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

iommu/amd: Enable PPR/GA interrupt after interrupt handler setup 



Current code enables PPR and GA interrupts before setting up the
interrupt handler (in state_next()). Make sure interrupt handler
is in place before enabling these interrupt.

amd_iommu_enable_interrupts() gets called in normal boot, kdump as well
as in suspend/resume path. Hence moving interrupt enablement to this
function works fine.

Reviewed-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20230628054554.6131-4-vasant.hegde@amd.com


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

drivers/iommu/amd/init.c

+7 −4
Original line number Diff line number Diff line
@@ -2943,8 +2943,6 @@ static void enable_iommus_vapic(void) 
static void enable_iommus(void)

{

	early_enable_iommus();

	enable_iommus_vapic();

	enable_iommus_v2();

}



static void disable_iommus(void)
@@ -3208,6 +3206,13 @@ static int amd_iommu_enable_interrupts(void) 
			goto out;

	}



	/*

	 * Interrupt handler is ready to process interrupts. Enable

	 * PPR and GA log interrupt for all IOMMUs.

	 */

	enable_iommus_vapic();

	enable_iommus_v2();



out:

	return ret;

}
@@ -3287,8 +3292,6 @@ static int __init state_next(void) 
		register_syscore_ops(&amd_iommu_syscore_ops);

		ret = amd_iommu_init_pci();

		init_state = ret ? IOMMU_INIT_ERROR : IOMMU_PCI_INIT;

		enable_iommus_vapic();

		enable_iommus_v2();

		break;

	case IOMMU_PCI_INIT:

		ret = amd_iommu_enable_interrupts();