diff mbox

[05/45] KVM: arm/arm64: vgic-new: Add acccessor to new struct vgic_irq instance

Message ID 1460740316-8755-6-git-send-email-andre.przywara@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andre Przywara April 15, 2016, 5:11 p.m. UTC
From: Christoffer Dall <christoffer.dall@linaro.org>

The new VGIC implementation centers around a struct vgic_irq instance
per virtual IRQ.
Provide a function to retrieve the right instance for a given IRQ
number and (in case of private interrupts) the right VCPU.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 virt/kvm/arm/vgic/vgic.c | 41 +++++++++++++++++++++++++++++++++++++++++
 virt/kvm/arm/vgic/vgic.h | 22 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 virt/kvm/arm/vgic/vgic.c
 create mode 100644 virt/kvm/arm/vgic/vgic.h

Comments

Andrew Jones April 25, 2016, 4:15 p.m. UTC | #1
Hi Andre,

I'm just randomly jumping in here because I spotted a typo in $SUBJECT.
'accessor' has too many c's. Also, just curious, but if the author is
from Linaro (hi Christoffer), then why do the new files this patch adds
have ARM copyrights?

Thanks,
drew
 

On Fri, Apr 15, 2016 at 06:11:16PM +0100, Andre Przywara wrote:
> From: Christoffer Dall <christoffer.dall@linaro.org>
> 
> The new VGIC implementation centers around a struct vgic_irq instance
> per virtual IRQ.
> Provide a function to retrieve the right instance for a given IRQ
> number and (in case of private interrupts) the right VCPU.
> 
> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
>  virt/kvm/arm/vgic/vgic.c | 41 +++++++++++++++++++++++++++++++++++++++++
>  virt/kvm/arm/vgic/vgic.h | 22 ++++++++++++++++++++++
>  2 files changed, 63 insertions(+)
>  create mode 100644 virt/kvm/arm/vgic/vgic.c
>  create mode 100644 virt/kvm/arm/vgic/vgic.h
> 
> diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
> new file mode 100644
> index 0000000..fb45537
> --- /dev/null
> +++ b/virt/kvm/arm/vgic/vgic.c
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright (C) 2015, 2016 ARM Ltd.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <linux/kvm.h>
> +#include <linux/kvm_host.h>
> +
> +#include "vgic.h"
> +
> +struct vgic_global __section(.hyp.text) kvm_vgic_global_state;
> +
> +struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
> +			      u32 intid)
> +{
> +	/* SGIs and PPIs */
> +	if (intid <= VGIC_MAX_PRIVATE)
> +		return &vcpu->arch.vgic_cpu.private_irqs[intid];
> +
> +	/* SPIs */
> +	if (intid <= VGIC_MAX_SPI)
> +		return &kvm->arch.vgic.spis[intid - VGIC_NR_PRIVATE_IRQS];
> +
> +	/* LPIs are not yet covered */
> +	if (intid >= VGIC_MIN_LPI)
> +		return NULL;
> +
> +	WARN(1, "Looking up struct vgic_irq for reserved INTID");
> +	return NULL;
> +}
> diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h
> new file mode 100644
> index 0000000..61b8d22
> --- /dev/null
> +++ b/virt/kvm/arm/vgic/vgic.h
> @@ -0,0 +1,22 @@
> +/*
> + * Copyright (C) 2015, 2016 ARM Ltd.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
> + */
> +#ifndef __KVM_ARM_VGIC_NEW_H__
> +#define __KVM_ARM_VGIC_NEW_H__
> +
> +struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
> +			      u32 intid);
> +
> +#endif
> -- 
> 2.7.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Christoffer Dall April 25, 2016, 7:49 p.m. UTC | #2
On Mon, Apr 25, 2016 at 06:15:25PM +0200, Andrew Jones wrote:
> Hi Andre,
> 
> I'm just randomly jumping in here because I spotted a typo in $SUBJECT.
> 'accessor' has too many c's. Also, just curious, but if the author is
> from Linaro (hi Christoffer), then why do the new files this patch adds
> have ARM copyrights?
> 

