coreboot-gerrit April 2020

coreboot-gerrit@coreboot.org

1 participants
2501 discussions

Change in coreboot[master]: cpu/x86/mp_init: Refactor and comment staggered SMBASE calculation
by Nico Huber (Code Review) 10 Jun '23

10 Jun '23

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38783 ) Change subject: cpu/x86/mp_init: Refactor and comment staggered SMBASE calculation ...................................................................... cpu/x86/mp_init: Refactor and comment staggered SMBASE calculation Change-Id: I98f55938f224ee49361d73e68ace9f9fcee7f48a Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M src/cpu/x86/mp_init.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38783/1 diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 45f7337..77eb661 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -720,7 +720,7 @@ const struct smm_runtime *runtime; int cpu; uintptr_t curr_smbase; - uintptr_t perm_smbase; + uintptr_t staggered_smbase; p = arg; runtime = p->runtime; @@ -737,9 +737,13 @@ * The permanent handler runs with all cpus concurrently. Precalculate * the location of the new SMBASE. If using SMM modules then this * calculation needs to match that of the module loader. + * + * Hardware assumes SMM entry at SMM_ENTRY_OFFSET, memory below this + * offset won't be accessed. `staggered_smbase` can point below actual + * SMRAM, hence. */ - perm_smbase = mp_state.perm_smbase; - perm_smbase -= cpu * runtime->save_state_size; + staggered_smbase = mp_state.perm_smbase; + staggered_smbase -= cpu * runtime->save_state_size; printk(BIOS_DEBUG, "New SMBASE 0x%08lx\n", perm_smbase); @@ -747,7 +751,7 @@ mp_state.ops.relocation_handler(cpu, curr_smbase, perm_smbase); stm_setup(cpu, mp_state.perm_smbase, mp_state.perm_smsize, - perm_smbase, runtime->start32_offset); + staggered_smbase, runtime->start32_offset); } static void adjust_smm_apic_id_map(struct smm_loader_params *smm_params) -- To view, visit https://review.coreboot.org/c/coreboot/+/38783 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I98f55938f224ee49361d73e68ace9f9fcee7f48a Gerrit-Change-Number: 38783 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

3 3

Change in ...coreboot[master]: sb/intel/ibexpeak: Use SOUTHBRIDGE_INTEL_COMMON_PMCLIB
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/+/32316 Change subject: sb/intel/ibexpeak: Use SOUTHBRIDGE_INTEL_COMMON_PMCLIB ...................................................................... sb/intel/ibexpeak: Use SOUTHBRIDGE_INTEL_COMMON_PMCLIB Use common code to detect ACPI S3. Untested. Change-Id: I766a3f4206e6605e6b7bb9a1ff0b2deb6721eb77 Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com> --- M src/mainboard/lenovo/x201/romstage.c M src/mainboard/packardbell/ms2290/romstage.c M src/southbridge/intel/ibexpeak/Kconfig 3 files changed, 13 insertions(+), 46 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/32316/1 diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c index 7e895b4..e65622c 100644 --- a/src/mainboard/lenovo/x201/romstage.c +++ b/src/mainboard/lenovo/x201/romstage.c @@ -34,6 +34,7 @@ #include "dock.h" #include <southbridge/intel/ibexpeak/pch.h> #include <southbridge/intel/common/gpio.h> +#include <southbridge/intel/common/pmclib.h> #include <northbridge/intel/nehalem/nehalem.h> #include <northbridge/intel/nehalem/raminit.h> @@ -206,24 +207,14 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist); - /* Read PM1_CNT */ - reg32 = inl(DEFAULT_PMBASE + 0x04); - printk(BIOS_DEBUG, "PM1_CNT: %08x\n", reg32); - if (((reg32 >> 10) & 7) == 5) { - u8 reg8; - reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xa2); + /* Check for S3 resume. */ + s3resume = southbridge_detect_s3_resume(); + if (s3resume) { + u8 reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xa2); printk(BIOS_DEBUG, "a2: %02x\n", reg8); if (!(reg8 & 0x20)) { - outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04); printk(BIOS_DEBUG, "Bad resume from S3 detected.\n"); - } else { - if (acpi_s3_resume_allowed()) { - printk(BIOS_DEBUG, "Resume from S3 detected.\n"); - s3resume = 1; - } else { - printk(BIOS_DEBUG, - "Resume from S3 detected, but disabled.\n"); - } + s3resume = 0; } } @@ -263,13 +254,5 @@ intel_early_me_status(); - if (s3resume) { - /* Clear SLP_TYPE. This will break stage2 but - * we care for that when we get there. - */ - reg32 = inl(DEFAULT_PMBASE + 0x04); - outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04); - } - romstage_handoff_init(s3resume); } diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c index 8442dfa..854c835 100644 --- a/src/mainboard/packardbell/ms2290/romstage.c +++ b/src/mainboard/packardbell/ms2290/romstage.c @@ -34,6 +34,7 @@ #include "arch/early_variables.h" #include <southbridge/intel/ibexpeak/pch.h> #include <northbridge/intel/nehalem/nehalem.h> +#include <southbridge/intel/common/pmclib.h> #include <northbridge/intel/nehalem/raminit.h> #include <southbridge/intel/ibexpeak/me.h> @@ -206,24 +207,14 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist); - /* Read PM1_CNT */ - reg32 = inl(DEFAULT_PMBASE + 0x04); - printk(BIOS_DEBUG, "PM1_CNT: %08x\n", reg32); - if (((reg32 >> 10) & 7) == 5) { - u8 reg8; - reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xa2); + /* Check for S3 resume. */ + s3resume = southbridge_detect_s3_resume(); + if (s3resume) { + u8 reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xa2); printk(BIOS_DEBUG, "a2: %02x\n", reg8); if (!(reg8 & 0x20)) { - outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04); printk(BIOS_DEBUG, "Bad resume from S3 detected.\n"); - } else { - if (acpi_s3_resume_allowed()) { - printk(BIOS_DEBUG, "Resume from S3 detected.\n"); - s3resume = 1; - } else { - printk(BIOS_DEBUG, - "Resume from S3 detected, but disabled.\n"); - } + s3resume = 0; } } @@ -255,13 +246,5 @@ intel_early_me_status(); - if (s3resume) { - /* Clear SLP_TYPE. This will break stage2 but - * we care for that when we get there. - */ - reg32 = inl(DEFAULT_PMBASE + 0x04); - outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04); - } - romstage_handoff_init(s3resume); } diff --git a/src/southbridge/intel/ibexpeak/Kconfig b/src/southbridge/intel/ibexpeak/Kconfig index bb6e22c..59b012e 100644 --- a/src/southbridge/intel/ibexpeak/Kconfig +++ b/src/southbridge/intel/ibexpeak/Kconfig @@ -32,6 +32,7 @@ select SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ select SOUTHBRIDGE_INTEL_COMMON_SMBUS select SOUTHBRIDGE_INTEL_COMMON_SPI + select SOUTHBRIDGE_INTEL_COMMON_PMCLIB select HAVE_USBDEBUG_OPTIONS select COMMON_FADT select ACPI_SATA_GENERATOR -- To view, visit https://review.coreboot.org/c/coreboot/+/32316 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I766a3f4206e6605e6b7bb9a1ff0b2deb6721eb77 Gerrit-Change-Number: 32316 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-MessageType: newchange

3 4

Change in coreboot[master]: soc/intel/cannonlake: Speed up postcar loading using intermediate cac...
by Subrata Banik (Code Review) 10 Jun '23

