coreboot-gerrit November 2015

coreboot-gerrit@coreboot.org

1 participants
1544 discussions

Patch set updated for coreboot: drivers/pc80: Ensure recovery mode always boots fallback image
by Timothy Pearson 01 Nov '15

01 Nov '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12289 -gerrit commit b143349179ace8fd9eb286c1959ffb78dc8b1f4d Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sun Nov 1 02:13:17 2015 -0600 drivers/pc80: Ensure recovery mode always boots fallback image The current fallback / failed boot count checks only look at the value of last_boot when determining whether to execute the normal or fallback image. Furthermore, the normal boot bit is unconditionally set if the failed boot count has not exceeded its threshold, thereby overriding a request from the user to boot into fallback mode if the user does not also set the failed boot count above the failure threshold. Only check the failed boot count if the normal boot bit is set in nvram. Change-Id: I753ae9f0710c524875a85354ac2547df0c305569 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/drivers/pc80/mc146818rtc_early.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/drivers/pc80/mc146818rtc_early.c b/src/drivers/pc80/mc146818rtc_early.c index 421af2f..2533058 100644 --- a/src/drivers/pc80/mc146818rtc_early.c +++ b/src/drivers/pc80/mc146818rtc_early.c @@ -67,23 +67,31 @@ static inline __attribute__((unused)) int do_normal_boot(void) /* The RTC_BOOT_BYTE is now o.k. see where to go. */ byte = cmos_read(RTC_BOOT_BYTE); + /* If booting past the bootblock is all that is required + * to reset the failed boot checks, then clear the boot + * count. This code must execute before any of the boot + * count checks below to function correctly. + */ if (!IS_ENABLED(CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR)) /* Are we in normal mode? */ if (byte & 1) byte &= 0x0f; /* yes, clear the boot count */ - /* Properly set the last boot flag */ - byte &= 0xfc; - if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { - byte |= (1<<1); - } - - /* Are we already at the max count? */ - if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { - byte += 1 << 4; /* No, add 1 to the count */ - } - else { - byte &= 0xfc; /* Yes, put in fallback mode */ + /* Are we in normal mode? */ + if (byte & 1) { + /* Properly set the last boot flag */ + byte &= 0xfc; + if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { + byte |= (1<<1); + } + + /* Are we already at the max count? */ + if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { + byte += 1 << 4; /* No, add 1 to the count */ + } + else { + byte &= 0xfc; /* Yes, put in fallback mode */ + } } /* Save the boot byte */

1 0

New patch to review for coreboot: mainboard/asus/kfsn4-dre_k8: Fix ramstage using Family 10h structs
by Timothy Pearson 01 Nov '15

01 Nov '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12290 -gerrit commit 63c5c920230e8642b42c7f59ccee233ff1882899 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sun Nov 1 02:41:39 2015 -0600 mainboard/asus/kfsn4-dre_k8: Fix ramstage using Family 10h structs Several ramstage files were inadvertently using Family 10h-specfic structures, causing unstable operation. Use the K8-specific structures instead. Change-Id: I64066dfdca83557393499b77726051e25b814381 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c | 2 +- src/mainboard/asus/kfsn4-dre_k8/irq_tables.c | 2 +- src/mainboard/asus/kfsn4-dre_k8/mptable.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c index 904ad38..c6d2981 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c +++ b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c @@ -19,7 +19,7 @@ #include <device/pci_ids.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include <cpu/amd/amdfam10_sysconf.h> +#include <cpu/amd/amdk8_sysconf.h> /* APIC */ unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/asus/kfsn4-dre_k8/irq_tables.c b/src/mainboard/asus/kfsn4-dre_k8/irq_tables.c index 0a990a7..d06980c 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/irq_tables.c +++ b/src/mainboard/asus/kfsn4-dre_k8/irq_tables.c @@ -28,7 +28,7 @@ #include <string.h> #include <stdint.h> #include <arch/pirq_routing.h> -#include <cpu/amd/amdfam10_sysconf.h> +#include <cpu/amd/amdk8_sysconf.h> extern unsigned char bus_isa; extern unsigned char bus_ck804[6]; diff --git a/src/mainboard/asus/kfsn4-dre_k8/mptable.c b/src/mainboard/asus/kfsn4-dre_k8/mptable.c index cdf86a1..21a433a 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/mptable.c +++ b/src/mainboard/asus/kfsn4-dre_k8/mptable.c @@ -27,7 +27,7 @@ #include <device/pci.h> #include <string.h> #include <stdint.h> -#include <cpu/amd/amdfam10_sysconf.h> +#include <cpu/amd/amdk8_sysconf.h> extern unsigned char bus_ck804[6]; extern unsigned apicid_ck804;

