[Qemu-devel] [PATCH for-1.7 1/3] sun4m: Add FCode ROM for TCX framebuffer

[Qemu-devel] [PATCH for-1.7 1/3] sun4m: Add FCode ROM for TCX framebuffer

[Mark Cave-Ayland]

Upstream OpenBIOS now implements SBus probing in order to determine the
contents of a physical bus slot, which is required to allow OpenBIOS to
identify the framebuffer without help from the fw_cfg interface.

SBus probing works by detecting the presence of an FCode program
(effectively tokenised Forth) at the base address of each slot, and if
present executes it so that it creates its own device node in the
OpenBIOS device tree.

The FCode ROM is generated as part of the OpenBIOS build and should
generally be updated at the same time.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Blue Swirl <blauwirbel@gmail.com>
CC: Bob Breuer <breuerr@mc.net>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
---
 Makefile             |    2 +-
 hw/display/tcx.c     |   27 ++++++++++++++++++++++++++-
 hw/sparc/sun4m.c     |   17 ++++++++++-------
 pc-bios/QEMU,tcx.bin |  Bin 0 -> 1242 bytes
 pc-bios/README       |    4 ++--
 5 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 pc-bios/QEMU,tcx.bin

diff --git a/Makefile b/Makefile
index b15003f..3235039 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,7 @@ ifdef INSTALL_BLOBS
 BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
 vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
 acpi-dsdt.aml q35-acpi-dsdt.aml \
-ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
+ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \
 pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
 pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
 efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 24876d3..06bf66f 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -25,8 +25,12 @@
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
+#include "hw/loader.h"
 #include "hw/sysbus.h"
 
+#define TCX_ROM_FILE "QEMU,tcx.bin"
+#define FCODE_MAX_ROM_SIZE 0x10000
+
 #define MAXX 1024
 #define MAXY 768
 #define TCX_DAC_NREGS 16
@@ -43,6 +47,8 @@ typedef struct TCXState {
     QemuConsole *con;
     uint8_t *vram;
     uint32_t *vram24, *cplane;
+    hwaddr prom_addr;
+    MemoryRegion rom;
     MemoryRegion vram_mem;
     MemoryRegion vram_8bit;
     MemoryRegion vram_24bit;
@@ -529,14 +535,32 @@ static int tcx_init1(SysBusDevice *dev)
 {
     TCXState *s = TCX(dev);
     ram_addr_t vram_offset = 0;
-    int size;
+    int size, ret;
     uint8_t *vram_base;
+    char *fcode_filename;
 
     memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
                            s->vram_size * (1 + 4 + 4));
     vmstate_register_ram_global(&s->vram_mem);
     vram_base = memory_region_get_ram_ptr(&s->vram_mem);
 
+    /* FCode ROM */
+    memory_region_init_ram(&s->rom, NULL, "tcx.prom", FCODE_MAX_ROM_SIZE);
+    vmstate_register_ram_global(&s->rom);
+    memory_region_set_readonly(&s->rom, true);
+    sysbus_init_mmio(dev, &s->rom);
+
+    fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE);
+    if (fcode_filename) {
+        ret = load_image_targphys(fcode_filename, s->prom_addr,
+                                  FCODE_MAX_ROM_SIZE);
+    }
+
+    if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) {
+        fprintf(stderr, "tcx: could not load prom '%s'\n", TCX_ROM_FILE);
+        return -1;
+    }
+
     /* 8-bit plane */
     s->vram = vram_base;
     size = s->vram_size;
