| Message ID | 20200304203330.4967-16-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | irqchip/gic-v4: GICv4.1 architecture support | expand |
On 2020/3/5 4:33, Marc Zyngier wrote: > Add the SGI configuration entry point for KVM to use. > > Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> Thanks
Hi Marc, On 3/4/20 9:33 PM, Marc Zyngier wrote: > Add the SGI configuration entry point for KVM to use. > > Signed-off-by: Marc Zyngier <maz@kernel.org> > --- > drivers/irqchip/irq-gic-v3-its.c | 2 +- > drivers/irqchip/irq-gic-v4.c | 13 +++++++++++++ > include/linux/irqchip/arm-gic-v4.h | 3 ++- > 3 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c > index effb0e0b0c9d..b65fba67bd85 100644 > --- a/drivers/irqchip/irq-gic-v3-its.c > +++ b/drivers/irqchip/irq-gic-v3-its.c > @@ -4039,7 +4039,7 @@ static int its_sgi_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) > struct its_cmd_info *info = vcpu_info; > > switch (info->cmd_type) { > - case PROP_UPDATE_SGI: > + case PROP_UPDATE_VSGI: This change rather belongs to [PATCH v5 12/23] irqchip/gic-v4.1: Plumb set_vcpu_affinity SGI callbacks > vpe->sgi_config[d->hwirq].priority = info->priority; > vpe->sgi_config[d->hwirq].group = info->group; > its_configure_sgi(d, false); > diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c > index 99b33f60ac63..0c18714ae13e 100644 > --- a/drivers/irqchip/irq-gic-v4.c > +++ b/drivers/irqchip/irq-gic-v4.c > @@ -320,6 +320,19 @@ int its_prop_update_vlpi(int irq, u8 config, bool inv) > return irq_set_vcpu_affinity(irq, &info); > } > > +int its_prop_update_vsgi(int irq, u8 priority, bool group) > +{ > + struct its_cmd_info info = { > + .cmd_type = PROP_UPDATE_VSGI, > + { > + .priority = priority, > + .group = group, > + }, > + }; > + > + return irq_set_vcpu_affinity(irq, &info); > +} > + > int its_init_v4(struct irq_domain *domain, > const struct irq_domain_ops *vpe_ops, > const struct irq_domain_ops *sgi_ops) > diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h > index 0bb111b4a504..6976b8331b60 100644 > --- a/include/linux/irqchip/arm-gic-v4.h > +++ b/include/linux/irqchip/arm-gic-v4.h > @@ -105,7 +105,7 @@ enum its_vcpu_info_cmd_type { > SCHEDULE_VPE, > DESCHEDULE_VPE, > INVALL_VPE, > - PROP_UPDATE_SGI, > + PROP_UPDATE_VSGI, same > }; > > struct its_cmd_info { > @@ -134,6 +134,7 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map); > int its_get_vlpi(int irq, struct its_vlpi_map *map); > int its_unmap_vlpi(int irq); > int its_prop_update_vlpi(int irq, u8 config, bool inv); > +int its_prop_update_vsgi(int irq, u8 priority, bool group); > > struct irq_domain_ops; > int its_init_v4(struct irq_domain *domain, > Besides Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric
Hi Eric, On 2020-03-17 10:30, Auger Eric wrote: > Hi Marc, > > On 3/4/20 9:33 PM, Marc Zyngier wrote: >> Add the SGI configuration entry point for KVM to use. >> >> Signed-off-by: Marc Zyngier <maz@kernel.org> >> --- >> drivers/irqchip/irq-gic-v3-its.c | 2 +- >> drivers/irqchip/irq-gic-v4.c | 13 +++++++++++++ >> include/linux/irqchip/arm-gic-v4.h | 3 ++- >> 3 files changed, 16 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/irqchip/irq-gic-v3-its.c >> b/drivers/irqchip/irq-gic-v3-its.c >> index effb0e0b0c9d..b65fba67bd85 100644 >> --- a/drivers/irqchip/irq-gic-v3-its.c >> +++ b/drivers/irqchip/irq-gic-v3-its.c >> @@ -4039,7 +4039,7 @@ static int its_sgi_set_vcpu_affinity(struct >> irq_data *d, void *vcpu_info) >> struct its_cmd_info *info = vcpu_info; >> >> switch (info->cmd_type) { >> - case PROP_UPDATE_SGI: >> + case PROP_UPDATE_VSGI: > This change rather belongs to > [PATCH v5 12/23] irqchip/gic-v4.1: Plumb set_vcpu_affinity SGI > callbacks Absolutely. I messed up a rebase, obviously. Thanks, M.
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index effb0e0b0c9d..b65fba67bd85 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -4039,7 +4039,7 @@ static int its_sgi_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) struct its_cmd_info *info = vcpu_info; switch (info->cmd_type) { - case PROP_UPDATE_SGI: + case PROP_UPDATE_VSGI: vpe->sgi_config[d->hwirq].priority = info->priority; vpe->sgi_config[d->hwirq].group = info->group; its_configure_sgi(d, false); diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c index 99b33f60ac63..0c18714ae13e 100644 --- a/drivers/irqchip/irq-gic-v4.c +++ b/drivers/irqchip/irq-gic-v4.c @@ -320,6 +320,19 @@ int its_prop_update_vlpi(int irq, u8 config, bool inv) return irq_set_vcpu_affinity(irq, &info); } +int its_prop_update_vsgi(int irq, u8 priority, bool group) +{ + struct its_cmd_info info = { + .cmd_type = PROP_UPDATE_VSGI, + { + .priority = priority, + .group = group, + }, + }; + + return irq_set_vcpu_affinity(irq, &info); +} + int its_init_v4(struct irq_domain *domain, const struct irq_domain_ops *vpe_ops, const struct irq_domain_ops *sgi_ops) diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h index 0bb111b4a504..6976b8331b60 100644 --- a/include/linux/irqchip/arm-gic-v4.h +++ b/include/linux/irqchip/arm-gic-v4.h @@ -105,7 +105,7 @@ enum its_vcpu_info_cmd_type { SCHEDULE_VPE, DESCHEDULE_VPE, INVALL_VPE, - PROP_UPDATE_SGI, + PROP_UPDATE_VSGI, }; struct its_cmd_info { @@ -134,6 +134,7 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map); int its_get_vlpi(int irq, struct its_vlpi_map *map); int its_unmap_vlpi(int irq); int its_prop_update_vlpi(int irq, u8 config, bool inv); +int its_prop_update_vsgi(int irq, u8 priority, bool group); struct irq_domain_ops; int its_init_v4(struct irq_domain *domain,
Add the SGI configuration entry point for KVM to use. Signed-off-by: Marc Zyngier <maz@kernel.org> --- drivers/irqchip/irq-gic-v3-its.c | 2 +- drivers/irqchip/irq-gic-v4.c | 13 +++++++++++++ include/linux/irqchip/arm-gic-v4.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-)