diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-04 00:39:25 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-04 10:43:29 +0100 |
| commit | 924b6231edfaf1e764ffb4f97ea382bf4facff58 (patch) | |
| tree | b51226e356c458d58c20a4c0dd1cb17c12b67086 | |
| parent | d0b03bd1c6725a3463290d7f9626e4b583518a5a (diff) | |
| download | kernel_samsung_aries-924b6231edfaf1e764ffb4f97ea382bf4facff58.zip kernel_samsung_aries-924b6231edfaf1e764ffb4f97ea382bf4facff58.tar.gz kernel_samsung_aries-924b6231edfaf1e764ffb4f97ea382bf4facff58.tar.bz2 | |
intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
When the DMAR table identifies that a PCI-PCI bridge belongs to a given
IOMMU, that means that the bridge and all devices behind it should be
associated with the IOMMU. Not just the bridge itself.
This fixes the device_to_iommu() function accordingly.
(It's broken if you have the same PCI bus numbers in multiple domains,
but this function was always broken in that way; I'll be dealing with
that later).
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | drivers/pci/intel-iommu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index f3eebd2..6262c19 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -477,11 +477,16 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn) if (drhd->ignored) continue; - for (i = 0; i < drhd->devices_cnt; i++) + for (i = 0; i < drhd->devices_cnt; i++) { if (drhd->devices[i] && drhd->devices[i]->bus->number == bus && drhd->devices[i]->devfn == devfn) return drhd->iommu; + if (drhd->devices[i]->subordinate && + drhd->devices[i]->subordinate->number <= bus && + drhd->devices[i]->subordinate->subordinate >= bus) + return drhd->iommu; + } if (drhd->include_all) return drhd->iommu; |