follow up

Signed-off-by: Oleksandr Tyshchenko <[email protected]>

xen/drivers/passthrough/arm/ipmmu-vmsa-plat.c

@@ -104,6 +104,10 @@ static int __init rcar_sysc_init(void)
 	u32 syscier, syscimr;
 	int i;
 
+	/*
+	 * As this function might be called more then once, just return if we
+	 * have already initialized sysc.
+	 */
 	if (rcar_sysc_base)
 		return 0;
 
@@ -135,8 +139,6 @@ static bool __init rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)
 {
 	unsigned int status;
 
-	rcar_sysc_init();
-
 	status = readl(rcar_sysc_base + sysc_ch->chan_offs + PWRSR_OFFS);
 	if (status & BIT(sysc_ch->chan_bit))
 		return true;
@@ -149,8 +151,6 @@ static int __init rcar_sysc_power_on(const struct rcar_sysc_ch *sysc_ch)
 	unsigned int status;
 	int ret = 0, i, j;
 
-	rcar_sysc_init();
-
 	writel(BIT(sysc_ch->isr_bit), rcar_sysc_base + SYSCISCR);
 
 	/* Submit power resume request until it was accepted */
@@ -219,6 +219,8 @@ static int __init ipmmu_power_on(struct dt_device_node *np)
 	if (pd < 0 || pd == RCAR_GEN3_PD_ALWAYS_ON)
 		return 0;
 
+	rcar_sysc_init();
+
 	for (i = 0; i < ARRAY_SIZE(rcar_sysc_chs); i++) {
 		if (rcar_sysc_chs[i].isr_bit != pd)
 			continue;

xen/drivers/passthrough/arm/ipmmu-vmsa.c

@@ -492,6 +492,8 @@ static void set_archdata(struct device *dev, struct ipmmu_vmsa_archdata *p)
 #define IMUASID_ASID0_SHIFT		0
 
 #define IMSCTLR				0x0500
+#define IMSCTLR_DISCACHE	0xE0000000
+
 
 #ifdef CONFIG_RCAR_DDR_BACKUP
 #define HW_REGISTER_BACKUP_SIZE		ARRAY_SIZE(root_pgtable0_reg)
@@ -1155,7 +1157,7 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,
 		 */
 		if (domain->mmus[0]->is_mmu_tlb_disabled)
 			ipmmu_ctx_write1(domain, IMSCTLR,
-					ipmmu_ctx_read(domain, IMSCTLR) | 0xE0000000);
+					ipmmu_ctx_read(domain, IMSCTLR) | IMSCTLR_DISCACHE);
 
 		ipmmu_ctx_write1(domain, IMCTR,
 				ipmmu_ctx_read(domain, IMCTR) | IMCTR_FLUSH);