diff options
author | Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> | 2018-02-13 15:20:51 +0000 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2018-02-14 15:15:41 +0100 |
commit | f51dc89265dabad36f1cd832a581106cf4e50158 (patch) | |
tree | f871aa1db18599359b0094a8b8529f0c159519a0 /drivers/iommu | |
parent | 8b4282e6b8e239d8ce68ab884c89335cc6fdd7c7 (diff) | |
download | linux-stable-f51dc89265dabad36f1cd832a581106cf4e50158.tar.gz linux-stable-f51dc89265dabad36f1cd832a581106cf4e50158.tar.bz2 linux-stable-f51dc89265dabad36f1cd832a581106cf4e50158.zip |
iommu/dma: Add HW MSI(GICv3 ITS) address regions reservation
Modified iommu_dma_get_resv_regions() to include GICv3 ITS
region on ACPI based ARM platfiorms which may require HW MSI
reservations.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/dma-iommu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 25914d36c5ac..f05f3cf90756 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> #include <linux/dma-iommu.h> #include <linux/gfp.h> @@ -167,13 +168,18 @@ EXPORT_SYMBOL(iommu_put_dma_cookie); * * IOMMU drivers can use this to implement their .get_resv_regions callback * for general non-IOMMU-specific reservations. Currently, this covers host - * bridge windows for PCI devices. + * bridge windows for PCI devices and GICv3 ITS region reservation on ACPI + * based ARM platforms that may require HW MSI reservation. */ void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list) { struct pci_host_bridge *bridge; struct resource_entry *window; + if (!is_of_node(dev->iommu_fwspec->iommu_fwnode) && + iort_iommu_msi_get_resv_regions(dev, list) < 0) + return; + if (!dev_is_pci(dev)) return; |