From b6b8bd1819ffe95ff3b04c66610af5a4d7ba605f Mon Sep 17 00:00:00 2001 From: bellard Date: Mon, 21 Jun 2004 16:55:53 +0000 Subject: ppc init fixes git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@957 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/ppc_chrp.c | 86 ++++++++++++++++++++++++++++++++++++++++++----------------- hw/ppc_prep.c | 30 +++++++++------------ 2 files changed, 75 insertions(+), 41 deletions(-) diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index 481bed7a72..5411806fc2 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -26,16 +26,22 @@ #define BIOS_FILENAME "ppc_rom.bin" #define NVRAM_SIZE 0x2000 +#define KERNEL_LOAD_ADDR 0x01000000 +#define INITRD_LOAD_ADDR 0x01800000 + /* MacIO devices (mapped inside the MacIO address space): CUDA, DBDMA, NVRAM (not implemented). */ static int dbdma_mem_index; static int cuda_mem_index; +static int ide0_mem_index; +static int ide1_mem_index; /* DBDMA: currently no op - should suffice right now */ static void dbdma_writeb (void *opaque, target_phys_addr_t addr, uint32_t value) { + printf("%s: 0x%08x <= 0x%08x\n", __func__, addr, value); } static void dbdma_writew (void *opaque, target_phys_addr_t addr, uint32_t value) @@ -48,6 +54,7 @@ static void dbdma_writel (void *opaque, target_phys_addr_t addr, uint32_t value) static uint32_t dbdma_readb (void *opaque, target_phys_addr_t addr) { + printf("%s: 0x%08x => 0x00000000\n", __func__, addr); return 0; } @@ -78,6 +85,8 @@ static void macio_map(PCIDevice *pci_dev, int region_num, { cpu_register_physical_memory(addr + 0x08000, 0x1000, dbdma_mem_index); cpu_register_physical_memory(addr + 0x16000, 0x2000, cuda_mem_index); + cpu_register_physical_memory(addr + 0x1f000, 0x1000, ide0_mem_index); + cpu_register_physical_memory(addr + 0x20000, 0x1000, ide1_mem_index); } static void macio_init(void) @@ -91,7 +100,7 @@ static void macio_init(void) in PearPC */ d->config[0x00] = 0x6b; // vendor_id d->config[0x01] = 0x10; - d->config[0x02] = 0x17; + d->config[0x02] = 0x22; d->config[0x03] = 0x00; d->config[0x0a] = 0x00; // class_sub = pci2pci @@ -113,10 +122,12 @@ void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, const char *initrd_filename) { char buf[1024]; + openpic_t *openpic; m48t59_t *nvram; int PPC_io_memory; int ret, linux_boot, i, fd; unsigned long bios_offset; + uint32_t kernel_base, kernel_size, initrd_base, initrd_size; linux_boot = (kernel_filename != NULL); @@ -135,26 +146,55 @@ void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, BIOS_SIZE, bios_offset | IO_MEM_ROM); cpu_single_env->nip = 0xfffffffc; + if (linux_boot) { + kernel_base = KERNEL_LOAD_ADDR; + /* now we can load the kernel */ + kernel_size = load_image(kernel_filename, phys_ram_base + kernel_base); + if (kernel_size < 0) { + fprintf(stderr, "qemu: could not load kernel '%s'\n", + kernel_filename); + exit(1); + } + /* load initrd */ + if (initrd_filename) { + initrd_base = INITRD_LOAD_ADDR; + initrd_size = load_image(initrd_filename, + phys_ram_base + initrd_base); + if (initrd_size < 0) { + fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", + initrd_filename); + exit(1); + } + } else { + initrd_base = 0; + initrd_size = 0; + } + boot_device = 'm'; + } else { + kernel_base = 0; + kernel_size = 0; + initrd_base = 0; + initrd_size = 0; + } /* Register CPU as a 74x/75x */ cpu_ppc_register(cpu_single_env, 0x00080000); /* Set time-base frequency to 100 Mhz */ cpu_ppc_tb_init(cpu_single_env, 100UL * 1000UL * 1000UL); - isa_mem_base = 0xc0000000; + isa_mem_base = 0x80000000; pci_pmac_init(); - /* Register 64 KB of ISA IO space */ + /* Register 8 MB of ISA IO space */ PPC_io_memory = cpu_register_io_memory(0, PPC_io_read, PPC_io_write, NULL); - cpu_register_physical_memory(0x80000000, 0x10000, PPC_io_memory); - // cpu_register_physical_memory(0xfe000000, 0xfe010000, PPC_io_memory); + cpu_register_physical_memory(0xF2000000, 0x00800000, PPC_io_memory); /* init basic PC hardware */ vga_initialize(ds, phys_ram_base + ram_size, ram_size, vga_ram_size, 1); - // openpic = openpic_init(0x00000000, 0xF0000000, 1); - // pic_init(openpic); + openpic = openpic_init(0x00000000, 0xF0000000, 1); + + /* XXX: suppress that */ pic_init(); - // pit = pit_init(0x40, 0); /* XXX: use Mac Serial port */ fd = serial_open_device(); @@ -164,30 +204,28 @@ void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, pci_ne2000_init(&nd_table[i]); } - pci_ide_init(bs_table); + ide0_mem_index = pmac_ide_init(&bs_table[0], openpic, 0x13); + ide1_mem_index = pmac_ide_init(&bs_table[2], openpic, 0x13); /* cuda also initialize ADB */ - cuda_mem_index = cuda_init(); + cuda_mem_index = cuda_init(openpic, 0x19); adb_kbd_init(&adb_bus); adb_mouse_init(&adb_bus); macio_init(); - nvram = m48t59_init(8, 0x0074, NVRAM_SIZE); + nvram = m48t59_init(8, 0xFFF04000, 0x0074, NVRAM_SIZE); + + if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) + graphic_depth = 15; - PPC_NVRAM_set_params(nvram, NVRAM_SIZE, "PREP", ram_size, boot_device, - 0, 0, - 0, - 0, - 0, 0, + PPC_NVRAM_set_params(nvram, NVRAM_SIZE, "CHRP", ram_size, boot_device, + kernel_base, kernel_size, + kernel_cmdline, + initrd_base, initrd_size, /* XXX: need an option to load a NVRAM image */ - 0 - ); - - /* Special port to get debug messages from Open-Firmware */ - register_ioport_write(0xFF00, 0x04, 1, &PREP_debug_write, NULL); - register_ioport_write(0xFF00, 0x04, 2, &PREP_debug_write, NULL); - - pci_ppc_bios_init(); + 0, + graphic_width, graphic_height, graphic_depth); + /* No PCI init: the BIOS will do it */ } diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 45b5853a6d..8d4e9801a9 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -26,8 +26,9 @@ //#define HARD_DEBUG_PPC_IO //#define DEBUG_PPC_IO -#define KERNEL_LOAD_ADDR 0x01000000; -#define INITRD_LOAD_ADDR 0x01800000; +#define BIOS_FILENAME "ppc_rom.bin" +#define KERNEL_LOAD_ADDR 0x01000000 +#define INITRD_LOAD_ADDR 0x01800000 extern int loglevel; extern FILE *logfile; @@ -39,7 +40,7 @@ extern FILE *logfile; #if defined (HARD_DEBUG_PPC_IO) #define PPC_IO_DPRINTF(fmt, args...) \ do { \ - if (loglevel > 0) { \ + if (loglevel & CPU_LOG_IOPORT) { \ fprintf(logfile, "%s: " fmt, __func__ , ##args); \ } else { \ printf("%s : " fmt, __func__ , ##args); \ @@ -48,7 +49,7 @@ do { \ #elif defined (DEBUG_PPC_IO) #define PPC_IO_DPRINTF(fmt, args...) \ do { \ - if (loglevel > 0) { \ + if (loglevel & CPU_LOG_IOPORT) { \ fprintf(logfile, "%s: " fmt, __func__ , ##args); \ } \ } while (0) @@ -56,7 +57,6 @@ do { \ #define PPC_IO_DPRINTF(fmt, args...) do { } while (0) #endif -#define BIOS_FILENAME "ppc_rom.bin" /* Constants for devices init */ static const int ide_iobase[2] = { 0x1f0, 0x170 }; static const int ide_iobase2[2] = { 0x3f6, 0x376 }; @@ -175,7 +175,6 @@ static struct { uint32_t eemck1; /* Error diagnostic */ } XCSR; -#endif static void PPC_XCSR_writeb (void *opaque, target_phys_addr_t addr, uint32_t value) { @@ -242,6 +241,7 @@ static CPUReadMemoryFunc *PPC_XCSR_read[] = { &PPC_XCSR_readw, &PPC_XCSR_readl, }; +#endif /* Fake super-io ports for PREP platform (Intel 82378ZB) */ typedef struct sysctrl_t { @@ -413,7 +413,6 @@ void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, const char *initrd_filename) { char buf[1024]; - // void *openpic; m48t59_t *nvram; int PPC_io_memory; int ret, linux_boot, i, nb_nics1, fd; @@ -506,7 +505,7 @@ void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, bs_table[2 * i], bs_table[2 * i + 1]); } kbd_init(); - DMA_init(); + DMA_init(1); // AUD_init(); // SB16_init(); @@ -528,10 +527,12 @@ void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, PPC_intack_write, NULL); cpu_register_physical_memory(0xBFFFFFF0, 0x4, PPC_io_memory); /* PowerPC control and status register group */ +#if 0 PPC_io_memory = cpu_register_io_memory(0, PPC_XCSR_read, PPC_XCSR_write, NULL); cpu_register_physical_memory(0xFEFF0000, 0x1000, PPC_io_memory); +#endif - nvram = m48t59_init(8, 0x0074, NVRAM_SIZE); + nvram = m48t59_init(8, 0, 0x0074, NVRAM_SIZE); if (nvram == NULL) return; sysctrl->nvram = nvram; @@ -539,16 +540,11 @@ void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, /* Initialise NVRAM */ PPC_NVRAM_set_params(nvram, NVRAM_SIZE, "PREP", ram_size, boot_device, kernel_base, kernel_size, - (uint32_t)(long)kernel_cmdline, - strlen(kernel_cmdline), + kernel_cmdline, initrd_base, initrd_size, /* XXX: need an option to load a NVRAM image */ - 0 - ); - - /* Special port to get debug messages from Open-Firmware */ - register_ioport_write(0xFF00, 0x04, 1, &PREP_debug_write, NULL); - register_ioport_write(0xFF00, 0x04, 2, &PREP_debug_write, NULL); + 0, + graphic_width, graphic_height, graphic_depth); pci_ppc_bios_init(); } -- cgit v1.2.3