OpenBIOS April 2013

openbios@openbios.org

8 participants
89 discussions

[commit] r1127 - trunk/openbios-devel/packages

by repository service

Author: mcayland Date: Sun Apr 21 10:27:21 2013 New Revision: 1127 URL: http://tracker.coreboot.org/trac/openbios/changeset/1127 Log: disk-label.c: Fix opening of raw block devices If open-dev is called on a raw block device such as cdrom, the current code will always attempt to interpose a partition handler for the first valid partition table type it finds. This is incorrect when opening a raw block device directly as it means we "fall into" the first valid partition that can be found, rather than using the full raw device. Fix this by only attempting to interpose a partition handler if the package arguments are not empty. This fixes the NetBSD SPARC64 bootloader as reported by Martin Husemann in https://bugs.launchpad.net/qemu/+bug/1169856. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/disk-label.c Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Fri Apr 19 09:05:33 2013 (r1126) +++ trunk/openbios-devel/packages/disk-label.c Sun Apr 21 10:27:21 2013 (r1127) @@ -73,63 +73,70 @@ di->filesystem_ph = 0; di->parent_seek_xt = find_parent_method("seek"); di->parent_tell_xt = find_parent_method("tell"); - di->parent_read_xt = find_parent_method("read"); + di->parent_read_xt = find_parent_method("read"); - /* Read first block from parent device */ - DPUSH(0); - call_package(di->parent_seek_xt, my_parent()); - POP(); - - PUSH(pointer2cell(block0)); - PUSH(sizeof(block0)); - call_package(di->parent_read_xt, my_parent()); - status = POP(); - if (status != sizeof(block0)) - goto out; - - /* Find partition handler */ - PUSH( pointer2cell(block0) ); - selfword("find-part-handler"); - ph = POP_ph(); - if( ph ) { - /* We found a suitable partition handler, so interpose it */ - DPRINTF("Partition found on disk - scheduling interpose with ph " FMT_ucellx "\n", ph); - - push_str(path); - PUSH_ph(ph); - fword("interpose"); + /* If arguments have been passed, determine the partition/filesystem type */ + if (path && strlen(path)) { - success = 1; - } else { - /* unknown (or missing) partition map, - * try the whole disk - */ - - DPRINTF("Unknown or missing partition map; trying whole disk\n"); - - /* Probe for filesystem from start of device */ - DPUSH ( 0 ); - PUSH_ih( my_self() ); - selfword("find-filesystem"); + /* Read first block from parent device */ + DPUSH(0); + call_package(di->parent_seek_xt, my_parent()); + POP(); + + PUSH(pointer2cell(block0)); + PUSH(sizeof(block0)); + call_package(di->parent_read_xt, my_parent()); + status = POP(); + if (status != sizeof(block0)) + goto out; + + /* Find partition handler */ + PUSH( pointer2cell(block0) ); + selfword("find-part-handler"); ph = POP_ph(); if( ph ) { - /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ - di->filesystem_ph = ph; - - DPRINTF("Located filesystem with ph " FMT_ucellx "\n", ph); - DPRINTF("path: %s length: %d\n", path, strlen(path)); + /* We found a suitable partition handler, so interpose it */ + DPRINTF("Partition found on disk - scheduling interpose with ph " FMT_ucellx "\n", ph); - if (path && strlen(path)) { - DPRINTF("INTERPOSE!\n"); - - push_str( path ); - PUSH_ph( ph ); - fword("interpose"); + push_str(path); + PUSH_ph(ph); + fword("interpose"); + + success = 1; + } else { + /* unknown (or missing) partition map, + * try the whole disk + */ + + DPRINTF("Unknown or missing partition map; trying whole disk\n"); + + /* Probe for filesystem from start of device */ + DPUSH ( 0 ); + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ + di->filesystem_ph = ph; + + DPRINTF("Located filesystem with ph " FMT_ucellx "\n", ph); + DPRINTF("path: %s length: %d\n", path, strlen(path)); + + if (path && strlen(path)) { + DPRINTF("INTERPOSE!\n"); + + push_str( path ); + PUSH_ph( ph ); + fword("interpose"); + } + } else if (path && strcmp(path, "%BOOT") != 0) { + goto out; } - } else if (path && strcmp(path, "%BOOT") != 0) { - goto out; - } + success = 1; + } + } else { + /* No arguments were passed, so we just use the parent raw device directly */ success = 1; }

