public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Leif Lindholm" <quic_llindhol@quicinc.com>
To: <devel@edk2.groups.io>, <xiongyining1480@phytium.com.cn>
Cc: <ardb+tianocore@kernel.org>, <graeme@xora.org.uk>,
	<marcin.juszkiewicz@linaro.org>, <chenbaozi@phytium.com.cn>
Subject: Re: [edk2-devel] [PATCH v4 1/1] SbsaQemu: AcpiDxe: Create SRAT table at runtime
Date: Thu, 28 Mar 2024 13:31:40 +0000	[thread overview]
Message-ID: <ZgVxPEa3w0S8KsZF@qc-i7.hemma.eciton.net> (raw)
In-Reply-To: <20240328061935.3810595-2-xiongyining1480@phytium.com.cn>

On Thu, Mar 28, 2024 at 06:19:35 +0000, Xiong Yining wrote:
> Add support to create SRAT(System resource affinity table) for
> sbsa platform at runtime.
> 
> Signed-off-by: Xiong Yining <xiongyining1480@phytium.com.cn>
> Reviewed-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

You are not supposed to add Reviewed-by: or Acked-by: tags unless
whoever is commenting on your code indicates so by posting (for me)
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

It is not an indicator of work in progress, it is a flag that the
patch has been Reviewed and is ready to merge.

This also means that if Reviewed-by: is given early in the process,
but then you need to do substantial rework, you should *drop* any
previously given Reviewed-by: tags.

Marcin has never given his Reviewed-by for this patch, so I have
dropped this before pushing. Pushed as 7c26299112f3.

Thanks!

/
    Leif

