OpenBIOS June 2013

openbios@openbios.org

13 participants
43 discussions

[commit] r1163 - trunk/openbios-devel/drivers
by repository service 26 Jun '13

26 Jun '13

Author: agraf Date: Wed Jun 26 03:49:20 2013 New Revision: 1163 URL: http://tracker.coreboot.org/trac/openbios/changeset/1163 Log: Cuda: Add device_type property Mac OS X wants to have a device_type property in the via-cuda node to find and identify it properly. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/cuda.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Tue Jun 25 19:23:09 2013 (r1162) +++ trunk/openbios-devel/drivers/cuda.c Wed Jun 26 03:49:20 2013 (r1163) @@ -190,6 +190,7 @@ set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); + set_property(ph, "device_type", "via-cuda", 9); set_property(ph, "compatible", "cuda", 5); props[0] = __cpu_to_be32(IO_CUDA_OFFSET);

1 0

[commit] r1161 - trunk/openbios-devel/drivers
by repository service 25 Jun '13

25 Jun '13

Author: agraf Date: Tue Jun 25 18:11:57 2013 New Revision: 1161 URL: http://tracker.coreboot.org/trac/openbios/changeset/1161 Log: Mac99: Add power-mgt node to via-cuda Instead of spawning a half-broken via-pmu device tree node, let's create a power-mgt node below out already existing via-cuda node instead. This patch is inspired by a patch from Amadeusz Sławiński <amade(a)asmblr.net> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Tue Jun 25 03:55:45 2013 (r1160) +++ trunk/openbios-devel/drivers/cuda.c Tue Jun 25 18:11:57 2013 (r1161) @@ -369,6 +369,20 @@ } +static void +powermgt_init(char *path) +{ + phandle_t ph; + char buf[64]; + + snprintf(buf, sizeof(buf), "%s/power-mgt", path); + REGISTER_NAMED_NODE(rtc, buf); + + ph = find_dev(buf); + set_property(ph, "device_type", "power-mgt", 10); + set_property(ph, "compatible", "power-mgt", 10); +} + cuda_t *cuda_init (const char *path, phys_addr_t base) { cuda_t *cuda; @@ -399,6 +413,7 @@ #endif rtc_init(buf); + powermgt_init(buf); main_cuda = cuda; Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:45 2013 (r1160) +++ trunk/openbios-devel/drivers/macio.c Tue Jun 25 18:11:57 2013 (r1161) @@ -43,34 +43,6 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } -/* XXX this is barely enough to make Mac OS happy, we really should just - emulate an actual PMU and have that behind the mac-io */ -static void -macio_pmu_init(const char *path) -{ - phandle_t dnode; - char buf[128]; - - push_str(path); - fword("find-device"); - fword("new-device"); - push_str("via-pmu"); - fword("device-name"); - fword("finish-device"); - - snprintf(buf, sizeof(buf), "%s/via-pmu", path); - push_str(buf); - fword("find-device"); - fword("new-device"); - push_str("power-mgt"); - fword("device-name"); - - snprintf(buf, sizeof(buf), "%s/via-pmu/power-mgt", path); - dnode = find_dev(buf); - set_property(dnode, "compatible", "via-pmu-99", 11); - fword("finish-device"); -} - void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; @@ -320,6 +292,5 @@ escc_init(path, addr); macio_ide_init(path, addr, 3); openpic_init(path, addr); - macio_pmu_init(path); ob_unin_init(); }

1 0

[commit] r1160 - trunk/openbios-devel/drivers
by repository service 25 Jun '13

25 Jun '13

