coreboot-gerrit May 2021

coreboot-gerrit@coreboot.org

1 participants
6048 discussions

Change in coreboot[master]: mb/google/volteer: Add variant_devtree_update
by Chen Wisley (Code Review) 10 Jun '23

10 Jun '23

Hello Wisley Chen, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/47354 to review the following change. Change subject: mb/google/volteer: Add variant_devtree_update ...................................................................... mb/google/volteer: Add variant_devtree_update Add variant_devtree_update() to override devicetree setting. BUG=none BRANCH=volteer TEST=emerge-volteer coreboot Signed-off-by: Wisley Chen <wisley.chen(a)quanta.corp-partner.google.com> Change-Id: Ida87617669e6c843b48427e87e9bb154a5df7d9e --- M src/mainboard/google/volteer/mainboard.c M src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/47354/1 diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index acba972..77f9f57 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -64,6 +64,11 @@ } } +void __weak variant_devtree_update(void) +{ + /* Override dev tree settings per board */ +} + static void mainboard_init(struct device *dev) { mainboard_ec_init(); @@ -114,6 +119,7 @@ cfg->gpio_override_pm = 1; memset(cfg->gpio_pm, 0, sizeof(cfg->gpio_pm)); } + variant_devtree_update(); } static void mainboard_chip_init(void *chip_info) diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h index 8408198..4d5dc87 100644 --- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h @@ -21,4 +21,7 @@ const struct ddr_memory_cfg *variant_memory_params(void); int variant_memory_sku(void); +/* Modify devictree settings during ramstage. */ +void variant_devtree_update(void); + #endif /* __BASEBOARD_VARIANTS_H__ */ -- To view, visit https://review.coreboot.org/c/coreboot/+/47354 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ida87617669e6c843b48427e87e9bb154a5df7d9e Gerrit-Change-Number: 47354 Gerrit-PatchSet: 1 Gerrit-Owner: Chen Wisley <wisley.chen(a)quantatw.com> Gerrit-Reviewer: Wisley Chen <wisley.chen(a)quanta.corp-partner.google.com> Gerrit-MessageType: newchange

2 1

Change in coreboot[master]: HACK: Random SPM debugging code
by Nicolas Boichat (Code Review) 10 Jun '23

10 Jun '23

