OpenBIOS December 2008

openbios@openbios.org

8 participants
78 discussions

r330 - openbios-devel/drivers
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 17:35:39 +0100 (Sun, 28 Dec 2008) New Revision: 330 Modified: openbios-devel/drivers/cuda.c Log: Enable reset-all and add poweroff Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-12-28 15:27:19 UTC (rev 329) +++ openbios-devel/drivers/cuda.c 2008-12-28 16:35:39 UTC (rev 330) @@ -58,6 +58,10 @@ #define ADB_PACKET 0 #define CUDA_PACKET 1 +/* CUDA commands (2nd byte) */ +#define CUDA_POWERDOWN 0xa +#define CUDA_RESET_SYSTEM 0x11 + static uint8_t cuda_readb (cuda_t *dev, int reg) { return *(volatile uint8_t *)(dev->base + reg); @@ -153,7 +157,27 @@ DECLARE_UNNAMED_NODE(ob_cuda, INSTALL_OPEN, sizeof(int)); +static cuda_t *main_cuda; + static void +ppc32_reset_all(void) +{ + uint8_t cmdbuf[2], obuf[64]; + + cmdbuf[0] = CUDA_RESET_SYSTEM; + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); +} + +static void +ppc32_poweroff(void) +{ + uint8_t cmdbuf[2], obuf[64]; + + cmdbuf[0] = CUDA_POWERDOWN; + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); +} + +static void ob_cuda_initialize (int *idx) { phandle_t ph=get_cur_dev(); @@ -174,6 +198,14 @@ set_int_property(ph, "interrupt-parent", pic_handle); // HEATHROW set_int_property(ph, "interrupts", 0x12); + + bind_func("ppc32-reset-all", ppc32_reset_all); + push_str("' ppc32-reset-all to reset-all"); + fword("eval"); + + PUSH(0); + fword("active-package!"); + bind_func("poweroff", ppc32_poweroff); } static void @@ -269,6 +301,8 @@ rtc_init(buf); + main_cuda = cuda; + return cuda; }

1 0

r329 - openbios-devel/drivers
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 16:27:19 +0100 (Sun, 28 Dec 2008) New Revision: 329 Modified: openbios-devel/drivers/ide.c Log: Suppress -Wformat-security warning Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-28 14:04:49 UTC (rev 328) +++ openbios-devel/drivers/ide.c 2008-12-28 15:27:19 UTC (rev 329) @@ -1313,8 +1313,6 @@ uint32_t io_port1, uint32_t ctl_port1) { int i, j; - const char * nodetemp_chan = "%s/"DEV_NAME; - const char * nodetemp = "%s/"DEV_NAME"/%s"; char nodebuff[32]; phandle_t dnode; @@ -1363,7 +1361,7 @@ ob_ide_identify_drives(chan); - snprintf(nodebuff, sizeof(nodebuff), nodetemp_chan, path, + snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", @@ -1393,8 +1391,9 @@ break; } printk("%s]: %s\n", media, drive->model); - snprintf(nodebuff, sizeof(nodebuff), nodetemp, path, - current_channel, media); + snprintf(nodebuff, sizeof(nodebuff), + "%s/" DEV_NAME "/%s", path, current_channel, + media); REGISTER_NAMED_NODE(ob_ide, nodebuff); dnode=find_dev(nodebuff); set_int_property(dnode, "reg", j);

1 0

r328 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 15:04:49 +0100 (Sun, 28 Dec 2008) New Revision: 328 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Add CPU reg node from PIR if available Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-28 13:34:52 UTC (rev 327) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-28 14:04:49 UTC (rev 328) @@ -229,26 +229,50 @@ fword("encode-string"); push_str("state"); fword("property"); +} - fword("finish-device"); +static void +cpu_add_pir_property(void) +{ + unsigned long pir; + + asm("mfspr %0, 1023\n" + : "=r"(pir) :); + PUSH(pir); + fword("encode-int"); + push_str("reg"); + fword("property"); } static void cpu_604_init(const struct cpudef *cpu) { cpu_generic_init(cpu); + cpu_add_pir_property(); + + fword("finish-device"); } static void cpu_750_init(const struct cpudef *cpu) { cpu_generic_init(cpu); + + PUSH(0); + fword("encode-int"); + push_str("reg"); + fword("property"); + + fword("finish-device"); } static void cpu_g4_init(const struct cpudef *cpu) { cpu_generic_init(cpu); + cpu_add_pir_property(); + + fword("finish-device"); } static const struct cpudef ppc_defs[] = {

1 0

r327 - openbios-devel/include/ppc
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 14:34:52 +0100 (Sun, 28 Dec 2008) New Revision: 327 Modified: openbios-devel/include/ppc/asmdefs.h Log: Fix Linux dependency Modified: openbios-devel/include/ppc/asmdefs.h =================================================================== --- openbios-devel/include/ppc/asmdefs.h 2008-12-25 20:23:02 UTC (rev 326) +++ openbios-devel/include/ppc/asmdefs.h 2008-12-28 13:34:52 UTC (rev 327) @@ -22,7 +22,7 @@ /* High/low halfword compatibility macros */ /************************************************************************/ -#ifdef __linux__ +#ifndef __darwin__ #define ha16( v ) (v)##@ha #define hi16( v ) (v)##@h #define lo16( v ) (v)##@l

1 0

r326 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 25 Dec '08

25 Dec '08

Author: blueswirl Date: 2008-12-25 21:23:02 +0100 (Thu, 25 Dec 2008) New Revision: 326 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Add more CPU definitions Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-25 10:38:40 UTC (rev 325) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-25 20:23:02 UTC (rev 326) @@ -234,6 +234,12 @@ } static void +cpu_604_init(const struct cpudef *cpu) +{ + cpu_generic_init(cpu); +} + +static void cpu_750_init(const struct cpudef *cpu) { cpu_generic_init(cpu); @@ -247,6 +253,54 @@ static const struct cpudef ppc_defs[] = { { + .iu_version = 0x00040000, + .name = "PowerPC,604", + .icache_size = 0x4000, + .dcache_size = 0x4000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x07de2900, + .initfn = cpu_604_init, + }, + { // XXX find out real values + .iu_version = 0x00090000, + .name = "PowerPC,604e", + .icache_size = 0x4000, + .dcache_size = 0x4000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x07de2900, + .initfn = cpu_604_init, + }, + { // XXX find out real values + .iu_version = 0x000a0000, + .name = "PowerPC,604r", + .icache_size = 0x4000, + .dcache_size = 0x4000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x07de2900, + .initfn = cpu_604_init, + }, + { // XXX find out real values + .iu_version = 0x80040000, + .name = "PowerPC,MPC86xx", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { .iu_version = 0x000080000, .name = "PowerPC,750", .icache_size = 0x8000, @@ -258,6 +312,54 @@ .clock_frequency = 0x14dc9380, .initfn = cpu_750_init, }, + { // XXX find out real values + .iu_version = 0x10080000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { // XXX find out real values + .iu_version = 0x70000000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { // XXX find out real values + .iu_version = 0x70020000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { // XXX find out real values + .iu_version = 0x800c0000, + .name = "PowerPC,74xx", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, { .iu_version = 0x0000c0000, .name = "PowerPC,G4",

1 0

[PATCH][QEMU] Change cdrom alias
by Laurent Vivier 25 Dec '08

25 Dec '08

According to: http://penguinppc.org/historical/dev-trees-html/g3bw_400.html#aliases cdrom alias on a G3 B&W is "cd", not "cdrom".

3 3

[PATCH][PPC] Allow yaboot to read files from cdrom
by Laurent Vivier 25 Dec '08

25 Dec '08

Currently yaboot fails to read its yaboot.conf. The reason is it provides a path like "cdrom:,/etc/yaboot.conf" without partition number. This patch sets the default partition number to 0, which means the whole disk.

2 1

r325 - in openbios-devel: arch/ppc/qemu modules
by svn＠openbios.org 25 Dec '08

25 Dec '08

Author: blueswirl Date: 2008-12-25 11:38:40 +0100 (Thu, 25 Dec 2008) New Revision: 325 Modified: openbios-devel/arch/ppc/qemu/main.c openbios-devel/modules/filesystems.c openbios-devel/modules/mac-parts.c Log: Allow yaboot to read files from cdrom (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-25 10:36:19 UTC (rev 324) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-25 10:38:40 UTC (rev 325) @@ -61,10 +61,12 @@ /* the ELF-image (usually) starts at offset 0x4000 */ if( (elf_offs=find_elf(fd)) < 0 ) { ELF_DPRINTF("----> %s is not an ELF image\n", get_file_path(fd)); - exit(1); + return -1; } - if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) - fatal_error("elf_readhdrs failed\n"); + if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) { + ELF_DPRINTF("elf_readhdrs failed\n"); + return -1; + } *elf_entry = ehdr.e_entry; @@ -89,8 +91,10 @@ fatal_error("Claim failed!\n"); addr = (char*)phdr[i].p_vaddr; - if( read_io(fd, addr, s) != s ) - fatal_error("read failed\n"); + if( read_io(fd, addr, s) != s ) { + ELF_DPRINTF("read failed\n"); + return -1; + } flush_icache_range( addr, addr+s ); @@ -116,14 +120,16 @@ try_path(const char *path, const char *param) { ulong elf_entry; - int fd; + int fd, ret; ELF_DPRINTF("Trying %s %s\n", path, param); if ((fd = open_io(path)) == -1) { ELF_DPRINTF("Can't open %s\n", path); return; } - (void) load_elf_rom( &elf_entry, fd ); + ret = load_elf_rom( &elf_entry, fd ); + if (ret < 0) + return; close_io( fd ); encode_bootpath( path, param ); @@ -258,8 +264,8 @@ POP(); param = pop_fstr_copy(); } + try_path(path, param); try_bootinfo(path); - try_path(path, param); } else { char boot_device = nvram_read(0x34); Modified: openbios-devel/modules/filesystems.c =================================================================== --- openbios-devel/modules/filesystems.c 2008-12-25 10:36:19 UTC (rev 324) +++ openbios-devel/modules/filesystems.c 2008-12-25 10:38:40 UTC (rev 325) @@ -256,6 +256,12 @@ } static void +files_block_size( files_info_t *dummy ) +{ + PUSH(512); +} + +static void files_initializer( files_info_t *dummy ) { fword("register-fs-package"); @@ -269,6 +275,7 @@ { "write", files_write }, { "seek", files_seek }, { "tell", files_tell }, + { "block-size", files_block_size }, /* special */ { "reopen", files_reopen }, Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2008-12-25 10:36:19 UTC (rev 324) +++ openbios-devel/modules/mac-parts.c 2008-12-25 10:38:40 UTC (rev 325) @@ -55,7 +55,7 @@ free( str ); } if( parnum < 0 ) - parnum = 1; + parnum = 0; DPRINTF("macparts_open %d\n", parnum); SEEK( 0 );

1 0

r324 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 25 Dec '08

25 Dec '08

Author: blueswirl Date: 2008-12-25 11:36:19 +0100 (Thu, 25 Dec 2008) New Revision: 324 Modified: openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/tree.fs Log: Change cdrom alias (original patch by Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-24 07:12:14 UTC (rev 323) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-25 10:36:19 UTC (rev 324) @@ -269,7 +269,7 @@ break; default: case 'd': - path = strdup("cdrom:0"); + path = strdup("cd:0"); break; } try_bootinfo(path); Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-24 07:12:14 UTC (rev 323) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-25 10:36:19 UTC (rev 324) @@ -102,7 +102,7 @@ then then - " cdrom" + " cd" " /pci/pci-ata/ata-1/cdrom@0" ?devalias not if " /pci/pci-ata/ata-1/cdrom@1" ?devalias not if " /pci/pci-ata/ata-2/cdrom@0" ?devalias not if

1 0

r323 - openbios-devel/drivers
by svn＠openbios.org 24 Dec '08

24 Dec '08

Author: blueswirl Date: 2008-12-24 08:12:14 +0100 (Wed, 24 Dec 2008) New Revision: 323 Modified: openbios-devel/drivers/obio.c Log: Fix serial console broken by r317 Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-12-23 20:36:45 UTC (rev 322) +++ openbios-devel/drivers/obio.c 2008-12-24 07:12:14 UTC (rev 323) @@ -119,8 +119,8 @@ static volatile unsigned char *kbd_dev, *serial_dev; -#define CTRL(port) serial_dev[(port) * 2 + 0] -#define DATA(port) serial_dev[(port) * 2 + 2] +#define CTRL(addr) (*(volatile unsigned char *)(addr)) +#define DATA(addr) (*(volatile unsigned char *)(addr + 2)) /* Conversion routines to/from brg time constants from/to bits * per second. @@ -177,7 +177,7 @@ DATA(port) = c; } -static void uart_init_line(int port, unsigned long baud) +static void uart_init_line(volatile unsigned char *port, unsigned long baud) { CTRL(port) = 4; // reg 4 CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x @@ -203,19 +203,17 @@ int uart_init(uint64_t port, unsigned long speed) { - int line; - serial_dev = map_io(port & ~7ULL, 2 * 4); serial_dev += port & 7ULL; - line = port & 3ULL; - uart_init_line(line, speed); + uart_init_line(serial_dev, speed); return -1; } void serial_putchar(int c) { - uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); + uart_putchar((int)(serial_dev + CONFIG_SERIAL_PORT), + (unsigned char) (c & 0xff)); } void serial_cls(void)

1 0