haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sparc64: unbreak

Browse source 
... by making apb a subclass of TYPE_PCI_HOST_BRIDGE.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-21-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-07-22 15:54:30 +02:00 committed by Anthony Liguori
parent b23ea25f50
commit 2b8fbcd870
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
hw/pci-host/apb.c
View file

@ -70,9 +70,14 @@ do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
#define MAX_IVEC 0x40 #define MAX_IVEC 0x40
#define NO_IRQ_REQUEST (MAX_IVEC + 1) #define NO_IRQ_REQUEST (MAX_IVEC + 1)
#define TYPE_APB "pbm"
#define APB_DEVICE(obj) \
OBJECT_CHECK(APBState, (obj), TYPE_APB)
typedef struct APBState { typedef struct APBState {
SysBusDevice busdev; PCIHostState parent_obj;
PCIBus *bus;
MemoryRegion apb_config; MemoryRegion apb_config;
MemoryRegion pci_config; MemoryRegion pci_config;
MemoryRegion pci_mmio; MemoryRegion pci_mmio;
@ -284,10 +289,11 @@ static void apb_pci_config_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size)
{ {
APBState *s = opaque; APBState *s = opaque;
PCIHostState *phb = PCI_HOST_BRIDGE(s);
val = qemu_bswap_len(val, size); val = qemu_bswap_len(val, size);
APB_DPRINTF("%s: addr " TARGET_FMT_plx " val %" PRIx64 "\n", __func__, addr, val); APB_DPRINTF("%s: addr " TARGET_FMT_plx " val %" PRIx64 "\n", __func__, addr, val);
pci_data_write(s->bus, addr, val, size); pci_data_write(phb->bus, addr, val, size);
} }
static uint64_t apb_pci_config_read(void *opaque, hwaddr addr, static uint64_t apb_pci_config_read(void *opaque, hwaddr addr,
@ -295,8 +301,9 @@ static uint64_t apb_pci_config_read(void *opaque, hwaddr addr,
{ {
uint32_t ret; uint32_t ret;
APBState *s = opaque; APBState *s = opaque;
PCIHostState *phb = PCI_HOST_BRIDGE(s);
ret = pci_data_read(s->bus, addr, size); ret = pci_data_read(phb->bus, addr, size);
ret = qemu_bswap_len(ret, size); ret = qemu_bswap_len(ret, size);
APB_DPRINTF("%s: addr " TARGET_FMT_plx " -> %x\n", __func__, addr, ret); APB_DPRINTF("%s: addr " TARGET_FMT_plx " -> %x\n", __func__, addr, ret);
return ret; return ret;
@ -381,12 +388,13 @@ PCIBus *pci_apb_init(hwaddr special_base,
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
PCIHostState *phb;
APBState *d; APBState *d;
PCIDevice *pci_dev; PCIDevice *pci_dev;
PCIBridge *br; PCIBridge *br;
/* Ultrasparc PBM main bus */ /* Ultrasparc PBM main bus */
dev = qdev_create(NULL, "pbm"); dev = qdev_create(NULL, TYPE_APB);
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
/* apb_config */ /* apb_config */
@ -395,24 +403,25 @@ PCIBus *pci_apb_init(hwaddr special_base,
sysbus_mmio_map(s, 1, special_base + 0x1000000ULL); sysbus_mmio_map(s, 1, special_base + 0x1000000ULL);
/* pci_ioport */ /* pci_ioport */
sysbus_mmio_map(s, 2, special_base + 0x2000000ULL); sysbus_mmio_map(s, 2, special_base + 0x2000000ULL);
d = FROM_SYSBUS(APBState, s); d = APB_DEVICE(dev);
memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL); memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);
memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio); memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio);
d->bus = pci_register_bus(&d->busdev.qdev, "pci", phb = PCI_HOST_BRIDGE(dev);
pci_apb_set_irq, pci_pbm_map_irq, d, phb->bus = pci_register_bus(DEVICE(phb), "pci",
&d->pci_mmio, pci_apb_set_irq, pci_pbm_map_irq, d,
get_system_io(), &d->pci_mmio,
0, 32, TYPE_PCI_BUS); get_system_io(),
0, 32, TYPE_PCI_BUS);
*pbm_irqs = d->pbm_irqs; *pbm_irqs = d->pbm_irqs;
d->ivec_irqs = ivec_irqs; d->ivec_irqs = ivec_irqs;
pci_create_simple(d->bus, 0, "pbm-pci"); pci_create_simple(phb->bus, 0, "pbm-pci");
/* APB secondary busses */ /* APB secondary busses */
pci_dev = pci_create_multifunction(d->bus, PCI_DEVFN(1, 0), true, pci_dev = pci_create_multifunction(phb->bus, PCI_DEVFN(1, 0), true,
"pbm-bridge"); "pbm-bridge");
br = DO_UPCAST(PCIBridge, dev, pci_dev); br = DO_UPCAST(PCIBridge, dev, pci_dev);
pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 1", pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 1",
@ -420,7 +429,7 @@ PCIBus *pci_apb_init(hwaddr special_base,
qdev_init_nofail(&pci_dev->qdev); qdev_init_nofail(&pci_dev->qdev);
*bus2 = pci_bridge_get_sec_bus(br); *bus2 = pci_bridge_get_sec_bus(br);
pci_dev = pci_create_multifunction(d->bus, PCI_DEVFN(1, 1), true, pci_dev = pci_create_multifunction(phb->bus, PCI_DEVFN(1, 1), true,
"pbm-bridge"); "pbm-bridge");
br = DO_UPCAST(PCIBridge, dev, pci_dev); br = DO_UPCAST(PCIBridge, dev, pci_dev);
pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 2", pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 2",
@ -428,13 +437,13 @@ PCIBus *pci_apb_init(hwaddr special_base,
qdev_init_nofail(&pci_dev->qdev); qdev_init_nofail(&pci_dev->qdev);
*bus3 = pci_bridge_get_sec_bus(br); *bus3 = pci_bridge_get_sec_bus(br);
return d->bus; return phb->bus;
} }
static void pci_pbm_reset(DeviceState *d) static void pci_pbm_reset(DeviceState *d)
{ {
unsigned int i; unsigned int i;
APBState *s = container_of(d, APBState, busdev.qdev); APBState *s = APB_DEVICE(d);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
s->pci_irq_map[i] &= PBM_PCI_IMR_MASK; s->pci_irq_map[i] &= PBM_PCI_IMR_MASK;
@ -463,7 +472,7 @@ static int pci_pbm_init_device(SysBusDevice *dev)
APBState *s; APBState *s;
unsigned int i; unsigned int i;
s = FROM_SYSBUS(APBState, dev); s = APB_DEVICE(dev);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
s->pci_irq_map[i] = (0x1f << 6) | (i << 2); s->pci_irq_map[i] = (0x1f << 6) | (i << 2);
} }
@ -531,8 +540,8 @@ static void pbm_host_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo pbm_host_info = { static const TypeInfo pbm_host_info = {
.name = "pbm", .name = TYPE_APB,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_PCI_HOST_BRIDGE,
.instance_size = sizeof(APBState), .instance_size = sizeof(APBState),
.class_init = pbm_host_class_init, .class_init = pbm_host_class_init,
}; };