Nicolas Boichat has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47359 ) Change subject: HACK: Random SPM debugging code ...................................................................... HACK: Random SPM debugging code Change-Id: I5880a91628e6999094257c49d1a4f0348fc69eeb --- M src/soc/mediatek/mt8192/spm.c 1 file changed, 46 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/47359/1 diff --git a/src/soc/mediatek/mt8192/spm.c b/src/soc/mediatek/mt8192/spm.c index e263fc3..cf8b10e 100644 --- a/src/soc/mediatek/mt8192/spm.c +++ b/src/soc/mediatek/mt8192/spm.c @@ -493,6 +493,9 @@ u32 dmem_start; u32 con0; + printk(BIOS_INFO, "SPM firmware @%08lx (Pmem:%08x/Total:%08x).\n", + (long)(pcm->buf), pcm->desc.pmem_words, pcm->desc.total_words); + ptr = (uintptr_t) pcm->buf + 0x40000000; pmem_words = pcm->desc.pmem_words; total_words = pcm->desc.total_words; @@ -517,7 +520,23 @@ write32(&mtk_spm->md32pcm_dma0_wpto, dmem_start); write32(&mtk_spm->md32pcm_dma0_count, total_words); write32(&mtk_spm->md32pcm_dma0_con, MD32PCM_DMA0_CON_VAL); + write32(&mtk_spm->md32pcm_dma0_start, 0); write32(&mtk_spm->md32pcm_dma0_start, MD32PCM_DMA0_START_VAL); + + { + u32 rlct[32]; u32 pc[32]; int i; + for (i = 0; i < ARRAY_SIZE(rlct); i++) { + pc[i] = read32(&mtk_spm->md32pcm_pc); + rlct[i] = read32(&mtk_spm->md32pcm_dma0_rlct); + udelay(1); + } + + printk(BIOS_INFO, "spm md32pcm_dma0_rlct @%08lx\n", (long)&mtk_spm->md32pcm_dma0_rlct); + for (i = 0; i < ARRAY_SIZE(rlct); i++) { + printk(BIOS_INFO, "spm rlct[%d] = 0x%x\n", i, rlct[i]); + printk(BIOS_INFO, "spm pc[%d] = 0x%x\n", i, pc[i]); + } + } } else { write32(&mtk_spm->pcm_con1, read32(&mtk_spm->pcm_con1) | SPM_REGWR_CFG_KEY | RG_IM_SLAVE_LSB); @@ -526,6 +545,7 @@ /* kick IM to fetch (only toggle IM_KICK) */ con0 = read32(&mtk_spm->pcm_con0); write32(&mtk_spm->pcm_con0, con0 | SPM_REGWR_CFG_KEY | PCM_CK_EN_LSB); + printk(BIOS_INFO, "SPM con0 0x%08x/0x%08x\n", con0, con0 | SPM_REGWR_CFG_KEY | PCM_CK_EN_LSB); } #define SPM_DEBUG_DUMP 1 @@ -721,9 +741,12 @@ write32(&mtk_spm->spm_sw_rsv_8, pwrctrl->pcm_flags1); } +static u32 pc[4096]; + static void spm_kick_pcm_to_run(struct pwr_ctrl *pwrctrl) { u32 con0, rstn; + int i, cnt; /* Waiting for loading SPMFW done*/ while (read32(&mtk_spm->md32pcm_dma0_rlct) != 0x0) @@ -746,14 +769,24 @@ write32(&mtk_spm->md32pcm_cfgreg_sw_rstn, rstn | MD32PCM_CFGREG_SW_RSTN_RESET); - /* Waiting for SPM init done */ - udelay(SPM_INIT_DONE_US); + for (cnt = 0; cnt < ARRAY_SIZE(pc); cnt++) { + pc[cnt] = read32(&mtk_spm->md32pcm_pc); + if (pc[cnt] == 0x3f4) + break; + /* Waiting for SPM init done */ + //udelay(SPM_INIT_DONE_US/ARRAY_SIZE(pc)); + } + + printk(BIOS_INFO, "spm pc @%08lx (%d loops)\n", (long)&mtk_spm->md32pcm_pc, cnt); + for (i = 0; i < cnt; i++) + printk(BIOS_INFO, "spm pc[%d] = 0x%x\n", i, pc[i]); } -int spm_init(void) +static inline int spm_init_lon(void) { struct dyna_load_pcm pcm; struct stopwatch sw; + int i; stopwatch_init(&sw); @@ -780,5 +813,15 @@ __func__, stopwatch_duration_msecs(&sw), read32(&mtk_spm->md32pcm_pc)); + for (i = 0; i < sizeof(*mtk_spm)/4; i++) { + u32* p = (u32 *)mtk_spm; + printk(BIOS_INFO, "SPM: %08lx=%08x\n", (long)&p[i], read32(&p[i])); + } + return 0; } + +int spm_init(void) { + /* Shorten __func__ in function above */ + return spm_init_lon(); +} -- To view, visit https://review.coreboot.org/c/coreboot/+/47359 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5880a91628e6999094257c49d1a4f0348fc69eeb Gerrit-Change-Number: 47359 Gerrit-PatchSet: 1 Gerrit-Owner: Nicolas Boichat <drinkcat(a)chromium.org> Gerrit-MessageType: newchange

3 2

Change in coreboot[master]: mb/scaleway/tagada: Add bmcinfo field confMRC to configure FSP MRC code
by Julien Viard de Galbert (Code Review) 10 Jun '23

10 Jun '23

