genirq/irqdomain: Update irq_domain_ops.activate() signature

The irq_domain_ops.activate() callback has no return value and no way to
tell the function that the activation is early.

The upcoming changes to support a reservation scheme which allows to assign
interrupt vectors on x86 only when the interrupt is actually requested
requires:

  - A return value, so activation can fail at request_irq() time

  - Information that the activate invocation is early, i.e. before
    request_irq().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Juergen Gross <jgross@suse.com>
Tested-by: Yu Chen <yu.c.chen@intel.com>
Acked-by: Juergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Rui Zhang <rui.zhang@intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Len Brown <lenb@kernel.org>
Link: https://lkml.kernel.org/r/20170913213152.848490816@linutronix.de

diff --git a/arch/x86/include/asm/irqdomain.h b/arch/x86/include/asm/irqdomain.h
index d26075b52885a8cee21841c2c2278a3e6c46b5ad..1d9091ffa140f01369704cb1d03844665b0d9ae0 100644 (file)
--- a/arch/x86/include/asm/irqdomain.h
+++ b/arch/x86/include/asm/irqdomain.h
@@ -41,8 +41,8 @@ extern int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
                              unsigned int nr_irqs, void *arg);
 extern void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,
                              unsigned int nr_irqs);
-extern void mp_irqdomain_activate(struct irq_domain *domain,
-                                 struct irq_data *irq_data);
+extern int mp_irqdomain_activate(struct irq_domain *domain,
+                                struct irq_data *irq_data, bool early);
 extern void mp_irqdomain_deactivate(struct irq_domain *domain,
                                    struct irq_data *irq_data);
 extern int mp_irqdomain_ioapic_idx(struct irq_domain *domain);

diff --git a/arch/x86/kernel/apic/htirq.c b/arch/x86/kernel/apic/htirq.c
index 56ccf9346b08ac4bf3e54e7994074b6c04fb02e8..b07075dce8b7faa931e3c0105c9c9396341a0d4a 100644 (file)
--- a/arch/x86/kernel/apic/htirq.c
+++ b/arch/x86/kernel/apic/htirq.c
@@ -112,8 +112,8 @@ static void htirq_domain_free(struct irq_domain *domain, unsigned int virq,
        irq_domain_free_irqs_top(domain, virq, nr_irqs);
 }
 
-static void htirq_domain_activate(struct irq_domain *domain,
-                                 struct irq_data *irq_data)
+static int htirq_domain_activate(struct irq_domain *domain,
+                                struct irq_data *irq_data, bool early)
 {
        struct ht_irq_msg msg;
        struct irq_cfg *cfg = irqd_cfg(irq_data);
@@ -132,6 +132,7 @@ static void htirq_domain_activate(struct irq_domain *domain,
                        HT_IRQ_LOW_MT_ARBITRATED) |
                HT_IRQ_LOW_IRQ_MASKED;
        write_ht_irq_msg(irq_data->irq, &msg);
+       return 0;
 }
 
 static void htirq_domain_deactivate(struct irq_domain *domain,

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 70e48aa6af982e4b94564986e352de61ba81d27f..d50e46757f6d0c0f46fb1d0552da35f95b0945e3 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2977,8 +2977,8 @@ void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,
        irq_domain_free_irqs_top(domain, virq, nr_irqs);
 }
 
