OpenBIOS February 2016

openbios@openbios.org

11 participants
39 discussions

[commit] r1382 - trunk/openbios-devel/arch/ppc/qemu
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:14 2016 New Revision: 1382 URL: http://tracker.coreboot.org/trac/openbios/changeset/1382 Log: ppc: use ROT13 encoding for copyright property Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:11 2016 (r1381) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:14 2016 (r1382) @@ -100,8 +100,8 @@ : insert-copyright-property \ As required for MacOS 9 and below - " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY" - encode-string " copyright" + " Pbclevtug 1983-2001 Nccyr Pbzchgre, Vap. GUVF ZRFFNTR SBE PBZCNGVOVYVGL BAYL" + rot13-str encode-string " copyright" " /" find-package if " set-property" $find if execute

1 0

[commit] r1381 - trunk/openbios-devel/arch/ppc/qemu
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:11 2016 New Revision: 1381 URL: http://tracker.coreboot.org/trac/openbios/changeset/1381 Log: ppc: move copyright property generation into a separate word Separate this out rather than keeping it as part of adler32. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:09 2016 (r1380) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:11 2016 (r1381) @@ -95,13 +95,11 @@ ; PREPOST-initializer \ ------------------------------------------------------------------------- -\ Adler-32 wrapper +\ copyright property handling \ ------------------------------------------------------------------------- -: adler32 ( adler buf len -- checksum ) - \ Since Mac OS 9 is the only system using this word, we take this - \ opportunity to inject a copyright message that is necessary for the - \ system to boot. +: insert-copyright-property + \ As required for MacOS 9 and below " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY" encode-string " copyright" " /" find-package if @@ -111,6 +109,17 @@ 3drop drop then then +; + +\ ------------------------------------------------------------------------- +\ Adler-32 wrapper +\ ------------------------------------------------------------------------- + +: adler32 ( adler buf len -- checksum ) + \ Since Mac OS 9 is the only system using this word, we take this + \ opportunity to inject a copyright message that is necessary for the + \ system to boot. + insert-copyright-property ( adler buf len )

1 0

[commit] r1380 - trunk/openbios-devel/forth/lib
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:09 2016 New Revision: 1380 URL: http://tracker.coreboot.org/trac/openbios/changeset/1380 Log: string.fs: add functions to support ROT13 string encoding/decoding Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/lib/string.fs Modified: trunk/openbios-devel/forth/lib/string.fs ============================================================================== --- trunk/openbios-devel/forth/lib/string.fs Sat Feb 13 14:34:31 2016 (r1379) +++ trunk/openbios-devel/forth/lib/string.fs Sat Feb 20 14:22:09 2016 (r1380) @@ -125,3 +125,17 @@ : parse-hex ( str len -- value ) base @ hex -rot $number if 0 then swap base ! ; + + +\ ----------------------------------------------------- +\ miscellaneous functions +\ ----------------------------------------------------- + +: rot13 ( c - c ) + dup upc [char] A [char] M between if d# 13 + exit then + dup upc [char] N [char] Z between if d# 13 - then +; + +: rot13-str ( str len -- newstr len ) + strdup 2dup bounds ?do i c@ rot13 i c! loop +;

1 0

[PATCHv2 0/6] ppc: improve copyright property handling
by Mark Cave-Ayland 14 Feb '16

14 Feb '16

This series changes the injection of the copyright property on PPC such that it is included just before control is handed to the client. The motivation behind this is that older versions of the MacOS bootloader don't call the adler32 word which means the injection is omitted and boot fails. The property is only inserted if a MacOS boot loader is detected and is removed if the bootloader terminates, thereby only making it visible to MacOS clients. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Updated Forth suggested by Segher - Update messages/comments as suggested by Alyssa - Only insert copyright property if MacOS bootloader detected Mark Cave-Ayland (6): string.fs: add functions to support ROT13 string encoding/decoding ppc: move copyright property generation into a separate word ppc: use ROT13 encoding for copyright property ciface.fs: implement optional (exit) hook when returning control back to the interpreter ppc: add complementary delete-copyright-property word ppc: move copyright property hooks from adler32 word openbios-devel/arch/ppc/qemu/init.c | 5 +++++ openbios-devel/arch/ppc/qemu/qemu.fs | 33 +++++++++++++++++++++++++-------- openbios-devel/forth/lib/string.fs | 19 +++++++++++++++++++ openbios-devel/forth/system/ciface.fs | 8 ++++++++ 4 files changed, 57 insertions(+), 8 deletions(-) -- 1.7.10.4

4 17

[PATCH] ppc: fix reuse of MMU translation slots
by Alyssa Milburn 14 Feb '16

14 Feb '16

The current code always picks slot 0 in the reuse case. (This doesn't seem to matter in the cases I've tested, though.) Signed-off-by: Alyssa Milburn <fuzzie(a)fuzzie.org> --- arch/ppc/qemu/ofmem.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 6f346a3..c9fe154 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -359,9 +359,11 @@ hash_page_64(unsigned long ea, phys_addr_t phys, ucell mode) found = 1; /* otherwise use a free slot */ - for (i = 0; !found && i < 8; i++) - if (!pp[i].v) - found = 1; + if (!found) { + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + } /* out of slots, just evict one */ if (!found) @@ -414,9 +416,11 @@ hash_page_32(unsigned long ea, phys_addr_t phys, ucell mode) found = 1; /* otherwise use a free slot */ - for (i = 0; !found && i < 8; i++) - if (!pp[i].v) - found = 1; + if (!found) { + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + } /* out of slots, just evict one */ if (!found) -- 2.1.0