@@ -598,6 +622,7 @@ static Property tcx_properties[] = {
     DEFINE_PROP_UINT16("width",    TCXState, width,     -1),
     DEFINE_PROP_UINT16("height",   TCXState, height,    -1),
     DEFINE_PROP_UINT16("depth",    TCXState, depth,     -1),
+    DEFINE_PROP_HEX64("prom_addr", TCXState, prom_addr, -1),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index a0d366c..94f7950 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -537,24 +537,27 @@ static void tcx_init(hwaddr addr, int vram_size, int width,
     qdev_prop_set_uint16(dev, "width", width);
     qdev_prop_set_uint16(dev, "height", height);
     qdev_prop_set_uint16(dev, "depth", depth);
+    qdev_prop_set_uint64(dev, "prom_addr", addr);
     qdev_init_nofail(dev);
     s = SYS_BUS_DEVICE(dev);
+    /* FCode ROM */
+    sysbus_mmio_map(s, 0, addr);
     /* 8-bit plane */
-    sysbus_mmio_map(s, 0, addr + 0x00800000ULL);
+    sysbus_mmio_map(s, 1, addr + 0x00800000ULL);
     /* DAC */
-    sysbus_mmio_map(s, 1, addr + 0x00200000ULL);
+    sysbus_mmio_map(s, 2, addr + 0x00200000ULL);
     /* TEC (dummy) */
-    sysbus_mmio_map(s, 2, addr + 0x00700000ULL);
+    sysbus_mmio_map(s, 3, addr + 0x00700000ULL);
     /* THC 24 bit: NetBSD writes here even with 8-bit display: dummy */
-    sysbus_mmio_map(s, 3, addr + 0x00301000ULL);
+    sysbus_mmio_map(s, 4, addr + 0x00301000ULL);
     if (depth == 24) {
         /* 24-bit plane */
-        sysbus_mmio_map(s, 4, addr + 0x02000000ULL);
+        sysbus_mmio_map(s, 5, addr + 0x02000000ULL);
         /* Control plane */
-        sysbus_mmio_map(s, 5, addr + 0x0a000000ULL);
+        sysbus_mmio_map(s, 6, addr + 0x0a000000ULL);
     } else {
         /* THC 8 bit (dummy) */
-        sysbus_mmio_map(s, 4, addr + 0x00300000ULL);
+        sysbus_mmio_map(s, 5, addr + 0x00300000ULL);
     }
 }
 
diff --git a/pc-bios/QEMU,tcx.bin b/pc-bios/QEMU,tcx.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a8ddd70ef35355c30d7cffd2e1b57f877572a3ca
GIT binary patch
literal 1242
zcmZ8hxl-Fu6xFkZeQXTK&j!qn**AgB64rt)Bt;q~lNw`zm4NNY!htH3naNM2fFJOT
zMvP0-C0(jantVh4Aoo6xa1s^oY*+VceZQe4G)@2MLG!<*wdh7l>uTIJS~6X!TIGUW
zshM@VXjRM)cF`?Cvpk3g+5cZyvh4GctJ2Vej2Eq{TQUo_TT@n;tP8trnS~qIYFqk)
zhb|xDvgIM-Bg7c>5oUxB{jz0fba;q04NWkK6PaYvO+-5+l3=3g9(st(aMT+_eL-Xp
zS>Pzi&MgtCBH<xLBxjJ5X2Lc79I-RN1fw1XiBvht1kn(YTXu$tP?d*~rV&z?I!ewV
zJ7Zj|(TMS;p{r;jh$e$5+cY97nj+_x&zf!;aplYe#j`>2T+^VJL^bn4@j?(SHjQ2t
zEd|kX5Un&ln11eFgno#yNaaORNP4`hK87&@6QdZ1DI_M4RXBxdg)^8_IFChzOIT5u
z!H~jk^eF7dpu!m93VUHFOd`c7!;W<>44SysnK-5@CNQb6GjUewc`PVg!m`57#Dvmm
z3@GeO>{B`k$=I2g^K&Acmyyeps%e))F}jGnFQY6gS1##059<%KZ1A#4ALEvvdw%>e
zkM;3d>ucn+a#3-zc;??@>%~icn>x1s1!}qNqZ=E@Jz|~I4&9}}KNB09WbFFb#!gG(
z`1PwdEAHuaNXTf>u2nBiZp5&MJs<0L2Wf2?yV!gb1@TtAqctg`C&i*;)oQ{(7a~XE
zGJ7O0vf^`tn(q6E@`Zp-oWd%49<d>H*SWGpTE=LIxx+u6Fj88kfi)y3SM>-x)J=C9
ztj2gsy-=+<rzK&q^M#$#-%f;_u6pgJeA=$~#JbecVb$a8uO1oI<H-sC`hLhx)xJJ+
ztoQ9M2i&FJ*5DD5_TItw%8}Y;NPt9)Hx0FCw9lo2d;W-}ZkJu>$&+!Cmg8JiU3z3m
K?1|A9_O(BcTLJ$7

literal 0
HcmV?d00001

diff --git a/pc-bios/README b/pc-bios/README
index b4138d1..7a3e4e9 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -11,8 +11,8 @@
   firmware implementation. The goal is to implement a 100% IEEE
   1275-1994 (referred to as Open Firmware) compliant firmware.
   The included images for PowerPC (for 32 and 64 bit PPC CPUs),
-  Sparc32 and Sparc64 are built from OpenBIOS SVN revision
-  1229.
+  Sparc32 (including QEMU,tcx.bin) and Sparc64 are built from OpenBIOS SVN
+  revision 1229.
 
 - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
   implementation for certain IBM POWER hardware.  The sources are at
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH for-1.7 1/3] sun4m: Add FCode ROM for TCX framebuffer

