public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Leif Lindholm" <leif@nuviainc.com>
To: Rebecca Cran <rebecca@nuviainc.com>
Cc: devel@edk2.groups.io, Ard Biesheuvel <ard.biesheuvel@arm.com>,
	nd@arm.com, Sami Mujawar <Sami.Mujawar@arm.com>,
	Liming Gao <gaoliming@byosoft.com.cn>,
	Michael D Kinney <michael.d.kinney@intel.com>,
	Zhiguang Liu <zhiguang.liu@intel.com>
Subject: Re: [PATCH v6 19/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type13
Date: Mon, 25 Jan 2021 19:11:43 +0000	[thread overview]
Message-ID: <20210125191143.GJ1664@vanye> (raw)
In-Reply-To: <20210114163628.31952-20-rebecca@nuviainc.com>

On Thu, Jan 14, 2021 at 09:36:25 -0700, Rebecca Cran wrote:
> This code provides information for the SMBIOS Type 13 table.
> 
> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>

Reviewed-by: Leif Lindholm <leif@nuviainc.com>

> ---
>  ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c     |  33 ++++
>  ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c | 166 ++++++++++++++++++++
>  ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni       |  43 +++++
>  3 files changed, 242 insertions(+)
> 
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c
> new file mode 100644
> index 000000000000..97d7303d1a33
> --- /dev/null
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c
> @@ -0,0 +1,33 @@
> +/** @file
> +  This file provides Smbios Type13 Data
> +
> +  Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
> +
> +  Copyright (c) 2021, NUVIA Inc. All rights reserved.<BR>
> +  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
> +  Copyright (c) 2015, Linaro Limited. All rights reserved.<BR>
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include "SmbiosMisc.h"
> +
> +//
> +// Static (possibly build generated) Bios Vendor data.
> +//
> +
> +SMBIOS_MISC_TABLE_DATA(SMBIOS_TABLE_TYPE13, MiscNumberOfInstallableLanguages) =
> +{
> +  {                                                     // Hdr
> +    EFI_SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION,            // Type,
> +    0,                                                    // Length,
> +    0                                                     // Handle
> +  },
> +  0,                                                    // InstallableLanguages
> +  0,                                                    // Flags
> +  {
> +    0                                                   // Reserved[15]
> +  },
> +  1                                                     // CurrentLanguage
> +};
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> new file mode 100644
> index 000000000000..19b60ed71f8c
> --- /dev/null
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> @@ -0,0 +1,166 @@
> +/** @file
> +  Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
> +
> +  Copyright (c) 2021, NUVIA Inc. All rights reserved.<BR>
> +  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
> +  Copyright (c) 2015, Linaro Limited. All rights reserved.<BR>
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include <Library/BaseLib.h>
> +#include <Library/BaseMemoryLib.h>
> +#include <Library/DebugLib.h>
> +#include <Library/HiiLib.h>
> +#include <Library/MemoryAllocationLib.h>
> +#include <Library/OemMiscLib.h>
> +#include <Library/PrintLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> +
> +#include "SmbiosMisc.h"
> +
> +/**
> +  Get next language from language code list (with separator ';').
> +
> +  @param  LangCode       Input: point to first language in the list. On
> +                         Otput: point to next language in the list, or
> +                                NULL if no more language in the list.
> +  @param  Lang           The first language in the list.
> +
> +**/
> +VOID
> +EFIAPI
> +GetNextLanguage (
> +  IN OUT CHAR8      **LangCode,
> +  OUT CHAR8         *Lang
> +  )
> +{
> +  UINTN  Index;
> +  CHAR8  *StringPtr;
> +
> +  if (LangCode == NULL || *LangCode == NULL || Lang == NULL) {
> +    return;
> +  }
> +
> +  Index     = 0;
> +  StringPtr = *LangCode;
> +  while (StringPtr[Index] != 0 && StringPtr[Index] != ';') {
> +    Index++;
> +  }
> +
> +  (VOID)CopyMem (Lang, StringPtr, Index);
> +  Lang[Index] = 0;
> +
> +  if (StringPtr[Index] == ';') {
> +    Index++;
> +  }
> +  *LangCode = StringPtr + Index;
> +}
> +
> +/**
> +  This function returns the number of supported languages on HiiHandle.
> +
> +  @param   HiiHandle    The HII package list handle.
> +
> +  @retval  The number of supported languages.
> +
> +**/
> +UINT16
> +EFIAPI
> +GetSupportedLanguageNumber (
> +  IN EFI_HII_HANDLE    HiiHandle
> +  )
> +{
> +  CHAR8   *Lang;
> +  CHAR8   *Languages;
> +  CHAR8   *LanguageString;
> +  UINT16  LangNumber;
> +
> +  Languages = HiiGetSupportedLanguages (HiiHandle);
> +  if (Languages == NULL) {
> +    return 0;
> +  }
> +
> +  LangNumber = 0;
> +  Lang = AllocatePool (AsciiStrSize (Languages));
> +  if (Lang != NULL) {
> +    LanguageString = Languages;
> +    while (*LanguageString != 0) {
> +      GetNextLanguage (&LanguageString, Lang);
> +      LangNumber++;
> +    }
> +    FreePool (Lang);
> +  }
> +  FreePool (Languages);
> +  return LangNumber;
> +}
> +
> +
> +/**
> +  This function makes boot time changes to the contents of the
> +  MiscNumberOfInstallableLanguages (Type 13) record.
> +
> +  @param  RecordData                 Pointer to SMBIOS table with default values.
> +  @param  Smbios                     SMBIOS protocol.
> +
> +  @retval EFI_SUCCESS                The SMBIOS table was successfully added.
> +  @retval EFI_INVALID_PARAMETER      Invalid parameter was found.
> +  @retval EFI_OUT_OF_RESOURCES       Failed to allocate required memory.
> +
> +**/
> +SMBIOS_MISC_TABLE_FUNCTION(MiscNumberOfInstallableLanguages)
> +{
> +  UINTN                                     LangStrLen;
> +  CHAR8                                     CurrentLang[SMBIOS_STRING_MAX_LENGTH + 1];
> +  CHAR8                                     *OptionalStrStart;
> +  EFI_STATUS                                Status;
> +  SMBIOS_TABLE_TYPE13                       *SmbiosRecord;
> +  SMBIOS_TABLE_TYPE13                       *InputData;
> +
> +  InputData = NULL;
> +
> +  //
> +  // First check for invalid parameters.
> +  //
> +  if (RecordData == NULL) {
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  InputData = (SMBIOS_TABLE_TYPE13 *)RecordData;
> +
> +  InputData->InstallableLanguages = GetSupportedLanguageNumber (mSmbiosMiscHiiHandle);
> +
> +  //
> +  // Try to check if current langcode matches with the langcodes in installed languages
> +  //
> +  ZeroMem (CurrentLang, SMBIOS_STRING_MAX_LENGTH - 1);
> +  (VOID)AsciiStrCpyS (CurrentLang, SMBIOS_STRING_MAX_LENGTH - 1, "en|US|iso8859-1");
> +  LangStrLen = AsciiStrLen (CurrentLang);
> +
> +  //
> +  // Two zeros following the last string.
> +  //
> +  SmbiosRecord = AllocateZeroPool (sizeof (SMBIOS_TABLE_TYPE13) + LangStrLen + 1 + 1);
> +  if (SmbiosRecord == NULL) {
> +    return EFI_OUT_OF_RESOURCES;
> +  }
> +
> +  (VOID)CopyMem (SmbiosRecord, InputData, sizeof (SMBIOS_TABLE_TYPE13));
> +
> +  SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE13);
> +
> +  OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1);
> +  (VOID)AsciiStrCpyS (OptionalStrStart, SMBIOS_STRING_MAX_LENGTH - 1, CurrentLang);
> +  //
> +  // Now we have got the full smbios record, call smbios protocol to add this record.
> +  //
> +  Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL);
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n",
> +            __FUNCTION__, __LINE__, Status));
> +  }
> +
> +  FreePool (SmbiosRecord);
> +  return Status;
> +}
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni
> new file mode 100644
> index 000000000000..3af7a01653d8
> --- /dev/null
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni
> @@ -0,0 +1,43 @@
> +/** @file
> +  Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
> +
> +  Copyright (c) 2021, NUVIA Inc. All rights reserved.<BR>
> +  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
> +  Copyright (c) 2015, Linaro Limited. All rights reserved.<BR>
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +/=#
> +
> +/=#
> +//
> +// Language String (Long Format)
> +//
> +#string STR_MISC_BIOS_LANGUAGES_ENG_LONG        #language en-US  "en|US|iso8859-1"
> +#string STR_MISC_BIOS_LANGUAGES_FRA_LONG        #language en-US  "fr|CA|iso8859-1"
> +#string STR_MISC_BIOS_LANGUAGES_CHN_LONG        #language en-US  "zh|TW|unicode"
> +#string STR_MISC_BIOS_LANGUAGES_JPN_LONG        #language en-US  "ja|JP|unicode"
> +#string STR_MISC_BIOS_LANGUAGES_ITA_LONG        #language en-US  "it|IT|iso8859-1"
> +#string STR_MISC_BIOS_LANGUAGES_SPA_LONG        #language en-US  "es|ES|iso8859-1"
> +#string STR_MISC_BIOS_LANGUAGES_GER_LONG        #language en-US  "de|DE|iso8859-1"
> +#string STR_MISC_BIOS_LANGUAGES_POR_LONG        #language en-US  "pt|PT|iso8859-1"
> +
> +
> +//
> +// Language String (Abbreviated Format)
> +//
> +#string STR_MISC_BIOS_LANGUAGES_ENG_ABBREVIATE  #language en-US  "enUS"
> +#string STR_MISC_BIOS_LANGUAGES_FRA_ABBREVIATE  #language en-US  "frCA"
> +#string STR_MISC_BIOS_LANGUAGES_CHN_ABBREVIATE  #language en-US  "zhTW"
> +#string STR_MISC_BIOS_LANGUAGES_JPN_ABBREVIATE  #language en-US  "jaJP"
> +#string STR_MISC_BIOS_LANGUAGES_ITA_ABBREVIATE  #language en-US  "itIT"
> +#string STR_MISC_BIOS_LANGUAGES_SPA_ABBREVIATE  #language en-US  "esES"
> +#string STR_MISC_BIOS_LANGUAGES_GER_ABBREVIATE  #language en-US  "deDE"
> +#string STR_MISC_BIOS_LANGUAGES_POR_ABBREVIATE  #language en-US  "ptPT"
> +
> +#string STR_MISC_BIOS_LANGUAGES_SIMPLECH_ABBREVIATE  #language en-US  "zhCN"
> +#string STR_MISC_BIOS_LANGUAGES_SIMPLECH_LONG        #language en-US  "zh|CN|unicode"
> +
> +
> -- 
> 2.26.2
> 

  reply	other threads:[~2021-01-25 19:11 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-14 16:36 [PATCH v6 00/22] ArmPkg,MdePkg: Add Universal/Smbios, and related changes Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 01/22] BaseTools: Fix the build report crash issue Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 02/22] ArmPkg: Add ARM SMC Architecture functions to ArmStdSmc.h Rebecca Cran
2021-01-15 20:55   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-14 16:36 ` [PATCH v6 03/22] MdePkg: Update IndustryStandard/SmBios.h with processor status data Rebecca Cran
2021-01-15  0:46   ` 回复: " gaoliming
2021-01-15 20:54   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-14 16:36 ` [PATCH v6 04/22] ArmPkg: Add register encoding definition for MMFR2 Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 05/22] ArmPkg: Add helper to read the Memory Model Features Register 2 Rebecca Cran
2021-01-26  9:35   ` [edk2-devel] " Philippe Mathieu-Daudé
2021-01-14 16:36 ` [PATCH v6 06/22] ArmPkg: Add helper function to read the Memory Model Feature Register 4 Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 07/22] ArmPkg: Fix the return type of the ReadCCSIDR function Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 08/22] ArmPkg: Update ArmLibPrivate.h with cache register definitions Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 09/22] ArmPkg: Add definition of the maximum cache level in ARMv8-A Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 10/22] ArmPkg: Add helper to read CCIDX status Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 11/22] ArmPkg: Add helper to read the CCSIDR2 register Rebecca Cran
2021-01-18  8:51   ` Sami Mujawar
2021-01-14 16:36 ` [PATCH v6 12/22] ArmPkg: Add Library/OemMiscLib.h Rebecca Cran
2021-01-15 20:56   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-25 17:51   ` Leif Lindholm
2021-01-14 16:36 ` [PATCH v6 13/22] ArmPkg: Add Universal/Smbios/OemMiscLibNull Rebecca Cran
2021-01-15 20:57   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-25 17:51   ` Leif Lindholm
2021-01-14 16:36 ` [PATCH v6 14/22] ArmPkg: Add Universal/Smbios/ProcessorSubClassDxe Rebecca Cran
2021-01-25 19:04   ` Leif Lindholm
2021-01-28  4:53     ` Rebecca Cran
2021-01-28 11:32       ` Leif Lindholm
2021-01-28 11:45         ` [edk2-devel] " Laszlo Ersek
2021-01-14 16:36 ` [PATCH v6 15/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type00 Rebecca Cran
2021-01-15 21:09   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-25 19:08   ` Leif Lindholm
2021-01-14 16:36 ` [PATCH v6 16/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type01 Rebecca Cran
2021-01-15 21:09   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-25 19:09   ` Leif Lindholm
2021-01-14 16:36 ` [PATCH v6 17/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type02 Rebecca Cran
2021-01-25 19:10   ` Leif Lindholm
2021-01-25 19:23   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-14 16:36 ` [PATCH v6 18/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type03 Rebecca Cran
2021-01-25 19:11   ` Leif Lindholm
2021-01-25 19:23   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-14 16:36 ` [PATCH v6 19/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type13 Rebecca Cran
2021-01-25 19:11   ` Leif Lindholm [this message]
2021-01-14 16:36 ` [PATCH v6 20/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type32 Rebecca Cran
2021-01-15 21:10   ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-01-25 19:20     ` Rebecca Cran
2021-01-25 19:23       ` Samer El-Haj-Mahmoud
2021-01-25 19:12   ` Leif Lindholm
2021-01-14 16:36 ` [PATCH v6 21/22] ArmPkg: Add SMBIOS PCDs to ArmPkg.dec Rebecca Cran
2021-01-14 16:36 ` [PATCH v6 22/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe Rebecca Cran
2021-01-25 19:15   ` Leif Lindholm
2021-01-25 19:23   ` [edk2-devel] " Samer El-Haj-Mahmoud
     [not found] ` <165A268B3006F467.32022@groups.io>
2021-01-14 16:40   ` [edk2-devel] [PATCH v6 01/22] BaseTools: Fix the build report crash issue Rebecca Cran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210125191143.GJ1664@vanye \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox