mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

versatile_pci: convert to memory API

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-08-15 17:17:32 +03:00 committed by Anthony Liguori
parent 1635bdfa78
commit 45de094eb8
1 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
hw/versatile_pci.c
View File

@ -16,7 +16,9 @@ typedef struct {
SysBusDevice busdev; SysBusDevice busdev;
qemu_irq irq[4]; qemu_irq irq[4];
int realview; int realview;
int mem_config; MemoryRegion mem_config;
MemoryRegion mem_config2;
MemoryRegion isa;
} PCIVPBState; } PCIVPBState;
static inline uint32_t vpb_pci_config_addr(target_phys_addr_t addr) static inline uint32_t vpb_pci_config_addr(target_phys_addr_t addr)
@ -24,55 +26,24 @@ static inline uint32_t vpb_pci_config_addr(target_phys_addr_t addr)
return addr & 0xffffff; return addr & 0xffffff;
} }
static void pci_vpb_config_writeb (void *opaque, target_phys_addr_t addr, static void pci_vpb_config_write(void *opaque, target_phys_addr_t addr,
uint32_t val) uint64_t val, unsigned size)
{ {
pci_data_write(opaque, vpb_pci_config_addr (addr), val, 1); pci_data_write(opaque, vpb_pci_config_addr(addr), val, size);
} }
static void pci_vpb_config_writew (void *opaque, target_phys_addr_t addr, static uint64_t pci_vpb_config_read(void *opaque, target_phys_addr_t addr,
uint32_t val) unsigned size)
{
pci_data_write(opaque, vpb_pci_config_addr (addr), val, 2);
}
static void pci_vpb_config_writel (void *opaque, target_phys_addr_t addr,
uint32_t val)
{
pci_data_write(opaque, vpb_pci_config_addr (addr), val, 4);
}
static uint32_t pci_vpb_config_readb (void *opaque, target_phys_addr_t addr)
{ {
uint32_t val; uint32_t val;
val = pci_data_read(opaque, vpb_pci_config_addr (addr), 1); val = pci_data_read(opaque, vpb_pci_config_addr(addr), size);
return val; return val;
} }
static uint32_t pci_vpb_config_readw (void *opaque, target_phys_addr_t addr) static const MemoryRegionOps pci_vpb_config_ops = {
{ .read = pci_vpb_config_read,
uint32_t val; .write = pci_vpb_config_write,
val = pci_data_read(opaque, vpb_pci_config_addr (addr), 2); .endianness = DEVICE_NATIVE_ENDIAN,
return val;
}
static uint32_t pci_vpb_config_readl (void *opaque, target_phys_addr_t addr)
{
uint32_t val;
val = pci_data_read(opaque, vpb_pci_config_addr (addr), 4);
return val;
}
static CPUWriteMemoryFunc * const pci_vpb_config_write[] = {
&pci_vpb_config_writeb,
&pci_vpb_config_writew,
&pci_vpb_config_writel,
};
static CPUReadMemoryFunc * const pci_vpb_config_read[] = {
&pci_vpb_config_readb,
&pci_vpb_config_readw,
&pci_vpb_config_readl,
}; };
static int pci_vpb_map_irq(PCIDevice *d, int irq_num) static int pci_vpb_map_irq(PCIDevice *d, int irq_num)
@ -87,17 +58,35 @@ static void pci_vpb_set_irq(void *opaque, int irq_num, int level)
qemu_set_irq(pic[irq_num], level); qemu_set_irq(pic[irq_num], level);
} }
static void pci_vpb_map(SysBusDevice *dev, target_phys_addr_t base) static void pci_vpb_map(SysBusDevice *dev, target_phys_addr_t base)
{ {
PCIVPBState *s = (PCIVPBState *)dev; PCIVPBState *s = (PCIVPBState *)dev;
/* Selfconfig area. */ /* Selfconfig area. */
cpu_register_physical_memory(base + 0x01000000, 0x1000000, s->mem_config); memory_region_add_subregion(get_system_memory(), base + 0x01000000,
&s->mem_config);
/* Normal config area. */ /* Normal config area. */
cpu_register_physical_memory(base + 0x02000000, 0x1000000, s->mem_config); memory_region_add_subregion(get_system_memory(), base + 0x02000000,
&s->mem_config2);
if (s->realview) { if (s->realview) {
/* IO memory area. */ /* IO memory area. */
isa_mmio_init(base + 0x03000000, 0x00100000); memory_region_add_subregion(get_system_memory(), base + 0x03000000,
&s->isa);
}
}
static void pci_vpb_unmap(SysBusDevice *dev, target_phys_addr_t base)
{
PCIVPBState *s = (PCIVPBState *)dev;
/* Selfconfig area. */
memory_region_del_subregion(get_system_memory(), &s->mem_config);
/* Normal config area. */
memory_region_del_subregion(get_system_memory(), &s->mem_config2);
if (s->realview) {
/* IO memory area. */
memory_region_del_subregion(get_system_memory(), &s->isa);
} }
} }
@ -117,10 +106,15 @@ static int pci_vpb_init(SysBusDevice *dev)
/* ??? Register memory space. */ /* ??? Register memory space. */
s->mem_config = cpu_register_io_memory(pci_vpb_config_read, memory_region_init_io(&s->mem_config, &pci_vpb_config_ops, bus,
pci_vpb_config_write, bus, "pci-vpb-selfconfig", 0x1000000);
DEVICE_LITTLE_ENDIAN); memory_region_init_io(&s->mem_config2, &pci_vpb_config_ops, bus,
sysbus_init_mmio_cb(dev, 0x04000000, pci_vpb_map); "pci-vpb-config", 0x1000000);
if (s->realview) {
isa_mmio_setup(&s->isa, 0x0100000);
}
sysbus_init_mmio_cb2(dev, pci_vpb_map, pci_vpb_unmap);
pci_create_simple(bus, -1, "versatile_pci_host"); pci_create_simple(bus, -1, "versatile_pci_host");
return 0; return 0;