Message ID | 1465979608-4034-2-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Superseded |
Delegated to: | Bin Meng |
Headers | show |
On Wed, Jun 15, 2016 at 3:33 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > This introduces baytrail-specific ACPI global NVS structure, defined in > both C header file and ASL file. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/cpu/baytrail/acpi.c | 26 ++++++++++++++++++++++ > .../include/asm/arch-baytrail/acpi/global_nvs.asl | 13 +++++++++++ > arch/x86/include/asm/arch-baytrail/global_nvs.h | 21 +++++++++++++++++ > 3 files changed, 60 insertions(+) > create mode 100644 arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl > create mode 100644 arch/x86/include/asm/arch-baytrail/global_nvs.h Reviewed-by: George McCollister <george.mccollister@gmail.com> Tested-by: George McCollister <george.mccollister@gmail.com>
On 15 June 2016 at 02:33, Bin Meng <bmeng.cn@gmail.com> wrote: > This introduces baytrail-specific ACPI global NVS structure, defined in > both C header file and ASL file. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/cpu/baytrail/acpi.c | 26 ++++++++++++++++++++++ > .../include/asm/arch-baytrail/acpi/global_nvs.asl | 13 +++++++++++ > arch/x86/include/asm/arch-baytrail/global_nvs.h | 21 +++++++++++++++++ > 3 files changed, 60 insertions(+) > create mode 100644 arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl > create mode 100644 arch/x86/include/asm/arch-baytrail/global_nvs.h Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 5ee4868..fa92d88 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -5,10 +5,14 @@ */ #include <common.h> +#include <cpu.h> +#include <dm.h> +#include <dm/uclass-internal.h> #include <asm/acpi_table.h> #include <asm/ioapic.h> #include <asm/mpspec.h> #include <asm/tables.h> +#include <asm/arch/global_nvs.h> #include <asm/arch/iomap.h> void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, @@ -161,3 +165,25 @@ u32 acpi_fill_madt(u32 current) return current; } + +void acpi_create_gnvs(struct acpi_global_nvs *gnvs) +{ + struct udevice *dev; + int ret; + + /* at least we have one processor */ + gnvs->pcnt = 1; + /* override the processor count with actual number */ + ret = uclass_find_first_device(UCLASS_CPU, &dev); + if (ret == 0 && dev != NULL) { + ret = cpu_get_count(dev); + if (ret > 0) + gnvs->pcnt = ret; + } + + /* determine whether internal uart is on */ + if (IS_ENABLED(CONFIG_INTERNAL_UART)) + gnvs->iuart_en = 1; + else + gnvs->iuart_en = 0; +} diff --git a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl new file mode 100644 index 0000000..fe348b3 --- /dev/null +++ b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +OperationRegion(GNVS, SystemMemory, 0xdeadbeef, 0x100) +Field(GNVS, ByteAcc, NoLock, Preserve) +{ + Offset (0x00), + PCNT, 8, /* processor count */ + IURE, 8, /* internal UART enabled */ +} diff --git a/arch/x86/include/asm/arch-baytrail/global_nvs.h b/arch/x86/include/asm/arch-baytrail/global_nvs.h new file mode 100644 index 0000000..56e3626 --- /dev/null +++ b/arch/x86/include/asm/arch-baytrail/global_nvs.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _GLOBAL_NVS_H_ +#define _GLOBAL_NVS_H_ + +struct __packed acpi_global_nvs { + u8 pcnt; /* processor count */ + u8 iuart_en; /* internal UART enabled */ + + /* + * Add padding so sizeof(struct acpi_global_nvs) == 0x100. + * This must match the size defined in the global_nvs.asl. + */ + u8 rsvd[254]; +}; + +#endif /* _GLOBAL_NVS_H_ */
This introduces baytrail-specific ACPI global NVS structure, defined in both C header file and ASL file. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/cpu/baytrail/acpi.c | 26 ++++++++++++++++++++++ .../include/asm/arch-baytrail/acpi/global_nvs.asl | 13 +++++++++++ arch/x86/include/asm/arch-baytrail/global_nvs.h | 21 +++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl create mode 100644 arch/x86/include/asm/arch-baytrail/global_nvs.h