Commit 6855d1ba authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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.6

- Support for building, and {un,}loading the SMMU drivers as modules

- Minor cleanups

- SMMUv3:
  * Non-critical fix to encoding of TLBI_NH_VA invalidation command
  * Fix broken sanity check on size of MMIO resource during probe
  * Support for Substream IDs which will soon be provided by PCI PASIDs

- io-pgtable:
  * Finish off the TTBR1 preparation work partially merged last cycle
  * Ensure correct memory attributes for non-cacheable mappings

- SMMU:
  * Namespace public #defines to avoid collisions with arch/arm64/
  * Avoid using valid SMR register when probing mask size
parents 1ea27ee2 5a4549fd

Documentation/devicetree/bindings/iommu/iommu.txt

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ have a means to turn off translation. But it is invalid in such cases to 
disable the IOMMU's device tree node in the first place because it would

prevent any driver from properly setting up the translations.



Optional properties:

--------------------

- pasid-num-bits: Some masters support multiple address spaces for DMA, by

  tagging DMA transactions with an address space identifier. By default,

  this is 0, which means that the device only has one address space.





Notes:

======

drivers/acpi/arm64/iort.c

+18 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define pr_fmt(fmt)	"ACPI: IORT: " fmt



#include <linux/acpi_iort.h>

#include <linux/bitfield.h>

#include <linux/iommu.h>

#include <linux/kernel.h>

#include <linux/list.h>
@@ -924,6 +925,20 @@ static int iort_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data) 
	return iort_iommu_xlate(info->dev, parent, streamid);

}



static void iort_named_component_init(struct device *dev,

				      struct acpi_iort_node *node)

{

	struct acpi_iort_named_component *nc;

	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);



	if (!fwspec)

		return;



	nc = (struct acpi_iort_named_component *)node->node_data;

	fwspec->num_pasid_bits = FIELD_GET(ACPI_IORT_NC_PASID_BITS,

					   nc->node_flags);

}



/**

 * iort_iommu_configure - Set-up IOMMU configuration for a device.

 *
@@ -978,6 +993,9 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) 
			if (parent)

				err = iort_iommu_xlate(dev, parent, streamid);

		} while (parent && !err);



		if (!err)

			iort_named_component_init(dev, node);

	}



	/*

drivers/iommu/arm-smmu-impl.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int arm_mmu500_reset(struct arm_smmu_device *smmu) 
	 * Secure has also cleared SACR.CACHE_LOCK for this to take effect...

	 */

	reg = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_ID7);

	major = FIELD_GET(ID7_MAJOR, reg);

	major = FIELD_GET(ARM_SMMU_ID7_MAJOR, reg);

	reg = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_sACR);

	if (major >= 2)

		reg &= ~ARM_MMU500_ACR_CACHE_LOCK;

drivers/iommu/arm-smmu-v3.c

+389 −110

File changed.

Preview size limit exceeded, changes collapsed.

drivers/iommu/arm-smmu.c

+109 −88

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE