OpenBIOS February 2013

openbios@openbios.org

12 participants
24 discussions

Re: [OpenBIOS] Fix double nvram entry on newworld
by Alexander Graf 03 Feb '13

03 Feb '13

Am 02.02.2013 um 14:05 schrieb Blue Swirl <blauwirbel(a)gmail.com>: > On Thu, Jan 31, 2013 at 3:10 PM, Alexander Graf <agraf(a)suse.de> wrote: >> >> On 30.01.2013, at 11:29, Amadeusz Sławiński wrote: >> >>> Fix double nvram entry on newworld >>> >>> There are two nvram entries on newworld (for example qemu -M mac99) >>> >>> The first one (nvram@fff04000) has initialized .properties while the >>> other one has words. >>> >>> 0 > dev / ls >>> ... >>> fff75e24 pci@f2000000 >>> fff77848 nvram@fff04000 >>> fff778e0 nvram >>> ok >>> 0 > dev /nvram@fff04000 ok >>> 0 > words >>> ok >>> 0 > .properties >>> name "nvram" >>> #bytes 2000 >>> reg fff04000 00004000 >>> device_type "nvram" >>> compatible "nvram,flash" >>> ok >>> 0 > dev /nvram@0 ok >>> 0 > words close open seek write read size >>> ok >>> 0 > .properties >>> name "nvram" >>> ok >>> >>> This patch fixes initialization, so only one node is created >>> containing both .properties and words. >>> >>> 0 > dev / ls >>> ... >>> fff75e24 pci@f2000000 >>> fff77868 nvram@fff04000 >>> ok >>> 0 > dev /nvram@fff04000 ok >>> 0 > words close open seek write read size >>> ok >>> 0 > .properties >>> name "nvram" >>> #bytes 2000 >>> reg fff04000 00004000 >>> device_type "nvram" >>> compatible "nvram,flash" >>> ok >>> >>> Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> >> >> Blue, once this patch is in the tree, do you think you could rebuild OpenBIOS for QEMU, so that it will land in 1.4? > > Sorry, it didn't happen before the freeze. I'm not sure if new > OpenBIOS images qualifies as a bug fix. I would say yes ;). Anthony, any objections from your side? Alex > Most of the changes since > r1063 (now in QEMU) are bug fixes, though: > a5af2b3 macio.c: Fix double nvram entry on newworld > ff86ced SPARC32: WIM register update delay > 8e9793b SPARC32: Clear FP register > c23f9f7 esp.c: fix SCSI command code displayed in do_command() debug statement. > 39988d6 esp.c: fix TEST_UNIT_READY SCSI command length. > 75e29de Revert configuration change from previous commit. > d5df782 video.c: Fix compilation when CONFIG_DEBUG_CONSOLE_VIDEO is > set to false. > 91119ec video.c: Fix incorrect sized type in fill_rect(). > 3caf41b mac-parts.c: Update bootpath to reflect the chosen partition > if unspecified. > ec237bb Switch partition argument parsing to use left-parse-string as > per CHRP bindings. > e4ada76 PPC: Mimic Apple's OpenFirmware behaviour if a divide by zero occurs. > 7e64c09 mac-parts.c: Add Apple_Bootstrap to partition types considered > for Mac boot. > 5b48904 PPC: Fix filll word used by BootX > 1711362 Ignore any attempts to emit a character to stdout when stdout > is set to 0. > 6294e00 adb_kbd.c: Implement dummy get-key-map word for the ADB > keyboard package. > 1484d2b PPC: Fix mapping of OpenBIOS ROM in RAM copy within OFMEM > 69c27c4 PPC: Fix next slot eviction > 1be3a15 video.c: Place framebuffer address in frame-buffer-adr > e11cacd mac-parts.c: Fix detection of wrapped HFS+ volumes. > 7694794 PPC: Implement filll (fill long) word for QEMU/PPC as required by BootX. > 1fbbbd2 Redefine "to" word in device.fs to allow the current package > to be set like a standard value. > 1da510f Rework mac-parts.c to use CHRP-compliant partition search, > followed by Apple OF partition search. > b70a1f7 PPC: Rework assignment of keyboard devalias. > dd37f6b Add a default "decode-unit" word for devices that don't > implement their own. > 7a370cc PPC: Add keyboard device alias as a duplicate of stdin. > 58106df Fix dir cd:,\ (no partition specified) when reading from Mac partitions. > 5f23f2c Improve dir word by reducing complexity and adding some more > diagnostics. > a78e3b4 The spin word is set by BootX when Mac OS X is booting. > 37d2f65 PPC32: Enable local variables for the PPC32 build. > 538d404 Implementation of Forth local variables for OpenBIOS. > 5bb1484 amd64: Fix compilation from last commit to implement "dir" > word for HFS+ filesystem. > 0495b71 Add initial implementation of "dir" word for HFS+ filesystems. > 21ed61f Fix HFS+ display for non-ASCII characters. > 5b22479 Fix bug related to opening backup volumes in libhfsp's volume_open(). > f095c85 ppc qemu: Increase PCI hole for heathrow > >> >> >> Thanks, >> >> Alex >> >>> >>> diff -uNr a/drivers/macio.c b/drivers/macio.c >>> --- a/drivers/macio.c 2013-01-28 12:16:54.849868216 +0100 >>> +++ b/drivers/macio.c 2013-01-28 12:17:27.595867493 +0100 >>> @@ -57,12 +57,6 @@ >>> } else { >>> nvram_offset = NW_IO_NVRAM_OFFSET; >>> nvram_size = NW_IO_NVRAM_SIZE; >>> - push_str("/"); >>> - fword("find-device"); >>> - fword("new-device"); >>> - push_str("nvram"); >>> - fword("device-name"); >>> - fword("finish-device"); >>> } >>> nvram = (char*)addr + nvram_offset; >>> snprintf(buf, sizeof(buf), "%s/nvram", path); >>> >>> -- >>> OpenBIOS http://openbios.org/ >>> Mailinglist: http://lists.openbios.org/mailman/listinfo >>> Free your System - May the Forth be with you >>