10 Jun '23

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34791 ) Change subject: soc/intel/cannonlake: Speed up postcar loading using intermediate caching ...................................................................... soc/intel/cannonlake: Speed up postcar loading using intermediate caching This patch ensures intermediate caching is enabled to speed up loading and decompression of next stage as we are still in romstage and car tear down will be handled by next stage at its entry. TEST=cbmem -t shows ~2-4ms time savings in warm reboot case with this CL. Change-Id: I3ba63887acb5c4bdeaf3e21c24fb0e631362962c Signed-off-by: Subrata Banik <subrata.banik(a)intel.com> --- M src/soc/intel/cannonlake/romstage/romstage.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/34791/1 diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index 94b9899..04a9d53 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -127,6 +127,21 @@ printk(BIOS_DEBUG, "%d DIMMs found\n", mem_info->dimm_cnt); } +/* + * Make sure we are enabling intermediate caching to speed up next stage + * (postcar/romstage) loading and decompression as we are still in romstage + * and car tear down will be handled by next stage at its entry. + */ +static void enable_ramstage_caching(uintptr_t base, size_t size) +{ + int mtrr = get_free_var_mtrr(); + + if (mtrr == -1) + return; + + set_var_mtrr(mtrr, base, size, MTRR_TYPE_WRPROT); +} + asmlinkage void car_stage_entry(void) { bool s3wake; @@ -160,6 +175,8 @@ printk(BIOS_DEBUG, "top_of_ram = 0x%lx\n", top_of_ram); top_of_ram -= 16*MiB; postcar_frame_add_mtrr(&pcf, top_of_ram, 16*MiB, MTRR_TYPE_WRBACK); + /* enabling intermediate caching */ + enable_ramstage_caching(top_of_ram, 16*MiB); /* Cache the ROM as WP just below 4GiB. */ postcar_frame_add_romcache(&pcf, MTRR_TYPE_WRPROT); -- To view, visit https://review.coreboot.org/c/coreboot/+/34791 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3ba63887acb5c4bdeaf3e21c24fb0e631362962c Gerrit-Change-Number: 34791 Gerrit-PatchSet: 1 Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com> Gerrit-MessageType: newchange

8 66

Change in coreboot[master]: arch/x86: Add postcar_frame_add_ramcache() API
by Subrata Banik (Code Review) 10 Jun '23

10 Jun '23

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34805 ) Change subject: arch/x86: Add postcar_frame_add_ramcache() API ...................................................................... arch/x86: Add postcar_frame_add_ramcache() API This patch adds new API for intermediate caching top_of_ram and setting up required MTRR for next stage. Change-Id: Iddafb573afb4799de64754a94816d7f3f2f4982f Signed-off-by: Subrata Banik <subrata.banik(a)intel.com> --- M src/arch/x86/include/arch/cpu.h M src/arch/x86/postcar_loader.c 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/34805/1 diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 293ca02..7dc4049 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -329,6 +329,13 @@ void postcar_frame_add_romcache(struct postcar_frame *pcf, int type); /* + * Add variable MTRR covering the Top of RAM with given MTRR type. + */ +void postcar_frame_add_ramcache(struct postcar_frame *pcf, + uintptr_t addr, size_t size, int type); + + +/* * Push used MTRR and Max MTRRs on to the stack * and return pointer to stack top. */ diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index 35e139f..8a1f6cb 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -120,6 +120,29 @@ postcar_frame_add_mtrr(pcf, CACHE_ROM_BASE, CACHE_ROM_SIZE, type); } +/* + * Make sure we are enabling intermediate caching to speed up next stage + * (postcar/romstage) loading and decompression as we are still in romstage + * and CAR tear down will be handled by next stage at its entry. + */ +static void enable_top_of_ram_cache(uintptr_t base, size_t size) +{ + int mtrr = get_free_var_mtrr(); + + if (mtrr == -1) + return; + + set_var_mtrr(mtrr, base, size, MTRR_TYPE_WRPROT); +} + +void postcar_frame_add_ramcache(struct postcar_frame *pcf, + uintptr_t addr, size_t size, int type) +{ + /* enable intermediate caching for Top of RAM */ + enable_top_of_ram_cache(addr, size); + postcar_frame_add_mtrr(pcf, addr, size, type); +} + void *postcar_commit_mtrrs(struct postcar_frame *pcf) { /* -- To view, visit https://review.coreboot.org/c/coreboot/+/34805 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iddafb573afb4799de64754a94816d7f3f2f4982f Gerrit-Change-Number: 34805 Gerrit-PatchSet: 1 Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com> Gerrit-MessageType: newchange

6 34

Change in coreboot[master]: Fixed configuration for DDR Size discovered by Coreboot
by Marc Karasek (Code Review) 10 Jun '23

10 Jun '23

Marc Karasek has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38904 ) Change subject: Fixed configuration for DDR Size discovered by Coreboot ...................................................................... Fixed configuration for DDR Size discovered by Coreboot For qemu-riscv value was incorrect. It was set to 32768 which in turn was being used as 32768MB (32+GB), instead of the 32MB it was intended to represent. Change value so it is a select option based on in menuconfig based on what you want coreboot to "discover" on boot. Current three options are : 128MB 256MB 512MB NOTE: You must specify greater than what is chosen from the above items on the qemu cmdline. Signed-off-by: Marc Karasek <mkarasek(a)cryptocoretech.com> Change-Id: Idef44eb8baf3e89d7c74fa452fc60b7beefa2c48 --- M src/mainboard/emulation/qemu-riscv/Kconfig 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/38904/1 diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig index 4d4c900..2a119a3 100644 --- a/src/mainboard/emulation/qemu-riscv/Kconfig +++ b/src/mainboard/emulation/qemu-riscv/Kconfig @@ -54,9 +54,35 @@ int default 1 +choice + prompt "DRAM SIZE MB" + help + Select the size of the DDR coreboot will find. + Note: You must specify a -m <size> greater than + what is chosen here. + + config COREBOOT_DDR_SIZE_128M + bool "128 MB" + help + Choose this option if you want coreboot to find 127MB DDR + + config COREBOOT_DDR_SIZE_256M + bool "256 MB" + help + Choose this option if you want coreboot to find 255MB DDR + + config COREBOOT_DDR_SIZE_512M + bool "512 MB" + help + Choose this option if you want coreboot to find 512MB DDR +endchoice + config DRAM_SIZE_MB int - default 32768 + default 32 + default 32 if COREBOOT_DDR_SIZE_128M + default 64 if COREBOOT_DDR_SIZE_256M + default 128 if COREBOOT_DDR_SIZE_512M config OPENSBI_PLATFORM string -- To view, visit https://review.coreboot.org/c/coreboot/+/38904 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Idef44eb8baf3e89d7c74fa452fc60b7beefa2c48 Gerrit-Change-Number: 38904 Gerrit-PatchSet: 1 Gerrit-Owner: Marc Karasek <marckarasek(a)gmail.com> Gerrit-MessageType: newchange

4 9

Change in coreboot[master]: Add a doc describing an ACPI device for controlling platform radios.
by Matthew Garrett (Code Review) 10 Jun '23

10 Jun '23

Matthew Garrett has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37991 ) Change subject: Add a doc describing an ACPI device for controlling platform radios. ...................................................................... Add a doc describing an ACPI device for controlling platform radios. Signed-off-by: Matthew Garrett <mjg59(a)google.com> Change-Id: I94dc058825cb147aca0d007d68885d4bfbe580a8 --- M Documentation/acpi/index.md A Documentation/acpi/rfkill.md M src/arch/x86/include/arch/acpi.h 3 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/37991/1 diff --git a/Documentation/acpi/index.md b/Documentation/acpi/index.md index 8add8db..d10bca5 100644 --- a/Documentation/acpi/index.md +++ b/Documentation/acpi/index.md @@ -9,3 +9,7 @@ ## devicetree - [Adding devices to a device tree](devicetree.md) + +## Radio device control + +- [Exposing an ACPI device for controlling radios](rfkill.md) diff --git a/Documentation/acpi/rfkill.md b/Documentation/acpi/rfkill.md new file mode 100644 index 0000000..ef54f16 --- /dev/null +++ b/Documentation/acpi/rfkill.md @@ -0,0 +1,106 @@ +# Coreboot platform rfkill control + +## Introduction + +Many devices support platform-level control over integrated radio devices +such as wifi or bluetooth cards. However, the ACPI specification provides +no generic mechanism for operating systems to interact with these platform +interfaces. This has led to a proliferation of vendor-specific control +mechanisms. Coreboot ports to existing platforms tend to mimic those +interfaces and make use of existing drivers, but this doesn't solve the +problem for devices where coreboot is the primary firmware implementation. + +This specification defines an ACPI device that exposes an interface for +controlling any radios defined by the platform. It is intended to allow for +generic OS drivers to be written which will then work on any coreboot +platform that implements this specification. + +## Device specification + +The coreboot rfkill device must be declared with a _HID of "BOOT0001". +It must implement the following ACPI methods: + +### DEVS + +This method provides a list of the supported radios whose state can be +controlledvia this device. It takes no arguments and returns a single +integer. The integer is a bitmask of radio types supported by the device, +defined as follows: + +| Bit | Radio type | +|-----|---------------| +| 0 | Wifi | +| 1 | Bluetooth | +| 2 | Ultra-Wideband| +| 3 | WiMax | +| 4 | WWAN | +| 5 | GPS | +| 6 | FM | +| 7 | NFC | + +### SSTA + +This defines the mutable ("soft") state of all radios in the system. This +method takes no arguments and returns a single integer. The integer is a +bitmask representing radio state using the same values as defined in +DEVS. If a bit is 1 then the radio is enabled. If a bit is 0 then the radio +is not present. If a bit is not set in the value returned by the DEVS method +then the meaning of the bit returned by SSTA is undefined. The state +returned by SSTA can be overridden by the CNTL method. + +### HSTA + +This defines the immutable ("hard") state of all radios in the system. This +method takes no arguments and returns a single integer. The integer is a +bitmask representing radio state using the same values as defined in +DEVS. If a bit is 1 then the radio is enabled. If a bit is 0 then the radio +is disabled. If a bit is not set in the value returned by the DEVS method +then the meaning of the bit returned by HSTA is undefined. The state +returned by HSTA cannot be overridden by the CNTL method. + +### CNTL + +This method takes a single integer as an argument and returns nothing. The +argument is a bitmask representing radio state using the same values as +defined in DEVS. If a bit is 1 then the platform should enable the +corresponding radio. If a bit is 0 then the platform should disable the +corresponding radio. This method only alters the soft radio state, not the +hard radio state. + +### Notifications + +The platform will send a Notify with a value of 0x80 if the state is updated +via any mechanism other than an OS request. The OS should then re-evaluate +the state by calling SSTA and HSTA. + +## Implementation design + +Two types of blocking are defined - "soft" and "hard". Soft state can be +overridden on request by the OS, for example in response to a hotkey +press. Hard state cannot be overridden by the OS, and should correspond to +cases where some external interface has requested that radios be disabled +(for example, a physical switch on the side of the device). Hard and soft +state should be tracked independently - for instance, if a radio is +currently enabled and then disabled via a physical switch being moved, the +state returned by SSTA should still indicate that the radio is enabled while +the state returned by HSTA should indicate that the radio is disabled. If +the OS then requests that the radio be disabled via the CNTL method, SSTA +and HSTA should now both indicate that the radio is disabled. If the +physical switch is now switched back, HSTA should indicate that the radio is +enabled but SSTA should still indicate that the radio is disabled. Only when +the OS requests that the radio be enabled via CNTL should the radio be +re-enabled. + +If the platform alters the radio state (in response to any form of policy +decision or in response to a physical switch), it should update the soft +block state (if the OS can override this decision) or the hard block state +(if the OS cannot override this decision) and then call Notify on the device +with an argument of 0x80. + +If the platform provides more than one radio of a given type, it should +implement an additional rfkill device. Each radio should only be represented +in a single device. + +If an rfkill device should be explicitly tied to a radio device, then the +radio should be exposed in the ACPI device heirarchy and an rfkill device +that controls only that radio implemented as a child of that device. diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 68475c1..e87df04 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -64,6 +64,7 @@ /* List of ACPI HID that use the coreboot ACPI ID */ enum coreboot_acpi_ids { COREBOOT_ACPI_ID_CBTABLE = 0x0000, /* BOOT0000 */ + COREBOOT_ACPI_ID_RFKILL = 0x0001, /* BOOT0001 */ COREBOOT_ACPI_ID_MAX = 0xFFFF, /* BOOTFFFF */ }; -- To view, visit https://review.coreboot.org/c/coreboot/+/37991 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I94dc058825cb147aca0d007d68885d4bfbe580a8 Gerrit-Change-Number: 37991 Gerrit-PatchSet: 1 Gerrit-Owner: Matthew Garrett <mjg59(a)google.com> Gerrit-MessageType: newchange

6 13

Change in coreboot[master]: soc/sifive/fu540: Fix RISCV_ARCH / RISCV_ABI to support float
by Xiang Wang (Code Review) 10 Jun '23

10 Jun '23

Xiang Wang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37593 ) Change subject: soc/sifive/fu540: Fix RISCV_ARCH / RISCV_ABI to support float ...................................................................... soc/sifive/fu540: Fix RISCV_ARCH / RISCV_ABI to support float fu540 hart 0 is based on rv64imac, other hart is based on rv64imafdc. coreboot supports low-privileged non-aligned memory access, which requires the compiler to enable floating-point functionality. Compiling the src/arch/riscv/fp_asm.S file before the correction will not generate any instructions. Change-Id: I0f4828046aeb4803d4437c6adad2191684a632f7 Signed-off-by: Xiang Wang <merle(a)hardenedlinux.org> --- M src/soc/sifive/fu540/Kconfig 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/37593/1 diff --git a/src/soc/sifive/fu540/Kconfig b/src/soc/sifive/fu540/Kconfig index 97c67bf..4ff2827 100644 --- a/src/soc/sifive/fu540/Kconfig +++ b/src/soc/sifive/fu540/Kconfig @@ -30,11 +30,11 @@ config RISCV_ARCH string - default "rv64imac" + default "rv64imafdc" config RISCV_ABI string - default "lp64" + default "lp64d" config RISCV_CODEMODEL string -- To view, visit https://review.coreboot.org/c/coreboot/+/37593 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0f4828046aeb4803d4437c6adad2191684a632f7 Gerrit-Change-Number: 37593 Gerrit-PatchSet: 1 Gerrit-Owner: Xiang Wang <merle(a)hardenedlinux.org> Gerrit-MessageType: newchange

