From: Sami Mujawar <sami.mujawar@arm.com>
Date: Tue, 1 Mar 2022 17:29:51 +0000 (+0000)
Subject: ArmVirtPkg: Fix depex in kvmtool guest Rtc library
X-Git-Tag: edk2-stable202305~235
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6f415f8af48d0ba3e5d4719062a62cbfc3577227;p=ovmf.git

ArmVirtPkg: Fix depex in kvmtool guest Rtc library

The Rtc library for the kvmtool guest firmware configures the
RTC controller address range as runtime memory by calling the
gDS->SetMemorySpaceAttributes().
The SetMemorySpaceAttributes() function has a dependency on
the CPU Arch Protocol. If the CPU Arch Protocol is not
installed the call to set the memory attributes fails with
error code EFI_NOT_AVAILABLE_YET.

Therefore, set the library dependency on the CPU Arch protocol.

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---

diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
index f0a7c19ca5..c10a6737a0 100644
--- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
+++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  FDT client library for motorola,mc146818 RTC driver
 #
-#  Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+#  Copyright (c) 2020 - 2023, ARM Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -40,4 +40,4 @@
   gPcAtChipsetPkgTokenSpaceGuid.PcdRtcTargetRegister64
 
 [Depex]
-  gFdtClientProtocolGuid
+  gFdtClientProtocolGuid AND gEfiCpuArchProtocolGuid