Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f896c0d authored by Robin Murphy's avatar Robin Murphy Committed by Isaac J. Manjarres
Browse files

iommu/arm-smmu: Add configuration implementation hook 



Probing the ID registers and setting up the SMMU configuration is an
area where overrides and workarounds may well be needed. Indeed, the
Cavium workaround detection lives there at the moment, so let's break
that out.

Change-Id: I2b828a98981866a1a5adf21555055b8a4c9788d2
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Git-commit: 3995e186
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[isaacm@codeauora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent 7d0946b9

drivers/iommu/arm-smmu-impl.c

+34 −0
Original line number Diff line number Diff line
@@ -47,8 +47,42 @@ const struct arm_smmu_impl calxeda_impl = { 
};





static int cavium_cfg_probe(struct arm_smmu_device *smmu)

{

	static atomic_t context_count = ATOMIC_INIT(0);

	/*

	 * Cavium CN88xx erratum #27704.

	 * Ensure ASID and VMID allocation is unique across all SMMUs in

	 * the system.

	 */

	smmu->cavium_id_base = atomic_fetch_add(smmu->num_context_banks,

						   &context_count);

	dev_notice(smmu->dev, "\tenabling workaround for Cavium erratum 27704\n");



	return 0;

}



const struct arm_smmu_impl cavium_impl = {

	.cfg_probe = cavium_cfg_probe,

};





struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu)

{

	/*

	 * We will inevitably have to combine model-specific implementation

	 * quirks with platform-specific integration quirks, but everything

	 * we currently support happens to work out as straightforward

	 * mutually-exclusive assignments.

	 */

	switch (smmu->model) {

	case CAVIUM_SMMUV2:

		smmu->impl = &cavium_impl;

		break;

	default:

		break;

	}



	if (of_property_read_bool(smmu->dev->of_node,

				  "calxeda,smmu-secure-config-access"))

		smmu->impl = &calxeda_impl;

drivers/iommu/arm-smmu.c

+3 −14
Original line number Diff line number Diff line
@@ -215,8 +215,6 @@ struct arm_smmu_domain { 
	struct msm_iommu_domain		domain;

};



static atomic_t cavium_smmu_context_count = ATOMIC_INIT(0);



static bool using_legacy_binding, using_generic_binding;



struct arm_smmu_option_prop {
@@ -4392,18 +4390,6 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) 
	}

	dev_dbg(smmu->dev, "\t%u context banks (%u stage-2 only)\n",

		   smmu->num_context_banks, smmu->num_s2_context_banks);

	/*

	 * Cavium CN88xx erratum #27704.

	 * Ensure ASID and VMID allocation is unique across all SMMUs in

	 * the system.

	 */

	if (smmu->model == CAVIUM_SMMUV2) {

		smmu->cavium_id_base =

			atomic_add_return(smmu->num_context_banks,

					  &cavium_smmu_context_count);

		smmu->cavium_id_base -= smmu->num_context_banks;

		dev_notice(smmu->dev, "\tenabling workaround for Cavium erratum 27704\n");

	}

	smmu->cbs = devm_kcalloc(smmu->dev, smmu->num_context_banks,

				 sizeof(*smmu->cbs), GFP_KERNEL);

	if (!smmu->cbs)
@@ -4472,6 +4458,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) 
		dev_dbg(smmu->dev, "\tStage-2: %lu-bit IPA -> %lu-bit PA\n",

			smmu->ipa_size, smmu->pa_size);



	if (smmu->impl && smmu->impl->cfg_probe)

		return smmu->impl->cfg_probe(smmu);



	return 0;

}

drivers/iommu/arm-smmu.h

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ struct arm_smmu_impl { 
	u64 (*read_reg64)(struct arm_smmu_device *smmu, int page, int offset);

	void (*write_reg64)(struct arm_smmu_device *smmu, int page, int offset,

			    u64 val);

	int (*cfg_probe)(struct arm_smmu_device *smmu);

};



static inline void __iomem *arm_smmu_page(struct arm_smmu_device *smmu, int n)