From d5295253b0d2baf190180b08c2a531021af91c99 Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 3 Jul 2005 14:00:51 +0000
Subject: [PATCH] VGA bios support for PowerPC

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1494 c046a42c-6fe2-441c-8c8c-71466251a162
---
 Makefile        |   3 ++-
 hw/mips_r4k.c   |   2 +-
 hw/pc.c         |   2 +-
 hw/ppc_chrp.c   |  51 ++++++++++++++++++++++++++++++++++++------------
 hw/vga.c        |  21 +++++++++++++++++---
 hw/vga_int.h    |   2 ++
 pc-bios/video.x | Bin 0 -> 12192 bytes
 vl.h            |   5 +++--
 8 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 pc-bios/video.x

diff --git a/Makefile b/Makefile
index 11b38d15f1..74b1a94eb9 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ install: all
 	mkdir -p "$(datadir)"
 	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
                        pc-bios/vgabios-cirrus.bin \
-                       pc-bios/ppc_rom.bin \
+                       pc-bios/ppc_rom.bin pc-bios/video.x \
                        pc-bios/proll.elf \
                        pc-bios/linux_boot.bin "$(datadir)"
 	mkdir -p "$(docdir)"
@@ -121,6 +121,7 @@ tarbin:
 	$(datadir)/vgabios.bin \
 	$(datadir)/vgabios-cirrus.bin \
 	$(datadir)/ppc_rom.bin \
+	$(datadir)/video.x \
 	$(datadir)/proll.elf \
 	$(datadir)/linux_boot.bin \
 	$(docdir)/qemu-doc.html \
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 9ce4a5ac94..ca135ac39b 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -242,7 +242,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     isa_pic = pic_init(pic_irq_request, cpu_single_env);
     serial_init(0x3f8, 4, serial_hds[0]);
     vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size, 
-                   vga_ram_size);
+                   vga_ram_size, 0, 0);
 
     isa_ne2000_init(0x300, 9, &nd_table[0]);
 }
diff --git a/hw/pc.c b/hw/pc.c
index 696c9192c9..29037db7b5 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -547,7 +547,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
         }
     } else {
         vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, 
-                       vga_ram_size);
+                       vga_ram_size, 0, 0);
     }
 
     rtc_state = rtc_init(0x70, 8);
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index 515806fbb5..5d20333d73 100644
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -24,6 +24,7 @@
 #include "vl.h"
 
 #define BIOS_FILENAME "ppc_rom.bin"
+#define VGABIOS_FILENAME "video.x"
 #define NVRAM_SIZE        0x2000
 
 #define KERNEL_LOAD_ADDR 0x01000000
@@ -232,12 +233,13 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
     void *pic;
     m48t59_t *nvram;
     int PPC_io_memory, unin_memory;
-    int ret, linux_boot, i;
-    unsigned long bios_offset;
+    int linux_boot, i;
+    unsigned long bios_offset, vga_bios_offset;
     uint32_t kernel_base, kernel_size, initrd_base, initrd_size;
     ppc_def_t *def;
     PCIBus *pci_bus;
     const char *arch_name;
+    int vga_bios_size, bios_size;
 
     linux_boot = (kernel_filename != NULL);
 
@@ -247,15 +249,36 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
     /* allocate and load BIOS */
     bios_offset = ram_size + vga_ram_size;
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
-    ret = load_image(buf, phys_ram_base + bios_offset);
-    if (ret != BIOS_SIZE) {
-        fprintf(stderr, "qemu: could not load PPC PREP bios '%s'\n", buf);
+    bios_size = load_image(buf, phys_ram_base + bios_offset);
+    if (bios_size < 0 || bios_size > BIOS_SIZE) {
+        fprintf(stderr, "qemu: could not load PowerPC bios '%s'\n", buf);
         exit(1);
     }
-    cpu_register_physical_memory((uint32_t)(-BIOS_SIZE), 
-                                 BIOS_SIZE, bios_offset | IO_MEM_ROM);
-    cpu_single_env->nip = 0xfffffffc;
-
+    bios_size = (bios_size + 0xfff) & ~0xfff;
+    cpu_register_physical_memory((uint32_t)(-bios_size), 
+                                 bios_size, bios_offset | IO_MEM_ROM);
+    
+    /* allocate and load VGA BIOS */
+    vga_bios_offset = bios_offset + bios_size;
+    snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME);
+    vga_bios_size = load_image(buf, phys_ram_base + vga_bios_offset + 8);
+    if (vga_bios_size < 0) {
+        /* if no bios is present, we can still work */
+        fprintf(stderr, "qemu: warning: could not load VGA bios '%s'\n", buf);
+        vga_bios_size = 0;
+    } else {
+        /* set a specific header (XXX: find real Apple format for NDRV
+           drivers) */
+        phys_ram_base[vga_bios_offset] = 'N';
+        phys_ram_base[vga_bios_offset + 1] = 'D';
+        phys_ram_base[vga_bios_offset + 2] = 'R';
+        phys_ram_base[vga_bios_offset + 3] = 'V';
+        cpu_to_be32w((uint32_t *)(phys_ram_base + vga_bios_offset + 4), 
+                     vga_bios_size);
+        vga_bios_size += 8;
+    }
+    vga_bios_size = (vga_bios_size + 0xfff) & ~0xfff;
+    
     if (linux_boot) {
         kernel_base = KERNEL_LOAD_ADDR;
         /* now we can load the kernel */
@@ -321,8 +344,9 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
         cpu_register_physical_memory(0xfe000000, 0x00200000, PPC_io_memory);
         
         /* init basic PC hardware */
-        vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, 
-                       vga_ram_size);
+        vga_initialize(pci_bus, ds, phys_ram_base + ram_size, 
+                       ram_size, vga_ram_size,
+                       vga_bios_offset, vga_bios_size);
         pic = heathrow_pic_init(&heathrow_pic_mem_index);
         set_irq = heathrow_pic_set_irq;
         pci_set_pic(pci_bus, set_irq, pic);