We just decided to let ARM deal with asserting the license since we all
collaborated on it, but others also suggested that we should let ARM and
Linaro share the license.

-Christoffer

> 
> On Fri, Apr 15, 2016 at 06:11:16PM +0100, Andre Przywara wrote:
> > From: Christoffer Dall <christoffer.dall@linaro.org>
> > 
> > The new VGIC implementation centers around a struct vgic_irq instance
> > per virtual IRQ.
> > Provide a function to retrieve the right instance for a given IRQ
> > number and (in case of private interrupts) the right VCPU.
> > 
> > Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
> > Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> > ---
> >  virt/kvm/arm/vgic/vgic.c | 41 +++++++++++++++++++++++++++++++++++++++++
> >  virt/kvm/arm/vgic/vgic.h | 22 ++++++++++++++++++++++
> >  2 files changed, 63 insertions(+)
> >  create mode 100644 virt/kvm/arm/vgic/vgic.c
> >  create mode 100644 virt/kvm/arm/vgic/vgic.h
> > 
> > diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
> > new file mode 100644
> > index 0000000..fb45537
> > --- /dev/null
> > +++ b/virt/kvm/arm/vgic/vgic.c
> > @@ -0,0 +1,41 @@
> > +/*
> > + * Copyright (C) 2015, 2016 ARM Ltd.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
> > + */
> > +
> > +#include <linux/kvm.h>
> > +#include <linux/kvm_host.h>
> > +
> > +#include "vgic.h"
> > +
> > +struct vgic_global __section(.hyp.text) kvm_vgic_global_state;
> > +
> > +struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
> > +			      u32 intid)
> > +{
> > +	/* SGIs and PPIs */
> > +	if (intid <= VGIC_MAX_PRIVATE)
> > +		return &vcpu->arch.vgic_cpu.private_irqs[intid];
> > +
> > +	/* SPIs */
> > +	if (intid <= VGIC_MAX_SPI)
> > +		return &kvm->arch.vgic.spis[intid - VGIC_NR_PRIVATE_IRQS];
> > +
> > +	/* LPIs are not yet covered */
> > +	if (intid >= VGIC_MIN_LPI)
> > +		return NULL;
> > +
> > +	WARN(1, "Looking up struct vgic_irq for reserved INTID");
> > +	return NULL;
> > +}
> > diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h
> > new file mode 100644
> > index 0000000..61b8d22
> > --- /dev/null
> > +++ b/virt/kvm/arm/vgic/vgic.h
> > @@ -0,0 +1,22 @@
> > +/*
> > + * Copyright (C) 2015, 2016 ARM Ltd.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
> > + */
> > +#ifndef __KVM_ARM_VGIC_NEW_H__
> > +#define __KVM_ARM_VGIC_NEW_H__
> > +
> > +struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
> > +			      u32 intid);
> > +
> > +#endif
> > -- 
> > 2.7.3
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marc Zyngier April 26, 2016, 8:21 a.m. UTC | #3
On 25/04/16 20:49, Christoffer Dall wrote:
> On Mon, Apr 25, 2016 at 06:15:25PM +0200, Andrew Jones wrote:
>> Hi Andre,
>>
>> I'm just randomly jumping in here because I spotted a typo in $SUBJECT.
>> 'accessor' has too many c's. Also, just curious, but if the author is
>> from Linaro (hi Christoffer), then why do the new files this patch adds
>> have ARM copyrights?
>>
> 
> We just decided to let ARM deal with asserting the license since we all
> collaborated on it, but others also suggested that we should let ARM and
> Linaro share the license.

I personally have no objections to having both ARM and Linaro sharing
the copyright, but I just don't know how this works in practice (and
asking any legal department is a sure recipe to delay these patches for
an extra 6 months, give or take a few years).

In the end, all I care about is the licence under which the code is
released.

Thanks,

	M.
