irqchip/gic-v4.1: Plumb set_vcpu_affinity SGI callbacks

Just like for vLPIs, there is some configuration information that cannot
be directly communicated through the normal irqchip API, and we have to
use our good old friend set_vcpu_affinity as a side-band communication
mechanism.

This is used to configure group and priority for a given vSGI.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Link: https://lore.kernel.org/r/20200304203330.4967-13-maz@kernel.org

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index c614f0c..aae5332 100644 (file)
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -4047,6 +4047,23 @@ out:
        return 0;
 }
 
+static int its_sgi_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)
+{
+       struct its_vpe *vpe = irq_data_get_irq_chip_data(d);
+       struct its_cmd_info *info = vcpu_info;
+
+       switch (info->cmd_type) {
+       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);
+               return 0;
+
+       default:
+               return -EINVAL;
+       }
+}
+
 static struct irq_chip its_sgi_irq_chip = {
        .name                   = "GICv4.1-sgi",
        .irq_mask               = its_sgi_mask_irq,
@@ -4054,6 +4071,7 @@ static struct irq_chip its_sgi_irq_chip = {
        .irq_set_affinity       = its_sgi_set_affinity,
        .irq_set_irqchip_state  = its_sgi_set_irqchip_state,
        .irq_get_irqchip_state  = its_sgi_get_irqchip_state,
+       .irq_set_vcpu_affinity  = its_sgi_set_vcpu_affinity,
 };
 
 static int its_sgi_irq_domain_alloc(struct irq_domain *domain,

diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h
index 44e8c19..1b34100 100644 (file)
--- a/include/linux/irqchip/arm-gic-v4.h
+++ b/include/linux/irqchip/arm-gic-v4.h
@@ -103,6 +103,7 @@ enum its_vcpu_info_cmd_type {
        SCHEDULE_VPE,
        DESCHEDULE_VPE,
        INVALL_VPE,
+       PROP_UPDATE_VSGI,
 };
 
 struct its_cmd_info {
@@ -115,6 +116,10 @@ struct its_cmd_info {
                        bool            g0en;
                        bool            g1en;
                };
+               struct {
+                       u8              priority;
+                       bool            group;
+               };
        };
 };