summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-17 08:54:20 +0300
committerNico Huber <nico.h@gmx.de>2021-01-10 11:16:26 +0000
commit81b8472237a1083f8c0224b10da90fd985f8fa9a (patch)
tree2265bf77f66831ff2efa379bfd3ff62f6bd7c4ad /src
parent3139c8dc05a363810b4dd9c45f01667760e22a58 (diff)
downloadcoreboot-81b8472237a1083f8c0224b10da90fd985f8fa9a.tar.xz
ACPI: Drop redundant CONSOLE_CBMEM setup in GNVS
Already done from common gnvs_get_or_create() implementation after gnvs_cbmc_ptr() is defined. Change-Id: I77c292cd9590d7fc54d8b21ea62717a2d77e5ba4 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48702 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/soc/amd/picasso/acpi.c4
-rw-r--r--src/soc/amd/stoneyridge/acpi.c4
-rw-r--r--src/soc/intel/alderlake/acpi.c4
-rw-r--r--src/soc/intel/apollolake/acpi.c4
-rw-r--r--src/soc/intel/baytrail/acpi.c5
-rw-r--r--src/soc/intel/braswell/acpi.c5
-rw-r--r--src/soc/intel/broadwell/pch/lpc.c5
-rw-r--r--src/soc/intel/cannonlake/acpi.c4
-rw-r--r--src/soc/intel/denverton_ns/acpi.c5
-rw-r--r--src/soc/intel/elkhartlake/acpi.c4
-rw-r--r--src/soc/intel/icelake/acpi.c4
-rw-r--r--src/soc/intel/jasperlake/acpi.c4
-rw-r--r--src/soc/intel/skylake/acpi.c5
-rw-r--r--src/soc/intel/tigerlake/acpi.c4
-rw-r--r--src/soc/intel/xeon_sp/skx/soc_acpi.c4
-rw-r--r--src/southbridge/intel/lynxpoint/lpc.c7
16 files changed, 5 insertions, 67 deletions
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 513d9f23b7..4b40e9be9e 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -396,10 +396,6 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
void acpi_create_gnvs(struct global_nvs *gnvs)
{
-
- if (CONFIG(CONSOLE_CBMEM))
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&gnvs->chromeos);
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index 74a3b2f207..aadf3a2938 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -164,10 +164,6 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
void acpi_create_gnvs(struct global_nvs *gnvs)
{
-
- if (CONFIG(CONSOLE_CBMEM))
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&gnvs->chromeos);
diff --git a/src/soc/intel/alderlake/acpi.c b/src/soc/intel/alderlake/acpi.c
index ca5d726874..4ebe0d5102 100644
--- a/src/soc/intel/alderlake/acpi.c
+++ b/src/soc/intel/alderlake/acpi.c
@@ -289,10 +289,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
- if (CONFIG(CONSOLE_CBMEM))
- /* Update the mem console pointer. */
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 61d42a5407..0a9b16e909 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -77,10 +77,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
struct soc_intel_apollolake_config *cfg;
cfg = config_of_soc();
-
- if (CONFIG(CONSOLE_CBMEM))
- gnvs->cbmc = (uintptr_t) cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&gnvs->chromeos);
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index 3aec20021b..72326e76a0 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -70,11 +70,6 @@ void acpi_init_gnvs(struct global_nvs *gnvs)
/* Top of Low Memory (start of resource allocation) */
gnvs->tolm = nc_read_top_of_low_memory();
-#if CONFIG(CONSOLE_CBMEM)
- /* Update the mem console pointer. */
- gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
-#endif
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 3a82318839..82aff9351d 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -73,11 +73,6 @@ void acpi_init_gnvs(struct global_nvs *gnvs)
/* Top of Low Memory (start of resource allocation) */
gnvs->tolm = nc_read_top_of_low_memory();
-#if CONFIG(CONSOLE_CBMEM)
- /* Update the mem console pointer. */
- gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
-#endif
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index c735a819ce..4d4d8610f2 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -618,11 +618,6 @@ static void southcluster_inject_dsdt(const struct device *device)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
-#if CONFIG(CONSOLE_CBMEM)
- /* Update the mem console pointer. */
- gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
-#endif
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c
index f061c30bf4..1d4419b583 100644
--- a/src/soc/intel/cannonlake/acpi.c
+++ b/src/soc/intel/cannonlake/acpi.c
@@ -194,10 +194,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
- /* Update the mem console pointer. */
- if (CONFIG(CONSOLE_CBMEM))
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index e68e5dbeaa..005dbae093 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -68,11 +68,6 @@ void acpi_init_gnvs(struct global_nvs *gnvs)
/* Top of Low Memory (start of resource allocation) */
gnvs->tolm = (uintptr_t)cbmem_top();
-#if CONFIG(CONSOLE_CBMEM)
- /* Update the mem console pointer. */
- gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
-#endif
-
/* MMIO Low/High & TSEG base and length */
gnvs->mmiob = (u32)get_top_of_low_memory();
gnvs->mmiol = (u32)(get_pciebase() - 1);
diff --git a/src/soc/intel/elkhartlake/acpi.c b/src/soc/intel/elkhartlake/acpi.c
index af837aba5d..6d76b66cbe 100644
--- a/src/soc/intel/elkhartlake/acpi.c
+++ b/src/soc/intel/elkhartlake/acpi.c
@@ -257,10 +257,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
- if (CONFIG(CONSOLE_CBMEM))
- /* Update the mem console pointer. */
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c
index ff66300da5..30917f304b 100644
--- a/src/soc/intel/icelake/acpi.c
+++ b/src/soc/intel/icelake/acpi.c
@@ -189,10 +189,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
- if (CONFIG(CONSOLE_CBMEM))
- /* Update the mem console pointer. */
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/jasperlake/acpi.c b/src/soc/intel/jasperlake/acpi.c
index 8673da17ea..1591953dcc 100644
--- a/src/soc/intel/jasperlake/acpi.c
+++ b/src/soc/intel/jasperlake/acpi.c
@@ -284,10 +284,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
- if (CONFIG(CONSOLE_CBMEM))
- /* Update the mem console pointer. */
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 6b90dc4092..a045f2d61c 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -168,11 +168,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
-#if CONFIG(CONSOLE_CBMEM)
- /* Update the mem console pointer. */
- gnvs->cbmc = (u32)(uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-#endif
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c
index c7c544615e..f21953dd84 100644
--- a/src/soc/intel/tigerlake/acpi.c
+++ b/src/soc/intel/tigerlake/acpi.c
@@ -284,10 +284,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
- if (CONFIG(CONSOLE_CBMEM))
- /* Update the mem console pointer. */
- gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
-
if (CONFIG(CHROMEOS)) {
/* Initialize Verified Boot data */
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index 4109abc65f..af52674e9f 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -33,10 +33,6 @@ void acpi_init_gnvs(struct global_nvs *gnvs)
/* CPU core count */
gnvs->pcnt = dev_count_cpu();
printk(BIOS_DEBUG, "%s gnvs->pcnt: %d\n", __func__, gnvs->pcnt);
-
- /* Update the mem console pointer. */
- if (CONFIG(CONSOLE_CBMEM))
- gnvs->cbmc = (uint32_t)cbmem_find(CBMEM_ID_CONSOLE);
}
int soc_madt_sci_irq_polarity(int sci)
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index bd424b8f71..1f768c2603 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -685,6 +685,11 @@ size_t gnvs_size_of_array(void)
return sizeof(struct global_nvs);
}
+uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs)
+{
+ return &gnvs->cbmc;
+}
+
void southbridge_inject_dsdt(const struct device *dev)
{
struct global_nvs *gnvs;
@@ -702,8 +707,6 @@ void southbridge_inject_dsdt(const struct device *dev)
chromeos_init_chromeos_acpi(&(gnvs->chromeos));
#endif
- /* Update the mem console pointer. */
- gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
/* Add it to DSDT. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 00:48:16 +0000