diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-16 08:56:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-16 08:56:37 -0400 |
| commit | dba0a6ae1907bbff3ebda06e4874d006f10db1bb (patch) | |
| tree | 61d65db08c42dcf0d64d8c084c026d52c9beb3af /arch/x86/lib/acpi_table.c | |
| parent | 66b8669d7709cecedf2e0403bb17b48bab86f644 (diff) | |
| parent | 1f4431e46120ef913fc9f83c78a734d910d00b3f (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Provide serial base clock speed via getinfo() for ACPI SPCR
- Initial ACPI support from DM core by leveraging existing ACPI support
in x86
Diffstat (limited to 'arch/x86/lib/acpi_table.c')
| -rw-r--r-- | arch/x86/lib/acpi_table.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 66e32f21bdb..9346e165d89 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -12,8 +12,8 @@ #include <dm/uclass-internal.h> #include <serial.h> #include <version.h> +#include <acpi/acpi_table.h> #include <asm/acpi/global_nvs.h> -#include <asm/acpi_table.h> #include <asm/ioapic.h> #include <asm/lapic.h> #include <asm/mpspec.h> @@ -471,6 +471,15 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) spcr->pci_device_id = 0xffff; spcr->pci_vendor_id = 0xffff; + /* + * SPCR has no clue if the UART base clock speed is different + * to the default one. However, the SPCR 1.04 defines baud rate + * 0 as a preconfigured state of UART and OS is supposed not + * to touch the configuration of the serial device. + */ + if (serial_info.clock != SERIAL_DEFAULT_CLOCK) + spcr->baud_rate = 0; + /* Fix checksum */ header->checksum = table_compute_checksum((void *)spcr, header->length); } |