Julien Viard de Galbert has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47479 ) Change subject: mb/scaleway/tagada: Add bmcinfo field confMRC to configure FSP MRC code ...................................................................... mb/scaleway/tagada: Add bmcinfo field confMRC to configure FSP MRC code The BMC now expose an extra field to give more control over the FSP MRC options. Change-Id: I2cad2ec24ff61d384e040c23a24782d8934b6f0b Signed-off-by: Julien Viard de Galbert <jviarddegalbert(a)online.net> --- M src/mainboard/scaleway/tagada/bmcinfo.c M src/mainboard/scaleway/tagada/bmcinfo.h M src/mainboard/scaleway/tagada/romstage.c 3 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/47479/1 diff --git a/src/mainboard/scaleway/tagada/bmcinfo.c b/src/mainboard/scaleway/tagada/bmcinfo.c index 9f30a7e..b2037fc 100644 --- a/src/mainboard/scaleway/tagada/bmcinfo.c +++ b/src/mainboard/scaleway/tagada/bmcinfo.c @@ -21,6 +21,7 @@ u8 bootOption; u8 hwRev; // Note: Initial implementation ended here u8 disableNic1; + u8 confMRC; u8 endMarker; // Insert new fields before } biosBmcInfo_t; @@ -162,6 +163,15 @@ return 0; } +int bmcinfo_conf_mrc(void) +{ + if (IS_BMC_INFO_FIELD_VALID(confMRC)) { + printk(BIOS_DEBUG, "bmcInfo confMRC=%x\n", BMC_INFO->confMRC); + return BMC_INFO->confMRC; + } + return CONF_MRC_DEFAULT; +} + /* Add override functions below */ /* Override default uart baudrate */ diff --git a/src/mainboard/scaleway/tagada/bmcinfo.h b/src/mainboard/scaleway/tagada/bmcinfo.h index 016de9b..de014bb 100644 --- a/src/mainboard/scaleway/tagada/bmcinfo.h +++ b/src/mainboard/scaleway/tagada/bmcinfo.h @@ -13,6 +13,13 @@ // Reset after boot sequence (don't go to EFI shell) #define BOOT_OPTION_NO_EFISHELL 0x80 +// Enable FastBoot +#define CONF_MRC_FAST_BOOT 1 +// Enable MRC RMT reporting +#define CONF_MRC_RMT_ENABLE 2 + +#define CONF_MRC_DEFAULT (CONF_MRC_FAST_BOOT | CONF_MRC_RMT_ENABLE) + char *bmcinfo_serial(void); u8 *bmcinfo_uuid(void); int bmcinfo_slot(void); @@ -23,5 +30,6 @@ int bmcinfo_relax_security(void); int bmcinfo_boot_option(void); int bmcinfo_disable_nic1(void); +int bmcinfo_conf_mrc(void); #endif /* MAINBOARD_BMCINFO_H */ diff --git a/src/mainboard/scaleway/tagada/romstage.c b/src/mainboard/scaleway/tagada/romstage.c index f041b6f..6b3ac47 100644 --- a/src/mainboard/scaleway/tagada/romstage.c +++ b/src/mainboard/scaleway/tagada/romstage.c @@ -41,6 +41,7 @@ // Enable Rmt and Fast Boot by default, RMT will be run only on first // boot or when dimms change - mupd->FspmConfig.PcdMrcRmtSupport = 1; - mupd->FspmConfig.PcdFastBoot = 1; + int confMRC = bmcinfo_conf_mrc(); + mupd->FspmConfig.PcdMrcRmtSupport = (confMRC & CONF_MRC_RMT_ENABLE)?1:0; + mupd->FspmConfig.PcdFastBoot = (confMRC & CONF_MRC_FAST_BOOT)?1:0; } -- To view, visit https://review.coreboot.org/c/coreboot/+/47479 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2cad2ec24ff61d384e040c23a24782d8934b6f0b Gerrit-Change-Number: 47479 Gerrit-PatchSet: 1 Gerrit-Owner: Julien Viard de Galbert <coreboot-review-ju(a)vdg.name> Gerrit-MessageType: newchange

2 1

Change in coreboot[master]: mb/hatch + soc/intel/cannonlake: Enable TetonGlacierMode on hatch
by David Jimenez (Code Review) 10 Jun '23

10 Jun '23

