x86: Allow Coral to boot into Chrome OS
Subsystems (8)
v2 cover x86: Allow Coral to boot into Chrome OS
This series adds various minor features and tweaks to allow Coral to boot into Chrome OS from U-Boot.
It relies on three other series which have been recently sent:
- smbios (u-boot-dm/smbios-working)
- bootm (u-boot-dm/bootm-working)
- misca (u-boot-dm/misca-working)
This should provide a solid base for using ACPI on other Intel Apollo Lake (APL) devices.
Changes in v2:
- Rename update_fixed_mtrss() to update_fixed_mtrrs()
- Add comments to enable_pm_timer_emulation() and cpu_mca_configure()
- Convert tabs to spaces for consistency
- Use log_err() to report error
- Rename struct chromeos_acpi to struct chromeos_acpi_gnvs
- Fix comment style
- Define CONFIG_CHROMEOS_VBOOT in the Kconfig too
- Correct a bisect build error
- Drop patch "Store the FADT so we can avoid searching for it"
- Drop patch "Move ROM_TABLE_ADDR into the C file"
Simon Glass (30):
Add an assembly guard around linux/bitops.h
x86: apl: Add core init for the SoC
x86: Add a layout for Chrome OS verified boot
x86: Add support for private files
x86: Allow writing tables to fail
x86: acpi: Store the ACPI context in global_data
x86: Don't bother clearing global NVS
x86: coral: Drop the duplicate PCIe settings
x86: Add SMBIOS info for Coral
x86: coral: Correct max98357 file
x86: Use if instead of #ifdef in write_tables()
x86: Allow putting some tables in the bloblist
x86: nhlt: Correct output of bytes and 16-bit data
x86: nhlt: Fix a few bugs in the table generation
x86: Show the interrupt pointer with 'irqinfo'
x86: sound: Correct error handling
acpi: Correct reset handling in acpi_device_add_power_res()
x86: acpi: Allow the SSDT to be empty
x86: acpi: Put the generated code first in DSDT
acpi: Don't reset the tables with every new generation
x86: Define the Chrome OS GNVS region
x86: Use CONFIG_CHROMEOS_VBOOT for verified boot
x86: Set up Chrome OS to boot into developer mode
x86: Boot coral into Chrome OS by default
x86: fsp: Convert fsp_dram to use log_debug()
x86: Silence some logging statements
x86: acpi: Include the TPMv1 table only if needed
x86: acpi: Don't show the UART address by default
x86: pinctrl: Silence the warning when a pin is not found
x86: fsp: Adjust calculations for MTRR range and DRAM top
Kconfig | 17 ++++ arch/x86/cpu/apollolake/acpi.c | 25 ++++-- arch/x86/cpu/apollolake/cpu.c | 84 +++++++++++++++++ arch/x86/cpu/apollolake/cpu_common.c | 25 ++++++ arch/x86/cpu/apollolake/cpu_spl.c | 20 ----- arch/x86/cpu/apollolake/fsp_s.c | 8 +- arch/x86/cpu/cpu.c | 9 +- arch/x86/cpu/i386/interrupt.c | 14 +-- arch/x86/cpu/intel_common/acpi.c | 1 - arch/x86/cpu/intel_common/cpu.c | 19 ++++ arch/x86/cpu/intel_common/intel_opregion.c | 2 +- arch/x86/cpu/intel_common/itss.c | 8 +- arch/x86/dts/chromebook_coral.dts | 12 ++- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/u-boot.dtsi | 4 + arch/x86/include/asm/acpi/vbnv_layout.h | 38 ++++++++ arch/x86/include/asm/arch-apollolake/cpu.h | 14 +++ arch/x86/include/asm/cpu_common.h | 9 ++ arch/x86/include/asm/intel_gnvs.h | 54 ++++++++++- arch/x86/include/asm/interrupt.h | 17 ++++ arch/x86/include/asm/msr-index.h | 20 ++++- arch/x86/include/asm/tables.h | 4 +- arch/x86/lib/acpi_nhlt.c | 19 ++-- arch/x86/lib/acpi_table.c | 78 ++++++++++------ arch/x86/lib/fsp/fsp_dram.c | 35 +++++--- arch/x86/lib/fsp/fsp_graphics.c | 2 +- arch/x86/lib/fsp2/fsp_dram.c | 8 +- arch/x86/lib/interrupts.c | 3 + arch/x86/lib/tables.c | 85 +++++++++++++----- arch/x86/lib/tpl.c | 2 +- .../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes configs/chromebook_coral_defconfig | 13 ++- drivers/core/acpi.c | 10 ++- drivers/pinctrl/intel/pinctrl.c | 2 +- drivers/sound/da7219.c | 4 +- drivers/sound/max98357a.c | 2 +- include/acpi/acpi_table.h | 10 +++ include/asm-generic/global_data.h | 5 ++ include/configs/chromebook_coral.h | 9 +- include/dm/acpi.h | 9 ++ include/linux/bitops.h | 4 +- lib/Kconfig | 9 ++ lib/acpi/acpi_device.c | 2 +- lib/acpi/acpi_table.c | 4 +- test/dm/acpi.c | 4 + 45 files changed, 585 insertions(+), 140 deletions(-) create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 1/30 Add an assembly guard around linux/bitops.h
This file can be included by any header but it includes C code. Guard it to avoid errors when compiling ASL, etc.
---
(no changes since v1)
include/linux/bitops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/bitops.h +2 -2
@@ -1,7 +1,7 @@#ifndef _LINUX_BITOPS_H#define _LINUX_BITOPS_H -#ifndef USE_HOSTCC +#if !defined(USE_HOSTCC ) && !defined(__ASSEMBLY__)#include <asm/types.h> #include <asm-generic/bitsperlong.h>
@@ -218,6 +218,6 @@ static inline void generic_clear_bit(int nr, volatile unsigned long *addr) *p &= ~mask; } -#endif /* !USE_HOSTCC */ +#endif /* !USE_HOSTCC && !__ASSEMBLY__ */ #endif
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 2/30 x86: apl: Add core init for the SoC
In reply to Simon GlassSet up MSRs required for Apollo Lake. This enables Linux to use the timers correctly. Also write the fixed MSRs for this platform.
---
Changes in v2:
- Rename update_fixed_mtrss() to update_fixed_mtrrs()
- Add comments to enable_pm_timer_emulation() and cpu_mca_configure()
arch/x86/cpu/apollolake/cpu.c | 84 ++++++++++++++++++++++ arch/x86/cpu/apollolake/cpu_common.c | 25 +++++++ arch/x86/cpu/apollolake/cpu_spl.c | 20 ------ arch/x86/cpu/intel_common/cpu.c | 19 +++++ arch/x86/include/asm/arch-apollolake/cpu.h | 14 ++++ arch/x86/include/asm/cpu_common.h | 9 +++ arch/x86/include/asm/msr-index.h | 20 +++++- 7 files changed, 170 insertions(+), 21 deletions(-)
arch/x86/cpu/apollolake/cpu.c +84 -0
@@ -13,6 +13,9 @@#include <asm/cpu_x86.h> #include <asm/intel_acpi.h> #include <asm/msr.h> +#include <asm/mtrr.h> +#include <asm/arch/cpu.h> +#include <asm/arch/iomap.h> #include <dm/acpi.h> #define CSTATE_RES (address_space, width, offset, address) \
@@ -86,6 +89,86 @@ static int acpi_cpu_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx)return 0 ; } +static void update_fixed_mtrrs (void ) +{ +native_write_msr (MTRR_FIX_64K_00000_MSR , +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK ), +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK )); +native_write_msr (MTRR_FIX_16K_80000_MSR , +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK ), +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK )); +native_write_msr (MTRR_FIX_4K_E0000_MSR , +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK ), +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK )); +native_write_msr (MTRR_FIX_4K_E8000_MSR , +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK ), +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK )); +native_write_msr (MTRR_FIX_4K_F0000_MSR , +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK ), +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK )); +native_write_msr (MTRR_FIX_4K_F8000_MSR , +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK ), +MTRR_FIX_TYPE (MTRR_TYPE_WRBACK )); +} + +static void setup_core_msrs (void ) +{ +wrmsrl (MSR_PMG_CST_CONFIG_CONTROL , +PKG_C_STATE_LIMIT_C2_MASK |CORE_C_STATE_LIMIT_C10_MASK | +IO_MWAIT_REDIRECT_MASK |CST_CFG_LOCK_MASK ); +/* Power Management I/O base address for I/O trapping to C-states */ +wrmsrl (MSR_PMG_IO_CAPTURE_ADR ,ACPI_PMIO_CST_REG | + (PMG_IO_BASE_CST_RNG_BLK_SIZE <<16 )); +/* Disable C1E */ +msr_clrsetbits_64 (MSR_POWER_CTL ,0x2 ,0 ); +/* Disable support for MONITOR and MWAIT instructions */ +msr_clrsetbits_64 (MSR_IA32_MISC_ENABLE ,MISC_ENABLE_MWAIT ,0 ); +/* +* Enable and Lock the Advanced Encryption Standard (AES-NI) +* feature register +*/ +msr_clrsetbits_64 (MSR_FEATURE_CONFIG ,FEATURE_CONFIG_RESERVED_MASK , +FEATURE_CONFIG_LOCK ); + +update_fixed_mtrrs (); +} + +static int soc_core_init (void ) +{ +struct udevice *pmc; +int ret; + +/* Clear out pending MCEs */ +cpu_mca_configure (); + +/* Set core MSRs */ +setup_core_msrs (); +/* +* Enable ACPI PM timer emulation, which also lets microcode know +* location of ACPI_BASE_ADDRESS. This also enables other features +* implemented in microcode. +*/ + ret =uclass_first_device_err (UCLASS_ACPI_PMC , &pmc); +if (ret) +return log_msg_ret ("PMC" , ret); +enable_pm_timer_emulation (pmc); + +return 0 ; +} + +static int cpu_apl_probe (struct udevice *dev) +{ +if (gd->flags &GD_FLG_RELOC ) { +int ret; + + ret =soc_core_init (); +if (ret) +return log_ret (ret); + } + +return 0 ; +} +struct acpi_ops apl_cpu_acpi_ops = { .fill_ssdt = acpi_cpu_fill_ssdt, };
@@ -107,6 +190,7 @@ U_BOOT_DRIVER(cpu_x86_apl_drv) = { .id = UCLASS_CPU, .of_match = cpu_x86_apl_ids, .bind = cpu_x86_bind, + .probe = cpu_apl_probe, .ops = &cpu_x86_apl_ops,ACPI_OPS_PTR (&apl_cpu_acpi_ops) .flags = DM_FLAG_PRE_RELOC,
arch/x86/cpu/apollolake/cpu_common.c +25 -0
@@ -4,8 +4,13 @@*/ #include <common.h> +#include <dm.h> +#include <log.h> #include <asm/cpu_common.h> #include <asm/msr.h> +#include <asm/arch/cpu.h> +#include <asm/arch/iomap.h> +#include <power/acpi_pmc.h> void cpu_flush_l1d_to_l2 (void ) {
@@ -15,3 +20,23 @@ void cpu_flush_l1d_to_l2(void) msr.lo |=FLUSH_DL1_L2 ;msr_write (MSR_POWER_MISC , msr); } + +void enable_pm_timer_emulation (const struct udevice *pmc) +{ +struct acpi_pmc_upriv *upriv =dev_get_uclass_priv (pmc); +msr_t msr; + +/* +* The derived frequency is calculated as follows: +* (CTC_FREQ * msr[63:32]) >> 32 = target frequency. +* +* Back-solve the multiplier so the 3.579545MHz ACPI timer frequency is +* used. +*/ + msr.hi = (3579545ULL <<32 ) /CTC_FREQ ; + +/* Set PM1 timer IO port and enable */ + msr.lo =EMULATE_PM_TMR_EN | (upriv->acpi_base +R_ACPI_PM1_TMR ); +debug ("PM timer %x %x\n" , msr.hi, msr.lo); +msr_write (MSR_EMULATE_PM_TIMER , msr); +}
arch/x86/cpu/apollolake/cpu_spl.c +0 -20
@@ -114,26 +114,6 @@ static int fast_spi_cache_bios_region(void)return 0 ; } -static void enable_pm_timer_emulation (struct udevice *pmc) -{ -struct acpi_pmc_upriv *upriv =dev_get_uclass_priv (pmc); -msr_t msr; - -/* -* The derived frequency is calculated as follows: -* (CTC_FREQ * msr[63:32]) >> 32 = target frequency. -* -* Back-solve the multiplier so the 3.579545MHz ACPI timer frequency is -* used. -*/ - msr.hi = (3579545ULL <<32 ) /CTC_FREQ ; - -/* Set PM1 timer IO port and enable */ - msr.lo =EMULATE_PM_TMR_EN | (upriv->acpi_base +R_ACPI_PM1_TMR ); -debug ("PM timer %x %x\n" , msr.hi, msr.lo); -msr_write (MSR_EMULATE_PM_TIMER , msr); -} -static void google_chromeec_ioport_range (uint *out_basep,uint *out_sizep) {uint base;
arch/x86/cpu/intel_common/cpu.c +19 -0
@@ -306,3 +306,22 @@ int cpu_get_cores_per_package(void)return cores; } + +void cpu_mca_configure (void ) +{ +msr_t msr; +int i; +int num_banks; + + msr =msr_read (MSR_IA32_MCG_CAP ); + num_banks = msr.lo &0xff ; + msr.lo =0 ; + msr.hi =0 ; +for (i =0 ; i < num_banks; i++) { +/* Clear the machine check status */ +msr_write (MSR_IA32_MC0_STATUS + (i *4 ), msr); +/* Initialise machine checks */ +msr_write (MSR_IA32_MC0_CTL + i *4 , + (msr_t ) {.lo =0xffffffff , .hi =0xffffffff }); + } +}
arch/x86/include/asm/arch-apollolake/cpu.h +14 -0
@@ -15,6 +15,20 @@#ifndef __ASSEMBLY__/* Flush L1D to L2 */ void cpu_flush_l1d_to_l2 (void ); + +/** +* Enable emulation of the PM timer +* +* Some legacy OSes cannot tolerate the ACPI timer stoping during idle states, +* and this results in higher power consumption. ACPI timer emulation allows +* disabling of the ACPI Timer (PM1_TMR) to have no impact on the system, with +* the exception that TMR_STS will not be set on an overflow condition. All +* aligned 32-bit reads from the ACPI Timer port are valid and will behave as if +* the ACPI timer remains enabled. +* +* @pmc: PMC device +*/ +void enable_pm_timer_emulation (const struct udevice *pmc);#endif #endif /* _ASM_ARCH_CPU_H */
arch/x86/include/asm/cpu_common.h +9 -0
@@ -184,4 +184,13 @@ int cpu_get_max_turbo_ratio(void);*/ int cpu_get_cores_per_package (void ); +/** +* cpu_mca_configure() - Set up machine-check exceptions ready for use +* +* These allow the SoC to report errors while running. See here for details: +* +* https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/machine-check-exceptions-debug-paper.pdf +*/ +void cpu_mca_configure (void ); +#endif
arch/x86/include/asm/msr-index.h +19 -1
@@ -68,7 +68,18 @@#define MSR_BSEL_CR_OVERCLOCK_CONTROL 0x000000cd#define MSR_PLATFORM_INFO 0x000000ce#define MSR_PMG_CST_CONFIG_CONTROL 0x000000e2 -#define SINGLE_PCTL (1 << 11) +/* Set MSR_PMG_CST_CONFIG_CONTROL[3:0] for Package C-State limit */ +#define PKG_C_STATE_LIMIT_C2_MASK BIT(1) +/* Set MSR_PMG_CST_CONFIG_CONTROL[7:4] for Core C-State limit*/ +#define CORE_C_STATE_LIMIT_C10_MASK 0x70 +/* Set MSR_PMG_CST_CONFIG_CONTROL[10] to IO redirect to MWAIT */ +#define IO_MWAIT_REDIRECT_MASK BIT(10) +/* Set MSR_PMG_CST_CONFIG_CONTROL[15] to lock CST_CFG [0-15] bits */ +#define CST_CFG_LOCK_MASK BIT(15) +#define SINGLE_PCTL BIT(11) + +/* ACPI PMIO Offset to C-state register */ +#define ACPI_PMIO_CST_REG (ACPI_BASE_ADDRESS + 0x14)#define MSR_MTRRcap 0x000000fe#define MSR_IA32_BBL_CR_CTL 0x00000119
@@ -83,6 +94,10 @@#define EMULATE_PM_TMR_EN (1 << 16)#define EMULATE_DELAY_VALUE 0x13 +#define MSR_FEATURE_CONFIG 0x13c +#define FEATURE_CONFIG_RESERVED_MASK 0x3ULL +#define FEATURE_CONFIG_LOCK (1 << 0) +#define MSR_IA32_SYSENTER_CS 0x00000174#define MSR_IA32_SYSENTER_ESP 0x00000175#define MSR_IA32_SYSENTER_EIP 0x00000176
@@ -453,6 +468,9 @@#define MSR_AMD_PERF_CTL 0xc0010062#define MSR_PMG_CST_CONFIG_CTL 0x000000e2 +/* CST Range (R/W) IO port block size */ +#define PMG_IO_BASE_CST_RNG_BLK_SIZE 0x5 +#define MSR_PMG_IO_CAPTURE_ADR 0x000000e4#define MSR_IA32_MPERF 0x000000e7#define MSR_IA32_APERF 0x000000e8
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 2/30 x86: apl: Add core init for the SoC
Quoted 11 lines · Simon Glass
Set up MSRs required for Apollo Lake. This enables Linux to use the timers correctly. Also write the fixed MSRs for this platform.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Renameupdate_fixed_mtrss()toupdate_fixed_mtrrs()
- Add comments toenable_pm_timer_emulation()andcpu_mca_configure()
Quoted 9 lines
arch/x86/cpu/apollolake/cpu.c | 84 ++++++++++++++++++++++ arch/x86/cpu/apollolake/cpu_common.c | 25 +++++++ arch/x86/cpu/apollolake/cpu_spl.c | 20 ------ arch/x86/cpu/intel_common/cpu.c | 19 +++++ arch/x86/include/asm/arch-apollolake/cpu.h | 14 ++++ arch/x86/include/asm/cpu_common.h | 9 +++ arch/x86/include/asm/msr-index.h | 20 +++++- 7 files changed, 170 insertions(+), 21 deletions(-)
PATCH v2 3/30 x86: Add a layout for Chrome OS verified boot
In reply to Simon GlassAdd definitions for part of the vboot context used with verified boot.
---
Changes in v2:
- Convert tabs to spaces for consistency
arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
arch/x86/include/asm/acpi/vbnv_layout.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2020 Google LLC +*/ + +#ifndef __ASM_ACPI_VBNV_LAYOUT_H__ +#define __ASM_ACPI_VBNV_LAYOUT_H__ + +#define VBOOT_VBNV_BLOCK_SIZE 16/* Size of NV storage block in bytes */ + +/* Constants for NV storage, for use with ACPI */ +#define HEADER_OFFSET 0 +#define HEADER_MASK 0xc0 +#define HEADER_SIGNATURE 0x40 +#define HEADER_FIRMWARE_SETTINGS_RESET 0x20 +#define HEADER_KERNEL_SETTINGS_RESET 0x10 + +#define BOOT_OFFSET 1 +#define BOOT_DEBUG_RESET_MODE 0x80 +#define BOOT_DISABLE_DEV_REQUEST 0x40 +#define BOOT_DISPLAY_REQUEST 0x20 +#define BOOT_TRY_B_COUNT_MASK 0x0f + +#define RECOVERY_OFFSET 2 +#define LOCALIZATION_OFFSET 3 + +#define DEV_FLAGS_OFFSET 4 +#define DEV_BOOT_USB_MASK 0x01 +#define DEV_BOOT_SIGNED_ONLY_MASK 0x02 +#define DEV_ENABLE_UDC 0x40 + +#define MISC_FLAGS_OFFSET 8 +#define MISC_FLAGS_BATTERY_CUTOFF_MASK 0x08 + +#define KERNEL_FIELD_OFFSET 11 +#define CRC_OFFSET 15 + +#endif /* __ASM_ACPI_VBNV_LAYOUT_H__ */
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 3/30 x86: Add a layout for Chrome OS verified boot
Hi Simon,
Quoted 8 lines · Simon Glass
Add definitions for part of the vboot context used with verified boot.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Convert tabs to spaces for consistency
I think in U-Boot tabs are preferred over spaces.
Quoted 5 lines
arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
Otherwise,
Regards,
Bin
PATCH v2 3/30 x86: Add a layout for Chrome OS verified boot
Hi Bin,
Quoted 7 lines · Bin Meng
Hi Simon,
Quoted 3 lines · Simon Glass
Add definitions for part of the vboot context used with verified boot.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Convert tabs to spaces for consistencyI think in U-Boot tabs are preferred over spaces.
I think that message is wrong so I updated it.
Quoted 9 lines
Quoted 6 lines
arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.hOtherwise,
Reviewed-by Bin Meng <[email protected]>
Regards,
Simon
PATCH v2 4/30 x86: Add support for private files
In reply to Simon GlassSome boards need to include binary data into the image for use during the boot process. Add a node for these.
An example is the audio-codec configuration used by some audio drivers on Intel platforms. If no private files are provided, they will be omitted.
---
(no changes since v1)
arch/x86/dts/u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/dts/u-boot.dtsi +4 -0
@@ -138,6 +138,10 @@ filename = CONFIG_FSP_FILE_S; }; #endif + private_files: private-files { + type = "files"; + pattern = "*.dat"; + }; #if IS_ENABLED(CONFIG_HAVE_MRC) || IS_ENABLED(CONFIG_FSP_VERSION2) rw-mrc-cache { type = "blob";
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 5/30 x86: Allow writing tables to fail
In reply to Simon GlassAt present write_tables() can fail but does not report this problem to its caller. Fix this by changing the return type.
---
Changes in v2:
- Use log_err() to report error
arch/x86/cpu/cpu.c | 9 ++++++++- arch/x86/include/asm/tables.h | 4 +++- arch/x86/lib/tables.c | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-)
arch/x86/cpu/cpu.c +8 -1
@@ -18,6 +18,8 @@* src/arch/x86/lib/cpu.c */ +#define LOG_CATEGORY UCLASS_CPU +#include <common.h> #include <bootstage.h> #include <command.h>
@@ -200,6 +202,7 @@ __weak void board_final_cleanup(void)int last_stage_init (void ) {struct acpi_fadt __maybe_unused *fadt; +int ret;board_final_init ();
@@ -210,7 +213,11 @@ int last_stage_init(void)acpi_resume (fadt); } -write_tables (); + ret =write_tables (); +if (ret) { +log_err ("Failed to write tables\n" ); +return log_msg_ret ("table" , ret); + }if (IS_ENABLED (CONFIG_GENERATE_ACPI_TABLE )) { fadt =acpi_find_fadt ();
arch/x86/include/asm/tables.h +3 -1
@@ -49,8 +49,10 @@ void table_fill_string(char *dest, const char *src, size_t n, char pad);* This writes x86 configuration tables, including PIRQ routing table, * Multi-Processor table and ACPI table. Whether a specific type of * configuration table is written is controlled by a Kconfig option. +* +* @return 0 if OK, -ENOSPC if table too large */ -void write_tables (void ); +int write_tables (void );/** * write_pirq_routing_table() - Write PIRQ routing table
arch/x86/lib/tables.c +4 -1
@@ -64,7 +64,7 @@ void table_fill_string(char *dest, const char *src, size_t n, char pad) dest[i] = pad; } -void write_tables (void ) +int write_tables (void ) {u32 rom_table_start =ROM_TABLE_ADDR ;u32 rom_table_end;
@@ -91,6 +91,7 @@ void write_tables(void) cfg_tables[i].size = table_size; }else {printf ("%d: no memory for configuration tables\n" , i); +return -ENOSPC ; }#endif
@@ -105,4 +106,6 @@ void write_tables(void)write_coreboot_table (CB_TABLE_ADDR , cfg_tables);#endif debug ("- done writing tables\n" ); + +return 0 ; }
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 6/30 x86: acpi: Store the ACPI context in global_data
In reply to Simon GlassAt present we create the ACPI context but then drop it after generation of tables is complete. This is annoying because we have to then search for tables later.
To fix this, allocate the context and store it in global_data.
---
(no changes since v1)
arch/x86/lib/acpi_table.c | 7 ++++++- include/asm-generic/global_data.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-)
arch/x86/lib/acpi_table.c +6 -1
@@ -494,7 +494,7 @@ void acpi_create_ssdt(struct acpi_ctx *ctx, struct acpi_table_header *ssdt,*/ ulong write_acpi_tables (ulong start_addr) { -struct acpi_ctx sctx, *ctx = &sctx; +struct acpi_ctx *ctx;struct acpi_facs *facs;struct acpi_table_header *dsdt;struct acpi_fadt *fadt;
@@ -509,6 +509,11 @@ ulong write_acpi_tables(ulong start_addr)int ret;int i; + ctx =calloc (1 ,sizeof (*ctx)); +if (!ctx) +return log_msg_ret ("mem" , -ENOMEM ); + gd->acpi_ctx = ctx; + start =map_sysmem (start_addr,0 );debug ("ACPI: Writing ACPI tables at %lx\n" , start_addr);
include/asm-generic/global_data.h +5 -0
@@ -24,6 +24,8 @@#include <membuff.h> #include <linux/list.h> +struct acpi_ctx ; + typedef struct global_data { struct bd_info *bd; unsigned long flags;
@@ -137,6 +139,9 @@ typedef struct global_data {#if CONFIG_IS_ENABLED (WDT )struct udevice *watchdog_dev;#endif +#ifdef CONFIG_GENERATE_ACPI_TABLE +struct acpi_ctx *acpi_ctx; +#endif } gd_t;#endif
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 7/30 x86: Don't bother clearing global NVS
In reply to Simon GlassThe bloblist guarantees that blobs are zeroed so there is no need to do an additional memset(). Drop it.
---
(no changes since v1)
arch/x86/cpu/intel_common/acpi.c | 1 - 1 file changed, 1 deletion(-)
arch/x86/cpu/intel_common/acpi.c +0 -1
@@ -202,7 +202,6 @@ int southbridge_inject_dsdt(const struct udevice *dev, struct acpi_ctx *ctx) (void **)&gnvs);if (ret)return log_msg_ret ("bloblist" , ret); -memset (gnvs,'\0' ,sizeof (*gnvs)); ret =acpi_create_gnvs (gnvs);if (ret)
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 8/30 x86: coral: Drop the duplicate PCIe settings
In reply to Simon GlassThese settings are included twice. The second lot are correct, so drop the others.
---
(no changes since v1)
arch/x86/dts/chromebook_coral.dts | 2 -- 1 file changed, 2 deletions(-)
arch/x86/dts/chromebook_coral.dts +0 -2
@@ -718,8 +718,6 @@ fsps,ish-enable = <0>; fsps,enable-sata = <0>; - fsps,pcie-root-port-en = [00 00 00 00 00 01]; - fsps,pcie-rp-hot-plug = [00 00 00 00 00 01]; fsps,i2c6-enable = <I2CX_ENABLE_DISABLED>; fsps,i2c7-enable = <I2CX_ENABLE_DISABLED>; fsps,hsuart3-enable = <HSUARTX_ENABLE_DISABLED>;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 9/30 x86: Add SMBIOS info for Coral
In reply to Simon GlassThis is required by Chrome OS so that the audio and other unibuild features work correctly. Add it.
---
(no changes since v1)
arch/x86/dts/chromebook_coral.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/dts/chromebook_coral.dts +8 -0
@@ -54,6 +54,14 @@ recovery-gpios = <&gpio_nw (-1) GPIO_ACTIVE_LOW>; write-protect-gpios = <&gpio_nw GPIO_75 GPIO_ACTIVE_HIGH>; phase-enforce-gpios = <&gpio_n GPIO_10 GPIO_ACTIVE_HIGH>; + smbios { + manufacturer = "Google"; + product = "Coral"; + version = "rev2"; + serial = "123456789"; + sku = "sku3"; + family = "Google_Coral"; + }; }; config {
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 10/30 x86: coral: Correct max98357 file
In reply to Simon GlassThis somehow ended up as an empty file. Fix it.
---
(no changes since v1)
.../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes 1 file changed, 0 insertions(+), 0 deletions(-)
board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat binary +0 -0
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 10/30 x86: coral: Correct max98357 file
Quoted 11 lines · Simon Glass
This somehow ended up as an empty file. Fix it.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v1)
.../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes 1 file changed, 0 insertions(+), 0 deletions(-)
PATCH v2 11/30 x86: Use if instead of #ifdef in write_tables()
In reply to Simon GlassUse if() to remove the extra build path in this code.
---
(no changes since v1)
arch/x86/lib/tables.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
arch/x86/lib/tables.c +19 -19
@@ -68,10 +68,8 @@ int write_tables(void) {u32 rom_table_start =ROM_TABLE_ADDR ;u32 rom_table_end; -#ifdef CONFIG_SEABIOS u32 high_table, table_size;struct memory_area cfg_tables[ARRAY_SIZE (table_list) +1 ]; -#endif int i;debug ("Writing tables to %x:\n" , rom_table_start);
@@ -81,30 +79,32 @@ int write_tables(void) rom_table_end = table->write (rom_table_start); rom_table_end =ALIGN (rom_table_end,ROM_TABLE_ALIGN ); -#ifdef CONFIG_SEABIOS - table_size = rom_table_end - rom_table_start; - high_table = (u32 )high_table_malloc (table_size); -if (high_table) { - table->write (high_table); - - cfg_tables[i].start = high_table; - cfg_tables[i].size = table_size; - }else { -printf ("%d: no memory for configuration tables\n" , i); -return -ENOSPC ; +if (IS_ENABLED (CONFIG_SEABIOS )) { + table_size = rom_table_end - rom_table_start; + high_table = (u32 )(ulong )high_table_malloc (table_size); +if (high_table) { + table->write (high_table); + + cfg_tables[i].start = high_table; + cfg_tables[i].size = table_size; + }else { +printf ("%d: no memory for configuration tables\n" , + i); +return -ENOSPC ; + } } -#endif debug ("- wrote '%s' to %x, end %x\n" , table->name, rom_table_start, rom_table_end); rom_table_start = rom_table_end; } -#ifdef CONFIG_SEABIOS -/* make sure the last item is zero */ - cfg_tables[i].size =0 ; -write_coreboot_table (CB_TABLE_ADDR , cfg_tables); -#endif +if (IS_ENABLED (CONFIG_SEABIOS )) { +/* make sure the last item is zero */ + cfg_tables[i].size =0 ; +write_coreboot_table (CB_TABLE_ADDR , cfg_tables); + } +debug ("- done writing tables\n" );return 0 ;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 12/30 x86: Allow putting some tables in the bloblist
In reply to Simon GlassAt present all tables are placed starting at address f0000 in memory, and can be up to 64KB in size. If the tables are very large, this may not provide enough space.
Also if the tables point to other tables (such as console log or a ramoops area) then we must allocate other memory anyway.
The bloblist is a nice place to put these tables since it is contiguous, which makes it easy to reserve this memory for linux using the 820 tables.
Add an option to put some of the tables in the bloblist. For SMBIOS and ACPI, create suitable pointers from the f0000 region to the new location of the tables.
---
(no changes since v1)
arch/x86/lib/tables.c | 46 ++++++++++++++++++++++++++++++++++++--- include/acpi/acpi_table.h | 10 +++++++++ lib/Kconfig | 9 ++++++++ lib/acpi/acpi_table.c | 4 ++-- 4 files changed, 64 insertions(+), 5 deletions(-)
arch/x86/lib/tables.c +43 -3
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <bloblist.h> #include <log.h> #include <malloc.h> #include <smbios.h>
@@ -26,10 +27,16 @@ typedef ulong (*table_write)(ulong addr);* * @name: Name of table (for debugging) * @write: Function to call to write this table +* @tag: Bloblist tag if using CONFIG_BLOBLIST_TABLES +* @size: Maximum table size +* @align: Table alignment in bytes */ struct table_info {const char *name;table_write write; +enum bloblist_tag_t tag; +int size; +int align; };static struct table_info table_list[] = {
@@ -43,10 +50,10 @@ static struct table_info table_list[] = { { "mp", write_mp_table, },#endif #ifdef CONFIG_GENERATE_ACPI_TABLE - { "acpi", write_acpi_tables, }, + { "acpi", write_acpi_tables, BLOBLISTT_ACPI_TABLES, 0x10000, 0x1000}, #endif #ifdef CONFIG_GENERATE_SMBIOS_TABLE - { "smbios", write_smbios_table, }, + { "smbios", write_smbios_table, BLOBLISTT_SMBIOS_TABLES, 0x1000, 0x100}, #endif };
@@ -66,16 +73,25 @@ void table_fill_string(char *dest, const char *src, size_t n, char pad)int write_tables (void ) { -u32 rom_table_start =ROM_TABLE_ADDR ; +u32 rom_table_start;u32 rom_table_end;u32 high_table, table_size;struct memory_area cfg_tables[ARRAY_SIZE (table_list) +1 ];int i; + rom_table_start =ROM_TABLE_ADDR ; +debug ("Writing tables to %x:\n" , rom_table_start);for (i =0 ; i <ARRAY_SIZE (table_list); i++) {const struct table_info *table = &table_list[i]; +int size = table->size ? :CONFIG_ROM_TABLE_SIZE ; +if (IS_ENABLED (CONFIG_BLOBLIST_TABLES ) && table->tag) { + rom_table_start = (ulong )bloblist_add (table->tag, size, + table->align); +if (!rom_table_start) +return log_msg_ret ("bloblist" , -ENOBUFS ); + } rom_table_end = table->write (rom_table_start); rom_table_end =ALIGN (rom_table_end,ROM_TABLE_ALIGN );
@@ -96,6 +112,11 @@ int write_tables(void)debug ("- wrote '%s' to %x, end %x\n" , table->name, rom_table_start, rom_table_end); +if (rom_table_end - rom_table_start > size) { +log_err ("Out of space for configuration tables: need %x, have %x\n" , + rom_table_end - rom_table_start, size); +return log_msg_ret ("bloblist" , -ENOSPC ); + } rom_table_start = rom_table_end; }
@@ -105,6 +126,25 @@ int write_tables(void)write_coreboot_table (CB_TABLE_ADDR , cfg_tables); } +if (IS_ENABLED (CONFIG_BLOBLIST_TABLES )) { +struct acpi_ctx *ctx = gd->acpi_ctx; +void *ptr = (void *)CONFIG_ROM_TABLE_ADDR ; + +/* Write an RSDP pointing to the tables */ +if (IS_ENABLED (CONFIG_GENERATE_ACPI_TABLE )) { +acpi_write_rsdp (ptr, ctx->rsdt, ctx->xsdt); + ptr +=ALIGN (sizeof (struct acpi_rsdp ),16 ); + } +if (IS_ENABLED (CONFIG_GENERATE_SMBIOS_TABLE )) { +void *smbios; + + smbios =bloblist_find (BLOBLISTT_SMBIOS_TABLES ,0 ); +if (!smbios) +return log_msg_ret ("smbios" , -ENOENT ); +memcpy (ptr, smbios,sizeof (struct smbios_entry )); + } + } +debug ("- done writing tables\n" );return 0 ;
include/acpi/acpi_table.h +10 -0
@@ -688,6 +688,16 @@ int acpi_add_table(struct acpi_ctx *ctx, void *table);*/ void acpi_setup_base_tables (struct acpi_ctx *ctx,void *start); +/** +* acpi_write_rsdp() - Write out an RSDP indicating where the ACPI tables are +* +* @rsdp: Address to write RSDP +* @rsdt: Address of RSDT +* @xsdt: Address of XSDT +*/ +void acpi_write_rsdp (struct acpi_rsdp *rsdp,struct acpi_rsdt *rsdt, +struct acpi_xsdt *xsdt); +#endif /* !__ACPI__*/ #include <asm/acpi_table.h>
lib/Kconfig +9 -0
@@ -624,6 +624,15 @@ config FDT_FIXUP_PARTITIONS menu "System tables" depends on (!EFI && !SYS_COREBOOT) || (ARM && EFI_LOADER) +config BLOBLIST_TABLES + bool "Put tables in a bloblist" + depends on X86 + help + Normally tables are placed at address 0xf0000 and can be up to 64KB + long. With this option, tables are instead placed in the bloblist + with a pointer from 0xf0000. The size can then be larger and the + tables can be placed high in memory. + config GENERATE_SMBIOS_TABLE bool "Generate an SMBIOS (System Management BIOS) table" default y
lib/acpi/acpi_table.c +2 -2
@@ -183,8 +183,8 @@ int acpi_add_table(struct acpi_ctx *ctx, void *table)return 0 ; } -static void acpi_write_rsdp (struct acpi_rsdp *rsdp,struct acpi_rsdt *rsdt, -struct acpi_xsdt *xsdt) +void acpi_write_rsdp (struct acpi_rsdp *rsdp,struct acpi_rsdt *rsdt, +struct acpi_xsdt *xsdt) {memset (rsdp,0 ,sizeof (struct acpi_rsdp ));
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 13/30 x86: nhlt: Correct output of bytes and 16-bit data
In reply to Simon GlassAt present these functions are incorrect. Fix them and add some logging and checking to avoid future problems.
---
(no changes since v1)
arch/x86/lib/acpi_nhlt.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/x86/lib/acpi_nhlt.c +10 -3
@@ -285,25 +285,26 @@ static void nhlt_free_resources(struct nhlt *nhlt) }struct cursor { +u8 *start;u8 *buf; };static void ser8 (struct cursor *cur,uint val) { *cur->buf = val; - cur->buf +=sizeof (val); + cur->buf +=sizeof (u8); }static void ser16 (struct cursor *cur,uint val) {put_unaligned_le16 (val, cur->buf); - cur->buf +=sizeof (val); + cur->buf +=sizeof (u16); }static void ser32 (struct cursor *cur,uint val) {put_unaligned_le32 (val, cur->buf); - cur->buf +=sizeof (val); + cur->buf +=sizeof (u32); }static void serblob (struct cursor *cur,void *from,size_t sz)
@@ -315,12 +316,14 @@ static void serblob(struct cursor *cur, void *from, size_t sz)static void serialise_specific_config (struct nhlt_specific_config *cfg,struct cursor *cur) { +log_debug ("%x\n" , cur->buf - cur->start);ser32 (cur, cfg->size);serblob (cur, cfg->capabilities, cfg->size); }static void serialise_waveform (struct nhlt_waveform *wave,struct cursor *cur) { +log_debug ("%x\n" , cur->buf - cur->start);ser16 (cur, wave->tag);ser16 (cur, wave->num_channels);ser32 (cur, wave->samples_per_second);
@@ -338,6 +341,7 @@ static void serialise_waveform(struct nhlt_waveform *wave, struct cursor *cur)static void serialise_format (struct nhlt_format *fmt,struct cursor *cur) { +log_debug ("%x\n" , cur->buf - cur->start);serialise_waveform (&fmt->waveform, cur);serialise_specific_config (&fmt->config, cur); }
@@ -346,6 +350,7 @@ static void serialise_endpoint(struct nhlt_endpoint *endp, struct cursor *cur) {int i; +log_debug ("%x\n" , cur->buf - cur->start);ser32 (cur, endp->length);ser8 (cur, endp->link_type);ser8 (cur, endp->instance_id);
@@ -405,10 +410,12 @@ int nhlt_serialise_oem_overrides(struct acpi_ctx *ctx, struct nhlt *nhlt, header->oem_revision = oem_revision; cur.buf = (void *)(header +1 ); + cur.start = (void *)header;nhlt_serialise_endpoints (nhlt, &cur); header->checksum =table_compute_checksum (header, sz);nhlt_free_resources (nhlt); +assert (cur.buf - cur.start == sz); ret =acpi_add_table (ctx, ctx->current);if (ret)
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 14/30 x86: nhlt: Fix a few bugs in the table generation
In reply to Simon GlassAt present these tables do not have the correct header, and there is an occasional incorrect value due to uninited data. Fix these bugs.
---
(no changes since v1)
arch/x86/lib/acpi_nhlt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/lib/acpi_nhlt.c +3 -1
@@ -68,6 +68,7 @@ struct nhlt_endpoint *nhlt_add_endpoint(struct nhlt *nhlt, int link_type, endp->device_type = device_type; endp->direction = dir; endp->virtual_bus_id =DEFAULT_VIRTUAL_BUS_ID ; + endp->num_formats =0 ; nhlt->num_endpoints++;
@@ -395,7 +396,7 @@ int nhlt_serialise_oem_overrides(struct acpi_ctx *ctx, struct nhlt *nhlt,/* Create header */ header = (void *)ctx->current;memset (header,'\0' ,sizeof (struct acpi_table_header )); -acpi_fill_header (header,"NHLT" ); +memcpy (header->signature,"NHLT" ,4 ); header->length = sz; header->revision =acpi_get_table_revision (ACPITAB_NHLT );
@@ -408,6 +409,7 @@ int nhlt_serialise_oem_overrides(struct acpi_ctx *ctx, struct nhlt *nhlt,memcpy (header->oem_table_id, oem_table_id, oem_table_id_len); } header->oem_revision = oem_revision; +memcpy (header->aslc_id,ASLC_ID ,4 ); cur.buf = (void *)(header +1 ); cur.start = (void *)header;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 15/30 x86: Show the interrupt pointer with 'irqinfo'
In reply to Simon GlassIt is useful for this command to show the address of the interrupt table. Add support for this.
---
(no changes since v1)
arch/x86/cpu/i386/interrupt.c | 14 +++++++------- arch/x86/include/asm/interrupt.h | 17 +++++++++++++++++ arch/x86/lib/interrupts.c | 3 +++ 3 files changed, 27 insertions(+), 7 deletions(-)
arch/x86/cpu/i386/interrupt.c +7 -7
@@ -180,16 +180,11 @@ struct idt_entry {u16 base_high; } __packed; -struct desc_ptr { -unsigned short size; -unsigned long address; -} __packed; -struct idt_entry idt[256 ]__aligned(16) ; -struct desc_ptr idt_ptr; +struct idt_ptr idt_ptr; -static inline void load_idt (const struct desc_ptr *dtr) +static inline void load_idt (const struct idt_ptr *dtr) { asmvolatile ("cs lidt %0" : :"m" (*dtr)); }
@@ -232,6 +227,11 @@ int cpu_init_interrupts(void)return 0 ; } +void interrupt_read_idt (struct idt_ptr *ptr) +{ + asmvolatile ("sidt %0" : :"m" (*ptr)); +} +void *x86_get_idt (void ) {return &idt_ptr;
arch/x86/include/asm/interrupt.h +17 -0
@@ -38,6 +38,16 @@ enum x86_exception { EXC_VE }; +/** +* struct idt_ptr - Holds the IDT (Interrupt Descriptor Table) +* +* @size: Size of IDT in bytes +*/ +struct idt_ptr { +unsigned short size; +unsigned long address; +} __packed; +/* arch/x86/cpu/interrupts.c */ void set_vector (u8 intnum,void *routine);
@@ -61,4 +71,11 @@ void configure_irq_trigger(int int_num, bool is_level_triggered);void *x86_get_idt (void ); +/** +* interrupt_read_idt() - Read the IDT +* +* @ptr: Place to put IDT contents +*/ +void interrupt_read_idt (struct idt_ptr *ptr); +#endif
arch/x86/lib/interrupts.c +3 -0
@@ -131,8 +131,11 @@ void do_irq(int hw_irq)int do_irqinfo (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {#if !CONFIG_IS_ENABLED (X86_64 ) +struct idt_ptr ptr;int irq; +interrupt_read_idt (&ptr); +printf ("IDT at %lx, size %x\n" , ptr.address, ptr.size);printf ("Spurious IRQ: %u, last unknown IRQ: %d\n" , spurious_irq_cnt, spurious_irq);
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 16/30 x86: sound: Correct error handling
In reply to Simon GlassA few functions have changed to return pin numbers or I2C addresses. The error checking for some of the callers is therefore wrong. Fix them.
---
(no changes since v1)
drivers/sound/da7219.c | 4 ++-- drivers/sound/max98357a.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/sound/da7219.c +2 -2
@@ -54,13 +54,13 @@ static int da7219_acpi_fill_ssdt(const struct udevice *dev,acpigen_write_name (ctx,"_CRS" );acpigen_write_resourcetemplate_header (ctx); ret =acpi_device_write_i2c_dev (ctx, dev); -if (ret) +if (ret <0 )return log_msg_ret ("i2c" , ret);/* Use either Interrupt() or GpioInt() */ ret =acpi_device_write_interrupt_or_gpio (ctx, (struct udevice *)dev,"req-gpios" ); -if (ret) +if (ret <0 )return log_msg_ret ("irq_gpio" , ret);acpigen_write_resourcetemplate_footer (ctx);
drivers/sound/max98357a.c +1 -1
@@ -69,7 +69,7 @@ static int max98357a_acpi_fill_ssdt(const struct udevice *dev,acpigen_write_name (ctx,"_CRS" );acpigen_write_resourcetemplate_header (ctx); ret =acpi_device_write_gpio_desc (ctx, &priv->sdmode_gpio); -if (ret) +if (ret <0 )return log_msg_ret ("gpio" , ret);acpigen_write_resourcetemplate_footer (ctx);
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 17/30 acpi: Correct reset handling in acpi_device_add_power_res()
In reply to Simon GlassIf there is no reset line, this still emits ACPI code for the reset GPIO. Fix it by updating the check.
---
(no changes since v1)
lib/acpi/acpi_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/acpi/acpi_device.c +1 -1
@@ -422,7 +422,7 @@ int acpi_device_add_power_res(struct acpi_ctx *ctx, u32 tx_state_val,/* Method (_ON, 0, Serialized) */ acpigen_write_method_serialized (ctx,"_ON" ,0 ); -if (reset_gpio) { +if (has_reset) { ret =acpigen_set_enable_tx_gpio (ctx, tx_state_val, dw0_read, dw0_write, &reset, true);if (ret)
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 18/30 x86: acpi: Allow the SSDT to be empty
In reply to Simon GlassIf there is nothing in the SSDT we should not include it in the tables. Update the implementation to check this.
---
(no changes since v1)
arch/x86/lib/acpi_table.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
arch/x86/lib/acpi_table.c +15 -7
@@ -470,8 +470,9 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) header->checksum =table_compute_checksum ((void *)spcr, header->length); } -void acpi_create_ssdt (struct acpi_ctx *ctx,struct acpi_table_header *ssdt, -const char *oem_table_id) +static int acpi_create_ssdt (struct acpi_ctx *ctx, +struct acpi_table_header *ssdt, +const char *oem_table_id) {memset ((void *)ssdt,'\0' ,sizeof (struct acpi_table_header ));
@@ -484,9 +485,19 @@ void acpi_create_ssdt(struct acpi_ctx *ctx, struct acpi_table_header *ssdt,acpi_fill_ssdt (ctx); -/* (Re)calculate length and checksum. */ +/* (Re)calculate length and checksum */ ssdt->length = ctx->current - (void *)ssdt; ssdt->checksum =table_compute_checksum ((void *)ssdt, ssdt->length); +log_debug ("SSDT at %p, length %x\n" , ssdt, ssdt->length); + +/* Drop the table if it is empty */ +if (ssdt->length ==sizeof (struct acpi_table_header )) { + ctx->current = ssdt; +return -ENOENT ; + } +acpi_align (ctx); + +return 0 ; }/*
@@ -596,11 +607,8 @@ ulong write_acpi_tables(ulong start_addr)debug ("ACPI: * SSDT\n" ); ssdt = (struct acpi_table_header *)ctx->current; -acpi_create_ssdt (ctx, ssdt,OEM_TABLE_ID ); -if (ssdt->length >sizeof (struct acpi_table_header )) { -acpi_inc_align (ctx, ssdt->length); +if (!acpi_create_ssdt (ctx, ssdt,OEM_TABLE_ID ))acpi_add_table (ctx, ssdt); - }debug ("ACPI: * MCFG\n" ); mcfg = ctx->current;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 19/30 x86: acpi: Put the generated code first in DSDT
In reply to Simon GlassThe current implementation for DSDT tables is not correct for the case where there is generated code, as the length ends up being incorrect. Also, we want the generated code to go first in the table.
Rewrite this piece to correct these problems.
---
(no changes since v1)
arch/x86/lib/acpi_table.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
arch/x86/lib/acpi_table.c +18 -9
@@ -505,6 +505,7 @@ static int acpi_create_ssdt(struct acpi_ctx *ctx,*/ ulong write_acpi_tables (ulong start_addr) { +const int thl =sizeof (struct acpi_table_header );struct acpi_ctx *ctx;struct acpi_facs *facs;struct acpi_table_header *dsdt;
@@ -516,6 +517,7 @@ ulong write_acpi_tables(ulong start_addr)struct acpi_csrt *csrt;struct acpi_spcr *spcr;void *start; +int aml_len;ulong addr;int ret;int i;
@@ -541,21 +543,28 @@ ulong write_acpi_tables(ulong start_addr) dsdt = ctx->current;/* Put the table header first */ -memcpy (dsdt, &AmlCode,sizeof (struct acpi_table_header )); -acpi_inc (ctx,sizeof (struct acpi_table_header )); +memcpy (dsdt, &AmlCode, thl); +acpi_inc (ctx, thl); +log_debug ("DSDT starts at %p, hdr ends at %p\n" , dsdt, ctx->current);/* If the table is not empty, allow devices to inject things */ -if (dsdt->length >=sizeof (struct acpi_table_header )) -acpi_inject_dsdt (ctx); + aml_len = dsdt->length - thl; +if (aml_len) { +void *base = ctx->current; -/* Copy in the AML code itself if any (after the header) */ -memcpy (ctx->current, - (char *)&AmlCode +sizeof (struct acpi_table_header ), - dsdt->length -sizeof (struct acpi_table_header )); +acpi_inject_dsdt (ctx); +log_debug ("Added %x bytes from inject_dsdt, now at %p\n" , + ctx->current - base, ctx->current); +log_debug ("Copy AML code size %x to %p\n" , aml_len, + ctx->current); +memcpy (ctx->current, AmlCode + thl, aml_len); +acpi_inc (ctx, aml_len); + } -acpi_inc (ctx, dsdt->length -sizeof (struct acpi_table_header )); dsdt->length = ctx->current - (void *)dsdt;acpi_align (ctx); +log_debug ("Updated DSDT length to %x, total %x\n" , dsdt->length, + ctx->current - (void *)dsdt);if (!IS_ENABLED (CONFIG_ACPI_GNVS_EXTERNAL )) {/* Pack GNVS into the ACPI table area */
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 20/30 acpi: Don't reset the tables with every new generation
In reply to Simon GlassAt present if SSDT and DSDT code is created, only the latter is retained for examination by the 'acpi items' command. Fix this by only resetting the list when explicitly requested.
---
(no changes since v1)
arch/x86/lib/acpi_table.c | 1 + drivers/core/acpi.c | 10 ++++++---- include/dm/acpi.h | 9 +++++++++ test/dm/acpi.c | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-)
arch/x86/lib/acpi_table.c +1 -0
@@ -531,6 +531,7 @@ ulong write_acpi_tables(ulong start_addr)debug ("ACPI: Writing ACPI tables at %lx\n" , start_addr); +acpi_reset_items ();acpi_setup_base_tables (ctx, start);debug ("ACPI: * FACS\n" );
drivers/core/acpi.c +6 -4
@@ -268,8 +268,7 @@ int acpi_recurse_method(struct acpi_ctx *ctx, struct udevice *parent,if (func) {void *start = ctx->current; -log_debug ("\n" ); -log_debug ("- %s %p\n" , parent->name, func); +log_debug ("- method %d, %s %p\n" , method, parent->name, func); ret =device_ofdata_to_platdata (parent);if (ret)return log_msg_ret ("ofdata" , ret);
@@ -299,7 +298,6 @@ int acpi_fill_ssdt(struct acpi_ctx *ctx)int ret;log_debug ("Writing SSDT tables\n" ); - item_count =0 ; ret =acpi_recurse_method (ctx,dm_root (),METHOD_FILL_SSDT ,TYPE_SSDT );log_debug ("Writing SSDT finished, err=%d\n" , ret); ret =sort_acpi_item_type (ctx, start,TYPE_SSDT );
@@ -315,7 +313,6 @@ int acpi_inject_dsdt(struct acpi_ctx *ctx)int ret;log_debug ("Writing DSDT tables\n" ); - item_count =0 ; ret =acpi_recurse_method (ctx,dm_root (),METHOD_INJECT_DSDT ,TYPE_DSDT );log_debug ("Writing DSDT finished, err=%d\n" , ret);
@@ -326,6 +323,11 @@ int acpi_inject_dsdt(struct acpi_ctx *ctx)return ret; } +void acpi_reset_items (void ) +{ + item_count =0 ; +} +int acpi_write_dev_tables (struct acpi_ctx *ctx) {int ret;
include/dm/acpi.h +9 -0
@@ -226,6 +226,15 @@ void acpi_dump_items(enum acpi_dump_option option);*/ int acpi_get_path (const struct udevice *dev,char *out_path,int maxlen); +/** +* acpi_reset_items() - Reset the list of ACPI items to empty +* +* This list keeps track of DSDT and SSDT items that are generated +* programmatically. The 'acpi items' command shows the list. Use this function +* to empty the list, before writing new items. +*/ +void acpi_reset_items (void ); +#endif /* __ACPI__ */ #endif
test/dm/acpi.c +4 -0
@@ -477,6 +477,7 @@ static int dm_test_acpi_fill_ssdt(struct unit_test_state *uts) buf =malloc (BUF_SIZE );ut_assertnonnull (buf); +acpi_reset_items (); ctx.current = buf; buf[4 ] ='z' ;/* sentinel */ ut_assertok (acpi_fill_ssdt (&ctx));
@@ -507,6 +508,7 @@ static int dm_test_acpi_inject_dsdt(struct unit_test_state *uts) buf =malloc (BUF_SIZE );ut_assertnonnull (buf); +acpi_reset_items (); ctx.current = buf; buf[4 ] ='z' ;/* sentinel */ ut_assertok (acpi_inject_dsdt (&ctx));
@@ -537,6 +539,7 @@ static int dm_test_acpi_cmd_items(struct unit_test_state *uts) buf =malloc (BUF_SIZE );ut_assertnonnull (buf); +acpi_reset_items (); ctx.current = buf;ut_assertok (acpi_fill_ssdt (&ctx));console_record_reset ();
@@ -545,6 +548,7 @@ static int dm_test_acpi_cmd_items(struct unit_test_state *uts)ut_assert_nextline ("dev 'acpi-test2', type 1, size 2" );ut_assert_console_end (); +acpi_reset_items (); ctx.current = buf;ut_assertok (acpi_inject_dsdt (&ctx));console_record_reset ();
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 21/30 x86: Define the Chrome OS GNVS region
In reply to Simon GlassIt is not possible to boot Chrome OS properly without passing some basic information from U-Boot. This applies even if verified boot is not being used. Add a structure definition for this.
---
Changes in v2:
- Rename struct chromeos_acpi to struct chromeos_acpi_gnvs
- Fix comment style
arch/x86/include/asm/intel_gnvs.h | 51 ++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
arch/x86/include/asm/intel_gnvs.h +50 -1
@@ -9,6 +9,55 @@#ifndef _INTEL_GNVS_H_#define _INTEL_GNVS_H_ +/* +* The chromeos_acpi portion of ACPI GNVS is assumed to live from offset +* 0x100 - 0x1000. When defining acpi_global_nvs, use check_member +* to ensure that it is properly aligned: +* +* check_member(acpi_global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET); +*/ +#define GNVS_CHROMEOS_ACPI_OFFSET 0x100 + +enum { +CHSW_RECOVERY_X86 =BIT (1 ), +CHSW_RECOVERY_EC =BIT (2 ), +CHSW_DEVELOPER_SWITCH =BIT (5 ), +CHSW_FIRMWARE_WP =BIT (9 ), +}; + +enum { +FIRMWARE_TYPE_AUTO_DETECT =-1 , +FIRMWARE_TYPE_RECOVERY =0 , +FIRMWARE_TYPE_NORMAL =1 , +FIRMWARE_TYPE_DEVELOPER =2 , +FIRMWARE_TYPE_NETBOOT =3 , +FIRMWARE_TYPE_LEGACY =4 , +}; + +struct __packed chromeos_acpi_gnvs { +/* ChromeOS-specific */ +u32 boot_reason;/* 00 boot reason */ +u32 active_main_fw;/* 04 (0=recovery, 1=A, 2=B) */ +u32 activeec_fw;/* 08 (0=RO, 1=RW) */ +u16 switches;/* 0c CHSW */ +u8 vbt4[256 ];/* 0e HWID */ +u8 vbt5[64 ];/* 10e FWID */ +u8 vbt6[64 ];/* 14e FRID - 275 */ +u32 main_fw_type;/* 18e (2 = developer mode) */ +u32 vbt8;/* 192 recovery reason */ +u32 vbt9;/* 196 fmap base address */ +u8 vdat[3072 ];/* 19a VDAT space filled by verified boot */ +u32 vbt10;/* d9a smbios bios version */ +u32 mehh[8 ];/* d9e management engine hash */ +u32 ramoops_base;/* dbe ramoops base address */ +u32 ramoops_len;/* dc2 ramoops length */ +u32 vpd_ro_base;/* dc6 pointer to RO_VPD */ +u32 vpd_ro_size;/* dca size of RO_VPD */ +u32 vpd_rw_base;/* dce pointer to RW_VPD */ +u32 vpd_rw_size;/* dd2 size of RW_VPD */ +u8 pad[298 ];/* dd6-eff */ +}; +struct __packed acpi_global_nvs {/* Miscellaneous */ u8 pcnt;/* 0x00 - Processor Count */
@@ -31,7 +80,7 @@ struct __packed acpi_global_nvs {u8 unused1[0x100 -0x3d ];/* Pad out to 256 bytes */ #ifdef CONFIG_CHROMEOS /* ChromeOS-specific (0x100 - 0xfff) */ -struct chromeos_acpi chromeos; +struct chromeos_acpi_gnvs chromeos;#else u8 unused2[0x1000 -0x100 ];/* Pad out to 4096 bytes */ #endif
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 21/30 x86: Define the Chrome OS GNVS region
Quoted 6 lines · Simon Glass
It is not possible to boot Chrome OS properly without passing some basic information from U-Boot. This applies even if verified boot is not being used. Add a structure definition for this.
Signed-off-by Simon Glass <[email protected]>
Quoted 9 lines
---
Changes in v2:
- Rename structchromeos_acpito structchromeos_acpi_gnvs
- Fix comment stylearch/x86/include/asm/intel_gnvs.h | 51 ++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
PATCH v2 22/30 x86: Use CONFIG_CHROMEOS_VBOOT for verified boot
In reply to Simon GlassAt present CONFIG_CHROMEOS is used to determine whether verified boot is in use. The code to implement that is not in U-Boot mainline.
However, it is useful to be able to boot a Chromebook in developer mode in U-Boot mainline without needing the verified boot code.
To allow this, use CONFIG_CHROMEOS_VBOOT to indicate that verified boot should be used, and CONFIG_CHROMEOS to indicate that the board supports Chrome OS. That allows us to define CONFIG_CHROMEOS on coral.
---
Changes in v2:
- Define CONFIG_CHROMEOS_VBOOT in the Kconfig too
- Correct a bisect build error
Kconfig | 17 +++++++++++++++++ arch/x86/cpu/apollolake/acpi.c | 3 ++- arch/x86/dts/chromebook_coral.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/include/asm/intel_gnvs.h | 3 --- arch/x86/lib/tpl.c | 2 +- configs/chromebook_coral_defconfig | 3 ++- 7 files changed, 24 insertions(+), 8 deletions(-)
Kconfig +17 -0
@@ -759,6 +759,23 @@ config ARCH_FIXUP_FDT_MEMORY used for booting OS with different memory setup where the part of the memory location should be used for different purpose. +config CHROMEOS + bool "Support booting Chrome OS" + help + Chrome OS requires U-Boot to set up a table indicating the boot mode + (e.g. Developer mode) and a few other things. Enable this if you are + booting on a Chromebook to avoid getting an error about an invalid + firmware ID. + +config CHROMEOS_VBOOT + bool "Support Chrome OS verified boot" + help + This is intended to enable the full Chrome OS verified boot support + in U-Boot. It is not actually implemented in the U-Boot source code + at present, so this option is always set to 'n'. It allows + distinguishing between booting Chrome OS in a basic way (developer + mode) and a full boot. + endmenu # Boot images source "api/Kconfig"
arch/x86/cpu/apollolake/acpi.c +2 -1
@@ -75,7 +75,8 @@ int acpi_create_gnvs(struct acpi_global_nvs *gnvs)/* TODO(sjg at chromium.org): Add the console log to gnvs->cbmc */ -#ifdef CONFIG_CHROMEOS +/* Disable this code until a later patch */ +#if 0 /* Initialise Verified Boot data */ chromeos_init_acpi (&gnvs->chromeos); gnvs->chromeos.vbt2 =ACTIVE_ECFW_RO ;
arch/x86/dts/chromebook_coral.dts +1 -1
@@ -9,7 +9,7 @@ /include/ "rtc.dtsi" /include/ "tsc_timer.dtsi" -#ifdef CONFIG_CHROMEOS +#ifdef CONFIG_CHROMEOS_VBOOT #include "chromeos-x86.dtsi" #include "flashmap-x86-ro.dtsi" #include "flashmap-16mb-rw.dtsi"
arch/x86/dts/chromebook_samus.dts +1 -1
@@ -9,7 +9,7 @@ /include/ "rtc.dtsi" /include/ "tsc_timer.dtsi" -#ifdef CONFIG_CHROMEOS +#ifdef CONFIG_CHROMEOS_VBOOT #include "chromeos-x86.dtsi" #include "flashmap-x86-ro.dtsi" #include "flashmap-8mb-rw.dtsi"
arch/x86/include/asm/intel_gnvs.h +0 -3
@@ -85,9 +85,6 @@ struct __packed acpi_global_nvs {u8 unused2[0x1000 -0x100 ];/* Pad out to 4096 bytes */ #endif }; - -#ifdef CONFIG_CHROMEOS check_member (acpi_global_nvs, chromeos,GNVS_CHROMEOS_ACPI_OFFSET ); -#endif #endif /* _INTEL_GNVS_H_ */
arch/x86/lib/tpl.c +1 -1
@@ -75,7 +75,7 @@ void board_init_f_r(void)u32 spl_boot_device (void ) { -return IS_ENABLED (CONFIG_CHROMEOS ) ?BOOT_DEVICE_CROS_VBOOT : +return IS_ENABLED (CONFIG_CHROMEOS_VBOOT ) ?BOOT_DEVICE_CROS_VBOOT :BOOT_DEVICE_SPI_MMAP ; }
configs/chromebook_coral_defconfig +2 -1
@@ -2,9 +2,9 @@ CONFIG_X86=y CONFIG_SYS_TEXT_BASE=0x1110000 CONFIG_SYS_MALLOC_F_LEN=0x3d00 CONFIG_NR_DRAM_BANKS=8 +CONFIG_MAX_CPUS=8 CONFIG_SPL_DM_SPI=y CONFIG_SPL_TEXT_BASE=0xfef10000 -CONFIG_MAX_CPUS=8 CONFIG_SPL_SYS_MALLOC_F_LEN=0xf000 CONFIG_BOOTSTAGE_STASH_ADDR=0xfef00000 CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -21,6 +21,7 @@ CONFIG_INTEL_CAR_CQOS=y CONFIG_X86_OFFSET_U_BOOT=0xffd00000 CONFIG_X86_OFFSET_SPL=0xffe80000 CONFIG_INTEL_GENERIC_WIFI=y +CONFIG_CHROMEOS=y CONFIG_BOOTSTAGE=y CONFIG_SPL_BOOTSTAGE=y CONFIG_TPL_BOOTSTAGE=y
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 22/30 x86: Use CONFIG_CHROMEOS_VBOOT for verified boot
Quoted 18 lines · Simon Glass
At present
CONFIG_CHROMEOSis used to determine whether verified boot is in use. The code to implement that is not in U-Boot mainline.However, it is useful to be able to boot a Chromebook in developer mode in U-Boot mainline without needing the verified boot code.
To allow this, use
CONFIG_CHROMEOS_VBOOTto indicate that verified boot should be used, andCONFIG_CHROMEOSto indicate that the board supports Chrome OS. That allows us to defineCONFIG_CHROMEOSon coral.Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- DefineCONFIG_CHROMEOS_VBOOTin theKconfigtoo
- Correct a bisect build error
Quoted 9 lines
Kconfig | 17 +++++++++++++++++ arch/x86/cpu/apollolake/acpi.c | 3 ++- arch/x86/dts/chromebook_coral.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/include/asm/intel_gnvs.h | 3 --- arch/x86/lib/tpl.c | 2 +- configs/chromebook_coral_defconfig | 3 ++- 7 files changed, 24 insertions(+), 8 deletions(-)
PATCH v2 23/30 x86: Set up Chrome OS to boot into developer mode
In reply to Simon GlassSet up a few fields necessarily to make Chrome OS boot without showing a firmware error.
---
(no changes since v1)
arch/x86/cpu/apollolake/acpi.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
arch/x86/cpu/apollolake/acpi.c +20 -6
@@ -65,6 +65,21 @@ int arch_write_sci_irq_select(uint scis)return 0 ; } +/** +* chromeos_init_acpi() - Initialise basic data to boot Chrome OS +* +* This tells Chrome OS to boot in developer mode +* +* @cros: Structure to initialise +*/ +static void chromeos_init_acpi (struct chromeos_acpi_gnvs *cros) +{ + cros->active_main_fw =1 ; + cros->active_main_fw =1 ;/* A */ + cros->switches =CHSW_DEVELOPER_SWITCH ; + cros->main_fw_type =2 ;/* Developer */ +} +int acpi_create_gnvs (struct acpi_global_nvs *gnvs) {struct udevice *cpu;
@@ -75,12 +90,9 @@ int acpi_create_gnvs(struct acpi_global_nvs *gnvs)/* TODO(sjg at chromium.org): Add the console log to gnvs->cbmc */ -/* Disable this code until a later patch */ -#if 0 -/* Initialise Verified Boot data */ -chromeos_init_acpi (&gnvs->chromeos); - gnvs->chromeos.vbt2 =ACTIVE_ECFW_RO ; -#endif +if (IS_ENABLED (CONFIG_CHROMEOS )) +chromeos_init_acpi (&gnvs->chromeos); +/* Set unknown wake source */ gnvs->pm1i = ~0ULL ;
@@ -93,6 +105,8 @@ int acpi_create_gnvs(struct acpi_global_nvs *gnvs) gnvs->pcnt = ret; } + gnvs->dpte =1 ; +return 0 ; }
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 24/30 x86: Boot coral into Chrome OS by default
In reply to Simon GlassAdd a script to boot Chrome OS from the internal MMC. This involved adding a few commands and options.
---
(no changes since v1)
configs/chromebook_coral_defconfig | 10 +++++++--- include/configs/chromebook_coral.h | 9 ++++++++- 2 files changed, 15 insertions(+), 4 deletions(-)
configs/chromebook_coral_defconfig +7 -3
@@ -29,8 +29,10 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_SPL_BOOTSTAGE_RECORD_COUNT=10 CONFIG_BOOTSTAGE_STASH=y CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS2,115200n8 cros_legacy loglevel=9 init=/sbin/init oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw noinitrd vt.global_cursor_default=0 add_efi_memmap boot=local noresume noswap i915.modeset=1 nmi_watchdog=panic,lapic disablevmx=off" +CONFIG_BOOTARGS="" +CONFIG_BOOTARGS_SUBST=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LOGF_FUNC=y CONFIG_SPL_LOG=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_LAST_STAGE_INIT=y
@@ -55,11 +57,11 @@ CONFIG_CMD_READ=y CONFIG_CMD_SATA=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_TPM=y +CONFIG_CMD_CBFS=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y
@@ -72,7 +74,6 @@ CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_ENV_OVERWRITE=y -# CONFIG_NET is not set CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_OF_TRANSLATE=y
@@ -106,10 +107,13 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_VIDEO_COPY=y +CONFIG_FS_CBFS=y CONFIG_SPL_FS_CBFS=y +CONFIG_FAT_WRITE=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_TPL_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y # CONFIG_GZIP is not set +CONFIG_BLOBLIST_TABLES=y # CONFIG_EFI_LOADER is not set
include/configs/chromebook_coral.h +8 -1
@@ -11,7 +11,14 @@#define __CONFIG_H#define CONFIG_BOOTCOMMAND \ - "fatload mmc 1:c 1000000 syslinux/vmlinuz.A; zboot 1000000" + "tpm init; tpm startup TPM2_SU_CLEAR; " \ + "read mmc 2:2 100000 0 80; setexpr loader *001004f0; " \ + "setexpr size *00100518; setexpr blocks $size / 200; " \ + "read mmc 2:2 100000 80 $blocks; setexpr setup $loader - 1000; " \ + "setexpr cmdline $loader - 2000; " \ + "part uuid mmc 2:2 uuid; setenv bootargs_U $uuid; " \ + "zboot start 100000 0 0 0 $setup $cmdline; " \ + "zboot load; zboot setup; zboot dump; zboot go"#include <configs/x86-common.h> #include <configs/x86-chromebook.h>
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 25/30 x86: fsp: Convert fsp_dram to use log_debug()
In reply to Simon GlassUse log_debug() instead of debug() in this file, to enable the extra features.
---
(no changes since v1)
arch/x86/lib/fsp2/fsp_dram.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/x86/lib/fsp2/fsp_dram.c +6 -2
@@ -4,6 +4,8 @@* Written by Simon Glass <[email protected]> */ +#define LOG_CATEGORY LOGC_ARCH +#include <common.h> #include <handoff.h> #include <init.h>
@@ -35,7 +37,7 @@ int dram_init(void) ret =fsp_memory_init (s3wake,IS_ENABLED (CONFIG_APL_BOOT_FROM_FAST_SPI_FLASH ));if (ret) { -debug ("Memory init failed (err=%x)\n" , ret); +log_debug ("Memory init failed (err=%x)\n" , ret);return ret; }
@@ -60,7 +62,7 @@ int dram_init(void)struct spl_handoff *ho = gd->spl_handoff;if (!ho) { -debug ("No SPL handoff found\n" ); +log_debug ("No SPL handoff found\n" );return -ESTRPIPE ; } gd->ram_size = ho->ram_size;
@@ -82,6 +84,8 @@ ulong board_get_usable_ram_top(ulong total_size)#if CONFIG_IS_ENABLED (HANDOFF )struct spl_handoff *ho = gd->spl_handoff; +log_debug ("usable_ram_top = %lx\n" , ho->arch.usable_ram_top); +return ho->arch.usable_ram_top;#endif
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 26/30 x86: Silence some logging statements
In reply to Simon GlassQuite a few log_info() calls are included in the x86 code which should use log_debug() instead. Convert them to reduce unwanted output.
---
(no changes since v1)
arch/x86/cpu/apollolake/fsp_s.c | 8 ++++---- arch/x86/cpu/intel_common/intel_opregion.c | 2 +- arch/x86/cpu/intel_common/itss.c | 8 ++++---- arch/x86/lib/acpi_nhlt.c | 2 +- arch/x86/lib/fsp/fsp_graphics.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/cpu/apollolake/fsp_s.c +4 -4
@@ -116,10 +116,10 @@ static int set_power_limits(struct udevice *dev)/* Program package power limits in RAPL MSR */ msr_write (MSR_PKG_POWER_LIMIT , limit); -log_info ("RAPL PL1 %d.%dW\n" , tdp / power_unit, -100 * (tdp % power_unit) / power_unit); -log_info ("RAPL PL2 %d.%dW\n" , pl2_val / power_unit, -100 * (pl2_val % power_unit) / power_unit); +log_debug ("RAPL PL1 %d.%dW\n" , tdp / power_unit, +100 * (tdp % power_unit) / power_unit); +log_debug ("RAPL PL2 %d.%dW\n" , pl2_val / power_unit, +100 * (pl2_val % power_unit) / power_unit);/* * Sett RAPL MMIO register for Power limits. RAPL driver is using MSR
arch/x86/cpu/intel_common/intel_opregion.c +1 -1
@@ -42,7 +42,7 @@ static int locate_vbt(char **vbtp, int *sizep)return -EINVAL ; } -log_info ("Found a VBT of %u bytes\n" , size); +log_debug ("Found a VBT of %u bytes\n" , size); *sizep = size; *vbtp = vbt_data;
arch/x86/cpu/intel_common/itss.c +4 -4
@@ -67,7 +67,7 @@ static int snapshot_polarities(struct udevice *dev) reg_start = start /IRQS_PER_IPC ; reg_end =DIV_ROUND_UP (end,IRQS_PER_IPC ); -log_info ("ITSS IRQ Polarities snapshot %p\n" , priv->irq_snapshot); +log_debug ("ITSS IRQ Polarities snapshot %p\n" , priv->irq_snapshot);for (i = reg_start; i < reg_end; i++) {uint reg =PCR_ITSS_IPC0_CONF +sizeof (u32) * i;
@@ -89,11 +89,11 @@ static void show_polarities(struct udevice *dev, const char *msg) {int i; -log_info ("ITSS IRQ Polarities %s:\n" , msg); +log_debug ("ITSS IRQ Polarities %s:\n" , msg);for (i =0 ; i <NUM_IPC_REGS ; i++) {uint reg =PCR_ITSS_IPC0_CONF +sizeof (u32) * i; -log_info ("IPC%d: 0x%08x\n" , i,pcr_read32 (dev, reg)); +log_debug ("IPC%d: 0x%08x\n" , i,pcr_read32 (dev, reg)); } }
@@ -115,7 +115,7 @@ static int restore_polarities(struct udevice *dev) sizeof(priv->irq_snapshot));show_polarities (dev,"Before" ); -log_info ("priv->irq_snapshot %p\n" , priv->irq_snapshot); +log_debug ("priv->irq_snapshot %p\n" , priv->irq_snapshot); reg_start = start /IRQS_PER_IPC ; reg_end =DIV_ROUND_UP (end,IRQS_PER_IPC );
arch/x86/lib/acpi_nhlt.c +1 -1
@@ -390,7 +390,7 @@ int nhlt_serialise_oem_overrides(struct acpi_ctx *ctx, struct nhlt *nhlt,size_t oem_table_id_len;int ret; -log_info ("ACPI: * NHLT\n" ); +log_debug ("ACPI: * NHLT\n" ); sz =nhlt_current_size (nhlt);/* Create header */
arch/x86/lib/fsp/fsp_graphics.c +1 -1
@@ -139,7 +139,7 @@ static int fsp_video_acpi_write_tables(const struct udevice *dev,struct igd_opregion *opregion;int ret; -printf ("ACPI: * IGD OpRegion\n" ); +log_debug ("ACPI: * IGD OpRegion\n" ); opregion = (struct igd_opregion *)ctx->current; ret =intel_gma_init_igd_opregion ((struct udevice *)dev, opregion);
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 27/30 x86: acpi: Include the TPMv1 table only if needed
In reply to Simon GlassThis table is not needed if a v2 TPM is in use. Add a condition to avoid adding it when not needed.
---
(no changes since v1)
arch/x86/lib/acpi_table.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
arch/x86/lib/acpi_table.c +11 -8
@@ -646,14 +646,17 @@ ulong write_acpi_tables(ulong start_addr)acpi_inc_align (ctx, madt->header.length);acpi_add_table (ctx, madt); -debug ("ACPI: * TCPA\n" ); - tcpa = (struct acpi_tcpa *)ctx->current; - ret =acpi_create_tcpa (tcpa); -if (ret) { -log_warning ("Failed to create TCPA table (err=%d)\n" , ret); - }else { -acpi_inc_align (ctx, tcpa->header.length); -acpi_add_table (ctx, tcpa); +if (IS_ENABLED (CONFIG_TPM_V1 )) { +debug ("ACPI: * TCPA\n" ); + tcpa = (struct acpi_tcpa *)ctx->current; + ret =acpi_create_tcpa (tcpa); +if (ret) { +log_warning ("Failed to create TCPA table (err=%d)\n" , + ret); + }else { +acpi_inc_align (ctx, tcpa->header.length); +acpi_add_table (ctx, tcpa); + } }debug ("ACPI: * CSRT\n" );
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 28/30 x86: acpi: Don't show the UART address by default
In reply to Simon GlassThis is useful when using Linux's earlycon since the MMIO address must be provided on some platforms, e.g.:
earlycon=uart8250,mmio32,0xddffc000,115200n8
However this is only for debugging, so don't show it by default.
---
(no changes since v1)
arch/x86/lib/acpi_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/acpi_table.c +1 -1
@@ -767,7 +767,7 @@ int acpi_write_dbg2_pci_uart(struct acpi_ctx *ctx, struct udevice *dev,* 32-bits each. This is only for debugging so it is not a big deal. */ addr =dm_pci_read_bar32 (dev,0 ); -printf ("UART addr %lx\n" , (ulong )addr); +log_debug ("UART addr %lx\n" , (ulong )addr);memset (&address,'\0' ,sizeof (address)); address.space_id =ACPI_ADDRESS_SPACE_MEMORY ;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 29/30 x86: pinctrl: Silence the warning when a pin is not found
In reply to Simon GlassThis does not necessarily indicate a problem, since some pins are optional. Let the caller show an error if necessary.
---
(no changes since v1)
drivers/pinctrl/intel/pinctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/intel/pinctrl.c +1 -1
@@ -154,7 +154,7 @@ static int pinctrl_get_device(uint pad, struct udevice **devp)return 0 ; } } -printf ("pad %d not found\n" , pad); +log_debug ("pad %d not found\n" , pad);return -ENOTBLK ; }
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 30/30 x86: fsp: Adjust calculations for MTRR range and DRAM top
In reply to Simon GlassAt present the top of available DRAM is the same as the top of the range of the low-memory MTRR.
In fact, U-Boot is allowed to use memory up until the start of the FSP reserved memory. Use that value for low_end, since it makes more memory available.
Keep the same calculation as before for mtrr_top, i.e. the top of reserved memory.
A side-effect of this change is that the E820 tables have a single entry that extends from the bottom of the memory used by U-Boot to the bottom of the FSP reserved memory. This includes the bloblist, if ACPI tables are placed there.
---
Changes in v2:
- Drop patch "Store the FADT so we can avoid searching for it"
- Drop patch "Move ROM_TABLE_ADDR into the C file"
arch/x86/lib/fsp/fsp_dram.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
arch/x86/lib/fsp/fsp_dram.c +22 -13
@@ -41,8 +41,10 @@ int fsp_scan_for_ram_size(void)int dram_init_banksize (void ) { +efi_guid_t fsp =FSP_HOB_RESOURCE_OWNER_FSP_GUID ;const struct hob_header *hdr;struct hob_res_desc *res_desc; +phys_addr_t mtrr_top;phys_addr_t low_end;uint bank;
@@ -54,35 +56,42 @@ int dram_init_banksize(void)return 0 ; } - low_end =0 ; + low_end =0 ;/* top of low memory usable by U-Boot */ + mtrr_top =0 ;/* top of low memory (even if reserved) */ for (bank =1 , hdr = gd->arch.hob_list; bank <CONFIG_NR_DRAM_BANKS && !end_of_hob (hdr); hdr =get_next_hob (hdr)) {if (hdr->type !=HOB_TYPE_RES_DESC )continue ; res_desc = (struct hob_res_desc *)hdr; +if (!guidcmp (&res_desc->owner, &fsp)) + low_end = res_desc->phys_start;if (res_desc->type !=RES_SYS_MEM && res_desc->type !=RES_MEM_RESERVED )continue ;if (res_desc->phys_start < (1ULL <<32 )) { - low_end =max (low_end, - res_desc->phys_start + res_desc->len); -continue ; + mtrr_top =max (mtrr_top, + res_desc->phys_start + res_desc->len); + }else { + gd->bd->bi_dram[bank].start = res_desc->phys_start; + gd->bd->bi_dram[bank].size = res_desc->len; +mtrr_add_request (MTRR_TYPE_WRBACK , res_desc->phys_start, + res_desc->len); +log_debug ("ram %llx %llx\n" , + gd->bd->bi_dram[bank].start, + gd->bd->bi_dram[bank].size); } - - gd->bd->bi_dram[bank].start = res_desc->phys_start; - gd->bd->bi_dram[bank].size = res_desc->len; -mtrr_add_request (MTRR_TYPE_WRBACK , res_desc->phys_start, - res_desc->len); -log_debug ("ram %llx %llx\n" , gd->bd->bi_dram[bank].start, - gd->bd->bi_dram[bank].size); }/* Add the memory below 4GB */ gd->bd->bi_dram[0 ].start =0 ; gd->bd->bi_dram[0 ].size = low_end; -mtrr_add_request (MTRR_TYPE_WRBACK ,0 , low_end); +/* +* Set up an MTRR to the top of low, reserved memory. This is necessary +* for graphics to run at full speed in U-Boot. +*/ +mtrr_add_request (MTRR_TYPE_WRBACK ,0 , mtrr_top);return 0 ; }
@@ -156,7 +165,7 @@ unsigned int install_e820_map(unsigned int max_entries,#if CONFIG_IS_ENABLED (HANDOFF ) &&IS_ENABLED (CONFIG_USE_HOB )int handoff_arch_save (struct spl_handoff *ho) { - ho->arch.usable_ram_top =fsp_get_usable_lowmem_top (gd->arch.hob_list); + ho->arch.usable_ram_top = gd->bd->bi_dram[0 ].size; ho->arch.hob_list = gd->arch.hob_list;return 0 ;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
v2 cover x86: Allow Coral to boot into Chrome OS
In reply to Simon GlassHi Bin,
Quoted 96 lines · Simon Glass
This series adds various minor features and tweaks to allow Coral to boot into Chrome OS from U-Boot.
It relies on three other series which have been recently sent:
- smbios (u-boot-dm/smbios-working)
- bootm (u-boot-dm/bootm-working)
- misca (u-boot-dm/misca-working)This should provide a solid base for using ACPI on other Intel Apollo Lake (APL) devices.
Changes in v2:
- Renameupdate_fixed_mtrss()toupdate_fixed_mtrrs()
- Add comments toenable_pm_timer_emulation()andcpu_mca_configure()
- Convert tabs to spaces for consistency
- Uselog_err()to report error
- Rename structchromeos_acpito structchromeos_acpi_gnvs
- Fix comment style
- DefineCONFIG_CHROMEOS_VBOOTin theKconfigtoo
- Correct a bisect build error
- Drop patch "Store the FADT so we can avoid searching for it"
- Drop patch "MoveROM_TABLE_ADDRinto the C file"Simon Glass (30):
Add an assembly guard aroundlinux/bitops.h
x86: apl: Add core init for the SoC
x86: Add a layout for Chrome OS verified boot
x86: Add support for private files
x86: Allow writing tables to fail
x86: acpi: Store the ACPI context inglobal_data
x86: Don't bother clearing global NVS
x86: coral: Drop the duplicate PCIe settings
x86: Add SMBIOS info for Coral
x86: coral: Correct max98357 file
x86: Use if instead of #ifdef inwrite_tables()
x86: Allow putting some tables in the bloblist
x86: nhlt: Correct output of bytes and 16-bit data
x86: nhlt: Fix a few bugs in the table generation
x86: Show the interrupt pointer with 'irqinfo'
x86: sound: Correct error handling
acpi: Correct reset handling inacpi_device_add_power_res()
x86: acpi: Allow the SSDT to be empty
x86: acpi: Put the generated code first in DSDT
acpi: Don't reset the tables with every new generation
x86: Define the Chrome OS GNVS region
x86: UseCONFIG_CHROMEOS_VBOOTfor verified boot
x86: Set up Chrome OS to boot into developer mode
x86: Boot coral into Chrome OS by default
x86: fsp: Convertfsp_dramto uselog_debug()
x86: Silence some logging statements
x86: acpi: Include the TPMv1 table only if needed
x86: acpi: Don't show the UART address by default
x86: pinctrl: Silence the warning when a pin is not found
x86: fsp: Adjust calculations for MTRR range and DRAM topKconfig | 17 ++++ arch/x86/cpu/apollolake/acpi.c | 25 ++++-- arch/x86/cpu/apollolake/cpu.c | 84 +++++++++++++++++ arch/x86/cpu/apollolake/cpu_common.c | 25 ++++++ arch/x86/cpu/apollolake/cpu_spl.c | 20 ----- arch/x86/cpu/apollolake/fsp_s.c | 8 +- arch/x86/cpu/cpu.c | 9 +- arch/x86/cpu/i386/interrupt.c | 14 +-- arch/x86/cpu/intel_common/acpi.c | 1 - arch/x86/cpu/intel_common/cpu.c | 19 ++++ arch/x86/cpu/intel_common/intel_opregion.c | 2 +- arch/x86/cpu/intel_common/itss.c | 8 +- arch/x86/dts/chromebook_coral.dts | 12 ++- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/u-boot.dtsi | 4 + arch/x86/include/asm/acpi/vbnv_layout.h | 38 ++++++++ arch/x86/include/asm/arch-apollolake/cpu.h | 14 +++ arch/x86/include/asm/cpu_common.h | 9 ++ arch/x86/include/asm/intel_gnvs.h | 54 ++++++++++- arch/x86/include/asm/interrupt.h | 17 ++++ arch/x86/include/asm/msr-index.h | 20 ++++- arch/x86/include/asm/tables.h | 4 +- arch/x86/lib/acpi_nhlt.c | 19 ++-- arch/x86/lib/acpi_table.c | 78 ++++++++++------ arch/x86/lib/fsp/fsp_dram.c | 35 +++++--- arch/x86/lib/fsp/fsp_graphics.c | 2 +- arch/x86/lib/fsp2/fsp_dram.c | 8 +- arch/x86/lib/interrupts.c | 3 + arch/x86/lib/tables.c | 85 +++++++++++++----- arch/x86/lib/tpl.c | 2 +- .../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes configs/chromebook_coral_defconfig | 13 ++- drivers/core/acpi.c | 10 ++- drivers/pinctrl/intel/pinctrl.c | 2 +- drivers/sound/da7219.c | 4 +- drivers/sound/max98357a.c | 2 +- include/acpi/acpi_table.h | 10 +++ include/asm-generic/global_data.h | 5 ++ include/configs/chromebook_coral.h | 9 +-
Quoted 8 lines
include/dm/acpi.h | 9 ++ include/linux/bitops.h | 4 +- lib/Kconfig | 9 ++ lib/acpi/acpi_device.c | 2 +- lib/acpi/acpi_table.c | 4 +- test/dm/acpi.c | 4 + 45 files changed, 585 insertions(+), 140 deletions(-) create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
Just checking on this series and a few others in your patchwork queue.
Regards,
SImon
v2 cover x86: Allow Coral to boot into Chrome OS
Hi Simon,
Quoted 109 lines · Simon Glass
Hi Bin,
Quoted 96 lines · Simon Glass
This series adds various minor features and tweaks to allow Coral to boot into Chrome OS from U-Boot.
It relies on three other series which have been recently sent:
- smbios (u-boot-dm/smbios-working)
- bootm (u-boot-dm/bootm-working)
- misca (u-boot-dm/misca-working)This should provide a solid base for using ACPI on other Intel Apollo Lake (APL) devices.
Changes in v2:
- Renameupdate_fixed_mtrss()toupdate_fixed_mtrrs()
- Add comments toenable_pm_timer_emulation()andcpu_mca_configure()
- Convert tabs to spaces for consistency
- Uselog_err()to report error
- Rename structchromeos_acpito structchromeos_acpi_gnvs
- Fix comment style
- DefineCONFIG_CHROMEOS_VBOOTin theKconfigtoo
- Correct a bisect build error
- Drop patch "Store the FADT so we can avoid searching for it"
- Drop patch "MoveROM_TABLE_ADDRinto the C file"Simon Glass (30):
Add an assembly guard aroundlinux/bitops.h
x86: apl: Add core init for the SoC
x86: Add a layout for Chrome OS verified boot
x86: Add support for private files
x86: Allow writing tables to fail
x86: acpi: Store the ACPI context inglobal_data
x86: Don't bother clearing global NVS
x86: coral: Drop the duplicate PCIe settings
x86: Add SMBIOS info for Coral
x86: coral: Correct max98357 file
x86: Use if instead of #ifdef inwrite_tables()
x86: Allow putting some tables in the bloblist
x86: nhlt: Correct output of bytes and 16-bit data
x86: nhlt: Fix a few bugs in the table generation
x86: Show the interrupt pointer with 'irqinfo'
x86: sound: Correct error handling
acpi: Correct reset handling inacpi_device_add_power_res()
x86: acpi: Allow the SSDT to be empty
x86: acpi: Put the generated code first in DSDT
acpi: Don't reset the tables with every new generation
x86: Define the Chrome OS GNVS region
x86: UseCONFIG_CHROMEOS_VBOOTfor verified boot
x86: Set up Chrome OS to boot into developer mode
x86: Boot coral into Chrome OS by default
x86: fsp: Convertfsp_dramto uselog_debug()
x86: Silence some logging statements
x86: acpi: Include the TPMv1 table only if needed
x86: acpi: Don't show the UART address by default
x86: pinctrl: Silence the warning when a pin is not found
x86: fsp: Adjust calculations for MTRR range and DRAM topKconfig | 17 ++++ arch/x86/cpu/apollolake/acpi.c | 25 ++++-- arch/x86/cpu/apollolake/cpu.c | 84 +++++++++++++++++ arch/x86/cpu/apollolake/cpu_common.c | 25 ++++++ arch/x86/cpu/apollolake/cpu_spl.c | 20 ----- arch/x86/cpu/apollolake/fsp_s.c | 8 +- arch/x86/cpu/cpu.c | 9 +- arch/x86/cpu/i386/interrupt.c | 14 +-- arch/x86/cpu/intel_common/acpi.c | 1 - arch/x86/cpu/intel_common/cpu.c | 19 ++++ arch/x86/cpu/intel_common/intel_opregion.c | 2 +- arch/x86/cpu/intel_common/itss.c | 8 +- arch/x86/dts/chromebook_coral.dts | 12 ++- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/dts/u-boot.dtsi | 4 + arch/x86/include/asm/acpi/vbnv_layout.h | 38 ++++++++ arch/x86/include/asm/arch-apollolake/cpu.h | 14 +++ arch/x86/include/asm/cpu_common.h | 9 ++ arch/x86/include/asm/intel_gnvs.h | 54 ++++++++++- arch/x86/include/asm/interrupt.h | 17 ++++ arch/x86/include/asm/msr-index.h | 20 ++++- arch/x86/include/asm/tables.h | 4 +- arch/x86/lib/acpi_nhlt.c | 19 ++-- arch/x86/lib/acpi_table.c | 78 ++++++++++------ arch/x86/lib/fsp/fsp_dram.c | 35 +++++--- arch/x86/lib/fsp/fsp_graphics.c | 2 +- arch/x86/lib/fsp2/fsp_dram.c | 8 +- arch/x86/lib/interrupts.c | 3 + arch/x86/lib/tables.c | 85 +++++++++++++----- arch/x86/lib/tpl.c | 2 +- .../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes configs/chromebook_coral_defconfig | 13 ++- drivers/core/acpi.c | 10 ++- drivers/pinctrl/intel/pinctrl.c | 2 +- drivers/sound/da7219.c | 4 +- drivers/sound/max98357a.c | 2 +- include/acpi/acpi_table.h | 10 +++ include/asm-generic/global_data.h | 5 ++ include/configs/chromebook_coral.h | 9 +-Quoted 8 lines
include/dm/acpi.h | 9 ++ include/linux/bitops.h | 4 +- lib/Kconfig | 9 ++ lib/acpi/acpi_device.c | 2 +- lib/acpi/acpi_table.c | 4 +- test/dm/acpi.c | 4 + 45 files changed, 585 insertions(+), 140 deletions(-) create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
Quoted 1 line
Just checking on this series and a few others in your patchwork queue.
Will look into the queue.
But this series does not apply.
Applying: Add an assembly guard around linux/bitops.h
Applying: x86: apl: Add core init for the SoC
Applying: x86: Add a layout for Chrome OS verified boot
Applying: x86: Add support for private files
error: patch failed: arch/x86/dts/u-boot.dtsi:138
error: arch/x86/dts/u-boot.dtsi: patch does not apply Patch failed at 0004 x86: Add support for private files
Regards,
Bin