HI Marcin,
On Wed, 10 May 2023 at 17:08, Marcin Juszkiewicz
<marcin.juszkiew...@linaro.org> wrote:
>
> Qemu has versioning for sbsa-ref platform. TF-A reads it from provided
> DeviceTree and provides as SMC.
>
> This change adds reading platform version into EDK2.
>
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiew...@linaro.org>
> ---
> Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 3 +++
> .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 14 ++++++++++++++
> .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf | 5 +++++
> Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 3 +++
> 4 files changed, 25 insertions(+)
>
> diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
> b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
> index c9b912cc1e9e..facca3b3e272 100644
> --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
> +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
> @@ -561,6 +561,9 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisAssetTag|L"AT0000"
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSKU|L"SK0000"
>
> + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMajor|0x0
> + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMinor|0x0
> +
>
> ################################################################################
> #
> # Components Section - list of all EDK II Modules needed by this Platform
> diff --git
> a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
> b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
> index b7270a07abbd..7a22f067b600 100644
> --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
> +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
> @@ -7,12 +7,14 @@
> *
> **/
>
> +#include <Library/ArmSmcLib.h>
> #include <Library/BaseLib.h>
> #include <Library/DebugLib.h>
> #include <Library/NonDiscoverableDeviceRegistrationLib.h>
> #include <Library/PcdLib.h>
> #include <Library/UefiBootServicesTableLib.h>
> #include <Library/UefiDriverEntryPoint.h>
> +#include <IndustryStandard/ArmStdSmc.h>
>
> #include <Protocol/FdtClient.h>
>
> @@ -26,6 +28,9 @@ InitializeSbsaQemuPlatformDxe (
> EFI_STATUS Status;
> UINTN Size;
> VOID* Base;
> + UINTN Major;
> + UINTN Minor;
> + UINTN Result;
>
> DEBUG ((DEBUG_INFO, "%a: InitializeSbsaQemuPlatformDxe called\n",
> __FUNCTION__));
>
> @@ -51,5 +56,14 @@ InitializeSbsaQemuPlatformDxe (
> return Status;
> }
>
> + Result = ArmCallSmc0(SIP_FUNCTION_ID(1), &Major, &Minor, NULL);
> + if (Result != 0xFFFFFF)
> + {
> + PcdSet32S (PcdPlatformVersionMajor, Major);
> + PcdSet32S (PcdPlatformVersionMinor, Minor);
Please don't ignore the return values of PcdSet32S like that - at
least capture the return value and use ASSERT_EFI_ERROR() or log them
using DEBUG() so we'll notice if this breaks.
> + }
> +
> + DEBUG((DEBUG_ERROR, "Platform version: %d.%d\n", Major, Minor));
> +
> return EFI_SUCCESS;
> }
> diff --git
> a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
> b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
> index 21d2135f6d17..1f2c8a9dd6af 100644
> ---
> a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
> +++
> b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
> @@ -20,6 +20,7 @@
> SbsaQemuPlatformDxe.c
>
> [Packages]
> + ArmPkg/ArmPkg.dec
> ArmVirtPkg/ArmVirtPkg.dec
> EmbeddedPkg/EmbeddedPkg.dec
> MdeModulePkg/MdeModulePkg.dec
> @@ -27,6 +28,7 @@
> Silicon/Qemu/SbsaQemu/SbsaQemu.dec
>
> [LibraryClasses]
> + ArmSmcLib
> PcdLib
> DebugLib
> NonDiscoverableDeviceRegistrationLib
> @@ -36,6 +38,9 @@
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize
>
> + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMajor
> + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMinor
> +
> [Depex]
> TRUE
>
> diff --git a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
> b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
> index 8654cc7c858c..fb5903bfda0f 100644
> --- a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
> +++ b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
> @@ -70,3 +70,6 @@
>
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisManufacturer|L""|VOID*|0x0000011B
>
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisAssetTag|L""|VOID*|0x0000011C
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSKU|L""|VOID*|0x0000011D
> +
> +
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMajor|0x0|UINT32|0x0000011E
> +
> gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMinor|0x0|UINT32|0x0000011F
> --
> 2.40.1
>
>
>
> ------------
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#104572): https://edk2.groups.io/g/devel/message/104572
> Mute This Topic: https://groups.io/mt/98807889/1131722
> Group Owner: devel+ow...@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [a...@kernel.org]
> ------------
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104574): https://edk2.groups.io/g/devel/message/104574
Mute This Topic: https://groups.io/mt/98807889/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
