david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonito: convert ldma 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:21 +01:00 committed by Avi Kivity
parent 845cbeb8e3
commit def344a6ea
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

@ -202,6 +202,7 @@ typedef struct PCIBonitoState
/* Bonito registers */ /* Bonito registers */
MemoryRegion iomem; MemoryRegion iomem;
MemoryRegion iomem_ldma;
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;
@ -211,10 +212,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_ldma_start;
target_phys_addr_t bonito_ldma_length;
int bonito_ldma_handle;
target_phys_addr_t bonito_cop_start; target_phys_addr_t bonito_cop_start;
target_phys_addr_t bonito_cop_length; target_phys_addr_t bonito_cop_length;
int bonito_cop_handle; int bonito_cop_handle;
@ -344,7 +341,8 @@ static const MemoryRegionOps bonito_pciconf_ops = {
}, },
}; };
static uint32_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr) static uint64_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
uint32_t val; uint32_t val;
PCIBonitoState *s = opaque; PCIBonitoState *s = opaque;
@ -355,23 +353,21 @@ static uint32_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr)
} }
static void bonito_ldma_writel(void *opaque, target_phys_addr_t addr, static void bonito_ldma_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->bonldma))[addr/sizeof(uint32_t)] = val & 0xffffffff; ((uint32_t *)(&s->bonldma))[addr/sizeof(uint32_t)] = val & 0xffffffff;
} }
static CPUWriteMemoryFunc * const bonito_ldma_write[] = { static const MemoryRegionOps bonito_ldma_ops = {
NULL, .read = bonito_ldma_readl,
NULL, .write = bonito_ldma_writel,
bonito_ldma_writel, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 4,
static CPUReadMemoryFunc * const bonito_ldma_read[] = { .max_access_size = 4,
NULL, },
NULL,
bonito_ldma_readl,
}; };
static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr) static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr)
@ -707,13 +703,10 @@ static int bonito_initfn(PCIDevice *dev)
sysbus_init_mmio_region(sysbus, &s->pcihost->data_mem); sysbus_init_mmio_region(sysbus, &s->pcihost->data_mem);
sysbus_mmio_map(sysbus, 2, BONITO_SPCICONFIG_BASE); sysbus_mmio_map(sysbus, 2, BONITO_SPCICONFIG_BASE);
s->bonito_ldma_handle = cpu_register_io_memory(bonito_ldma_read, memory_region_init_io(&s->iomem_ldma, &bonito_ldma_ops, s,
bonito_ldma_write, s, "ldma", 0x100);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(sysbus, &s->iomem_ldma);
s->bonito_ldma_start = 0xbfe00200; sysbus_mmio_map(sysbus, 3, 0xbfe00200);
s->bonito_ldma_length = 0x100;
cpu_register_physical_memory(s->bonito_ldma_start, s->bonito_ldma_length,
s->bonito_ldma_handle);
s->bonito_cop_handle = cpu_register_io_memory(bonito_cop_read, s->bonito_cop_handle = cpu_register_io_memory(bonito_cop_read,
bonito_cop_write, s, bonito_cop_write, s,