Commit 3f6eeada authored by Vasant Hegde's avatar Vasant Hegde Committed by Joerg Roedel
Browse files

iommu/amd: Do not try copy old DTE resume path 



In suspend/resume path, no need to copy old DTE (early_enable_iommus()).
Just need to reload IOMMU hardware.

This is the side effect of commit 3ac3e5ee ("iommu/amd: Copy old
trans table from old kernel") which changed early_enable_iommus() but
missed to fix enable_iommus().

Resume path continue to work as 'amd_iommu_pre_enabled' is set to false
and copy_device_table() will fail. It will just re-loaded IOMMU. Hence I
think we don't need to backport this to stable tree.

Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Link: https://lore.kernel.org/r/20241016084958.99727-1-vasant.hegde@amd.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 5ce73c52

drivers/iommu/amd/init.c

+2 −6
Original line number Diff line number Diff line
@@ -2882,11 +2882,6 @@ static void enable_iommus_vapic(void) 
#endif

}



static void enable_iommus(void)

{

	early_enable_iommus();

}



static void disable_iommus(void)

{

	struct amd_iommu *iommu;
@@ -2913,7 +2908,8 @@ static void amd_iommu_resume(void) 
		iommu_apply_resume_quirks(iommu);



	/* re-load the hardware */

	enable_iommus();

	for_each_iommu(iommu)

		early_enable_iommu(iommu);



	amd_iommu_enable_interrupts();

}