Author: agraf Date: Tue Jun 25 03:55:45 2013 New Revision: 1160 URL: http://tracker.coreboot.org/trac/openbios/changeset/1160 Log: mac99: Add uni-n and pmu nodes With these device nodes the Mac OS X 10.4 kernel detects our Mac99 machine type. It still hangs shortly after though. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:44 2013 (r1159) +++ trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:45 2013 (r1160) @@ -43,6 +43,34 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } +/* XXX this is barely enough to make Mac OS happy, we really should just + emulate an actual PMU and have that behind the mac-io */ +static void +macio_pmu_init(const char *path) +{ + phandle_t dnode; + char buf[128]; + + push_str(path); + fword("find-device"); + fword("new-device"); + push_str("via-pmu"); + fword("device-name"); + fword("finish-device"); + + snprintf(buf, sizeof(buf), "%s/via-pmu", path); + push_str(buf); + fword("find-device"); + fword("new-device"); + push_str("power-mgt"); + fword("device-name"); + + snprintf(buf, sizeof(buf), "%s/via-pmu/power-mgt", path); + dnode = find_dev(buf); + set_property(dnode, "compatible", "via-pmu-99", 11); + fword("finish-device"); +} + void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; @@ -241,6 +269,28 @@ { "encode-unit", ob_macio_encode_unit }, }; +static void +ob_unin_init(void) +{ + phandle_t dnode; + int props[2]; + + push_str("/"); + fword("find-device"); + fword("new-device"); + push_str("uni-n"); + fword("device-name"); + + dnode = find_dev("/uni-n"); + set_property(dnode, "device_type", "memory-controller", 18); + set_property(dnode, "compatible", "uni-north", 10); + props[0] = __cpu_to_be32(0xf8000000); + props[1] = __cpu_to_be32(0x1000000); + set_property(dnode, "reg", (char *)&props, sizeof(props)); + + fword("finish-device"); +} + void ob_macio_heathrow_init(const char *path, phys_addr_t addr) { @@ -270,4 +320,6 @@ escc_init(path, addr); macio_ide_init(path, addr, 3); openpic_init(path, addr); + macio_pmu_init(path); + ob_unin_init(); }

1 0

[commit] r1159 - trunk/openbios-devel/drivers
by repository service 25 Jun '13

25 Jun '13

Author: agraf Date: Tue Jun 25 03:55:44 2013 New Revision: 1159 URL: http://tracker.coreboot.org/trac/openbios/changeset/1159 Log: g3beige: Enable second ATA port on MacIO The macio on our g3beige (heathrow) machine has 2 ATA links. Enable the second one. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Jun 23 00:32:07 2013 (r1158) +++ trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:44 2013 (r1159) @@ -253,7 +253,7 @@ cuda_init(path, addr); macio_nvram_init(path, addr); escc_init(path, addr); - macio_ide_init(path, addr, 1); + macio_ide_init(path, addr, 2); } void

1 0

Re: [OpenBIOS] [Qemu-ppc] Changing CD-ROM path
by Alexander Graf 24 Jun '13

24 Jun '13

