Re: [OpenBIOS] Back at it again( PCI Passthrough )
by Jd Lyons
Ok, I made those changes to openbios, here is the output.
> On May 8, 2018, at 6:50 AM, Joe van Tunen <joevt(a)shaw.ca> wrote:
>
> : (debug-feval) ( fcode# -- fcode# )
> \ Address
> fcode-stream 1 - . here u. ." : "
>
> \ Indicate if word is compiled
> state @ 0<> if
> ." (compile) "
> then
> dup fcode>xt cell - lfa2name type
> dup ." [ 0x" . ." ]" cr
> ;
6 days, 7 hours
- 7
- 54
[PATCH v5] arch/ppc/qemu: Add a node for the other (empty) PCI bus to the device tree
by BALATON Zoltan
QEMU mac99 emulates two of the three PCI buses found on real
PowerMac3,1 but OpenBIOS only handles a single PCI bus and initialises
and puts info in the device tree of the second PCI bus only which is
where devices are connected and calls it bus 0. However, some clients
may not know about this or have hardcoded assumptions and erroneously
use the address of the first bus to access PCI config registers for
devices on the second bus which silently fails as these requests will
go to the other empty bus emulated and return invalid values. Devices
mapped via MMIO still appear to work but they may not be correctly
initialised and some cards are not detected because of this.
Until support for multiple PCI buses is implemented add an empty node
in the device tree for the uninitialised bus to let clients know about
it. This fixes detecting PCI devices (such as USB) under MorphOS and
may also fix enabling the bus master bit needed with some network
cards and allow the workarund for that to be reverted.
Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu>
---
arch/ppc/qemu/init.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index f72728c..a996404 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -716,6 +716,46 @@ static void kvm_of_init(void)
fword("finish-device");
}
+static void empty_pci_bus_init(void)
+{
+ if (machine_id == ARCH_MAC99) {
+ activate_device("/");
+ fword("new-device");
+ push_str("pci");
+ fword("device-name");
+ push_str("pci");
+ fword("device-type");
+ PUSH(0xf0000000);
+ fword("encode-int");
+ PUSH(0x02000000);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
+ fword("property");
+ PUSH(3);
+ fword("encode-int");
+ push_str("#address-cells");
+ fword("property");
+ PUSH(2);
+ fword("encode-int");
+ push_str("#size-cells");
+ fword("property");
+ PUSH(1);
+ fword("encode-int");
+ push_str("#interrupt-cells");
+ fword("property");
+ PUSH(0);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ push_str("bus-range");
+ fword("property");
+ fword("finish-device");
+ device_end();
+ }
+}
+
/*
* filll ( addr bytes quad -- )
*/
@@ -859,7 +899,17 @@ arch_of_init(void)
feval("['] ppc-dma-sync to (dma-sync)");
#ifdef CONFIG_DRIVER_PCI
+ /* Add empty node for first pci bus on MAC99 */
+ /* Remove this when pci driver is fixed to handle multiple buses */
+ empty_pci_bus_init();
ob_pci_init();
+ if (machine_id == ARCH_MAC99) {
+ phandle_t dev = find_dev("/pci@f2000000");
+ if (dev) {
+ u32 props[2] = {0, 1};
+ set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0]));
+ }
+ }
#endif
printk("\n");
--
2.13.7
2 weeks, 1 day
- 2
- 8
[PATCH 0/2] SPARC32: fix crash when starting qemu-system-sparc with no framebuffer
by Mark Cave-Ayland
A recent patch to QEMU that allows sun4m machines to be launched with -vga none
revealed a crash on startup due to the missing framebuffer.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (2):
sbus: don't use internal fallback TCX driver with QEMU
SPARC32: use serial console when QEMU is launched with -vga none
arch/sparc32/init.fs | 7 +++++--
arch/sparc32/openbios.c | 8 ++++++++
drivers/sbus.c | 11 +++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
--
2.11.0
3 weeks
- 2
- 11
[PATCH] SPARC64: use serial console when QEMU is launched with -vga none
by Mark Cave-Ayland
If no display device has been installed in the DT e.g. passing -vga none into
the QEMU command line then fall back to using the serial console as already
occurs when launching QEMU in -nographic mode.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
arch/sparc64/openbios.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c
index a783c1f..e2f7e59 100644
--- a/arch/sparc64/openbios.c
+++ b/arch/sparc64/openbios.c
@@ -537,10 +537,11 @@ void arch_nvram_get(char *data)
uint32_t temp;
uint64_t ram_size;
uint32_t clock_frequency;
- uint16_t machine_id;
+ uint16_t machine_id, nographic;
const char *stdin_path, *stdout_path;
char *bootorder_file, *boot_path;
uint32_t bootorder_sz, sz;
+ phandle_t display_ph;
fw_cfg_init();
@@ -701,7 +702,15 @@ void arch_nvram_get(char *data)
push_str("/chosen");
fword("find-device");
- if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) {
+ nographic = fw_cfg_read_i16(FW_CFG_NOGRAPHIC);
+
+ /* Check to see if any framebuffer present */
+ display_ph = dt_iterate_type(0, "display");
+ if (display_ph == 0) {
+ nographic = 1;
+ }
+
+ if (nographic) {
stdin_path = stdout_path = "ttya";
} else {
stdin_path = "keyboard";
--
2.11.0
3 weeks, 2 days
- 1
- 1
- ← Newer
- 1
- Older →