* [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
@ 2022-07-01 16:32 Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 1/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value Jeff Brasen
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Jeff Brasen @ 2022-07-01 16:32 UTC (permalink / raw)
To: devel; +Cc: Pierre.Gondois, Sami.Mujawar, Alexei.Fedorov, Jeff Brasen
Add fixes/features to dynamic PCIe support
- Correct issue with translation in generated ACPI tables.
- Allow for more than 16 controllers to be generated.
- Allow optional use of segment number as UID for cases where ACPI path is needed in other places.
- Add support for override protocol that allows platform specific modification of node prior to creation.
Update:
v2 - Add IsPosDecode logic to translation patch
Jeff Brasen (4):
DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value
DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as
UID
DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF
DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override
protocol
DynamicTablesPkg/DynamicTablesPkg.dec | 6 ++
.../Protocol/SsdtPcieOverrideProtocol.h | 63 ++++++++++++++++
.../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 73 ++++++++++++++++---
.../AcpiSsdtPcieLibArm/SsdtPcieGenerator.h | 2 +-
.../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 7 ++
5 files changed, 139 insertions(+), 12 deletions(-)
create mode 100644 DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
--
2.25.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value
2022-07-01 16:32 [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
@ 2022-07-01 16:32 ` Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 2/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as UID Jeff Brasen
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Jeff Brasen @ 2022-07-01 16:32 UTC (permalink / raw)
To: devel; +Cc: Pierre.Gondois, Sami.Mujawar, Alexei.Fedorov, Jeff Brasen
The translation value in ACPI should be the difference between the CPU and PCIe address.
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
.../Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
index a34018151f..d4c5f47b07 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
@@ -540,6 +540,7 @@ GeneratePciCrs (
UINT32 RefCount;
CM_ARM_PCI_ADDRESS_MAP_INFO *AddrMapInfo;
AML_OBJECT_NODE_HANDLE CrsNode;
+ BOOLEAN IsPosDecode;
ASSERT (Generator != NULL);
ASSERT (CfgMgrProtocol != NULL);
@@ -609,6 +610,11 @@ GeneratePciCrs (
}
Translation = (AddrMapInfo->CpuAddress != AddrMapInfo->PciAddress);
+ if (AddrMapInfo->CpuAddress >= AddrMapInfo->PciAddress) {
+ IsPosDecode = TRUE;
+ } else {
+ IsPosDecode = FALSE;
+ }
switch (AddrMapInfo->SpaceCode) {
case PCI_SS_IO:
@@ -616,12 +622,12 @@ GeneratePciCrs (
FALSE,
TRUE,
TRUE,
- TRUE,
+ IsPosDecode,
3,
0,
AddrMapInfo->PciAddress,
AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,
- Translation ? AddrMapInfo->CpuAddress : 0,
+ Translation ? AddrMapInfo->CpuAddress - AddrMapInfo->PciAddress : 0,
AddrMapInfo->AddressSize,
0,
NULL,
@@ -635,7 +641,7 @@ GeneratePciCrs (
case PCI_SS_M32:
Status = AmlCodeGenRdDWordMemory (
FALSE,
- TRUE,
+ IsPosDecode,
TRUE,
TRUE,
TRUE,
@@ -643,7 +649,7 @@ GeneratePciCrs (
0,
AddrMapInfo->PciAddress,
AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,
- Translation ? AddrMapInfo->CpuAddress : 0,
+ Translation ? AddrMapInfo->CpuAddress - AddrMapInfo->PciAddress : 0,
AddrMapInfo->AddressSize,
0,
NULL,
@@ -657,7 +663,7 @@ GeneratePciCrs (
case PCI_SS_M64:
Status = AmlCodeGenRdQWordMemory (
FALSE,
- TRUE,
+ IsPosDecode,
TRUE,
TRUE,
TRUE,
@@ -665,7 +671,7 @@ GeneratePciCrs (
0,
AddrMapInfo->PciAddress,
AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,
- Translation ? AddrMapInfo->CpuAddress : 0,
+ Translation ? AddrMapInfo->CpuAddress - AddrMapInfo->PciAddress : 0,
AddrMapInfo->AddressSize,
0,
NULL,
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as UID
2022-07-01 16:32 [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 1/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value Jeff Brasen
@ 2022-07-01 16:32 ` Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 3/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF Jeff Brasen
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Jeff Brasen @ 2022-07-01 16:32 UTC (permalink / raw)
To: devel; +Cc: Pierre.Gondois, Sami.Mujawar, Alexei.Fedorov, Jeff Brasen
Add support for selecting to use index or segment number as UID and name.
This allows the path of the nodes to be well known.
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
DynamicTablesPkg/DynamicTablesPkg.dec | 3 +++
.../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 19 ++++++++++++++++++-
.../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 3 +++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/DynamicTablesPkg/DynamicTablesPkg.dec b/DynamicTablesPkg/DynamicTablesPkg.dec
index 9b74c5a671..a890a048be 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dec
+++ b/DynamicTablesPkg/DynamicTablesPkg.dec
@@ -57,5 +57,8 @@
# Non BSA Compliant 16550 Serial HID
gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdNonBsaCompliant16550SerialHid|""|VOID*|0x40000008
+ # Use PCI segment numbers as UID
+ gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdPciUseSegmentAsUid|FALSE|BOOLEAN|0x40000009
+
[Guids]
gEdkiiDynamicTablesPkgTokenSpaceGuid = { 0xab226e66, 0x31d8, 0x4613, { 0x87, 0x9d, 0xd2, 0xfa, 0xb6, 0x10, 0x26, 0x3c } }
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
index d4c5f47b07..80776ceb79 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
@@ -1002,6 +1002,7 @@ BuildSsdtPciTableEx (
UINTN Index;
EFI_ACPI_DESCRIPTION_HEADER **TableList;
ACPI_PCI_GENERATOR *Generator;
+ UINT32 Uid;
ASSERT (This != NULL);
ASSERT (AcpiTableInfo != NULL);
@@ -1057,13 +1058,29 @@ BuildSsdtPciTableEx (
*Table = TableList;
for (Index = 0; Index < PciCount; Index++) {
+ if (PcdGetBool (PcdPciUseSegmentAsUid)) {
+ Uid = PciInfo[Index].PciSegmentGroupNumber;
+ if (Uid > MAX_PCI_ROOT_COMPLEXES_SUPPORTED) {
+ DEBUG ((
+ DEBUG_ERROR,
+ "ERROR: SSDT-PCI: Pci root complexes segment number: %d."
+ " Greater than maximum number of Pci root complexes supported = %d.\n",
+ Uid,
+ MAX_PCI_ROOT_COMPLEXES_SUPPORTED
+ ));
+ return EFI_INVALID_PARAMETER;
+ }
+ } else {
+ Uid = Index;
+ }
+
// Build a SSDT table describing the Pci devices.
Status = BuildSsdtPciTable (
Generator,
CfgMgrProtocol,
AcpiTableInfo,
&PciInfo[Index],
- Index,
+ Uid,
&TableList[Index]
);
if (EFI_ERROR (Status)) {
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf
index 283b564801..431e32a777 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf
@@ -30,3 +30,6 @@
AcpiHelperLib
AmlLib
BaseLib
+
+[Pcd]
+ gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdPciUseSegmentAsUid
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF
2022-07-01 16:32 [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 1/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 2/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as UID Jeff Brasen
@ 2022-07-01 16:32 ` Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 4/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override protocol Jeff Brasen
2022-07-07 16:59 ` [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
4 siblings, 0 replies; 8+ messages in thread
From: Jeff Brasen @ 2022-07-01 16:32 UTC (permalink / raw)
To: devel; +Cc: Pierre.Gondois, Sami.Mujawar, Alexei.Fedorov, Jeff Brasen
Add support for PCIe devices with UID > 0xF.
This is done by using the next value in the name so
PCI5, PC26, etc
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
.../Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 11 +++++++----
.../Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.h | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
index 80776ceb79..9f785ca5ac 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
@@ -824,7 +824,10 @@ GeneratePciDevice (
// Write the name of the PCI device.
CopyMem (AslName, "PCIx", AML_NAME_SEG_SIZE + 1);
- AslName[AML_NAME_SEG_SIZE - 1] = AsciiFromHex (Uid);
+ AslName[AML_NAME_SEG_SIZE - 1] = AsciiFromHex (Uid & 0xF);
+ if (Uid > 0xF) {
+ AslName[AML_NAME_SEG_SIZE - 2] = AsciiFromHex ((Uid >> 4) & 0xF);
+ }
// ASL: Device (PCIx) {}
Status = AmlCodeGenDevice (AslName, ScopeNode, &PciNode);
@@ -1060,13 +1063,13 @@ BuildSsdtPciTableEx (
for (Index = 0; Index < PciCount; Index++) {
if (PcdGetBool (PcdPciUseSegmentAsUid)) {
Uid = PciInfo[Index].PciSegmentGroupNumber;
- if (Uid > MAX_PCI_ROOT_COMPLEXES_SUPPORTED) {
+ if (Uid >= MAX_PCI_ROOT_COMPLEXES_SUPPORTED) {
DEBUG ((
DEBUG_ERROR,
"ERROR: SSDT-PCI: Pci root complexes segment number: %d."
- " Greater than maximum number of Pci root complexes supported = %d.\n",
+ " Greater than maximum supported value = %d.\n",
Uid,
- MAX_PCI_ROOT_COMPLEXES_SUPPORTED
+ MAX_PCI_ROOT_COMPLEXES_SUPPORTED - 1
));
return EFI_INVALID_PARAMETER;
}
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.h
index 59a0d601a3..515a3e1785 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.h
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.h
@@ -31,7 +31,7 @@
Corresponding changes would be needed to support the Name and
UID fields describing the Pci root complexes.
*/
-#define MAX_PCI_ROOT_COMPLEXES_SUPPORTED 16
+#define MAX_PCI_ROOT_COMPLEXES_SUPPORTED 256
// _SB scope of the AML namespace.
#define SB_SCOPE "\\_SB_"
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 4/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override protocol
2022-07-01 16:32 [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
` (2 preceding siblings ...)
2022-07-01 16:32 ` [PATCH v2 3/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF Jeff Brasen
@ 2022-07-01 16:32 ` Jeff Brasen
2022-07-07 16:59 ` [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
4 siblings, 0 replies; 8+ messages in thread
From: Jeff Brasen @ 2022-07-01 16:32 UTC (permalink / raw)
To: devel; +Cc: Pierre.Gondois, Sami.Mujawar, Alexei.Fedorov, Jeff Brasen
Some platfoms may want to modify the ACPI table created.
Add support for protocol that can provide an alternative implementation.
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
DynamicTablesPkg/DynamicTablesPkg.dec | 3 +
.../Protocol/SsdtPcieOverrideProtocol.h | 63 +++++++++++++++++++
.../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 31 ++++++++-
.../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 4 ++
4 files changed, 98 insertions(+), 3 deletions(-)
create mode 100644 DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
diff --git a/DynamicTablesPkg/DynamicTablesPkg.dec b/DynamicTablesPkg/DynamicTablesPkg.dec
index a890a048be..bb66bdaf14 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dec
+++ b/DynamicTablesPkg/DynamicTablesPkg.dec
@@ -43,6 +43,9 @@
# Dynamic Table Factory Protocol GUID
gEdkiiDynamicTableFactoryProtocolGuid = { 0x91d1e327, 0xfe5a, 0x49b8, { 0xab, 0x65, 0xe, 0xce, 0x2d, 0xdb, 0x45, 0xec } }
+ # Protocol to override PCI SSDT table generation
+ gEdkiiDynamicTableSsdtPcieOverrideProtocolGuid = { 0x962e8b44, 0x23b3, 0x41da, { 0x9f, 0x36, 0xca, 0xde, 0x68, 0x49, 0xfb, 0xf6 } }
+
[PcdsFixedAtBuild]
# Maximum number of Custom ACPI Generators
diff --git a/DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h b/DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
new file mode 100644
index 0000000000..29568a0159
--- /dev/null
+++ b/DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
@@ -0,0 +1,63 @@
+/** @file
+
+ Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
+
+ SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef SSDT_PCIE_OVERRIDE_PROTOCOL_H_
+#define SSDT_PCIE_OVERRIDE_PROTOCOL_H_
+
+#include <ArmNameSpaceObjects.h>
+#include <Library/AmlLib/AmlLib.h>
+
+/** This macro defines the SSDT PCI Override Protocol GUID.
+
+ GUID: {D85A4835-5A82-4894-AC02-706F43D5978E}
+*/
+#define EDKII_SSDT_PCI_OVERRIDE_PROTOCOL_GUID \
+ { 0x962e8b44, 0x23b3, 0x41da, \
+ { 0x9f, 0x36, 0xca, 0xde, 0x68, 0x49, 0xfb, 0xf6 } \
+ };
+
+/**
+ Forward declarations:
+*/
+typedef struct SsdtOverridePciProtocol EDKII_SSDT_PCI_OVERRIDE_PROTOCOL;
+
+/** The UpdateTable function allows the override protocol to update the
+ * PCIe SSDT table prior to being created.
+
+ @param [in] This Pointer to the SSDT PCI Override Protocol.
+ @param [in] PciInfo The PCIe configuration info for this node.
+ @param [in] Uid UID that was selected for this PCIe node.
+ @param [in, out] PciNode Pointer to the PCI node of this ACPI table.
+
+ @retval EFI_SUCCESS Success.
+ @retval EFI_INVALID_PARAMETER A parameter is invalid.
+ @retval EFI_DEVICE_ERROR Failed to update the table.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EDKII_SSDT_PCI_OVERRIDE_PROTOCOL_UPDATE_TABLE)(
+ IN CONST EDKII_SSDT_PCI_OVERRIDE_PROTOCOL *CONST This,
+ IN CONST CM_ARM_PCI_CONFIG_SPACE_INFO *PciInfo,
+ IN UINT32 Uid,
+ IN OUT AML_ROOT_NODE_HANDLE *PciNode
+ );
+
+/** The EDKII_CONFIGURATION_MANAGER_PROTOCOL structure describes the
+ Configuration Manager Protocol interface.
+*/
+typedef struct SsdtOverridePciProtocol {
+ /** The interface used to update the ACPI table for PCI.
+ */
+ EDKII_SSDT_PCI_OVERRIDE_PROTOCOL_UPDATE_TABLE UpdateTable;
+} EDKII_SSDT_PCI_OVERRIDE_PROTOCOL;
+
+/** The SSDT PCI Override Protocol GUID.
+*/
+extern EFI_GUID gEdkiiDynamicTableSsdtPcieOverrideProtocolGuid;
+
+#endif // SSDT_PCIE_OVERRIDE_PROTOCOL_H_
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
index 9f785ca5ac..46e0a98b98 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
@@ -20,6 +20,7 @@
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
#include <Protocol/AcpiTable.h>
// Module specific include files.
@@ -30,6 +31,7 @@
#include <Library/TableHelperLib.h>
#include <Library/AmlLib/AmlLib.h>
#include <Protocol/ConfigurationManagerProtocol.h>
+#include <Protocol/SsdtPcieOverrideProtocol.h>
#include "SsdtPcieGenerator.h"
@@ -804,9 +806,10 @@ GeneratePciDevice (
{
EFI_STATUS Status;
- CHAR8 AslName[AML_NAME_SEG_SIZE + 1];
- AML_OBJECT_NODE_HANDLE ScopeNode;
- AML_OBJECT_NODE_HANDLE PciNode;
+ CHAR8 AslName[AML_NAME_SEG_SIZE + 1];
+ AML_OBJECT_NODE_HANDLE ScopeNode;
+ AML_OBJECT_NODE_HANDLE PciNode;
+ EDKII_SSDT_PCI_OVERRIDE_PROTOCOL *OverrideProtocol;
ASSERT (Generator != NULL);
ASSERT (CfgMgrProtocol != NULL);
@@ -866,6 +869,28 @@ GeneratePciDevice (
// Add the template _OSC method.
Status = AddOscMethod (PciNode);
+ if (EFI_ERROR (Status)) {
+ ASSERT (0);
+ return Status;
+ }
+
+ Status = gBS->LocateProtocol (
+ &gEdkiiDynamicTableSsdtPcieOverrideProtocolGuid,
+ NULL,
+ (VOID **)&OverrideProtocol
+ );
+ if (!EFI_ERROR (Status)) {
+ Status = OverrideProtocol->UpdateTable (
+ OverrideProtocol,
+ PciInfo,
+ Uid,
+ PciNode
+ );
+ } else {
+ // Not an error if override protocol is not found
+ Status = EFI_SUCCESS;
+ }
+
ASSERT_EFI_ERROR (Status);
return Status;
}
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf
index 431e32a777..8e916f15e9 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf
@@ -30,6 +30,10 @@
AcpiHelperLib
AmlLib
BaseLib
+ UefiBootServicesTableLib
[Pcd]
gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdPciUseSegmentAsUid
+
+[Protocols]
+ gEdkiiDynamicTableSsdtPcieOverrideProtocolGuid
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
2022-07-01 16:32 [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
` (3 preceding siblings ...)
2022-07-01 16:32 ` [PATCH v2 4/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override protocol Jeff Brasen
@ 2022-07-07 16:59 ` Jeff Brasen
2022-07-08 7:31 ` PierreGondois
4 siblings, 1 reply; 8+ messages in thread
From: Jeff Brasen @ 2022-07-07 16:59 UTC (permalink / raw)
To: devel@edk2.groups.io
Cc: Pierre.Gondois@arm.com, Sami.Mujawar@arm.com,
Alexei.Fedorov@arm.com
Pierre,
Any thoughts on this v2 version?
-Jeff
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Friday, July 1, 2022 10:33 AM
> To: devel@edk2.groups.io
> Cc: Pierre.Gondois@arm.com; Sami.Mujawar@arm.com;
> Alexei.Fedorov@arm.com; Jeff Brasen <jbrasen@nvidia.com>
> Subject: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
>
> Add fixes/features to dynamic PCIe support
>
> - Correct issue with translation in generated ACPI tables.
> - Allow for more than 16 controllers to be generated.
> - Allow optional use of segment number as UID for cases where ACPI path is
> needed in other places.
> - Add support for override protocol that allows platform specific modification
> of node prior to creation.
>
> Update:
> v2 - Add IsPosDecode logic to translation patch
>
> Jeff Brasen (4):
> DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value
> DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as
> UID
> DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF
> DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override
> protocol
>
> DynamicTablesPkg/DynamicTablesPkg.dec | 6 ++
> .../Protocol/SsdtPcieOverrideProtocol.h | 63 ++++++++++++++++
> .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 73 ++++++++++++++++---
> .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.h | 2 +-
> .../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 7 ++
> 5 files changed, 139 insertions(+), 12 deletions(-) create mode 100644
> DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
>
> --
> 2.25.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
2022-07-07 16:59 ` [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
@ 2022-07-08 7:31 ` PierreGondois
2022-07-08 15:13 ` Jeff Brasen
0 siblings, 1 reply; 8+ messages in thread
From: PierreGondois @ 2022-07-08 7:31 UTC (permalink / raw)
To: Jeff Brasen, devel@edk2.groups.io
Cc: Sami.Mujawar@arm.com, Alexei.Fedorov@arm.com
Hello Jeff,
I had some questions about the V1 at:
https://edk2.groups.io/g/devel/topic/92089320#90932
https://edk2.groups.io/g/devel/topic/92089321#90933
Regards,
Pierre
On 7/7/22 18:59, Jeff Brasen wrote:
> Pierre,
>
> Any thoughts on this v2 version?
>
> -Jeff
>
>
>> -----Original Message-----
>> From: Jeff Brasen <jbrasen@nvidia.com>
>> Sent: Friday, July 1, 2022 10:33 AM
>> To: devel@edk2.groups.io
>> Cc: Pierre.Gondois@arm.com; Sami.Mujawar@arm.com;
>> Alexei.Fedorov@arm.com; Jeff Brasen <jbrasen@nvidia.com>
>> Subject: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
>>
>> Add fixes/features to dynamic PCIe support
>>
>> - Correct issue with translation in generated ACPI tables.
>> - Allow for more than 16 controllers to be generated.
>> - Allow optional use of segment number as UID for cases where ACPI path is
>> needed in other places.
>> - Add support for override protocol that allows platform specific modification
>> of node prior to creation.
>>
>> Update:
>> v2 - Add IsPosDecode logic to translation patch
>>
>> Jeff Brasen (4):
>> DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value
>> DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as
>> UID
>> DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF
>> DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override
>> protocol
>>
>> DynamicTablesPkg/DynamicTablesPkg.dec | 6 ++
>> .../Protocol/SsdtPcieOverrideProtocol.h | 63 ++++++++++++++++
>> .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 73 ++++++++++++++++---
>> .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.h | 2 +-
>> .../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 7 ++
>> 5 files changed, 139 insertions(+), 12 deletions(-) create mode 100644
>> DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
>>
>> --
>> 2.25.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
2022-07-08 7:31 ` PierreGondois
@ 2022-07-08 15:13 ` Jeff Brasen
0 siblings, 0 replies; 8+ messages in thread
From: Jeff Brasen @ 2022-07-08 15:13 UTC (permalink / raw)
To: Pierre Gondois, devel@edk2.groups.io
Cc: Sami.Mujawar@arm.com, Alexei.Fedorov@arm.com
Ok, I never got those responses, will have to check what happened with my email. Will respond to those.
> -----Original Message-----
> From: Pierre Gondois <pierre.gondois@arm.com>
> Sent: Friday, July 8, 2022 1:31 AM
> To: Jeff Brasen <jbrasen@nvidia.com>; devel@edk2.groups.io
> Cc: Sami.Mujawar@arm.com; Alexei.Fedorov@arm.com
> Subject: Re: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
>
> External email: Use caution opening links or attachments
>
>
> Hello Jeff,
> I had some questions about the V1 at:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk
> 2.groups.io%2Fg%2Fdevel%2Ftopic%2F92089320%2390932&data=05%7
> C01%7Cjbrasen%40nvidia.com%7C8a911ded72fd403690f208da60b3e0a9%7C
> 43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637928622942274065%7C
> Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJB
> TiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=p3jCMX%
> 2Fi0wf60FA2DgsGV7b3Vq6qw8jP6Kjp82YOoKg%3D&reserved=0
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk
> 2.groups.io%2Fg%2Fdevel%2Ftopic%2F92089321%2390933&data=05%7
> C01%7Cjbrasen%40nvidia.com%7C8a911ded72fd403690f208da60b3e0a9%7C
> 43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637928622942274065%7C
> Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJB
> TiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=IBjcEWb5
> VY7iXXkwOuP5LZN8c3aFdB25ophGXAVfHjQ%3D&reserved=0
>
> Regards,
> Pierre
>
> On 7/7/22 18:59, Jeff Brasen wrote:
> > Pierre,
> >
> > Any thoughts on this v2 version?
> >
> > -Jeff
> >
> >
> >> -----Original Message-----
> >> From: Jeff Brasen <jbrasen@nvidia.com>
> >> Sent: Friday, July 1, 2022 10:33 AM
> >> To: devel@edk2.groups.io
> >> Cc: Pierre.Gondois@arm.com; Sami.Mujawar@arm.com;
> >> Alexei.Fedorov@arm.com; Jeff Brasen <jbrasen@nvidia.com>
> >> Subject: [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates
> >>
> >> Add fixes/features to dynamic PCIe support
> >>
> >> - Correct issue with translation in generated ACPI tables.
> >> - Allow for more than 16 controllers to be generated.
> >> - Allow optional use of segment number as UID for cases where ACPI
> >> path is needed in other places.
> >> - Add support for override protocol that allows platform specific
> >> modification of node prior to creation.
> >>
> >> Update:
> >> v2 - Add IsPosDecode logic to translation patch
> >>
> >> Jeff Brasen (4):
> >> DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value
> >> DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number
> as
> >> UID
> >> DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF
> >> DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override
> >> protocol
> >>
> >> DynamicTablesPkg/DynamicTablesPkg.dec | 6 ++
> >> .../Protocol/SsdtPcieOverrideProtocol.h | 63 ++++++++++++++++
> >> .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 73 ++++++++++++++++-
> --
> >> .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.h | 2 +-
> >> .../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 7 ++
> >> 5 files changed, 139 insertions(+), 12 deletions(-) create mode
> >> 100644 DynamicTablesPkg/Include/Protocol/SsdtPcieOverrideProtocol.h
> >>
> >> --
> >> 2.25.1
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-07-08 15:13 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-01 16:32 [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 1/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 2/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as UID Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 3/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF Jeff Brasen
2022-07-01 16:32 ` [PATCH v2 4/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Add support for override protocol Jeff Brasen
2022-07-07 16:59 ` [PATCH v2 0/4] DynamicTablesPkg: Pcie generation updates Jeff Brasen
2022-07-08 7:31 ` PierreGondois
2022-07-08 15:13 ` Jeff Brasen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox