From: Jan Kiszka <[email protected]> Setting type to JAILHOUSE_IOMMU_ARM_MMU500 already implies that the entry is valid.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm64/smmu.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/hypervisor/arch/arm64/smmu.c b/hypervisor/arch/arm64/smmu.c index 2564bbd2..b3facb8b 100644 --- a/hypervisor/arch/arm64/smmu.c +++ b/hypervisor/arch/arm64/smmu.c @@ -937,32 +937,29 @@ static int arm_smmu_init(void) if (iommu->type != JAILHOUSE_IOMMU_ARM_MMU500) continue; - if (iommu->base) { - num++; + num++; - smmu_device[i].features &= ~ARM_SMMU_FEAT_COHERENT_WALK; - smmu_device[i].arm_sid_mask = iommu->arm_mmu500.sid_mask; + smmu_device[i].features &= ~ARM_SMMU_FEAT_COHERENT_WALK; + smmu_device[i].arm_sid_mask = iommu->arm_mmu500.sid_mask; - smmu_device[i].base = paging_map_device(iommu->base, - iommu->size); - if (!smmu_device[i].base) - return -ENOMEM; + smmu_device[i].base = paging_map_device(iommu->base, + iommu->size); + if (!smmu_device[i].base) + return -ENOMEM; - printk("ARM MMU500 at 0x%llx with:\n", iommu->base); + printk("ARM MMU500 at 0x%llx with:\n", iommu->base); - smmu_device[i].cb_base = smmu_device[i].base + - iommu->size / 2; + smmu_device[i].cb_base = smmu_device[i].base + iommu->size / 2; - err = arm_smmu_device_cfg_probe(&smmu_device[i]); - if (err) - return err; + err = arm_smmu_device_cfg_probe(&smmu_device[i]); + if (err) + return err; - err = arm_smmu_device_reset(&smmu_device[i]); - if (err) - return err; + err = arm_smmu_device_reset(&smmu_device[i]); + if (err) + return err; - arm_smmu_test_smr_masks(&smmu_device[i]); - } + arm_smmu_test_smr_masks(&smmu_device[i]); } if (!num) -- 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/1d94ae4dee332319caf23cc1f694a3059d8785eb.1602664150.git.jan.kiszka%40siemens.com.
