OpenBIOS March 2015

openbios@openbios.org

1 participants
6 discussions

[commit] r1334 - trunk/openbios-devel/arch/sparc32
by repository service 11 Mar '15

11 Mar '15

Author: mcayland Date: Wed Mar 11 23:58:20 2015 New Revision: 1334 URL: http://tracker.coreboot.org/trac/openbios/changeset/1334 Log: SPARC32: clear physical memory upon startup This is to work around a bug in Solaris which appears not to explicitly clear some of its internal kmem structures (particularly its pagelists) on boot. The result of this is that Solaris will initially boot fine, until a reboot/reset is initiated. When this occurs, the kmem structures contain whatever junk was previously left in memory during initialisation causing a panic. The fix is to clear physical memory on startup (as OBP appears to do) so that the kmem intialisation code behaves correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/entry.S Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Wed Mar 11 23:58:18 2015 (r1333) +++ trunk/openbios-devel/arch/sparc32/entry.S Wed Mar 11 23:58:20 2015 (r1334) @@ -122,7 +122,44 @@ or %g3, %g4, %g1 ! %g1 contains end of memory + ! Get kernel address from configuration device + ! NB: little endian format + mov FW_CFG_KERNEL_ADDR, %g2 + sub %g5, 2, %g5 + stha %g2, [%g5] CFG_ASI + add %g5, 2, %g5 + lduba [%g5] CFG_ASI, %g4 + lduba [%g5] CFG_ASI, %g3 + sll %g3, 8, %g3 + or %g3, %g4, %g4 + + lduba [%g5] CFG_ASI, %g3 + sll %g3, 16, %g3 + or %g3, %g4, %g4 + + lduba [%g5] CFG_ASI, %g3 + sll %g3, 24, %g3 + or %g3, %g4, %g4 + + ! If kernel address is set, don't clear from base of RAM in order to + ! leave the kernel image intact + mov 0, %g6 + cmp %g4, 0 + beq clear_mem + nop + + ! Start from 16M + set 0x1000000, %g6 + +clear_mem: + sta %g0, [%g6] ASI_M_BYPASS + add %g6, 0x4, %g6 + cmp %g6, %g1 + bl clear_mem + nop + +clear_done: ! Start of private memory in %g6 set 0x2000, %g3 sub %g1, %g3, %g6

1 0

[commit] r1333 - trunk/openbios-devel/arch/sparc32
by repository service 11 Mar '15

11 Mar '15

Author: mcayland Date: Wed Mar 11 23:58:18 2015 New Revision: 1333 URL: http://tracker.coreboot.org/trac/openbios/changeset/1333 Log: SPARC32: mark pre-loaded kernel image memory as being in use This is to ensure that a client OS reading the memory lists from the PROM won't consider its own memory space available. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openbios.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Wed Mar 11 23:58:15 2015 (r1332) +++ trunk/openbios-devel/arch/sparc32/openbios.c Wed Mar 11 23:58:18 2015 (r1333) @@ -865,9 +865,14 @@ romvec = init_openprom(); kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); - if (kernel_size) + if (kernel_size) { kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); + /* Mark the kernel memory as in use */ + ofmem_claim_phys(PAGE_ALIGN(kernel_image), PAGE_ALIGN(kernel_size), 0); + ofmem_claim_virt(PAGE_ALIGN(kernel_image), PAGE_ALIGN(kernel_size), 0); + } + kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); if (kernel_cmdline) { cmdline = strdup(kernel_cmdline);

1 0

[commit] r1332 - trunk/openbios-devel/arch/sparc32
by repository service 11 Mar '15

11 Mar '15

Author: mcayland Date: Wed Mar 11 23:58:15 2015 New Revision: 1332 URL: http://tracker.coreboot.org/trac/openbios/changeset/1332 Log: SPARC32: fix initialisation of L1 page table Since l1 is a pointer to an array of longs, the increment size should be 1 (element) and not 4 (bytes). While this shouldn't have an effect when booting an image from fresh, it meant that the L1 page table contained old entries after a reboot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Wed Mar 11 23:58:13 2015 (r1331) +++ trunk/openbios-devel/arch/sparc32/lib.c Wed Mar 11 23:58:15 2015 (r1332) @@ -367,7 +367,7 @@ for (i = 1; i < NCTX_SWIFT; i++) { context_table[i] = SRMMU_ET_INVALID; } - for (i = 0; i < 256; i += 4) { + for (i = 0; i < 256; i++) { l1[i] = SRMMU_ET_INVALID; }

1 0

[commit] r1331 - trunk/openbios-devel/arch/sparc32
by repository service 11 Mar '15

11 Mar '15