On 22.06.2013, at 19:53, Programmingkid wrote: > > On Jun 22, 2013, at 1:27 PM, Alexander Graf wrote: > >> >> On 22.06.2013, at 18:50, Programmingkid wrote: >> >>> Mac OS 10.2 requires the boot CD-ROM to be located here: /pci/mac-io/ide@1000/@0:9. It is currently located here: /pci@80000000/pci-ata@4/ata-2@500/cdrom@0. How would I go about changing the CD-ROM to this location? I'm looking for a specific file or files to make this change. >> >> This is an OF path, which is up to OpenBIOS to construct. >> >> What makes you think that Mac OS searches at that exact location? >> >> >> Alex >> > > XNU (Mac OS X's kernel) prints this line to the screen: > From path: “ide1/@0:9,\mach_kernel”, Waiting on <dict ID=”0”><key>IOPathMatch</key><string ID=”1”>IODeviceTree:/pci/mac-io/ide@1000/@0:9</string></dict> > > The key IOPathMatch means the location of the cdrom has to be at a certain location. In this case it is /pci/mac-io/ide@1000/@0:9. Yes, but I don't see where Mac OS X has this hardcoded. It gets passed in somehow. What machine type is this? g3beige? On there, I don't see an ide1 alias anywhere: 0 > dev /aliases ok 0 > ls ok 0 > .properties name "aliases" screen "/pci@80000000/mac-io@3/escc/ch-b" mac-io "/pci@80000000/mac-io@3" via-cuda "/pci@80000000/mac-io@3/via-cuda" adb-keyboard "/pci@80000000/mac-io@3/via-cuda/adb/keyboard" adb-mouse "/pci@80000000/mac-io@3/via-cuda/adb/mouse" rtc "/pci@80000000/mac-io@3/via-cuda/rtc" nvram "/pci@80000000/mac-io@3/nvram" ttya "/pci@80000000/mac-io@3/escc/ch-a" scca "/pci@80000000/mac-io@3/escc/ch-a" ttyb "/pci@80000000/mac-io@3/escc/ch-b" sccb "/pci@80000000/mac-io@3/escc/ch-b" ide0 "/pci@80000000/pci-ata@4/ata-2/cdrom" cd "/pci@80000000/pci-ata@4/ata-2/cdrom" cdrom "/pci@80000000/pci-ata@4/ata-2/cdrom" keyboard "/pci@80000000/mac-io@3/via-cuda@16000/adb/keyboard@8" ok Somehow Mac OS resolves "ide1" into "/pci/mac-io/ide@1000". That's the part where the logic fails. Please don't drop the CCs. There's a good reason I added Mark and the OpenBIOS list. This issue is very likely completely QEMU unrelated. Alex > > You say OpenBIOS construct's this path. In the file mac_oldworld.c, around line 280, it looks like it sets the location. Here is the code: > macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO); > dev = DEVICE(macio); > qdev_connect_gpio_out(dev, 0, pic[0x12]); /* CUDA */ > qdev_connect_gpio_out(dev, 1, pic[0x0D]); /* IDE */ > qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE DMA */ > macio_init(macio, pic_mem, escc_bar); > > /* First IDE channel is a MAC IDE on the MacIO bus */ > macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio), > "ide")); > macio_ide_init_drives(macio_ide, hd); > > /* Second IDE channel is a CMD646 on the PCI bus */ > hd[0] = hd[MAX_IDE_DEVS]; > hd[1] = hd[MAX_IDE_DEVS + 1]; > hd[3] = hd[2] = NULL; > pci_cmd646_ide_init(pci_bus, hd, 0); >

5 9

[PATCH 0/4] Switch TCX/VGA drivers from Forth to FCode
by Mark Cave-Ayland 24 Jun '13

24 Jun '13

Note: this patchset should be applied on top of my last display patchset here: http://www.openfirmware.info/pipermail/openbios/2013-June/007753.html. At the moment the IEEE1275 initialisers for TCX/VGA are setup by calling is-install directly; in actual fact what we need to do is convert the drivers over to FCode and execute them during a bus probe. This patchset switches the tcx.fs and vga.fs drivers over to FCode from Forth, includes the FCode binaries as part of the OpenBIOS image, and executes the drivers using byte-load during probe. Currently both drivers are reasonably bare (with most of the work still being done in C), however it is a starting point for moving more functionality into the FCode drivers and makes it possible to implement a "probe-self" word in the near future. This patch shouldn't alter any functionality, but the most significant change is that it does introduce "toke" from the OpenFirmware fcode-utils suite as a mandatory dependency for building OpenBIOS. Mark Cave-Ayland (4): switch-arch: make the fcode-utils tokeniser "toke" mandatory for the build config: add new fcode tag and support for building Fcode into dictionaries SPARC32: switch TCX driver over to FCode x86/SPARC64/PPC/amd64: switch VGA driver over to FCode openbios-devel/Makefile.target | 3 ++ openbios-devel/arch/amd64/build.xml | 1 + openbios-devel/arch/amd64/init.fs | 7 ++++ openbios-devel/arch/ppc/build.xml | 5 +++ openbios-devel/arch/ppc/ppc.fs | 11 ++++++ openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/init.fs | 6 +++ openbios-devel/arch/sparc32/tree.fs | 1 + openbios-devel/arch/sparc64/build.xml | 1 + openbios-devel/arch/sparc64/init.fs | 6 +++ openbios-devel/arch/sparc64/tree.fs | 2 + openbios-devel/arch/x86/build.xml | 1 + openbios-devel/arch/x86/init.fs | 8 ++++ openbios-devel/config/examples/amd64_config.xml | 1 + openbios-devel/config/scripts/switch-arch | 12 ++++++ openbios-devel/config/xml/dictionary.xsl | 40 ++++++++++++++++--- openbios-devel/config/xml/fcode.xsl | 48 +++++++++++++++++++++++ openbios-devel/config/xml/makefile.xsl | 2 + openbios-devel/config/xml/rules.xml | 3 ++ openbios-devel/drivers/build.xml | 5 ++- openbios-devel/drivers/pci.c | 3 +- openbios-devel/drivers/sbus.c | 5 ++- openbios-devel/drivers/tcx.fs | 35 ++++++++++++++++- openbios-devel/drivers/vga.fs | 35 ++++++++++++++++- 24 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 openbios-devel/config/xml/fcode.xsl -- 1.7.10.4

