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

bonito: convert cop to memory API

Browse source 
Signed-off-by: Benoît Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-11-24 14:31:22 +01:00 committed by Avi Kivity
parent def344a6ea
commit 9a542a4821
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
hw/bonito.c
View file

@ -203,6 +203,7 @@ typedef struct PCIBonitoState
/* Bonito registers */ /* Bonito registers */
MemoryRegion iomem; MemoryRegion iomem;
MemoryRegion iomem_ldma; MemoryRegion iomem_ldma;
MemoryRegion iomem_cop;
target_phys_addr_t bonito_pciio_start; target_phys_addr_t bonito_pciio_start;
target_phys_addr_t bonito_pciio_length; target_phys_addr_t bonito_pciio_length;
@ -212,10 +213,6 @@ typedef struct PCIBonitoState
target_phys_addr_t bonito_localio_length; target_phys_addr_t bonito_localio_length;
int bonito_localio_handle; int bonito_localio_handle;
target_phys_addr_t bonito_cop_start;
target_phys_addr_t bonito_cop_length;
int bonito_cop_handle;
} PCIBonitoState; } PCIBonitoState;
PCIBonitoState * bonito_state; PCIBonitoState * bonito_state;
@ -370,7 +367,8 @@ static const MemoryRegionOps bonito_ldma_ops = {
}, },
}; };
static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr) static uint64_t bonito_cop_readl(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
uint32_t val; uint32_t val;
PCIBonitoState *s = opaque; PCIBonitoState *s = opaque;
@ -381,23 +379,21 @@ static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr)
} }
static void bonito_cop_writel(void *opaque, target_phys_addr_t addr, static void bonito_cop_writel(void *opaque, target_phys_addr_t addr,
uint32_t val) uint64_t val, unsigned size)
{ {
PCIBonitoState *s = opaque; PCIBonitoState *s = opaque;
((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)] = val & 0xffffffff; ((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)] = val & 0xffffffff;
} }
static CPUWriteMemoryFunc * const bonito_cop_write[] = { static const MemoryRegionOps bonito_cop_ops = {
NULL, .read = bonito_cop_readl,
NULL, .write = bonito_cop_writel,
bonito_cop_writel, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 4,
static CPUReadMemoryFunc * const bonito_cop_read[] = { .max_access_size = 4,
NULL, },
NULL,
bonito_cop_readl,
}; };
static uint32_t bonito_sbridge_pciaddr(void *opaque, target_phys_addr_t addr) static uint32_t bonito_sbridge_pciaddr(void *opaque, target_phys_addr_t addr)
@ -708,13 +704,10 @@ static int bonito_initfn(PCIDevice *dev)
sysbus_init_mmio_region(sysbus, &s->iomem_ldma); sysbus_init_mmio_region(sysbus, &s->iomem_ldma);
sysbus_mmio_map(sysbus, 3, 0xbfe00200); sysbus_mmio_map(sysbus, 3, 0xbfe00200);
s->bonito_cop_handle = cpu_register_io_memory(bonito_cop_read, memory_region_init_io(&s->iomem_cop, &bonito_cop_ops, s,
bonito_cop_write, s, "cop", 0x100);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(sysbus, &s->iomem_cop);
s->bonito_cop_start = 0xbfe00300; sysbus_mmio_map(sysbus, 4, 0xbfe00300);
s->bonito_cop_length = 0x100;
cpu_register_physical_memory(s->bonito_cop_start, s->bonito_cop_length,
s->bonito_cop_handle);
/* Map PCI IO Space 0x1fd0 0000 - 0x1fd1 0000 */ /* Map PCI IO Space 0x1fd0 0000 - 0x1fd1 0000 */
s->bonito_pciio_start = BONITO_PCIIO_BASE; s->bonito_pciio_start = BONITO_PCIIO_BASE;