@@ -363,8 +387,9 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
         cpu_register_physical_memory(0xf8000000, 0x00001000, unin_memory);
 
         /* init basic PC hardware */
-        vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, 
-                       vga_ram_size);
+        vga_initialize(pci_bus, ds, phys_ram_base + ram_size,
+                       ram_size, vga_ram_size,
+                       vga_bios_offset, vga_bios_size);
         pic = openpic_init(NULL, &openpic_mem_index, 1);
         set_irq = openpic_set_irq;
         pci_set_pic(pci_bus, set_irq, pic);
diff --git a/hw/vga.c b/hw/vga.c
index 2c425ffe9b..49e5b211f9 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1654,8 +1654,11 @@ static void vga_map(PCIDevice *pci_dev, int region_num,
                     uint32_t addr, uint32_t size, int type)
 {
     VGAState *s = vga_state;
-
-    cpu_register_physical_memory(addr, s->vram_size, s->vram_offset);
+    if (region_num == PCI_ROM_SLOT) {
+        cpu_register_physical_memory(addr, s->bios_size, s->bios_offset);
+    } else {
+        cpu_register_physical_memory(addr, s->vram_size, s->vram_offset);
+    }
 }
 
 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, 
@@ -1701,7 +1704,8 @@ void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
 
 
 int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, 
-                   unsigned long vga_ram_offset, int vga_ram_size)
+                   unsigned long vga_ram_offset, int vga_ram_size,
+                   unsigned long vga_bios_offset, int vga_bios_size)
 {
     VGAState *s;
 
@@ -1776,6 +1780,17 @@ int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
         /* XXX: vga_ram_size must be a power of two */
         pci_register_io_region(d, 0, vga_ram_size, 
                                PCI_ADDRESS_SPACE_MEM_PREFETCH, vga_map);
+        if (vga_bios_size != 0) {
+            unsigned int bios_total_size;
+            s->bios_offset = vga_bios_offset;
+            s->bios_size = vga_bios_size;
+            /* must be a power of two */
+            bios_total_size = 1;
+            while (bios_total_size < vga_bios_size)
+                bios_total_size <<= 1;
+            pci_register_io_region(d, PCI_ROM_SLOT, bios_total_size, 
+                                   PCI_ADDRESS_SPACE_MEM_PREFETCH, vga_map);
+        }
     } else {
 #ifdef CONFIG_BOCHS_VBE
         /* XXX: use optimized standard vga accesses */
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 2e7fb30efb..621268de4c 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -78,6 +78,8 @@
     uint8_t *vram_ptr;                                                  \
     unsigned long vram_offset;                                          \
     unsigned int vram_size;                                             \
+    unsigned long bios_offset;                                          \
+    unsigned int bios_size;                                             \
     uint32_t latch;                                                     \
     uint8_t sr_index;                                                   \
     uint8_t sr[256];                                                    \
diff --git a/pc-bios/video.x b/pc-bios/video.x
new file mode 100644
index 0000000000000000000000000000000000000000..761aa0c9d47fc3648a64ccfe9b9747b2a3af9572
GIT binary patch
literal 12192
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
C=6}@y

literal 0
HcmV?d00001

diff --git a/vl.h b/vl.h
index 6f6aba75b8..85d0cf4733 100644
--- a/vl.h
+++ b/vl.h
@@ -137,7 +137,7 @@ extern int win2k_install_hack;
 
 /* XXX: make it dynamic */
 #if defined (TARGET_PPC)
-#define BIOS_SIZE (512 * 1024)
+#define BIOS_SIZE ((512 + 32) * 1024)
 #elif defined(TARGET_MIPS)
 #define BIOS_SIZE (128 * 1024)
 #else
@@ -596,7 +596,8 @@ static inline void dpy_resize(DisplayState *s, int w, int h)
 }
 
 int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, 
-                   unsigned long vga_ram_offset, int vga_ram_size);
+                   unsigned long vga_ram_offset, int vga_ram_size,
+                   unsigned long vga_bios_offset, int vga_bios_size);
 void vga_update_display(void);
 void vga_invalidate_display(void);
 void vga_screen_dump(const char *filename);