-void mp_irqdomain_activate(struct irq_domain *domain,
-                          struct irq_data *irq_data)
+int mp_irqdomain_activate(struct irq_domain *domain,
+                         struct irq_data *irq_data, bool early)
 {
        unsigned long flags;
        struct irq_pin_list *entry;
@@ -2988,6 +2988,7 @@ void mp_irqdomain_activate(struct irq_domain *domain,
        for_each_irq_pin(entry, data->irq_2_pin)
                __ioapic_write_entry(entry->apic, entry->pin, data->entry);
        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
+       return 0;
 }
 
 void mp_irqdomain_deactivate(struct irq_domain *domain,

diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
index 03fc397335b7482e9302f7d7f6b85d9c0f553df5..5f6fd860820a3c5175609a5a3468262aac937604 100644 (file)
--- a/arch/x86/platform/uv/uv_irq.c
+++ b/arch/x86/platform/uv/uv_irq.c
@@ -127,10 +127,11 @@ static void uv_domain_free(struct irq_domain *domain, unsigned int virq,
  * Re-target the irq to the specified CPU and enable the specified MMR located
  * on the specified blade to allow the sending of MSIs to the specified CPU.
  */
-static void uv_domain_activate(struct irq_domain *domain,
-                              struct irq_data *irq_data)
+static int uv_domain_activate(struct irq_domain *domain,
+                             struct irq_data *irq_data, bool early)
 {
        uv_program_mmr(irqd_cfg(irq_data), irq_data->chip_data);
+       return 0;
 }
 
 /*

diff --git a/drivers/gpio/gpio-xgene-sb.c b/drivers/gpio/gpio-xgene-sb.c
index 033258634b8c37300df3598e3fd24570aab1597d..b5843fe6a44d88d080f9611858dcb98c074a64ee 100644 (file)
--- a/drivers/gpio/gpio-xgene-sb.c
+++ b/drivers/gpio/gpio-xgene-sb.c
@@ -140,8 +140,9 @@ static int xgene_gpio_sb_to_irq(struct gpio_chip *gc, u32 gpio)
        return irq_create_fwspec_mapping(&fwspec);
 }
 
-static void xgene_gpio_sb_domain_activate(struct irq_domain *d,
-               struct irq_data *irq_data)
+static int xgene_gpio_sb_domain_activate(struct irq_domain *d,
+                                        struct irq_data *irq_data,
+                                        bool early)
 {
        struct xgene_gpio_sb *priv = d->host_data;
        u32 gpio = HWIRQ_TO_GPIO(priv, irq_data->hwirq);
@@ -150,11 +151,12 @@ static void xgene_gpio_sb_domain_activate(struct irq_domain *d,
                dev_err(priv->gc.parent,
                "Unable to configure XGene GPIO standby pin %d as IRQ\n",
                                gpio);
-               return;
+               return -ENOSPC;
        }
 
        xgene_gpio_set_bit(&priv->gc, priv->regs + MPA_GPIO_SEL_LO,
                        gpio * 2, 1);
+       return 0;
 }
 
 static void xgene_gpio_sb_domain_deactivate(struct irq_domain *d,

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 51f8215877f552ed168424107078ac786febaf3b..ea03f4138f5fa63b20597ce9fe66585273bd2471 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4170,8 +4170,8 @@ static void irq_remapping_free(struct irq_domain *domain, unsigned int virq,
        irq_domain_free_irqs_common(domain, virq, nr_irqs);
 }
 
-static void irq_remapping_activate(struct irq_domain *domain,
-                                  struct irq_data *irq_data)
+static int irq_remapping_activate(struct irq_domain *domain,
+                                 struct irq_data *irq_data, bool early)
 {
        struct amd_ir_data *data = irq_data->chip_data;
        struct irq_2_irte *irte_info = &data->irq_2_irte;
@@ -4180,6 +4180,7 @@ static void irq_remapping_activate(struct irq_domain *domain,
        if (iommu)
                iommu->irte_ops->activate(data->entry, irte_info->devid,
                                          irte_info->index);
+       return 0;
 }
 
 static void irq_remapping_deactivate(struct irq_domain *domain,

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index a5b89f6bcdbf08af9e4bfb75d1baf1e063735708..762d84713b7a464464201c797641850e07b303fa 100644 (file)
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -1389,12 +1389,13 @@ static void intel_irq_remapping_free(struct irq_domain *domain,
        irq_domain_free_irqs_common(domain, virq, nr_irqs);
 }
 
-static void intel_irq_remapping_activate(struct irq_domain *domain,
-                                        struct irq_data *irq_data)
+static int intel_irq_remapping_activate(struct irq_domain *domain,
+                                       struct irq_data *irq_data, bool early)
 {
        struct intel_ir_data *data = irq_data->chip_data;
 
        modify_irte(&data->irq_2_iommu, &data->irte_entry);
+       return 0;
 }
 
 static void intel_irq_remapping_deactivate(struct irq_domain *domain,

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index e8d89343d6139424e2caf0baa112955b7005b2e4..20e2b5fac7b99a88b5bcf48b774b0f0af9de5ae0 100644 (file)
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -2186,8 +2186,8 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
        return 0;
 }
 
-static void its_irq_domain_activate(struct irq_domain *domain,
-                                   struct irq_data *d)
+static int its_irq_domain_activate(struct irq_domain *domain,
+                                  struct irq_data *d, bool early)
 {
        struct its_device *its_dev = irq_data_get_irq_chip_data(d);
        u32 event = its_get_event_id(d);
@@ -2205,6 +2205,7 @@ static void its_irq_domain_activate(struct irq_domain *domain,
 
        /* Map the GIC IRQ and event to the device */
        its_send_mapti(its_dev, d->hwirq, event);
+       return 0;
 }
 
 static void its_irq_domain_deactivate(struct irq_domain *domain,
@@ -2678,8 +2679,8 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
        return err;
 }
 
-static void its_vpe_irq_domain_activate(struct irq_domain *domain,
-                                       struct irq_data *d)
+static int its_vpe_irq_domain_activate(struct irq_domain *domain,
+                                      struct irq_data *d, bool early)
 {
        struct its_vpe *vpe = irq_data_get_irq_chip_data(d);
 
@@ -2687,6 +2688,7 @@ static void its_vpe_irq_domain_activate(struct irq_domain *domain,
        vpe->col_idx = cpumask_first(cpu_online_mask);
        its_send_vmapp(vpe, true);
        its_send_vinvall(vpe);
+       return 0;
 }
 
 static void its_vpe_irq_domain_deactivate(struct irq_domain *domain,

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 50299ad966590e8ae0ce2813d1f803c790c6ce51..02b66588cac638fc2525655c1a3f75054ae26e60 100644 (file)
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -289,13 +289,14 @@ static int stm32_gpio_domain_translate(struct irq_domain *d,
        return 0;
 }
 
-static void stm32_gpio_domain_activate(struct irq_domain *d,
-                                      struct irq_data *irq_data)
+static int stm32_gpio_domain_activate(struct irq_domain *d,
+                                     struct irq_data *irq_data, bool early)
 {
        struct stm32_gpio_bank *bank = d->host_data;
        struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);
 
        regmap_field_write(pctl->irqmux[irq_data->hwirq], bank->bank_nr);
+       return 0;
 }
 
 static int stm32_gpio_domain_alloc(struct irq_domain *d,

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index de06ce992a2d45c5536c997748d58e056cd8f82c..9bc07f59b090dd7016e1aa477fa3c20f63e55424 100644 (file)
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -111,7 +111,7 @@ struct irq_domain_ops {
                     unsigned int nr_irqs, void *arg);
        void (*free)(struct irq_domain *d, unsigned int virq,
                     unsigned int nr_irqs);
-       void (*activate)(struct irq_domain *d, struct irq_data *irq_data);
+       int (*activate)(struct irq_domain *d, struct irq_data *irqd, bool early);
        void (*deactivate)(struct irq_domain *d, struct irq_data *irq_data);
        int (*translate)(struct irq_domain *d, struct irq_fwspec *fwspec,
                         unsigned long *out_hwirq, unsigned int *out_type);

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 1a75a00ee01f7a7dc2a2ccf9999cc99975ce6883..1423f8a6c75d6c7e0fd6e6f1581eb65c7ce3f70a 100644 (file)
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1690,7 +1690,7 @@ static void __irq_domain_activate_irq(struct irq_data *irq_data)
                if (irq_data->parent_data)
                        __irq_domain_activate_irq(irq_data->parent_data);
                if (domain->ops->activate)
-                       domain->ops->activate(domain, irq_data);
+                       domain->ops->activate(domain, irq_data, false);
        }
 }
 

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 94ecc029384475971d8a44838bb51af0bb27798d..6155fff9f6473042b99c80fe7c1c4209bffe3b26 100644 (file)
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -102,13 +102,14 @@ int msi_domain_set_affinity(struct irq_data *irq_data,
        return ret;
 }
 
-static void msi_domain_activate(struct irq_domain *domain,
-                               struct irq_data *irq_data)
+static int msi_domain_activate(struct irq_domain *domain,
+                              struct irq_data *irq_data, bool early)
 {
        struct msi_msg msg;
 
        BUG_ON(irq_chip_compose_msi_msg(irq_data, &msg));
        irq_chip_write_msi_msg(irq_data, &msg);
+       return 0;
 }
 
 static void msi_domain_deactivate(struct irq_domain *domain,