summaryrefslogtreecommitdiff
path: root/src/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'src/acpi')
-rw-r--r--src/acpi/chromeos-gnvs.c10
-rw-r--r--src/acpi/gnvs.c11
-rw-r--r--src/acpi/nvs.c12
3 files changed, 14 insertions, 19 deletions
diff --git a/src/acpi/chromeos-gnvs.c b/src/acpi/chromeos-gnvs.c
index 81c652ad3f..060d56d44b 100644
--- a/src/acpi/chromeos-gnvs.c
+++ b/src/acpi/chromeos-gnvs.c
@@ -5,11 +5,9 @@
#include <smbios.h>
#include <vendorcode/google/chromeos/gnvs.h>
-void gnvs_assign_chromeos(void)
+void gnvs_assign_chromeos(void *gnvs_section)
{
- chromeos_acpi_t *gnvs_chromeos = gnvs_chromeos_ptr(acpi_get_gnvs());
- if (!gnvs_chromeos)
- return;
+ chromeos_acpi_t *gnvs_chromeos = gnvs_section;
chromeos_init_chromeos_acpi(gnvs_chromeos);
@@ -22,7 +20,7 @@ void gnvs_assign_chromeos(void)
void gnvs_set_ecfw_rw(void)
{
- chromeos_acpi_t *gnvs_chromeos = gnvs_chromeos_ptr(acpi_get_gnvs());
+ chromeos_acpi_t *gnvs_chromeos = chromeos_get_chromeos_acpi();
if (!gnvs_chromeos)
return;
@@ -31,7 +29,7 @@ void gnvs_set_ecfw_rw(void)
void smbios_type0_bios_version(uintptr_t address)
{
- chromeos_acpi_t *gnvs_chromeos = gnvs_chromeos_ptr(acpi_get_gnvs());
+ chromeos_acpi_t *gnvs_chromeos = chromeos_get_chromeos_acpi();
if (!gnvs_chromeos)
return;
diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c
index 10a77d39de..18a4d5d951 100644
--- a/src/acpi/gnvs.c
+++ b/src/acpi/gnvs.c
@@ -6,6 +6,7 @@
#include <console/console.h>
#include <string.h>
#include <types.h>
+#include <vendorcode/google/chromeos/gnvs.h>
static void *gnvs;
@@ -53,6 +54,14 @@ void *gnvs_get_or_create(void)
if (!gnvs_size)
return NULL;
+ /* Match with OpRegion declared in global_nvs.asl. */
+ if (gnvs_size < 0x100)
+ gnvs_size = 0x100;
+ if (gnvs_size > 0x1000)
+ gnvs_size = 0x2000;
+ else if (CONFIG(MAINBOARD_HAS_CHROMEOS))
+ gnvs_size = 0x1000;
+
gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, gnvs_size);
if (!gnvs)
return NULL;
@@ -63,7 +72,7 @@ void *gnvs_get_or_create(void)
gnvs_assign_cbmc();
if (CONFIG(CHROMEOS))
- gnvs_assign_chromeos();
+ gnvs_assign_chromeos((u8 *)gnvs + GNVS_CHROMEOS_ACPI_OFFSET);
return gnvs;
}
diff --git a/src/acpi/nvs.c b/src/acpi/nvs.c
index a7915f2164..12d124f64f 100644
--- a/src/acpi/nvs.c
+++ b/src/acpi/nvs.c
@@ -13,15 +13,3 @@ uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs)
{
return &gnvs->cbmc;
}
-
-/* Some <soc/nvs.h> have no chromeos entry. */
-void *gnvs_chromeos_ptr(struct global_nvs *gnvs)
-{
-#if CONFIG(BOARD_EMULATION_QEMU_X86_Q35)
- return NULL;
-#elif CONFIG(MAINBOARD_HAS_CHROMEOS)
- return &gnvs->chromeos;
-#else
- return NULL;
-#endif
-}