David Jimenez has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38947 ) Change subject: mb/hatch + soc/intel/cannonlake: Enable TetonGlacierMode on hatch ...................................................................... mb/hatch + soc/intel/cannonlake: Enable TetonGlacierMode on hatch Enabling TetonGlacierMode allows for reconfiguring the PCIe lanes at runtime for hybrid drives. BUG=b:149171631 BRANCH=none TEST=Swap between x4 NVMe drives and 2x2 Teton Glacier hybrid drives and run lsblk, lspci, and nvme tools to confirm dynamic PCIe configuration Signed-off-by: David Jimenez <dvjimenez(a)chromium.org> Change-Id: If775b40e6922ac7d111ac00c7c51eec6623ed4df --- M src/mainboard/google/hatch/variants/baseboard/devicetree.cb M src/soc/intel/cannonlake/chip.h M src/soc/intel/cannonlake/fsp_params.c 3 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/38947/1 diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb index f7cf3cd..f360c10 100644 --- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb @@ -50,6 +50,8 @@ register "PchUnlockGpioPads" = "1" # SD card WP pin confguration register "ScsSdCardWpPinEnabled" = "0" + # Auto-switch between X4 NVMe and X2 NVMe for hybrid storage support + register "TetonGlacierMode" = "1" # NOTE: if any variant wants to override this value, use the same format # as register "common_soc_config.pch_thermal_trip" = "value", instead of @@ -163,7 +165,7 @@ register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC_SKIP)" # WWAN register "usb3_ports[5]" = "USB3_PORT_EMPTY" - # Enable Root port 9(x4) for NVMe. + # Enable Root port 9(x2) for NVMe. register "PcieRpEnable[8]" = "1" register "PcieRpLtrEnable[8]" = "1" # RP 9 uses CLK SRC 1 @@ -171,6 +173,10 @@ # ClkReq-to-ClkSrc mapping for CLK SRC 1 register "PcieClkSrcClkReq[1]" = "1" + # Enable Root port 11(x2) for NVMe hybrid storage devices. + register "PcieRpEnable[10]" = "1" + register "PcieRpLtrEnable[10]" = "1" + # PCIe port 14 for M.2 E-key WLAN register "PcieRpEnable[13]" = "1" register "PcieRpLtrEnable[13]" = "1" @@ -324,9 +330,9 @@ device pci 1c.5 off end # PCI Express Port 6 device pci 1c.6 off end # PCI Express Port 7 device pci 1c.7 off end # PCI Express Port 8 - device pci 1d.0 on end # PCI Express Port 9 (X4 NVME) + device pci 1d.0 on end # PCI Express Port 9 (X2 NVME) device pci 1d.1 off end # PCI Express Port 10 - device pci 1d.2 off end # PCI Express Port 11 + device pci 1d.2 on end # PCI Express Port 11 (x2 NVME) device pci 1d.3 off end # PCI Express Port 12 device pci 1d.4 off end # PCI Express port 13 device pci 1d.5 on diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index fd37d26..16265d2 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -242,6 +242,9 @@ * Setting to 0 (default) disables Heci1 and hides the device from OS */ uint8_t HeciEnabled; + // Enables support for Teton Glacier hybrid storage device + uint8_t TetonGlacierMode; + /* PL1 Override value in Watts */ uint32_t tdp_pl1_override; /* PL2 Override value in Watts */ diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index dc4a2a8..e8ad62f 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -374,6 +374,9 @@ #endif params->Device4Enable = config->Device4Enable; + /* Teton Glacier hybrid storage support */ + params->TetonGlacierMode = config->TetonGlacierMode; + /* VrConfig Settings for 5 domains * 0 = System Agent, 1 = IA Core, 2 = Ring, * 3 = GT unsliced, 4 = GT sliced */ -- To view, visit https://review.coreboot.org/c/coreboot/+/38947 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If775b40e6922ac7d111ac00c7c51eec6623ed4df Gerrit-Change-Number: 38947 Gerrit-PatchSet: 1 Gerrit-Owner: David Jimenez <dvjimenez(a)chromium.org> Gerrit-MessageType: newchange

7 8

Change in coreboot[master]: xmb/google/volteer: Add BOOT_*_SUPPORT to FW_CONFIG
by Chen Wisley (Code Review) 10 Jun '23

10 Jun '23

