coreboot-gerrit June 2023

coreboot-gerrit@coreboot.org

1 participants
5387 discussions

Change in coreboot[master]: util/scripts/ucode_h_to_bin.sh: Fix `shellcheck` warning
by Alex Thiessen (Code Review) 10 Jun '23

10 Jun '23

Alex Thiessen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40945 ) Change subject: util/scripts/ucode_h_to_bin.sh: Fix `shellcheck` warning ...................................................................... util/scripts/ucode_h_to_bin.sh: Fix `shellcheck` warning The attempted fix in commit 21530bd4 "util/scripts/ucode_h_to_bin.sh: Drop disruptive quotes" triggers a `shellcheck` warning because a string is being split implicitly: In util/scripts/ucode_h_to_bin.sh line 52: for UCODE in ${@:2}; do ^-- SC2068: Double quote array expansions to avoid re-splitting elements. Reference: https://github.com/koalaman/shellcheck/wiki/SC2068 Also, accidental globbing will occur, e.g. when a file name contains an asterisk or a question mark. The underlying reason for this weirdness is this script's interface which is neither _usual_ nor well-documented (the code accepts things which don't adhere to the interface, e.g. multiple file lists or whole directory names). Make the split explicit by introducing a separate array variable containing the strings, split on spaces. This also will not trigger globbing. Change-Id: I5fb7d0370ca46e8eb850449612d201d5d164fb6a Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot(a)gmail.com> --- M util/scripts/ucode_h_to_bin.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/40945/1 diff --git a/util/scripts/ucode_h_to_bin.sh b/util/scripts/ucode_h_to_bin.sh index cb403a4..1072bb9 100755 --- a/util/scripts/ucode_h_to_bin.sh +++ b/util/scripts/ucode_h_to_bin.sh @@ -49,7 +49,9 @@ fi } -for UCODE in ${@:2}; do +IFS=' ' read -r -a UCODE_PARAM <<< "${@:2}" + +for UCODE in "${UCODE_PARAM[@]}"; do if [ -d "$UCODE" ]; then for f in "$UCODE/"*.inc do -- To view, visit https://review.coreboot.org/c/coreboot/+/40945 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5fb7d0370ca46e8eb850449612d201d5d164fb6a Gerrit-Change-Number: 40945 Gerrit-PatchSet: 1 Gerrit-Owner: Alex Thiessen <alex.thiessen.de+coreboot(a)gmail.com> Gerrit-MessageType: newchange

2 3

Change in coreboot[master]: mb/google/deltaur: Update ISH firmware name
by Anil Kumar K (Code Review) 10 Jun '23

10 Jun '23

Anil Kumar K has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40537 ) Change subject: mb/google/deltaur: Update ISH firmware name ...................................................................... mb/google/deltaur: Update ISH firmware name Bug=b:153847811 Branch=master Test=make build successfull Signed-off-by: Anil Kumar <anil.kumar.k(a)intel.com> Change-Id: Ic701f224452731e43207836882d649580b76db3a --- M src/mainboard/google/deltaur/variants/baseboard/devicetree.cb 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/40537/1 diff --git a/src/mainboard/google/deltaur/variants/baseboard/devicetree.cb b/src/mainboard/google/deltaur/variants/baseboard/devicetree.cb index e0b3d50..831c1c4 100644 --- a/src/mainboard/google/deltaur/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/deltaur/variants/baseboard/devicetree.cb @@ -175,7 +175,13 @@ device pci 11.2 off end # UART5 device pci 11.3 off end # UART6 - device pci 12.0 on end # ISH + device pci 12.0 on + chip drivers/intel/ish + register "firmware_name" = ""deltaur_ish.bin"" + device generic 0 on end + end + end # ISH + device pci 12.6 off end # GSPI #2 device pci 13.0 off end # GSPI #3 device pci 13.1 off end # GSPI #4 -- To view, visit https://review.coreboot.org/c/coreboot/+/40537 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic701f224452731e43207836882d649580b76db3a Gerrit-Change-Number: 40537 Gerrit-PatchSet: 1 Gerrit-Owner: Anil Kumar K <anil.kumar.k(a)intel.com> Gerrit-MessageType: newchange

4 9

Change in coreboot[master]: Documentation/soc/intel: Add documentation for MCU update
by Varshit B Pandya (Code Review) 10 Jun '23

10 Jun '23