2 4

Change in ...coreboot[master]: mb/lenovo: Add Lenovo Thinkpad Helix
by Christoph Pomaska (Code Review) 10 Jun '23

10 Jun '23

Christoph Pomaska has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33867 Change subject: mb/lenovo: Add Lenovo Thinkpad Helix ...................................................................... mb/lenovo: Add Lenovo Thinkpad Helix This port was originally generated by autoport, but has been modified. This device is technically a tablet PC, but the linter rejects 'tablet' in board_info.txt at the moment (TODO). THIS PORT IS UNTESTED YET Change-Id: I7dbf10bc85edb161fce077568d4ef3db91e10db7 Signed-off-by: Christoph Pomaska <github(a)aufmachen.jetzt> --- A src/mainboard/lenovo/helix/Kconfig A src/mainboard/lenovo/helix/Kconfig.name A src/mainboard/lenovo/helix/Makefile.inc A src/mainboard/lenovo/helix/acpi/ec.asl A src/mainboard/lenovo/helix/acpi/platform.asl A src/mainboard/lenovo/helix/acpi/superio.asl A src/mainboard/lenovo/helix/acpi_tables.c A src/mainboard/lenovo/helix/board_info.txt A src/mainboard/lenovo/helix/devicetree.cb A src/mainboard/lenovo/helix/dock.c A src/mainboard/lenovo/helix/dsdt.asl A src/mainboard/lenovo/helix/gma-mainboard.ads A src/mainboard/lenovo/helix/gpio.c A src/mainboard/lenovo/helix/hda_verb.c A src/mainboard/lenovo/helix/mainboard.c A src/mainboard/lenovo/helix/romstage.c A src/mainboard/lenovo/helix/smihandler.c 17 files changed, 921 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/33867/1 diff --git a/src/mainboard/lenovo/helix/Kconfig b/src/mainboard/lenovo/helix/Kconfig new file mode 100644 index 0000000..5f97a0e --- /dev/null +++ b/src/mainboard/lenovo/helix/Kconfig @@ -0,0 +1,46 @@ +if BOARD_LENOVO_THINKPAD_HELIX + +config BOARD_SPECIFIC_OPTIONS + def_bool y + select BOARD_ROMSIZE_KB_12288 + select EC_LENOVO_H8 + select EC_LENOVO_PMH7 + select HAVE_ACPI_RESUME + select HAVE_ACPI_TABLES + select INTEL_INT15 + select MAINBOARD_HAS_LIBGFXINIT # FIXME: check this + select NORTHBRIDGE_INTEL_SANDYBRIDGE + select SERIRQ_CONTINUOUS_MODE + select SOUTHBRIDGE_INTEL_C216 + select SYSTEM_TYPE_LAPTOP + select USE_NATIVE_RAMINIT + select GFX_GMA_INTERNAL_IS_EDP + +config MAINBOARD_DIR + string + default lenovo/helix + +config MAINBOARD_PART_NUMBER + string + default "ThinkPad Helix" + +config VGA_BIOS_FILE + string + default "pci8086,0166.rom" + +config VGA_BIOS_ID + string + default "8086,0166" + +config DRAM_RESET_GATE_GPIO # FIXME: check this + int + default 10 + +config MAX_CPUS + int + default 8 + +config USBDEBUG_HCD_INDEX # FIXME: check this + int + default 2 +endif diff --git a/src/mainboard/lenovo/helix/Kconfig.name b/src/mainboard/lenovo/helix/Kconfig.name new file mode 100644 index 0000000..d36682b --- /dev/null +++ b/src/mainboard/lenovo/helix/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_LENOVO_THINKPAD_HELIX + bool "ThinkPad Helix" diff --git a/src/mainboard/lenovo/helix/Makefile.inc b/src/mainboard/lenovo/helix/Makefile.inc new file mode 100644 index 0000000..333f63a --- /dev/null +++ b/src/mainboard/lenovo/helix/Makefile.inc @@ -0,0 +1,4 @@ +romstage-y += gpio.c +ramstage-y += dock.c +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +smm-y += smihandler.c diff --git a/src/mainboard/lenovo/helix/acpi/ec.asl b/src/mainboard/lenovo/helix/acpi/ec.asl new file mode 100644 index 0000000..c3569e8 --- /dev/null +++ b/src/mainboard/lenovo/helix/acpi/ec.asl @@ -0,0 +1 @@ +#include <ec/lenovo/h8/acpi/ec.asl> diff --git a/src/mainboard/lenovo/helix/acpi/platform.asl b/src/mainboard/lenovo/helix/acpi/platform.asl new file mode 100644 index 0000000..1340cd7 --- /dev/null +++ b/src/mainboard/lenovo/helix/acpi/platform.asl @@ -0,0 +1,28 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2019 Christoph Pomaska <github(a)aufmachen.jetzt> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +Method(_WAK,1) +{ + /* ME may not be up yet. */ + Store (0, \_TZ.MEB1) + Store (0, \_TZ.MEB2) + Return(Package(){0,0}) +} + +Method(_PTS,1) +{ + \_SB.PCI0.LPCB.EC.RADI(0) +} diff --git a/src/mainboard/lenovo/helix/acpi/superio.asl b/src/mainboard/lenovo/helix/acpi/superio.asl new file mode 100644 index 0000000..f2b35ba --- /dev/null +++ b/src/mainboard/lenovo/helix/acpi/superio.asl @@ -0,0 +1 @@ +#include <drivers/pc80/pc/ps2_controller.asl> diff --git a/src/mainboard/lenovo/helix/acpi_tables.c b/src/mainboard/lenovo/helix/acpi_tables.c new file mode 100644 index 0000000..6b731cc --- /dev/null +++ b/src/mainboard/lenovo/helix/acpi_tables.c @@ -0,0 +1,36 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <southbridge/intel/bd82x6x/nvs.h> + +/* FIXME: check this function. */ +void acpi_create_gnvs(global_nvs_t *gnvs) +{ + /* Disable USB ports in S3 by default */ + gnvs->s3u0 = 0; + gnvs->s3u1 = 0; + + /* Disable USB ports in S5 by default */ + gnvs->s5u0 = 0; + gnvs->s5u1 = 0; + + // the lid is open by default. + gnvs->lids = 1; + + gnvs->tcrt = 100; + gnvs->tpsv = 90; +} diff --git a/src/mainboard/lenovo/helix/board_info.txt b/src/mainboard/lenovo/helix/board_info.txt new file mode 100644 index 0000000..a7c651b --- /dev/null +++ b/src/mainboard/lenovo/helix/board_info.txt @@ -0,0 +1,6 @@ +Category: laptop +ROM protocol: SPI +Flashrom support: ? +ROM package: SOIC8 +ROM socketed: n +Release year: 2013 diff --git a/src/mainboard/lenovo/helix/devicetree.cb b/src/mainboard/lenovo/helix/devicetree.cb new file mode 100644 index 0000000..d5a6dd9 --- /dev/null +++ b/src/mainboard/lenovo/helix/devicetree.cb @@ -0,0 +1,166 @@ +chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did + register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" + register "gfx.link_frequency_270_mhz" = "0" + register "gfx.ndid" = "3" + register "gfx.use_spread_spectrum_clock" = "1" + register "gpu_cpu_backlight" = "0x00001156" + register "gpu_dp_b_hotplug" = "4" + register "gpu_dp_c_hotplug" = "4" + register "gpu_dp_d_hotplug" = "4" + register "gpu_panel_port_select" = "1" + register "gpu_panel_power_backlight_off_delay" = "1" + register "gpu_panel_power_backlight_on_delay" = "1" + register "gpu_panel_power_cycle_delay" = "6" + register "gpu_panel_power_down_delay" = "500" + register "gpu_panel_power_up_delay" = "2000" + register "gpu_pch_backlight" = "0x11561156" + device cpu_cluster 0x0 on + chip cpu/intel/model_206ax # FIXME: check all registers + register "c1_acpower" = "1" + register "c1_battery" = "1" + register "c2_acpower" = "3" + register "c2_battery" = "3" + register "c3_acpower" = "5" + register "c3_battery" = "5" + device lapic 0x0 on + end + device lapic 0xacac off + end + end + end + device domain 0x0 on + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH + register "c2_latency" = "0x0065" + register "docking_supported" = "1" + register "gen1_dec" = "0x007c1601" + register "gen2_dec" = "0x000c15e1" + register "gen3_dec" = "0x00000000" + register "gen4_dec" = "0x000c06a1" + register "gpi13_routing" = "2" + register "gpi1_routing" = "2" + register "p_cnt_throttling_supported" = "1" + register "pcie_hotplug_map" = "{ 1, 0, 0, 0, 0, 0, 0, 0 }" + register "pcie_port_coalesce" = "1" + register "sata_interface_speed_support" = "0x3" + register "sata_port_map" = "0x1" + register "spi_lvscc" = "0x2005" + register "spi_uvscc" = "0x2005" + register "superspeed_capable_ports" = "0x0000000b" + register "xhci_overcurrent_mapping" = "0x04000201" + register "xhci_switchable_ports" = "0x0000000b" + device pci 14.0 on # USB 3.0 Controller + subsystemid 0x17aa 0x2207 + end + device pci 16.0 on # Management Engine Interface 1 + subsystemid 0x17aa 0x2207 + end + device pci 16.1 off # Management Engine Interface 2 + end + device pci 16.2 off # Management Engine IDE-R + end + device pci 16.3 off # Management Engine KT + end + device pci 19.0 off # Intel Gigabit Ethernet + end + device pci 1a.0 on # USB2 EHCI #2 + subsystemid 0x17aa 0x2207 + end + device pci 1b.0 on # High Definition Audio Audio controller + subsystemid 0x17aa 0x2207 + end + device pci 1c.0 on # PCIe Port #1 + subsystemid 0x17aa 0x2207 + end + device pci 1c.1 on # PCIe Port #2 + subsystemid 0x17aa 0x2207 + end + device pci 1c.2 off # PCIe Port #3 + end + device pci 1c.3 off # PCIe Port #4 + end + device pci 1c.4 off # PCIe Port #5 + end + device pci 1c.5 off # PCIe Port #6 + end + device pci 1c.6 off # PCIe Port #7 + end + device pci 1c.7 off # PCIe Port #8 + end + device pci 1d.0 on # USB2 EHCI #1 + subsystemid 0x17aa 0x2207 + end + device pci 1e.0 off # PCI bridge + end + device pci 1f.0 on # LPC bridge PCI-LPC bridge + subsystemid 0x17aa 0x2207 + chip ec/lenovo/pmh7 + register "backlight_enable" = "0x01" + register "dock_event_enable" = "0x01" + device pnp ff.1 on # dummy + end + end + chip ec/lenovo/h8 # FIXME: has_keyboard_backlight, has_power_management_beeps, has_uwb + register "beepmask0" = "0x00" + register "beepmask1" = "0x86" + register "config0" = "0xa6" + register "config1" = "0x29" + register "config2" = "0xa1" + register "config3" = "0xc0" + register "event2_enable" = "0xff" + register "event3_enable" = "0xff" + register "event4_enable" = "0xf0" + register "event5_enable" = "0x3c" + register "event7_enable" = "0x01" + register "event8_enable" = "0x7b" + register "event9_enable" = "0xff" + register "eventb_enable" = "0x80" + register "eventc_enable" = "0xff" + register "eventd_enable" = "0xff" + register "evente_enable" = "0x1d" + device pnp ff.2 on # dummy + io 0x60 = 0x62 + io 0x62 = 0x66 + io 0x64 = 0x1600 + io 0x66 = 0x1604 + end + end + end + device pci 1f.2 on # SATA Controller 1 + subsystemid 0x17aa 0x2207 + end + device pci 1f.3 on # SMBus + subsystemid 0x17aa 0x2207 + chip drivers/i2c/at24rf08c # eeprom, 8 virtual devices, same chip + device i2c 54 on + end + device i2c 55 on + end + device i2c 56 on + end + device i2c 57 on + end + device i2c 5c on + end + device i2c 5d on + end + device i2c 5e on + end + device i2c 5f on + end + end + end + device pci 1f.5 off # SATA Controller 2 + end + device pci 1f.6 off # Thermal + end + end + device pci 00.0 on # Host bridge Host bridge + subsystemid 0x17aa 0x2207 + end + device pci 01.0 off # PCIe Bridge for discrete graphics + end + device pci 02.0 on # Internal graphics VGA controller + subsystemid 0x17aa 0x2207 + end + end +end diff --git a/src/mainboard/lenovo/helix/dock.c b/src/mainboard/lenovo/helix/dock.c new file mode 100644 index 0000000..df84d02 --- /dev/null +++ b/src/mainboard/lenovo/helix/dock.c @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2019 Christoph Pomaska <github(a)aufmachen.jetzt> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +#include <ec/lenovo/h8/h8.h> + +void h8_mainboard_init_dock(void) +{ +/* FIXME: fill this if needed. */ +} diff --git a/src/mainboard/lenovo/helix/dsdt.asl b/src/mainboard/lenovo/helix/dsdt.asl new file mode 100644 index 0000000..4a55d4f --- /dev/null +++ b/src/mainboard/lenovo/helix/dsdt.asl @@ -0,0 +1,48 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2019 Christoph Pomaska <github(a)aufmachen.jetzt> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB +#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB +#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#define EC_LENOVO_H8_ME_WORKAROUND 1 +#define THINKPAD_EC_GPE 17 + +#include <arch/acpi.h> +DefinitionBlock( + "dsdt.aml", + "DSDT", + 0x02, // DSDT revision: ACPI 2.0 and up + OEM_ID, + ACPI_TABLE_CREATOR, + 0x20141018 // OEM revision +) +{ + /* Some generic macros */ + #include "acpi/platform.asl" + #include <cpu/intel/common/acpi/cpu.asl> + #include <southbridge/intel/bd82x6x/acpi/platform.asl> + /* global NVS and variables. */ + #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> + #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> + + Device (\_SB.PCI0) + { + #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> + #include <drivers/intel/gma/acpi/default_brightness_levels.asl> + #include <southbridge/intel/bd82x6x/acpi/pch.asl> + } +} diff --git a/src/mainboard/lenovo/helix/gma-mainboard.ads b/src/mainboard/lenovo/helix/gma-mainboard.ads new file mode 100644 index 0000000..ce27742 --- /dev/null +++ b/src/mainboard/lenovo/helix/gma-mainboard.ads @@ -0,0 +1,35 @@ +-- +-- This file is part of the coreboot project. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- + +with HW.GFX.GMA; +with HW.GFX.GMA.Display_Probing; + +use HW.GFX.GMA; +use HW.GFX.GMA.Display_Probing; + +private package GMA.Mainboard is + + -- FIXME: check this + ports : constant Port_List := + (DP1, + DP2, + DP3, + HDMI1, + HDMI2, + HDMI3, + Analog, + Internal, + others => Disabled); + +end GMA.Mainboard; diff --git a/src/mainboard/lenovo/helix/gpio.c b/src/mainboard/lenovo/helix/gpio.c new file mode 100644 index 0000000..b1dcb0a --- /dev/null +++ b/src/mainboard/lenovo/helix/gpio.c @@ -0,0 +1,239 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <southbridge/intel/common/gpio.h> + +static const struct pch_gpio_set1 pch_gpio_set1_mode = { + .gpio0 = GPIO_MODE_GPIO, + .gpio1 = GPIO_MODE_GPIO, + .gpio2 = GPIO_MODE_GPIO, + .gpio3 = GPIO_MODE_GPIO, + .gpio4 = GPIO_MODE_GPIO, + .gpio5 = GPIO_MODE_GPIO, + .gpio6 = GPIO_MODE_GPIO, + .gpio7 = GPIO_MODE_GPIO, + .gpio8 = GPIO_MODE_GPIO, + .gpio9 = GPIO_MODE_NATIVE, + .gpio10 = GPIO_MODE_GPIO, + .gpio11 = GPIO_MODE_GPIO, + .gpio12 = GPIO_MODE_GPIO, + .gpio13 = GPIO_MODE_GPIO, + .gpio14 = GPIO_MODE_GPIO, + .gpio15 = GPIO_MODE_GPIO, + .gpio16 = GPIO_MODE_GPIO, + .gpio17 = GPIO_MODE_GPIO, + .gpio18 = GPIO_MODE_NATIVE, + .gpio19 = GPIO_MODE_NATIVE, + .gpio20 = GPIO_MODE_NATIVE, + .gpio21 = GPIO_MODE_GPIO, + .gpio22 = GPIO_MODE_GPIO, + .gpio23 = GPIO_MODE_NATIVE, + .gpio24 = GPIO_MODE_GPIO, + .gpio25 = GPIO_MODE_GPIO, + .gpio26 = GPIO_MODE_GPIO, + .gpio27 = GPIO_MODE_GPIO, + .gpio28 = GPIO_MODE_GPIO, + .gpio29 = GPIO_MODE_GPIO, + .gpio30 = GPIO_MODE_NATIVE, + .gpio31 = GPIO_MODE_NATIVE, +}; + +static const struct pch_gpio_set1 pch_gpio_set1_direction = { + .gpio0 = GPIO_DIR_INPUT, + .gpio1 = GPIO_DIR_INPUT, + .gpio2 = GPIO_DIR_INPUT, + .gpio3 = GPIO_DIR_INPUT, + .gpio4 = GPIO_DIR_INPUT, + .gpio5 = GPIO_DIR_INPUT, + .gpio6 = GPIO_DIR_INPUT, + .gpio7 = GPIO_DIR_INPUT, + .gpio8 = GPIO_DIR_OUTPUT, + .gpio10 = GPIO_DIR_OUTPUT, + .gpio11 = GPIO_DIR_INPUT, + .gpio12 = GPIO_DIR_INPUT, + .gpio13 = GPIO_DIR_INPUT, + .gpio14 = GPIO_DIR_INPUT, + .gpio15 = GPIO_DIR_OUTPUT, + .gpio16 = GPIO_DIR_INPUT, + .gpio17 = GPIO_DIR_INPUT, + .gpio21 = GPIO_DIR_INPUT, + .gpio22 = GPIO_DIR_OUTPUT, + .gpio24 = GPIO_DIR_OUTPUT, + .gpio25 = GPIO_DIR_INPUT, + .gpio26 = GPIO_DIR_INPUT, + .gpio27 = GPIO_DIR_INPUT, + .gpio28 = GPIO_DIR_OUTPUT, + .gpio29 = GPIO_DIR_OUTPUT, +}; + +static const struct pch_gpio_set1 pch_gpio_set1_level = { + .gpio8 = GPIO_LEVEL_LOW, + .gpio10 = GPIO_LEVEL_HIGH, + .gpio15 = GPIO_LEVEL_LOW, + .gpio22 = GPIO_LEVEL_HIGH, + .gpio24 = GPIO_LEVEL_LOW, + .gpio28 = GPIO_LEVEL_LOW, + .gpio29 = GPIO_LEVEL_HIGH, +}; + +static const struct pch_gpio_set1 pch_gpio_set1_reset = { + .gpio24 = GPIO_RESET_RSMRST, +}; + +static const struct pch_gpio_set1 pch_gpio_set1_invert = { + .gpio1 = GPIO_INVERT, + .gpio3 = GPIO_INVERT, + .gpio4 = GPIO_INVERT, + .gpio6 = GPIO_INVERT, + .gpio11 = GPIO_INVERT, + .gpio13 = GPIO_INVERT, +}; + +static const struct pch_gpio_set1 pch_gpio_set1_blink = { +}; + +static const struct pch_gpio_set2 pch_gpio_set2_mode = { + .gpio32 = GPIO_MODE_NATIVE, + .gpio33 = GPIO_MODE_GPIO, + .gpio34 = GPIO_MODE_GPIO, + .gpio35 = GPIO_MODE_GPIO, + .gpio36 = GPIO_MODE_GPIO, + .gpio37 = GPIO_MODE_GPIO, + .gpio38 = GPIO_MODE_GPIO, + .gpio39 = GPIO_MODE_GPIO, + .gpio40 = GPIO_MODE_GPIO, + .gpio41 = GPIO_MODE_GPIO, + .gpio42 = GPIO_MODE_GPIO, + .gpio43 = GPIO_MODE_GPIO, + .gpio44 = GPIO_MODE_GPIO, + .gpio45 = GPIO_MODE_GPIO, + .gpio46 = GPIO_MODE_GPIO, + .gpio47 = GPIO_MODE_NATIVE, + .gpio48 = GPIO_MODE_GPIO, + .gpio49 = GPIO_MODE_GPIO, + .gpio50 = GPIO_MODE_GPIO, + .gpio51 = GPIO_MODE_GPIO, + .gpio52 = GPIO_MODE_GPIO, + .gpio53 = GPIO_MODE_GPIO, + .gpio54 = GPIO_MODE_GPIO, + .gpio55 = GPIO_MODE_GPIO, + .gpio56 = GPIO_MODE_GPIO, + .gpio57 = GPIO_MODE_GPIO, + .gpio58 = GPIO_MODE_NATIVE, + .gpio59 = GPIO_MODE_GPIO, + .gpio60 = GPIO_MODE_NATIVE, + .gpio61 = GPIO_MODE_NATIVE, + .gpio62 = GPIO_MODE_NATIVE, + .gpio63 = GPIO_MODE_NATIVE, +}; + +static const struct pch_gpio_set2 pch_gpio_set2_direction = { + .gpio33 = GPIO_DIR_OUTPUT, + .gpio34 = GPIO_DIR_INPUT, + .gpio35 = GPIO_DIR_OUTPUT, + .gpio36 = GPIO_DIR_INPUT, + .gpio37 = GPIO_DIR_INPUT, + .gpio38 = GPIO_DIR_INPUT, + .gpio39 = GPIO_DIR_INPUT, + .gpio40 = GPIO_DIR_INPUT, + .gpio41 = GPIO_DIR_INPUT, + .gpio42 = GPIO_DIR_INPUT, + .gpio43 = GPIO_DIR_OUTPUT, + .gpio44 = GPIO_DIR_INPUT, + .gpio45 = GPIO_DIR_INPUT, + .gpio46 = GPIO_DIR_INPUT, + .gpio48 = GPIO_DIR_INPUT, + .gpio49 = GPIO_DIR_INPUT, + .gpio50 = GPIO_DIR_INPUT, + .gpio51 = GPIO_DIR_OUTPUT, + .gpio52 = GPIO_DIR_OUTPUT, + .gpio53 = GPIO_DIR_OUTPUT, + .gpio54 = GPIO_DIR_INPUT, + .gpio55 = GPIO_DIR_OUTPUT, + .gpio56 = GPIO_DIR_INPUT, + .gpio57 = GPIO_DIR_INPUT, + .gpio59 = GPIO_DIR_INPUT, +}; + +static const struct pch_gpio_set2 pch_gpio_set2_level = { + .gpio33 = GPIO_LEVEL_HIGH, + .gpio35 = GPIO_LEVEL_HIGH, + .gpio43 = GPIO_LEVEL_HIGH, + .gpio51 = GPIO_LEVEL_HIGH, + .gpio52 = GPIO_LEVEL_HIGH, + .gpio53 = GPIO_LEVEL_HIGH, + .gpio55 = GPIO_LEVEL_HIGH, +}; + +static const struct pch_gpio_set2 pch_gpio_set2_reset = { +}; + +static const struct pch_gpio_set3 pch_gpio_set3_mode = { + .gpio64 = GPIO_MODE_GPIO, + .gpio65 = GPIO_MODE_GPIO, + .gpio66 = GPIO_MODE_GPIO, + .gpio67 = GPIO_MODE_GPIO, + .gpio68 = GPIO_MODE_GPIO, + .gpio69 = GPIO_MODE_GPIO, + .gpio70 = GPIO_MODE_GPIO, + .gpio71 = GPIO_MODE_GPIO, + .gpio72 = GPIO_MODE_NATIVE, + .gpio73 = GPIO_MODE_NATIVE, + .gpio74 = GPIO_MODE_NATIVE, + .gpio75 = GPIO_MODE_NATIVE, +}; + +static const struct pch_gpio_set3 pch_gpio_set3_direction = { + .gpio64 = GPIO_DIR_INPUT, + .gpio65 = GPIO_DIR_INPUT, + .gpio66 = GPIO_DIR_INPUT, + .gpio67 = GPIO_DIR_INPUT, + .gpio68 = GPIO_DIR_OUTPUT, + .gpio69 = GPIO_DIR_INPUT, + .gpio70 = GPIO_DIR_INPUT, + .gpio71 = GPIO_DIR_INPUT, +}; + +static const struct pch_gpio_set3 pch_gpio_set3_level = { + .gpio68 = GPIO_LEVEL_HIGH, +}; + +static const struct pch_gpio_set3 pch_gpio_set3_reset = { +}; + +const struct pch_gpio_map mainboard_gpio_map = { + .set1 = { + .mode = &pch_gpio_set1_mode, + .direction = &pch_gpio_set1_direction, + .level = &pch_gpio_set1_level, + .blink = &pch_gpio_set1_blink, + .invert = &pch_gpio_set1_invert, + .reset = &pch_gpio_set1_reset, + }, + .set2 = { + .mode = &pch_gpio_set2_mode, + .direction = &pch_gpio_set2_direction, + .level = &pch_gpio_set2_level, + .reset = &pch_gpio_set2_reset, + }, + .set3 = { + .mode = &pch_gpio_set3_mode, + .direction = &pch_gpio_set3_direction, + .level = &pch_gpio_set3_level, + .reset = &pch_gpio_set3_reset, + }, +}; diff --git a/src/mainboard/lenovo/helix/hda_verb.c b/src/mainboard/lenovo/helix/hda_verb.c new file mode 100644 index 0000000..32f1126 --- /dev/null +++ b/src/mainboard/lenovo/helix/hda_verb.c @@ -0,0 +1,76 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <device/azalia_device.h> + +const u32 cim_verb_data[] = { + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa2207, /* Subsystem ID */ + + 0x0000000b, /* Number of 4 dword sets */ + /* NID 0x01: Subsystem ID. */ + AZALIA_SUBVENDOR(0x0, 0x17aa2207), + + /* NID 0x12. */ + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60130), + + /* NID 0x14. */ + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), + + /* NID 0x15. */ + AZALIA_PIN_CFG(0x0, 0x15, 0x03214020), + + /* NID 0x17. */ + AZALIA_PIN_CFG(0x0, 0x17, 0x40008008), + + /* NID 0x18. */ + AZALIA_PIN_CFG(0x0, 0x18, 0x03a19040), + + /* NID 0x19. */ + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), + + /* NID 0x1a. */ + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + + /* NID 0x1b. */ + AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), + + /* NID 0x1d. */ + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f6862d), + + /* NID 0x1e. */ + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + + 0x00000004, /* Number of 4 dword sets */ + /* NID 0x01: Subsystem ID. */ + AZALIA_SUBVENDOR(0x3, 0x80860101), + + /* NID 0x05. */ + AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), + + /* NID 0x06. */ + AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), + + /* NID 0x07. */ + AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), +}; + +const u32 pc_beep_verbs[0] = {}; + +AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/lenovo/helix/mainboard.c b/src/mainboard/lenovo/helix/mainboard.c new file mode 100644 index 0000000..040941d --- /dev/null +++ b/src/mainboard/lenovo/helix/mainboard.c @@ -0,0 +1,31 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2019 Christoph Pomaska <github(a)aufmachen.jetzt> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +#include <device/device.h> +#include <drivers/intel/gma/int15.h> +#include <southbridge/intel/bd82x6x/pch.h> + +static void mainboard_enable(struct device *dev) +{ + /* FIXME: fix those values*/ + install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, + GMA_INT15_PANEL_FIT_DEFAULT, + GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); +} + +struct chip_operations mainboard_ops = { + .enable_dev = mainboard_enable, +}; diff --git a/src/mainboard/lenovo/helix/romstage.c b/src/mainboard/lenovo/helix/romstage.c new file mode 100644 index 0000000..ff8bd1d --- /dev/null +++ b/src/mainboard/lenovo/helix/romstage.c @@ -0,0 +1,75 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* FIXME: Check if all includes are needed. */ + +#include <stdint.h> +#include <string.h> +#include <timestamp.h> +#include <arch/byteorder.h> +#include <device/mmio.h> +#include <device/pci_ops.h> +#include <device/pnp_ops.h> +#include <console/console.h> +#include <northbridge/intel/sandybridge/sandybridge.h> +#include <northbridge/intel/sandybridge/raminit_native.h> +#include <southbridge/intel/bd82x6x/pch.h> +#include <southbridge/intel/common/gpio.h> + +void pch_enable_lpc(void) +{ + pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x3f0f); + pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0010); +} + +void mainboard_rcba_config(void) +{ +} + +const struct southbridge_usb_port mainboard_usb_ports[] = { + { 1, 0, 0 }, + { 1, 2, 1 }, + { 1, 1, 3 }, + { 1, 0, -1 }, + { 1, 1, 2 }, + { 1, 1, -1 }, + { 0, 0, -1 }, + { 1, 0, -1 }, + { 1, 0, -1 }, + { 1, 1, 5 }, + { 0, 0, -1 }, + { 1, 1, -1 }, + { 1, 0, -1 }, + { 1, 0, -1 }, +}; + +void mainboard_early_init(int s3resume) +{ +} + +void mainboard_config_superio(void) +{ +} + +/* FIXME: Put proper SPD map here. */ +void mainboard_get_spd(spd_raw_data *spd, bool id_only) +{ + read_spd(&spd[0], 0x50, id_only); + read_spd(&spd[1], 0x52, id_only); + read_spd(&spd[2], 0x51, id_only); + read_spd(&spd[3], 0x53, id_only); +} diff --git a/src/mainboard/lenovo/helix/smihandler.c b/src/mainboard/lenovo/helix/smihandler.c new file mode 100644 index 0000000..a235c3e --- /dev/null +++ b/src/mainboard/lenovo/helix/smihandler.c @@ -0,0 +1,104 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <arch/io.h> +#include <console/console.h> +#include <cpu/x86/smm.h> +#include <ec/acpi/ec.h> +#include <ec/lenovo/h8/h8.h> +#include <delay.h> +#include <southbridge/intel/bd82x6x/pch.h> +#include <southbridge/intel/common/pmutil.h> + +#define GPE_EC_SCI 1 +/* FIXME: check this */ +#define GPE_EC_WAKE 13 + +static void mainboard_smm_init(void) +{ + printk(BIOS_DEBUG, "initializing SMI\n"); + /* Enable 0x1600/0x1600 register pair */ + ec_set_bit(0x00, 0x05); +} + +int mainboard_io_trap_handler(int smif) +{ + static int smm_initialized; + + if (!smm_initialized) { + mainboard_smm_init(); + smm_initialized = 1; + } + + return 0; +} + +static void mainboard_smi_handle_ec_sci(void) +{ + u8 status = inb(EC_SC); + u8 event; + + if (!(status & EC_SCI_EVT)) + return; + + event = ec_query(); + printk(BIOS_DEBUG, "EC event %02x\n", event); +} + +void mainboard_smi_gpi(u32 gpi_sts) +{ + if (gpi_sts & (1 << GPE_EC_SCI)) + mainboard_smi_handle_ec_sci(); +} + +int mainboard_smi_apmc(u8 data) +{ + switch (data) { + case APM_CNT_ACPI_ENABLE: + /* use 0x1600/0x1604 to prevent races with userspace */ + ec_set_ports(0x1604, 0x1600); + /* route EC_SCI to SCI */ + gpi_route_interrupt(GPE_EC_SCI, GPI_IS_SCI); + /* discard all events, and enable attention */ + ec_write(0x80, 0x01); + break; + case APM_CNT_ACPI_DISABLE: + /* we have to use port 0x62/0x66, as 0x1600/0x1604 doesn't + provide a EC query function */ + ec_set_ports(0x66, 0x62); + /* route EC_SCI to SMI */ + gpi_route_interrupt(GPE_EC_SCI, GPI_IS_SMI); + /* discard all events, and enable attention */ + ec_write(0x80, 0x01); + break; + default: + break; + } + return 0; +} + +void mainboard_smi_sleep(u8 slp_typ) +{ + if (slp_typ == 3) { + u8 ec_wake = ec_read(0x32); + /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ + if (ec_wake & 0x14) { + /* Redirect EC WAKE GPE to SCI. */ + gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI); + } + } +} -- To view, visit https://review.coreboot.org/c/coreboot/+/33867 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7dbf10bc85edb161fce077568d4ef3db91e10db7 Gerrit-Change-Number: 33867 Gerrit-PatchSet: 1 Gerrit-Owner: Christoph Pomaska <github(a)aufmachen.jetzt> Gerrit-MessageType: newchange