Chen Wisley has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47733 ) Change subject: xmb/google/volteer: Add BOOT_*_SUPPORT to FW_CONFIG ...................................................................... xmb/google/volteer: Add BOOT_*_SUPPORT to FW_CONFIG bit 22 for BOOT_SUPPORT_NVME bit 23 for BOOT_SUPPORT_SATA bit 24 for BOOT_SUPPORT_EMMC: bit24 BUG=none BRANCH=volteer TEST=emerge-volteer coreboot Change-Id: I41a6c624c8e32a6115b496f523dbd7a7c3f038c4 Signed-off-by: Wisley Chen <wisley.chen(a)quantatw.com> --- M src/mainboard/google/volteer/variants/baseboard/devicetree.cb 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/47733/1 diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb index 50be736..18d1f6b 100644 --- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb @@ -38,6 +38,15 @@ option SD_GL9755S 1 option SD_RTS5261 2 end + field BOOT_NVME_MASK 22 + option BOOT_SUPPORT_NVME 1 + end + field BOOT_SATA_MASK 23 + option BOOT_SUPPORT_SATA 1 + end + field BOOT_EMMC_MASK 24 + option BOOT_SUPPORT_EMMC 1 + end end chip soc/intel/tigerlake -- To view, visit https://review.coreboot.org/c/coreboot/+/47733 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I41a6c624c8e32a6115b496f523dbd7a7c3f038c4 Gerrit-Change-Number: 47733 Gerrit-PatchSet: 1 Gerrit-Owner: Chen Wisley <wisley.chen(a)quantatw.com> Gerrit-MessageType: newchange

3 3

Change in coreboot[master]: cpu/x86/sipi_vector: Properly use uintptr_t
by Patrick Rudolph (Code Review) 10 Jun '23

10 Jun '23

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47711 ) Change subject: cpu/x86/sipi_vector: Properly use uintptr_t ...................................................................... cpu/x86/sipi_vector: Properly use uintptr_t Change-Id: Ifc60e1efa6fe6a3029ef9e5e63ce50afa8c8c51c Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com> --- M src/cpu/x86/sipi_vector.S M src/include/cpu/x86/mp.h 2 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/47711/1 diff --git a/src/cpu/x86/sipi_vector.S b/src/cpu/x86/sipi_vector.S index ad614ae..cb5641a 100644 --- a/src/cpu/x86/sipi_vector.S +++ b/src/cpu/x86/sipi_vector.S @@ -15,6 +15,11 @@ * C code. The C handler loads microcode, sets up MSRs, and enables caching * before calling into the MP init provided 'c_handler' */ +#if ENV_X86_64 +#define uintptr_t quad +#else +#define uintptr_t long +#endif .section ".module_parameters", "aw", @progbits ap_start_params: @@ -25,19 +30,19 @@ idt_ptr: .long 0 stack_top: -.long 0 +.uintptr_t 0 stack_size: .long 0 microcode_lock: .long 0 microcode_ptr: -.long 0 +.uintptr_t 0 msr_table_ptr: -.long 0 +.uintptr_t 0 msr_count: .long 0 c_handler: -.long 0 +.uintptr_t 0 ap_count: .long 0 diff --git a/src/include/cpu/x86/mp.h b/src/include/cpu/x86/mp.h index b55e2e7..ed6e91f 100644 --- a/src/include/cpu/x86/mp.h +++ b/src/include/cpu/x86/mp.h @@ -149,13 +149,13 @@ uint32_t gdt; uint16_t unused; uint32_t idt_ptr; - uint32_t stack_top; + uintptr_t stack_top; uint32_t stack_size; uint32_t microcode_lock; /* 0xffffffff means parallel loading. */ - uint32_t microcode_ptr; - uint32_t msr_table_ptr; + uintptr_t microcode_ptr; + uintptr_t msr_table_ptr; uint32_t msr_count; - uint32_t c_handler; + uintptr_t c_handler; atomic_t ap_count; } __packed; -- To view, visit https://review.coreboot.org/c/coreboot/+/47711 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifc60e1efa6fe6a3029ef9e5e63ce50afa8c8c51c Gerrit-Change-Number: 47711 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-MessageType: newchange

4 3

Change in coreboot[master]: soc/intel/jasperlake: [TEST-ONLY] SPI read CAR test
by Aamir Bohra (Code Review) 10 Jun '23

10 Jun '23

