From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, alan@softiron.co.uk,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-platforms 03/11] Silicon/AMD/Styx/AcpiPlatformDxe: replace XGBE CPP conditional with PCD
Date: Tue, 11 Dec 2018 19:35:06 +0100 [thread overview]
Message-ID: <20181211183514.20948-4-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org>
We already have a boolean PCD that tells us whether XGBE support should
be enabled, so use it instead of C preprocessor conditionals.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 1 +
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 13 ++++---------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
index be885d6aea90..d27431343f4b 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -68,6 +68,7 @@
gAmdStyxTokenSpaceGuid.PcdSocCpuId
[FixedPcd]
+ gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable
gAmdStyxTokenSpaceGuid.PcdCntControlBase
gAmdStyxTokenSpaceGuid.PcdCntReadBase
gAmdStyxTokenSpaceGuid.PcdCntCTLBase
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c
index 9c17c38a04bf..9c8c8b09d4a4 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c
@@ -43,7 +43,6 @@
STATIC EFI_ACPI_TABLE_PROTOCOL *mAcpiTableProtocol;
STATIC AMD_MP_CORE_INFO_PROTOCOL *mAmdMpCoreInfoProtocol;
-#if DO_XGBE
STATIC CONST UINT8 mDefaultMacPackageA[] = {
0x12, 0xe, 0x6, 0xa, 0x2, 0xa, 0xa1, 0xa, 0xa2, 0xa, 0xa3, 0xa, 0xa4, 0xa, 0xa5
@@ -91,8 +90,6 @@ PatchAmlPackage (
}
}
-#endif
-
STATIC
VOID
EnableAvailableCores (
@@ -135,10 +132,7 @@ InstallSystemDescriptionTables (
EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort;
EFI_ACPI_5_1_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt;
EFI_ACPI_5_1_GIC_STRUCTURE *GicC;
-
-#if DO_XGBE
UINT8 MacPackage[sizeof(mDefaultMacPackageA)];
-#endif
CpuId = PcdGet32 (PcdSocCpuId);
@@ -158,7 +152,10 @@ InstallSystemDescriptionTables (
break;
case SIGNATURE_64 ('S', 't', 'y', 'x', 'X', 'g', 'b', 'e'):
-#if DO_XGBE
+ if (!FixedPcdGetBool (PcdXgbeEnable)) {
+ continue;
+ }
+
//
// Patch the SSDT binary with the correct MAC addresses
//
@@ -173,8 +170,6 @@ InstallSystemDescriptionTables (
(UINT8 *)Table, TableSize);
break;
-#endif
- continue;
default:
switch (Table->Signature) {
--
2.19.2
next prev parent reply other threads:[~2018-12-11 18:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 18:35 [PATCH edk2-platforms 00/11] final set of Styx cleanups Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 01/11] Silicon/AMD/Styx/Iort: drop conditionally included XGBE nodes Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 02/11] Platform/SoftIron/Overdrive1000Board: remove dead XGBE references Ard Biesheuvel
2018-12-11 18:35 ` Ard Biesheuvel [this message]
2018-12-11 18:35 ` [PATCH edk2-platforms 04/11] Silicon/AMD/Styx/PlatInitPei: replace XGBE CPP conditional with PCD Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 05/11] Silicon/AMD/Styx/StyxDtbLoaderLib: " Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 06/11] Platform/AMD/OverdriveBoard: drop DO_XGBE C preprocessor defines Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 07/11] Silicon/AMD/Styx: introduce boolean PCD for KCS/IPMI support Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 08/11] Silicon/AMD/Styx/AcpiPlatformDxe: move IPMI/KCS device into separate SSDT Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 09/11] Silicon/AMD/Styx/StyxDtbLoaderLib: replace DO_KCS macro reference with PCD Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 10/11] Platform/Styx: get rid of DO_KCS preprocessor macro Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 11/11] Silicon/AMD/Styx/AcpiPlatformDxe: disable KCS on pre-B1 silicon Ard Biesheuvel
2018-12-12 22:23 ` [PATCH edk2-platforms 00/11] final set of Styx cleanups Leif Lindholm
2018-12-13 11:09 ` Ard Biesheuvel
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=20181211183514.20948-4-ard.biesheuvel@linaro.org \
--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