coreboot-gerrit October 2016

coreboot-gerrit@coreboot.org

1 participants
1281 discussions

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit 1b139e64676f963bd7fe9e51d0e5c58d2d85bd2b Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 3 +++ util/abuild/abuild | 2 +- util/amdfwtool/amdfwtool.c | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..bd0a807 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + #default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..107be69 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ @@ -235,6 +237,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(OPT_2SMUFIRMWARE2_FILE) \ $(OPT_2SMUSCS_FILE) \ --output $@ + please_fail_here cbfs-files-y += apu/amdfw apu/amdfw-file := $(obj)/amdfw.rom diff --git a/util/abuild/abuild b/util/abuild/abuild index a2a428b..8fa62dc 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -671,7 +671,7 @@ else junit '<testsuite>' if [ "$mode" != "text" ]; then for xmlfile in $TARGET/abuild/*_*.xml; do - cat $xmlfile >> $REAL_XMLFILE + cat $xmlfile | tr -d '\0' >> $REAL_XMLFILE done fi XMLFILE=$REAL_XMLFILE diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 3dff2ac..cb4687d 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -391,6 +391,9 @@ int main(int argc, char **argv) int targetfd; char *output; + FILE *tty = stderr; + + fprintf(tty, "#0 AMDFWTOOL: allocating rom, %u bytes\n", CONFIG_ROM_SIZE); rom = malloc(CONFIG_ROM_SIZE); memset (rom, 0xFF, CONFIG_ROM_SIZE); if (!rom) { @@ -542,6 +545,7 @@ int main(int argc, char **argv) amd_romsig[4] = current + ROM_BASE_ADDRESS; current += 0x200; /* Conservative size of pspdir */ + fprintf(tty, "#0 ANDFWTOOL: calling integrate_psp_firmwares at %u\n", current); current = integrate_psp_firmwares(rom, current, pspdir, amd_psp_fw_table); }

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit 2b9fd78dce052af00076fdb529173340daabd9d9 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ util/abuild/abuild | 2 +- util/amdfwtool/amdfwtool.c | 4 ++++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..bd0a807 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + #default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..524ee9d 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ diff --git a/util/abuild/abuild b/util/abuild/abuild index a2a428b..8fa62dc 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -671,7 +671,7 @@ else junit '<testsuite>' if [ "$mode" != "text" ]; then for xmlfile in $TARGET/abuild/*_*.xml; do - cat $xmlfile >> $REAL_XMLFILE + cat $xmlfile | tr -d '\0' >> $REAL_XMLFILE done fi XMLFILE=$REAL_XMLFILE diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 3dff2ac..cb4687d 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -391,6 +391,9 @@ int main(int argc, char **argv) int targetfd; char *output; + FILE *tty = stderr; + + fprintf(tty, "#0 AMDFWTOOL: allocating rom, %u bytes\n", CONFIG_ROM_SIZE); rom = malloc(CONFIG_ROM_SIZE); memset (rom, 0xFF, CONFIG_ROM_SIZE); if (!rom) { @@ -542,6 +545,7 @@ int main(int argc, char **argv) amd_romsig[4] = current + ROM_BASE_ADDRESS; current += 0x200; /* Conservative size of pspdir */ + fprintf(tty, "#0 ANDFWTOOL: calling integrate_psp_firmwares at %u\n", current); current = integrate_psp_firmwares(rom, current, pspdir, amd_psp_fw_table); }

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit c31ad31ad1bf5251e1e35dd1df09d0ae96605001 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ util/abuild/abuild | 2 +- util/amdfwtool/amdfwtool.c | 4 ++++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..524ee9d 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ diff --git a/util/abuild/abuild b/util/abuild/abuild index a2a428b..8fa62dc 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -671,7 +671,7 @@ else junit '<testsuite>' if [ "$mode" != "text" ]; then for xmlfile in $TARGET/abuild/*_*.xml; do - cat $xmlfile >> $REAL_XMLFILE + cat $xmlfile | tr -d '\0' >> $REAL_XMLFILE done fi XMLFILE=$REAL_XMLFILE diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 3dff2ac..cb4687d 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -391,6 +391,9 @@ int main(int argc, char **argv) int targetfd; char *output; + FILE *tty = stderr; + + fprintf(tty, "#0 AMDFWTOOL: allocating rom, %u bytes\n", CONFIG_ROM_SIZE); rom = malloc(CONFIG_ROM_SIZE); memset (rom, 0xFF, CONFIG_ROM_SIZE); if (!rom) { @@ -542,6 +545,7 @@ int main(int argc, char **argv) amd_romsig[4] = current + ROM_BASE_ADDRESS; current += 0x200; /* Conservative size of pspdir */ + fprintf(tty, "#0 ANDFWTOOL: calling integrate_psp_firmwares at %u\n", current); current = integrate_psp_firmwares(rom, current, pspdir, amd_psp_fw_table); }

1 0

Patch set updated for coreboot: RISCV: architecture cleanup.
by Ronald G. Minnich 19 Oct '16

19 Oct '16

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17058 -gerrit commit 9d17fbcfb47df8f393904d25c659390e224d3b1f Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Wed Oct 19 08:07:13 2016 -0700 RISCV: architecture cleanup. This includes changes that will make the lowrisc fpga implementation work. We provide a standard payload that makes the jump from machine to supervisor mode; the days of kernels running in machine mode are over. We do some small tweaks to the virtual memory code. We temporarily disable two functions that won't work on some targets as register numbers changed between 1.7 and 1.9. Once lowrisc catches up we'll reenable them. Change-Id: I6caadfa9627fa35e31580492be01d4af908d31d9 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/arch/riscv/Makefile.inc | 1 + src/arch/riscv/boot.c | 4 ++++ src/arch/riscv/include/vm.h | 10 ---------- src/arch/riscv/payload.S | 35 +++++++++++++++++++++++++++++++++++ src/arch/riscv/trap_handler.c | 1 + src/arch/riscv/virtual_memory.c | 41 ++++++++++++++++++++++++++++++----------- 6 files changed, 71 insertions(+), 21 deletions(-) diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc index 4bab459..cf6ce99 100644 --- a/src/arch/riscv/Makefile.inc +++ b/src/arch/riscv/Makefile.inc @@ -96,6 +96,7 @@ ramstage-y += misc.c ramstage-y += boot.c ramstage-y += tables.c ramstage-y += sbi.S +ramstage-y += payload.S ramstage-y += \ $(top)/src/lib/memchr.c \ $(top)/src/lib/memcmp.c \ diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c index 7435490..35a9123 100644 --- a/src/arch/riscv/boot.c +++ b/src/arch/riscv/boot.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include <lib.h> #include <program_loading.h> #include <vm.h> #include <arch/encoding.h> @@ -21,9 +22,12 @@ void arch_prog_run(struct prog *prog) { void (*doit)(void *) = prog_entry(prog); + void riscvpayload(void); if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) { + hexdump((void *)0x81000000, 128); initVirtualMemory(); + riscvpayload(); } doit(prog_entry_arg(prog)); diff --git a/src/arch/riscv/include/vm.h b/src/arch/riscv/include/vm.h index bee2ed4..6472cad 100644 --- a/src/arch/riscv/include/vm.h +++ b/src/arch/riscv/include/vm.h @@ -37,16 +37,6 @@ #define VA_BITS 39 #define MEGAPAGE_SIZE (SUPERPAGE_SIZE << RISCV_PGLEVEL_BITS) -#define PROT_READ 1 -#define PROT_WRITE 2 -#define PROT_EXEC 4 - -#define MAP_PRIVATE 0x2 -#define MAP_FIXED 0x10 -#define MAP_ANONYMOUS 0x20 -#define MAP_POPULATE 0x8000 -#define MREMAP_FIXED 0x2 - #define EXTRACT_FIELD(val, which) (((val) & (which)) / ((which) & ~((which)-1))) #define INSERT_FIELD(val, which, fieldval) (((val) & ~(which)) | ((fieldval) * ((which) & ~((which)-1)))) diff --git a/src/arch/riscv/payload.S b/src/arch/riscv/payload.S new file mode 100644 index 0000000..bc9654a --- /dev/null +++ b/src/arch/riscv/payload.S @@ -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; 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. + */ + + .global riscvpayload +riscvpayload: + /* Jump to 0xffffffff81000000 in S-mode */ + li t0, 0xffffffff81000000 + csrw mepc, t0 + csrr t0, mstatus + li t1, ~(3<<11) + and t0, t0, t1 + li t2, (1<<11) + or t0, t0, t2 + csrw mstatus, t0 + +#if 0 // remove for testing. +.L2: + li a5,1107296256 + li a4,48 + sw a4,0(a5) + j .L2 +#endif + // We're still in toolchain no mans land. + .word 0x30200073 + //mret diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c index ad49928..d2b05bd 100644 --- a/src/arch/riscv/trap_handler.c +++ b/src/arch/riscv/trap_handler.c @@ -163,6 +163,7 @@ void trap_handler(trapframe *tf) { break; } + //print_page_table(); die("Can't recover from trap. Halting.\n"); } diff --git a/src/arch/riscv/virtual_memory.c b/src/arch/riscv/virtual_memory.c index be8b488..8b75a3d 100644 --- a/src/arch/riscv/virtual_memory.c +++ b/src/arch/riscv/virtual_memory.c @@ -94,7 +94,7 @@ static void print_page_table_at(pte_t *pt, intptr_t virt_addr, int level) /* Print the page table structures to the console */ void print_page_table(void) { - print_page_table_at(root_page_table, 0, 0); + print_page_table_at((void *)(read_csr(sptbr) << RISCV_PGSHIFT), 0, 0); } void flush_tlb(void) @@ -115,9 +115,9 @@ pte_t ptd_create(uintptr_t ppn) pte_t pte_create(uintptr_t ppn, int prot, int user) { pte_t pte = (ppn << PTE_PPN_SHIFT) | PTE_R | PTE_V; - if (prot & PROT_WRITE) + if (prot & PTE_W) pte |= PTE_W; - if (prot & PROT_EXEC) + if (prot & PTE_X) pte |= PTE_X; if (user) pte |= PTE_U; @@ -147,21 +147,32 @@ void init_vm(uintptr_t virtMemStart, uintptr_t physMemStart, uintptr_t pageTable int l2_shift = RISCV_PGLEVEL_BITS + RISCV_PGSHIFT; size_t l2_idx = (virtMemStart >> l2_shift) & ((1 << RISCV_PGLEVEL_BITS)-1); l2_idx += ((vaddr - virtMemStart) >> l2_shift); - middle_pt[l2_idx] = pte_create(paddr >> RISCV_PGSHIFT, PROT_READ|PROT_WRITE|PROT_EXEC, 0); + middle_pt[l2_idx] = pte_create(paddr >> RISCV_PGSHIFT, + PTE_R|PTE_W|PTE_X, 0); } // map SBI at top of vaddr space - uintptr_t num_sbi_pages = 1; // only need to map a single page for sbi interface + // only need to map a single page for sbi interface + uintptr_t num_sbi_pages = 1; uintptr_t sbiStartAddress = (uintptr_t) &sbi_page; uintptr_t sbiAddr = sbiStartAddress; for (uintptr_t i = 0; i < num_sbi_pages; i++) { uintptr_t idx = (1 << RISCV_PGLEVEL_BITS) - num_sbi_pages + i; - sbi_pt[idx] = pte_create(sbiAddr >> RISCV_PGSHIFT, PROT_READ|PROT_EXEC, 0); + sbi_pt[idx] = pte_create(sbiAddr >> RISCV_PGSHIFT, + PTE_R|PTE_X, 0); sbiAddr += RISCV_PGSIZE; } pte_t* sbi_pte = middle_pt + ((num_middle_pts << RISCV_PGLEVEL_BITS)-1); *sbi_pte = ptd_create((uintptr_t)sbi_pt >> RISCV_PGSHIFT); + // IO space. + root_pt[0] = pte_create(0, PTE_W|PTE_R, 0); + root_pt[1] = pte_create(0x40000000>>RISCV_PGSHIFT, + PTE_W|PTE_R, 0); + + // Start of RAM + root_pt[2] = pte_create(0x80000000>>RISCV_PGSHIFT, + PTE_W|PTE_R, 0); mb(); root_page_table = root_pt; uintptr_t ptbr = ((uintptr_t) root_pt) >> RISCV_PGSHIFT; @@ -185,12 +196,14 @@ void initVirtualMemory(void) { printk(BIOS_DEBUG, "-----------------------------\n"); } + // TODO: Figure out how to grab this from cbfs printk(BIOS_DEBUG, "Initializing virtual memory...\n"); - uintptr_t physicalStart = 0x90000000; // TODO: Figure out how to grab this from cbfs - uintptr_t virtualStart = 0xffffffff80000000; - uintptr_t pageTableStart = 0x91400000; + uintptr_t physicalStart = 0x81000000; + uintptr_t virtualStart = 0xffffffff81000000; + uintptr_t pageTableStart = 0x80800000; init_vm(virtualStart, physicalStart, pageTableStart); mb(); + flush_tlb(); #if IS_ENABLED(CONFIG_DEBUG_PRINT_PAGE_TABLES) printk(BIOS_DEBUG, "Finished initializing virtual memory, starting walk...\n"); @@ -211,6 +224,7 @@ void mstatus_init(void) set_csr(mie, MIP_MSIP); /* Configure which exception causes are delegated to supervisor mode */ +/* set_csr(medeleg, (1 << CAUSE_MISALIGNED_FETCH) | (1 << CAUSE_FAULT_FETCH) | (1 << CAUSE_ILLEGAL_INSTRUCTION) @@ -220,7 +234,12 @@ void mstatus_init(void) | (1 << CAUSE_USER_ECALL) ); +*/ /* Enable all user/supervisor-mode counters */ - write_csr(mscounteren, 0b111); - write_csr(mucounteren, 0b111); + /* We'll turn these on once lowrisc gets their bitstream up to + * 1.9. Right now there's no agreement on the values for these + * architectural registers. + */ + //write_csr(mscounteren, 0b111); + //write_csr(mucounteren, 0b111); }

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit 8d302f880718dd86e2efebd4e273fca3afcb0152 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ util/amdfwtool/amdfwtool.c | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..524ee9d 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 3dff2ac..cb4687d 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -391,6 +391,9 @@ int main(int argc, char **argv) int targetfd; char *output; + FILE *tty = stderr; + + fprintf(tty, "#0 AMDFWTOOL: allocating rom, %u bytes\n", CONFIG_ROM_SIZE); rom = malloc(CONFIG_ROM_SIZE); memset (rom, 0xFF, CONFIG_ROM_SIZE); if (!rom) { @@ -542,6 +545,7 @@ int main(int argc, char **argv) amd_romsig[4] = current + ROM_BASE_ADDRESS; current += 0x200; /* Conservative size of pspdir */ + fprintf(tty, "#0 ANDFWTOOL: calling integrate_psp_firmwares at %u\n", current); current = integrate_psp_firmwares(rom, current, pspdir, amd_psp_fw_table); }

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit 25de3762bf51a7afac20380ef372b609f7db8fec Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ util/amdfwtool/amdfwtool.c | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..524ee9d 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 3dff2ac..da26daa 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -391,6 +391,9 @@ int main(int argc, char **argv) int targetfd; char *output; + FILE *tty = fopen("/dev/tty", "a"); + + fprintf(tty, "AMDFWTOOL: allocating rom, %u bytes\n", CONFIG_ROM_SIZE); rom = malloc(CONFIG_ROM_SIZE); memset (rom, 0xFF, CONFIG_ROM_SIZE); if (!rom) { @@ -542,6 +545,7 @@ int main(int argc, char **argv) amd_romsig[4] = current + ROM_BASE_ADDRESS; current += 0x200; /* Conservative size of pspdir */ + fprintf(tty, "andfwtool: calling integrate_psp_firmwares at %u\n", current); current = integrate_psp_firmwares(rom, current, pspdir, amd_psp_fw_table); }

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit db9adc295bb2ac83304bbf0e708219eae8bb1b8c Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ util/amdfwtool/amdfwtool.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..524ee9d 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 3dff2ac..507a3ff 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -391,6 +391,7 @@ int main(int argc, char **argv) int targetfd; char *output; + printf("AMDFWTOOL: allocating rom, %u bytes\n", CONFIG_ROM_SIZE); rom = malloc(CONFIG_ROM_SIZE); memset (rom, 0xFF, CONFIG_ROM_SIZE); if (!rom) { @@ -542,6 +543,7 @@ int main(int argc, char **argv) amd_romsig[4] = current + ROM_BASE_ADDRESS; current += 0x200; /* Conservative size of pspdir */ + printf("andfwtool: calling integrate_psp_firmwares at %u\n", current); current = integrate_psp_firmwares(rom, current, pspdir, amd_psp_fw_table); }

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit c963cb3f22a70cd3285fb53fe2e71ea0605ed740 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Makefile.inc | 2 +- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 127f372..f95488c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -487,7 +487,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -fsanitize=address -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $< CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..524ee9d 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,6 +206,8 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC version: " + $(HOSTCC) --version $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit 94c589214a5db45258b5d95fb0c5825bdeea72b5 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..25f8f01 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,7 +206,9 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" - $(AMDFWTOOL) \ + @printf " HOSTCC version: " + $(HOSTCC) --version + failailail $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ $(OPT_HUDSON_GEC_FWM_FILE) \

1 0

Patch set updated for coreboot: [DON'T MERGE] Investigating CL #16987
by Jonathan Neuschäfer 19 Oct '16

19 Oct '16

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17060 -gerrit commit 2c03ce818040093b2a8897589acb2f86e2791d5d Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Wed Oct 19 02:18:54 2016 +0200 [DON'T MERGE] Investigating CL #16987 https://review.coreboot.org/#/c/16987/ results in a crash in AMDFWTOOL for some boards, on jenkins. With this patch, I try to figure out what's going on. Change-Id: Ic36b8be2b0ee458311dcc8e9139df2b4d113b4ba Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- src/mainboard/emulation/Kconfig | 1 + src/southbridge/amd/pi/hudson/Makefile.inc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 1dc89ca..759b1de 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -2,6 +2,7 @@ if VENDOR_EMULATION choice prompt "Mainboard model" + default BOARD_EMULATION_QEMU_X86_I440FX source "src/mainboard/emulation/*/Kconfig.name" diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index 291e25f..00fec2e 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -206,7 +206,9 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \ $(AMDFWTOOL) rm -f $@ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n" - $(AMDFWTOOL) \ + @pritnf " HOSTCC version: " + $(HOSTCC) --version + failailail $(AMDFWTOOL) \ $(OPT_HUDSON_XHCI_FWM_FILE) \ $(OPT_HUDSON_IMC_FWM_FILE) \ $(OPT_HUDSON_GEC_FWM_FILE) \

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit October 2016