Aamir Bohra has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47788 ) Change subject: soc/intel/jasperlake: [TEST-ONLY] SPI read CAR test ...................................................................... soc/intel/jasperlake: [TEST-ONLY] SPI read CAR test Change-Id: I4813572a31240b2796cacfa97044f9ed091ec108 Signed-off-by: Aamir Bohra <aamir.bohra(a)intel.com> --- M src/soc/intel/jasperlake/bootblock/bootblock.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/47788/1 diff --git a/src/soc/intel/jasperlake/bootblock/bootblock.c b/src/soc/intel/jasperlake/bootblock/bootblock.c index 96e6268..a1254cf 100644 --- a/src/soc/intel/jasperlake/bootblock/bootblock.c +++ b/src/soc/intel/jasperlake/bootblock/bootblock.c @@ -1,10 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <bootblock_common.h> +#include <console/console.h> #include <intelblocks/systemagent.h> #include <intelblocks/tco.h> #include <intelblocks/uart.h> #include <soc/bootblock.h> +#include <string.h> + asmlinkage void bootblock_c_entry(uint64_t base_timestamp) { @@ -22,6 +25,31 @@ uart_bootblock_init(); } +static void report_cache_info(void) +{ + struct cpuid_result res; + uintptr_t addr = 0xFF000000; + char buf[1024]; + uint32_t kbcount=0; + res = cpuid_ext(0x04, 0x03); + const size_t assoc = CPUID_CACHE_WAYS_OF_ASSOC(res) + 1; + const size_t partitions = CPUID_CACHE_PHYS_LINE(res) + 1; + const size_t cache_line_size = CPUID_CACHE_COHER_LINE(res) + 1; + const size_t number_of_sets = CPUID_CACHE_NO_OF_SETS(res) + 1; + const size_t cache_size = assoc * partitions * cache_line_size * number_of_sets; + printk(BIOS_INFO, "assoc=%zd par=%zd line_size=%zd sets=%zd\n", + assoc, partitions, cache_line_size, number_of_sets); + printk(BIOS_INFO, "@@ dedede cache_size 0x%lx bytes\n", cache_size); + + while (addr < 0xFFFF0000) { + memcpy(buf, (void *)addr, 1024); + printk(BIOS_ERR, "TEST : %lx %x KBcount : %d \n", addr, buf[0], kbcount); + addr += 1024; + ++kbcount; + } + +} + void bootblock_soc_init(void) { report_platform_info(); @@ -29,4 +57,5 @@ /* Programming TCO_BASE_ADDRESS and TCO Timer Halt */ tco_configure(); + report_cache_info(); } -- To view, visit https://review.coreboot.org/c/coreboot/+/47788 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4813572a31240b2796cacfa97044f9ed091ec108 Gerrit-Change-Number: 47788 Gerrit-PatchSet: 1 Gerrit-Owner: Aamir Bohra <aamir.bohra(a)intel.com> Gerrit-MessageType: newchange

3 2

Change in coreboot[master]: src/soc/intel/tigerlake: Get SPI-DMI destination Id
by Srinidhi N Kaushik (Code Review) 10 Jun '23

10 Jun '23

Srinidhi N Kaushik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48067 ) Change subject: src/soc/intel/tigerlake: Get SPI-DMI destination Id ...................................................................... src/soc/intel/tigerlake: Get SPI-DMI destination Id Add support to get SPI_DMI destination id. This change implements SOC function that rteruns SPI-DMI Destination id by calling soc_get_spi_dmi_destination_id(). BUG=b:171534504 Signed-off-by: Srinidhi N Kaushik <srinidhi.n.kaushik(a)intel.com> Change-Id: Idf500f1ccf576bbb903bdb5e218263d3f1295ae8 --- M src/soc/intel/tigerlake/spi.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/48067/1 diff --git a/src/soc/intel/tigerlake/spi.c b/src/soc/intel/tigerlake/spi.c index 63d9d80..fa63713 100644 --- a/src/soc/intel/tigerlake/spi.c +++ b/src/soc/intel/tigerlake/spi.c @@ -7,7 +7,9 @@ */ #include <intelblocks/spi.h> +#include <intelblocks/fast_spi.h> #include <soc/pci_devs.h> +#include <soc/pcr_ids.h> int spi_soc_devfn_to_bus(unsigned int devfn) { @@ -23,3 +25,8 @@ } return -1; } + +uint32_t soc_get_spi_dmi_destination_id() +{ + return SPI_DMI_DESTINATION_ID; +} -- To view, visit https://review.coreboot.org/c/coreboot/+/48067 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Idf500f1ccf576bbb903bdb5e218263d3f1295ae8 Gerrit-Change-Number: 48067 Gerrit-PatchSet: 1 Gerrit-Owner: Srinidhi N Kaushik <srinidhi.n.kaushik(a)intel.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

