OpenBIOS April 2007

openbios@openbios.org

9 participants
56 discussions

r319 - cpu/x86/pc/olpc dev/geode/display
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 09:01:05 +0200 (Wed, 25 Apr 2007) New Revision: 319 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/vsapci.fth dev/geode/display/gxpci.fth Log: OLPC - fixed some fairly innocuous problems with the display device tree and display register mapping. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-04-25 06:59:47 UTC (rev 318) +++ cpu/x86/pc/olpc/devices.fth 2007-04-25 07:01:05 UTC (rev 319) @@ -290,7 +290,7 @@ fload ${BP}/dev/geode/display/loadpkg.fth \ Geode display 0 0 encode-bytes - h# 8200.0910 +i 0+i h# fd00.0000 +i 0+i h# 0100.0000 +i \ Frame buffer + h# 8200.0910 +i 0+i h# fd00.0000 +i 0+i h# 0080.0000 +i \ Frame buffer h# 8200.0914 +i 0+i h# fe00.0000 +i 0+i h# 0000.4000 +i \ GP h# 8200.0918 +i 0+i h# fe40.0000 +i 0+i h# 0000.4000 +i \ DC h# 8200.091c +i 0+i h# fe80.0000 +i 0+i h# 0000.4000 +i \ VP Modified: cpu/x86/pc/olpc/vsapci.fth =================================================================== --- cpu/x86/pc/olpc/vsapci.fth 2007-04-25 06:59:47 UTC (rev 318) +++ cpu/x86/pc/olpc/vsapci.fth 2007-04-25 07:01:05 UTC (rev 319) @@ -201,7 +201,7 @@ h# ffffc000 gxfb-hdr h# 10 + l! \ BAR4 MASK - VIP h# 20811022 gxfb-hdr h# 20 + l! \ Vendor/device ID - AMD - h# fe0c0000 gxfb-hdr h# 40 + l! \ BAR4 address - VIP + h# fe00c000 gxfb-hdr h# 40 + l! \ BAR4 address - VIP then [ifdef] lx-devel exit [then] Modified: dev/geode/display/gxpci.fth =================================================================== --- dev/geode/display/gxpci.fth 2007-04-25 06:59:47 UTC (rev 318) +++ dev/geode/display/gxpci.fth 2007-04-25 07:01:05 UTC (rev 319) @@ -9,10 +9,11 @@ 0 0 encode-bytes 0 0 h# 0000.0000 my-space + phys+ 0 i+ h# 0000.0100 i+ \ Config registers -0 0 h# 0200.0010 my-space + phys+ 0 i+ h# 0100.0000 i+ \ Frame buffer +0 0 h# 0200.0010 my-space + phys+ 0 i+ h# 0080.0000 i+ \ Frame buffer 0 0 h# 0200.0014 my-space + phys+ 0 i+ h# 0000.4000 i+ \ Display controller 0 0 h# 0200.0018 my-space + phys+ 0 i+ h# 0000.4000 i+ \ Video controller 0 0 h# 0200.001c my-space + phys+ 0 i+ h# 0000.4000 i+ \ Graphics controller +0 0 h# 0200.0020 my-space + phys+ 0 i+ h# 0000.4000 i+ \ Video Input Port " reg" property : map-membar ( bar size -- adr ) @@ -27,7 +28,7 @@ h# 1c h# 4000 map-membar ( gp-base dc-base vp-base ) ; : (map-frame-buffer) ( -- adr ) - h# 10 h# 100.0000 map-membar + h# 10 h# 80.0000 map-membar ; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r318 - dev/olpc/cafenand
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 08:59:47 +0200 (Wed, 25 Apr 2007) New Revision: 318 Modified: dev/olpc/cafenand/cafenand.fth Log: OLPC cafenand.fth - removed some unused register access words. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-04-25 06:58:37 UTC (rev 317) +++ dev/olpc/cafenand/cafenand.fth 2007-04-25 06:59:47 UTC (rev 318) @@ -23,10 +23,6 @@ : cl! ( l adr -- ) chip + rl! ; : cl@ ( adr -- l ) chip + rl@ ; -: cw! ( w adr -- ) chip + rw! ; -: cw@ ( adr -- w ) chip + rw@ ; -: cb! ( b adr -- ) chip + rb! ; -: cb@ ( adr -- b ) chip + rb@ ; : map-regs ( -- ) 0 0 h# 0200.0010 my-space + /regs " map-in" $call-parent to chip

1 0

r317 - forth/kernel
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 08:58:37 +0200 (Wed, 25 Apr 2007) New Revision: 317 Modified: forth/kernel/kernel.fth Log: Kernel - Added bdump and wdump commands. Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2007-04-21 14:23:45 UTC (rev 316) +++ forth/kernel/kernel.fth 2007-04-25 06:58:37 UTC (rev 317) @@ -544,28 +544,40 @@ ps-size-t constant ps-size rs-size-t constant rs-size -: cdump (s adr len -- ) +: dump-chars ( adr -- ) + h# 10 bounds do + i c@ dup bl h# 80 within if emit else drop ." ." then + loop +; +: bdump (s adr len -- ) base @ >r hex bounds ?do i 8 u.r ." : " i h# 10 bounds do i /l bounds do i c@ .2 loop space /l +loop - i h# 10 bounds do - i c@ dup bl h# 80 within if emit else drop ." ." then - loop + i dump-chars cr h# 10 +loop r> base ! ; +: wdump (s adr len -- ) + base @ >r hex + bounds ?do + i 8 u.r ." : " i h# 10 bounds do + i w@ 4 u.r space space + /w +loop + i dump-chars + cr + h# 10 +loop + r> base ! +; : ldump (s adr len -- ) base @ >r hex bounds ?do i 8 u.r ." : " i h# 10 bounds do i l@ 8 u.r space space /l +loop - i h# 10 bounds do - i c@ dup bl h# 80 within if emit else drop ." ." then - loop + i dump-chars cr h# 10 +loop r> base !

1 0

r129 - openbios-devel/arch/sparc32
by svn＠openbios.org 24 Apr '07

24 Apr '07

Author: blueswirl Date: 2007-04-24 22:00:02 +0200 (Tue, 24 Apr 2007) New Revision: 129 Modified: openbios-devel/arch/sparc32/romvec.c Log: Fix broken compilation when debugging enabled Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-04-24 19:44:35 UTC (rev 128) +++ openbios-devel/arch/sparc32/romvec.c 2007-04-24 20:00:02 UTC (rev 129) @@ -108,7 +108,7 @@ } } -#if CONFIG_DEBUG_OBP +#ifdef CONFIG_DEBUG_OBP static int looks_like_string(char *str, int len) { int i; @@ -163,7 +163,7 @@ else str = "NULL"; -#if CONFIG_DEBUG_OBP +#ifdef CONFIG_DEBUG_OBP if (looks_like_string(str, len)) { DPRINTF("obp_getprop(0x%x, %s) = %s\n", node, name, str); } else {

1 0

r128 - openbios-devel/drivers
by svn＠openbios.org 24 Apr '07

24 Apr '07

Author: blueswirl Date: 2007-04-24 21:44:35 +0200 (Tue, 24 Apr 2007) New Revision: 128 Modified: openbios-devel/drivers/esp.c Log: Re-enable interpose Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-04-24 19:19:58 UTC (rev 127) +++ openbios-devel/drivers/esp.c 2007-04-24 19:44:35 UTC (rev 128) @@ -285,23 +285,11 @@ selfword("open-deblocker"); -#if WHEN_INTERPOSE_IS_FIXED - // Buggy implementation of "interpose" breaks SunOS 4. - // inst2pkg of the device returned by open() should return - // the same phandle regardless of whether any interposition - // has happened. Interpose currently causes inst2pkg to - // return the phandle of /packages/misc-files. - // - // Removing interpose isn't the ideal solution, but it - // allows SunOS 4 to load the kernel. Interpose should - // be fixed, then re-enabled. - /* interpose disk-label */ ph = find_dev("/packages/disk-label"); fword("my-args"); PUSH_ph( ph ); fword("interpose"); -#endif RET ( -ret ); }

1 0

Re: [OpenBIOS] Fixing interpose
by Stefan Reinauer 24 Apr '07

24 Apr '07

Copying list again... * Blue Swirl <blauwirbel(a)gmail.com> [070424 20:49]: > Copyright (c) 1982, 1986, 1989, 1991, 1993 > The Regents of the University of California. All rights reserved. > Copyright (c) 1995-2006 OpenBSD. All rights reserved. http://www.OpenBSD.org > > OpenBSD 4.0 (RAMDISK) #297: Sun Sep 17 22:27:36 MDT 2006 > deraadt@sparc.openbsd.org:/usr/src/sys/arch/sparc/compile/RAMDISK > real mem = 133505024 > avail mem = 117956608 [..] > zs0 at obio0 addr 0x71100000 pri 12, softpri 6 > zstty0 at zs0 channel 0 (console i/o) > zstty1 at zs0 channel 1 Is openbsd hanging here? NetBSD: > obp_fortheval_v2(384000 pgmap@ 387d8c L!) : pgmap@ ( virt -- pmentry ) \ Return the page map entry for the virtual address. ; Not sure - can we just use an empty word here, as we use a 1:1 mapping? : pgmap! ( pmentry virt -- ) \ Store a new page map entry for the virtual address. 2drop ; Those words are defined in http://openbios.org/viewvc/obp/cpu/sparc/ultra/mmu.fth?view=markup&revision… My sparc know how is pretty limited though ;-) > pgmap@:obp_devclose(0xffd87f0c) = -19 > Cannot load netbsd: error=27 Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/

1 0

r127 - in openbios-devel: arch/sparc32 forth/device
by svn＠openbios.org 24 Apr '07

24 Apr '07

Author: stepan Date: 2007-04-24 21:19:58 +0200 (Tue, 24 Apr 2007) New Revision: 127 Modified: openbios-devel/arch/sparc32/romvec.c openbios-devel/forth/device/package.fs Log: Fix for interpose problem. Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-04-21 19:47:16 UTC (rev 126) +++ openbios-devel/arch/sparc32/romvec.c 2007-04-24 19:19:58 UTC (rev 127) @@ -389,7 +389,7 @@ int ret; PUSH(dev_desc); - fword("ihandle>phandle"); + fword("ihandle>non-interposed-phandle"); ret = POP(); DPRINTF("obp_inst2pkg(fd 0x%x) = 0x%x\n", dev_desc, ret); Modified: openbios-devel/forth/device/package.fs =================================================================== --- openbios-devel/forth/device/package.fs 2007-04-21 19:47:16 UTC (rev 126) +++ openbios-devel/forth/device/package.fs 2007-04-24 19:19:58 UTC (rev 127) @@ -25,10 +25,18 @@ ?my-self >in.my-parent @ ; +: ihandle>non-interposed-phandle ( ihandle -- phandle ) + begin dup >in.interposed @ while + >in.my-parent @ + repeat + >in.device-node @ +; + : ihandle>phandle ( ihandle -- phandle ) >in.device-node @ ; + \ next-property \ defined in property.c

1 0

Fixing interpose
by Blue Swirl 23 Apr '07

23 Apr '07

Fixing the handling of interposed devices would allow booting a lot more OSes. If I understand correctly the interpose solution discussed earlier, the ihandle>phandle in line 28 in: http://www.openbios.org/viewvc/openbios-devel/forth/device/package.fs?view=… should become more like something in OBP line 72: http://openbios.org/viewvc/obp/os/bootprom/instance.fth?view=annotate&root=… Is this right? Or could someone more knowledgeable in Forth propose a fix?

3 3

r126 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 21 Apr '07

21 Apr '07

Author: blueswirl Date: 2007-04-21 21:47:16 +0200 (Sat, 21 Apr 2007) New Revision: 126 Modified: openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/tree.fs openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c Log: TCX 24 bit model support Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/arch/sparc32/openbios.c 2007-04-21 19:47:16 UTC (rev 126) @@ -95,19 +95,18 @@ void setup_timers(void); modules_init(); -#ifdef CONFIG_DRIVER_SBUS ob_init_mmu(hwdef->iommu_high, hwdef->iommu_base); - ob_sbus_init(hwdef->iommu_high, hwdef->iommu_base + 0x1000, hwdef->machine_id); - -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video(); -#endif -#endif #ifdef CONFIG_DRIVER_OBIO ob_obio_init(hwdef->slavio_high, hwdef->slavio_base, hwdef->fd_offset, hwdef->counter_offset, hwdef->intr_offset); nvram_init(); #endif +#ifdef CONFIG_DRIVER_SBUS +#ifdef CONFIG_DEBUG_CONSOLE_VIDEO + init_video(); +#endif + ob_sbus_init(hwdef->iommu_high, hwdef->iommu_base + 0x1000, hwdef->machine_id); +#endif device_end(); bind_func("platform-boot", boot ); Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/arch/sparc32/tree.fs 2007-04-21 19:47:16 UTC (rev 126) @@ -88,8 +88,6 @@ h# 300 encode-int " height" property h# 400 encode-int " width" property h# 400 encode-int " linebytes" property - d# 24 encode-int " depth" property - " no" encode-string " tcx-8-bit" property 5 encode-int 0 encode-int encode+ " intr" property 5 encode-int " interrupts" property finish-device Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/drivers/obio.c 2007-04-21 19:47:16 UTC (rev 126) @@ -349,6 +349,7 @@ extern char boot_device; extern char obp_stdin, obp_stdout; extern const char *obp_stdin_path, *obp_stdout_path; + extern uint16_t graphic_depth; const char *stdin, *stdout, *cpuname; unsigned int i; @@ -386,6 +387,7 @@ boot_device = nv_info.boot_device; nographic = nv_info.nographic; + graphic_depth = nv_info.depth; push_str("mk48t08"); fword("model"); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/drivers/sbus.c 2007-04-21 19:47:16 UTC (rev 126) @@ -77,6 +77,8 @@ fword("property"); } +uint16_t graphic_depth; + static void ob_tcx_init(unsigned int slot, unsigned long base) { @@ -98,7 +100,11 @@ PUSH(0x02000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00400000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -108,7 +114,11 @@ PUSH(0x04000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00400000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -128,7 +138,11 @@ PUSH(0x0a000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00400000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -138,7 +152,11 @@ PUSH(0x0c000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00800000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -148,7 +166,11 @@ PUSH(0x0e000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00800000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -168,17 +190,29 @@ PUSH(0x00200000); fword("encode-int"); fword("encode+"); - PUSH(0x00000004); + if (graphic_depth == 24) { + PUSH(0x00004000); + } else { + PUSH(0x00000004); + } fword("encode-int"); fword("encode+"); PUSH(slot); fword("encode-int"); fword("encode+"); - PUSH(0x00300000); + if (graphic_depth == 24) { + PUSH(0x00301000); + } else { + PUSH(0x00300000); + } fword("encode-int"); fword("encode+"); - PUSH(0x0000081c); + if (graphic_depth == 24) { + PUSH(0x00001000); + } else { + PUSH(0x0000081c); + } fword("encode-int"); fword("encode+"); @@ -198,7 +232,11 @@ PUSH(0x00240000); fword("encode-int"); fword("encode+"); - PUSH(0x00000004); + if (graphic_depth == 24) { + PUSH(0x00004000); + } else { + PUSH(0x00000004); + } fword("encode-int"); fword("encode+"); @@ -208,12 +246,28 @@ PUSH(0x00280000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00008000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); push_str("reg"); fword("property"); + + PUSH((int)graphic_depth); + fword("encode-int"); + push_str("depth"); + fword("property"); + + if (graphic_depth == 8) { + push_str("true"); + fword("encode-string"); + push_str("tcx-8-bit"); + fword("property"); + } } static void

1 0

r125 - openbios-devel/arch/sparc64
by svn＠openbios.org 16 Apr '07

16 Apr '07

Author: blueswirl Date: 2007-04-16 18:52:52 +0200 (Mon, 16 Apr 2007) New Revision: 125 Modified: openbios-devel/arch/sparc64/vectors.S Log: Fix exception number in crash output Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2007-04-16 16:47:42 UTC (rev 124) +++ openbios-devel/arch/sparc64/vectors.S 2007-04-16 16:52:52 UTC (rev 125) @@ -210,7 +210,10 @@ bug: /* Dump the exception and its context */ ! Set up CPU state - wrpr %g0, PSTATE_PRIV, %pstate + ! Don't change the global register set or we lose %g1 (exception level) + rdpr %pstate, %g2 + or %g2, PSTATE_PRIV, %g2 + wrpr %g2, %pstate wr %g0, 0, %fprs wrpr %g0, 0x0, %tl

1 0