6 6

Change in ...coreboot[master]: cpu/amd/microcode: Search all containers
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/+/30747 Change subject: cpu/amd/microcode: Search all containers ...................................................................... cpu/amd/microcode: Search all containers Currently, it’s aborted if the first file is not found. The commit was only tested with all microcode containers present in CBFS. If only one microcode update container is present, which is not the first, it is skipped. Change the return to continue to traverse all elements. Fixes: 83e4c5613 (cpu/amd/microcode: Update parser to use stock microcode blobs) Change-Id: I5195ff0334cf49cadc25de31822a9f2f2cd90490 Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de> --- M src/cpu/amd/microcode/microcode.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/30747/1 diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c index e8ab175..622c6db 100644 --- a/src/cpu/amd/microcode/microcode.c +++ b/src/cpu/amd/microcode/microcode.c @@ -214,7 +214,7 @@ spin_unlock(romstage_microcode_cbfs_lock()); #endif #endif - return; + continue; } amd_update_microcode(ucode, ucode_len, equivalent_processor_rev_id); -- To view, visit https://review.coreboot.org/c/coreboot/+/30747 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5195ff0334cf49cadc25de31822a9f2f2cd90490 Gerrit-Change-Number: 30747 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: newchange

2 1

Change in coreboot[master]: [WIP] Documentation/basics: Add glossary
by Christoph Pomaska (Code Review) 10 Jun '23

