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 11b38d15f1a..74b1a94eb99 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 9ce4a5ac940..ca135ac39bf 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 696c9192c90..29037db7b5b 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 515806fbb5d..5d20333d738 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 2c425ffe9bb..49e5b211f9b 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 2e7fb30efb5..621268de4c5 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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
Bf7Jj0

literal 0
Hc-jL100001

diff --git a/vl.h b/vl.h
index 6f6aba75b86..85d0cf47330 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);
-- 
2.39.5