Change in coreboot[master]: ACPI: Drop redundant CONSOLE_CBMEM setup in GNVS - coreboot-gerrit

18 Jun 2020

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42492 )
Change subject: ACPI: Drop redundant CONSOLE_CBMEM setup in GNVS
......................................................................
ACPI: Drop redundant CONSOLE_CBMEM setup in GNVS
Already done in common gnvs_get_or_create() implementation.
Change-Id: I77c292cd9590d7fc54d8b21ea62717a2d77e5ba4
Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com
---
M src/soc/amd/picasso/acpi.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/intel/apollolake/acpi.c
M src/soc/intel/baytrail/acpi.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/acpi.c
M src/soc/intel/cannonlake/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/icelake/acpi.c
M src/soc/intel/jasperlake/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/tigerlake/acpi.c
M src/soc/intel/xeon_sp/skx/acpi.c
M src/southbridge/intel/lynxpoint/lpc.c
14 files changed, 0 insertions(+), 58 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/42492/1

diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 981c8b8..3d45760 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -246,10 +246,6 @@
static void acpi_create_gnvs(struct global_nvs_t *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 5559291..f5f5073 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -221,10 +221,6 @@
static void acpi_create_gnvs(struct global_nvs_t *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/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index be6eb9a..500ad44 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -75,10 +75,6 @@
    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 13acf86..3a8a542 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -68,11 +68,6 @@
    /* 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 6b29d9a..cbea1ae 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -72,11 +72,6 @@
    /* 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/acpi.c b/src/soc/intel/broadwell/acpi.c
index 0d83c01..609e2da 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -156,11 +156,6 @@
    /* 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 c041eb0..83bb8e2 100644
--- a/src/soc/intel/cannonlake/acpi.c
+++ b/src/soc/intel/cannonlake/acpi.c
@@ -193,10 +193,6 @@
    /* 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 38913de..f14ac58 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -65,11 +65,6 @@
    /* 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/icelake/acpi.c b/src/soc/intel/icelake/acpi.c
index 796e770..915c741 100644
--- a/src/soc/intel/icelake/acpi.c
+++ b/src/soc/intel/icelake/acpi.c
@@ -188,10 +188,6 @@
    /* 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 88ec5fe..bc80c84 100644
--- a/src/soc/intel/jasperlake/acpi.c
+++ b/src/soc/intel/jasperlake/acpi.c
@@ -282,10 +282,6 @@
    /* 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 4a6533d..628e933 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -165,11 +165,6 @@
    /* 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/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c
index 0991134..71dfcad 100644
--- a/src/soc/intel/tigerlake/acpi.c
+++ b/src/soc/intel/tigerlake/acpi.c
@@ -282,10 +282,6 @@
    /* 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/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index 9880c44..072bb6a 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -53,9 +53,6 @@
    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);
 }
uint32_t soc_read_sci_irq_select(void)
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 342ab5b..0ac9ad0 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -708,8 +708,6 @@
    	chromeos_init_chromeos_acpi(&(gnvs->chromeos));
 #endif
-		/* Update the mem console pointer. */
-		gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
/* Add it to DSDT.  */
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/42492
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I77c292cd9590d7fc54d8b21ea62717a2d77e5ba4
Gerrit-Change-Number: 42492
Gerrit-PatchSet: 1
Gerrit-Owner: Kyösti Mälkki kyosti.malkki@gmail.com
Gerrit-Reviewer: Andrey Petrov andrey.petrov@gmail.com
Gerrit-Reviewer: David Guckian david.guckian@intel.com
Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org
Gerrit-Reviewer: Vanessa Eusebio vanessa.f.eusebio@intel.com
Gerrit-MessageType: newchange



    