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

sh_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:30 +03:00 committed by Anthony Liguori
parent d76120135b
commit fb57117a19
1 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
hw/sh_pci.c
View file

@ -33,13 +33,16 @@ typedef struct SHPCIState {
PCIBus *bus; PCIBus *bus;
PCIDevice *dev; PCIDevice *dev;
qemu_irq irq[4]; qemu_irq irq[4];
int memconfig; MemoryRegion memconfig_p4;
MemoryRegion memconfig_a7;
MemoryRegion isa;
uint32_t par; uint32_t par;
uint32_t mbr; uint32_t mbr;
uint32_t iobr; uint32_t iobr;
} SHPCIState; } SHPCIState;
static void sh_pci_reg_write (void *p, target_phys_addr_t addr, uint32_t val) static void sh_pci_reg_write (void *p, target_phys_addr_t addr, uint64_t val,
unsigned size)
{ {
SHPCIState *pcic = p; SHPCIState *pcic = p;
switch(addr) { switch(addr) {
@ -54,10 +57,10 @@ static void sh_pci_reg_write (void *p, target_phys_addr_t addr, uint32_t val)
break; break;
case 0x1c8: case 0x1c8:
if ((val & 0xfffc0000) != (pcic->iobr & 0xfffc0000)) { if ((val & 0xfffc0000) != (pcic->iobr & 0xfffc0000)) {
cpu_register_physical_memory(pcic->iobr & 0xfffc0000, 0x40000, memory_region_del_subregion(get_system_memory(), &pcic->isa);
IO_MEM_UNASSIGNED);
pcic->iobr = val & 0xfffc0001; pcic->iobr = val & 0xfffc0001;
isa_mmio_init(pcic->iobr & 0xfffc0000, 0x40000); memory_region_add_subregion(get_system_memory(),
pcic->iobr & 0xfffc0000, &pcic->isa);
} }
break; break;
case 0x220: case 0x220:
@ -66,7 +69,8 @@ static void sh_pci_reg_write (void *p, target_phys_addr_t addr, uint32_t val)
} }
} }
static uint32_t sh_pci_reg_read (void *p, target_phys_addr_t addr) static uint64_t sh_pci_reg_read (void *p, target_phys_addr_t addr,
unsigned size)
{ {
SHPCIState *pcic = p; SHPCIState *pcic = p;
switch(addr) { switch(addr) {
@ -84,14 +88,14 @@ static uint32_t sh_pci_reg_read (void *p, target_phys_addr_t addr)
return 0; return 0;
} }
typedef struct { static const MemoryRegionOps sh_pci_reg_ops = {
CPUReadMemoryFunc * const r[3]; .read = sh_pci_reg_read,
CPUWriteMemoryFunc * const w[3]; .write = sh_pci_reg_write,
} MemOp; .endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
static MemOp sh_pci_reg = { .min_access_size = 4,
{ NULL, NULL, sh_pci_reg_read }, .max_access_size = 4,
{ NULL, NULL, sh_pci_reg_write }, },
}; };
static int sh_pci_map_irq(PCIDevice *d, int irq_num) static int sh_pci_map_irq(PCIDevice *d, int irq_num)
@ -110,11 +114,23 @@ static void sh_pci_map(SysBusDevice *dev, target_phys_addr_t base)
{ {
SHPCIState *s = FROM_SYSBUS(SHPCIState, dev); SHPCIState *s = FROM_SYSBUS(SHPCIState, dev);
cpu_register_physical_memory(P4ADDR(base), 0x224, s->memconfig); memory_region_add_subregion(get_system_memory(),
cpu_register_physical_memory(A7ADDR(base), 0x224, s->memconfig); P4ADDR(base),
&s->memconfig_p4);
memory_region_add_subregion(get_system_memory(),
A7ADDR(base),
&s->memconfig_a7);
s->iobr = 0xfe240000; s->iobr = 0xfe240000;
isa_mmio_init(s->iobr, 0x40000); memory_region_add_subregion(get_system_memory(), s->iobr, &s->isa);
}
static void sh_pci_unmap(SysBusDevice *dev, target_phys_addr_t base)
{
SHPCIState *s = FROM_SYSBUS(SHPCIState, dev);
memory_region_del_subregion(get_system_memory(), &s->memconfig_p4);
memory_region_del_subregion(get_system_memory(), &s->memconfig_a7);
memory_region_del_subregion(get_system_memory(), &s->isa);
} }
static int sh_pci_init_device(SysBusDevice *dev) static int sh_pci_init_device(SysBusDevice *dev)
@ -132,9 +148,14 @@ static int sh_pci_init_device(SysBusDevice *dev)
get_system_memory(), get_system_memory(),
get_system_io(), get_system_io(),
PCI_DEVFN(0, 0), 4); PCI_DEVFN(0, 0), 4);
s->memconfig = cpu_register_io_memory(sh_pci_reg.r, sh_pci_reg.w, memory_region_init_io(&s->memconfig_p4, &sh_pci_reg_ops, s,
s, DEVICE_NATIVE_ENDIAN); "sh_pci", 0x224);
sysbus_init_mmio_cb(dev, 0x224, sh_pci_map); memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_a7,
0, 0x224);
isa_mmio_setup(&s->isa, 0x40000);
sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap);
sysbus_init_mmio_region(dev, &s->memconfig_a7);
sysbus_init_mmio_region(dev, &s->isa);
s->dev = pci_create_simple(s->bus, PCI_DEVFN(0, 0), "sh_pci_host"); s->dev = pci_create_simple(s->bus, PCI_DEVFN(0, 0), "sh_pci_host");
return 0; return 0;
} }