[commit] r1387 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Thu Feb 25 23:59:56 2016
New Revision: 1387
URL: http://tracker.coreboot.org/trac/openbios/changeset/1387
Log:
ppc: fix ESCC reg properties
I/O offsets were wrong in legacy mode and some were missing in non-legacy mode.
This fixes serial port detection in NetBSD, which was ignoring it.
This also partly fixes MacOS 9.2, which relies on them to initialize OpenTransport.
Based upon an original patch from Hervé Poussineau <hpoussin(a)reactos.org>.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/drivers/escc.c
Modified: trunk/openbios-devel/drivers/escc.c
==============================================================================
--- trunk/openbios-devel/drivers/escc.c Thu Feb 25 23:59:53 2016 (r1386)
+++ trunk/openbios-devel/drivers/escc.c Thu Feb 25 23:59:56 2016 (r1387)
@@ -388,7 +388,20 @@
cell props[10];
int index;
int legacy;
-
+ int reg_offsets[2][2][3] = {
+ {
+ /* ch-b */
+ { 0x00, 0x10, 0x40 },
+ /* ch-a */
+ { 0x20, 0x30, 0x50 }
+ },{
+ /* legacy ch-b */
+ { 0x0, 0x2, 0x8 },
+ /* legacy ch-a */
+ { 0x4, 0x6, 0xa }
+ }
+ };
+
switch (esnum) {
case 2: index = 1; legacy = 0; break;
case 3: index = 0; legacy = 0; break;
@@ -425,17 +438,21 @@
set_property(dnode, "compatible", buf, 9);
if (legacy) {
- props[0] = IO_ESCC_LEGACY_OFFSET + index * 0x4;
- props[1] = 0x00000001;
- props[2] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 2;
- props[3] = 0x00000001;
- props[4] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 6;
- props[5] = 0x00000001;
+ props[0] = IO_ESCC_LEGACY_OFFSET + reg_offsets[legacy][index][0];
+ props[1] = 0x1;
+ props[2] = IO_ESCC_LEGACY_OFFSET + reg_offsets[legacy][index][1];
+ props[3] = 0x1;
+ props[4] = IO_ESCC_LEGACY_OFFSET + reg_offsets[legacy][index][2];
+ props[5] = 0x1;
set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell));
} else {
- props[0] = IO_ESCC_OFFSET + index * 0x20;
- props[1] = 0x00000020;
- set_property(dnode, "reg", (char *)&props, 2 * sizeof(cell));
+ props[0] = IO_ESCC_OFFSET + reg_offsets[legacy][index][0];
+ props[1] = 0x1;
+ props[2] = IO_ESCC_OFFSET + reg_offsets[legacy][index][1];
+ props[3] = 0x1;
+ props[4] = IO_ESCC_OFFSET + reg_offsets[legacy][index][2];
+ props[5] = 0x1;
+ set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell));
}
if (legacy) {
@@ -446,13 +463,13 @@
OLDWORLD(set_property(dnode, "AAPL,address",
(char *)&props, 1 * sizeof(cell)));
- props[0] = 0x00000010 - index;
+ props[0] = 0x10 - index;
OLDWORLD(set_property(dnode, "AAPL,interrupts",
(char *)&props, 1 * sizeof(cell)));
props[0] = (0x24) + index;
- props[1] = 0;
- props[2] = 0;
+ props[1] = 0x0;
+ props[2] = 0x0;
NEWWORLD(set_property(dnode, "interrupts",
(char *)&props, 3 * sizeof(cell)));
4 years, 3 months
- 1
- 0
[commit] r1386 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Thu Feb 25 23:59:53 2016
New Revision: 1386
URL: http://tracker.coreboot.org/trac/openbios/changeset/1386
Log:
escc.c: rename offset to index
This better describes the variable since it contains a reference to the
channel rather than an offset.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/drivers/escc.c
Modified: trunk/openbios-devel/drivers/escc.c
==============================================================================
--- trunk/openbios-devel/drivers/escc.c Sat Feb 20 14:22:24 2016 (r1385)
+++ trunk/openbios-devel/drivers/escc.c Thu Feb 25 23:59:53 2016 (r1386)
@@ -386,15 +386,15 @@
phandle_t dnode, aliases;
cell props[10];
- int offset;
+ int index;
int legacy;
switch (esnum) {
- case 2: offset = 1; legacy = 0; break;
- case 3: offset = 0; legacy = 0; break;
- case 4: offset = 1; legacy = 1; break;
- case 5: offset = 0; legacy = 1; break;
- default: return;
+ case 2: index = 1; legacy = 0; break;
+ case 3: index = 0; legacy = 0; break;
+ case 4: index = 1; legacy = 1; break;
+ case 5: index = 0; legacy = 1; break;
+ default: return;
}
/* add device */
@@ -425,32 +425,32 @@
set_property(dnode, "compatible", buf, 9);
if (legacy) {
- props[0] = IO_ESCC_LEGACY_OFFSET + offset * 0x4;
+ props[0] = IO_ESCC_LEGACY_OFFSET + index * 0x4;
props[1] = 0x00000001;
- props[2] = IO_ESCC_LEGACY_OFFSET + offset * 0x4 + 2;
+ props[2] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 2;
props[3] = 0x00000001;
- props[4] = IO_ESCC_LEGACY_OFFSET + offset * 0x4 + 6;
+ props[4] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 6;
props[5] = 0x00000001;
set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell));
} else {
- props[0] = IO_ESCC_OFFSET + offset * 0x20;
+ props[0] = IO_ESCC_OFFSET + index * 0x20;
props[1] = 0x00000020;
set_property(dnode, "reg", (char *)&props, 2 * sizeof(cell));
}
if (legacy) {
- props[0] = addr + IO_ESCC_LEGACY_OFFSET + offset * 0x4;
+ props[0] = addr + IO_ESCC_LEGACY_OFFSET + index * 0x4;
} else {
- props[0] = addr + IO_ESCC_OFFSET + offset * 0x20;
+ props[0] = addr + IO_ESCC_OFFSET + index * 0x20;
}
OLDWORLD(set_property(dnode, "AAPL,address",
(char *)&props, 1 * sizeof(cell)));
- props[0] = 0x00000010 - offset;
+ props[0] = 0x00000010 - index;
OLDWORLD(set_property(dnode, "AAPL,interrupts",
(char *)&props, 1 * sizeof(cell)));
- props[0] = (0x24) + offset;
+ props[0] = (0x24) + index;
props[1] = 0;
props[2] = 0;
NEWWORLD(set_property(dnode, "interrupts",
@@ -460,11 +460,11 @@
if (legacy) {
uart_init_line(
- (unsigned char*)addr + IO_ESCC_LEGACY_OFFSET + offset * 0x4,
+ (unsigned char*)addr + IO_ESCC_LEGACY_OFFSET + index * 0x4,
CONFIG_SERIAL_SPEED);
} else {
uart_init_line(
- (unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20,
+ (unsigned char*)addr + IO_ESCC_OFFSET + index * 0x20,
CONFIG_SERIAL_SPEED);
}
}
4 years, 3 months
- 1
- 0
Re: [OpenBIOS] Has anyone figured out how to invoke Macsbug from the cocoa gui?
by Programmingkid
On Feb 25, 2016, at 5:39 PM, Mark Cave-Ayland wrote:
> On 25/02/16 19:15, Programmingkid wrote:
>
>> I want to bring up Macsbug while Mac OS 9 is booting. I tried command-powerkey (real left and right command keys) but that didn't work. Command-fn-f12 also didn't work for me. Anybody have any luck with this when using a Mac OS X host?
>
> Control works fine here with the GTK GUI (hold it down as soon as you
> see the happy Mac). Maybe try using vnc/sdl just for debugging? It seems
> that the keymaps for the cocoa GUI may need some work.
It definitely looks to be true. I will start working on this problem immediately.
4 years, 3 months
- 1
- 0
Has anyone figured out how to invoke Macsbug from the cocoa gui?
by Programmingkid
I want to bring up Macsbug while Mac OS 9 is booting. I tried command-powerkey (real left and right command keys) but that didn't work. Command-fn-f12 also didn't work for me. Anybody have any luck with this when using a Mac OS X host?
4 years, 3 months
- 3
- 3
Trying to figure out what 9 means to the escc
by Programmingkid
With the below patch I can see that Mac OS 9.0 is having escc_mem_write() go to the SERIAL_CTRL case. Then to the W_CMD case. Then to the CMD_HI case. This then causes newreg to be set to the value 9. What I need to know is what is this value for. Does anyone know what it means?
Afterwords Mac OS 9.0 will write the value 0xc0 to the escc. This causes the escc to reset.
This pdf might be helpful for anyone who is interested in helping: http://www.zilog.com/docs/serial/scc_escc_um.pdf
---
hw/char/escc.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 98a1c21..f1fc70e 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -472,6 +472,7 @@ static void escc_update_parameters(ChannelState *s)
static void escc_mem_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
+
ESCCState *serial = opaque;
ChannelState *s;
uint32_t saddr;
@@ -481,22 +482,31 @@ static void escc_mem_write(void *opaque, hwaddr addr,
saddr = (addr >> serial->it_shift) & 1;
channel = (addr >> (serial->it_shift + 1)) & 1;
s = &serial->chn[channel];
+
+ printf("%s(): start value:0x%x register:0x%x\n", __func__, val, saddr);
+
switch (saddr) {
case SERIAL_CTRL:
+ printf("%s() SERIAL_CTRL case\n", __func__);
trace_escc_mem_writeb_ctrl(CHN_C(s), s->reg, val & 0xff);
newreg = 0;
switch (s->reg) {
case W_CMD:
+ printf("%s() W_CMD case\n", __func__);
newreg = val & CMD_PTR_MASK;
val &= CMD_CMD_MASK;
switch (val) {
case CMD_HI:
+ printf("%s() CMD_HI case\n", __func__);
newreg |= CMD_HI;
+ printf("%s(): newreg = 0x%x\n", __func__, newreg);
break;
case CMD_CLR_TXINT:
+ printf("%s() CMD_CLR_TXINT case\n", __func__);
clr_txint(s);
break;
case CMD_CLR_IUS:
+ printf("%s() CMD_CLR_IUS case\n", __func__);
if (s->rxint_under_svc) {
s->rxint_under_svc = 0;
if (s->txint) {
@@ -508,6 +518,7 @@ static void escc_mem_write(void *opaque, hwaddr addr,
escc_update_irq(s);
break;
default:
+ printf("%s(): unprogrammed command detected: value:%d\n", __func__, val);
break;
}
break;
@@ -515,36 +526,44 @@ static void escc_mem_write(void *opaque, hwaddr addr,
case W_SYNC1 ... W_TXBUF:
case W_MISC1 ... W_CLOCK:
case W_MISC2 ... W_EXTINT:
+ printf("%s() W_MISC2 case\n", __func__);
s->wregs[s->reg] = val;
break;
case W_TXCTRL1:
case W_TXCTRL2:
+ printf("%s() W_TXCTRL2 case\n", __func__);
s->wregs[s->reg] = val;
escc_update_parameters(s);
break;
case W_BRGLO:
case W_BRGHI:
+ printf("%s() W_BRGHI case\n", __func__);
s->wregs[s->reg] = val;
s->rregs[s->reg] = val;
escc_update_parameters(s);
break;
case W_MINTR:
+ printf("%s(): W_MINTR detected\n", __func__);
switch (val & MINTR_RST_MASK) {
case 0:
default:
break;
case MINTR_RST_B:
+ printf("%s() MINTR_RST_B case\n", __func__);
escc_reset_chn(&serial->chn[0]);
return;
case MINTR_RST_A:
+ printf("%s() MINTR_RST_A case\n", __func__);
escc_reset_chn(&serial->chn[1]);
return;
case MINTR_RST_ALL:
+ printf("%s(): MINTR_RST_ALL case\n", __func__);
escc_reset(DEVICE(serial));
return;
}
break;
default:
+ printf("%s(): unprogrammed command detected: value:%d\n", __func__, val);
break;
}
if (s->reg == 0)
@@ -553,6 +572,7 @@ static void escc_mem_write(void *opaque, hwaddr addr,
s->reg = 0;
break;
case SERIAL_DATA:
+ printf("%s() SERIAL_DATA case\n", __func__);
trace_escc_mem_writeb_data(CHN_C(s), val);
s->tx = val;
if (s->wregs[W_TXCTRL2] & TXCTRL2_TXEN) { // tx enabled
@@ -567,6 +587,7 @@ static void escc_mem_write(void *opaque, hwaddr addr,
set_txint(s);
break;
default:
+ printf("%s(): unprogrammed command detected: value:%d\n", __func__, val);
break;
}
}
@@ -583,11 +604,16 @@ static uint64_t escc_mem_read(void *opaque, hwaddr addr,
saddr = (addr >> serial->it_shift) & 1;
channel = (addr >> (serial->it_shift + 1)) & 1;
s = &serial->chn[channel];
+
+ printf("%s(): address:0x%x saddr:0x%x\n", __func__, addr, saddr);
+
switch (saddr) {
case SERIAL_CTRL:
trace_escc_mem_readb_ctrl(CHN_C(s), s->reg, s->rregs[s->reg]);
+ printf("%s(): s->reg = 0x%x\n", __func__, s->reg);
ret = s->rregs[s->reg];
s->reg = 0;
+ printf("%s(): SERIAL_CTRL returning 0x%x\n", __func__, ret);
return ret;
case SERIAL_DATA:
s->rregs[R_STATUS] &= ~STATUS_RXAV;
@@ -599,8 +625,10 @@ static uint64_t escc_mem_read(void *opaque, hwaddr addr,
trace_escc_mem_readb_data(CHN_C(s), ret);
if (s->chr)
qemu_chr_accept_input(s->chr);
+ printf("%s(): SERIAL_DATA returning 0x%x\n", __func__, ret);
return ret;
default:
+ printf("%s(): default case for address 0x%x\n", __func__, addr);
break;
}
return 0;
--
1.7.5.4
4 years, 3 months
- 2
- 2
[PATCHv2 0/6] ppc: ESCC fixups (MacOS related)
by Mark Cave-Ayland
This patchset is really a roll-up/rework of ESCC patches posted by Hervé and John
along with a general tidy-up of the ESCC channel code and addition of DBDMA
properties.
The most interesting change with this patchset is that a basic OS 9.2 image
with just OT extensions enabled now hangs in QEMU in a loop constantly polling
ESCC registers rather than crashing into MacsBug.
NOTE: for OS 9 testers, QEMU's default G4 CPU for mac99 seems buggy and always
crashes into MacsBug. Make sure that you have the interpreter.fs patch applied and
run QEMU with -cpu G3.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
v2:
- Switch channel offsets over to match http://nandra.segv.jp/NetBSD/G4.dump-device-tree.txt
(fixes serial port on Linux)
- Fix DBDMA region size to 0x100
Mark Cave-Ayland (6):
escc.c: rename offset to index
ppc: fix ESCC reg properties
escc.c: tidy-up legacy and non-legacy codepaths
escc.c: add empty slot-names property to serial ports
escc.c: add DBDMA addresses to reg property
escc.c: add DBDMA interrupt properties
openbios-devel/drivers/escc.c | 92 +++++++++++++++++++++++++----------------
1 file changed, 56 insertions(+), 36 deletions(-)
--
1.7.10.4
4 years, 3 months
- 5
- 17
[PATCH 0/6] ppc: ESCC fixups (MacOS related)
by Mark Cave-Ayland
This patchset is really a roll-up/rework of ESCC patches posted by Hervé and John
along with a general tidy-up of the ESCC channel code and addition of DBDMA
properties.
The most interesting change with this patchset is that a basic OS 9.2 image
with just OT extensions enabled now hangs in QEMU in a loop constantly polling
ESCC registers rather than crashing into MacsBug.
There are still some issues accessing the serial ports in BSD/Linux but fortunately
no regressions/hangs show in testing here with this patchset applied.
NOTE: for OS 9 testers, QEMU's default G4 CPU for mac99 seems buggy and always
crashes into MacsBug. Make sure that you have the interpreter.fs patch applied and
run QEMU with -cpu G3.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (6):
escc.c: rename offset to index
ppc: fix ESCC reg properties
escc.c: tidy-up legacy and non-legacy codepaths
escc.c: add empty slot-names property to serial ports
escc.c: add DBDMA addresses to reg property
escc.c: add DBDMA interrupt properties
openbios-devel/drivers/escc.c | 92 +++++++++++++++++++++++++----------------
1 file changed, 56 insertions(+), 36 deletions(-)
--
1.7.10.4
4 years, 3 months
- 3
- 13
[commit] r1385 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sat Feb 20 14:22:24 2016
New Revision: 1385
URL: http://tracker.coreboot.org/trac/openbios/changeset/1385
Log:
ppc: move copyright property hooks from adler32 word
Instead insert the copyright property if we detect the /rom/macos device
generated by the MacOS boot loader just before we call the client with
go and remove it before control is returned back to the interpreter.
This effectively hides the property from everyone except for MacOS bootloaders.
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 Sat Feb 20 14:22:22 2016 (r1384)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Feb 20 14:22:24 2016 (r1385)
@@ -601,6 +601,11 @@
{
ucell addr;
+ /* Insert copyright property for MacOS 9 and below */
+ if (find_dev("/rom/macos")) {
+ fword("insert-copyright-property");
+ }
+
feval("saved-program-state >sps.entry @");
addr = POP();
Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:22 2016 (r1384)
+++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:24 2016 (r1385)
@@ -121,18 +121,16 @@
active-package!
;
+: (exit)
+ \ Clean up before returning to the interpreter
+ delete-copyright-property
+;
+
\ -------------------------------------------------------------------------
\ 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 )
-
" (adler32)" $find if
execute
else
4 years, 3 months
- 1
- 0
[commit] r1384 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: mcayland
Date: Sat Feb 20 14:22:22 2016
New Revision: 1384
URL: http://tracker.coreboot.org/trac/openbios/changeset/1384
Log:
ppc: add complementary delete-copyright-property word
This simply removes the copyright property generated by insert-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:17 2016 (r1383)
+++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:22 2016 (r1384)
@@ -111,6 +111,16 @@
then
;
+: delete-copyright-property
+ \ Remove copyright property created above
+ active-package
+ " /" find-package if
+ active-package!
+ " copyright" delete-property
+ then
+ active-package!
+;
+
\ -------------------------------------------------------------------------
\ Adler-32 wrapper
\ -------------------------------------------------------------------------
4 years, 3 months
- 1
- 0
[commit] r1383 - trunk/openbios-devel/forth/system
by repository service
Author: mcayland
Date: Sat Feb 20 14:22:17 2016
New Revision: 1383
URL: http://tracker.coreboot.org/trac/openbios/changeset/1383
Log:
ciface.fs: implement optional (exit) hook when returning control back to the interpreter
This allows us to optionally intercept and execute code before returning back
to the Forth interactive console.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/forth/system/ciface.fs
Modified: trunk/openbios-devel/forth/system/ciface.fs
==============================================================================
--- trunk/openbios-devel/forth/system/ciface.fs Sat Feb 20 14:22:14 2016 (r1382)
+++ trunk/openbios-devel/forth/system/ciface.fs Sat Feb 20 14:22:17 2016 (r1383)
@@ -326,6 +326,14 @@
: exit ( -- )
." EXIT"
+
+ \ Execute (exit) hook if one exists
+ s" (exit)" $find if
+ execute
+ else
+ 2drop
+ then
+
outer-interpreter
;
4 years, 3 months
- 1
- 0