mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips/gt64xxx_pci: Add a 'cpu-little-endian' qdev property

Browse Source 
This device does not have to be TARGET-dependent.
Add a 'cpu_big_endian' property which sets the byte-swapping
options if required.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20221220113436.14299-5-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2019-06-24 17:06:24 +02:00 committed by Philippe Mathieu-Daudé
parent 81ad24762d
commit a699b915de
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/mips/gt64xxx_pci.c
View File

@ -26,6 +26,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/qdev-properties.h"
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "hw/pci/pci_device.h" #include "hw/pci/pci_device.h"
#include "hw/pci/pci_host.h" #include "hw/pci/pci_host.h"
@ -256,6 +257,9 @@ struct GT64120State {
PCI_MAPPING_ENTRY(ISD); PCI_MAPPING_ENTRY(ISD);
MemoryRegion pci0_mem; MemoryRegion pci0_mem;
AddressSpace pci0_mem_as; AddressSpace pci0_mem_as;
/* properties */
bool cpu_little_endian;
}; };
/* Adjust range to avoid touching space which isn't mappable via PCI */ /* Adjust range to avoid touching space which isn't mappable via PCI */
@ -1035,16 +1039,11 @@ static const MemoryRegionOps isd_mem_ops = {
static void gt64120_reset(DeviceState *dev) static void gt64120_reset(DeviceState *dev)
{ {
GT64120State *s = GT64120_PCI_HOST_BRIDGE(dev); GT64120State *s = GT64120_PCI_HOST_BRIDGE(dev);
#if TARGET_BIG_ENDIAN
bool cpu_little_endian = false;
#else
bool cpu_little_endian = true;
#endif
/* FIXME: Malta specific hw assumptions ahead */ /* FIXME: Malta specific hw assumptions ahead */
/* CPU Configuration */ /* CPU Configuration */
s->regs[GT_CPU] = cpu_little_endian ? R_GT_CPU_Endianness_MASK : 0; s->regs[GT_CPU] = s->cpu_little_endian ? R_GT_CPU_Endianness_MASK : 0;
s->regs[GT_MULTI] = 0x00000003; s->regs[GT_MULTI] = 0x00000003;
/* CPU Address decode */ /* CPU Address decode */
@ -1151,7 +1150,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_TC_CONTROL] = 0x00000000; s->regs[GT_TC_CONTROL] = 0x00000000;
/* PCI Internal */ /* PCI Internal */
s->regs[GT_PCI0_CMD] = cpu_little_endian ? R_GT_PCI0_CMD_ByteSwap_MASK : 0; s->regs[GT_PCI0_CMD] = s->cpu_little_endian ? R_GT_PCI0_CMD_ByteSwap_MASK : 0;
s->regs[GT_PCI0_TOR] = 0x0000070f; s->regs[GT_PCI0_TOR] = 0x0000070f;
s->regs[GT_PCI0_BS_SCS10] = 0x00fff000; s->regs[GT_PCI0_BS_SCS10] = 0x00fff000;
s->regs[GT_PCI0_BS_SCS32] = 0x00fff000; s->regs[GT_PCI0_BS_SCS32] = 0x00fff000;
@ -1168,7 +1167,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_PCI0_SSCS10_BAR] = 0x00000000; s->regs[GT_PCI0_SSCS10_BAR] = 0x00000000;
s->regs[GT_PCI0_SSCS32_BAR] = 0x01000000; s->regs[GT_PCI0_SSCS32_BAR] = 0x01000000;
s->regs[GT_PCI0_SCS3BT_BAR] = 0x1f000000; s->regs[GT_PCI0_SCS3BT_BAR] = 0x1f000000;
s->regs[GT_PCI1_CMD] = cpu_little_endian ? R_GT_PCI1_CMD_ByteSwap_MASK : 0; s->regs[GT_PCI1_CMD] = s->cpu_little_endian ? R_GT_PCI1_CMD_ByteSwap_MASK : 0;
s->regs[GT_PCI1_TOR] = 0x0000070f; s->regs[GT_PCI1_TOR] = 0x0000070f;
s->regs[GT_PCI1_BS_SCS10] = 0x00fff000; s->regs[GT_PCI1_BS_SCS10] = 0x00fff000;
s->regs[GT_PCI1_BS_SCS32] = 0x00fff000; s->regs[GT_PCI1_BS_SCS32] = 0x00fff000;
@ -1262,11 +1261,18 @@ static const TypeInfo gt64120_pci_info = {
}, },
}; };
static Property gt64120_properties[] = {
DEFINE_PROP_BOOL("cpu-little-endian", GT64120State,
cpu_little_endian, !TARGET_BIG_ENDIAN),
DEFINE_PROP_END_OF_LIST(),
};
static void gt64120_class_init(ObjectClass *klass, void *data) static void gt64120_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
device_class_set_props(dc, gt64120_properties);
dc->realize = gt64120_realize; dc->realize = gt64120_realize;
dc->reset = gt64120_reset; dc->reset = gt64120_reset;
dc->vmsd = &vmstate_gt64120; dc->vmsd = &vmstate_gt64120;