Andrew Jones April 26, 2016, 9:44 a.m. UTC | #4
On Tue, Apr 26, 2016 at 09:21:30AM +0100, Marc Zyngier wrote:
> On 25/04/16 20:49, Christoffer Dall wrote:
> > On Mon, Apr 25, 2016 at 06:15:25PM +0200, Andrew Jones wrote:
> >> Hi Andre,
> >>
> >> I'm just randomly jumping in here because I spotted a typo in $SUBJECT.
> >> 'accessor' has too many c's. Also, just curious, but if the author is
> >> from Linaro (hi Christoffer), then why do the new files this patch adds
> >> have ARM copyrights?
> >>
> > 
> > We just decided to let ARM deal with asserting the license since we all
> > collaborated on it, but others also suggested that we should let ARM and
> > Linaro share the license.
> 
> I personally have no objections to having both ARM and Linaro sharing
> the copyright, but I just don't know how this works in practice (and
> asking any legal department is a sure recipe to delay these patches for
> an extra 6 months, give or take a few years).
> 
> In the end, all I care about is the licence under which the code is
> released.
>

Thanks, my curiosity is satisfied. I fully agree that if it's not easy
to share a collaborated file, then it's just a matter of flipping a coin,
or defaulting to whichever has the majority.

drew
Christoffer Dall April 26, 2016, 6:42 p.m. UTC | #5
On Tue, Apr 26, 2016 at 11:44:33AM +0200, Andrew Jones wrote:
> On Tue, Apr 26, 2016 at 09:21:30AM +0100, Marc Zyngier wrote:
> > On 25/04/16 20:49, Christoffer Dall wrote:
> > > On Mon, Apr 25, 2016 at 06:15:25PM +0200, Andrew Jones wrote:
> > >> Hi Andre,
> > >>
> > >> I'm just randomly jumping in here because I spotted a typo in $SUBJECT.
> > >> 'accessor' has too many c's. Also, just curious, but if the author is
> > >> from Linaro (hi Christoffer), then why do the new files this patch adds
> > >> have ARM copyrights?
> > >>
> > > 
> > > We just decided to let ARM deal with asserting the license since we all
> > > collaborated on it, but others also suggested that we should let ARM and
> > > Linaro share the license.
> > 
> > I personally have no objections to having both ARM and Linaro sharing
> > the copyright, but I just don't know how this works in practice (and
> > asking any legal department is a sure recipe to delay these patches for
> > an extra 6 months, give or take a few years).
> > 
> > In the end, all I care about is the licence under which the code is
> > released.
> >
> 
> Thanks, my curiosity is satisfied. I fully agree that if it's not easy
> to share a collaborated file, then it's just a matter of flipping a coin,
> or defaulting to whichever has the majority.
> 
I also only care about the license under which it is released.

I opted for defaulting to the company that is most set up to pursue any
potential infringement on the copyright.

-Christoffer
diff mbox

Patch

diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
new file mode 100644
index 0000000..fb45537
--- /dev/null
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -0,0 +1,41 @@ 
+/*
+ * Copyright (C) 2015, 2016 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kvm.h>
+#include <linux/kvm_host.h>
+
+#include "vgic.h"
+
+struct vgic_global __section(.hyp.text) kvm_vgic_global_state;
+
+struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
+			      u32 intid)
+{
+	/* SGIs and PPIs */
+	if (intid <= VGIC_MAX_PRIVATE)
+		return &vcpu->arch.vgic_cpu.private_irqs[intid];
+
+	/* SPIs */
+	if (intid <= VGIC_MAX_SPI)
+		return &kvm->arch.vgic.spis[intid - VGIC_NR_PRIVATE_IRQS];
+
+	/* LPIs are not yet covered */
+	if (intid >= VGIC_MIN_LPI)
+		return NULL;
+
+	WARN(1, "Looking up struct vgic_irq for reserved INTID");
+	return NULL;
+}
diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h
new file mode 100644
index 0000000..61b8d22
--- /dev/null
+++ b/virt/kvm/arm/vgic/vgic.h
@@ -0,0 +1,22 @@ 
+/*
+ * Copyright (C) 2015, 2016 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __KVM_ARM_VGIC_NEW_H__
+#define __KVM_ARM_VGIC_NEW_H__
+
+struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
+			      u32 intid);
+
+#endif