Varshit B Pandya has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34657 ) Change subject: Documentation/soc/intel: Add documentation for MCU update ...................................................................... Documentation/soc/intel: Add documentation for MCU update Change-Id: I3deb24550c1f1cd4c7b8082af75115ca174c295a Signed-off-by: Pandya, Varshit B <varshit.b.pandya(a)intel.com> --- A Documentation/soc/intel/ucode_update/Flash_Layout.PNG A Documentation/soc/intel/ucode_update/microcode_update_model.md 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/34657/1 diff --git a/Documentation/soc/intel/ucode_update/Flash_Layout.PNG b/Documentation/soc/intel/ucode_update/Flash_Layout.PNG new file mode 100644 index 0000000..ac18977 --- /dev/null +++ b/Documentation/soc/intel/ucode_update/Flash_Layout.PNG Binary files differ diff --git a/Documentation/soc/intel/ucode_update/microcode_update_model.md b/Documentation/soc/intel/ucode_update/microcode_update_model.md new file mode 100644 index 0000000..e2d7f35 --- /dev/null +++ b/Documentation/soc/intel/ucode_update/microcode_update_model.md @@ -0,0 +1,43 @@ +# Microcode update mechanism for devices in field + +## Introduction + +Processor microcode (MCU) is akin to processor firmware. Processors may need updates to their microcode to operate correctly. These updates fix bugs/errata that can cause anything from incorrect processing, to code and data corruption, and system lockups. + +##Problem Statement + +As per chrome design, any field updatable FW has to be first verified by vboot (chrome root of trust - CROT) before it is allowed to run on the system. CROT executes on the CPU, hence FW such as MCU loaded before the CPU reset cannot be verified before it actually gets loaded. As a result today Chromebooks are not able to apply MCU in the field. This proposal tries to address the issue + +Prior to CPU reset, the CPU HW locates the FIT table from the storage, walks over the FIT table and picks-up the MCU that matches the CPU Family, Model, Stepping and PLATFORM ID with the highest revision ID. CPU verifies that MCU is signed by Intel and once verification is successful, it attempts to load the MCU. + +However FIT does not contain any fall back mechanism. If one MCU loading fails for whatever reason, it drops the further loading process and moves on to CPU reset. While it is fairly a remote chance, in case of any failure to load MCU which cause hang like situations before CPU reset, a platform based mechanism can be put in place to enter recovery mode. As detailed below, if we are using BUC register based top swap implementation, then an RTC reset may be required to clear top swap bit. + +## Design Proposal + +The proposal relies on the following Intel SoC features: + +1. Top swap, which enables the BIOS to have 2 bootblocks and bot from either using a RTC backed Top swap control bit in BUC register. +2. Firmware Interface Table (FIT) based MCU loading. + +The idea is to have 2 bootblocks, each having its own FIT table. The FIT in one of them will be configured to point to an MCU in RO firmware, and the FIT in other one will point to a fixed flash region (aka MCU staging area), which will contain an MCU from RW firmware. + +Top-swap feature of Intel CPUs, will be used to switch between 2 bootblocks, based on the bootmode i.e., recovery or normal/developer mode. + +Coreboot will keep the MCU staging area updated with the MCU from the currently selected RW firmware. + +## Implementation Details + +1. Create 2 BBs (bb_ro_ucode and bb_staged_ucode) each containing their own FIT tables. Both bootblocks will be in the RO section. + a. bb_ro_ucode contains a FIT which has pointer to MCU (microcode_blob.bin) which resides in RO section. This is will be used in the recovery scenario. + b. bb_staged_ucode is identical to bb_ro_ucode but contains a FIT which has pointer to a MCU that will reside in a staging area. +2. Create a MCU staging area + a. Reserve a region in the FMAP which is equal to or greater than the MCU size specified in the BWG for that SoC. This is a RW region just lke the RW_MRC_CACHE. + b. MCU from RW-A/RW-B will be copied to this region during boot. + c. A Flash Protected Range (FPR) should be configured to write protect this MCU Staging area. + d. bb_staged_ucode FIT points to the MCU in this staging area. +3. The resulting flash layout is shown below, +**Flash Layout** +![Flash Layout][flash_layout] +[flash_layout]: Flash_Layout.PNG + +4. The proposed design uses the PCR register based control for top-swap -- To view, visit https://review.coreboot.org/c/coreboot/+/34657 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3deb24550c1f1cd4c7b8082af75115ca174c295a Gerrit-Change-Number: 34657 Gerrit-PatchSet: 1 Gerrit-Owner: Varshit B Pandya <varshit.b.pandya(a)intel.com> Gerrit-MessageType: newchange

6 15

