m68k: QOMify the MCF Fast Ethernet Controller device
When running qemu-system-m68k with the "-net" parameter (for example simply "-net nic -net user"), there is currently a confusing warning message saying: Warning: requested NIC (anonymous, model mcf_fec) was not created (not supported by this machine?) This seems to happen because the MCF NIC has never been adapted to the currently expected QEMU device behavior. Thus let's QOMify the NIC now to get rid of the warning message. Signed-off-by: Thomas Huth <huth@tuxfamily.org> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Thomas Huth
Jason Wang
parent
d5aa3e6e0c
commit
6ac38ed42b
|
|
@ -11,6 +11,7 @@
|
|||
#include "cpu.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/m68k/mcf.h"
|
||||
#include "hw/m68k/mcf_fec.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
|
|
@ -18,6 +19,7 @@
|
|||
#include "net/net.h"
|
||||
#include "hw/boards.h"
|
||||
#include "hw/loader.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "elf.h"
|
||||
#include "exec/address-spaces.h"
|
||||
|
||||
|
|
@ -192,6 +194,26 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
|
|||
}
|
||||
}
|
||||
|
||||
static void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd, hwaddr base,
|
||||
qemu_irq *irqs)
|
||||
{
|
||||
DeviceState *dev;
|
||||
SysBusDevice *s;
|
||||
int i;
|
||||
|
||||
qemu_check_nic_model(nd, TYPE_MCF_FEC_NET);
|
||||
dev = qdev_create(NULL, TYPE_MCF_FEC_NET);
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
qdev_init_nofail(dev);
|
||||
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
for (i = 0; i < FEC_NUM_IRQ; i++) {
|
||||
sysbus_connect_irq(s, i, irqs[i]);
|
||||
}
|
||||
|
||||
memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(s, 0));
|
||||
}
|
||||
|
||||
static void mcf5208evb_init(MachineState *machine)
|
||||
{
|
||||
ram_addr_t ram_size = machine->ram_size;
|
||||
|
|
@ -243,9 +265,10 @@ static void mcf5208evb_init(MachineState *machine)
|
|||
fprintf(stderr, "Too many NICs\n");
|
||||
exit(1);
|
||||
}
|
||||
if (nd_table[0].used)
|
||||
if (nd_table[0].used) {
|
||||
mcf_fec_init(address_space_mem, &nd_table[0],
|
||||
0xfc030000, pic + 36);
|
||||
}
|
||||
|
||||
/* 0xfc000000 SCM. */
|
||||
/* 0xfc004000 XBS. */
|
||||
|
|
|
|||
|
|
@ -9,7 +9,9 @@
|
|||
#include "hw/hw.h"
|
||||
#include "net/net.h"
|
||||
#include "hw/m68k/mcf.h"
|
||||
#include "hw/m68k/mcf_fec.h"
|
||||
#include "hw/net/mii.h"
|
||||
#include "hw/sysbus.h"
|
||||
/* For crc32 */
|
||||
#include <zlib.h>
|
||||
#include "exec/address-spaces.h"
|
||||
|
|
@ -27,9 +29,10 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
|
|||
#define FEC_MAX_FRAME_SIZE 2032
|
||||
|
||||
typedef struct {
|
||||
MemoryRegion *sysmem;
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion iomem;
|
||||
qemu_irq *irq;
|
||||
qemu_irq irq[FEC_NUM_IRQ];
|
||||
NICState *nic;
|
||||
NICConf conf;
|
||||
uint32_t irq_state;
|
||||
|
|
@ -68,7 +71,6 @@ typedef struct {
|
|||
#define FEC_RESET 1
|
||||
|
||||
/* Map interrupt flags onto IRQ lines. */
|
||||
#define FEC_NUM_IRQ 13
|
||||
static const uint32_t mcf_fec_irq_map[FEC_NUM_IRQ] = {
|
||||
FEC_INT_TXF,
|
||||
FEC_INT_TXB,
|
||||
|
|
@ -208,8 +210,10 @@ static void mcf_fec_enable_rx(mcf_fec_state *s)
|
|||
}
|
||||
}
|
||||
|
||||
static void mcf_fec_reset(mcf_fec_state *s)
|
||||
static void mcf_fec_reset(DeviceState *dev)
|
||||
{
|
||||
mcf_fec_state *s = MCF_FEC_NET(dev);
|
||||
|
||||
s->eir = 0;
|
||||
s->eimr = 0;
|
||||
s->rx_enabled = 0;
|
||||
|
|
@ -330,7 +334,7 @@ static void mcf_fec_write(void *opaque, hwaddr addr,
|
|||
s->ecr = value;
|
||||
if (value & FEC_RESET) {
|
||||
DPRINTF("Reset\n");
|
||||
mcf_fec_reset(s);
|
||||
mcf_fec_reset(opaque);
|
||||
}
|
||||
if ((s->ecr & FEC_EN) == 0) {
|
||||
s->rx_enabled = 0;
|
||||
|
|
@ -513,24 +517,55 @@ static NetClientInfo net_mcf_fec_info = {
|
|||
.receive = mcf_fec_receive,
|
||||
};
|
||||
|
||||
void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd,
|
||||
hwaddr base, qemu_irq *irq)
|
||||
static void mcf_fec_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
mcf_fec_state *s;
|
||||
|
||||
qemu_check_nic_model(nd, "mcf_fec");
|
||||
|
||||
s = (mcf_fec_state *)g_malloc0(sizeof(mcf_fec_state));
|
||||
s->sysmem = sysmem;
|
||||
s->irq = irq;
|
||||
|
||||
memory_region_init_io(&s->iomem, NULL, &mcf_fec_ops, s, "fec", 0x400);
|
||||
memory_region_add_subregion(sysmem, base, &s->iomem);
|
||||
|
||||
s->conf.macaddr = nd->macaddr;
|
||||
s->conf.peers.ncs[0] = nd->netdev;
|
||||
|
||||
s->nic = qemu_new_nic(&net_mcf_fec_info, &s->conf, nd->model, nd->name, s);
|
||||
mcf_fec_state *s = MCF_FEC_NET(dev);
|
||||
|
||||
s->nic = qemu_new_nic(&net_mcf_fec_info, &s->conf,
|
||||
object_get_typename(OBJECT(dev)), dev->id, s);
|
||||
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
|
||||
}
|
||||
|
||||
static void mcf_fec_instance_init(Object *obj)
|
||||
{
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
||||
mcf_fec_state *s = MCF_FEC_NET(obj);
|
||||
int i;
|
||||
|
||||
memory_region_init_io(&s->iomem, obj, &mcf_fec_ops, s, "fec", 0x400);
|
||||
sysbus_init_mmio(sbd, &s->iomem);
|
||||
for (i = 0; i < FEC_NUM_IRQ; i++) {
|
||||
sysbus_init_irq(sbd, &s->irq[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static Property mcf_fec_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(mcf_fec_state, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void mcf_fec_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||
|
||||
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
|
||||
dc->realize = mcf_fec_realize;
|
||||
dc->desc = "MCF Fast Ethernet Controller network device";
|
||||
dc->reset = mcf_fec_reset;
|
||||
dc->props = mcf_fec_properties;
|
||||
}
|
||||
|
||||
static const TypeInfo mcf_fec_info = {
|
||||
.name = TYPE_MCF_FEC_NET,
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(mcf_fec_state),
|
||||
.instance_init = mcf_fec_instance_init,
|
||||
.class_init = mcf_fec_class_init,
|
||||
};
|
||||
|
||||
static void mcf_fec_register_types(void)
|
||||
{
|
||||
type_register_static(&mcf_fec_info);
|
||||
}
|
||||
|
||||
type_init(mcf_fec_register_types)
|
||||
|
|
|
|||
|
|
@ -21,10 +21,6 @@ qemu_irq *mcf_intc_init(struct MemoryRegion *sysmem,
|
|||
hwaddr base,
|
||||
M68kCPU *cpu);
|
||||
|
||||
/* mcf_fec.c */
|
||||
void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd,
|
||||
hwaddr base, qemu_irq *irq);
|
||||
|
||||
/* mcf5206.c */
|
||||
qemu_irq *mcf5206_init(struct MemoryRegion *sysmem,
|
||||
uint32_t base, M68kCPU *cpu);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
/*
|
||||
* Definitions for the ColdFire Fast Ethernet Controller emulation.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define TYPE_MCF_FEC_NET "mcf-fec"
|
||||
#define MCF_FEC_NET(obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET)
|
||||
|
||||
#define FEC_NUM_IRQ 13
|
||||
Loading…
Reference in New Issue