[Artyom Tarasenko]

Hi Mark,

this patch breaks booting with OBP:

Probing /iommu@0,10000000/sbus@0,10001000 at 5,0  espdma esp sd st
SUNW,bpp ledma le
Probing /iommu@0,10000000/sbus@0,10001000 at 4,0  SUNW,CS4231 power-management
Probing /iommu@0,10000000/sbus@0,10001000 at 1,0  Nothing there
Probing /iommu@0,10000000/sbus@0,10001000 at 2,0  Nothing there
Probing /iommu@0,10000000/sbus@0,10001000 at 3,0  SUNW,tcx Memory
Address not Aligned

^^^^ After the unaligned access OBP is not properly initialized.
See the bug 1262081, reported by Peter Bartoli.

Artyom

On Sat, Nov 2, 2013 at 5:03 PM, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
> Upstream OpenBIOS now implements SBus probing in order to determine the
> contents of a physical bus slot, which is required to allow OpenBIOS to
> identify the framebuffer without help from the fw_cfg interface.
>
> SBus probing works by detecting the presence of an FCode program
> (effectively tokenised Forth) at the base address of each slot, and if
> present executes it so that it creates its own device node in the
> OpenBIOS device tree.
>
> The FCode ROM is generated as part of the OpenBIOS build and should
> generally be updated at the same time.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Blue Swirl <blauwirbel@gmail.com>
> CC: Bob Breuer <breuerr@mc.net>
> CC: Artyom Tarasenko <atar4qemu@gmail.com>
> ---
>  Makefile             |    2 +-
>  hw/display/tcx.c     |   27 ++++++++++++++++++++++++++-
>  hw/sparc/sun4m.c     |   17 ++++++++++-------
>  pc-bios/QEMU,tcx.bin |  Bin 0 -> 1242 bytes
>  pc-bios/README       |    4 ++--
>  5 files changed, 39 insertions(+), 11 deletions(-)
>  create mode 100644 pc-bios/QEMU,tcx.bin
>
> diff --git a/Makefile b/Makefile
> index b15003f..3235039 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -286,7 +286,7 @@ ifdef INSTALL_BLOBS
>  BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
>  vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
>  acpi-dsdt.aml q35-acpi-dsdt.aml \
> -ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
> +ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \
>  pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
>  pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
>  efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index 24876d3..06bf66f 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -25,8 +25,12 @@
>  #include "qemu-common.h"
>  #include "ui/console.h"
>  #include "ui/pixel_ops.h"
> +#include "hw/loader.h"
>  #include "hw/sysbus.h"
>
> +#define TCX_ROM_FILE "QEMU,tcx.bin"
> +#define FCODE_MAX_ROM_SIZE 0x10000
> +
>  #define MAXX 1024
>  #define MAXY 768
>  #define TCX_DAC_NREGS 16
> @@ -43,6 +47,8 @@ typedef struct TCXState {
>      QemuConsole *con;
>      uint8_t *vram;
>      uint32_t *vram24, *cplane;
> +    hwaddr prom_addr;
> +    MemoryRegion rom;
>      MemoryRegion vram_mem;
>      MemoryRegion vram_8bit;
>      MemoryRegion vram_24bit;
> @@ -529,14 +535,32 @@ static int tcx_init1(SysBusDevice *dev)
>  {
>      TCXState *s = TCX(dev);
>      ram_addr_t vram_offset = 0;
> -    int size;
> +    int size, ret;
>      uint8_t *vram_base;
> +    char *fcode_filename;
>
>      memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
>                             s->vram_size * (1 + 4 + 4));
>      vmstate_register_ram_global(&s->vram_mem);
>      vram_base = memory_region_get_ram_ptr(&s->vram_mem);
>
> +    /* FCode ROM */
> +    memory_region_init_ram(&s->rom, NULL, "tcx.prom", FCODE_MAX_ROM_SIZE);
> +    vmstate_register_ram_global(&s->rom);
> +    memory_region_set_readonly(&s->rom, true);
> +    sysbus_init_mmio(dev, &s->rom);
> +
> +    fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE);
> +    if (fcode_filename) {
> +        ret = load_image_targphys(fcode_filename, s->prom_addr,
> +                                  FCODE_MAX_ROM_SIZE);
> +    }
> +
> +    if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) {
> +        fprintf(stderr, "tcx: could not load prom '%s'\n", TCX_ROM_FILE);
> +        return -1;
> +    }
> +
>      /* 8-bit plane */
>      s->vram = vram_base;
>      size = s->vram_size;
> @@ -598,6 +622,7 @@ static Property tcx_properties[] = {
>      DEFINE_PROP_UINT16("width",    TCXState, width,     -1),
>      DEFINE_PROP_UINT16("height",   TCXState, height,    -1),
>      DEFINE_PROP_UINT16("depth",    TCXState, depth,     -1),
> +    DEFINE_PROP_HEX64("prom_addr", TCXState, prom_addr, -1),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index a0d366c..94f7950 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -537,24 +537,27 @@ static void tcx_init(hwaddr addr, int vram_size, int width,
>      qdev_prop_set_uint16(dev, "width", width);
>      qdev_prop_set_uint16(dev, "height", height);
>      qdev_prop_set_uint16(dev, "depth", depth);
> +    qdev_prop_set_uint64(dev, "prom_addr", addr);
>      qdev_init_nofail(dev);
>      s = SYS_BUS_DEVICE(dev);
> +    /* FCode ROM */
> +    sysbus_mmio_map(s, 0, addr);
>      /* 8-bit plane */
> -    sysbus_mmio_map(s, 0, addr + 0x00800000ULL);
> +    sysbus_mmio_map(s, 1, addr + 0x00800000ULL);
>      /* DAC */
> -    sysbus_mmio_map(s, 1, addr + 0x00200000ULL);
> +    sysbus_mmio_map(s, 2, addr + 0x00200000ULL);
>      /* TEC (dummy) */
> -    sysbus_mmio_map(s, 2, addr + 0x00700000ULL);
> +    sysbus_mmio_map(s, 3, addr + 0x00700000ULL);
>      /* THC 24 bit: NetBSD writes here even with 8-bit display: dummy */
> -    sysbus_mmio_map(s, 3, addr + 0x00301000ULL);
> +    sysbus_mmio_map(s, 4, addr + 0x00301000ULL);
>      if (depth == 24) {
>          /* 24-bit plane */
> -        sysbus_mmio_map(s, 4, addr + 0x02000000ULL);
> +        sysbus_mmio_map(s, 5, addr + 0x02000000ULL);
>          /* Control plane */
> -        sysbus_mmio_map(s, 5, addr + 0x0a000000ULL);
> +        sysbus_mmio_map(s, 6, addr + 0x0a000000ULL);
>      } else {
>          /* THC 8 bit (dummy) */
> -        sysbus_mmio_map(s, 4, addr + 0x00300000ULL);
> +        sysbus_mmio_map(s, 5, addr + 0x00300000ULL);
>      }
>  }
>
> diff --git a/pc-bios/QEMU,tcx.bin b/pc-bios/QEMU,tcx.bin
<cut>

-- 
Regards,
Artyom Tarasenko

linux/sparc and solaris/sparc under qemu blog:
http://tyom.blogspot.com/search/label/qemu

Re: [Qemu-devel] [PATCH for-1.7 1/3] sun4m: Add FCode ROM for TCX framebuffer

[Mark Cave-Ayland]

On 19/12/13 12:59, Artyom Tarasenko wrote:

> Hi Mark,
>
> this patch breaks booting with OBP:
>
> Probing /iommu@0,10000000/sbus@0,10001000 at 5,0  espdma esp sd st
> SUNW,bpp ledma le
> Probing /iommu@0,10000000/sbus@0,10001000 at 4,0  SUNW,CS4231 power-management
> Probing /iommu@0,10000000/sbus@0,10001000 at 1,0  Nothing there
> Probing /iommu@0,10000000/sbus@0,10001000 at 2,0  Nothing there
> Probing /iommu@0,10000000/sbus@0,10001000 at 3,0  SUNW,tcx Memory
> Address not Aligned
>
> ^^^^ After the unaligned access OBP is not properly initialized.
> See the bug 1262081, reported by Peter Bartoli.
>
> Artyom

Ah... I wonder if OBP doesn't like something in the QEMU,tcx.bin FCode 
initialisation function? If you temporarily rename the file (which can 
be found in the share directory) to something else, does boot start to 
work again?

Thinking about it, I suspect I'll need to add some code to the OpenBIOS 
FCode ROMs so that they only initialise if OpenBIOS is detected. This is 
because there is code there that tries to get information from QEMU 
about the screen width/height/depth etc. which will obviously fail on OBP.


ATB,

Mark.

Re: [Qemu-devel] [PATCH for-1.7 1/3] sun4m: Add FCode ROM for TCX framebuffer

[Peter Bartoli]

[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]



-peter

On Dec 19, 2013, at 11:27 AM, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> wrote:
> On 19/12/13 12:59, Artyom Tarasenko wrote:
> 
>> Hi Mark,
>> 
>> this patch breaks booting with OBP:
>> 
>> Probing /iommu@0,10000000/sbus@0,10001000 at 5,0  espdma esp sd st
>> SUNW,bpp ledma le
>> Probing /iommu@0,10000000/sbus@0,10001000 at 4,0  SUNW,CS4231 power-management
>> Probing /iommu@0,10000000/sbus@0,10001000 at 1,0  Nothing there
>> Probing /iommu@0,10000000/sbus@0,10001000 at 2,0  Nothing there
>> Probing /iommu@0,10000000/sbus@0,10001000 at 3,0  SUNW,tcx Memory
>> Address not Aligned
>> 
>> ^^^^ After the unaligned access OBP is not properly initialized.
>> See the bug 1262081, reported by Peter Bartoli.
>> 
>> Artyom
> 
> Ah... I wonder if OBP doesn't like something in the QEMU,tcx.bin FCode initialisation function? If you temporarily rename the file (which can be found in the share directory) to something else, does boot start to work again?
> 
> Thinking about it, I suspect I'll need to add some code to the OpenBIOS FCode ROMs so that they only initialise if OpenBIOS is detected. This is because there is code there that tries to get information from QEMU about the screen width/height/depth etc. which will obviously fail on OBP.
> 
> 
> ATB,
> 
> Mark.


Out of curiosity, and please pardon my ignorance and separate bug filing about the tcx not working with OBP ... but why is it that this doesn't work?

-peter

[-- Attachment #2: Type: text/html, Size: 2517 bytes --]