Change in coreboot[master]: devicetree: Check destination size while flattening
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/+/41201 ) Change subject: devicetree: Check destination size while flattening ...................................................................... devicetree: Check destination size while flattening * Check that destination buffer doesn't overflow while flattening * Add 128 bytes to the requested space for the FDT in fit_payload.c Change-Id: Ia8300df1abd012d286c10d12cc99bdc05c2710d8 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- M src/include/device_tree.h M src/lib/device_tree.c M src/lib/fit_payload.c M src/mainboard/sifive/hifive-unleashed/fixup_fdt.c 4 files changed, 25 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/41201/1 diff --git a/src/include/device_tree.h b/src/include/device_tree.h index bd0d151..ddfb6e5 100644 --- a/src/include/device_tree.h +++ b/src/include/device_tree.h @@ -116,8 +116,8 @@ /* Figure out how big a device tree would be if it were flattened. */ uint32_t dt_flat_size(const struct device_tree *tree); -/* Flatten a device tree into the buffer pointed to by dest. */ -void dt_flatten(const struct device_tree *tree, void *dest); +/* Flatten a device tree into the buffer with size len pointed to by dest. */ +void dt_flatten(const struct device_tree *tree, void *dest, size_t len); void dt_print_node(const struct device_tree_node *node); /* Read #address-cells and #size-cells properties from a node. */ void dt_read_cell_props(const struct device_tree_node *node, u32 *addrcp, diff --git a/src/lib/device_tree.c b/src/lib/device_tree.c index cb81d32..5d4b2b0 100644 --- a/src/lib/device_tree.c +++ b/src/lib/device_tree.c @@ -421,14 +421,21 @@ *strings_start = dstrings; } -void dt_flatten(const struct device_tree *tree, void *start_dest) +void dt_flatten(const struct device_tree *tree, void *start_dest, size_t len) { uint8_t *dest = (uint8_t *)start_dest; + uint8_t *dest_max = ((uint8_t *)start_dest) + len; + + if ((dest + tree->header_size) > dest_max) + goto err; memcpy(dest, tree->header, tree->header_size); struct fdt_header *header = (struct fdt_header *)dest; dest += tree->header_size; + if ((dest + sizeof(uint64_t) * 2) > dest_max) + goto err; + struct device_tree_reserve_map_entry *entry; list_for_each(entry, tree->reserve_map, list_node) dt_flatten_map_entry(entry, (void **)&dest); @@ -439,6 +446,9 @@ uint32_t strings_size = 0; dt_flat_node_size(tree->root, &struct_size, &strings_size); + if ((dest + struct_size) > dest_max) + goto err; + uint8_t *struct_start = dest; header->structure_offset = htobe32(dest - (uint8_t *)start_dest); header->structure_size = htobe32(struct_size); @@ -447,6 +457,9 @@ *((uint32_t *)dest) = htobe32(FDT_TOKEN_END); dest += sizeof(uint32_t); + if ((dest + strings_size) > dest_max) + goto err; + uint8_t *strings_start = dest; header->strings_offset = htobe32(dest - (uint8_t *)start_dest); header->strings_size = htobe32(strings_size); @@ -456,6 +469,11 @@ (void **)&strings_start); header->totalsize = htobe32(dest - (uint8_t *)start_dest); + + return; +err: + printk(BIOS_CRIT, "%s: Buffer overflowed (used %d, max %zd) while flattening devicetree\n", + __func__, (dest - (uint8_t *)start_dest), len); } diff --git a/src/lib/fit_payload.c b/src/lib/fit_payload.c index 9cf1542..1b97ad9 100644 --- a/src/lib/fit_payload.c +++ b/src/lib/fit_payload.c @@ -23,7 +23,7 @@ printk(BIOS_INFO, "FIT: Flattening FDT to %p\n", (void *)fdt->offset); - dt_flatten(dt, (void *)fdt->offset); + dt_flatten(dt, (void *)fdt->offset, fdt->size); prog_segment_loaded(fdt->offset, fdt->size, 0); } @@ -219,7 +219,8 @@ /* Collect infos for fit_payload_arch */ kernel.size = config->kernel->size; - fdt.size = dt_flat_size(dt); + /* Add additional space for fit_add_ramdisk() */ + fdt.size = dt_flat_size(dt) + 128; initrd.size = config->ramdisk ? config->ramdisk->size : 0; /* Invoke arch specific payload placement and fixups */ diff --git a/src/mainboard/sifive/hifive-unleashed/fixup_fdt.c b/src/mainboard/sifive/hifive-unleashed/fixup_fdt.c index c270857..3cffb97 100644 --- a/src/mainboard/sifive/hifive-unleashed/fixup_fdt.c +++ b/src/mainboard/sifive/hifive-unleashed/fixup_fdt.c @@ -96,7 +96,7 @@ return; } - dt_flatten(tree, dt); + dt_flatten(tree, dt, dt_flat_size(tree)); /* update HLS */ for (int i = 0; i < CONFIG_MAX_CPUS; i++) -- To view, visit https://review.coreboot.org/c/coreboot/+/41201 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia8300df1abd012d286c10d12cc99bdc05c2710d8 Gerrit-Change-Number: 41201 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Philipp Hug <philipp(a)hug.cx> Gerrit-Reviewer: ron minnich <rminnich(a)gmail.com> Gerrit-MessageType: newchange

4 3

Change in coreboot[master]: emulation/qemu-i440fx: Add \_SB.PCI0.MBRS
by Paul Menzel (Code Review) 10 Jun '23

10 Jun '23

