ACPI: Drop redundant CBMEM_ID_ACPI_GNVS allocations
Allocation now happens prior to device enumeration. The step cbmem_add() is a no-op here, if reached for some boards. The memset() here is also redundant and becomes harmful with followup works, as it would wipe out the CBMEM console and ChromeOS related fields without them being set again. Change-Id: I9b2625af15cae90b9c1eb601e606d0430336609f Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48701 Reviewed-by: Lance Zhao Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
committed by
Nico Huber
parent
fb777b5da8
commit
3139c8dc05
@@ -24,6 +24,12 @@ config ACPI_INTEL_HARDWARE_SLEEP_VALUES
|
||||
Provide common definitions for Intel hardware PM1_CNT register sleep
|
||||
values.
|
||||
|
||||
config ACPI_SOC_NVS
|
||||
bool
|
||||
help
|
||||
Set to indicate <soc/nvs.h> exists for the platform with a definition
|
||||
for global_nvs.
|
||||
|
||||
config ACPI_NO_PCAT_8259
|
||||
bool
|
||||
help
|
||||
|
@@ -12,6 +12,7 @@ ramstage-y += acpigen_usb.c
|
||||
ramstage-y += device.c
|
||||
ramstage-$(CONFIG_CHROMEOS) += chromeos-gnvs.c
|
||||
ramstage-y += gnvs.c
|
||||
ramstage-$(CONFIG_ACPI_SOC_NVS) += nvs.c
|
||||
ramstage-y += pld.c
|
||||
ramstage-y += sata.c
|
||||
ramstage-y += soundwire.c
|
||||
|
@@ -29,12 +29,7 @@ static void gnvs_assign_cbmc(void)
|
||||
*gnvs_cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
|
||||
}
|
||||
|
||||
/* Platforms that implement GNVS will need to implement these. */
|
||||
__weak size_t gnvs_size_of_array(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Needs implementation in platform code. */
|
||||
__weak uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs_)
|
||||
{
|
||||
return NULL;
|
||||
|
23
src/acpi/nvs.c
Normal file
23
src/acpi/nvs.c
Normal file
@@ -0,0 +1,23 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include <acpi/acpi_gnvs.h>
|
||||
#include <soc/nvs.h>
|
||||
#include <stdint.h>
|
||||
|
||||
size_t gnvs_size_of_array(void)
|
||||
{
|
||||
return sizeof(struct global_nvs);
|
||||
}
|
||||
|
||||
uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs)
|
||||
{
|
||||
return &gnvs->cbmc;
|
||||
}
|
||||
|
||||
/* Some <soc/nvs.h> have no chromeos entry. */
|
||||
#if CONFIG(MAINBOARD_HAS_CHROMEOS)
|
||||
void *gnvs_chromeos_ptr(struct global_nvs *gnvs)
|
||||
{
|
||||
return &gnvs->chromeos;
|
||||
}
|
||||
#endif
|
Reference in New Issue
Block a user