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

Commit 937de539 authored by Patrick Daly's avatar Patrick Daly
Browse files

iommu: arm-smmu: Make smr mask discovery work with static cb 



SMR0 may be inuse when the arm smmu driver probes. Therefore attempt
to find another context bank to use instead of trampling on the
existing settings.

Change-Id: I264d987a9801019405b3a9cfb65d546bf89b011e
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent bc8b1cbe

drivers/iommu/arm-smmu.c

+16 −4
Original line number Diff line number Diff line
@@ -3519,6 +3519,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) 
	smmu->streamid_mask = size - 1;

	if (id & ID0_SMS) {

		u32 smr;

		int i;



		smmu->features |= ARM_SMMU_FEAT_STREAM_MATCH;

		size = (id >> ID0_NUMSMRG_SHIFT) & ID0_NUMSMRG_MASK;
@@ -3533,14 +3534,25 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) 
		 * bits are set, so check each one separately. We can reject

		 * masters later if they try to claim IDs outside these masks.

		 */

		for (i = 0; i < size; i++) {

			smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(i));

			if (!(smr & SMR_VALID))

				break;

		}

		if (i == size) {

			dev_err(smmu->dev,

				"Unable to compute streamid_masks\n");

			return -ENODEV;

		}



		smr = smmu->streamid_mask << SMR_ID_SHIFT;

		writel_relaxed(smr, gr0_base + ARM_SMMU_GR0_SMR(0));

		smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(0));

		writel_relaxed(smr, gr0_base + ARM_SMMU_GR0_SMR(i));

		smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(i));

		smmu->streamid_mask = smr >> SMR_ID_SHIFT;



		smr = smmu->streamid_mask << SMR_MASK_SHIFT;

		writel_relaxed(smr, gr0_base + ARM_SMMU_GR0_SMR(0));

		smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(0));

		writel_relaxed(smr, gr0_base + ARM_SMMU_GR0_SMR(i));

		smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(i));

		smmu->smr_mask_mask = smr >> SMR_MASK_SHIFT;



		/* Zero-initialised to mark as invalid */