Commit 49b6ed1a authored by Joerg Roedel's avatar Joerg Roedel

Merge tag 'arm-smmu-updates' of...

Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu

Arm SMMU updates for 5.7

- Support for the TLB range invalidation command in SMMUv3.2

- Introduction of command batching helpers...

- ... which are then used to batch up CD and ATC invalidation

- Support for PCI PASID, along with necessary PCI symbol exports

- MAINTAINERS update to include DT binding docs
parents f8788d86 6a481a95
...@@ -1426,6 +1426,7 @@ M: Will Deacon <will@kernel.org> ...@@ -1426,6 +1426,7 @@ M: Will Deacon <will@kernel.org>
R: Robin Murphy <robin.murphy@arm.com> R: Robin Murphy <robin.murphy@arm.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/iommu/arm,smmu*
F: drivers/iommu/arm-smmu* F: drivers/iommu/arm-smmu*
F: drivers/iommu/io-pgtable-arm.c F: drivers/iommu/io-pgtable-arm.c
F: drivers/iommu/io-pgtable-arm-v7s.c F: drivers/iommu/io-pgtable-arm-v7s.c
......
This diff is collapsed.
...@@ -366,6 +366,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) ...@@ -366,6 +366,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_enable_pasid);
/** /**
* pci_disable_pasid - Disable the PASID capability * pci_disable_pasid - Disable the PASID capability
...@@ -390,6 +391,7 @@ void pci_disable_pasid(struct pci_dev *pdev) ...@@ -390,6 +391,7 @@ void pci_disable_pasid(struct pci_dev *pdev)
pdev->pasid_enabled = 0; pdev->pasid_enabled = 0;
} }
EXPORT_SYMBOL_GPL(pci_disable_pasid);
/** /**
* pci_restore_pasid_state - Restore PASID capabilities * pci_restore_pasid_state - Restore PASID capabilities
...@@ -441,6 +443,7 @@ int pci_pasid_features(struct pci_dev *pdev) ...@@ -441,6 +443,7 @@ int pci_pasid_features(struct pci_dev *pdev)
return supported; return supported;
} }
EXPORT_SYMBOL_GPL(pci_pasid_features);
#define PASID_NUMBER_SHIFT 8 #define PASID_NUMBER_SHIFT 8
#define PASID_NUMBER_MASK (0x1f << PASID_NUMBER_SHIFT) #define PASID_NUMBER_MASK (0x1f << PASID_NUMBER_SHIFT)
...@@ -469,4 +472,5 @@ int pci_max_pasids(struct pci_dev *pdev) ...@@ -469,4 +472,5 @@ int pci_max_pasids(struct pci_dev *pdev)
return (1 << supported); return (1 << supported);
} }
EXPORT_SYMBOL_GPL(pci_max_pasids);
#endif /* CONFIG_PCI_PASID */ #endif /* CONFIG_PCI_PASID */
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