Commit e479822e authored by David Woodhouse's avatar David Woodhouse Committed by Greg Kroah-Hartman

iommu/vt-d: Fix ATSR handling for Root-Complex integrated endpoints

commit d14053b3 upstream.

The VT-d specification says that "Software must enable ATS on endpoint
devices behind a Root Port only if the Root Port is reported as
supporting ATS transactions."

We walk up the tree to find a Root Port, but for integrated devices we
don't find one — we get to the host bridge. In that case we *should*
allow ATS. Currently we don't, which means that we are incorrectly
failing to use ATS for the integrated graphics. Fix that.

We should never break out of this loop "naturally" with bus==NULL,
since we'll always find bridge==NULL in that case (and now return 1).

So remove the check for (!bridge) after the loop, since it can never
happen. If it did, it would be worthy of a BUG_ON(!bridge). But since
it'll oops anyway in that case, that'll do just as well.
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f21731a5
...@@ -3928,14 +3928,17 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev) ...@@ -3928,14 +3928,17 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev)
dev = pci_physfn(dev); dev = pci_physfn(dev);
for (bus = dev->bus; bus; bus = bus->parent) { for (bus = dev->bus; bus; bus = bus->parent) {
bridge = bus->self; bridge = bus->self;
if (!bridge || !pci_is_pcie(bridge) || /* If it's an integrated device, allow ATS */
if (!bridge)
return 1;
/* Connected via non-PCIe: no ATS */
if (!pci_is_pcie(bridge) ||
pci_pcie_type(bridge) == PCI_EXP_TYPE_PCI_BRIDGE) pci_pcie_type(bridge) == PCI_EXP_TYPE_PCI_BRIDGE)
return 0; return 0;
/* If we found the root port, look it up in the ATSR */
if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT) if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT)
break; break;
} }
if (!bridge)
return 0;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(atsru, &dmar_atsr_units, list) { list_for_each_entry_rcu(atsru, &dmar_atsr_units, list) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment