ppc/ppc405: QOM'ify FPGA

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <ed6ff1705dadb46b456e424aa0f0420f1d18d92c.1660746880.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Cédric Le Goater 2022-08-17 17:08:37 +02:00 committed by Daniel Henrique Barboza
parent 111913fb2d
commit ea9b318695

View File

@ -71,18 +71,23 @@ struct Ppc405MachineState {
* - NVRAM (0xF0000000) * - NVRAM (0xF0000000)
* - FPGA (0xF0300000) * - FPGA (0xF0300000)
*/ */
typedef struct ref405ep_fpga_t ref405ep_fpga_t;
struct ref405ep_fpga_t { #define TYPE_REF405EP_FPGA "ref405ep-fpga"
OBJECT_DECLARE_SIMPLE_TYPE(Ref405epFpgaState, REF405EP_FPGA);
struct Ref405epFpgaState {
SysBusDevice parent_obj;
MemoryRegion iomem;
uint8_t reg0; uint8_t reg0;
uint8_t reg1; uint8_t reg1;
}; };
static uint64_t ref405ep_fpga_readb(void *opaque, hwaddr addr, unsigned size) static uint64_t ref405ep_fpga_readb(void *opaque, hwaddr addr, unsigned size)
{ {
ref405ep_fpga_t *fpga; Ref405epFpgaState *fpga = opaque;
uint32_t ret; uint32_t ret;
fpga = opaque;
switch (addr) { switch (addr) {
case 0x0: case 0x0:
ret = fpga->reg0; ret = fpga->reg0;
@ -101,9 +106,8 @@ static uint64_t ref405ep_fpga_readb(void *opaque, hwaddr addr, unsigned size)
static void ref405ep_fpga_writeb(void *opaque, hwaddr addr, uint64_t value, static void ref405ep_fpga_writeb(void *opaque, hwaddr addr, uint64_t value,
unsigned size) unsigned size)
{ {
ref405ep_fpga_t *fpga; Ref405epFpgaState *fpga = opaque;
fpga = opaque;
switch (addr) { switch (addr) {
case 0x0: case 0x0:
/* Read only */ /* Read only */
@ -126,27 +130,40 @@ static const MemoryRegionOps ref405ep_fpga_ops = {
.endianness = DEVICE_BIG_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void ref405ep_fpga_reset (void *opaque) static void ref405ep_fpga_reset(DeviceState *dev)
{ {
ref405ep_fpga_t *fpga; Ref405epFpgaState *fpga = REF405EP_FPGA(dev);
fpga = opaque;
fpga->reg0 = 0x00; fpga->reg0 = 0x00;
fpga->reg1 = 0x0F; fpga->reg1 = 0x0F;
} }
static void ref405ep_fpga_init(MemoryRegion *sysmem, uint32_t base) static void ref405ep_fpga_realize(DeviceState *dev, Error **errp)
{ {
ref405ep_fpga_t *fpga; Ref405epFpgaState *s = REF405EP_FPGA(dev);
MemoryRegion *fpga_memory = g_new(MemoryRegion, 1);
fpga = g_new0(ref405ep_fpga_t, 1); memory_region_init_io(&s->iomem, OBJECT(s), &ref405ep_fpga_ops, s,
memory_region_init_io(fpga_memory, NULL, &ref405ep_fpga_ops, fpga,
"fpga", 0x00000100); "fpga", 0x00000100);
memory_region_add_subregion(sysmem, base, fpga_memory); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
qemu_register_reset(&ref405ep_fpga_reset, fpga);
} }
static void ref405ep_fpga_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
dc->realize = ref405ep_fpga_realize;
dc->reset = ref405ep_fpga_reset;
/* Reason: only works as part of a ppc405 board */
dc->user_creatable = false;
}
static const TypeInfo ref405ep_fpga_type = {
.name = TYPE_REF405EP_FPGA,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Ref405epFpgaState),
.class_init = ref405ep_fpga_class_init,
};
/* /*
* CPU reset handler when booting directly from a loaded kernel * CPU reset handler when booting directly from a loaded kernel
*/ */
@ -331,7 +348,11 @@ static void ref405ep_init(MachineState *machine)
memory_region_add_subregion(get_system_memory(), PPC405EP_SRAM_BASE, sram); memory_region_add_subregion(get_system_memory(), PPC405EP_SRAM_BASE, sram);
/* Register FPGA */ /* Register FPGA */
ref405ep_fpga_init(get_system_memory(), PPC405EP_FPGA_BASE); dev = qdev_new(TYPE_REF405EP_FPGA);
object_property_add_child(OBJECT(machine), "fpga", OBJECT(dev));
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, PPC405EP_FPGA_BASE);
/* Register NVRAM */ /* Register NVRAM */
dev = qdev_new("sysbus-m48t08"); dev = qdev_new("sysbus-m48t08");
qdev_prop_set_int32(dev, "base-year", 1968); qdev_prop_set_int32(dev, "base-year", 1968);
@ -376,6 +397,7 @@ static void ppc405_machine_init(void)
{ {
type_register_static(&ppc405_machine_type); type_register_static(&ppc405_machine_type);
type_register_static(&ref405ep_type); type_register_static(&ref405ep_type);
type_register_static(&ref405ep_fpga_type);
} }
type_init(ppc405_machine_init) type_init(ppc405_machine_init)