Author: mcayland Date: Wed Mar 11 23:58:13 2015 New Revision: 1331 URL: http://tracker.coreboot.org/trac/openbios/changeset/1331 Log: SPARC32: minor tidy-up for boot.c This commit doesn't have any functional changes but removes some debugging printks accidentally included by a previous commit, plus adds a +1 offset back onto the size of tail prommap entry to ensure that it is correctly aligned. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Mon Mar 9 10:37:51 2015 (r1330) +++ trunk/openbios-devel/arch/sparc32/boot.c Wed Mar 11 23:58:13 2015 (r1331) @@ -147,9 +147,6 @@ (**pp).start_adr = (char *)intprop_ptr[1]; (**pp).num_bytes = intprop_ptr[2]; - printk("start_adr: %x\n", (int)(**pp).start_adr); - printk("num_bytes: %x\n", (**pp).num_bytes); - intprop_ptr += 3; } @@ -180,7 +177,7 @@ (**pp).num_bytes = (intprop_ptr[4] + intprop_ptr[5]) - (intprop_ptr[1] + intprop_ptr[2]); } else { /* Tail (size from top of virtual memory) */ - (**pp).num_bytes = 0xffffffffUL - (intprop_ptr[1] + intprop_ptr[2]); + (**pp).num_bytes = 0xffffffffUL - (intprop_ptr[1] + intprop_ptr[2]) + 1; } intprop_ptr += 3;

1 0

[commit] r1330 - trunk/openbios-devel/drivers
by repository service 09 Mar '15

09 Mar '15

Author: mcayland Date: Mon Mar 9 10:37:51 2015 New Revision: 1330 URL: http://tracker.coreboot.org/trac/openbios/changeset/1330 Log: SPARC64: add an eeprom node to the device tree Add eeprom node to the device tree to make device visible for the guest OS. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Mar 9 10:37:48 2015 (r1329) +++ trunk/openbios-devel/drivers/pci.c Mon Mar 9 10:37:51 2015 (r1330) @@ -831,6 +831,26 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); + /* Build eeprom node */ + fword("new-device"); + PUSH(0x14); + fword("encode-int"); + PUSH(0x2000); + fword("encode-int"); + fword("encode+"); + PUSH(0x2000); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + push_str("mk48t59"); + fword("model"); + + push_str("eeprom"); + fword("device-name"); + fword("finish-device"); + #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init(config->path, "fdthree", 0x3f0ULL, 0); #endif

1 0

[commit] r1329 - trunk/openbios-devel/arch/sparc64
by repository service 09 Mar '15

09 Mar '15

Author: mcayland Date: Mon Mar 9 10:37:48 2015 New Revision: 1329 URL: http://tracker.coreboot.org/trac/openbios/changeset/1329 Log: SPARC64: use MMIO for NVRAM access Use MMIO for accessing the m48t59 NVRAM chip. This patch is a counterpart of a QEMU change. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon Dec 1 21:52:15 2014 (r1328) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Mar 9 10:37:48 2015 (r1329) @@ -27,21 +27,18 @@ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" -#define NVRAM_ADDR_LO 0x74 -#define NVRAM_ADDR_HI 0x75 -#define NVRAM_DATA 0x77 - #define APB_SPECIAL_BASE 0x1fe00000000ULL #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ // XXX +#define NVRAM_BASE 0x2000 #define NVRAM_SIZE 0x2000 #define NVRAM_IDPROM 0x1fd8 #define NVRAM_IDPROM_SIZE 32 #define NVRAM_OB_START (0) -#define NVRAM_OB_SIZE ((0x1fd0 - NVRAM_OB_START) & ~15) +#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) static uint8_t idprom[NVRAM_IDPROM_SIZE]; @@ -352,34 +349,22 @@ for (;;); } -static uint8_t nvram_read_byte(uint16_t offset) -{ - outb(offset & 0xff, NVRAM_ADDR_LO); - outb(offset >> 8, NVRAM_ADDR_HI); - return inb(NVRAM_DATA); -} - static void nvram_read(uint16_t offset, char *buf, unsigned int nbytes) { unsigned int i; - for (i = 0; i < nbytes; i++) - buf[i] = nvram_read_byte(offset + i); -} - -static void nvram_write_byte(uint16_t offset, uint8_t val) -{ - outb(offset & 0xff, NVRAM_ADDR_LO); - outb(offset >> 8, NVRAM_ADDR_HI); - outb(val, NVRAM_DATA); + for (i = 0; i < nbytes; i++) { + buf[i] = inb(NVRAM_BASE + offset + i); + } } static void nvram_write(uint16_t offset, const char *buf, unsigned int nbytes) { unsigned int i; - for (i = 0; i < nbytes; i++) - nvram_write_byte(offset + i, buf[i]); + for (i = 0; i < nbytes; i++) { + outb(buf[i], NVRAM_BASE + offset + i); + } } static uint8_t qemu_uuid[16];

1 0