OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

xilinx: Convert most xilinx devices to MemoryRegion 

This converts ethlite, intc, timer and uartlite to use
MemoryRegions.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Edgar E. Iglesias 2011-08-26 00:13:47 +02:00
parent fe0de7aa5e
commit 010f3f5fbd
4 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/xilinx_ethlite.c
View File

@ -50,6 +50,7 @@
struct xlx_ethlite struct xlx_ethlite
{ {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio;
qemu_irq irq; qemu_irq irq;
NICState *nic; NICState *nic;
NICConf conf; NICConf conf;
@ -70,7 +71,8 @@ static inline void eth_pulse_irq(struct xlx_ethlite *s)
} }
} }
static uint32_t eth_readl (void *opaque, target_phys_addr_t addr) static uint64_t
eth_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{ {
struct xlx_ethlite *s = opaque; struct xlx_ethlite *s = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -98,10 +100,12 @@ static uint32_t eth_readl (void *opaque, target_phys_addr_t addr)
} }
static void static void
eth_writel (void *opaque, target_phys_addr_t addr, uint32_t value) eth_write(void *opaque, target_phys_addr_t addr,
uint64_t val64, unsigned int size)
{ {
struct xlx_ethlite *s = opaque; struct xlx_ethlite *s = opaque;
unsigned int base = 0; unsigned int base = 0;
uint32_t value = val64;
addr >>= 2; addr >>= 2;
switch (addr) switch (addr)
@ -146,12 +150,14 @@ eth_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
} }
} }
static CPUReadMemoryFunc * const eth_read[] = { static const MemoryRegionOps eth_ops = {
NULL, NULL, &eth_readl, .read = eth_read,
}; .write = eth_write,
.endianness = DEVICE_NATIVE_ENDIAN,
static CPUWriteMemoryFunc * const eth_write[] = { .valid = {
NULL, NULL, &eth_writel, .min_access_size = 4,
.max_access_size = 4
}
}; };
static int eth_can_rx(VLANClientState *nc) static int eth_can_rx(VLANClientState *nc)
@ -206,13 +212,12 @@ static NetClientInfo net_xilinx_ethlite_info = {
static int xilinx_ethlite_init(SysBusDevice *dev) static int xilinx_ethlite_init(SysBusDevice *dev)
{ {
struct xlx_ethlite *s = FROM_SYSBUS(typeof (*s), dev); struct xlx_ethlite *s = FROM_SYSBUS(typeof (*s), dev);
int regs;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
s->rxbuf = 0; s->rxbuf = 0;
regs = cpu_register_io_memory(eth_read, eth_write, s, DEVICE_NATIVE_ENDIAN); memory_region_init_io(&s->mmio, &eth_ops, s, "xilinx-ethlite", R_MAX * 4);
sysbus_init_mmio(dev, R_MAX * 4, regs); sysbus_init_mmio_region(dev, &s->mmio);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_xilinx_ethlite_info, &s->conf, s->nic = qemu_new_nic(&net_xilinx_ethlite_info, &s->conf,

29
hw/xilinx_intc.c
View File

@ -40,6 +40,7 @@
struct xlx_pic struct xlx_pic
{ {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio;
qemu_irq parent_irq; qemu_irq parent_irq;
/* Configuration reg chosen at synthesis-time. QEMU populates /* Configuration reg chosen at synthesis-time. QEMU populates
@ -72,7 +73,8 @@ static void update_irq(struct xlx_pic *p)
} }
} }
static uint32_t pic_readl (void *opaque, target_phys_addr_t addr) static uint64_t
pic_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{ {
struct xlx_pic *p = opaque; struct xlx_pic *p = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -91,9 +93,11 @@ static uint32_t pic_readl (void *opaque, target_phys_addr_t addr)
} }
static void static void
pic_writel (void *opaque, target_phys_addr_t addr, uint32_t value) pic_write(void *opaque, target_phys_addr_t addr,
uint64_t val64, unsigned int size)
{ {
struct xlx_pic *p = opaque; struct xlx_pic *p = opaque;
uint32_t value = val64;
addr >>= 2; addr >>= 2;
D(qemu_log("%s addr=%x val=%x\n", __func__, addr * 4, value)); D(qemu_log("%s addr=%x val=%x\n", __func__, addr * 4, value));
@ -116,14 +120,14 @@ pic_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
update_irq(p); update_irq(p);
} }
static CPUReadMemoryFunc * const pic_read[] = { static const MemoryRegionOps pic_ops = {
NULL, NULL, .read = pic_read,
&pic_readl, .write = pic_write,
}; .endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
static CPUWriteMemoryFunc * const pic_write[] = { .min_access_size = 4,
NULL, NULL, .max_access_size = 4
&pic_writel, }
}; };
static void irq_handler(void *opaque, int irq, int level) static void irq_handler(void *opaque, int irq, int level)
@ -148,13 +152,12 @@ static void irq_handler(void *opaque, int irq, int level)
static int xilinx_intc_init(SysBusDevice *dev) static int xilinx_intc_init(SysBusDevice *dev)
{ {
struct xlx_pic *p = FROM_SYSBUS(typeof (*p), dev); struct xlx_pic *p = FROM_SYSBUS(typeof (*p), dev);
int pic_regs;
qdev_init_gpio_in(&dev->qdev, irq_handler, 32); qdev_init_gpio_in(&dev->qdev, irq_handler, 32);
sysbus_init_irq(dev, &p->parent_irq); sysbus_init_irq(dev, &p->parent_irq);
pic_regs = cpu_register_io_memory(pic_read, pic_write, p, DEVICE_NATIVE_ENDIAN); memory_region_init_io(&p->mmio, &pic_ops, p, "xilinx-pic", R_MAX * 4);
sysbus_init_mmio(dev, R_MAX * 4, pic_regs); sysbus_init_mmio_region(dev, &p->mmio);
return 0; return 0;
} }

31
hw/xilinx_timer.c
View File

@ -59,6 +59,7 @@ struct xlx_timer
struct timerblock struct timerblock
{ {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio;
qemu_irq irq; qemu_irq irq;
uint32_t nr_timers; uint32_t nr_timers;
uint32_t freq_hz; uint32_t freq_hz;
@ -85,7 +86,8 @@ static void timer_update_irq(struct timerblock *t)
qemu_set_irq(t->irq, !!irq); qemu_set_irq(t->irq, !!irq);
} }
static uint32_t timer_readl (void *opaque, target_phys_addr_t addr) static uint64_t
timer_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{ {
struct timerblock *t = opaque; struct timerblock *t = opaque;
struct xlx_timer *xt; struct xlx_timer *xt;
@ -134,11 +136,13 @@ static void timer_enable(struct xlx_timer *xt)
} }
static void static void
timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) timer_write(void *opaque, target_phys_addr_t addr,
uint64_t val64, unsigned int size)
{ {
struct timerblock *t = opaque; struct timerblock *t = opaque;
struct xlx_timer *xt; struct xlx_timer *xt;
unsigned int timer; unsigned int timer;
uint32_t value = val64;
addr >>= 2; addr >>= 2;
timer = timer_from_addr(addr); timer = timer_from_addr(addr);
@ -166,14 +170,14 @@ timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
timer_update_irq(t); timer_update_irq(t);
} }
static CPUReadMemoryFunc * const timer_read[] = { static const MemoryRegionOps timer_ops = {
NULL, NULL, .read = timer_read,
&timer_readl, .write = timer_write,
}; .endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
static CPUWriteMemoryFunc * const timer_write[] = { .min_access_size = 4,
NULL, NULL, .max_access_size = 4
&timer_writel, }
}; };
static void timer_hit(void *opaque) static void timer_hit(void *opaque)
@ -192,7 +196,6 @@ static int xilinx_timer_init(SysBusDevice *dev)
{ {
struct timerblock *t = FROM_SYSBUS(typeof (*t), dev); struct timerblock *t = FROM_SYSBUS(typeof (*t), dev);
unsigned int i; unsigned int i;
int timer_regs;
/* All timers share a single irq line. */ /* All timers share a single irq line. */
sysbus_init_irq(dev, &t->irq); sysbus_init_irq(dev, &t->irq);
@ -209,9 +212,9 @@ static int xilinx_timer_init(SysBusDevice *dev)
ptimer_set_freq(xt->ptimer, t->freq_hz); ptimer_set_freq(xt->ptimer, t->freq_hz);
} }
timer_regs = cpu_register_io_memory(timer_read, timer_write, t, memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer",
DEVICE_NATIVE_ENDIAN); R_MAX * 4 * t->nr_timers);
sysbus_init_mmio(dev, R_MAX * 4 * t->nr_timers, timer_regs); sysbus_init_mmio_region(dev, &t->mmio);
return 0; return 0;
} }

32
hw/xilinx_uartlite.c
View File

@ -49,6 +49,7 @@
struct xlx_uartlite struct xlx_uartlite
{ {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio;
CharDriverState *chr; CharDriverState *chr;
qemu_irq irq; qemu_irq irq;
@ -82,7 +83,8 @@ static void uart_update_status(struct xlx_uartlite *s)
s->regs[R_STATUS] = r; s->regs[R_STATUS] = r;
} }
static uint32_t uart_readl (void *opaque, target_phys_addr_t addr) static uint64_t
uart_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{ {
struct xlx_uartlite *s = opaque; struct xlx_uartlite *s = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -107,9 +109,11 @@ static uint32_t uart_readl (void *opaque, target_phys_addr_t addr)
} }
static void static void
uart_writel (void *opaque, target_phys_addr_t addr, uint32_t value) uart_write(void *opaque, target_phys_addr_t addr,
uint64_t val64, unsigned int size)
{ {
struct xlx_uartlite *s = opaque; struct xlx_uartlite *s = opaque;
uint32_t value = val64;
unsigned char ch = value; unsigned char ch = value;
addr >>= 2; addr >>= 2;
@ -147,16 +151,14 @@ uart_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
uart_update_irq(s); uart_update_irq(s);
} }
static CPUReadMemoryFunc * const uart_read[] = { static const MemoryRegionOps uart_ops = {
&uart_readl, .read = uart_read,
&uart_readl, .write = uart_write,
&uart_readl, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 1,
static CPUWriteMemoryFunc * const uart_write[] = { .max_access_size = 4
&uart_writel, }
&uart_writel,
&uart_writel,
}; };
static void uart_rx(void *opaque, const uint8_t *buf, int size) static void uart_rx(void *opaque, const uint8_t *buf, int size)
@ -196,14 +198,12 @@ static void uart_event(void *opaque, int event)
static int xilinx_uartlite_init(SysBusDevice *dev) static int xilinx_uartlite_init(SysBusDevice *dev)
{ {
struct xlx_uartlite *s = FROM_SYSBUS(typeof (*s), dev); struct xlx_uartlite *s = FROM_SYSBUS(typeof (*s), dev);
int uart_regs;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
uart_update_status(s); uart_update_status(s);
uart_regs = cpu_register_io_memory(uart_read, uart_write, s, memory_region_init_io(&s->mmio, &uart_ops, s, "xilinx-uartlite", R_MAX * 4);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->mmio);
sysbus_init_mmio(dev, R_MAX * 4, uart_regs);
s->chr = qdev_init_chardev(&dev->qdev); s->chr = qdev_init_chardev(&dev->qdev);
if (s->chr) if (s->chr)