8 years

[PATCH] SPARC: Fix escc instance structure alignment

by Mark Cave-Ayland

When binding C functions to Forth words using NODE_METHODs for the SPARC ESCC serial driver, the C instance parameter pointer was set to be a pointer to a phys_addr_t. This is incorrect in the case where sizeof(phys_addr_t) != sizeof(cell) such as on SPARC32, as the address allocated from the Forth machine would be aligned to sizeof(cell); hence an alignment exception could be generated on random occasions on SPARC32 when the allocated address generated by Forth when opening the device was aligned to just 4 bytes (and not also 8 bytes) when derefencing the instance parameter pointer. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/drivers/escc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openbios-devel/drivers/escc.c b/openbios-devel/drivers/escc.c index 892dc8c..9973fe1 100644 --- a/openbios-devel/drivers/escc.c +++ b/openbios-devel/drivers/escc.c @@ -131,7 +131,7 @@ void serial_cls(void) /* ( addr len -- actual ) */ static void -escc_read(phys_addr_t *address) +escc_read(ucell *address) { char *addr; int len; @@ -152,7 +152,7 @@ escc_read(phys_addr_t *address) /* ( addr len -- actual ) */ static void -escc_write(phys_addr_t *address) +escc_write(ucell *address) { unsigned char *addr; int i, len; @@ -172,7 +172,7 @@ escc_close(void) } static void -escc_open(phys_addr_t *address) +escc_open(ucell *address) { #ifdef CONFIG_DRIVER_ESCC_SUN int len; @@ -199,7 +199,7 @@ escc_open(phys_addr_t *address) RET ( -1 ); } -DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(phys_addr_t)); +DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(ucell)); NODE_METHODS(escc) = { { "open", escc_open }, -- 1.7.10.4

8 years

Re: [OpenBIOS] [PATCH] pci: fix BAR setup

by Blue Swirl

On Fri, Apr 19, 2013 at 9:10 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > On Mon, May 14, 2012 at 8:58 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> On Mon, May 14, 2012 at 1:49 PM, Mark Cave-Ayland >> <mark.cave-ayland(a)ilande.co.uk> wrote: >>> On 14/05/12 14:28, Artyom Tarasenko wrote: >>> >>>>>> It's to avoid VGA legacy mapping at 0xa0000. If I change >>>>>> hwdefs.pci.pci_mem_base in arch/sparc64/openbios.c to 0, OpenBIOS will >>>>>> crash during VGA init. Previously this worked because the PCI devices >>>>>> were mapped somewhat randomly and by chance, VGA legacy low mem area >>>>>> was avoided. >>>>>> >>>>>> I think the correct fix is to make QEMU VGA device disable the legacy >>>>>> mapping unless explicitly enabled. Alternatively the child base >>>>>> arithmetic could be fixed in OpenBIOS like proposed by Jakub. >>>>> >>>>> >>>>> >>>>> Did a patch ever come out of this discussion in the end? >>>>> >>>> >>>> No. :-) Feel free to fix it, unless Blue prefers fixing it himself... >>> >>> >>> I'm not sure I'm confident enough with PCI to do this, and I'm also not sure >>> what Blue's recommended fix actually is? Is it to increase parent_base by >>> 0x1000 or set child_base to zero? >> >> The best solution is to fix VGA (assuming my analysis was right) and >> set child_base to zero. > > Blue, do you know whether the QOMification improved the situation with > the legacy VGA low mem area? I don't think it had any effect, but PCI bridging code was fixed recently. There are still some problems, if I move most devices behind the first bridge with this patch, Sparc64 does not boot anymore: diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 0d29620..8bf7230 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -813,7 +813,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, M48t59State *nvram; unsigned int i; uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry; - PCIBus *pci_bus, *pci_bus2, *pci_bus3; + PCIBus *pci_bus2, *pci_bus3; ISABus *isa_bus; qemu_irq *ivec_irqs, *pbm_irqs; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -829,12 +829,11 @@ static void sun4uv_init(MemoryRegion *address_space_mem, prom_init(hwdef->prom_addr, bios_name); ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, cpu, IVEC_MAX); - pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2, - &pci_bus3, &pbm_irqs); - pci_vga_init(pci_bus); + pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2, + &pci_bus3, &pbm_irqs); + pci_vga_init(pci_bus2); - // XXX Should be pci_bus3 - isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs); + isa_bus = pci_ebus_init(pci_bus2, -1, pbm_irqs); i = 0; if (hwdef->console_serial_base) { @@ -859,7 +858,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, ide_drive_get(hd, MAX_IDE_BUS); - pci_cmd646_ide_init(pci_bus, hd, 1); + pci_cmd646_ide_init(pci_bus2, hd, 1); isa_create_simple(isa_bus, "i8042"); for(i = 0; i < MAX_FD; i++) { Also ethernet is using the main PCI bus instead of the bridged version: (qemu) info pci Bus 0, device 0, function 0: Host bridge: PCI device 108e:a000 id "" Bus 0, device 1, function 0: PCI bridge: PCI device 108e:5000 BUS 0. secondary bus 1. subordinate bus 255. IO range [0x0000, 0x0fff] memory range [0x00000000, 0x000fffff] prefetchable memory range [0x00000000, 0x000fffff] id "" Bus 1, device 0, function 0: VGA controller: PCI device 1234:1111 BAR0: 32 bit prefetchable memory at 0x01000000 [0x01ffffff]. BAR2: 32 bit memory at 0x02000000 [0x02000fff]. BAR6: 32 bit memory at 0x02010000 [0x0201ffff]. id "" Bus 1, device 1, function 0: Bridge: PCI device 108e:1000 BAR0: 32 bit memory at 0xffffffffffffffff [0x00fffffe]. BAR1: 32 bit memory at 0xffffffffffffffff [0x007ffffe]. id "" Bus 1, device 2, function 0: IDE controller: PCI device 1095:0646 IRQ 0. BAR0: I/O at 0xffffffffffffffff [0x0006]. BAR1: I/O at 0xffffffffffffffff [0x0002]. BAR2: I/O at 0xffffffffffffffff [0x0006]. BAR3: I/O at 0xffffffffffffffff [0x0002]. BAR4: I/O at 0xffffffffffffffff [0x000e]. id "" Bus 0, device 1, function 1: PCI bridge: PCI device 108e:5000 BUS 0. secondary bus 0. subordinate bus 0. IO range [0x0000, 0x0fff] memory range [0x00000000, 0x000fffff] prefetchable memory range [0x00000000, 0x000fffff] id "" Bus 0, device 2, function 0: ^ should be bus 1. Ethernet controller: PCI device 10ec:8029 IRQ 0. BAR0: I/O at 0xffffffffffffffff [0x00fe]. BAR6: 32 bit memory at 0xffffffffffffffff [0x0003fffe]. id "" > > > -- > Regards, > Artyom Tarasenko > > linux/sparc and solaris/sparc under qemu blog: > http://tyom.blogspot.com/search/label/qemu > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