Paul Menzel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38304 ) Change subject: emulation/qemu-i440fx: Add \_SB.PCI0.MBRS ...................................................................... emulation/qemu-i440fx: Add \_SB.PCI0.MBRS Linux 5.4.8 shows the ACPI error below. [ 0.732324] ACPI BIOS Error (bug): Could not resolve symbol [\_SB.PCI0.MBRS], AE_NOT_FOUND (20190816/dswload2-159) [ 0.732784] ACPI Error: AE_NOT_FOUND, During name lookup/catalog (20190816/psobject-220) So, add that symbol. Copied from (removed) `src/mainboard/hp/dl145_g1/dsdt.asl`. Change-Id: I0243f6a469f5addbf2f09f3aed52d1a067b22cc9 Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de> --- M src/mainboard/emulation/qemu-i440fx/dsdt.asl 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/38304/1 diff --git a/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl index 9bef7d9..95b4b42 100644 --- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl +++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl @@ -33,6 +33,13 @@ Scope(\_SB) { Device(PCI0) { + /* Dummy device to hold auto generated reserved resources */ + Device(MBRS) { + Name (_HID, EisaId ("PNP0C02")) + Name (_UID, 0x01) + External(_CRS) /* Resource Template in SSDT */ + } + Name(_HID, EisaId("PNP0A03")) Name(_UID, 1) } -- To view, visit https://review.coreboot.org/c/coreboot/+/38304 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0243f6a469f5addbf2f09f3aed52d1a067b22cc9 Gerrit-Change-Number: 38304 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: newchange

3 4

Change in coreboot[master]: Documentation/mainboard/lenovo/t420s.md: Add documentation for Lenovo...
by David Gebski (Code Review) 10 Jun '23

10 Jun '23

David Gebski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41484 ) Change subject: Documentation/mainboard/lenovo/t420s.md: Add documentation for Lenovo T420s ...................................................................... Documentation/mainboard/lenovo/t420s.md: Add documentation for Lenovo T420s Borrowed text mostly from documentation for Lenovo T420. Added two images showing the pinout. Signed-off-by: Zalckos <mail(a)davidgebski.nl> Change-Id: I9fae5cfd596da144f2161ad35323cb2a6de645a9 --- A Documentation/mainboard/lenovo/t420s.md A Documentation/mainboard/lenovo/t420s_board.jpg A Documentation/mainboard/lenovo/t420s_rpi.jpg 3 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/41484/1 diff --git a/Documentation/mainboard/lenovo/t420s.md b/Documentation/mainboard/lenovo/t420s.md new file mode 100644 index 0000000..ce848c5 --- /dev/null +++ b/Documentation/mainboard/lenovo/t420s.md @@ -0,0 +1,22 @@ +# Lenovo T420s + +## Flashing instructions +The flash IC is located at the bottom center of the mainboard. Sadly, +access to the IC is blocked by the magnesum frame, so you need to disassemble +the entire laptop and remove the mainboard. + +Below is a picture of IC on the mainboard with clip attached, and a picture of the Raspberry Pi with cables attached. In this case it's a Winbond flash chip "W25Q64.V". + +![t420s_board](t420s_board.jpg) +![t420s_rpi](t420s_rpi.jpg) + + +For more details have a look at [T420 / T520 / X220 / T420s / W520 common] and +the general [flashing tutorial]. + +Steps to access the flash IC are described here [T4xx series]. + +[T4xx series]: t4xx_series.md +[flashing tutorial]: ../../flash_tutorial/ext_power.md +[T420 / T520 / X220 / T420s / W520 common]: Sandy_Bridge_series.md + diff --git a/Documentation/mainboard/lenovo/t420s_board.jpg b/Documentation/mainboard/lenovo/t420s_board.jpg new file mode 100644 index 0000000..b99ce6e --- /dev/null +++ b/Documentation/mainboard/lenovo/t420s_board.jpg Binary files differ diff --git a/Documentation/mainboard/lenovo/t420s_rpi.jpg b/Documentation/mainboard/lenovo/t420s_rpi.jpg new file mode 100644 index 0000000..e7b7626 --- /dev/null +++ b/Documentation/mainboard/lenovo/t420s_rpi.jpg Binary files differ -- To view, visit https://review.coreboot.org/c/coreboot/+/41484 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I9fae5cfd596da144f2161ad35323cb2a6de645a9 Gerrit-Change-Number: 41484 Gerrit-PatchSet: 1 Gerrit-Owner: David Gebski Gerrit-MessageType: newchange

3 2

Change in coreboot[master]: superio/winbond/w83627dhg: Boards use common config entry/exit function
by Keith Hui (Code Review) 10 Jun '23