1 0

New patch to review for coreboot: drivers/pc80: Ensure recovery mode always boots fallback image
by Timothy Pearson 01 Nov '15

01 Nov '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12289 -gerrit commit c49d7f9bf46bee43f9fcf691762959dc82b1876a Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sun Nov 1 02:13:17 2015 -0600 drivers/pc80: Ensure recovery mode always boots fallback image The current fallback / failed boot count checks only look at the value of last_boot when determining whether to execute the normal or fallback image. Furthermore, the normal boot bit is unconditionally set if the failed boot count has not exceeded its threshold, thereby overriding a request from the user to boot into fallback mode if the user does not also set the failed boot count above the failure threshold. Only check the failed boot count if the normal boot bit is set in nvram. Change-Id: I753ae9f0710c524875a85354ac2547df0c305569 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/drivers/pc80/mc146818rtc_early.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/drivers/pc80/mc146818rtc_early.c b/src/drivers/pc80/mc146818rtc_early.c index 421af2f..9861c29 100644 --- a/src/drivers/pc80/mc146818rtc_early.c +++ b/src/drivers/pc80/mc146818rtc_early.c @@ -72,18 +72,20 @@ static inline __attribute__((unused)) int do_normal_boot(void) if (byte & 1) byte &= 0x0f; /* yes, clear the boot count */ - /* Properly set the last boot flag */ - byte &= 0xfc; - if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { - byte |= (1<<1); - } - - /* Are we already at the max count? */ - if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { - byte += 1 << 4; /* No, add 1 to the count */ - } - else { - byte &= 0xfc; /* Yes, put in fallback mode */ + if (byte & 1) { + /* Properly set the last boot flag */ + byte &= 0xfc; + if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { + byte |= (1<<1); + } + + /* Are we already at the max count? */ + if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) { + byte += 1 << 4; /* No, add 1 to the count */ + } + else { + byte &= 0xfc; /* Yes, put in fallback mode */ + } } /* Save the boot byte */

1 0

Patch set updated for coreboot: cpu/amd/model_fxx: Backport PowerNow! core count fix from Family 10h
by Timothy Pearson 01 Nov '15

01 Nov '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12286 -gerrit commit b092189e3b259f4414c2cfd8e90b07013b18b074 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sat Oct 31 15:21:24 2015 -0500 cpu/amd/model_fxx: Backport PowerNow! core count fix from Family 10h The K8 PowerNow! state generator does not generate _PSS objects for nodes other than the first CPU package. This patch backports the PowerNow! core count fixes for Family 10h to the K8 CPUs. Change-Id: I7b411ab75155dfb4bf51ae04301aa16fb2ae89f3 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/cpu/amd/model_fxx/powernow_acpi.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c index 1cb35ef..d64c6d9 100644 --- a/src/cpu/amd/model_fxx/powernow_acpi.c +++ b/src/cpu/amd/model_fxx/powernow_acpi.c @@ -100,6 +100,10 @@ static void pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) u8 cmp_cap, pwr_lmt; u32 power_limit = 0; u8 index; + uint8_t node_count; + uint8_t cores_per_node; + uint32_t total_core_count; + uint32_t dword; msr_t msr; u32 fid_multiplier; static const struct power_limit_encoding TDP[] = { @@ -156,9 +160,18 @@ static void pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) * cmp_cap : 0x0 SingleCore ; 0x1 DualCore */ printk(BIOS_INFO, "Pstates Algorithm ...\n"); - cmp_cap = - (pci_read_config16(dev_find_slot(0, PCI_DEVFN(0x18, 3)), 0xE8) & - 0x3000) >> 12; + + /* Get number of cores */ + dword = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x18, 3)), 0xe8); + cmp_cap = (dword & 0x3000) >> 12; + /* Get number of nodes */ + dword = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x18, 0)), 0x60); + node_count = ((dword & 0x70) >> 4) + 1; + cores_per_node = cmp_cap + 1; + + /* Compute total number of cores installed in system */ + total_core_count = cores_per_node * node_count; + cpuid1 = cpuid(0x80000001); pwr_lmt = ((cpuid1.ebx & 0x1C0) >> 5) | ((cpuid1.ebx & 0x4000) >> 14); for (index = 0; index < ARRAY_SIZE(TDP); index++) @@ -360,7 +373,7 @@ write_pstates: (0x0 << 18) | /* MVS */ (0x5 << 11); /* VST */ - for (index = 0; index < (cmp_cap + 1); index++) { + for (index = 0; index < total_core_count; index++) { write_pstates_for_core(Pstate_num, Pstate_feq, Pstate_vid, Pstate_fid, Pstate_power, index, pcontrol_blk, plen, onlyBSP, control);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2015