diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-14 12:01:58 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-24 11:48:38 +0000 |
| commit | 5daa1d38985a19dc84f2299dba2e340dda2870ae (patch) | |
| tree | 5ffc76d72e2b7676f520b21808c7c35709ce30d0 /src/southbridge/intel | |
| parent | e37459ed64b40a23880babf430fd92a847752053 (diff) | |
ACPI: Replace uses of CBMEM_ID_ACPI_GNVS
These are the simple cbmem_find() cases. Also drop the redundant
error messages.
Change-Id: I78e5445eb09c322ff94fe4f65345eb2997bd10ef
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42361
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/southbridge/intel')
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/serialio.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/southbridge/intel/lynxpoint/acpi.c b/src/southbridge/intel/lynxpoint/acpi.c index d63af6c99f..c4ea418ade 100644 --- a/src/southbridge/intel/lynxpoint/acpi.c +++ b/src/southbridge/intel/lynxpoint/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpi.h> +#include <acpi/acpi_gnvs.h> #include <acpi/acpigen.h> -#include <cbmem.h> #include <types.h> #include <string.h> #include <version.h> @@ -51,7 +51,7 @@ static void acpi_create_serialio_ssdt_entry(int id, global_nvs_t *gnvs) void acpi_create_serialio_ssdt(acpi_header_t *ssdt) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); - global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); + global_nvs_t *gnvs = acpi_get_gnvs(); int id; if (!gnvs) diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c index cdb1f351d7..3973a8d94a 100644 --- a/src/southbridge/intel/lynxpoint/serialio.c +++ b/src/southbridge/intel/lynxpoint/serialio.c @@ -2,7 +2,7 @@ #include <device/mmio.h> #include <device/pci_ops.h> -#include <cbmem.h> +#include <acpi/acpi_gnvs.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -208,11 +208,9 @@ static void serialio_init(struct device *dev) global_nvs_t *gnvs; /* Find ACPI NVS to update BARs */ - gnvs = (global_nvs_t *)cbmem_find(CBMEM_ID_ACPI_GNVS); - if (!gnvs) { - printk(BIOS_ERR, "Unable to locate Global NVS\n"); + gnvs = acpi_get_gnvs(); + if (!gnvs) return; - } /* Save BAR0 and BAR1 to ACPI NVS */ gnvs->s0b[sio_index] = (u32)bar0->base; |