10 Jun '23

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40964 ) Change subject: superio/winbond/w83627dhg: Boards use common config entry/exit function ...................................................................... superio/winbond/w83627dhg: Boards use common config entry/exit function These 4 boards, using this super I/O, do more early init on it than just enabling early serial. Change them to use the common config entry/exit function. Allows to drop the duplicate just this chip holds. Change-Id: Ia3cbf6fa9a7719fc420559b9343786c1f66858a4 Signed-off-by: Keith Hui <buurin(a)gmail.com> --- M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/asus/p5ql-em/early_init.c M src/mainboard/asus/p5qpl-am/early_init.c M src/mainboard/intel/dg41wv/early_init.c 4 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/40964/1 diff --git a/src/mainboard/asus/p5gc-mx/early_init.c b/src/mainboard/asus/p5gc-mx/early_init.c index 4a17c37..be43fba 100644 --- a/src/mainboard/asus/p5gc-mx/early_init.c +++ b/src/mainboard/asus/p5gc-mx/early_init.c @@ -27,7 +27,7 @@ int need_reset = 0; u8 reg, old_reg; - pnp_enter_ext_func_mode(GPIO_DEV); + pnp_enter_conf_state(GPIO_DEV); pnp_set_logical_device(GPIO_DEV); reg = 0x9a; @@ -54,7 +54,7 @@ pnp_write_config(GPIO_DEV, 0xe1, reg); need_reset += ((reg & 0x20) != (old_reg & 0x20)); - pnp_exit_ext_func_mode(GPIO_DEV); + pnp_exit_conf_state(GPIO_DEV); return need_reset; } diff --git a/src/mainboard/asus/p5ql-em/early_init.c b/src/mainboard/asus/p5ql-em/early_init.c index 3803801..1301018 100644 --- a/src/mainboard/asus/p5ql-em/early_init.c +++ b/src/mainboard/asus/p5ql-em/early_init.c @@ -67,7 +67,7 @@ break; } - pnp_enter_ext_func_mode(GPIO_DEV); + pnp_enter_conf_state(GPIO_DEV); pnp_set_logical_device(GPIO_DEV); /* @@ -99,7 +99,7 @@ old_reg = pnp_read_config(GPIO_DEV, 0xf5); /* GPIO4x data */ pnp_write_config(GPIO_DEV, 0xf5, old_reg | reg); need_reset += ((reg & 0x1) != (old_reg & 0x1)); - pnp_exit_ext_func_mode(GPIO_DEV); + pnp_exit_conf_state(GPIO_DEV); return need_reset; } diff --git a/src/mainboard/asus/p5qpl-am/early_init.c b/src/mainboard/asus/p5qpl-am/early_init.c index afcd531..18cb314 100644 --- a/src/mainboard/asus/p5qpl-am/early_init.c +++ b/src/mainboard/asus/p5qpl-am/early_init.c @@ -69,7 +69,7 @@ break; } - pnp_enter_ext_func_mode(GPIO_DEV); + pnp_enter_conf_state(GPIO_DEV); pnp_set_logical_device(GPIO_DEV); if (CONFIG(BOARD_ASUS_P5QPL_AM)) { @@ -121,7 +121,7 @@ pnp_write_config(GPIO_DEV, 0xf5, old_reg | reg); need_reset += ((reg & 0x18) != (old_reg & 0x18)); } - pnp_exit_ext_func_mode(GPIO_DEV); + pnp_exit_conf_state(GPIO_DEV); return need_reset; } diff --git a/src/mainboard/intel/dg41wv/early_init.c b/src/mainboard/intel/dg41wv/early_init.c index 584b936..c8d7c67 100644 --- a/src/mainboard/intel/dg41wv/early_init.c +++ b/src/mainboard/intel/dg41wv/early_init.c @@ -25,12 +25,12 @@ void bootblock_mainboard_early_init(void) { /* Set GPIOs on superio, enable UART */ - pnp_enter_ext_func_mode(SERIAL_DEV); + pnp_enter_conf_state(SERIAL_DEV); pnp_set_logical_device(SERIAL_DEV); pnp_write_config(SERIAL_DEV, 0x2c, 0x13); - pnp_exit_ext_func_mode(SERIAL_DEV); + pnp_exit_conf_state(SERIAL_DEV); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); -- To view, visit https://review.coreboot.org/c/coreboot/+/40964 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia3cbf6fa9a7719fc420559b9343786c1f66858a4 Gerrit-Change-Number: 40964 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Hui <buurin(a)gmail.com> Gerrit-MessageType: newchange

3 9

