|
@@ -24,6 +24,7 @@
|
|
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/log.h"
|
|
#include "qemu/log.h"
|
|
|
|
+#include "qapi/error.h"
|
|
#include "hw/char/xilinx_uartlite.h"
|
|
#include "hw/char/xilinx_uartlite.h"
|
|
#include "hw/irq.h"
|
|
#include "hw/irq.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/qdev-properties.h"
|
|
@@ -57,6 +58,7 @@
|
|
struct XilinxUARTLite {
|
|
struct XilinxUARTLite {
|
|
SysBusDevice parent_obj;
|
|
SysBusDevice parent_obj;
|
|
|
|
|
|
|
|
+ EndianMode model_endianness;
|
|
MemoryRegion mmio;
|
|
MemoryRegion mmio;
|
|
CharBackend chr;
|
|
CharBackend chr;
|
|
qemu_irq irq;
|
|
qemu_irq irq;
|
|
@@ -166,17 +168,21 @@ uart_write(void *opaque, hwaddr addr,
|
|
uart_update_irq(s);
|
|
uart_update_irq(s);
|
|
}
|
|
}
|
|
|
|
|
|
-static const MemoryRegionOps uart_ops = {
|
|
|
|
- .read = uart_read,
|
|
|
|
- .write = uart_write,
|
|
|
|
- .endianness = DEVICE_NATIVE_ENDIAN,
|
|
|
|
- .valid = {
|
|
|
|
- .min_access_size = 1,
|
|
|
|
- .max_access_size = 4
|
|
|
|
- }
|
|
|
|
|
|
+static const MemoryRegionOps uart_ops[2] = {
|
|
|
|
+ [0 ... 1] = {
|
|
|
|
+ .read = uart_read,
|
|
|
|
+ .write = uart_write,
|
|
|
|
+ .valid = {
|
|
|
|
+ .min_access_size = 1,
|
|
|
|
+ .max_access_size = 4,
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ [0].endianness = DEVICE_LITTLE_ENDIAN,
|
|
|
|
+ [1].endianness = DEVICE_BIG_ENDIAN,
|
|
};
|
|
};
|
|
|
|
|
|
static const Property xilinx_uartlite_properties[] = {
|
|
static const Property xilinx_uartlite_properties[] = {
|
|
|
|
+ DEFINE_PROP_ENDIAN_NODEFAULT("endianness", XilinxUARTLite, model_endianness),
|
|
DEFINE_PROP_CHR("chardev", XilinxUARTLite, chr),
|
|
DEFINE_PROP_CHR("chardev", XilinxUARTLite, chr),
|
|
};
|
|
};
|
|
|
|
|
|
@@ -214,6 +220,15 @@ static void xilinx_uartlite_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
{
|
|
XilinxUARTLite *s = XILINX_UARTLITE(dev);
|
|
XilinxUARTLite *s = XILINX_UARTLITE(dev);
|
|
|
|
|
|
|
|
+ if (s->model_endianness == ENDIAN_MODE_UNSPECIFIED) {
|
|
|
|
+ error_setg(errp, TYPE_XILINX_UARTLITE " property 'endianness'"
|
|
|
|
+ " must be set to 'big' or 'little'");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ memory_region_init_io(&s->mmio, OBJECT(dev),
|
|
|
|
+ &uart_ops[s->model_endianness == ENDIAN_MODE_BIG],
|
|
|
|
+ s, "xlnx.xps-uartlite", R_MAX * 4);
|
|
qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
|
|
qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
|
|
uart_event, NULL, s, NULL, true);
|
|
uart_event, NULL, s, NULL, true);
|
|
}
|
|
}
|
|
@@ -223,9 +238,6 @@ static void xilinx_uartlite_init(Object *obj)
|
|
XilinxUARTLite *s = XILINX_UARTLITE(obj);
|
|
XilinxUARTLite *s = XILINX_UARTLITE(obj);
|
|
|
|
|
|
sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
|
|
sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
|
|
-
|
|
|
|
- memory_region_init_io(&s->mmio, obj, &uart_ops, s,
|
|
|
|
- "xlnx.xps-uartlite", R_MAX * 4);
|
|
|
|
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
|
|
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
|
|
}
|
|
}
|
|
|
|
|