> ---
>  .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.h | 27 ++++++
>  .../Include/Library/HardwareInfoLib.h         | 10 ++
>  .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 92 +++++++++++++++++++
>  .../SbsaQemuHardwareInfoLib.c                 | 36 ++++++++
>  4 files changed, 165 insertions(+)
> 
> diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.h b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.h
> index 7595df4c8a2d..83a085cd86f4 100644
> --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.h
> +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.h
> @@ -63,4 +63,31 @@ typedef struct {
>  
>  #define GTDT_WDTIMER_FLAGS          (GTDT_WDTIMER_ACTIVE_HIGH | GTDT_WDTIMER_LEVEL_TRIGGERED)
>  
> +#define SBSAQEMU_ACPI_MEMORY_AFFINITY_STRUCTURE_INIT(                             \
> +          ProximityDomain, Base, Length, Flags)                                   \
> +  {                                                                               \
> +    1,                                                  /* Type */                \
> +    sizeof (EFI_ACPI_6_4_MEMORY_AFFINITY_STRUCTURE),    /* Length */              \
> +    ProximityDomain,                                    /* Proximity Domain */    \
> +    0,                                                  /* Reserved */            \
> +    (Base) & 0xffffffff,                                /* Base Address Low */    \
> +    ((Base) >> 32) & 0xffffffff ,                       /* Base Address High */   \
> +    (Length) & 0xffffffff,                              /* Length Low */          \
> +    ((Length) >> 32) & 0xffffffff,                      /* Length High */         \
> +    0,                                                  /* Reserved */            \
> +    Flags,                                              /* Flags */               \
> +    0                                                   /* Reserved */            \
> +  }
> +
> +#define SBSAQEMU_ACPI_GICC_AFFINITY_STRUCTURE_INIT(                               \
> +          ProximityDomain, ACPIProcessorUID, Flags, ClockDomain)                  \
> +  {                                                                               \
> +    3,                                                  /* Type */                \
> +    sizeof (EFI_ACPI_6_4_GICC_AFFINITY_STRUCTURE),      /* Length */              \
> +    ProximityDomain,                                    /* Proximity Domain */    \
> +    ACPIProcessorUID,                                   /* ACPI Processor UID */  \
> +    Flags,                                              /* Flags */               \
> +    ClockDomain                                         /* Clock Domain */        \
> +  }
> +
>  #endif
> diff --git a/Silicon/Qemu/SbsaQemu/Include/Library/HardwareInfoLib.h b/Silicon/Qemu/SbsaQemu/Include/Library/HardwareInfoLib.h
> index 5db0eacc9d2d..46fdad45353c 100644
> --- a/Silicon/Qemu/SbsaQemu/Include/Library/HardwareInfoLib.h
> +++ b/Silicon/Qemu/SbsaQemu/Include/Library/HardwareInfoLib.h
> @@ -73,4 +73,14 @@ GetMemInfo (
>    OUT MemoryInfo  *MemInfo
>    );
>  
> +/**
> +  Get the number of numa node from device tree passed by Qemu.
> +
> +  @retval                the number of numa node.
> +**/
> +UINT64
> +GetNumaNodeCount (
> +  VOID
> +  );
> +
>  #endif /* HARDWARE_INFO_LIB */
> diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c
> index 4ebe2a445344..30239e7dca0d 100644
> --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c
> +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c
> @@ -682,6 +682,91 @@ AddGtdtTable (
>    return Status;
>  }
>  
> +/*
> + * A function that adds the SRAT ACPI table.
> + */
> +EFI_STATUS
> +AddSratTable (
> +  IN EFI_ACPI_TABLE_PROTOCOL   *AcpiTable
> +  )
> +{
> +  EFI_STATUS            Status;
> +  UINT8                 *New;
> +  EFI_PHYSICAL_ADDRESS  PageAddress;
> +  UINTN                 TableHandle;
> +  UINT32                TableSize;
> +  UINT32                Index;
> +  UINT32                NodeId;
> +  UINT32                NumMemNodes;
> +  MemoryInfo            MemInfo;
> +  UINT32                NumCores = GetCpuCount ();
> +
> +  // Initialize SRAT ACPI Header
> +  EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER Header = {
> +     SBSAQEMU_ACPI_HEADER (EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_SIGNATURE,
> +                           EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER,
> +                           EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_REVISION),
> +      1, 0 };
> +
> +  NumMemNodes  = GetMemNodeCount();
> +
> +  // Calculate the new table size based on the number of cores
> +  TableSize = sizeof (EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER) +
> +               (sizeof (EFI_ACPI_6_4_MEMORY_AFFINITY_STRUCTURE) * NumMemNodes ) +
> +               (sizeof (EFI_ACPI_6_4_GICC_AFFINITY_STRUCTURE) * NumCores);
> +
> +  Status = gBS->AllocatePages (
> +                AllocateAnyPages,
> +                EfiACPIReclaimMemory,
> +                EFI_SIZE_TO_PAGES (TableSize),
> +                &PageAddress
> +                );
> +
> +  if (EFI_ERROR(Status)) {
> +    DEBUG ((DEBUG_ERROR, "Failed to allocate pages for SRAT table\n"));
> +    return EFI_OUT_OF_RESOURCES;
> +  }
> +
> +  New = (UINT8 *)(UINTN) PageAddress;
> +  ZeroMem (New, TableSize);
> +
> +  // Add the ACPI Description table header
> +  CopyMem (New, &Header, sizeof (EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER));
> +  ((EFI_ACPI_DESCRIPTION_HEADER*) New)->Length = TableSize;
> +  New += sizeof (EFI_ACPI_6_4_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER);
> +
> +  // Add memory structures
> +  for (Index = 0; Index < NumMemNodes ; Index++) {
> +    GetMemInfo (Index, &MemInfo);
> +    EFI_ACPI_6_4_MEMORY_AFFINITY_STRUCTURE memory = SBSAQEMU_ACPI_MEMORY_AFFINITY_STRUCTURE_INIT (MemInfo.NodeId, MemInfo.AddressBase, MemInfo.AddressSize, 1);
> +    CopyMem (New, &memory, sizeof (EFI_ACPI_6_4_MEMORY_AFFINITY_STRUCTURE));
> +    New += sizeof (EFI_ACPI_6_4_MEMORY_AFFINITY_STRUCTURE);
> +  }
> +
> +  // Add processor structures for the cores
> +  for (Index = 0; Index < NumCores; Index++) {
> +    NodeId = GetCpuNumaNode(Index);
> +    EFI_ACPI_6_4_GICC_AFFINITY_STRUCTURE gicc = SBSAQEMU_ACPI_GICC_AFFINITY_STRUCTURE_INIT(NodeId, Index, 1, 0);
> +    CopyMem (New, &gicc, sizeof (EFI_ACPI_6_4_GICC_AFFINITY_STRUCTURE));
> +    New += sizeof (EFI_ACPI_6_4_GICC_AFFINITY_STRUCTURE);
> +  }
> +
> +  // Perform Checksum
> +  AcpiPlatformChecksum ((UINT8*) PageAddress, TableSize);
> +
> +  Status = AcpiTable->InstallAcpiTable (
> +                        AcpiTable,
> +                        (EFI_ACPI_COMMON_HEADER *)PageAddress,
> +                        TableSize,
> +                        &TableHandle
> +                        );
> +  if (EFI_ERROR(Status)) {
> +    DEBUG ((DEBUG_ERROR, "Failed to install SRAT table\n"));
> +  }
> +
> +  return Status;
> +}
> +
>  /*
>   * A function to disable XHCI node on Platform Version lower than 0.3
>   */
> @@ -793,6 +878,13 @@ InitializeSbsaQemuAcpiDxe (
>      DEBUG ((DEBUG_ERROR, "Failed to add PPTT table\n"));
>    }
>  
> +  if (GetNumaNodeCount() > 1){
> +    Status = AddSratTable (AcpiTable);
> +    if (EFI_ERROR (Status)) {
> +      DEBUG ((DEBUG_ERROR, "Failed to add SRAT table\n"));
> +    }
> +  }
> +
>    Status = AddGtdtTable (AcpiTable);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "Failed to add GTDT table\n"));
> diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuHardwareInfoLib/SbsaQemuHardwareInfoLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuHardwareInfoLib/SbsaQemuHardwareInfoLib.c
> index b178cf6c6c43..79d0c79918d0 100644
> --- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuHardwareInfoLib/SbsaQemuHardwareInfoLib.c
> +++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuHardwareInfoLib/SbsaQemuHardwareInfoLib.c
> @@ -143,3 +143,39 @@ GetMemInfo (
>        MemInfo->AddressBase + MemInfo->AddressSize -1 ));
>  
>  }
> +
> +UINT64
> +GetNumaNodeCount (
> +  VOID
> +)
> +{
> +  UINT64                Arg;
> +  UINT32                Index;
> +  UINT32                NumberNumaNodes;
> +  UINT32                NumberMemNodes;
> +  UINT32                NumCores = GetCpuCount();
> +  MemoryInfo            MemInfo;
> +
> +  NumberNumaNodes = 0;
> +  NumberMemNodes = GetMemNodeCount();
> +
> +  if (NumCores > 0){
> +    for (Index = 0; Index < NumCores; Index ++){
> +      Arg = GetCpuNumaNode(Index);
> +      if (NumberNumaNodes == 0 || NumberNumaNodes < (Arg + 1)){
> +        NumberNumaNodes = Arg + 1;
> +      }
> +    }
> +  }
> +
> +  if (NumberMemNodes > 0){
> +    for (Index = 0; Index < NumberMemNodes; Index ++){
> +      GetMemInfo(Index, &MemInfo);
> +      if (NumberNumaNodes == 0 || NumberNumaNodes < (MemInfo.NodeId + 1)){
> +        NumberNumaNodes = MemInfo.NodeId + 1;
> +      }
> +    }
> +  }
> +
> +  return NumberNumaNodes;
> +}
> -- 
> 2.34.1
> 
> 
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117212): https://edk2.groups.io/g/devel/message/117212
Mute This Topic: https://groups.io/mt/105192387/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



      parent reply	other threads:[~2024-03-28 13:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-28  6:19 [edk2-devel] [PATCH v4 0/1] Add support for generating SRAT tables Xiong Yining
2024-03-28  6:19 ` [edk2-devel] [PATCH v4 1/1] SbsaQemu: AcpiDxe: Create SRAT table at runtime Xiong Yining
2024-03-28 13:24   ` Marcin Juszkiewicz
2024-03-28 13:31   ` Leif Lindholm [this message]

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=ZgVxPEa3w0S8KsZF@qc-i7.hemma.eciton.net \
    --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