Change in coreboot[master]: superio/nuvoton/*: Standardise config state entry/exit functions
by Keith Hui (Code Review) 10 Jun '23

10 Jun '23

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40963 ) Change subject: superio/nuvoton/*: Standardise config state entry/exit functions ...................................................................... superio/nuvoton/*: Standardise config state entry/exit functions Rename nuvoton_pnp_{enter,exit}_conf_state() to pnp_{enter,exit}_conf_state() to match other Super I/Os. Part of an attempt to standardise the pre-RAM API across all Super I/Os. Change-Id: I238808b36545f3595a1b1a007ffe5dd41b448231 Signed-off-by: Keith Hui <buurin(a)gmail.com> --- M src/mainboard/asrock/b75pro3-m/early_init.c M src/mainboard/asrock/b85m_pro4/bootblock.c M src/mainboard/asrock/g41c-gs/early_init.c M src/mainboard/asrock/h81m-hds/bootblock.c M src/mainboard/asus/h61m-cs/early_init.c M src/mainboard/asus/p8h61-m_pro/early_init.c M src/mainboard/asus/p8z77-m_pro/early_init.c M src/mainboard/asus/p8z77-v_lx2/early_init.c M src/mainboard/supermicro/x10slm-f/bootblock.c M src/superio/nuvoton/common/early_serial.c M src/superio/nuvoton/common/nuvoton.h 11 files changed, 22 insertions(+), 24 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/40963/1 diff --git a/src/mainboard/asrock/b75pro3-m/early_init.c b/src/mainboard/asrock/b75pro3-m/early_init.c index 552e664..7a4a30c 100644 --- a/src/mainboard/asrock/b75pro3-m/early_init.c +++ b/src/mainboard/asrock/b75pro3-m/early_init.c @@ -30,14 +30,14 @@ void bootblock_mainboard_early_init(void) { /* Set GPIOs on superio, enable UART */ - nuvoton_pnp_enter_conf_state(SERIAL_DEV); + pnp_enter_conf_state(SERIAL_DEV); pnp_set_logical_device(SERIAL_DEV); pnp_write_config(SERIAL_DEV, 0x1c, 0x80); pnp_write_config(SERIAL_DEV, 0x27, 0x80); pnp_write_config(SERIAL_DEV, 0x2a, 0x60); - nuvoton_pnp_exit_conf_state(SERIAL_DEV); + pnp_exit_conf_state(SERIAL_DEV); nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); } diff --git a/src/mainboard/asrock/b85m_pro4/bootblock.c b/src/mainboard/asrock/b85m_pro4/bootblock.c index 5f91b29..2e72b22 100644 --- a/src/mainboard/asrock/b85m_pro4/bootblock.c +++ b/src/mainboard/asrock/b85m_pro4/bootblock.c @@ -12,7 +12,7 @@ void mainboard_config_superio(void) { - nuvoton_pnp_enter_conf_state(GLOBAL_DEV); + pnp_enter_conf_state(GLOBAL_DEV); /* Select HWM/LED functions instead of floppy functions */ pnp_write_config(GLOBAL_DEV, 0x1c, 0x03); @@ -22,7 +22,7 @@ pnp_set_logical_device(ACPI_DEV); pnp_write_config(ACPI_DEV, 0xe4, 0x70); - nuvoton_pnp_exit_conf_state(GLOBAL_DEV); + pnp_exit_conf_state(GLOBAL_DEV); /* Enable UART */ nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asrock/g41c-gs/early_init.c b/src/mainboard/asrock/g41c-gs/early_init.c index d35bb5d..209885a 100644 --- a/src/mainboard/asrock/g41c-gs/early_init.c +++ b/src/mainboard/asrock/g41c-gs/early_init.c @@ -29,14 +29,14 @@ { /* Set GPIOs on superio, enable UART */ if (CONFIG(SUPERIO_NUVOTON_NCT6776)) { - nuvoton_pnp_enter_conf_state(SERIAL_DEV_R2); + pnp_enter_conf_state(SERIAL_DEV_R2); pnp_set_logical_device(SERIAL_DEV_R2); pnp_write_config(SERIAL_DEV_R2, 0x1c, 0x80); pnp_write_config(SERIAL_DEV_R2, 0x27, 0x80); pnp_write_config(SERIAL_DEV_R2, 0x2a, 0x60); - nuvoton_pnp_exit_conf_state(SERIAL_DEV_R2); + pnp_exit_conf_state(SERIAL_DEV_R2); nuvoton_enable_serial(SERIAL_DEV_R2, CONFIG_TTYS0_BASE); } else { winbond_enable_serial(SERIAL_DEV_R1, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asrock/h81m-hds/bootblock.c b/src/mainboard/asrock/h81m-hds/bootblock.c index f3fb2c2..f5bbf6f 100644 --- a/src/mainboard/asrock/h81m-hds/bootblock.c +++ b/src/mainboard/asrock/h81m-hds/bootblock.c @@ -15,7 +15,7 @@ nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - nuvoton_pnp_enter_conf_state(GLOBAL_PSEUDO_DEV); + pnp_enter_conf_state(GLOBAL_PSEUDO_DEV); /* Select HWM/LED functions instead of floppy functions. */ pnp_write_config(GLOBAL_PSEUDO_DEV, 0x1c, 0x03); @@ -32,5 +32,5 @@ pnp_set_logical_device(IR_DEV); pnp_write_config(IR_DEV, 0xf1, 0x5c); - nuvoton_pnp_exit_conf_state(GLOBAL_PSEUDO_DEV); + pnp_exit_conf_state(GLOBAL_PSEUDO_DEV); } diff --git a/src/mainboard/asus/h61m-cs/early_init.c b/src/mainboard/asus/h61m-cs/early_init.c index 1b9adb4..45459a4 100644 --- a/src/mainboard/asus/h61m-cs/early_init.c +++ b/src/mainboard/asus/h61m-cs/early_init.c @@ -32,10 +32,10 @@ void bootblock_mainboard_early_init(void) { - nuvoton_pnp_enter_conf_state(SIO_DEV); + pnp_enter_conf_state(SIO_DEV); pnp_set_logical_device(ACPI_DEV); pnp_write_config(ACPI_DEV, 0xe4, 0x10); - nuvoton_pnp_exit_conf_state(SIO_DEV); + pnp_exit_conf_state(SIO_DEV); } void mainboard_get_spd(spd_raw_data *spd, bool id_only) diff --git a/src/mainboard/asus/p8h61-m_pro/early_init.c b/src/mainboard/asus/p8h61-m_pro/early_init.c index 582366d..f6eb812 100644 --- a/src/mainboard/asus/p8h61-m_pro/early_init.c +++ b/src/mainboard/asus/p8h61-m_pro/early_init.c @@ -33,7 +33,7 @@ void bootblock_mainboard_early_init(void) { /* Enable UART */ - nuvoton_pnp_enter_conf_state(GLOBAL_DEV); + pnp_enter_conf_state(GLOBAL_DEV); /* Select SIO pin states. */ pnp_write_config(GLOBAL_DEV, 0x1c, 0x83); @@ -47,7 +47,7 @@ pnp_set_logical_device(SERIAL_DEV); - nuvoton_pnp_exit_conf_state(GLOBAL_DEV); + pnp_exit_conf_state(GLOBAL_DEV); nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); } diff --git a/src/mainboard/asus/p8z77-m_pro/early_init.c b/src/mainboard/asus/p8z77-m_pro/early_init.c index 687cbfd..eb0df1c 100644 --- a/src/mainboard/asus/p8z77-m_pro/early_init.c +++ b/src/mainboard/asus/p8z77-m_pro/early_init.c @@ -38,12 +38,12 @@ void bootblock_mainboard_early_init(void) { /* Setup COM/UART */ - nuvoton_pnp_enter_conf_state(GLOBAL_DEV); + pnp_enter_conf_state(GLOBAL_DEV); /* TODO / FIXME: Setup Multifuncion/SIO pins for COM */ pnp_set_logical_device(SERIAL_DEV); - nuvoton_pnp_exit_conf_state(GLOBAL_DEV); + pnp_exit_conf_state(GLOBAL_DEV); nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); } diff --git a/src/mainboard/asus/p8z77-v_lx2/early_init.c b/src/mainboard/asus/p8z77-v_lx2/early_init.c index cbbf9dc..5a7b4cb 100644 --- a/src/mainboard/asus/p8z77-v_lx2/early_init.c +++ b/src/mainboard/asus/p8z77-v_lx2/early_init.c @@ -32,7 +32,7 @@ void bootblock_mainboard_early_init(void) { - nuvoton_pnp_enter_conf_state(GLOBAL_DEV); + pnp_enter_conf_state(GLOBAL_DEV); /* Select SIO pin states */ pnp_write_config(GLOBAL_DEV, 0x1a, 0x02); @@ -47,7 +47,7 @@ pnp_set_logical_device(ACPI_DEV); pnp_write_config(ACPI_DEV, 0xe4, 0x10); - nuvoton_pnp_exit_conf_state(GLOBAL_DEV); + pnp_exit_conf_state(GLOBAL_DEV); /* Enable UART */ nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/supermicro/x10slm-f/bootblock.c b/src/mainboard/supermicro/x10slm-f/bootblock.c index c0d4502..64b5e6d 100644 --- a/src/mainboard/supermicro/x10slm-f/bootblock.c +++ b/src/mainboard/supermicro/x10slm-f/bootblock.c @@ -26,7 +26,7 @@ nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - nuvoton_pnp_enter_conf_state(GLOBAL_PSEUDO_DEV); + pnp_enter_conf_state(GLOBAL_PSEUDO_DEV); /* Select HWM/LED functions instead of floppy functions. */ pnp_write_config(GLOBAL_PSEUDO_DEV, 0x1c, 0x03); @@ -36,5 +36,5 @@ pnp_set_logical_device(ACPI_DEV); pnp_write_config(ACPI_DEV, 0xe4, 0x70); - nuvoton_pnp_exit_conf_state(GLOBAL_PSEUDO_DEV); + pnp_exit_conf_state(GLOBAL_PSEUDO_DEV); } diff --git a/src/superio/nuvoton/common/early_serial.c b/src/superio/nuvoton/common/early_serial.c index ed31b72..b709969 100644 --- a/src/superio/nuvoton/common/early_serial.c +++ b/src/superio/nuvoton/common/early_serial.c @@ -31,7 +31,7 @@ /* Enable configuration: pass entry key '0x87' into index port dev * two times. */ -void nuvoton_pnp_enter_conf_state(pnp_devfn_t dev) +void pnp_enter_conf_state(pnp_devfn_t dev) { u16 port = dev >> 8; outb(NUVOTON_ENTRY_KEY, port); @@ -39,7 +39,7 @@ } /* Disable configuration: pass exit key '0xAA' into index port dev. */ -void nuvoton_pnp_exit_conf_state(pnp_devfn_t dev) +void pnp_exit_conf_state(pnp_devfn_t dev) { u16 port = dev >> 8; outb(NUVOTON_EXIT_KEY, port); @@ -48,7 +48,7 @@ /* Bring up early serial debugging output before the RAM is initialized. */ void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase) { - nuvoton_pnp_enter_conf_state(dev); + pnp_enter_conf_state(dev); if (CONFIG(SUPERIO_NUVOTON_NCT5539D_COM_A)) /* Route COM A to GPIO8 pin group */ @@ -66,5 +66,5 @@ pnp_set_enable(dev, 0); pnp_set_iobase(dev, PNP_IDX_IO0, iobase); pnp_set_enable(dev, 1); - nuvoton_pnp_exit_conf_state(dev); + pnp_exit_conf_state(dev); } diff --git a/src/superio/nuvoton/common/nuvoton.h b/src/superio/nuvoton/common/nuvoton.h index f5b3176..d69548e 100644 --- a/src/superio/nuvoton/common/nuvoton.h +++ b/src/superio/nuvoton/common/nuvoton.h @@ -7,8 +7,6 @@ #include <device/pnp_type.h> #include <stdint.h> -void nuvoton_pnp_enter_conf_state(pnp_devfn_t dev); -void nuvoton_pnp_exit_conf_state(pnp_devfn_t dev); void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase); #endif /* SUPERIO_NUVOTON_COMMON_PRE_RAM_H */ -- To view, visit https://review.coreboot.org/c/coreboot/+/40963 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I238808b36545f3595a1b1a007ffe5dd41b448231 Gerrit-Change-Number: 40963 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Hui <buurin(a)gmail.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-MessageType: newchange

2 3

[S] Change in coreboot[master]: device/: Add basic dualgraphics support
by Stefan Reinauer (Code Review) 10 Jun '23

10 Jun '23

Stefan Reinauer has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/41190?usp=email ) Change subject: device/: Add basic dualgraphics support ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/coreboot/+/41190?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I28f896c2b7964728975d38dba4b3ebccf887e0b7 Gerrit-Change-Number: 41190 Gerrit-PatchSet: 7 Gerrit-Owner: UIS Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-CC: Patrick Rudolph <siro(a)das-labor.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: abandon

