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/soc/amd | |
| 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/soc/amd')
| -rw-r--r-- | src/soc/amd/picasso/southbridge.c | 5 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/southbridge.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/soc/amd/picasso/southbridge.c b/src/soc/amd/picasso/southbridge.c index 0d908c3f73..45f66d6b5b 100644 --- a/src/soc/amd/picasso/southbridge.c +++ b/src/soc/amd/picasso/southbridge.c @@ -10,6 +10,7 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <cbmem.h> +#include <acpi/acpi_gnvs.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/reset.h> #include <amdblocks/acpimmio.h> @@ -308,7 +309,7 @@ static void set_nvs_sws(void *unused) sws = cbmem_find(CBMEM_ID_POWER_STATE); if (sws == NULL) return; - gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); + gnvs = acpi_get_gnvs(); if (gnvs == NULL) return; @@ -336,7 +337,7 @@ void southbridge_init(void *chip_info) static void set_sb_final_nvs(void) { - struct global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); + struct global_nvs_t *gnvs = acpi_get_gnvs(); if (gnvs == NULL) return; diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index e90fe1b457..f21734902b 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -8,6 +8,7 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <cbmem.h> +#include <acpi/acpi_gnvs.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/agesawrapper.h> #include <amdblocks/reset.h> @@ -542,7 +543,7 @@ static void set_nvs_sws(void *unused) sws = cbmem_find(CBMEM_ID_POWER_STATE); if (sws == NULL) return; - gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); + gnvs = acpi_get_gnvs(); if (gnvs == NULL) return; @@ -575,7 +576,7 @@ static void set_sb_final_nvs(void) size_t fwsize; const struct device *sd, *sata; - struct global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); + struct global_nvs_t *gnvs = acpi_get_gnvs(); if (gnvs == NULL) return; |