[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 41/58] ahci: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 41/58] ahci: convert to memory API |
Date: |
Sun, 17 Jul 2011 14:14:08 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/ide/ahci.c | 31 +++++++++++++------------------
hw/ide/ahci.h | 2 +-
hw/ide/ich.c | 3 +--
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 1f008a3..e207ca0 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -276,12 +276,12 @@ static void ahci_port_write(AHCIState *s, int port, int
offset, uint32_t val)
}
}
-static uint32_t ahci_mem_readl(void *ptr, target_phys_addr_t addr)
+static uint64_t ahci_mem_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
- AHCIState *s = ptr;
+ AHCIState *s = opaque;
uint32_t val = 0;
- addr = addr & 0xfff;
if (addr < AHCI_GENERIC_HOST_CONTROL_REGS_MAX_ADDR) {
switch (addr) {
case HOST_CAP:
@@ -314,10 +314,10 @@ static uint32_t ahci_mem_readl(void *ptr,
target_phys_addr_t addr)
-static void ahci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val)
+static void ahci_mem_write(void *opaque, target_phys_addr_t addr,
+ uint64_t val, unsigned size)
{
- AHCIState *s = ptr;
- addr = addr & 0xfff;
+ AHCIState *s = opaque;
/* Only aligned reads are allowed on AHCI */
if (addr & 3) {
@@ -364,16 +364,10 @@ static void ahci_mem_writel(void *ptr, target_phys_addr_t
addr, uint32_t val)
}
-static CPUReadMemoryFunc * const ahci_readfn[3]={
- ahci_mem_readl,
- ahci_mem_readl,
- ahci_mem_readl
-};
-
-static CPUWriteMemoryFunc * const ahci_writefn[3]={
- ahci_mem_writel,
- ahci_mem_writel,
- ahci_mem_writel
+static MemoryRegionOps ahci_mem_ops = {
+ .read = ahci_mem_read,
+ .write = ahci_mem_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
static void ahci_reg_init(AHCIState *s)
@@ -1131,8 +1125,8 @@ void ahci_init(AHCIState *s, DeviceState *qdev, int ports)
s->ports = ports;
s->dev = qemu_mallocz(sizeof(AHCIDevice) * ports);
ahci_reg_init(s);
- s->mem = cpu_register_io_memory(ahci_readfn, ahci_writefn, s,
- DEVICE_LITTLE_ENDIAN);
+ /* XXX BAR size should be 1k, but that breaks, so bump it to 4k for now */
+ memory_region_init_io(&s->mem, &ahci_mem_ops, s, "ahci", 0x1000);
irqs = qemu_allocate_irqs(ahci_irq_set, s, s->ports);
for (i = 0; i < s->ports; i++) {
@@ -1151,6 +1145,7 @@ void ahci_init(AHCIState *s, DeviceState *qdev, int ports)
void ahci_uninit(AHCIState *s)
{
+ memory_region_destroy(&s->mem);
qemu_free(s->dev);
}
diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h
index dc86951..e456193 100644
--- a/hw/ide/ahci.h
+++ b/hw/ide/ahci.h
@@ -289,7 +289,7 @@ struct AHCIDevice {
typedef struct AHCIState {
AHCIDevice *dev;
AHCIControlRegs control_regs;
- int mem;
+ MemoryRegion mem;
int ports;
qemu_irq irq;
} AHCIState;
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 054e073..7e497c3 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -93,8 +93,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev)
msi_init(dev, 0x50, 1, true, false);
d->ahci.irq = d->card.irq[0];
- /* XXX BAR size should be 1k, but that breaks, so bump it to 4k for now */
- pci_register_bar_simple(&d->card, 5, 0x1000, 0, d->ahci.mem);
+ pci_register_bar_region(&d->card, 5, 0, &d->ahci.mem);
return 0;
}
--
1.7.5.3
- [Qemu-devel] [RFC v4 26/58] cirrus: simplify vga window mmio access functions, (continued)
- [Qemu-devel] [RFC v4 26/58] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 34/58] ac97: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 16/58] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 09/58] memory: add backward compatibility for old portio registration, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 48/58] isa-mmio: concert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 52/58] xen-platform: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 24/58] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 46/58] pcnet: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 57/58] pci: fold BAR mapping function into its caller, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 21/58] pci: add API to get a BAR's mapped address, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 41/58] ahci: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [RFC v4 32/58] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 51/58] uhci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 49/58] sun4u: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 17/58] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 38/58] ide: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 45/58] ne2000: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 39/58] ivshmem: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 58/58] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 56/58] pci: remove pci_register_bar(), Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 44/58] ppc: convert to memory API, Avi Kivity, 2011/07/17