3 3

Fix double nvram entry on newworld
by Amadeusz Sławiński 02 Feb '13

02 Feb '13

Fix double nvram entry on newworld There are two nvram entries on newworld (for example qemu -M mac99) The first one (nvram@fff04000) has initialized .properties while the other one has words. 0 > dev / ls ... fff75e24 pci@f2000000 fff77848 nvram@fff04000 fff778e0 nvram ok 0 > dev /nvram@fff04000 ok 0 > words ok 0 > .properties name "nvram" #bytes 2000 reg fff04000 00004000 device_type "nvram" compatible "nvram,flash" ok 0 > dev /nvram@0 ok 0 > words close open seek write read size ok 0 > .properties name "nvram" ok This patch fixes initialization, so only one node is created containing both .properties and words. 0 > dev / ls ... fff75e24 pci@f2000000 fff77868 nvram@fff04000 ok 0 > dev /nvram@fff04000 ok 0 > words close open seek write read size ok 0 > .properties name "nvram" #bytes 2000 reg fff04000 00004000 device_type "nvram" compatible "nvram,flash" ok Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> diff -uNr a/drivers/macio.c b/drivers/macio.c --- a/drivers/macio.c 2013-01-28 12:16:54.849868216 +0100 +++ b/drivers/macio.c 2013-01-28 12:17:27.595867493 +0100 @@ -57,12 +57,6 @@ } else { nvram_offset = NW_IO_NVRAM_OFFSET; nvram_size = NW_IO_NVRAM_SIZE; - push_str("/"); - fword("find-device"); - fword("new-device"); - push_str("nvram"); - fword("device-name"); - fword("finish-device"); } nvram = (char*)addr + nvram_offset; snprintf(buf, sizeof(buf), "%s/nvram", path);

5 5

G3 iMac device tree
by Programmingkid 01 Feb '13

01 Feb '13

Here is the device tree with properties of a G3 iMac: G3 iMac Device tree 0 > dev / ok 0 > ls ff83d640: /cpus ff83d8f0: /PowerPC,750@0 ff83dcb0: /l2-cache ff83e930: /chosen ff83eb48: /memory@0 ff83ede8: /openprom ff83ef90: /client-services ff840280: /rom@ff800000 ff840480: /boot-rom@fff00000 ff8406b0: /macos ff8407b8: /options ff8408c0: /aliases ff8413a8: /packages ff841488: /deblocker ff841e20: /disk-label ff8428e8: /obp-tftp ff84c1c8: /telnet ff84cac8: /mac-parts ff84e270: /mac-files ff851128: /hfs-plus-files ff855f48: /fat-files ff857d40: /iso-9660-files ff858ba0: /bootinfo-loader ff85a878: /xcoff-loader ff85b310: /pe-loader ff85bd60: /elf-loader ff85d408: /usb-hid-class ff85ff48: /usb-ms-class ff862b98: /usb-audio-class ff8d0710: /sbp2-disk ff8d30b0: /ata-disk ff8d4e18: /atapi-disk ff8d6d60: /bootpath-search ff8dd6f0: /terminal-emulator ff8dd800: /firewire-disk-mode ff8f20b8: /pseudo-hid ff8f21b8: /keyboard ff8f28b0: /mouse ff8f2e48: /eject-key ff8f3318: /pseudo-sound ff8f3648: /multiboot ff906638: /diagnostics ff906718: /nvram@fff04000 ff907318: /uni-n@f8000000 ff9075e0: /i2c@f8001000 ff907ea8: /cereal ff9085d8: /pci@f0000000 ff943eb0: /uni-north-agp@b ff944198: /ATY,Rage128Pk@10 ff94ce58: /ivad@0 ff909748: /pci@f2000000 ff90ba48: /mac-io@17 ff90fa00: /interrupt-controller@40000 ff90fc50: /gpio@50 ff90fdb8: /extint-gpio1 ff90ffd8: /programmer-switch ff910188: /escc-legacy@12000 ff9103f8: /ch-a@12004 ff9105f8: /ch-b@12000 ff9107f8: /escc@13000 ff910a80: /ch-a@13020 ff9114a8: /ch-b@13000 ff911e40: /davbus@14000 ff912178: /sound ff912a08: /timer@15000 ff912c18: /via-pmu@16000 ff9161f0: /rtc ff916960: /power-mgt ff94d030: /usb-power-mgt ff916c48: /i2c@18000 ff917550: /cereal ff94cb00: /i2c-modem ff917c98: /ata-4@1f000 ff91a508: /disk ff91ac68: /ata-3@20000 ff91d4d8: /disk ff91dc38: /ata-3@21000 ff9204a8: /disk ff920b50: /radio@30000 ff927190: /usb@18 ff94b9e8: /hub@1 ff94bbf0: /device@2 ff94bd68: /interface@0 ff94bf28: /mouse@3 ff92ee18: /usb@19 ff94af48: /hub@1 ff94b150: /device@1 ff94b2c8: /keyboard@0 ff94b658: /eject-key@1 ff90a8d0: /pci@f4000000 ff936bc0: /firewire@e ff93f4a8: /ethernet@f ff94d1f0: /ethernet-phy 0 > .properties model PowerMac2,2 compatible PowerMac2,2 MacRISC2 MacRISC Power Macintosh serial-number <removed> customer-sw-config color-code 0000 scb# 00000000 theater-mode name device-tree copyright Copyright 1983-2001 Apple Computer, Inc. All Rights Reserved device_type bootrom system-id 0000000000000 #address-cells 00000001 #size-cells 00000001 clock-frequency 05f3e279 AAPL,add-fcode-file ff81f498

