From: Jan Kiszka <[email protected]> Nothing was done with the results.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm64/smmu.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/hypervisor/arch/arm64/smmu.c b/hypervisor/arch/arm64/smmu.c index 5becec19..95d45148 100644 --- a/hypervisor/arch/arm64/smmu.c +++ b/hypervisor/arch/arm64/smmu.c @@ -179,9 +179,7 @@ struct arm_smmu_device { u32 num_s2_context_banks; struct arm_smmu_cb *cbs; u32 num_mapping_groups; - u16 streamid_mask; u16 arm_sid_mask; - u16 smr_mask_mask; struct arm_smmu_smr *smrs; struct arm_smmu_cfg *cfgs; unsigned long ipa_size; @@ -406,7 +404,6 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) return trace_error(-EIO); size = 1 << ((id >> ID0_NUMSIDB_SHIFT) & ID0_NUMSIDB_MASK); - smmu->streamid_mask = size - 1; if (id & ID0_SMS) { size = (id >> ID0_NUMSMRG_SHIFT) & ID0_NUMSMRG_MASK; @@ -471,30 +468,6 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) return 0; } -static void arm_smmu_test_smr_masks(struct arm_smmu_device *smmu) -{ - void *gr0_base = ARM_SMMU_GR0(smmu); - u32 smr; - - if (!smmu->smrs) - return; - - /* - * SMR.ID bits may not be preserved if the corresponding MASK - * bits are set, so check each one separately. We can reject - * masters later if they try to claim IDs outside these masks. - */ - smr = smmu->streamid_mask << SMR_ID_SHIFT; - mmio_write32(gr0_base + ARM_SMMU_GR0_SMR(0), smr); - smr = mmio_read32(gr0_base + ARM_SMMU_GR0_SMR(0)); - smmu->streamid_mask = smr >> SMR_ID_SHIFT; - - smr = smmu->streamid_mask << SMR_MASK_SHIFT; - mmio_write32(gr0_base + ARM_SMMU_GR0_SMR(0), smr); - smr = mmio_read32(gr0_base + ARM_SMMU_GR0_SMR(0)); - smmu->smr_mask_mask = smr >> SMR_MASK_SHIFT; -} - static int arm_smmu_find_sme(u16 id, struct arm_smmu_device *smmu) { struct arm_smmu_smr *smrs = smmu->smrs; @@ -677,8 +650,6 @@ static int arm_smmu_init(void) if (err) goto error; - arm_smmu_test_smr_masks(smmu); - num_smmu_devices++; } -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/cdcd368a564360e1df98a78b4a8a7306c7bf3b28.1601838005.git.jan.kiszka%40siemens.com.
