Felix Held submitted this change.

View Change

Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved Angel Pons: Looks good to me, approved
sb,soc/amd: Remove FADT_PM_PROFILE

This was copy-paste from fam14 configuration mechanism
using platform_cfg.h files.

Change-Id: I7fdd89a8b1fe9c7e558841e24fb832d0cffd3454
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42030
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/soc/amd/picasso/acpi.c
M src/soc/amd/picasso/include/soc/acpi.h
M src/soc/amd/stoneyridge/acpi.c
M src/soc/amd/stoneyridge/include/soc/acpi.h
M src/southbridge/amd/agesa/hudson/fadt.c
M src/southbridge/amd/pi/hudson/fadt.c
6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 817ec51..4377f7d 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -104,7 +104,7 @@
fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt;
fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
- fadt->preferred_pm_profile = FADT_PM_PROFILE;
+ fadt->preferred_pm_profile = PM_UNSPECIFIED;
fadt->sci_int = 9; /* IRQ 09 - ACPI SCI */

if (permanent_smi_handler()) {
diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h
index 77f836c..e5bc3f3 100644
--- a/src/soc/amd/picasso/include/soc/acpi.h
+++ b/src/soc/amd/picasso/include/soc/acpi.h
@@ -5,10 +5,6 @@

#include <acpi/acpi.h>

-#ifndef FADT_PM_PROFILE
- #define FADT_PM_PROFILE PM_UNSPECIFIED
-#endif
-
unsigned long southbridge_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp);

diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index a7caa93..083b4d8 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -76,7 +76,7 @@
fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt;
fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
- fadt->preferred_pm_profile = FADT_PM_PROFILE;
+ fadt->preferred_pm_profile = PM_UNSPECIFIED;
fadt->sci_int = 9; /* IRQ 09 - ACPI SCI */

if (permanent_smi_handler()) {
diff --git a/src/soc/amd/stoneyridge/include/soc/acpi.h b/src/soc/amd/stoneyridge/include/soc/acpi.h
index 4375192..c44e934 100644
--- a/src/soc/amd/stoneyridge/include/soc/acpi.h
+++ b/src/soc/amd/stoneyridge/include/soc/acpi.h
@@ -11,10 +11,6 @@
#define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042)
#endif

-#ifndef FADT_PM_PROFILE
- #define FADT_PM_PROFILE PM_UNSPECIFIED
-#endif
-
unsigned long southbridge_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp);

diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c
index a328a88..06f3b9a 100644
--- a/src/southbridge/amd/agesa/hudson/fadt.c
+++ b/src/southbridge/amd/agesa/hudson/fadt.c
@@ -19,10 +19,6 @@
#define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042)
#endif

-#ifndef FADT_PM_PROFILE
- #define FADT_PM_PROFILE PM_UNSPECIFIED
-#endif
-
/*
* Reference section 5.2.9 Fixed ACPI Description Table (FADT)
* in the ACPI 3.0b specification.
@@ -54,7 +50,7 @@
fadt->dsdt = (uintptr_t)dsdt;

fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
- fadt->preferred_pm_profile = FADT_PM_PROFILE;
+ fadt->preferred_pm_profile = PM_UNSPECIFIED;
fadt->sci_int = 9; /* HUDSON - IRQ 09 - ACPI SCI */

if (permanent_smi_handler()) {
diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c
index 686b669..c3be679 100644
--- a/src/southbridge/amd/pi/hudson/fadt.c
+++ b/src/southbridge/amd/pi/hudson/fadt.c
@@ -19,10 +19,6 @@
#define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042)
#endif

-#ifndef FADT_PM_PROFILE
- #define FADT_PM_PROFILE PM_UNSPECIFIED
-#endif
-
/*
* Reference section 5.2.9 Fixed ACPI Description Table (FADT)
* in the ACPI 3.0b specification.
@@ -46,7 +42,7 @@
fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt;
fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
- fadt->preferred_pm_profile = FADT_PM_PROFILE;
+ fadt->preferred_pm_profile = PM_UNSPECIFIED;
fadt->sci_int = 9; /* HUDSON - IRQ 09 - ACPI SCI */

if (permanent_smi_handler()) {

To view, visit change 42030. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I7fdd89a8b1fe9c7e558841e24fb832d0cffd3454
Gerrit-Change-Number: 42030
Gerrit-PatchSet: 3
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Reviewer: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged