OpenBIOS August 2011

openbios@openbios.org

19 participants
88 discussions

[PATCH 2/10] Ignore extraneous partitions
by William Hahne 09 Aug '11

09 Aug '11

BootX will only check the first few partitions from mac-parts to find the Mac OS partition. So it must expect drivers and void partitions to be ignored. This patch makes it so that if you specify the partition cd:1 and partition 1 is a driver it will keep checking partitions until reaching the first non-driver and non-void partition. Index: packages/mac-parts.c =================================================================== --- packages/mac-parts.c (revision 1041) +++ packages/mac-parts.c (working copy) @@ -200,15 +203,26 @@ } else { /* Another partition was explicitly requested */ - SEEK( bs * parnum ); - READ( &par, sizeof(par) ); + + /* We have to find the first valid partition corresponding to the given number. + This is because Apple sometimes includes a bunch of extra partitions that + BootX expects to be ignored */ + while (parnum < par.pmMapBlkCnt) { + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + /* Check if valid, also device driver partitions are expected to be ignored */ + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) && + !(__be32_to_cpu(par.pmPartStatus) & kPartitionIsRealDeviceDriver)) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + break; + } + + parnum++; } }

1 0

[PATCH 1/10] Dummy get-key-map in keyboard device package
by William Hahne 09 Aug '11

09 Aug '11

"get-key-map" is a Forth word that provides a map of all the keys currently pressed on the keyboard. Since it is only used by BootX to determine if one of the shortcuts for verbose or single user mode is pressed. It is a waste of time to provide a full implementation. This just hands out a dummy key map which specifies verbose mode. Index: drivers/adb_kbd.c =================================================================== --- drivers/adb_kbd.c (revision 1041) +++ drivers/adb_kbd.c (working copy) @@ -43,10 +43,13 @@ static void keyboard_read(void); +static void keyboard_get_key_map(void); + NODE_METHODS( keyboard ) = { { "open", keyboard_open }, { "close", keyboard_close }, { "read", keyboard_read }, + { "get-key-map", keyboard_get_key_map }, }; /* VT100 escape sequences */ @@ -566,3 +569,18 @@ } PUSH(i); } + +static unsigned char fake_keymap[32] = { + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 +}; + +static void keyboard_get_key_map(void) +{ + /* This is a bit of a hack since BootX requires a get-key-map word. + In the future this should be changed to give the actual current keymap, + but since this only effects keyboard input in BootX it isn't a priority. */ + PUSH( (int)fake_keymap ); +}

1 0

[PATCH 0/10] Patches for booting Mac OS X
by William Hahne 09 Aug '11

09 Aug '11

Hello, I apologize for my earlier post which I failed to break up. I have not done much posting to mailing lists. These 10 patches it all relate to getting OpenBIOS able to boot Mac OS X on Qemu. While Mac OS does not yet fully boot, with these patches I have gotten the Mac OS 10.2 kernel to load and begin booting. The rest of the work will mostly be in Qemu. William Hahne M kernel/forth.c M kernel/bootstrap.c M forth/admin/iocontrol.fs M forth/bootstrap/bootstrap.fs M fs/hfsplus/hfsp_volume.c M arch/ppc/qemu/init.c M packages/video.c M packages/mac-parts.c M drivers/adb_kbd.c

1 0

Re: [OpenBIOS] [Qemu-devel] [RFC] PowerPC Mac OS on Qemu
by Natalia Portillo 09 Aug '11

09 Aug '11

Please, a) separate the patch in pieces, I suggest you checking how other patches are split, there have been a lot of patches today to get insight. b) use inline signed-by patch Regards, Natalia Portillo El 09/08/2011, a las 20:46, William Hahne escribió: > Hello, > > I am a Google Summer of Code student working on getting PowerPC Mac OS running on Qemu. While I am not finished I need to upstream what I currently have before the end of Summer of Code. My patch is for OpenBIOS but I am cross-posting to both Qemu and OpenBIOS mailing lists since it is useful to get feedback from both. > > One part of the patch I am particularly concerned about is the patch to arch/ppc/qemu/init.c to provide a CPU and Timebase frequency. Qemu doesn't report a CPU frequency and the reported Timebase frequency is too high and causes the Mac OS scheduler to break. I hard-coded values that work but this seems like an unacceptable long-term solution to me. A simple test for CPU frequency might be the best solution here but seems a little redundant as Mac OS later runs its own test, seemingly only relying on these values during initialization (I am not 100% sure of this since it crashes before reaching that point.) Feedback here would be especially appreciated. > > Another thing to note is in drivers/adb_kbd.c. "get-key-map" which returns a map of the current pressed keys on the keyboard just returns a dummy value. I felt it was a waste of time making a full implementation when all it really gets you is the ability to use keyboard shortcuts for verbose or single user mode. > > Other than those specific concerns I welcome general feedback on the patch, since as I said I am hoping to get it in before the end of Summer of Code. > > Thanks, > William Hahne > <PowerPC_Mac_OS.patch>

1 0

[RFC] PowerPC Mac OS on Qemu
by William Hahne 09 Aug '11

09 Aug '11

Hello, I am a Google Summer of Code student working on getting PowerPC Mac OS running on Qemu. While I am not finished I need to upstream what I currently have before the end of Summer of Code. My patch is for OpenBIOS but I am cross-posting to both Qemu and OpenBIOS mailing lists since it is useful to get feedback from both. One part of the patch I am particularly concerned about is the patch to arch/ppc/qemu/init.c to provide a CPU and Timebase frequency. Qemu doesn't report a CPU frequency and the reported Timebase frequency is too high and causes the Mac OS scheduler to break. I hard-coded values that work but this seems like an unacceptable long-term solution to me. A simple test for CPU frequency might be the best solution here but seems a little redundant as Mac OS later runs its own test, seemingly only relying on these values during initialization (I am not 100% sure of this since it crashes before reaching that point.) Feedback here would be especially appreciated. Another thing to note is in drivers/adb_kbd.c. "get-key-map" which returns a map of the current pressed keys on the keyboard just returns a dummy value. I felt it was a waste of time making a full implementation when all it really gets you is the ability to use keyboard shortcuts for verbose or single user mode. Other than those specific concerns I welcome general feedback on the patch, since as I said I am hoping to get it in before the end of Summer of Code. Thanks, William Hahne

1 0

Re: [OpenBIOS] OpenBios Sparc64
by Tarl Neustaedter 08 Aug '11

08 Aug '11

On 2011-Aug-5 14:23 , Ghitulete Razvan wrote: > This is a wild > guess, but is the openboot CIF influenced in any way by the processor > state register? Shouldn't be. It's just forth code manipulating the device tree. Doesn't do anything exotic with the processor. On the other hand, it does need to have the client interface initialized, which happens automatically during startup. If you're somehow bypassing that, you'd expect to have trouble. > Also as a last option, do you know how i could get hold of a > binary for 3.13.1 so i can disassemble it and inspect the code easier > as i find it pretty difficult using the dis command over and over. > heh. I certainly can't send you one, Oracle is much more retentive on exporting code than Sun ever was. However, if you have hardware, you've got the binary. My recollection is that older versions of Solaris (pre Solaris-10) just leave the prom mapped in kernel space, starting at 0xf020.0000 . If not, you'll have to figure out how to use /dev/physmem to map in the prom so you can dump it out. Another possibility is the version of Openboot that was opensourced by Sun several years ago - 4.21, I think. See: http://openboot.sourceforge.net/

2 1

[PATCH v2] make select-dev and unselect-dev compatible with OBP
by Bob Breuer 08 Aug '11

08 Aug '11

>From the 1275 errata for section H.8, select-dev and unselect-dev are pre Open Firmware, but not the same as open-dev/device-end. Make them Sun OBP compatible by pulling the functionality for select-dev/ unselect-dev out of (and simplifying) begin-package/end-package. For the Sun OBP definition of begin-package/end-package, along with descriptions and example usage, see the "Debugging and Testing FCode Programs" chapter of "Writing FCode 3.x Programs". Signed-off-by: Bob Breuer <breuerr(a)mc.net> --- v2: updated commit message and comments to mention the 1275 errata, moved the words to forth/admin/devices.fs, begin-package/end-package followed along to avoid "unknown word" errors while building the dictionary. forth/admin/devices.fs | 26 +++++++++++++++++++++++++- forth/debugging/fcode.fs | 16 ---------------- forth/device/pathres.fs | 4 ---- 3 files changed, 25 insertions(+), 21 deletions(-) Index: forth/device/pathres.fs =================================================================== --- forth/device/pathres.fs (revision 1045) +++ forth/device/pathres.fs (working copy) @@ -471,10 +471,6 @@ ( ihandle ) ; -: select-dev ( dev-str dev-len -- ihandle | 0 ) - open-dev -; - : execute-device-method ( ... dev-str dev-len met-str met-len -- ... false | ?? true ) 2swap Index: forth/admin/devices.fs =================================================================== --- forth/admin/devices.fs (revision 1045) +++ forth/admin/devices.fs (working copy) @@ -46,10 +46,34 @@ 0 active-package! ; +\ Open selected device node and make it the current instance +\ section H.8 errata: pre OpenFirmware, but Sun OBP compatible +: select-dev ( -- ) + open-dev dup 0= abort" failed opening parent." + dup to my-self + ihandle>phandle active-package! +; + +\ Close current node, deselect active package and current instance, +\ leaving no instance selected +\ section H.8 errata: pre OpenFirmware, but Sun OBP compatible : unselect-dev ( -- ) + my-self close-dev device-end + 0 to my-self ; - + +: begin-package ( arg-str arg-len reg-str reg-len dev-str dev-len -- ) + select-dev + new-device + set-args +; + +: end-package ( -- ) + finish-device + unselect-dev +; + : ?active-package ( -- phandle ) active-package dup 0= abort" no active device" ; Index: forth/debugging/fcode.fs =================================================================== --- forth/debugging/fcode.fs (revision 1045) +++ forth/debugging/fcode.fs (working copy) @@ -10,21 +10,5 @@ : headers ( -- ) ; -: begin-package ( arg-str arg-len reg-str reg-len dev-str dev-len -- ) - open-dev dup 0= abort" failed opening parent." - dup to my-self - ihandle>phandle active-package! - new-device - set-args -; - -: end-package ( -- ) - my-parent >r - finish-device - 0 active-package! - 0 to my-self - r> close-dev -; - : apply ( ... "method-name< >device-specifier< >" -- ??? ) ;

2 1

[commit] r1046 - in trunk/openbios-devel/forth: admin debugging device
by repository service 08 Aug '11

08 Aug '11

Author: mcayland Date: Mon Aug 8 14:33:10 2011 New Revision: 1046 URL: http://tracker.coreboot.org/trac/openbios/changeset/1046 Log: Make select-dev and unselect-dev compatible with OBP. >From the 1275 errata for section H.8, select-dev and unselect-dev are pre Open Firmware, but not the same as open-dev/device-end. Make them Sun OBP compatible by pulling the functionality for select-dev/ unselect-dev out of (and simplifying) begin-package/end-package. For the Sun OBP definition of begin-package/end-package, along with descriptions and example usage, see the "Debugging and Testing FCode Programs" chapter of "Writing FCode 3.x Programs". Signed-off-by: Bob Breuer <breuerr(a)mc.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/admin/devices.fs trunk/openbios-devel/forth/debugging/fcode.fs trunk/openbios-devel/forth/device/pathres.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Thu Jul 14 16:37:34 2011 (r1045) +++ trunk/openbios-devel/forth/admin/devices.fs Mon Aug 8 14:33:10 2011 (r1046) @@ -46,10 +46,34 @@ 0 active-package! ; +\ Open selected device node and make it the current instance +\ section H.8 errata: pre OpenFirmware, but Sun OBP compatible +: select-dev ( -- ) + open-dev dup 0= abort" failed opening parent." + dup to my-self + ihandle>phandle active-package! +; + +\ Close current node, deselect active package and current instance, +\ leaving no instance selected +\ section H.8 errata: pre OpenFirmware, but Sun OBP compatible : unselect-dev ( -- ) + my-self close-dev device-end + 0 to my-self +; + +: begin-package ( arg-str arg-len reg-str reg-len dev-str dev-len -- ) + select-dev + new-device + set-args +; + +: end-package ( -- ) + finish-device + unselect-dev ; - + : ?active-package ( -- phandle ) active-package dup 0= abort" no active device" ; Modified: trunk/openbios-devel/forth/debugging/fcode.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/fcode.fs Thu Jul 14 16:37:34 2011 (r1045) +++ trunk/openbios-devel/forth/debugging/fcode.fs Mon Aug 8 14:33:10 2011 (r1046) @@ -10,21 +10,5 @@ : headers ( -- ) ; -: begin-package ( arg-str arg-len reg-str reg-len dev-str dev-len -- ) - open-dev dup 0= abort" failed opening parent." - dup to my-self - ihandle>phandle active-package! - new-device - set-args -; - -: end-package ( -- ) - my-parent >r - finish-device - 0 active-package! - 0 to my-self - r> close-dev -; - : apply ( ... "method-name< >device-specifier< >" -- ??? ) ; Modified: trunk/openbios-devel/forth/device/pathres.fs ============================================================================== --- trunk/openbios-devel/forth/device/pathres.fs Thu Jul 14 16:37:34 2011 (r1045) +++ trunk/openbios-devel/forth/device/pathres.fs Mon Aug 8 14:33:10 2011 (r1046) @@ -471,10 +471,6 @@ ( ihandle ) ; -: select-dev ( dev-str dev-len -- ihandle | 0 ) - open-dev -; - : execute-device-method ( ... dev-str dev-len met-str met-len -- ... false | ?? true ) 2swap

1 0

Re: [OpenBIOS] OpenBios Sparc64
by Tarl Neustaedter 05 Aug '11

05 Aug '11

On 2011-Aug-5 08:56 , Ghitulete Razvan wrote: > I meant OpenBOOT, as I am trying to write something for a V9 and qemu > doesn't have full suport for the V9 arch. But as far as i've noticed > the openbios implementation resembles the openboot one. Anywho I > managed to get passed this. It seems it was because I had the > processor in a wrong state. But now I ran into some other problems, as > it seems if I call the "finddevice" CIF command for any node, instead > of getting a valid phandle, or an -1 in case i ask for gibberish(which > i did). The CIF keeps returning the address to the string I passed as > an argument (said device that i am searching). Hmm. I'm not seeing it. Granted, this is a newer openboot than you are using, but I don't remember any bugs in this area since god was young. T5240, No Keyboard Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. OpenBoot 4.34.0.build_01, 16384 MB memory available, Serial #71716124. [tarl usb3 #948] Ethernet address 0:14:4f:46:4d:1c, Host ID: 84464d1c. {0} ok cd /openprom/client-services {0} ok " /pci@400" 4000 swap move {0} ok 4000 10 dump \/ 1 2 3 4 5 6 7 8 9 a b c d e f v123456789abcdef 4000 2f 70 63 69 40 34 30 30 00 00 00 00 00 00 00 00 /pci@400........ {0} ok 4000 finddevice {0} ok showstack f0288e28 {0} ok clear {0} ok " gabblebletch" 4000 swap move {0} ok 4000 20 dump \/ 1 2 3 4 5 6 7 8 9 a b c d e f v123456789abcdef 4000 67 61 62 62 6c 65 62 6c 65 74 63 68 00 00 00 00 gabblebletch.... 4010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ {0} ok 4000 finddevice ffffffffffffffff {0} ok

2 1

Re: [OpenBIOS] OpenBios Sparc64
by Tarl Neustaedter 05 Aug '11

05 Aug '11

1 0

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