1 4

[commit] r1158 - in trunk/openbios-devel: arch/ppc/qemu include/arch/common
by repository service 22 Jun '13

22 Jun '13

Author: agraf Date: Sun Jun 23 00:32:07 2013 New Revision: 1158 URL: http://tracker.coreboot.org/trac/openbios/changeset/1158 Log: fwcfg: Rename CPUFREQ to CLOCKFREQ The CPUFREQ fwcfg variable was a misnomer that never got into QEMU in that form. What we really implemented was a variable that exposes the "clock-frequency" property, so name it accordingly. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/include/arch/common/fw_cfg.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 23 00:30:31 2013 (r1157) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 23 00:32:07 2013 (r1158) @@ -263,7 +263,7 @@ push_str("timebase-frequency"); fword("property"); - PUSH(fw_cfg_read_i32(FW_CFG_PPC_CPUFREQ)); + PUSH(fw_cfg_read_i32(FW_CFG_PPC_CLOCKFREQ)); fword("encode-int"); push_str("clock-frequency"); fword("property"); Modified: trunk/openbios-devel/include/arch/common/fw_cfg.h ============================================================================== --- trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Jun 23 00:30:31 2013 (r1157) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Jun 23 00:32:07 2013 (r1158) @@ -40,7 +40,7 @@ #define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) #define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) #define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) -#define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04) #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05) #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06) #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)

1 0

[commit] r1157 - trunk/openbios-devel/arch/unix
by repository service 22 Jun '13

22 Jun '13

Author: agraf Date: Sun Jun 23 00:30:31 2013 New Revision: 1157 URL: http://tracker.coreboot.org/trac/openbios/changeset/1157 Log: Unix build: Add is_machine helpers When building the unix target on PPC, our #ifdef'ery thinks we can properly use the is_machine helpers and act accordingly to implement hacks. Expose these helpers in the unix target as well, just always define them as false. That way we safe compilation without adding too much logic to deal with unimportant corner cases. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/unix/unix.c Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Jun 9 14:25:46 2013 (r1156) +++ trunk/openbios-devel/arch/unix/unix.c Sun Jun 23 00:30:31 2013 (r1157) @@ -82,6 +82,26 @@ } #endif +#ifdef CONFIG_PPC +/* Expose system level is_machine helpers to make generic code easier */ + +#include "drivers/drivers.h" +int is_apple(void) +{ + return 0; +} + +int is_oldworld(void) +{ + return 0; +} + +int is_newworld(void) +{ + return 0; +} +#endif + #if 0 static void write_dictionary(char *filename) {

1 0

Re: [OpenBIOS] [Qemu-ppc] Changing CD-ROM path
by Alexander Graf 22 Jun '13

22 Jun '13

