Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50952 )
Change subject: soc/intel: Drop `bootblock_cpu_init()` function ......................................................................
soc/intel: Drop `bootblock_cpu_init()` function
Just call `fast_spi_cache_bios_region()` directly instead.
Change-Id: I99f6ed4cf1a5c49b078cfd05e357c2d4c26ade45 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/50952 Reviewed-by: Michael Niewöhner foss@mniewoehner.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/alderlake/Makefile.inc M src/soc/intel/alderlake/bootblock/bootblock.c D src/soc/intel/alderlake/bootblock/cpu.c M src/soc/intel/alderlake/include/soc/bootblock.h M src/soc/intel/cannonlake/Makefile.inc M src/soc/intel/cannonlake/bootblock/bootblock.c D src/soc/intel/cannonlake/bootblock/cpu.c M src/soc/intel/cannonlake/include/soc/bootblock.h M src/soc/intel/elkhartlake/Makefile.inc M src/soc/intel/elkhartlake/bootblock/bootblock.c D src/soc/intel/elkhartlake/bootblock/cpu.c M src/soc/intel/elkhartlake/include/soc/bootblock.h M src/soc/intel/icelake/Makefile.inc M src/soc/intel/icelake/bootblock/bootblock.c D src/soc/intel/icelake/bootblock/cpu.c M src/soc/intel/icelake/include/soc/bootblock.h M src/soc/intel/jasperlake/Makefile.inc M src/soc/intel/jasperlake/bootblock/bootblock.c D src/soc/intel/jasperlake/bootblock/cpu.c M src/soc/intel/jasperlake/include/soc/bootblock.h M src/soc/intel/skylake/Makefile.inc M src/soc/intel/skylake/bootblock/bootblock.c D src/soc/intel/skylake/bootblock/cpu.c M src/soc/intel/skylake/include/soc/bootblock.h M src/soc/intel/tigerlake/Makefile.inc M src/soc/intel/tigerlake/bootblock/bootblock.c D src/soc/intel/tigerlake/bootblock/cpu.c M src/soc/intel/tigerlake/include/soc/bootblock.h 28 files changed, 14 insertions(+), 135 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/src/soc/intel/alderlake/Makefile.inc b/src/soc/intel/alderlake/Makefile.inc index fc3d63e..bb731a1 100644 --- a/src/soc/intel/alderlake/Makefile.inc +++ b/src/soc/intel/alderlake/Makefile.inc @@ -15,7 +15,6 @@ all-y += uart.c
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c bootblock-y += espi.c diff --git a/src/soc/intel/alderlake/bootblock/bootblock.c b/src/soc/intel/alderlake/bootblock/bootblock.c index 96e6268..b8086a4 100644 --- a/src/soc/intel/alderlake/bootblock/bootblock.c +++ b/src/soc/intel/alderlake/bootblock/bootblock.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> #include <intelblocks/uart.h> @@ -16,7 +17,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init(); if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) uart_bootblock_init(); diff --git a/src/soc/intel/alderlake/bootblock/cpu.c b/src/soc/intel/alderlake/bootblock/cpu.c deleted file mode 100644 index 4225358..0000000 --- a/src/soc/intel/alderlake/bootblock/cpu.c +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* - * This file is created based on Intel Alder Lake Processor PCH Datasheet - * Document number: 621483 - * Chapter number: 7 - */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - /* - * Alderlake platform doesn't support booting from any other media - * than SPI flash and on IA platform SPI is memory mapped hence - * enabling temporary caching of memory-mapped spi boot media. - */ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/alderlake/include/soc/bootblock.h b/src/soc/intel/alderlake/include/soc/bootblock.h index 087d29f..0cf334f 100644 --- a/src/soc/intel/alderlake/include/soc/bootblock.h +++ b/src/soc/intel/alderlake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_ALDERLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */ diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc index 28b5ad0..d212d94 100644 --- a/src/soc/intel/cannonlake/Makefile.inc +++ b/src/soc/intel/cannonlake/Makefile.inc @@ -10,7 +10,6 @@ subdirs-y += ../../../cpu/intel/common
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += pmutil.c bootblock-y += bootblock/report_platform.c diff --git a/src/soc/intel/cannonlake/bootblock/bootblock.c b/src/soc/intel/cannonlake/bootblock/bootblock.c index 255bac8..dfa0bd0 100644 --- a/src/soc/intel/cannonlake/bootblock/bootblock.c +++ b/src/soc/intel/cannonlake/bootblock/bootblock.c @@ -2,6 +2,7 @@
#include <bootblock_common.h> #include <cpu/x86/mtrr.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/gspi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> @@ -52,7 +53,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init(); if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) uart_bootblock_init(); diff --git a/src/soc/intel/cannonlake/bootblock/cpu.c b/src/soc/intel/cannonlake/bootblock/cpu.c deleted file mode 100644 index 30c1a41..0000000 --- a/src/soc/intel/cannonlake/bootblock/cpu.c +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - /* Temporarily cache the memory-mapped boot media. */ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/cannonlake/include/soc/bootblock.h b/src/soc/intel/cannonlake/include/soc/bootblock.h index 6ac2bc2..dea7d47 100644 --- a/src/soc/intel/cannonlake/include/soc/bootblock.h +++ b/src/soc/intel/cannonlake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_CANNONLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */ diff --git a/src/soc/intel/elkhartlake/Makefile.inc b/src/soc/intel/elkhartlake/Makefile.inc index 5c46f86..371f952 100644 --- a/src/soc/intel/elkhartlake/Makefile.inc +++ b/src/soc/intel/elkhartlake/Makefile.inc @@ -16,7 +16,6 @@ all-y += uart.c
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c bootblock-y += espi.c diff --git a/src/soc/intel/elkhartlake/bootblock/bootblock.c b/src/soc/intel/elkhartlake/bootblock/bootblock.c index 96e6268..b8086a4 100644 --- a/src/soc/intel/elkhartlake/bootblock/bootblock.c +++ b/src/soc/intel/elkhartlake/bootblock/bootblock.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> #include <intelblocks/uart.h> @@ -16,7 +17,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init(); if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) uart_bootblock_init(); diff --git a/src/soc/intel/elkhartlake/bootblock/cpu.c b/src/soc/intel/elkhartlake/bootblock/cpu.c deleted file mode 100644 index bbce44c..0000000 --- a/src/soc/intel/elkhartlake/bootblock/cpu.c +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - /* - * Elkhartlake platform doesn't support booting from any other media - * (like eMMC on APL/GLK platform) than only booting from SPI device - * and on IA platform SPI is memory mapped hence enabling temporarily - * caching on memory-mapped spi boot media. - */ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/elkhartlake/include/soc/bootblock.h b/src/soc/intel/elkhartlake/include/soc/bootblock.h index 2dc50c1..1173bbe 100644 --- a/src/soc/intel/elkhartlake/include/soc/bootblock.h +++ b/src/soc/intel/elkhartlake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_ELKHARTLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */ diff --git a/src/soc/intel/icelake/Makefile.inc b/src/soc/intel/icelake/Makefile.inc index 05f4846..05e11f2 100644 --- a/src/soc/intel/icelake/Makefile.inc +++ b/src/soc/intel/icelake/Makefile.inc @@ -16,7 +16,6 @@ all-y += uart.c
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c bootblock-y += espi.c diff --git a/src/soc/intel/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c index df1fb56..ef5ada6 100644 --- a/src/soc/intel/icelake/bootblock/bootblock.c +++ b/src/soc/intel/icelake/bootblock/bootblock.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> #include <intelblocks/uart.h> @@ -16,7 +17,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init(); if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) uart_bootblock_init(); diff --git a/src/soc/intel/icelake/bootblock/cpu.c b/src/soc/intel/icelake/bootblock/cpu.c deleted file mode 100644 index bf5fc1b..0000000 --- a/src/soc/intel/icelake/bootblock/cpu.c +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - /* - * Icelake platform doesn't support booting from any other media - * (like eMMC on APL/GLK platform) than only booting from SPI device - * and on IA platform SPI is memory mapped hence enabling temporarily - * cacheing on memory-mapped spi boot media. - * - * This assumption will not hold good for APL/GLK platform where boot - * from eMMC is also possible options. - */ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/icelake/include/soc/bootblock.h b/src/soc/intel/icelake/include/soc/bootblock.h index f22b266..cdc350f 100644 --- a/src/soc/intel/icelake/include/soc/bootblock.h +++ b/src/soc/intel/icelake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_ICELAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */ diff --git a/src/soc/intel/jasperlake/Makefile.inc b/src/soc/intel/jasperlake/Makefile.inc index 677b5f3..ccff1e0 100644 --- a/src/soc/intel/jasperlake/Makefile.inc +++ b/src/soc/intel/jasperlake/Makefile.inc @@ -16,7 +16,6 @@ all-y += uart.c
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c bootblock-y += espi.c diff --git a/src/soc/intel/jasperlake/bootblock/bootblock.c b/src/soc/intel/jasperlake/bootblock/bootblock.c index 96e6268..b8086a4 100644 --- a/src/soc/intel/jasperlake/bootblock/bootblock.c +++ b/src/soc/intel/jasperlake/bootblock/bootblock.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> #include <intelblocks/uart.h> @@ -16,7 +17,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init(); if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) uart_bootblock_init(); diff --git a/src/soc/intel/jasperlake/bootblock/cpu.c b/src/soc/intel/jasperlake/bootblock/cpu.c deleted file mode 100644 index 292733a..0000000 --- a/src/soc/intel/jasperlake/bootblock/cpu.c +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - /* - * Jasperlake platform doesn't support booting from any other media - * (like eMMC on APL/GLK platform) than only booting from SPI device - * and on IA platform SPI is memory mapped hence enabling temporarily - * cacheing on memory-mapped spi boot media. - * - * This assumption will not hold good for APL/GLK platform where boot - * from eMMC is also possible options. - */ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/jasperlake/include/soc/bootblock.h b/src/soc/intel/jasperlake/include/soc/bootblock.h index 413ae4f..678a2c4 100644 --- a/src/soc/intel/jasperlake/include/soc/bootblock.h +++ b/src/soc/intel/jasperlake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_JASPERLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */ diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc index de516c1..1d36feb 100644 --- a/src/soc/intel/skylake/Makefile.inc +++ b/src/soc/intel/skylake/Makefile.inc @@ -11,7 +11,6 @@ subdirs-y += ../../../cpu/x86/tsc
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += i2c.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c index 65c631a..7b8b147 100644 --- a/src/soc/intel/skylake/bootblock/bootblock.c +++ b/src/soc/intel/skylake/bootblock/bootblock.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/gspi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> @@ -17,7 +18,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init();
if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) diff --git a/src/soc/intel/skylake/bootblock/cpu.c b/src/soc/intel/skylake/bootblock/cpu.c deleted file mode 100644 index bf487c3..0000000 --- a/src/soc/intel/skylake/bootblock/cpu.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/skylake/include/soc/bootblock.h b/src/soc/intel/skylake/include/soc/bootblock.h index 5e67735..90c4a40 100644 --- a/src/soc/intel/skylake/include/soc/bootblock.h +++ b/src/soc/intel/skylake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_SKYLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */ diff --git a/src/soc/intel/tigerlake/Makefile.inc b/src/soc/intel/tigerlake/Makefile.inc index f206406..baa9261 100644 --- a/src/soc/intel/tigerlake/Makefile.inc +++ b/src/soc/intel/tigerlake/Makefile.inc @@ -16,7 +16,6 @@ all-y += uart.c
bootblock-y += bootblock/bootblock.c -bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c bootblock-y += espi.c diff --git a/src/soc/intel/tigerlake/bootblock/bootblock.c b/src/soc/intel/tigerlake/bootblock/bootblock.c index 96e6268..b8086a4 100644 --- a/src/soc/intel/tigerlake/bootblock/bootblock.c +++ b/src/soc/intel/tigerlake/bootblock/bootblock.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> +#include <intelblocks/fast_spi.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> #include <intelblocks/uart.h> @@ -16,7 +17,7 @@ { bootblock_systemagent_early_init(); bootblock_pch_early_init(); - bootblock_cpu_init(); + fast_spi_cache_bios_region(); pch_early_iorange_init(); if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) uart_bootblock_init(); diff --git a/src/soc/intel/tigerlake/bootblock/cpu.c b/src/soc/intel/tigerlake/bootblock/cpu.c deleted file mode 100644 index ed9381c..0000000 --- a/src/soc/intel/tigerlake/bootblock/cpu.c +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* - * This file is created based on Intel Tiger Lake Processor PCH Datasheet - * Document number: 575857 - * Chapter number: 6 - */ - -#include <intelblocks/fast_spi.h> -#include <soc/bootblock.h> - -void bootblock_cpu_init(void) -{ - /* - * Tigerlake platform doesn't support booting from any other media - * (like eMMC on APL/GLK platform) than only booting from SPI device - * and on IA platform SPI is memory mapped hence enabling temporarily - * cacheing on memory-mapped spi boot media. - * - * This assumption will not hold good for APL/GLK platform where boot - * from eMMC is also possible options. - */ - fast_spi_cache_bios_region(); -} diff --git a/src/soc/intel/tigerlake/include/soc/bootblock.h b/src/soc/intel/tigerlake/include/soc/bootblock.h index 87be0e0..71a16a5 100644 --- a/src/soc/intel/tigerlake/include/soc/bootblock.h +++ b/src/soc/intel/tigerlake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_TIGERLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void);
/* Bootblock post console init programming */