iommu/arm-smmu: Plumb in new ACPI identifiers

PATCH New Robin Murphy 2 participants 2 messages Jun 19, 2017 – Jun 21, 2017

Subsystems (2)

Stable branch IOMMU

lore

Share & tools

lore

Robin Murphy

author reviewer

2017-06-19 15:41 UTC #0 lore raw

PATCH v3 1/1 iommu/arm-smmu: Plumb in new ACPI identifiers

Revision C of IORT now allows us to identify ARM MMU-401 and the Cavium ThunderX implementation. Wire them up so that we can probe these models once firmware starts using the new codes in place of generic ones, and so that the appropriate features and quirks get enabled when we do.

For the sake of backports and mitigating sychronisation problems with the ACPICA headers, we'll carry a backup copy of the new definitions locally for the short term to make life simpler.

CC stable at vger.kernel.org # 4.10

Acked-by Robert Richter <[email protected]>

Tested-by Robert Richter <[email protected]>

Signed-off-by Robin Murphy <[email protected]>

---

v3: The patch that actually landed in ACPICA was slightly tweaked for
self-consistency, so s/CAVIUM_SMMUV2/CAVIUM_THUNDERX/ to match.

 drivers/iommu/arm-smmu.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

drivers/iommu/arm-smmu.c +16 -0

index 7ec30b08b3bd..7ecd1a0b8419 100644
@@ -312,6 +312,14 @@ enum arm_smmu_implementation {
 	CAVIUM_SMMUV2,
 };
 
+/* Until ACPICA headers cover IORT rev. C */
+#ifndef ACPI_IORT_SMMU_CORELINK_MMU401
+#define ACPI_IORT_SMMU_CORELINK_MMU401	0x4
+#endif
+#ifndef ACPI_IORT_SMMU_CAVIUM_THUNDERX
+#define ACPI_IORT_SMMU_CAVIUM_THUNDERX	0x5
+#endif
+
 struct arm_smmu_s2cr {
 	struct iommu_group		*group;
 	int				count;

@@ -2073,6 +2081,10 @@ static int acpi_smmu_get_data(u32 model, struct arm_smmu_device *smmu)
 		smmu->version = ARM_SMMU_V1;
 		smmu->model = GENERIC_SMMU;
 		break;
+	case ACPI_IORT_SMMU_CORELINK_MMU401:
+		smmu->version = ARM_SMMU_V1_64K;
+		smmu->model = GENERIC_SMMU;
+		break;
 	case ACPI_IORT_SMMU_V2:
 		smmu->version = ARM_SMMU_V2;
 		smmu->model = GENERIC_SMMU;

@@ -2081,6 +2093,10 @@ static int acpi_smmu_get_data(u32 model, struct arm_smmu_device *smmu)
 		smmu->version = ARM_SMMU_V2;
 		smmu->model = ARM_MMU500;
 		break;
+	case ACPI_IORT_SMMU_CAVIUM_THUNDERX:
+		smmu->version = ARM_SMMU_V2;
+		smmu->model = CAVIUM_SMMUV2;
+		break;
 	default:
 		ret = -ENODEV;
 	}

Signature · 1 line

2.12.2.dirty

Will Deacon

2017-06-21 09:27 UTC #1 lore raw

PATCH v3 1/1 iommu/arm-smmu: Plumb in new ACPI identifiers

Quoted 13 lines · Robin Murphy

Revision C of IORT now allows us to identify ARM MMU-401 and the Cavium ThunderX implementation. Wire them up so that we can probe these models once firmware starts using the new codes in place of generic ones, and so that the appropriate features and quirks get enabled when we do.
For the sake of backports and mitigating sychronisation problems with the ACPICA headers, we'll carry a backup copy of the new definitions locally for the short term to make life simpler.
CC [email protected] # 4.10
Acked-by Robert Richter <[email protected]>
Tested-by Robert Richter <[email protected]>
Signed-off-by Robin Murphy <[email protected]>

Quoted 7 lines

---
v3: The patch that actually landed in ACPICA was slightly tweaked for
self-consistency, so s/CAVIUM_SMMUV2/CAVIUM_THUNDERX/ to match.
 drivers/iommu/arm-smmu.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

I've picked this one up.

Will