10 Jun '23

Christoph Pomaska has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35911 ) Change subject: [WIP] Documentation/basics: Add glossary ...................................................................... [WIP] Documentation/basics: Add glossary The glossary is to contain common abbreviations and specific vocabulary. Change-Id: I2ef9130f9cfecacdc0033deba3cde582fb991f54 Signed-off-by: Christoph Pomaska <c.pomaska(a)hosting.de> --- A Documentation/basics/glossary.md 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/35911/1 diff --git a/Documentation/basics/glossary.md b/Documentation/basics/glossary.md new file mode 100644 index 0000000..f820bf1 --- /dev/null +++ b/Documentation/basics/glossary.md @@ -0,0 +1,27 @@ +# Glossary + +## Intro +This page explains the most common abbreviations and terms. It also contains additional reference for some more detailed info. + +## Intel-specific + +- IFD: Intel Flash Descriptor\ + The Intel Flash Descriptor is used on Intel platforms to split the contents of a flash chip into multiple parts (regions). + Most boards contain the following regions: + * ifd + * me + * gbe + * bios + * platform data +- ME: Intel Management Engine + The Intel Management Engine is a co-processor that runs proprietary code which resides next to the bios-firmware within the "me" flash-region. + On older platforms it is possible to disable the ME by removing the code from the flash-chip. Since Sandybridge it is only possible to disable the ME by removing most parts of it and making it crash on startup, disabling a watchdog that shuts off the whole system 30 minutes after startup. Since Skylake it not possible to remove anything from the ME without breaking it. +- GbE: Gigabit Ethernet + This regions contains a firmware blob for Intel Gigabit Ethernet hardware. It is usually not used for mainboards that dont have Intel Gigabit ethernet onboard. +- BIOS: Basic Input Output System + The BIOS region contains the firmware that is required to boot up and initialize the system/mainboard. This is the region where coreboot is usually written to. + +## coreboot-specific +- CBFS: coreboot file system + The coreboot filesystem contains the files that are require for coreboot to work, such as the bootblock, payloads and romstage/ramstage binaries. + -- To view, visit https://review.coreboot.org/c/coreboot/+/35911 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2ef9130f9cfecacdc0033deba3cde582fb991f54 Gerrit-Change-Number: 35911 Gerrit-PatchSet: 1 Gerrit-Owner: Christoph Pomaska <github(a)aufmachen.jetzt> Gerrit-MessageType: newchange

5 10

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit April 2020