Unverified Commit 79087568 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3435 iommu/arm-smmu-v3: Add suspend and resume support 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuan Can <yuancan@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UHL4WQEM6MSVHIGMZCQC4NNFASRZ7YCX/ 
 
https://gitee.com/openeuler/kernel/issues/I8OX0Z 
 
Link:https://gitee.com/openeuler/kernel/pulls/3435

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 6a2cf930 fce2deba

drivers/iommu/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -412,6 +412,13 @@ config ARM_SMMU_V3_SVA 
	  Say Y here if your system supports SVA extensions such as PCIe PASID

	  and PRI.



config ARM_SMMU_V3_PM

	bool "Add arm_smmu_v3  suspend and resume support"

	depends on ARM_SMMU_V3 && PM_SLEEP

	default n

	help

	  Add support for suspend and resume support for arm smmu v3.



config S390_IOMMU

	def_bool y if S390 && PCI

	depends on S390 && PCI

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+87 −10
Original line number Diff line number Diff line
@@ -3154,6 +3154,13 @@ static void arm_smmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg) 
	doorbell = (((u64)msg->address_hi) << 32) | msg->address_lo;

	doorbell &= MSI_CFG0_ADDR_MASK;



#ifdef CONFIG_ARM_SMMU_V3_PM

	/* Saves the msg (base addr of msi irq) and restores it during resume */

	desc->msg.address_lo = msg->address_lo;

	desc->msg.address_hi = msg->address_hi;

	desc->msg.data = msg->data;

#endif



	writeq_relaxed(doorbell, smmu->base + cfg[0]);

	writel_relaxed(msg->data, smmu->base + cfg[1]);

	writel_relaxed(ARM_SMMU_MEMATTR_DEVICE_nGnRE, smmu->base + cfg[2]);
@@ -3196,11 +3203,51 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu) 
	devm_add_action(dev, arm_smmu_free_msis, dev);

}



static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu)

#ifdef CONFIG_ARM_SMMU_V3_PM

static void arm_smmu_resume_msis(struct arm_smmu_device *smmu)

{

	struct msi_desc *desc;

	struct device *dev = smmu->dev;



	msi_for_each_desc(desc, dev, MSI_DESC_ALL) {

		switch (desc->msi_index) {

		case EVTQ_MSI_INDEX:

		case GERROR_MSI_INDEX:

		case PRIQ_MSI_INDEX: {

			phys_addr_t *cfg = arm_smmu_msi_cfg[desc->msi_index];

			struct msi_msg *msg = &desc->msg;

			phys_addr_t doorbell = (((u64)msg->address_hi) << 32) | msg->address_lo;



			doorbell &= MSI_CFG0_ADDR_MASK;

			writeq_relaxed(doorbell, smmu->base + cfg[0]);

			writel_relaxed(msg->data, smmu->base + cfg[1]);

			writel_relaxed(ARM_SMMU_MEMATTR_DEVICE_nGnRE,

					smmu->base + cfg[2]);

			break;

		}

		default:

			continue;



		}

	}

}

#else

static void arm_smmu_resume_msis(struct arm_smmu_device *smmu)

{

}

#endif



static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu, bool resume)

{

	int irq, ret;



	if (!resume)

		arm_smmu_setup_msis(smmu);

	else {

		/* The irq doesn't need to be re-requested during resume */

		arm_smmu_resume_msis(smmu);

		return;

	}



	/* Request interrupt lines */

	irq = smmu->evtq.q.irq;
@@ -3242,7 +3289,7 @@ static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu) 
	}

}



static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)

static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu, bool resume)

{

	int ret, irq;

	u32 irqen_flags = IRQ_CTRL_EVTQ_IRQEN | IRQ_CTRL_GERROR_IRQEN;
@@ -3269,7 +3316,7 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu) 
		if (ret < 0)

			dev_warn(smmu->dev, "failed to enable combined irq\n");

	} else

		arm_smmu_setup_unique_irqs(smmu);

		arm_smmu_setup_unique_irqs(smmu, resume);



	if (smmu->features & ARM_SMMU_FEAT_PRI)

		irqen_flags |= IRQ_CTRL_PRIQ_IRQEN;