1 0

Device tree from G3 iBook
by Programmingkid 01 Feb '13

01 Feb '13

I thought this device tree will help any one who might want to work on the Mac99 target. It is the device tree from a G3 iBook. 0 > dev / ok 0 > ls ff83d628: /cpus ff83d8d8: /PowerPC,750@0 ff83dcb8: /l2-cache ff83e938: /chosen ff83eb50: /memory@0 ff83edf0: /openprom ff83ef98: /client-services ff840288: /rom@ff800000 ff840488: /boot-rom@fff00000 ff8406c0: /macos ff8407c8: /options ff8408d0: /aliases ff8413b8: /packages ff841498: /deblocker ff841e30: /disk-label ff8428f8: /obp-tftp ff84c1d8: /telnet ff84cad8: /mac-parts ff84e280: /mac-files ff851138: /hfs-plus-files ff855f58: /fat-files ff857d50: /iso-9660-files ff858bb0: /bootinfo-loader ff85a888: /xcoff-loader ff85b320: /pe-loader ff85bd70: /elf-loader ff85d418: /usb-hid-class ff85ff58: /usb-ms-class ff862ba8: /usb-audio-class ff8d0720: /sbp2-disk ff8d30c0: /ata-disk ff8d4e28: /atapi-disk ff8d6d70: /bootpath-search ff8dd700: /terminal-emulator ff8dd810: /firewire-disk-mode ff8f20c8: /pseudo-hid ff8f21c8: /keyboard ff8f28c0: /mouse ff8f2e58: /eject-key ff8f3328: /pseudo-sound ff8f3658: /multiboot ff906648: /diagnostics ff906728: /nvram@fff04000 ff907328: /uni-n@f8000000 ff9075f0: /i2c@f8001000 ff907eb8: /cereal ff9085e8: /pci@f0000000 ff93b1f0: /uni-north-agp@b ff93b4d8: /ATY,RageM_Lp@10 ff909758: /pci@f2000000 ff90ba40: /mac-io@17 ff90f9f8: /interrupt-controller@40000 ff90fc48: /gpio@50 ff90fdb0: /extint-gpio1 ff90ffd0: /programmer-switch ff910188: /extint-gpio12 ff910360: /i2s@10000 ff910590: /i2s-a@10000 ff9108c0: /sound ff910f70: /i2s-b@11000 ff911148: /escc-legacy@12000 ff9113b8: /ch-a@12004 ff9115b8: /ch-b@12000 ff9117b8: /escc@13000 ff911a40: /ch-a@13020 ff912468: /ch-b@13000 ff912de8: /timer@15000 ff912ff8: /via-pmu@16000 ff9165d0: /rtc ff916d20: /adb ff916ed8: /keyboard@2 ff917c80: /mouse@3 ff918068: /power-mgt ff953fb8: /usb-power-mgt ff918380: /battery@0 ff9184a8: /backlight@f300 ff918648: /i2c@18000 ff918f50: /cereal ff953c68: /i2c-modem ff919698: /ata-4@1f000 ff91bd88: /disk ff91c4e8: /ata-3@20000 ff91ebd8: /disk ff91f338: /ata-3@21000 ff921a28: /disk ff928400: /usb@18 ff90a8c8: /pci@f4000000 ff936828: /ethernet@f ff954178: /ethernet-phy

2 2