8 years

Patch that allows for building OpenBIOS on Mac OS X!

by Programmingkid

This patch allows users to build OpenBIOS on Mac OS X! The user just needs to install the elf cross compiler before applying this patch. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 1117) +++ config/scripts/switch-arch (working copy) @@ -89,16 +89,27 @@ archname() { - HOSTARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ - -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ - -e "s/Power Macintosh/ppc/"` + OS_NAME=`uname` + if test "$OS_NAME" = "Darwin"; then # Can't depend on uname -m on Mac OS X + IS_64BIT=`sysctl hw.cpu64bit_capable` + if test "$IS_64BIT" = "hw.cpu64bit_capable: 1"; then + HOSTARCH="amd64" + else + HOSTARCH="x86" + fi + else + HOSTARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ + -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ + -e "s/Power Macintosh/ppc/"` + fi } select_prefix() { - for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- + for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- ppc-elf- do + echo "Trying ${TARGET}gcc" if type ${TARGET}gcc > /dev/null 2>&1 then return

8 years

Re: [OpenBIOS] [PATCH] pci: fix BAR setup

by Artyom Tarasenko

On Mon, May 14, 2012 at 8:58 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Mon, May 14, 2012 at 1:49 PM, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk> wrote: >> On 14/05/12 14:28, Artyom Tarasenko wrote: >> >>>>> It's to avoid VGA legacy mapping at 0xa0000. If I change >>>>> hwdefs.pci.pci_mem_base in arch/sparc64/openbios.c to 0, OpenBIOS will >>>>> crash during VGA init. Previously this worked because the PCI devices >>>>> were mapped somewhat randomly and by chance, VGA legacy low mem area >>>>> was avoided. >>>>> >>>>> I think the correct fix is to make QEMU VGA device disable the legacy >>>>> mapping unless explicitly enabled. Alternatively the child base >>>>> arithmetic could be fixed in OpenBIOS like proposed by Jakub. >>>> >>>> >>>> >>>> Did a patch ever come out of this discussion in the end? >>>> >>> >>> No. :-) Feel free to fix it, unless Blue prefers fixing it himself... >> >> >> I'm not sure I'm confident enough with PCI to do this, and I'm also not sure >> what Blue's recommended fix actually is? Is it to increase parent_base by >> 0x1000 or set child_base to zero? > > The best solution is to fix VGA (assuming my analysis was right) and > set child_base to zero. Blue, do you know whether the QOMification improved the situation with the legacy VGA low mem area? -- Regards, Artyom Tarasenko linux/sparc and solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

8 years

OpenBIOS as a boot manager

by Mark Morgan Lloyd

I've got OpenFirmware as a boot manager on a couple of machines (i.e. resident on its own partition on disc), but is it possible to use OpenBIOS for this on a PPC Mac (specifically, a beige Old World G3?). Is there any chance that this would drive a DVD drive sufficient to install OS X? I'm not intending this for heavy use, but simply to provide a test target for another open-source project. I try to keep an eye on this mailing list, but please could somebody point me to the current homepage and download location. Google, Wp etc. links to http://www.openfirmware.info/Welcome_to_OpenBIOS which is well out of date. -- Mark Morgan Lloyd markMLl .AT. telemetry.co .DOT. uk [Opinions above are the author's, not those of his employers or colleagues]

8 years

[PATCH] disk-label.c: Fix opening of raw block devices

by Mark Cave-Ayland

If open-dev is called on a raw block device such as cdrom, the current code will always attempt to interpose a partition handler for the first valid partition table type it finds. This is incorrect when opening a raw block device directly as it means we "fall into" the first valid partition that can be found, rather than using the full raw device. Fix this by only attempting to interpose a partition handler if the package arguments are not empty. This fixes the NetBSD SPARC64 bootloader as reported by Martin Husemann in https://bugs.launchpad.net/qemu/+bug/1169856. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/packages/disk-label.c | 105 ++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/openbios-devel/packages/disk-label.c b/openbios-devel/packages/disk-label.c index 44b9f9e..1c18d74 100644 --- a/openbios-devel/packages/disk-label.c +++ b/openbios-devel/packages/disk-label.c @@ -73,63 +73,70 @@ dlabel_open( dlabel_info_t *di ) di->filesystem_ph = 0; di->parent_seek_xt = find_parent_method("seek"); di->parent_tell_xt = find_parent_method("tell"); - di->parent_read_xt = find_parent_method("read"); + di->parent_read_xt = find_parent_method("read"); - /* Read first block from parent device */ - DPUSH(0); - call_package(di->parent_seek_xt, my_parent()); - POP(); - - PUSH(pointer2cell(block0)); - PUSH(sizeof(block0)); - call_package(di->parent_read_xt, my_parent()); - status = POP(); - if (status != sizeof(block0)) - goto out; - - /* Find partition handler */ - PUSH( pointer2cell(block0) ); - selfword("find-part-handler"); - ph = POP_ph(); - if( ph ) { - /* We found a suitable partition handler, so interpose it */ - DPRINTF("Partition found on disk - scheduling interpose with ph " FMT_ucellx "\n", ph); - - push_str(path); - PUSH_ph(ph); - fword("interpose"); + /* If arguments have been passed, determine the partition/filesystem type */ + if (path && strlen(path)) { - success = 1; - } else { - /* unknown (or missing) partition map, - * try the whole disk - */ + /* Read first block from parent device */ + DPUSH(0); + call_package(di->parent_seek_xt, my_parent()); + POP(); - DPRINTF("Unknown or missing partition map; trying whole disk\n"); + PUSH(pointer2cell(block0)); + PUSH(sizeof(block0)); + call_package(di->parent_read_xt, my_parent()); + status = POP(); + if (status != sizeof(block0)) + goto out; - /* Probe for filesystem from start of device */ - DPUSH ( 0 ); - PUSH_ih( my_self() ); - selfword("find-filesystem"); + /* Find partition handler */ + PUSH( pointer2cell(block0) ); + selfword("find-part-handler"); ph = POP_ph(); if( ph ) { - /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ - di->filesystem_ph = ph; - - DPRINTF("Located filesystem with ph " FMT_ucellx "\n", ph); - DPRINTF("path: %s length: %d\n", path, strlen(path)); - - if (path && strlen(path)) { - DPRINTF("INTERPOSE!\n"); - - push_str( path ); - PUSH_ph( ph ); - fword("interpose"); + /* We found a suitable partition handler, so interpose it */ + DPRINTF("Partition found on disk - scheduling interpose with ph " FMT_ucellx "\n", ph); + + push_str(path); + PUSH_ph(ph); + fword("interpose"); + + success = 1; + } else { + /* unknown (or missing) partition map, + * try the whole disk + */ + + DPRINTF("Unknown or missing partition map; trying whole disk\n"); + + /* Probe for filesystem from start of device */ + DPUSH ( 0 ); + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ + di->filesystem_ph = ph; + + DPRINTF("Located filesystem with ph " FMT_ucellx "\n", ph); + DPRINTF("path: %s length: %d\n", path, strlen(path)); + + if (path && strlen(path)) { + DPRINTF("INTERPOSE!\n"); + + push_str( path ); + PUSH_ph( ph ); + fword("interpose"); + } + } else if (path && strcmp(path, "%BOOT") != 0) { + goto out; } - } else if (path && strcmp(path, "%BOOT") != 0) { - goto out; - } + success = 1; + } + } else { + /* No arguments we passed, so we just use the parent raw device directly */ success = 1; } -- 1.7.10.4

8 years

[commit] r1126 - trunk/openbios-devel/arch/sparc64

by repository service

Author: mcayland Date: Fri Apr 19 09:05:33 2013 New Revision: 1126 URL: http://tracker.coreboot.org/trac/openbios/changeset/1126 Log: SPARC64: Remove limit on kernel command line length caused by using a static buffer Instead use malloc() so that we can dynamically allocate the string ourselves. As reported by Rob Landley <rob(a)landley.net>. 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 Fri Apr 19 09:05:30 2013 (r1125) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 19 09:05:33 2013 (r1126) @@ -42,9 +42,6 @@ #define NVRAM_OB_START (0) #define NVRAM_OB_SIZE ((0x1fd0 - NVRAM_OB_START) & ~15) -#define OBIO_CMDLINE_MAX 256 -static char obio_cmdline[OBIO_CMDLINE_MAX]; - static uint8_t idprom[NVRAM_IDPROM_SIZE]; struct hwdef { @@ -370,6 +367,7 @@ void arch_nvram_get(char *data) { + char *obio_cmdline; uint32_t size = 0; const struct cpudef *cpu; char buf[256]; @@ -401,12 +399,13 @@ kernel_image = fw_cfg_read_i64(FW_CFG_KERNEL_ADDR); size = fw_cfg_read_i32(FW_CFG_CMDLINE_SIZE); - if (size > OBIO_CMDLINE_MAX - 1) - size = OBIO_CMDLINE_MAX - 1; if (size) { + obio_cmdline = (char *)malloc(size + 1); fw_cfg_read(FW_CFG_CMDLINE_DATA, obio_cmdline, size); + obio_cmdline[size] = '\0'; + } else { + obio_cmdline = strdup(""); } - obio_cmdline[size] = '\0'; qemu_cmdline = (uint64_t)obio_cmdline; cmdline_size = size; boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE);

8 years

[commit] r1125 - trunk/openbios-devel/arch/sparc32

by repository service

Author: mcayland Date: Fri Apr 19 09:05:30 2013 New Revision: 1125 URL: http://tracker.coreboot.org/trac/openbios/changeset/1125 Log: SPARC32: Remove limit on kernel command line length caused by using a static buffer Instead use strdup() so that we can dynamically allocate the string ourselves. As reported by Rob Landley <rob(a)landley.net>. 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 Fri Apr 19 09:04:40 2013 (r1124) +++ trunk/openbios-devel/arch/sparc32/openbios.c Fri Apr 19 09:05:30 2013 (r1125) @@ -835,8 +835,7 @@ static void arch_init( void ) { - static char cmdline[128]; - int size = 0; + char *cmdline; const char *kernel_cmdline; uint32_t temp; uint16_t machine_id; @@ -897,11 +896,11 @@ kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); if (kernel_cmdline) { - size = strlen(kernel_cmdline); - memcpy(cmdline, kernel_cmdline, size); + cmdline = strdup(kernel_cmdline); obp_arg.argv[1] = cmdline; - } - cmdline[size] = '\0'; + } else { + cmdline = strdup(""); + } qemu_cmdline = (uint32_t)cmdline; /* Setup nvram variables */

8 years

[commit] r1124 - trunk/openbios-devel/arch/ppc/qemu

by repository service

Author: mcayland Date: Fri Apr 19 09:04:40 2013 New Revision: 1124 URL: http://tracker.coreboot.org/trac/openbios/changeset/1124 Log: PPC: Remove zero page mapping from MMU to enable detection of NULL pointer dereferences Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Fri Apr 19 09:04:32 2013 (r1123) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Fri Apr 19 09:04:40 2013 (r1124) @@ -549,9 +549,14 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); - ofmem_claim_phys(0, get_ram_bottom(), 0); - ofmem_claim_virt(0, get_ram_bottom(), 0); - ofmem_map(0, 0, get_ram_bottom(), 0); + /* Map the memory (don't map page 0 to allow catching of NULL dereferences) */ + ofmem_claim_phys(PAGE_SIZE, get_ram_bottom() - PAGE_SIZE, 0); + ofmem_claim_virt(PAGE_SIZE, get_ram_bottom() - PAGE_SIZE, 0); + ofmem_map(PAGE_SIZE, PAGE_SIZE, get_ram_bottom() - PAGE_SIZE, 0); + + /* Mark the first page as non-free */ + ofmem_claim_phys(0, PAGE_SIZE, 0); + ofmem_claim_virt(0, PAGE_SIZE, 0); /* Map everything at the top of physical RAM 1:1, minus the OpenBIOS ROM in RAM copy */ ofmem_claim_phys(get_ram_top(), get_hash_base() + HASH_SIZE - get_ram_top(), 0);

8 years

← Newer
1
2
3
4
5
6
7
8
9
Older →