[PATCH] libopenbios/bootinfo_load.c: Implement Mac OS 9.2 boot script support
by Programmingkid
This patch makes booting Mac OS 9.2 possible. It replaces all occurrences of
>r and r> with sub_>r and sub_r>. This allows for the return stack to be left
alone. This patch also makes it so that the boot script is executed one line at a time.
Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com>
Note: this patch depends on the strstr() and return stack substitution patches.
Index: libopenbios/bootinfo_load.c
===================================================================
--- libopenbios/bootinfo_load.c (revision 1395)
+++ libopenbios/bootinfo_load.c (working copy)
@@ -19,6 +19,7 @@
#include "libopenbios/bootinfo_load.h"
#include "libopenbios/ofmem.h"
#include "libc/vsprintf.h"
+#include "libc/string.h"
//#define DEBUG_BOOTINFO
@@ -116,6 +117,75 @@
return LOADER_NOT_SUPPORT;
}
+// Replace all occurrences of orig_str in buffer with replace_str
+static void replace_string(char *buffer, const char *orig_str, const char *replace_str)
+{
+ char *ptr;
+ int index, new_buf_index = 0;
+ const int max_size = 5000;
+ char *new_buffer = malloc(max_size * sizeof(char));
+
+ for (index = 0; index < strlen(buffer); index++) {
+ if (buffer[index] == orig_str[0]) {
+ ptr = strstr(buffer + index, orig_str);
+
+ // if we encountered an orig_str in the buffer
+ if (index == (ptr - buffer)) {
+ sprintf(new_buffer + new_buf_index, "%s ", replace_str);
+ new_buf_index += strlen(replace_str) + 1;
+ index += strlen(orig_str);
+ continue;
+ }
+ }
+ new_buffer[new_buf_index++] = buffer[index];
+ }
+
+ // copy new_buffer into buffer
+ for (index = 0; index < strlen(new_buffer); index++) {
+ buffer[index] = new_buffer[index];
+ }
+ buffer[index+1] = '\0';
+}
+
+/* Replace >r and r> with sub_>r and sub_r> */
+static void replace_return_stack_words(char *bootscript)
+{
+ const char *find_str1 = ">r";
+ const char *replace_str1 = "sub_>r";
+ const char *find_str2 = "r>";
+ const char *replace_str2 = "sub_r>";
+
+ replace_string(bootscript, find_str1, replace_str1);
+ replace_string(bootscript, find_str2, replace_str2);
+}
+
+/* Runs the bootscript one line at a time */
+void run_script(char *bootscript)
+{
+ int index = 0, buf_index = 0;
+ char c;
+ char *buffer = malloc(1000 * sizeof(char));
+
+ while (1) {
+ c = bootscript[index];
+
+ // fill up buffer
+ while (c != '\n' && c != '\r' && c != '\0') {
+ buffer[buf_index++] = c;
+ c = bootscript[++index];
+ }
+ buffer[buf_index] = '\0';
+ buf_index = 0;
+ index++;
+ DPRINTF("%s\n", buffer);
+ feval(buffer);
+ if (c == '\0') {
+ break;
+ }
+ }
+ free(buffer);
+}
+
/*
Parse SGML structure like:
<chrp-boot>
@@ -209,9 +279,6 @@
script = 0;
bootscript[scriptlen] = '\0';
- DPRINTF("got bootscript %s\n",
- bootscript);
-
scriptvalid = -1;
break;
@@ -261,8 +328,8 @@
/* If the payload is bootinfo then we execute it immediately */
if (scriptvalid) {
- DPRINTF("bootscript: %s\n", bootscript);
- feval(bootscript);
+ replace_return_stack_words(bootscript);
+ run_script(bootscript);
}
else
DPRINTF("Unable to parse bootinfo bootscript\n");
2 years, 3 months
- 4
- 9
Adding new device in the middle of device-tree
by BALATON Zoltan
Hello,
Is there a way to add a new device in the middle of the device tree
(before or after an existing node) from Forth? If I try:
dev / new-device " newdev" device-name finish-device show-devs
/newdev appears at the end of the device-tree but that's not what I want.
I need this device to go at a specific place in the middle but I could not
find out how to achieve that. Any ideas?
Thank you,
BALATON Zoltan
2 years, 8 months
- 4
- 17
[PATCH] vga.fs: add support for QEMU PCI MMIO register access
by Mark Cave-Ayland
Currently the driver works by using the legacy VGA ioports for programming
the display. However this makes it much harder to configure e.g. multiple
displays or VGA devices behind multiple PCI bridges.
If building for QEMU, default to using the QEMU PCI MMIO registers to program
the display.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
drivers/vga.fs | 85 ++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 68 insertions(+), 17 deletions(-)
diff --git a/drivers/vga.fs b/drivers/vga.fs
index cbfa46c..d39b062 100644
--- a/drivers/vga.fs
+++ b/drivers/vga.fs
@@ -47,6 +47,22 @@ fcode-version3
: ioc! ioc!-xt execute ;
: iow! iow!-xt execute ;
+" le-w!" (find-xt) value le-w!-xt
+
+: le-w! le-w!-xt execute ;
+
+\
+\ PCI
+\
+
+" pci-bar>pci-addr" (find-xt) value pci-bar>pci-addr-xt
+: pci-bar>pci-addr pci-bar>pci-addr-xt execute ;
+
+h# 10 constant cfg-bar0 \ Framebuffer BAR
+h# 18 constant cfg-bar2 \ QEMU MMIO ioport BAR
+-1 value fb-addr
+-1 value mmio-addr
+
\
\ VGA registers
\
@@ -55,12 +71,22 @@ h# 3c0 constant vga-addr
h# 3c8 constant dac-write-addr
h# 3c9 constant dac-data-addr
+defer vga-ioc!
+
+: vga-legacy-ioc! ( val addr )
+ ioc!
+;
+
+: vga-mmio-ioc! ( val addr )
+ h# 3c0 - h# 400 + mmio-addr + c!
+;
+
: vga-color! ( r g b index -- )
\ Set the VGA colour registers
- dac-write-addr ioc! rot
- 2 >> dac-data-addr ioc! swap
- 2 >> dac-data-addr ioc!
- 2 >> dac-data-addr ioc!
+ dac-write-addr vga-ioc! rot
+ 2 >> dac-data-addr vga-ioc! swap
+ 2 >> dac-data-addr vga-ioc!
+ 2 >> dac-data-addr vga-ioc!
;
\
@@ -86,17 +112,23 @@ h# 1 constant VBE_DISPI_ENABLED
\ Bochs VBE register writes
\
-: vbe-iow! ( val addr -- )
+defer vbe-iow!
+
+: vbe-legacy-iow! ( val addr -- )
h# 1ce iow!
h# 1d0 iow!
;
+: vbe-mmio-iow! ( val addr -- )
+ 1 lshift h# 500 + mmio-addr + cr .s cr le-w!
+;
+
\
\ Initialise Bochs VBE mode
\
: vbe-init ( -- )
- h# 0 vga-addr ioc! \ Enable blanking
+ h# 0 vga-addr vga-ioc! \ Enable blanking
VBE_DISPI_DISABLED VBE_DISPI_INDEX_ENABLE vbe-iow!
h# 0 VBE_DISPI_INDEX_X_OFFSET vbe-iow!
h# 0 VBE_DISPI_INDEX_Y_OFFSET vbe-iow!
@@ -104,20 +136,14 @@ h# 1 constant VBE_DISPI_ENABLED
openbios-video-height VBE_DISPI_INDEX_YRES vbe-iow!
depth-bits VBE_DISPI_INDEX_BPP vbe-iow!
VBE_DISPI_ENABLED VBE_DISPI_INDEX_ENABLE vbe-iow!
- h# 0 vga-addr ioc!
- h# 20 vga-addr ioc! \ Disable blanking
+ h# 0 vga-addr vga-ioc!
+ h# 20 vga-addr vga-ioc! \ Disable blanking
;
\
-\ PCI
+\ PCI BAR mapping
\
-" pci-bar>pci-addr" (find-xt) value pci-bar>pci-addr-xt
-: pci-bar>pci-addr pci-bar>pci-addr-xt execute ;
-
-h# 10 constant cfg-bar0 \ Framebuffer BAR
--1 value fb-addr
-
: map-fb ( -- )
cfg-bar0 pci-bar>pci-addr if \ ( pci-addr.lo pci-addr.mid pci-addr.hi size )
" pci-map-in" $call-parent
@@ -125,6 +151,32 @@ h# 10 constant cfg-bar0 \ Framebuffer BAR
then
;
+: map-mmio ( -- )
+ cfg-bar2 pci-bar>pci-addr if \ ( pci-addr.lo pci-addr.mid pci-addr.hi size )
+ " pci-map-in" $call-parent
+ to mmio-addr
+ then
+;
+
+\
+\ Legacy IO port or QEMU MMIO accesses
+\
+\ legacy: use standard VGA ioport registers
+\ MMIO: use QEMU PCI MMIO VGA registers
+\
+\ If building for QEMU, default to MMIO access since it allows
+\ programming of the VGA card regardless of its position in the
+\ PCI topology
+\
+
+[IFDEF] CONFIG_QEMU
+['] vga-mmio-ioc! to vga-ioc!
+['] vbe-mmio-iow! to vbe-iow!
+[ELSE]
+['] vga-legacy-ioc! to vga-ioc!
+['] vbe-legacy-iow! to vbe-iow!
+[THEN]
+
\
\ Publically visible words
\
@@ -181,6 +233,7 @@ headerless
\
: qemu-vga-driver-install ( -- )
+ map-mmio vbe-init
fb-addr -1 = if
map-fb fb-addr to frame-buffer-adr
default-font set-font
@@ -193,8 +246,6 @@ headerless
;
: qemu-vga-driver-init
-
- vbe-init
openbios-video-width encode-int " width" property
openbios-video-height encode-int " height" property
depth-bits encode-int " depth" property
--
1.7.10.4
2 years, 9 months
- 2
- 4
[PATCH 0/8] pci: fix up PCI bridges
by Mark Cave-Ayland
In order to progress further with sun4u in QEMU, it has become necessary
to introduce PCI bridges similar to a real Ultra 5. This is because several
OSs make assumptions about the PCI topology, and without the PCI bridge in
place will either crash or fail to map memory regions correctly.
This first patchset fixes up PCI bridges so that we can now enumerate them
correctly. As an idea as to where I'm going with this, if you also take the
WIP QEMU branch at https://github.com/mcayland/qemu/tree/sparc64-pcibridge
then the output of show-devs looks like this:
Welcome to OpenBIOS v1.1 built on Jun 11 2017 06:57
Type 'help' for detailed information
0 > show-devs
ffe1bf40 /
ffe1c118 /aliases
ffe1c240 /openprom (BootROM)
ffe26b58 /openprom/client-services
ffe1c4f8 /options
ffe1c5d8 /chosen
ffe1c718 /builtin
ffe1c840 /builtin/console
ffe26620 /packages
ffe28648 /packages/cmdline
ffe28898 /packages/disk-label
ffe2c8e0 /packages/deblocker
ffe2cef8 /packages/grubfs-files
ffe2d308 /packages/sun-parts
ffe2d720 /packages/elf-loader
ffe2b218 /memory@0,0 (memory)
ffe2b378 /virtual-memory
ffe2d880 /pci@1fe,0 (pci)
ffe2e1b0 /pci@1fe,0/pci@1 (pci)
ffe2e8c8 /pci@1fe,0/pci@1,1 (pci)
ffe2efb0 /pci@1fe,0/pci@1,1/ebus@1
ffe2f7f0 /pci@1fe,0/pci@1,1/ebus@1/eeprom@0
ffe2f968 /pci@1fe,0/pci@1,1/ebus@1/fdthree@0 (block)
ffe2feb8 /pci@1fe,0/pci@1,1/ebus@1/su@0 (serial)
ffe30248 /pci@1fe,0/pci@1,1/ebus@1/kb_ps2@0 (serial)
ffe305b8 /pci@1fe,0/pci@1,1/QEMU,VGA@2 (display)
ffe31c30 /pci@1fe,0/pci@1,1/pci-ata@3 (pci-ide)
ffe32188 /pci@1fe,0/pci@1,1/pci-ata@3/ide0@4000 (ide)
ffe32468 /pci@1fe,0/pci@1,1/pci-ata@3/ide1@4100 (ide)
ffe32700 /pci@1fe,0/pci@1,1/pci-ata@3/ide1@4100/cdrom@0 (block)
ffe32d88 /pci@1fe,0/NE2000@2 (network)
ffe33490 /SUNW,UltraSPARC-IIi (cpu)
ok
Note I have several more SPARC64-related fixes queued, however as this
patchset is starting to get quite unwieldy it makes sense to split this
part off separately.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (8):
pci: add temporary bus-range property to PCI bridge devices
pci: include PCI bus id in ob_pci_decode_unit()
pci: create new ob_pci_bridge_node based upon ob_pci_bus_node
pci: rename ob_pci_map_in() to ob_pci_bus_map_in()
pci: implement ob_pci_bridge_map_in() for PCI-PCI bridge nodes
pci: configure base and limit registers during PCI bridge
configuration
pci: split PCI bus interrupt maps from PCI host bridge interrupt maps
pci: allow ob_pci_bus_set_interrupt_map() to take a callback function
drivers/pci.c | 186 ++++++++++++++++++++++++++++++++++++++++++++-------------
drivers/pci.h | 5 ++
2 files changed, 150 insertions(+), 41 deletions(-)
--
1.7.10.4
2 years, 9 months
- 1
- 9
[PATCH] libopenbios: add Forth LE memory access words
by Mark Cave-Ayland
These are particularly useful when accessing hardware registers from BE hosts.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
libopenbios/init.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/libopenbios/init.c b/libopenbios/init.c
index aa99608..3ad9505 100644
--- a/libopenbios/init.c
+++ b/libopenbios/init.c
@@ -15,12 +15,56 @@
*/
#include "config.h"
+#include "libc/byteorder.h"
#include "libopenbios/openbios.h"
#include "libopenbios/bindings.h"
#include "libopenbios/initprogram.h"
#define NO_QEMU_PROTOS
#include "arch/common/fw_cfg.h"
+
+/*
+ * le-w! ( w waddr -- )
+ */
+
+static void lewstore(void)
+{
+ u16 *aaddr = (u16 *)cell2pointer(POP());
+ const u16 word = POP();
+ *aaddr = __cpu_to_le16(word);
+}
+
+/*
+ * le-l! ( quad qaddr -- )
+ */
+
+static void lelstore(void)
+{
+ u32 *aaddr = (u32 *)cell2pointer(POP());
+ const u32 longval = POP();
+ *aaddr = __cpu_to_le32(longval);
+}
+
+/*
+ * le-w@ ( waddr -- w )
+ */
+
+static void lewfetch(void)
+{
+ const u16 *aaddr = (u16 *)cell2pointer(POP());
+ PUSH(__le16_to_cpu(*aaddr));
+}
+
+/*
+ * le-l@ ( qaddr -- quad )
+ */
+
+static void lelfetch(void)
+{
+ const u32 *aaddr = (u32 *)cell2pointer(POP());
+ PUSH(__le32_to_cpu(*aaddr));
+}
+
void
openbios_init( void )
{
@@ -36,4 +80,10 @@ openbios_init( void )
// Bind the C implementation of (go) into Forth
bind_func("(go)", go);
+
+ // Bind the LE access words
+ bind_func("le-w!", lewstore);
+ bind_func("le-l!", lelstore);
+ bind_func("le-w@", lewfetch);
+ bind_func("le-l@", lelfetch);
}
--
1.7.10.4
2 years, 9 months
- 1
- 1
[PATCH] libopenbios: fix build for platforms without fw_cfg interface
by Mark Cave-Ayland
Commit 7130437 "fw_cfg: implement fw-cfg-read-file Forth word" added a binding
for the Forth version of fw_cfg_read_file() into libopenbios/init.c but forgot
to only include the binding when CONFIG_DRIVER_FW_CFG was defined.
This broke the build for platforms which don't have the fw_cfg interface
enabled by default such as x86.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
libopenbios/init.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libopenbios/init.c b/libopenbios/init.c
index aa99608..e08df19 100644
--- a/libopenbios/init.c
+++ b/libopenbios/init.c
@@ -28,8 +28,10 @@ openbios_init( void )
PUSH(pointer2cell((void *)&__context));
feval("['] __context cell+ !");
+#if defined(CONFIG_DRIVER_FW_CFG)
// Bind the Forth fw_cfg file interface
bind_func("fw-cfg-read-file", forth_fw_cfg_read_file);
+#endif
// Bind the C implementation of (init-program) into Forth
bind_func("(init-program)", init_program);
--
1.7.10.4
2 years, 9 months
- 1
- 1
Curious as to current status
by Jonathan C Day
Hi,
The git repository seems alive, so there's someone out there, but the main website hasn't been updated in a while and the list is... quiet.
I'm looking to find out where OpenBIOS is, if it handles large devices (or if I need TianoCore for that, which I'd really not like) and whether the project is still in serious development (good) or is more maintenance mode (proprietary vendors have won).
I'm also curious as to what will boot cleanly. Coreboot only seems to give results for direct payloads and SeaBIOS, and I don't see a list on OpenBIOS' site (but may have missed it), so it's not obvious what works well, what's YMMV and what's in the paperweight category.
If things are semi-active to active, and if I can find a way to program the flash chip when things fail, I'd be happy to do testing.
Jonathan Day
2 years, 9 months
- 2
- 1