4 4

Change in coreboot[master]: configs: Add builder Kontron mAL-10 config
by Maxim Polyakov (Code Review) 10 Jun '23

10 Jun '23

Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47886 ) Change subject: configs: Add builder Kontron mAL-10 config ...................................................................... configs: Add builder Kontron mAL-10 config Add config file that can be used to build the coreboot image for the Kontron mAL-10 module. Change-Id: I7144a49410d05783224760ebc1933011b22a108b Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- A configs/config.kontron_mal10 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/47886/1 diff --git a/configs/config.kontron_mal10 b/configs/config.kontron_mal10 new file mode 100644 index 0000000..fa9ecf1 --- /dev/null +++ b/configs/config.kontron_mal10 @@ -0,0 +1,7 @@ +CONFIG_VENDOR_KONTRON=y +CONFIG_FMDFILE="src/mainboard/kontron/mal10/mal10.fmd" +CONFIG_NEED_IFWI=y +CONFIG_HAVE_IFD_BIN=y +CONFIG_BOARD_KONTRON_COME_MAL10=y +CONFIG_USE_LEGACY_8254_TIMER=y +CONFIG_PAYLOAD_NONE=y -- To view, visit https://review.coreboot.org/c/coreboot/+/47886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7144a49410d05783224760ebc1933011b22a108b Gerrit-Change-Number: 47886 Gerrit-PatchSet: 1 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-MessageType: newchange

3 2

Change in coreboot[master]: console,soc: print wr protect status
by Sridhar Siricilla (Code Review) 10 Jun '23

10 Jun '23

Sridhar Siricilla has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48342 ) Change subject: console,soc: print wr protect status ...................................................................... console,soc: print wr protect status Signed-off-by: Sridhar Siricilla <sridhar.siricilla(a)intel.com> Change-Id: I140fcee714ca550d403be1e0042e9f729f4417a5 --- M src/console/init.c M src/soc/intel/common/block/cse/cse_lite.c 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/48342/1 diff --git a/src/console/init.c b/src/console/init.c index c598077..9cb467c 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -7,6 +7,8 @@ #include <device/pci.h> #include <option.h> #include <version.h> +#include <spi_flash.h> + #define FIRST_CONSOLE (ENV_BOOTBLOCK || (CONFIG(NO_BOOTBLOCK_CONSOLE) && ENV_ROMSTAGE)) diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 8fd87b8..d77241a 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -10,6 +10,7 @@ #include <security/vboot/vboot_common.h> #include <security/vboot/misc.h> #include <soc/intel/common/reset.h> +#include <spi_flash.h> /* Converts bp index to boot partition string */ #define GET_BP_STR(bp_index) (bp_index ? "RW" : "RO") @@ -373,7 +374,12 @@ /* Set the CSE's next boot partition and issues system reset */ static bool cse_set_and_boot_from_next_bp(enum boot_partition_id bp) { - if (!cse_set_next_boot_partition(bp)) + { + u8 spi_sts; + spi_flash_status(boot_device_spi_flash(), &spi_sts); + printk(BIOS_DEBUG, "SPI_STATUS: 0x%x\n", spi_sts); + + if (!cse_set_next_boot_partition(bp)) return false; /* Allow the board to perform a reset for CSE RO<->RW jump */ @@ -775,6 +781,10 @@ { static struct get_bp_info_rsp cse_bp_info; + u8 spi_sts; + spi_flash_status(boot_device_spi_flash(), &spi_sts); + printk(BIOS_DEBUG, "SPI_STATUS: 0x%x\n", spi_sts); + if (vboot_recovery_mode_enabled()) { printk(BIOS_DEBUG, "cse_lite: Skip switching to RW in the recovery path\n"); return; -- To view, visit https://review.coreboot.org/c/coreboot/+/48342 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I140fcee714ca550d403be1e0042e9f729f4417a5 Gerrit-Change-Number: 48342 Gerrit-PatchSet: 1 Gerrit-Owner: Sridhar Siricilla <sridhar.siricilla(a)intel.com> Gerrit-MessageType: newchange

4 11

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2021