genirq/msi: Provide BUS_DEVICE_PCI_MSI[X]

Provide new bus tokens for the upcoming per device PCI/MSI and PCI/MSIX
interrupt domains.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221124232325.917219885@linutronix.de

diff --git a/include/linux/irqdomain_defs.h b/include/linux/irqdomain_defs.h
index 69035b4f740a475dd2b858e3946dd246196704a0..b3f4b7ef31f111026cd92818f4641e014a1262d5 100644 (file)
--- a/include/linux/irqdomain_defs.h
+++ b/include/linux/irqdomain_defs.h
@@ -21,6 +21,8 @@ enum irq_domain_bus_token {
        DOMAIN_BUS_TI_SCI_INTA_MSI,
        DOMAIN_BUS_WAKEUP,
        DOMAIN_BUS_VMD_MSI,
+       DOMAIN_BUS_PCI_DEVICE_MSI,
+       DOMAIN_BUS_PCI_DEVICE_MSIX,
 };
 
 #endif /* _LINUX_IRQDOMAIN_DEFS_H */

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index ae5869222fe5824844650c875393de9ce19bd921..0749e661e459cb740c50bb6905bc51aa755a0ca2 100644 (file)
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1118,6 +1118,8 @@ static bool msi_check_reservation_mode(struct irq_domain *domain,
 
        switch(domain->bus_token) {
        case DOMAIN_BUS_PCI_MSI:
+       case DOMAIN_BUS_PCI_DEVICE_MSI:
+       case DOMAIN_BUS_PCI_DEVICE_MSIX:
        case DOMAIN_BUS_VMD_MSI:
                break;
        default:
@@ -1143,6 +1145,8 @@ static int msi_handle_pci_fail(struct irq_domain *domain, struct msi_desc *desc,
 {
        switch(domain->bus_token) {
        case DOMAIN_BUS_PCI_MSI:
+       case DOMAIN_BUS_PCI_DEVICE_MSI:
+       case DOMAIN_BUS_PCI_DEVICE_MSIX:
        case DOMAIN_BUS_VMD_MSI:
                if (IS_ENABLED(CONFIG_PCI_MSI))
                        break;