PowerPC 4xx device emulation improvements

Signed-off-by Hollis Blanchard <[email protected]>

qemu/hw/ppc4xx.h +23 -0

@@ -2,6 +2,9 @@
  * QEMU PowerPC 4xx emulation shared definitions
  *
  * Copyright (c) 2007 Jocelyn Mayer
+ *
+ * Copyright 2008 IBM Corp.
+ * Authors: Hollis Blanchard <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

@@ -46,4 +49,41 @@
 qemu_irq *ppcuic_init (CPUState *env, qemu_irq *irqs,
                        uint32_t dcr_base, int has_ssr, int has_vr);
 
+
+struct pci_master_map {
+    uint32_t la;
+    uint32_t ma;
+    uint32_t pcila;
+    uint32_t pciha;
+};
+
+struct pci_target_map {
+    uint32_t ms;
+    uint32_t la;
+    uint32_t bar;
+};
+
+#define PPC44x_PCI_NR_PMMS 3
+#define PPC44x_PCI_NR_PTMS 2
+
+struct ppc4xx_pci_t {
+    target_phys_addr_t config_space;
+    target_phys_addr_t registers;

qemu/hw/ppc4xx.h +7 -0

+
+ppc4xx_pci_t *ppc4xx_pci_init(CPUState *env, qemu_irq *pic,
+                              target_phys_addr_t config_space,
+                              target_phys_addr_t int_ack,
+                              target_phys_addr_t special_cycle,
+                              target_phys_addr_t registers);
+
 #endif /* !defined(PPC_4XX_H) */

qemu/hw/ppc4xx_devs.c +5 -0

@@ -2,6 +2,9 @@
  * QEMU PowerPC 4xx embedded processors shared devices emulation
  *
  * Copyright (c) 2007 Jocelyn Mayer
+ *
+ * Copyright 2008 IBM Corp.
+ * Authors: Hollis Blanchard <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

@@ -25,6 +28,8 @@
 #include "ppc.h"
 #include "ppc4xx.h"
 #include "sysemu.h"
+#include "pci.h"
+#include "bswap.h"
 
 extern int loglevel;
 extern FILE *logfile;

qemu/hw/ppc4xx_devs.c +17 -0

+
+#define PCIL0_PMM0LA        0x0
+#define PCIL0_PMM0MA        0x4
+#define PCIL0_PMM0PCILA     0x8
+#define PCIL0_PMM0PCIHA     0xc
+#define PCIL0_PMM1LA        0x10
+#define PCIL0_PMM1MA        0x14
+#define PCIL0_PMM1PCILA     0x18
+#define PCIL0_PMM1PCIHA     0x1c
+#define PCIL0_PMM2LA        0x20
+#define PCIL0_PMM2MA        0x24
+#define PCIL0_PMM2PCILA     0x28
+#define PCIL0_PMM2PCIHA     0x2c
+#define PCIL0_PTM1MS        0x30
+#define PCIL0_PTM1LA        0x34
+#define PCIL0_PTM2MS        0x38
+#define PCIL0_PTM2LA        0x3c

qemu/hw/ppc4xx_devs.c +28 -0

+
+    ppc4xx_pci->pcic0_cfgaddr = value & ~0x3;
+}
+
+static CPUWriteMemoryFunc *pci4xx_cfgaddr_write[] = {
+    &pci4xx_cfgaddr_write4,
+    &pci4xx_cfgaddr_write4,
+    &pci4xx_cfgaddr_write4,
+};
+
+static uint32_t pci4xx_cfgdata_read1(void *opaque, target_phys_addr_t addr)
+{
+    ppc4xx_pci_t *ppc4xx_pci = opaque;
+    int offset = addr & 0x3;
+    uint32_t cfgaddr = ppc4xx_pci->pcic0_cfgaddr;
+    uint32_t value;
+
+    if (!(cfgaddr & (1<<31)))
+        return 0xffffffff;
+
+    value = pci_data_read(ppc4xx_pci->bus, cfgaddr | offset, 1);
+
+    return value;
+}
+
+static uint32_t pci4xx_cfgdata_read2(void *opaque, target_phys_addr_t addr)
+{
+    ppc4xx_pci_t *ppc4xx_pci = opaque;

qemu/hw/ppc4xx_devs.c +5 -0

+}
+
+static uint32_t pci4xx_cfgdata_read4(void *opaque, target_phys_addr_t addr)
+{
+    ppc4xx_pci_t *ppc4xx_pci = opaque;

qemu/hw/ppc4xx_devs.c +15 -0

+}
+
+static CPUReadMemoryFunc *pci4xx_cfgdata_read[] = {
+    &pci4xx_cfgdata_read1,
+    &pci4xx_cfgdata_read2,
+    &pci4xx_cfgdata_read4,
+};
+
+static void pci4xx_cfgdata_write1(void *opaque, target_phys_addr_t addr,
+                                  uint32_t value)
+{
+    ppc4xx_pci_t *ppc4xx_pci = opaque;
+    int offset = addr & 0x3;
+
+    pci_data_write(ppc4xx_pci->bus, ppc4xx_pci->pcic0_cfgaddr | offset,

qemu/hw/ppc4xx_devs.c +8 -0

+
+    pci_data_write(ppc4xx_pci->bus, ppc4xx_pci->pcic0_cfgaddr | offset,
+                   value, 4);
+}
+
+static CPUWriteMemoryFunc *pci4xx_cfgdata_write[] = {
+    &pci4xx_cfgdata_write1,
+    &pci4xx_cfgdata_write2,

qemu/hw/ppc4xx_devs.c +72 -0

+
+    switch (offset) {
+    case PCIL0_PMM0LA:
+        pci->pmm[0].la = value;
+        break;
+    case PCIL0_PMM1LA:
+        pci->pmm[0].la = value;
+        break;
+    case PCIL0_PMM2LA:
+        pci->pmm[0].la = value;
+        break;
+    default:
+        //printf("  unhandled PCI internal register 0x%lx\n", offset);
+        break;
+    }
+}
+
+static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
+{
+    struct ppc4xx_pci_t *pci = opaque;
+    unsigned long offset = addr - pci->registers;
+    uint32_t value;
+
+    switch (offset) {
+    case PCIL0_PMM0LA:
+        value = pci->pmm[0].la;
+        break;
+    case PCIL0_PMM0MA:
+        value = pci->pmm[0].ma;
+        break;
+    case PCIL0_PMM0PCIHA:
+        value = pci->pmm[0].pciha;
+        break;
+    case PCIL0_PMM0PCILA:
+        value = pci->pmm[0].pcila;
+        break;
+
+    case PCIL0_PMM1LA:
+        value = pci->pmm[1].la;
+        break;
+    case PCIL0_PMM1MA:
+        value = pci->pmm[1].ma;
+        break;
+    case PCIL0_PMM1PCIHA:
+        value = pci->pmm[1].pciha;
+        break;
+    case PCIL0_PMM1PCILA:
+        value = pci->pmm[1].pcila;
+        break;
+
+    case PCIL0_PMM2LA:
+        value = pci->pmm[2].la;
+        break;
+    case PCIL0_PMM2MA:
+        value = pci->pmm[2].ma;
+        break;
+    case PCIL0_PMM2PCIHA:
+        value = pci->pmm[2].pciha;
+        break;
+    case PCIL0_PMM2PCILA:
+        value = pci->pmm[2].pcila;
+        break;
+
+    case PCIL0_PTM1MS:
+        value = pci->ptm[0].ms;
+        break;
+    case PCIL0_PTM1LA:
+        value = pci->ptm[0].la;
+        break;
+    case PCIL0_PTM2MS:
+        value = pci->ptm[1].ms;
+        break;

qemu/hw/ppc4xx_devs.c +9 -0

+
+    return value;
+}
+
+static CPUReadMemoryFunc *pci_reg_read[] = {
+    &pci_reg_read4,
+    &pci_reg_read4,
+    &pci_reg_read4,
+};

qemu/hw/ppc4xx_devs.c +97 -0

+}
+
+static CPUWriteMemoryFunc *pci_special_write[] = {
+    &pci_special_write4,
+    &pci_special_write4,
+    &pci_special_write4,
+};
+
+static int bamboo_pci_map_irq(PCIDevice *pci_dev, int irq_num)
+{
+    int slot = pci_dev->devfn >> 3;
+
+#if 0
+    printf("### %s: devfn %x irq %d -> %d\n", __func__,
+           pci_dev->devfn, irq_num, slot+1);
+#endif
+
+    /* All pins from each slot are tied to a single board IRQ (2-5) */
+    return slot + 1;
+}
+
+static void bamboo_pci_set_irq(qemu_irq *pic, int irq_num, int level)
+{
+#if 0
+    printf("### %s: PCI irq %d, UIC irq %d\n", __func__, irq_num, 30 - irq_num);
+#endif
+
+    /* Board IRQs 2-5 are connected to UIC IRQs 28-25 */
+    qemu_set_irq(pic[30-irq_num], level);
+}
+
+/* XXX Needs some abstracting for boards other than Bamboo. */
+ppc4xx_pci_t *ppc4xx_pci_init(CPUState *env, qemu_irq *pic,
+                              target_phys_addr_t config_space,
+                              target_phys_addr_t int_ack,
+                              target_phys_addr_t special_cycle,
+                              target_phys_addr_t registers)
+{
+    ppc4xx_pci_t *pci;
+    PCIDevice *d;
+    int index;
+
+    pci = qemu_mallocz(sizeof(ppc4xx_pci_t));
+    if (!pci)
+        return NULL;
+
+    pci->config_space = config_space;
+    pci->registers = registers;
+    pci->pic = pic;
+
+    pci->bus = pci_register_bus(bamboo_pci_set_irq, bamboo_pci_map_irq,
+                                pic, 0, 4);
+    d = pci_register_device(pci->bus, "host bridge", sizeof(PCIDevice),
+                            0, NULL, NULL);
+    d->config[0x00] = 0x14; // vendor_id
+    d->config[0x01] = 0x10;
+    d->config[0x02] = 0x7f; // device_id
+    d->config[0x03] = 0x02;
+    d->config[0x0a] = 0x80; // class_sub = other bridge type
+    d->config[0x0b] = 0x06; // class_base = PCI_bridge
+
+    /* CFGADDR */
+    index = cpu_register_io_memory(0, pci4xx_cfgaddr_read,
+                                   pci4xx_cfgaddr_write, pci);
+    if (index < 0)
+        goto free;
+    cpu_register_physical_memory(config_space, 4, index);
+
+    /* CFGDATA */
+    index = cpu_register_io_memory(0, pci4xx_cfgdata_read,
+                                   pci4xx_cfgdata_write, pci);
+    if (index < 0)
+        goto free;
+    cpu_register_physical_memory(config_space + 4, 4, index);
+
+    /* "Special cycle" and interrupt acknowledge */
+    index = cpu_register_io_memory(0, pci_int_ack_read,
+                                   pci_special_write, pci);
+    if (index < 0)
+        goto free;
+    cpu_register_physical_memory(int_ack, 4, index);
+
+    /* Internal registers */
+    index = cpu_register_io_memory(0, pci_reg_read, pci_reg_write, pci);
+    if (index < 0)
+        goto free;
+    cpu_register_physical_memory(registers, PCI_REG_SIZE, index);
+
+    /* XXX register_savevm() */
+
+    return pci;
+
+free:
+    printf("%s error\n", __func__);
+    qemu_free(pci);
+    return NULL;
+}