diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2014-10-02 11:50:25 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-10-02 12:12:25 +0200 |
| commit | 57384592c43375d2c9a14d82aebbdc95fdda9e9d (patch) | |
| tree | ee31cf5f8d306c0bddd5ae2cf96c6b5d2b556979 | |
| parent | iommu/vt-d: Only remove domain when device is removed (diff) | |
| download | linux-dev-57384592c43375d2c9a14d82aebbdc95fdda9e9d.tar.xz linux-dev-57384592c43375d2c9a14d82aebbdc95fdda9e9d.zip | |
iommu/vt-d: Store bus information in RMRR PCI device path
This will be used later to match broken RMRR entries.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/dmar.c | 1 | ||||
| -rw-r--r-- | include/linux/dmar.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 8ed55b0a1ce4..68da1ab0f2cd 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -155,6 +155,7 @@ dmar_alloc_pci_notify_info(struct pci_dev *dev, unsigned long event) if (event == BUS_NOTIFY_ADD_DEVICE) { for (tmp = dev; tmp; tmp = tmp->bus->self) { level--; + info->path[level].bus = tmp->bus->number; info->path[level].device = PCI_SLOT(tmp->devfn); info->path[level].function = PCI_FUNC(tmp->devfn); if (pci_is_root_bus(tmp->bus)) diff --git a/include/linux/dmar.h b/include/linux/dmar.h index 1deece46a0ca..593fff99e6bf 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h @@ -56,13 +56,19 @@ struct dmar_drhd_unit { struct intel_iommu *iommu; }; +struct dmar_pci_path { + u8 bus; + u8 device; + u8 function; +}; + struct dmar_pci_notify_info { struct pci_dev *dev; unsigned long event; int bus; u16 seg; u16 level; - struct acpi_dmar_pci_path path[]; + struct dmar_pci_path path[]; } __attribute__((packed)); extern struct rw_semaphore dmar_global_lock; |