iommu/vt-d: Only insert alias dev_info if there is an alias
For devices without an PCI alias there will be two device_domain_info structures added. Prevent that by checking if the alias is different from the device. Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
127c761598
commit
08a7f456a7
|
@ -2319,8 +2319,8 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
|
||||||
struct device_domain_info *info = NULL;
|
struct device_domain_info *info = NULL;
|
||||||
struct dmar_domain *domain, *tmp;
|
struct dmar_domain *domain, *tmp;
|
||||||
struct intel_iommu *iommu;
|
struct intel_iommu *iommu;
|
||||||
|
u16 req_id, dma_alias;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
u16 dma_alias;
|
|
||||||
u8 bus, devfn;
|
u8 bus, devfn;
|
||||||
|
|
||||||
domain = find_domain(dev);
|
domain = find_domain(dev);
|
||||||
|
@ -2331,6 +2331,8 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
|
||||||
if (!iommu)
|
if (!iommu)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
req_id = ((u16)bus << 8) | devfn;
|
||||||
|
|
||||||
if (dev_is_pci(dev)) {
|
if (dev_is_pci(dev)) {
|
||||||
struct pci_dev *pdev = to_pci_dev(dev);
|
struct pci_dev *pdev = to_pci_dev(dev);
|
||||||
|
|
||||||
|
@ -2361,7 +2363,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* register PCI DMA alias device */
|
/* register PCI DMA alias device */
|
||||||
if (dev_is_pci(dev)) {
|
if (req_id != dma_alias && dev_is_pci(dev)) {
|
||||||
tmp = dmar_insert_one_dev_info(iommu, PCI_BUS_NUM(dma_alias),
|
tmp = dmar_insert_one_dev_info(iommu, PCI_BUS_NUM(dma_alias),
|
||||||
dma_alias & 0xff, NULL, domain);
|
dma_alias & 0xff, NULL, domain);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue