diff options
| -rw-r--r-- | hw/cris_pic_cpu.c | 1 | ||||
| -rw-r--r-- | hw/etraxfs.h | 21 | ||||
| -rw-r--r-- | hw/etraxfs_eth.c | 76 | ||||
| -rw-r--r-- | hw/etraxfs_ser.c | 10 |
4 files changed, 73 insertions, 35 deletions
diff --git a/hw/cris_pic_cpu.c b/hw/cris_pic_cpu.c index a92d445f29..7f1e4ab855 100644 --- a/hw/cris_pic_cpu.c +++ b/hw/cris_pic_cpu.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "sysbus.h" #include "hw.h" #include "pc.h" #include "etraxfs.h" diff --git a/hw/etraxfs.h b/hw/etraxfs.h index 5c61f1b41b..1554b0b8e8 100644 --- a/hw/etraxfs.h +++ b/hw/etraxfs.h @@ -25,6 +25,21 @@ #include "etraxfs_dma.h" qemu_irq *cris_pic_init_cpu(CPUState *env); -void etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr, - struct etraxfs_dma_client *dma_out, - struct etraxfs_dma_client *dma_in); + +/* Instantiate an ETRAXFS Ethernet MAC. */ +static inline DeviceState * +etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr, + void *dma_out, void *dma_in) +{ + DeviceState *dev; + qemu_check_nic_model(nd, "fseth"); + + dev = qdev_create(NULL, "etraxfs-eth"); + qdev_set_nic_properties(dev, nd); + qdev_prop_set_uint32(dev, "phyaddr", phyaddr); + qdev_prop_set_ptr(dev, "dma_out", dma_out); + qdev_prop_set_ptr(dev, "dma_in", dma_in); + qdev_init_nofail(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + return dev; +} diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index 6453077056..92d4ecac8f 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -23,7 +23,7 @@ */ #include <stdio.h> -#include "hw.h" +#include "sysbus.h" #include "net.h" #include "etraxfs.h" @@ -319,6 +319,7 @@ static void mdio_cycle(struct qemu_mdio *bus) struct fs_eth { + SysBusDevice busdev; NICState *nic; NICConf conf; int ethregs; @@ -327,8 +328,14 @@ struct fs_eth uint8_t macaddr[2][6]; uint32_t regs[FS_ETH_MAX_REGS]; - struct etraxfs_dma_client *dma_out; - struct etraxfs_dma_client *dma_in; + union { + void *vdma_out; + struct etraxfs_dma_client *dma_out; + }; + union { + void *vdma_in; + struct etraxfs_dma_client *dma_in; + }; /* MDIO bus. */ struct qemu_mdio mdio_bus; @@ -579,37 +586,50 @@ static NetClientInfo net_etraxfs_info = { .link_status_changed = eth_set_link, }; -void etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr, - struct etraxfs_dma_client *dma_out, - struct etraxfs_dma_client *dma_in) +static int fs_eth_init(SysBusDevice *dev) { - struct fs_eth *eth = NULL; + struct fs_eth *s = FROM_SYSBUS(typeof(*s), dev); + int eth_regs; - qemu_check_nic_model(nd, "fseth"); - - eth = qemu_mallocz(sizeof *eth); + if (!s->dma_out || !s->dma_in) { + hw_error("Unconnected ETRAX-FS Ethernet MAC.\n"); + } - dma_out->client.push = eth_tx_push; - dma_out->client.opaque = eth; - dma_in->client.opaque = eth; - dma_in->client.pull = NULL; + s->dma_out->client.push = eth_tx_push; + s->dma_out->client.opaque = s; + s->dma_in->client.opaque = s; + s->dma_in->client.pull = NULL; - eth->dma_out = dma_out; - eth->dma_in = dma_in; + eth_regs = cpu_register_io_memory(eth_read, eth_write, s, + DEVICE_LITTLE_ENDIAN); + sysbus_init_mmio(dev, 0x5c, eth_regs); - /* Connect the phy. */ - eth->phyaddr = phyaddr & 0x1f; - tdk_init(ð->phy); - mdio_attach(ð->mdio_bus, ð->phy, eth->phyaddr); + qemu_macaddr_default_if_unset(&s->conf.macaddr); + s->nic = qemu_new_nic(&net_etraxfs_info, &s->conf, + dev->qdev.info->name, dev->qdev.id, s); + qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); - eth->ethregs = cpu_register_io_memory(eth_read, eth_write, eth, - DEVICE_NATIVE_ENDIAN); - cpu_register_physical_memory (base, 0x5c, eth->ethregs); + tdk_init(&s->phy); + mdio_attach(&s->mdio_bus, &s->phy, s->phyaddr); + return 0; +} - eth->conf.macaddr = nd->macaddr; - eth->conf.vlan = nd->vlan; - eth->conf.peer = nd->netdev; +static SysBusDeviceInfo etraxfs_eth_info = { + .init = fs_eth_init, + .qdev.name = "etraxfs-eth", + .qdev.size = sizeof(struct fs_eth), + .qdev.props = (Property[]) { + DEFINE_PROP_UINT32("phyaddr", struct fs_eth, phyaddr, 1), + DEFINE_PROP_PTR("dma_out", struct fs_eth, vdma_out), + DEFINE_PROP_PTR("dma_in", struct fs_eth, vdma_in), + DEFINE_NIC_PROPERTIES(struct fs_eth, conf), + DEFINE_PROP_END_OF_LIST(), + } +}; - eth->nic = qemu_new_nic(&net_etraxfs_info, ð->conf, - nd->model, nd->name, eth); +static void etraxfs_eth_register(void) +{ + sysbus_register_withprop(&etraxfs_eth_info); } + +device_init(etraxfs_eth_register) diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index b917d4db11..28b86ea2d4 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "qemu-char.h" +#include "qemu-log.h" #define D(x) @@ -100,7 +101,7 @@ static uint32_t ser_readl (void *opaque, target_phys_addr_t addr) break; default: r = s->regs[addr]; - D(printf ("%s " TARGET_FMT_plx "=%x\n", __func__, addr, r)); + D(qemu_log("%s " TARGET_FMT_plx "=%x\n", __func__, addr, r)); break; } return r; @@ -113,7 +114,7 @@ ser_writel (void *opaque, target_phys_addr_t addr, uint32_t value) unsigned char ch = value; D(CPUState *env = s->env); - D(printf ("%s " TARGET_FMT_plx "=%x\n", __func__, addr, value)); + D(qemu_log("%s " TARGET_FMT_plx "=%x\n", __func__, addr, value)); addr >>= 2; switch (addr) { @@ -127,7 +128,8 @@ ser_writel (void *opaque, target_phys_addr_t addr, uint32_t value) if (s->pending_tx) { value &= ~1; s->pending_tx = 0; - D(printf("fixedup value=%x r_intr=%x\n", value, s->regs[R_INTR])); + D(qemu_log("fixedup value=%x r_intr=%x\n", + value, s->regs[R_INTR])); } s->regs[addr] = value; s->regs[R_INTR] &= ~value; @@ -157,7 +159,7 @@ static void serial_receive(void *opaque, const uint8_t *buf, int size) /* Got a byte. */ if (s->rx_fifo_len >= 16) { - printf("WARNING: UART dropped char.\n"); + qemu_log("WARNING: UART dropped char.\n"); return; } |