From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 2826D22620E7B for ; Fri, 6 Apr 2018 07:47:07 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EF9011529; Fri, 6 Apr 2018 07:47:06 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E29613F587; Fri, 6 Apr 2018 07:47:05 -0700 (PDT) From: Supreeth Venkatesh To: edk2-devel@lists.01.org Cc: achin.gupta@arm.com, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, Supreeth Venkatesh Date: Fri, 6 Apr 2018 15:46:45 +0100 Message-Id: <20180406144645.11005-4-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180406144645.11005-1-supreeth.venkatesh@arm.com> References: <20180406144645.11005-1-supreeth.venkatesh@arm.com> Subject: [edk2-platforms PATCH v1 3/3] VExpressPkg: Reorder driver load order for AARCH64 FVP. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2018 14:47:07 -0000 ARM CPU driver inf file recently got updated to have a depedency expression to load after GIC driver. However, there are other Arm drivers like NorFlashDxe, MM Communication drivers etc. which depends on ARM CPU driver for AddMemorySpace() and its related operations to work properly. Hence, NorflashDxe and other drivers encounter runtime asserts due to bizzare order of loading drivers as they load ahead of ARM CPU Driver. Hence to resolve runtime asserts due to bizzare order of loading drivers either depex has to be updated in all the driver inf files that depend on ARM CPU driver or reorder driver load order to load GIC Driver and CPU driver load first. This patch attempts to fix loading order of drivers on AARCH64 FVP. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Supreeth Venkatesh --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index 1be1e0115f..36ffc56a5a 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -219,6 +219,7 @@ # # Architectural Protocols # + ArmPkg/Drivers/ArmGic/ArmGicDxe.inf ArmPkg/Drivers/CpuDxe/CpuDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf !if $(SECURE_BOOT_ENABLE) == TRUE @@ -270,7 +271,6 @@ MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf ArmPkg/Drivers/TimerDxe/TimerDxe.inf !ifdef EDK2_ENABLE_PL111 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf index d30a50884f..1653138d8b 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -79,6 +79,7 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 # # PI DXE Drivers producing Architectural Protocols (EFI Services) # + INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -115,7 +116,6 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf !ifdef EDK2_ENABLE_PL111 -- 2.16.2