diff options
| author | Simon Glass <sjg@chromium.org> | 2020-07-07 21:32:05 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-07-17 14:32:24 +0800 |
| commit | 8d7ff12e635f255afce74767a78d7584abbbaed0 (patch) | |
| tree | baf23081ee65e40970ec4c1c83a1aa7c44ae5601 /arch/x86/lib/acpi_table.c | |
| parent | 8f9877df95ae0068ce14a962bd72c22026c1d2e8 (diff) | |
| download | u-boot-8d7ff12e635f255afce74767a78d7584abbbaed0.tar.gz u-boot-8d7ff12e635f255afce74767a78d7584abbbaed0.tar.xz u-boot-8d7ff12e635f255afce74767a78d7584abbbaed0.zip | |
acpi: Allow creating the GNVS to fail
In some cases an internal error may prevent this from working. Update the
function return value and report the error. At present the API for writing
tables does not easily support reporting errors, but once it is fully
updated to use a context pointer, this will be easier.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Diffstat (limited to 'arch/x86/lib/acpi_table.c')
| -rw-r--r-- | arch/x86/lib/acpi_table.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index eeacfe9b06..8219376e17 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -23,6 +23,7 @@ #include <asm/tables.h> #include <asm/arch/global_nvs.h> #include <dm/acpi.h> +#include <linux/err.h> /* * IASL compiles the dsdt entries and writes the hex values @@ -443,8 +444,14 @@ ulong write_acpi_tables(ulong start_addr) dsdt->checksum = 0; dsdt->checksum = table_compute_checksum((void *)dsdt, dsdt->length); - /* Fill in platform-specific global NVS variables */ - acpi_create_gnvs(ctx->current); + /* + * Fill in platform-specific global NVS variables. If this fails we + * cannot return the error but this should only happen while debugging. + */ + addr = acpi_create_gnvs(ctx->current); + if (IS_ERR_VALUE(addr)) + printf("Error: Failed to create GNVS\n"); + acpi_inc_align(ctx, sizeof(struct acpi_global_nvs)); debug("ACPI: * FADT\n"); |