diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2019-04-26 15:48:52 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-04-26 15:48:52 +0200 |
| commit | 26ac2b6ee6c0902188316d16bc5ca9306d678f03 (patch) | |
| tree | 9664a3178d423866a37759ae33920ceeb9c377fe /drivers/acpi | |
| parent | Linux 5.1-rc6 (diff) | |
| parent | iommu/arm-smmu: Log CBFRSYNRA register on context fault (diff) | |
| download | linux-dev-26ac2b6ee6c0902188316d16bc5ca9306d678f03.tar.xz linux-dev-26ac2b6ee6c0902188316d16bc5ca9306d678f03.zip | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/arm64/iort.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index e48894e002ba..4000902e57f0 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1028,6 +1028,14 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) dev_dbg(dev, "dma_pfn_offset(%#08llx)\n", offset); } +static bool iort_pci_rc_supports_ats(struct acpi_iort_node *node) +{ + struct acpi_iort_root_complex *pci_rc; + + pci_rc = (struct acpi_iort_root_complex *)node->node_data; + return pci_rc->ats_attribute & ACPI_IORT_ATS_SUPPORTED; +} + /** * iort_iommu_configure - Set-up IOMMU configuration for a device. * @@ -1063,6 +1071,9 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) info.node = node; err = pci_for_each_dma_alias(to_pci_dev(dev), iort_pci_iommu_init, &info); + + if (!err && iort_pci_rc_supports_ats(node)) + dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; } else { int i = 0; |