|
@@ -2440,11 +2440,11 @@ static int __init state_next(void)
|
|
break;
|
|
break;
|
|
case IOMMU_ACPI_FINISHED:
|
|
case IOMMU_ACPI_FINISHED:
|
|
early_enable_iommus();
|
|
early_enable_iommus();
|
|
- register_syscore_ops(&amd_iommu_syscore_ops);
|
|
|
|
x86_platform.iommu_shutdown = disable_iommus;
|
|
x86_platform.iommu_shutdown = disable_iommus;
|
|
init_state = IOMMU_ENABLED;
|
|
init_state = IOMMU_ENABLED;
|
|
break;
|
|
break;
|
|
case IOMMU_ENABLED:
|
|
case IOMMU_ENABLED:
|
|
|
|
+ register_syscore_ops(&amd_iommu_syscore_ops);
|
|
ret = amd_iommu_init_pci();
|
|
ret = amd_iommu_init_pci();
|
|
init_state = ret ? IOMMU_INIT_ERROR : IOMMU_PCI_INIT;
|
|
init_state = ret ? IOMMU_INIT_ERROR : IOMMU_PCI_INIT;
|
|
enable_iommus_v2();
|
|
enable_iommus_v2();
|