3 3

[PATCH 0/7] ppc: improve fake copyright message handling
by Mark Cave-Ayland 13 Feb '16

13 Feb '16

This series changes the injection of the fake copyright message such that it is included just before control is handled to the client. The motivation behind this is that older versions of the MacOS bootloader don't call the adler32 word which means the injection is omitted and boot fails. The first patch is actually a build fix (and will likely be applied separately) while the rest of the patchset ensures that the message is only visible to the bootloader client as discussed on the mailing list. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (7): pci.c: fix build for non-SPARC/PPC platforms string.fs: add functions to support ROT13 string encoding/decoding ppc: move fake copyright notice generation into a separate word ppc: use ROT13 encoding for fake copyright message ciface.fs: implement optional (exit) hook when returning control back to the interpreter ppc: add complimentary delete-fake-copyright word ppc: move fake copyright hooks from adler32 word openbios-devel/arch/ppc/qemu/init.c | 3 +++ openbios-devel/arch/ppc/qemu/qemu.fs | 33 +++++++++++++++++++++++++-------- openbios-devel/drivers/pci.c | 9 +++++---- openbios-devel/forth/lib/string.fs | 28 ++++++++++++++++++++++++++++ openbios-devel/forth/system/ciface.fs | 8 ++++++++ 5 files changed, 69 insertions(+), 12 deletions(-) -- 1.7.10.4

6 23

[commit] r1379 - trunk/openbios-devel/drivers
by repository service 13 Feb '16

13 Feb '16

Author: mcayland Date: Sat Feb 13 14:34:31 2016 New Revision: 1379 URL: http://tracker.coreboot.org/trac/openbios/changeset/1379 Log: pci.c: fix build for non-SPARC/PPC platforms Commit r1377 accidentally broke compilation with -Werror for platforms without a default PCI interrupt implementation. Supply a suitable (empty) stub in order to keep the compiler quiet. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Wed Feb 3 21:46:31 2016 (r1378) +++ trunk/openbios-devel/drivers/pci.c Sat Feb 13 14:34:31 2016 (r1379) @@ -1500,19 +1500,20 @@ /* Device address is in 1st 32-bit word of encoded PCI address for config space */ if ((addr & PCI_RANGE_TYPE_MASK) == PCI_RANGE_CONFIG) { -#ifdef CONFIG_SPARC64 +#if defined(CONFIG_SPARC64) ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); props[ncells++] = intno; props[ncells++] = dnode; props[ncells++] = SUN4U_INTERRUPT(addr, intno); -#endif - -#ifdef CONFIG_PPC +#elif defined(CONFIG_PPC) ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); props[ncells++] = intno; props[ncells++] = dnode; props[ncells++] = arch->irqs[intno - 1]; props[ncells++] = 3; +#else + /* Keep compiler quiet */ + dnode = dnode; #endif } }

1 0

[PATCH] drivers/escc.c: Add slot-names property ch-a node under escc
by Programmingkid 12 Feb '16

12 Feb '16

Mac OS X's AppleSCCSerial kernel extension requires the slot-names property in order to use any serial ports. This patch adds the property. After this patch is applied, the next thing that stops Mac OS X from using the serial port is something having to do with DMA. http://www.opensource.apple.com/source/AppleSCCSerial/AppleSCCSerial-126.4.… In this file the setPortName() function is what does the searching for slot-names. Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 1378) +++ drivers/escc.c (working copy) @@ -456,6 +456,11 @@ NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 3 * sizeof(cell))); + /* The four numbers in front of Modem are needed for AppleSCCSerial + kernel extension compatibility. */ + char *names = "0001Modem"; + NEWWORLD(set_property(dnode, "slot-names", names, strlen(names) + 1)); + device_end(); if (legacy) {

6 20

[PATCH v2] drivers/escc.c: Add slot-names property to ch-a and ch-b nodes under escc node
by Programmingkid 11 Feb '16

11 Feb '16

subject: [PATCH v2] drivers/escc.c: Add slot-names property ch-a node under escc The escc node's ch-a node needs a slot-names property in order to satisfy the Mac OS X driver's requirements. This patch adds the slot-names property to the escc/ch-a node. The ch-b node will have a slot-names property set to 0. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Changes from last patch: Replaced C code with Forth code. Replaced 0001 string with integer 1 value. Have the ch-b node's property set to just 0 to mirror what real hardware would have. Notes: It does look like Mac OS 9 needs a working ESCC in order to run. For an experiment I set the ch-a node's slot-names property to 0 just see what would happen. Mac OS 9 crashed at the same place as usual. Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 1378) +++ drivers/escc.c (working copy) @@ -456,6 +456,22 @@ NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 3 * sizeof(cell))); + if(strcmp(node, "a") == 0) { /* ch-a */ + /* Setup the slot-names property - used by Mac OS */ + fword("1"); /* Bitmask of available slots */ + fword("encode-int"); + push_str("Modem"); /* One name is given to each available slot */ + fword("encode-string"); + fword("encode+"); + push_str("slot-names"); + fword("property"); + } else { /* ch-b */ + fword("0"); /* Bitmask of available slots */ + fword("encode-int"); + push_str("slot-names"); + fword("property"); + } + device_end(); if (legacy) {

1 0

Re: [OpenBIOS] [PATCH] ppc: fix ESCC reg properties
by Howard Spoelstra 08 Feb '16

08 Feb '16

Those are tty.serial and tty.printer

2 1