[PATCH 0/6] Mac OS 9 boot fixes
by Cormac O'Brien
These patches fix a number of issues that hindered the Mac OS 9 boot process.
Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com>
Cormac O'Brien (6):
bootinfo_load: recognize ASCII EOT as end of bootinfo
ppc: add Adler-32 checksum capability
ppc: add ROM node to device tree
ppc: fix stack usage in mmu_claim, mem_claim
ppc: add CPU reservation-granule-size property
ppc: add Apple copyright injection to adler32
arch/ppc/qemu/init.c | 62 +++++++++++++++++++++++++++++++++++++++++++++
arch/ppc/qemu/methods.c | 34 ++++++++++++-------------
arch/ppc/qemu/qemu.fs | 28 ++++++++++++++++++++
arch/ppc/qemu/tree.fs | 8 ++++++
libopenbios/bootinfo_load.c | 10 ++++++++
5 files changed, 125 insertions(+), 17 deletions(-)
--
2.4.4
3 years, 7 months
- 3
- 10
[commit] r1346 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sun Jun 21 20:52:51 2015
New Revision: 1346
URL: http://tracker.coreboot.org/trac/openbios/changeset/1346
Log:
ppc: add Apple copyright injection to adler32
Since Mac OS 9 and BootX are the only known users of the adler32 word, we use
the word to add an Apple copyright message to the device tree in order to
allow OS 9 to boot.
Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/ppc/qemu/init.c
trunk/openbios-devel/arch/ppc/qemu/qemu.fs
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 21 20:52:47 2015 (r1345)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 21 20:52:51 2015 (r1346)
@@ -1006,7 +1006,7 @@
bind_func("filll", ffilll);
/* Implementation of adler32 word (required by OS 9, BootX) */
- bind_func("adler32", adler32);
+ bind_func("(adler32)", adler32);
bind_func("platform-boot", boot);
bind_func("(go)", go);
Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sun Jun 21 20:52:47 2015 (r1345)
+++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sun Jun 21 20:52:51 2015 (r1346)
@@ -93,3 +93,31 @@
:noname
set-defaults
; PREPOST-initializer
+
+\ -------------------------------------------------------------------------
+\ 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.
+ " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY"
+ encode-string " copyright"
+ " /" find-package if
+ " set-property" $find if
+ execute
+ else
+ 3drop drop
+ then
+ then
+
+ ( adler buf len )
+
+ " (adler32)" $find if
+ execute
+ else
+ ." Can't find " ( adler32-name ) type cr
+ 3drop 0
+ then
+;
3 years, 7 months
- 1
- 0
[commit] r1345 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sun Jun 21 20:52:47 2015
New Revision: 1345
URL: http://tracker.coreboot.org/trac/openbios/changeset/1345
Log:
ppc: add CPU reservation-granule-size property
This patch adds the 'reservation-granule-size' property to the CPU node, as is
required by Mac OS 9.
Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/ppc/qemu/init.c
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 21 20:52:44 2015 (r1344)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 21 20:52:47 2015 (r1345)
@@ -302,6 +302,11 @@
fword("encode-string");
push_str("state");
fword("property");
+
+ PUSH(0x20);
+ fword("encode-int");
+ push_str("reservation-granule-size");
+ fword("property");
}
static void
3 years, 7 months
- 1
- 0
[commit] r1344 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sun Jun 21 20:52:44 2015
New Revision: 1344
URL: http://tracker.coreboot.org/trac/openbios/changeset/1344
Log:
ppc: fix stack usage in mmu_claim, mem_claim
The 'phys' argument to mem_claim() and 'virt' argument to mmu_claim() are now
only popped from the stack if the 'align' argument is provided. Exception
throws have been removed to simplify crossing C <-> Forth boundaries and to
maintain consistency with other architectures.
This patch also fixes two stack diagrams with 'phys' arguments instead of
'virt' ones.
Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/ppc/qemu/methods.c
Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Jun 21 20:52:42 2015 (r1343)
+++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Jun 21 20:52:44 2015 (r1344)
@@ -164,21 +164,21 @@
DECLARE_NODE( mmu_ciface, 0, 0, "+/openprom/client-services" );
-/* ( phys size align --- base ) */
+/* ( [phys] size align --- base ) */
static void
mem_claim( void )
{
ucell align = POP();
ucell size = POP();
- ucell phys = POP();
- ucell ret = ofmem_claim_phys( phys, size, align );
+ phys_addr_t phys = -1;
- if( ret == -1 ) {
- printk("MEM: claim failure\n");
- throw( -13 );
- return;
+ if (!align) {
+ phys = POP();
}
- PUSH( ret );
+
+ phys = ofmem_claim_phys(phys, size, align);
+
+ PUSH(phys);
}
/* ( phys size --- ) */
@@ -188,24 +188,24 @@
POP(); POP();
}
-/* ( phys size align --- base ) */
+/* ( [virt] size align --- base ) */
static void
mmu_claim( void )
{
ucell align = POP();
ucell size = POP();
- ucell phys = POP();
- ucell ret = ofmem_claim_virt( phys, size, align );
+ ucell virt = -1;
- if( ret == -1 ) {
- printk("MMU: CLAIM failure\n");
- throw( -13 );
- return;
+ if (!align) {
+ virt = POP();
}
- PUSH( ret );
+
+ virt = ofmem_claim_virt(virt, size, align);
+
+ PUSH(virt);
}
-/* ( phys size --- ) */
+/* ( virt size --- ) */
static void
mmu_release( void )
{
3 years, 7 months
- 1
- 0
[commit] r1343 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sun Jun 21 20:52:42 2015
New Revision: 1343
URL: http://tracker.coreboot.org/trac/openbios/changeset/1343
Log:
ppc: add ROM node to device tree
This patch adds a ROM node to the PPC device tree as is required by Mac OS 9.
Based on a patch by John Arbuckle <programmingkidx(a)gmail.com>
Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/ppc/qemu/tree.fs
Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sun Jun 21 20:52:38 2015 (r1342)
+++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Sun Jun 21 20:52:42 2015 (r1343)
@@ -42,6 +42,14 @@
: close ;
finish-device
+new-device
+ " rom" device-name
+ h# ff800000 encode-int 0 encode-int encode+ " reg" property
+ 1 encode-int " #address-cells" property
+ h# ff800000 encode-int h# 800000 encode-int encode+
+ h# ff800000 encode-int encode+ " ranges" property
+finish-device
+
\ -------------------------------------------------------------
\ /packages
\ -------------------------------------------------------------
3 years, 7 months
- 1
- 0
[commit] r1342 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sun Jun 21 20:52:38 2015
New Revision: 1342
URL: http://tracker.coreboot.org/trac/openbios/changeset/1342
Log:
ppc: add Adler-32 checksum capability
This patch provides an implementation of the adler32 Forth word as required by
Mac OS 9 and BootX.
Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/ppc/qemu/init.c
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 21 20:52:35 2015 (r1341)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 21 20:52:38 2015 (r1342)
@@ -680,6 +680,60 @@
}
}
+/*
+ * adler32 ( adler buf len -- checksum )
+ *
+ * Adapted from Mark Adler's original implementation (zlib license)
+ *
+ * Both OS 9 and BootX require this word for payload validation.
+ */
+
+#define DO1(buf,i) {s1 += buf[i]; s2 += s1;}
+#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf) DO8(buf,0); DO8(buf,8);
+
+static void adler32(void)
+{
+ uint32_t len = (uint32_t)POP();
+ char *buf = (char *)POP();
+ uint32_t adler = (uint32_t)POP();
+
+ if (buf == NULL) {
+ RET(-1);
+ }
+
+ uint32_t base = 65521;
+ uint32_t nmax = 5552;
+
+ uint32_t s1 = adler & 0xffff;
+ uint32_t s2 = (adler >> 16) & 0xffff;
+
+ uint32_t k;
+ while (len > 0) {
+ k = (len < nmax ? len : nmax);
+ len -= k;
+
+ while (k >= 16) {
+ DO16(buf);
+ buf += 16;
+ k -= 16;
+ }
+ if (k != 0) {
+ do {
+ s1 += *buf++;
+ s2 += s1;
+ } while (--k);
+ }
+
+ s1 %= base;
+ s2 %= base;
+ }
+
+ RET(s2 << 16 | s1);
+}
+
void
arch_of_init(void)
{
@@ -945,6 +999,9 @@
/* Implementation of filll word (required by BootX) */
bind_func("filll", ffilll);
+
+ /* Implementation of adler32 word (required by OS 9, BootX) */
+ bind_func("adler32", adler32);
bind_func("platform-boot", boot);
bind_func("(go)", go);
3 years, 7 months
- 1
- 0
[commit] r1341 - trunk/openbios-devel/libopenbios
by repository service
Author: mcayland
Date: Sun Jun 21 20:52:35 2015
New Revision: 1341
URL: http://tracker.coreboot.org/trac/openbios/changeset/1341
Log:
bootinfo_load.c: stop parsing CHRP boot script when NULL is reached
The Mac OS 9 CHRP boot script consists of a null-terminated Forth string
followed by a large binary payload. Make sure we correctly determine the size
of the bootscript at this point instead of trying to allocate memory for the
entire binary blob which fails due to insufficient memory.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/libopenbios/bootinfo_load.c
Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c
==============================================================================
--- trunk/openbios-devel/libopenbios/bootinfo_load.c Wed May 13 01:11:05 2015 (r1340)
+++ trunk/openbios-devel/libopenbios/bootinfo_load.c Sun Jun 21 20:52:35 2015 (r1341)
@@ -161,6 +161,12 @@
feval("load-size");
size = POP();
+ /* Some bootinfo scripts contain a binary payload after the
+ NULL-terminated Forth string such as OS 9. Restrict our
+ size to just the Forth section, otherwise we end up trying
+ to allocate memory for the entire binary which might fail. */
+ size = strnlen(base, size);
+
bootscript = malloc(size);
if (bootscript == NULL) {
DPRINTF("Can't malloc %d bytes\n", size);
3 years, 7 months
- 1
- 0
[PATCH] interpreter.fs: allow evaluate to split words on CR as well as LF
by Mark Cave-Ayland
Otherwise the Forth intepreter fails due to lack of buffer space when
trying to execute large boot scripts on platforms that use CR instead
of LF for line endings (particularly MacOS 9).
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
openbios-devel/forth/bootstrap/interpreter.fs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openbios-devel/forth/bootstrap/interpreter.fs b/openbios-devel/forth/bootstrap/interpreter.fs
index 5187058..74a109f 100644
--- a/openbios-devel/forth/bootstrap/interpreter.fs
+++ b/openbios-devel/forth/bootstrap/interpreter.fs
@@ -163,7 +163,7 @@ defer outer-interpreter
: evaluate ( str len -- ?? )
2dup + -rot
over + over do
- i c@ 0a = if
+ i c@ dup 0a = swap 0d = or if
i over -
(evaluate)
i 1+
--
1.7.10.4
3 years, 7 months
- 2
- 6
[PATCHv2] bootinfo_load.c: stop parsing CHRP boot script when NULL is reached
by Mark Cave-Ayland
The Mac OS 9 CHRP boot script consists of a null-terminated Forth string
followed by a large binary payload. Make sure we correctly determine the size
of the bootscript at this point instead of trying to allocate memory for the
entire binary blob which fails due to insufficient memory.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
openbios-devel/libopenbios/bootinfo_load.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/openbios-devel/libopenbios/bootinfo_load.c b/openbios-devel/libopenbios/bootinfo_load.c
index fa9e36b..e9b0739 100644
--- a/openbios-devel/libopenbios/bootinfo_load.c
+++ b/openbios-devel/libopenbios/bootinfo_load.c
@@ -161,6 +161,12 @@ bootinfo_init_program(void)
feval("load-size");
size = POP();
+ /* Some bootinfo scripts contain a binary payload after the
+ NULL-terminated Forth string such as OS 9. Restrict our
+ size to just the Forth section, otherwise we end up trying
+ to allocate memory for the entire binary which will fail. */
+ size = strnlen(base, size);
+
bootscript = malloc(size);
if (bootscript == NULL) {
DPRINTF("Can't malloc %d bytes\n", size);
--
1.7.10.4
3 years, 7 months
- 1
- 0
[PATCH] bootinfo_load.c: stop parsing CHRP boot script when NULL is reached
by Mark Cave-Ayland
The Mac OS 9 CHRP boot script consists of a null-terminated Forth string
followed by a large binary payload. Make sure we correctly determine the size
of the bootscript at this point instead of trying to allocate memory for the
entire binary blob which fails due to insufficient memory.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
openbios-devel/libopenbios/bootinfo_load.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/openbios-devel/libopenbios/bootinfo_load.c b/openbios-devel/libopenbios/bootinfo_load.c
index fa9e36b..c70203e 100644
--- a/openbios-devel/libopenbios/bootinfo_load.c
+++ b/openbios-devel/libopenbios/bootinfo_load.c
@@ -161,6 +161,12 @@ bootinfo_init_program(void)
feval("load-size");
size = POP();
+ /* Some bootinfo scripts contain a binary payload after the
+ NULL-terminated Forth string such as OS 9. Restrict our
+ size to just the Forth section, otherwise we end up trying
+ to allocate memory for the entire binary which will fail. */
+ size = MIN(strlen(base), size);
+
bootscript = malloc(size);
if (bootscript == NULL) {
DPRINTF("Can't malloc %d bytes\n", size);
--
1.7.10.4
3 years, 7 months
- 2
- 2