| Date | Mon, 05 Dec 2022 21:41:49 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: irq/core] genirq/msi: Provide BUS_DEVICE_PCI_MSI[X] |
| |
The following commit has been merged into the irq/core branch of tip:
Commit-ID: bd141a3db40c877e01de8e981edb57c03199d876 Gitweb: https://git.kernel.org/tip/bd141a3db40c877e01de8e981edb57c03199d876 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Fri, 25 Nov 2022 00:26:02 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Mon, 05 Dec 2022 22:22:32 +01:00
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
--- include/linux/irqdomain_defs.h | 2 ++ kernel/irq/msi.c | 4 ++++ 2 files changed, 6 insertions(+)
diff --git a/include/linux/irqdomain_defs.h b/include/linux/irqdomain_defs.h index 69035b4..b3f4b7e 100644 --- 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 ae58692..0749e66 100644 --- 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;
|