The following commit has been merged into the x86/irq branch of tip: Commit-ID: d7f954e54079b4bf6088956d59f43768ec71269a Gitweb: https://git.kernel.org/tip/d7f954e54079b4bf6088956d59f43768ec71269a Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 26 Aug 2020 13:16:52 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 16 Sep 2020 16:52:36 +02:00
PCI_vmd_Mark_VMD_irqdomain_with_DOMAIN_BUS_VMD_MSI Devices on the VMD bus use their own MSI irq domain, but it is not distinguishable from regular PCI/MSI irq domains. This is required to exclude VMD devices from getting the irq domain pointer set by interrupt remapping. Override the default bus token. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> Acked-by: Joerg Roedel <[email protected]> Link: https://lore.kernel.org/r/[email protected] --- drivers/pci/controller/vmd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 411eed6..aa1b12b 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -580,6 +580,12 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) return -ENODEV; } + /* + * Override the irq domain bus token so the domain can be distinguished + * from a regular PCI/MSI domain. + */ + irq_domain_update_bus_token(vmd->irq_domain, DOMAIN_BUS_VMD_MSI); + pci_add_resource(&resources, &vmd->resources[0]); pci_add_resource_offset(&resources, &vmd->resources[1], offset[0]); pci_add_resource_offset(&resources, &vmd->resources[2], offset[1]);