On 22.06.2013, at 18:50, Programmingkid wrote: > Mac OS 10.2 requires the boot CD-ROM to be located here: /pci/mac-io/ide@1000/@0:9. It is currently located here: /pci@80000000/pci-ata@4/ata-2@500/cdrom@0. How would I go about changing the CD-ROM to this location? I'm looking for a specific file or files to make this change. This is an OF path, which is up to OpenBIOS to construct. What makes you think that Mac OS searches at that exact location? Alex

1 0

[PATCHv2 00/20] Switch to standards-compliant Forth console from C console
by Mark Cave-Ayland 22 Jun '13

22 Jun '13

As mentioned previously on-list, OpenBIOS currently contains two consoles - a C based console and a Forth based console. The Forth based console is currently broken, but is more feature complete than the C console, whilst also being more portable across different architectures. This patchset performs the following functions: - Fix various bugs in the Forth console - Optimise performance using low-level C graphics routines - Add simple IEEE1275-like initialisers for TCX and VGA graphics - Switch TCX and VGA drivers over to use the new console using the standard is-install word Once this patchset is committed, a further patchset will follow to remove all of the duplicate C console code, remove packages/video.c and unify the console input/routines into libopenbios. Changes since v1: - Rebase onto SVN trunk - Various minor bugfixes/tidy-ups - Fix CSI n;mH and CSI n;mf as reported by Blue Swirl - Implementation of remaining missing fb8-* defer words: fb8-insert-lines fb8-insert-characters fb8-delete-characters Mark Cave-Ayland (20): display.fs: Fix up default-font word. display.fs: Fix fb8-delete-lines within the inbuilt Forth terminal emulator. terminal.fs: Fix linefeeds on the bottom line of the Forth console. terminal.fs: Fix backspace sequence in Forth terminal. video: Create new video_common.c file for shared video primitive routines. video_common.c: Move primitive graphic operations into libopenbios/video_common.c. pci: Modify PCI display devices so that open and close words are not created automatically during initialisation. video: Create tcx.fs and vga.fs to simulate Fcode video initialisation code. display.fs: pass the colour depth and line bytes to the Forth terminal routines. video_common.c: create low-level video_mask_blit() function. video_common.c: create low-level video_invert_rect() function. display.fs: Fix fb8 routines to work with bit depths > 8. video_common.c: create low-level video_fill_rect() function. display.fs: optimise scrolling by copying/deleting multiple scanlines at once. display.fs: Add vertical font-spacing as per the existing C console implementation. terminal.fs: handle all cursor positioning within the terminal package. terminal.fs: Fix CSI n;mH and CSI n;mf control sequences. display.fs: add implementation of fb8-insert-lines. display.fs: add implementation of fb8-insert-characters and fb8-delete-characters. video: switch VGA and TCX drivers over to Forth console using is-install. openbios-devel/arch/sparc32/console.c | 12 - openbios-devel/arch/sparc32/openbios.c | 2 +- openbios-devel/drivers/build.xml | 2 + openbios-devel/drivers/pci.c | 14 +- openbios-devel/drivers/pci.h | 1 + openbios-devel/drivers/sbus.c | 2 + openbios-devel/drivers/tcx.fs | 13 + openbios-devel/drivers/vga.fs | 13 + openbios-devel/drivers/vga_vbe.c | 2 +- openbios-devel/forth/device/display.fs | 228 +++++++------- openbios-devel/forth/device/font.fs | 4 + openbios-devel/forth/device/terminal.fs | 67 +++- openbios-devel/include/libopenbios/video.h | 24 ++ openbios-devel/include/packages/video.h | 6 +- openbios-devel/libopenbios/build.xml | 1 + openbios-devel/libopenbios/console_common.c | 1 + openbios-devel/libopenbios/video_common.c | 446 +++++++++++++++++++++++++++ openbios-devel/packages/video.c | 279 +---------------- 18 files changed, 700 insertions(+), 417 deletions(-) create mode 100644 openbios-devel/drivers/tcx.fs create mode 100644 openbios-devel/drivers/vga.fs create mode 100644 openbios-devel/include/libopenbios/video.h create mode 100644 openbios-devel/libopenbios/video_common.c -- 1.7.10.4

3 25