Commit da38e9ec authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Joerg Roedel
Browse files

iommu/ipmmu-vmsa: Add suspend/resume support 



During PSCI system suspend, R-Car Gen3 SoCs are powered down, and all
IPMMU state is lost.  Hence after s2ram, devices wired behind an IPMMU,
and configured to use it, will see their DMA operations hang.

To fix this, restore all IPMMU contexts, and re-enable all active
micro-TLBs during system resume.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 892db541

drivers/iommu/ipmmu-vmsa.c

+46 −1
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
#endif



#define IPMMU_CTX_MAX		8U

#define IPMMU_CTX_INVALID	-1



#define IPMMU_UTLB_MAX		48U



struct ipmmu_features {

	bool use_ns_alias_offset;
@@ -58,6 +61,7 @@ struct ipmmu_vmsa_device { 
	spinlock_t lock;			/* Protects ctx and domains[] */

	DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);

	struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX];

	s8 utlb_ctx[IPMMU_UTLB_MAX];



	struct iommu_group *group;

	struct dma_iommu_mapping *mapping;
@@ -335,6 +339,7 @@ static void ipmmu_utlb_enable(struct ipmmu_vmsa_domain *domain, 
	ipmmu_write(mmu, IMUCTR(utlb),

		    IMUCTR_TTSEL_MMU(domain->context_id) | IMUCTR_FLUSH |

		    IMUCTR_MMUEN);

	mmu->utlb_ctx[utlb] = domain->context_id;

}



/*
@@ -346,6 +351,7 @@ static void ipmmu_utlb_disable(struct ipmmu_vmsa_domain *domain, 
	struct ipmmu_vmsa_device *mmu = domain->mmu;



	ipmmu_write(mmu, IMUCTR(utlb), 0);

	mmu->utlb_ctx[utlb] = IPMMU_CTX_INVALID;

}



static void ipmmu_tlb_flush_all(void *cookie)
@@ -1043,6 +1049,7 @@ static int ipmmu_probe(struct platform_device *pdev) 
	spin_lock_init(&mmu->lock);

	bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);

	mmu->features = of_device_get_match_data(&pdev->dev);

	memset(mmu->utlb_ctx, IPMMU_CTX_INVALID, mmu->features->num_utlbs);

	dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));



	/* Map I/O memory and request IRQ. */
@@ -1158,10 +1165,48 @@ static int ipmmu_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int ipmmu_resume_noirq(struct device *dev)

{

	struct ipmmu_vmsa_device *mmu = dev_get_drvdata(dev);

	unsigned int i;



	/* Reset root MMU and restore contexts */

	if (ipmmu_is_root(mmu)) {

		ipmmu_device_reset(mmu);



		for (i = 0; i < mmu->num_ctx; i++) {

			if (!mmu->domains[i])

				continue;



			ipmmu_domain_setup_context(mmu->domains[i]);

		}

	}



	/* Re-enable active micro-TLBs */

	for (i = 0; i < mmu->features->num_utlbs; i++) {

		if (mmu->utlb_ctx[i] == IPMMU_CTX_INVALID)

			continue;



		ipmmu_utlb_enable(mmu->root->domains[mmu->utlb_ctx[i]], i);

	}



	return 0;

}



static const struct dev_pm_ops ipmmu_pm  = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, ipmmu_resume_noirq)

};

#define DEV_PM_OPS	&ipmmu_pm

#else

#define DEV_PM_OPS	NULL

#endif /* CONFIG_PM_SLEEP */



static struct platform_driver ipmmu_driver = {

	.driver = {

		.name = "ipmmu-vmsa",

		.of_match_table = of_match_ptr(ipmmu_of_ids),

		.pm = DEV_PM_OPS,

	},

	.probe = ipmmu_probe,

	.remove	= ipmmu_remove,

CRA Git | Maintained and supported by SUSTech CRA and CCSE