@@ -3294,7 +3341,7 @@ static int arm_smmu_device_disable(struct arm_smmu_device *smmu) 
	return ret;

}



static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass)

static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool resume)

{

	int ret;

	u32 reg, enables;
@@ -3402,7 +3449,7 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass) 
		}

	}



	ret = arm_smmu_setup_irqs(smmu);

	ret = arm_smmu_setup_irqs(smmu, resume);

	if (ret) {

		dev_err(smmu->dev, "failed to setup irqs\n");

		return ret;
@@ -3412,7 +3459,7 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass) 
		enables &= ~(CR0_EVTQEN | CR0_PRIQEN);



	/* Enable the SMMU interface, or ensure bypass */

	if (!bypass || disable_bypass) {

	if (!smmu->bypass || disable_bypass) {

		enables |= CR0_SMMUEN;

	} else {

		ret = arm_smmu_update_gbpa(smmu, 0, GBPA_ABORT);
@@ -3767,6 +3814,26 @@ static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, 
	return devm_ioremap_resource(dev, &res);

}



#ifdef CONFIG_ARM_SMMU_V3_PM

static int arm_smmu_suspend(struct device *dev)

{

	/*

	 * The smmu is powered off and related registers are automatically

	 * cleared when suspend. No need to do anything.

	 */

	return 0;

}



static int arm_smmu_resume(struct device *dev)

{

	struct arm_smmu_device *smmu = dev_get_drvdata(dev);



	arm_smmu_device_reset(smmu, true);



	return 0;

}

#endif



static void arm_smmu_rmr_install_bypass_ste(struct arm_smmu_device *smmu)

{

	struct list_head rmr_list;
@@ -3804,7 +3871,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev) 
	resource_size_t ioaddr;

	struct arm_smmu_device *smmu;

	struct device *dev = &pdev->dev;

	bool bypass;



	smmu = devm_kzalloc(dev, sizeof(*smmu), GFP_KERNEL);

	if (!smmu)
@@ -3820,7 +3886,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) 
	}



	/* Set bypass mode according to firmware probing result */

	bypass = !!ret;

	smmu->bypass = !!ret;



	/* Base address */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -3884,7 +3950,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) 
	arm_smmu_rmr_install_bypass_ste(smmu);



	/* Reset the device */

	ret = arm_smmu_device_reset(smmu, bypass);

	ret = arm_smmu_device_reset(smmu, false);

	if (ret)

		return ret;
@@ -3928,6 +3994,16 @@ static const struct of_device_id arm_smmu_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, arm_smmu_of_match);



#ifdef CONFIG_ARM_SMMU_V3_PM

static const struct dev_pm_ops arm_smmu_pm_ops = {

	.suspend = arm_smmu_suspend,

	.resume = arm_smmu_resume,

};

#define ARM_SMMU_PM_OPS		(&arm_smmu_pm_ops)

#else

#define ARM_SMMU_PM_OPS		NULL

#endif



static void arm_smmu_driver_unregister(struct platform_driver *drv)

{

	arm_smmu_sva_notifier_synchronize();
@@ -3939,6 +4015,7 @@ static struct platform_driver arm_smmu_driver = { 
		.name			= "arm-smmu-v3",

		.of_match_table		= arm_smmu_of_match,

		.suppress_bind_attrs	= true,

		.pm			= ARM_SMMU_PM_OPS,

	},

	.probe	= arm_smmu_device_probe,

	.remove_new = arm_smmu_device_remove,

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h

+2 −0
Original line number Diff line number Diff line
@@ -682,6 +682,8 @@ struct arm_smmu_device { 


	struct rb_root			streams;

	struct mutex			streams_mutex;



	bool				bypass;

};



struct arm_smmu_stream {