Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35153078 authored by Liam Mark's avatar Liam Mark
Browse files

Revert "iommu/arm-smmu-v3: Implement shutdown method" 



This reverts commit 7aa8619a ("iommu/arm-smmu-v3: Implement shutdown
method").

Disabling the SMMU during shutdown is currently causing issues because
there are SMMU clients who don't currently support shutdown and there is
currently no guarantee that shutdown will be called on SMMU clients before
shutdown is called on the SMMU.

We don't need to support kexec so revert SMMU shutdown support until it
can be cleanly handled.

Change-Id: Ia042ea29e6432d14d42e3536f82775161a934b9c
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent f0a4ec7d

drivers/iommu/arm-smmu-v3.c

+0 −7
Original line number Diff line number Diff line
@@ -2861,15 +2861,9 @@ static int arm_smmu_device_remove(struct platform_device *pdev) 
	struct arm_smmu_device *smmu = platform_get_drvdata(pdev);



	arm_smmu_device_disable(smmu);



	return 0;

}



static void arm_smmu_device_shutdown(struct platform_device *pdev)

{

	arm_smmu_device_remove(pdev);

}



static const struct of_device_id arm_smmu_of_match[] = {

	{ .compatible = "arm,smmu-v3", },

	{ },
@@ -2883,7 +2877,6 @@ static struct platform_driver arm_smmu_driver = { 
	},

	.probe	= arm_smmu_device_probe,

	.remove	= arm_smmu_device_remove,

	.shutdown = arm_smmu_device_shutdown,

};

module_platform_driver(arm_smmu_driver);

drivers/iommu/arm-smmu.c

+0 −6
Original line number Diff line number Diff line
@@ -4346,11 +4346,6 @@ static int arm_smmu_device_remove(struct platform_device *pdev) 
	return 0;

}



static void arm_smmu_device_shutdown(struct platform_device *pdev)

{

	arm_smmu_device_remove(pdev);

}



static int __maybe_unused arm_smmu_pm_resume(struct device *dev)

{

	struct arm_smmu_device *smmu = dev_get_drvdata(dev);
@@ -4369,7 +4364,6 @@ static struct platform_driver arm_smmu_driver = { 
	},

	.probe	= arm_smmu_device_dt_probe,

	.remove	= arm_smmu_device_remove,

	.shutdown = arm_smmu_device_shutdown,

};



static struct platform_driver qsmmuv500_tbu_driver;