1 0

Change in coreboot[master]: Doc/mb/lenovo/t420s.md: Add documentation for Lenovo T420s
by David Gebski (Code Review) 10 Jun '23

10 Jun '23

David Gebski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41490 ) Change subject: Doc/mb/lenovo/t420s.md: Add documentation for Lenovo T420s ...................................................................... Doc/mb/lenovo/t420s.md: Add documentation for Lenovo T420s Borrowed text mostly from documentation for Lenovo T420. Added two images showing the pinout. Signed-off-by: Zalckos <mail(a)davidgebski.nl> Change-Id: Ia2c6701bc8269e73e4af5a9414b7ded77a4d3571 --- A Documentation/mainboard/lenovo/t420s.md A Documentation/mainboard/lenovo/t420s_board.jpg A Documentation/mainboard/lenovo/t420s_rpi.jpg 3 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/41490/1 diff --git a/Documentation/mainboard/lenovo/t420s.md b/Documentation/mainboard/lenovo/t420s.md new file mode 100644 index 0000000..82be80c --- /dev/null +++ b/Documentation/mainboard/lenovo/t420s.md @@ -0,0 +1,22 @@ +# Lenovo T420s + +## Flashing instructions +The flash IC is located at the bottom center of the mainboard. Sadly, access +to the IC is blocked by the magnesium frame, so you need to disassemble the +entire laptop and remove the mainboard. + +Below is a picture of IC on the mainboard with clip attached, and a picture of +the Raspberry Pi with cables attached. In this case it's a Winbond flash chip +"W25Q64.V". + +![t420s_board](t420s_board.jpg) +![t420s_rpi](t420s_rpi.jpg) + +For more details have a look at [T420 / T520 / X220 / T420s / W520 common] and +the general [flashing tutorial]. + +Steps to access the flash IC are described here [T4xx series]. + +[T4xx series]: t4xx_series.md +[flashing tutorial]: ../../flash_tutorial/ext_power.md +[T420 / T520 / X220 / T420s / W520 common]: Sandy_Bridge_series.md diff --git a/Documentation/mainboard/lenovo/t420s_board.jpg b/Documentation/mainboard/lenovo/t420s_board.jpg new file mode 100644 index 0000000..3ec4201 --- /dev/null +++ b/Documentation/mainboard/lenovo/t420s_board.jpg Binary files differ diff --git a/Documentation/mainboard/lenovo/t420s_rpi.jpg b/Documentation/mainboard/lenovo/t420s_rpi.jpg new file mode 100644 index 0000000..6fe204c --- /dev/null +++ b/Documentation/mainboard/lenovo/t420s_rpi.jpg Binary files differ -- To view, visit https://review.coreboot.org/c/coreboot/+/41490 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia2c6701bc8269e73e4af5a9414b7ded77a4d3571 Gerrit-Change-Number: 41490 Gerrit-PatchSet: 1 Gerrit-Owner: David Gebski Gerrit-MessageType: newchange

4 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2023