[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v7 09/18] hw/arm/allwinner-h3: add EMAC ethernet device
|
From: |
Alex Bennée |
|
Subject: |
Re: [PATCH v7 09/18] hw/arm/allwinner-h3: add EMAC ethernet device |
|
Date: |
Wed, 11 Mar 2020 13:56:16 +0000 |
|
User-agent: |
mu4e 1.3.9; emacs 28.0.50 |
Niek Linnenbank <address@hidden> writes:
> The Allwinner Sun8i System on Chip family includes an Ethernet MAC (EMAC)
> which provides 10M/100M/1000M Ethernet connectivity. This commit
> adds support for the Allwinner EMAC from the Sun8i family (H2+, H3, A33, etc),
> including emulation for the following functionality:
>
> * DMA transfers
> * MII interface
> * Transmit CRC calculation
>
> Signed-off-by: Niek Linnenbank <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
> ---
> include/hw/arm/allwinner-h3.h | 3 +
> include/hw/net/allwinner-sun8i-emac.h | 99 +++
> hw/arm/allwinner-h3.c | 16 +-
> hw/arm/orangepi.c | 3 +
> hw/net/allwinner-sun8i-emac.c | 871 ++++++++++++++++++++++++++
> hw/arm/Kconfig | 1 +
> hw/net/Kconfig | 3 +
> hw/net/Makefile.objs | 1 +
> hw/net/trace-events | 10 +
> 9 files changed, 1006 insertions(+), 1 deletion(-)
> create mode 100644 include/hw/net/allwinner-sun8i-emac.h
> create mode 100644 hw/net/allwinner-sun8i-emac.c
>
> diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h
> index d71a4917ab..f9b9a02373 100644
> --- a/include/hw/arm/allwinner-h3.h
> +++ b/include/hw/arm/allwinner-h3.h
> @@ -44,6 +44,7 @@
> #include "hw/misc/allwinner-h3-sysctrl.h"
> #include "hw/misc/allwinner-sid.h"
> #include "hw/sd/allwinner-sdhost.h"
> +#include "hw/net/allwinner-sun8i-emac.h"
> #include "target/arm/cpu.h"
>
> /**
> @@ -77,6 +78,7 @@ enum {
> AW_H3_UART1,
> AW_H3_UART2,
> AW_H3_UART3,
> + AW_H3_EMAC,
> AW_H3_GIC_DIST,
> AW_H3_GIC_CPU,
> AW_H3_GIC_HYP,
> @@ -120,6 +122,7 @@ typedef struct AwH3State {
> AwH3SysCtrlState sysctrl;
> AwSidState sid;
> AwSdHostState mmc0;
> + AwSun8iEmacState emac;
> GICState gic;
> MemoryRegion sram_a1;
> MemoryRegion sram_a2;
> diff --git a/include/hw/net/allwinner-sun8i-emac.h
> b/include/hw/net/allwinner-sun8i-emac.h
> new file mode 100644
> index 0000000000..eda034e96b
> --- /dev/null
> +++ b/include/hw/net/allwinner-sun8i-emac.h
> @@ -0,0 +1,99 @@
> +/*
> + * Allwinner Sun8i Ethernet MAC emulation
> + *
> + * Copyright (C) 2019 Niek Linnenbank <address@hidden>
> + *
> + * This program 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.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#ifndef HW_NET_ALLWINNER_SUN8I_EMAC_H
> +#define HW_NET_ALLWINNER_SUN8I_EMAC_H
> +
> +#include "qom/object.h"
> +#include "net/net.h"
> +#include "hw/sysbus.h"
> +
> +/**
> + * Object model
> + * @{
> + */
> +
> +#define TYPE_AW_SUN8I_EMAC "allwinner-sun8i-emac"
> +#define AW_SUN8I_EMAC(obj) \
> + OBJECT_CHECK(AwSun8iEmacState, (obj), TYPE_AW_SUN8I_EMAC)
> +
> +/** @} */
> +
> +/**
> + * Allwinner Sun8i EMAC object instance state
> + */
> +typedef struct AwSun8iEmacState {
> + /*< private >*/
> + SysBusDevice parent_obj;
> + /*< public >*/
> +
> + /** Maps I/O registers in physical memory */
> + MemoryRegion iomem;
> +
> + /** Interrupt output signal to notify CPU */
> + qemu_irq irq;
> +
> + /** Generic Network Interface Controller (NIC) for networking API */
> + NICState *nic;
> +
> + /** Generic Network Interface Controller (NIC) configuration */
> + NICConf conf;
> +
> + /**
> + * @name Media Independent Interface (MII)
> + * @{
> + */
> +
> + uint8_t mii_phy_addr; /**< PHY address */
> + uint32_t mii_cr; /**< Control */
> + uint32_t mii_st; /**< Status */
> + uint32_t mii_adv; /**< Advertised Abilities */
> +
> + /** @} */
> +
> + /**
> + * @name Hardware Registers
> + * @{
> + */
> +
> + uint32_t basic_ctl0; /**< Basic Control 0 */
> + uint32_t basic_ctl1; /**< Basic Control 1 */
> + uint32_t int_en; /**< Interrupt Enable */
> + uint32_t int_sta; /**< Interrupt Status */
> + uint32_t frm_flt; /**< Receive Frame Filter */
> +
> + uint32_t rx_ctl0; /**< Receive Control 0 */
> + uint32_t rx_ctl1; /**< Receive Control 1 */
> + uint32_t rx_desc_head; /**< Receive Descriptor List Address */
> + uint32_t rx_desc_curr; /**< Current Receive Descriptor Address */
> +
> + uint32_t tx_ctl0; /**< Transmit Control 0 */
> + uint32_t tx_ctl1; /**< Transmit Control 1 */
> + uint32_t tx_desc_head; /**< Transmit Descriptor List Address */
> + uint32_t tx_desc_curr; /**< Current Transmit Descriptor Address */
> + uint32_t tx_flowctl; /**< Transmit Flow Control */
> +
> + uint32_t mii_cmd; /**< Management Interface Command */
> + uint32_t mii_data; /**< Management Interface Data */
> +
> + /** @} */
> +
> +} AwSun8iEmacState;
> +
> +#endif /* HW_NET_ALLWINNER_SUN8I_H */
> diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
> index 8c7ac61517..d1245d2b01 100644
> --- a/hw/arm/allwinner-h3.c
> +++ b/hw/arm/allwinner-h3.c
> @@ -54,6 +54,7 @@ const hwaddr allwinner_h3_memmap[] = {
> [AW_H3_UART1] = 0x01c28400,
> [AW_H3_UART2] = 0x01c28800,
> [AW_H3_UART3] = 0x01c28c00,
> + [AW_H3_EMAC] = 0x01c30000,
> [AW_H3_GIC_DIST] = 0x01c81000,
> [AW_H3_GIC_CPU] = 0x01c82000,
> [AW_H3_GIC_HYP] = 0x01c84000,
> @@ -106,7 +107,6 @@ struct AwH3Unimplemented {
> { "twi1", 0x01c2b000, 1 * KiB },
> { "twi2", 0x01c2b400, 1 * KiB },
> { "scr", 0x01c2c400, 1 * KiB },
> - { "emac", 0x01c30000, 64 * KiB },
> { "gpu", 0x01c40000, 64 * KiB },
> { "hstmr", 0x01c60000, 4 * KiB },
> { "dramcom", 0x01c62000, 4 * KiB },
> @@ -162,6 +162,7 @@ enum {
> AW_H3_GIC_SPI_OHCI2 = 77,
> AW_H3_GIC_SPI_EHCI3 = 78,
> AW_H3_GIC_SPI_OHCI3 = 79,
> + AW_H3_GIC_SPI_EMAC = 82
> };
>
> /* Allwinner H3 general constants */
> @@ -207,6 +208,9 @@ static void allwinner_h3_init(Object *obj)
>
> sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0),
> TYPE_AW_SDHOST_SUN5I);
> +
> + sysbus_init_child_obj(obj, "emac", &s->emac, sizeof(s->emac),
> + TYPE_AW_SUN8I_EMAC);
> }
>
> static void allwinner_h3_realize(DeviceState *dev, Error **errp)
> @@ -337,6 +341,16 @@ static void allwinner_h3_realize(DeviceState *dev, Error
> **errp)
> object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0),
> "sd-bus", &error_abort);
>
> + /* EMAC */
> + if (nd_table[0].used) {
> + qemu_check_nic_model(&nd_table[0], TYPE_AW_SUN8I_EMAC);
> + qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
> + }
> + qdev_init_nofail(DEVICE(&s->emac));
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_H3_EMAC]);
> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0,
> + qdev_get_gpio_in(DEVICE(&s->gic),
> AW_H3_GIC_SPI_EMAC));
> +
> /* Universal Serial Bus */
> sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0],
> qdev_get_gpio_in(DEVICE(&s->gic),
> diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> index e5e3f74743..4299c59b8a 100644
> --- a/hw/arm/orangepi.c
> +++ b/hw/arm/orangepi.c
> @@ -78,6 +78,9 @@ static void orangepi_init(MachineState *machine)
> "not include H3 prefix\n");
> }
>
> + /* Setup EMAC properties */
> + object_property_set_int(OBJECT(&h3->emac), 1, "phy-addr", &error_abort);
> +
> /* Mark H3 object realized */
> object_property_set_bool(OBJECT(h3), true, "realized", &error_abort);
>
> diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c
> new file mode 100644
> index 0000000000..3fc5e34640
> --- /dev/null
> +++ b/hw/net/allwinner-sun8i-emac.c
> @@ -0,0 +1,871 @@
> +/*
> + * Allwinner Sun8i Ethernet MAC emulation
> + *
> + * Copyright (C) 2019 Niek Linnenbank <address@hidden>
> + *
> + * This program 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.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/units.h"
> +#include "hw/sysbus.h"
> +#include "migration/vmstate.h"
> +#include "net/net.h"
> +#include "hw/irq.h"
> +#include "hw/qdev-properties.h"
> +#include "qemu/log.h"
> +#include "trace.h"
> +#include "net/checksum.h"
> +#include "qemu/module.h"
> +#include "exec/cpu-common.h"
> +#include "hw/net/allwinner-sun8i-emac.h"
> +
> +/* EMAC register offsets */
> +enum {
> + REG_BASIC_CTL_0 = 0x0000, /* Basic Control 0 */
> + REG_BASIC_CTL_1 = 0x0004, /* Basic Control 1 */
> + REG_INT_STA = 0x0008, /* Interrupt Status */
> + REG_INT_EN = 0x000C, /* Interrupt Enable */
> + REG_TX_CTL_0 = 0x0010, /* Transmit Control 0 */
> + REG_TX_CTL_1 = 0x0014, /* Transmit Control 1 */
> + REG_TX_FLOW_CTL = 0x001C, /* Transmit Flow Control */
> + REG_TX_DMA_DESC_LIST = 0x0020, /* Transmit Descriptor List Address */
> + REG_RX_CTL_0 = 0x0024, /* Receive Control 0 */
> + REG_RX_CTL_1 = 0x0028, /* Receive Control 1 */
> + REG_RX_DMA_DESC_LIST = 0x0034, /* Receive Descriptor List Address */
> + REG_FRM_FLT = 0x0038, /* Receive Frame Filter */
> + REG_RX_HASH_0 = 0x0040, /* Receive Hash Table 0 */
> + REG_RX_HASH_1 = 0x0044, /* Receive Hash Table 1 */
> + REG_MII_CMD = 0x0048, /* Management Interface Command */
> + REG_MII_DATA = 0x004C, /* Management Interface Data */
> + REG_ADDR_HIGH = 0x0050, /* MAC Address High */
> + REG_ADDR_LOW = 0x0054, /* MAC Address Low */
> + REG_TX_DMA_STA = 0x00B0, /* Transmit DMA Status */
> + REG_TX_CUR_DESC = 0x00B4, /* Transmit Current Descriptor */
> + REG_TX_CUR_BUF = 0x00B8, /* Transmit Current Buffer */
> + REG_RX_DMA_STA = 0x00C0, /* Receive DMA Status */
> + REG_RX_CUR_DESC = 0x00C4, /* Receive Current Descriptor */
> + REG_RX_CUR_BUF = 0x00C8, /* Receive Current Buffer */
> + REG_RGMII_STA = 0x00D0, /* RGMII Status */
> +};
> +
> +/* EMAC register flags */
> +enum {
> + BASIC_CTL0_100Mbps = (0b11 << 2),
> + BASIC_CTL0_FD = (1 << 0),
> + BASIC_CTL1_SOFTRST = (1 << 0),
> +};
> +
> +enum {
> + INT_STA_RGMII_LINK = (1 << 16),
> + INT_STA_RX_EARLY = (1 << 13),
> + INT_STA_RX_OVERFLOW = (1 << 12),
> + INT_STA_RX_TIMEOUT = (1 << 11),
> + INT_STA_RX_DMA_STOP = (1 << 10),
> + INT_STA_RX_BUF_UA = (1 << 9),
> + INT_STA_RX = (1 << 8),
> + INT_STA_TX_EARLY = (1 << 5),
> + INT_STA_TX_UNDERFLOW = (1 << 4),
> + INT_STA_TX_TIMEOUT = (1 << 3),
> + INT_STA_TX_BUF_UA = (1 << 2),
> + INT_STA_TX_DMA_STOP = (1 << 1),
> + INT_STA_TX = (1 << 0),
> +};
> +
> +enum {
> + INT_EN_RX_EARLY = (1 << 13),
> + INT_EN_RX_OVERFLOW = (1 << 12),
> + INT_EN_RX_TIMEOUT = (1 << 11),
> + INT_EN_RX_DMA_STOP = (1 << 10),
> + INT_EN_RX_BUF_UA = (1 << 9),
> + INT_EN_RX = (1 << 8),
> + INT_EN_TX_EARLY = (1 << 5),
> + INT_EN_TX_UNDERFLOW = (1 << 4),
> + INT_EN_TX_TIMEOUT = (1 << 3),
> + INT_EN_TX_BUF_UA = (1 << 2),
> + INT_EN_TX_DMA_STOP = (1 << 1),
> + INT_EN_TX = (1 << 0),
> +};
> +
> +enum {
> + TX_CTL0_TX_EN = (1 << 31),
> + TX_CTL1_TX_DMA_START = (1 << 31),
> + TX_CTL1_TX_DMA_EN = (1 << 30),
> + TX_CTL1_TX_FLUSH = (1 << 0),
> +};
> +
> +enum {
> + RX_CTL0_RX_EN = (1 << 31),
> + RX_CTL0_STRIP_FCS = (1 << 28),
> + RX_CTL0_CRC_IPV4 = (1 << 27),
> +};
> +
> +enum {
> + RX_CTL1_RX_DMA_START = (1 << 31),
> + RX_CTL1_RX_DMA_EN = (1 << 30),
> + RX_CTL1_RX_MD = (1 << 1),
> +};
> +
> +enum {
> + RX_FRM_FLT_DIS_ADDR = (1 << 31),
> +};
> +
> +enum {
> + MII_CMD_PHY_ADDR_SHIFT = (12),
> + MII_CMD_PHY_ADDR_MASK = (0xf000),
> + MII_CMD_PHY_REG_SHIFT = (4),
> + MII_CMD_PHY_REG_MASK = (0xf0),
> + MII_CMD_PHY_RW = (1 << 1),
> + MII_CMD_PHY_BUSY = (1 << 0),
> +};
> +
> +enum {
> + TX_DMA_STA_STOP = (0b000),
> + TX_DMA_STA_RUN_FETCH = (0b001),
> + TX_DMA_STA_WAIT_STA = (0b010),
> +};
> +
> +enum {
> + RX_DMA_STA_STOP = (0b000),
> + RX_DMA_STA_RUN_FETCH = (0b001),
> + RX_DMA_STA_WAIT_FRM = (0b011),
> +};
> +
> +/* EMAC register reset values */
> +enum {
> + REG_BASIC_CTL_1_RST = 0x08000000,
> +};
> +
> +/* EMAC constants */
> +enum {
> + AW_SUN8I_EMAC_MIN_PKT_SZ = 64
> +};
> +
> +/* Transmit/receive frame descriptor */
> +typedef struct FrameDescriptor {
> + uint32_t status;
> + uint32_t status2;
> + uint32_t addr;
> + uint32_t next;
> +} FrameDescriptor;
> +
> +/* Frame descriptor flags */
> +enum {
> + DESC_STATUS_CTL = (1 << 31),
> + DESC_STATUS2_BUF_SIZE_MASK = (0x7ff),
> +};
> +
> +/* Transmit frame descriptor flags */
> +enum {
> + TX_DESC_STATUS_LENGTH_ERR = (1 << 14),
> + TX_DESC_STATUS2_FIRST_DESC = (1 << 29),
> + TX_DESC_STATUS2_LAST_DESC = (1 << 30),
> + TX_DESC_STATUS2_CHECKSUM_MASK = (0x3 << 27),
> +};
> +
> +/* Receive frame descriptor flags */
> +enum {
> + RX_DESC_STATUS_FIRST_DESC = (1 << 9),
> + RX_DESC_STATUS_LAST_DESC = (1 << 8),
> + RX_DESC_STATUS_FRM_LEN_MASK = (0x3fff0000),
> + RX_DESC_STATUS_FRM_LEN_SHIFT = (16),
> + RX_DESC_STATUS_NO_BUF = (1 << 14),
> + RX_DESC_STATUS_HEADER_ERR = (1 << 7),
> + RX_DESC_STATUS_LENGTH_ERR = (1 << 4),
> + RX_DESC_STATUS_CRC_ERR = (1 << 1),
> + RX_DESC_STATUS_PAYLOAD_ERR = (1 << 0),
> + RX_DESC_STATUS2_RX_INT_CTL = (1 << 31),
> +};
> +
> +/* MII register offsets */
> +enum {
> + MII_REG_CR = (0x0), /* Control */
> + MII_REG_ST = (0x1), /* Status */
> + MII_REG_ID_HIGH = (0x2), /* Identifier High */
> + MII_REG_ID_LOW = (0x3), /* Identifier Low */
> + MII_REG_ADV = (0x4), /* Advertised abilities */
> + MII_REG_LPA = (0x5), /* Link partner abilities */
> +};
> +
> +/* MII register flags */
> +enum {
> + MII_REG_CR_RESET = (1 << 15),
> + MII_REG_CR_POWERDOWN = (1 << 11),
> + MII_REG_CR_10Mbit = (0),
> + MII_REG_CR_100Mbit = (1 << 13),
> + MII_REG_CR_1000Mbit = (1 << 6),
> + MII_REG_CR_AUTO_NEG = (1 << 12),
> + MII_REG_CR_AUTO_NEG_RESTART = (1 << 9),
> + MII_REG_CR_FULLDUPLEX = (1 << 8),
> +};
> +
> +enum {
> + MII_REG_ST_100BASE_T4 = (1 << 15),
> + MII_REG_ST_100BASE_X_FD = (1 << 14),
> + MII_REG_ST_100BASE_X_HD = (1 << 13),
> + MII_REG_ST_10_FD = (1 << 12),
> + MII_REG_ST_10_HD = (1 << 11),
> + MII_REG_ST_100BASE_T2_FD = (1 << 10),
> + MII_REG_ST_100BASE_T2_HD = (1 << 9),
> + MII_REG_ST_AUTONEG_COMPLETE = (1 << 5),
> + MII_REG_ST_AUTONEG_AVAIL = (1 << 3),
> + MII_REG_ST_LINK_UP = (1 << 2),
> +};
> +
> +enum {
> + MII_REG_LPA_10_HD = (1 << 5),
> + MII_REG_LPA_10_FD = (1 << 6),
> + MII_REG_LPA_100_HD = (1 << 7),
> + MII_REG_LPA_100_FD = (1 << 8),
> + MII_REG_LPA_PAUSE = (1 << 10),
> + MII_REG_LPA_ASYMPAUSE = (1 << 11),
> +};
> +
> +/* MII constants */
> +enum {
> + MII_PHY_ID_HIGH = 0x0044,
> + MII_PHY_ID_LOW = 0x1400,
> +};
> +
> +static void allwinner_sun8i_emac_mii_set_link(AwSun8iEmacState *s,
> + bool link_active)
> +{
> + if (link_active) {
> + s->mii_st |= MII_REG_ST_LINK_UP;
> + } else {
> + s->mii_st &= ~MII_REG_ST_LINK_UP;
> + }
> +}
> +
> +static void allwinner_sun8i_emac_mii_reset(AwSun8iEmacState *s,
> + bool link_active)
> +{
> + s->mii_cr = MII_REG_CR_100Mbit | MII_REG_CR_AUTO_NEG |
> + MII_REG_CR_FULLDUPLEX;
> + s->mii_st = MII_REG_ST_100BASE_T4 | MII_REG_ST_100BASE_X_FD |
> + MII_REG_ST_100BASE_X_HD | MII_REG_ST_10_FD |
> MII_REG_ST_10_HD |
> + MII_REG_ST_100BASE_T2_FD | MII_REG_ST_100BASE_T2_HD |
> + MII_REG_ST_AUTONEG_COMPLETE | MII_REG_ST_AUTONEG_AVAIL;
> + s->mii_adv = 0;
> +
> + allwinner_sun8i_emac_mii_set_link(s, link_active);
> +}
> +
> +static void allwinner_sun8i_emac_mii_cmd(AwSun8iEmacState *s)
> +{
> + uint8_t addr, reg;
> +
> + addr = (s->mii_cmd & MII_CMD_PHY_ADDR_MASK) >> MII_CMD_PHY_ADDR_SHIFT;
> + reg = (s->mii_cmd & MII_CMD_PHY_REG_MASK) >> MII_CMD_PHY_REG_SHIFT;
> +
> + if (addr != s->mii_phy_addr) {
> + return;
> + }
> +
> + /* Read or write a PHY register? */
> + if (s->mii_cmd & MII_CMD_PHY_RW) {
> + trace_allwinner_sun8i_emac_mii_write_reg(reg, s->mii_data);
> +
> + switch (reg) {
> + case MII_REG_CR:
> + if (s->mii_data & MII_REG_CR_RESET) {
> + allwinner_sun8i_emac_mii_reset(s, s->mii_st &
> + MII_REG_ST_LINK_UP);
> + } else {
> + s->mii_cr = s->mii_data & ~(MII_REG_CR_RESET |
> + MII_REG_CR_AUTO_NEG_RESTART);
> + }
> + break;
> + case MII_REG_ADV:
> + s->mii_adv = s->mii_data;
> + break;
> + case MII_REG_ID_HIGH:
> + case MII_REG_ID_LOW:
> + case MII_REG_LPA:
> + break;
> + default:
> + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: write access to "
> + "unknown MII register 0x%x\n", reg);
> + break;
> + }
> + } else {
> + switch (reg) {
> + case MII_REG_CR:
> + s->mii_data = s->mii_cr;
> + break;
> + case MII_REG_ST:
> + s->mii_data = s->mii_st;
> + break;
> + case MII_REG_ID_HIGH:
> + s->mii_data = MII_PHY_ID_HIGH;
> + break;
> + case MII_REG_ID_LOW:
> + s->mii_data = MII_PHY_ID_LOW;
> + break;
> + case MII_REG_ADV:
> + s->mii_data = s->mii_adv;
> + break;
> + case MII_REG_LPA:
> + s->mii_data = MII_REG_LPA_10_HD | MII_REG_LPA_10_FD |
> + MII_REG_LPA_100_HD | MII_REG_LPA_100_FD |
> + MII_REG_LPA_PAUSE | MII_REG_LPA_ASYMPAUSE;
> + break;
> + default:
> + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: read access to "
> + "unknown MII register 0x%x\n", reg);
> + s->mii_data = 0;
> + break;
> + }
> +
> + trace_allwinner_sun8i_emac_mii_read_reg(reg, s->mii_data);
> + }
> +}
> +
> +static void allwinner_sun8i_emac_update_irq(AwSun8iEmacState *s)
> +{
> + qemu_set_irq(s->irq, (s->int_sta & s->int_en) != 0);
> +}
> +
> +static uint32_t allwinner_sun8i_emac_next_desc(FrameDescriptor *desc,
> + size_t min_size)
> +{
> + uint32_t paddr = desc->next;
> +
> + cpu_physical_memory_read(paddr, desc, sizeof(*desc));
> +
> + if ((desc->status & DESC_STATUS_CTL) &&
> + (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >= min_size) {
> + return paddr;
> + } else {
> + return 0;
> + }
> +}
> +
> +static uint32_t allwinner_sun8i_emac_get_desc(FrameDescriptor *desc,
> + uint32_t start_addr,
> + size_t min_size)
> +{
> + uint32_t desc_addr = start_addr;
> +
> + /* Note that the list is a cycle. Last entry points back to the head. */
> + while (desc_addr != 0) {
> + cpu_physical_memory_read(desc_addr, desc, sizeof(*desc));
> +
> + if ((desc->status & DESC_STATUS_CTL) &&
> + (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >= min_size) {
> + return desc_addr;
> + } else if (desc->next == start_addr) {
> + break;
> + } else {
> + desc_addr = desc->next;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static uint32_t allwinner_sun8i_emac_rx_desc(AwSun8iEmacState *s,
> + FrameDescriptor *desc,
> + size_t min_size)
> +{
> + return allwinner_sun8i_emac_get_desc(desc, s->rx_desc_curr, min_size);
> +}
> +
> +static uint32_t allwinner_sun8i_emac_tx_desc(AwSun8iEmacState *s,
> + FrameDescriptor *desc,
> + size_t min_size)
> +{
> + return allwinner_sun8i_emac_get_desc(desc, s->tx_desc_head, min_size);
> +}
> +
> +static void allwinner_sun8i_emac_flush_desc(FrameDescriptor *desc,
> + uint32_t phys_addr)
> +{
> + cpu_physical_memory_write(phys_addr, desc, sizeof(*desc));
> +}
> +
> +static int allwinner_sun8i_emac_can_receive(NetClientState *nc)
> +{
> + AwSun8iEmacState *s = qemu_get_nic_opaque(nc);
> + FrameDescriptor desc;
> +
> + return (s->rx_ctl0 & RX_CTL0_RX_EN) &&
> + (allwinner_sun8i_emac_rx_desc(s, &desc, 0) != 0);
> +}
> +
> +static ssize_t allwinner_sun8i_emac_receive(NetClientState *nc,
> + const uint8_t *buf,
> + size_t size)
> +{
> + AwSun8iEmacState *s = qemu_get_nic_opaque(nc);
> + FrameDescriptor desc;
> + size_t bytes_left = size;
> + size_t desc_bytes = 0;
> + size_t pad_fcs_size = 4;
> + size_t padding = 0;
> +
> + if (!(s->rx_ctl0 & RX_CTL0_RX_EN)) {
> + return -1;
> + }
> +
> + s->rx_desc_curr = allwinner_sun8i_emac_rx_desc(s, &desc,
> + AW_SUN8I_EMAC_MIN_PKT_SZ);
> + if (!s->rx_desc_curr) {
> + s->int_sta |= INT_STA_RX_BUF_UA;
> + }
> +
> + /* Keep filling RX descriptors until the whole frame is written */
> + while (s->rx_desc_curr && bytes_left > 0) {
> + desc.status &= ~DESC_STATUS_CTL;
> + desc.status &= ~RX_DESC_STATUS_FRM_LEN_MASK;
> +
> + if (bytes_left == size) {
> + desc.status |= RX_DESC_STATUS_FIRST_DESC;
> + }
> +
> + if ((desc.status2 & DESC_STATUS2_BUF_SIZE_MASK) <
> + (bytes_left + pad_fcs_size)) {
> + desc_bytes = desc.status2 & DESC_STATUS2_BUF_SIZE_MASK;
> + desc.status |= desc_bytes << RX_DESC_STATUS_FRM_LEN_SHIFT;
> + } else {
> + padding = pad_fcs_size;
> + if (bytes_left < AW_SUN8I_EMAC_MIN_PKT_SZ) {
> + padding += (AW_SUN8I_EMAC_MIN_PKT_SZ - bytes_left);
> + }
> +
> + desc_bytes = (bytes_left);
> + desc.status |= RX_DESC_STATUS_LAST_DESC;
> + desc.status |= (bytes_left + padding)
> + << RX_DESC_STATUS_FRM_LEN_SHIFT;
> + }
> +
> + cpu_physical_memory_write(desc.addr, buf, desc_bytes);
> + allwinner_sun8i_emac_flush_desc(&desc, s->rx_desc_curr);
> + trace_allwinner_sun8i_emac_receive(s->rx_desc_curr, desc.addr,
> + desc_bytes);
> +
> + /* Check if frame needs to raise the receive interrupt */
> + if (!(desc.status2 & RX_DESC_STATUS2_RX_INT_CTL)) {
> + s->int_sta |= INT_STA_RX;
> + }
> +
> + /* Increment variables */
> + buf += desc_bytes;
> + bytes_left -= desc_bytes;
> +
> + /* Move to the next descriptor */
> + s->rx_desc_curr = allwinner_sun8i_emac_next_desc(&desc, 64);
> + if (!s->rx_desc_curr) {
> + /* Not enough buffer space available */
> + s->int_sta |= INT_STA_RX_BUF_UA;
> + s->rx_desc_curr = s->rx_desc_head;
> + break;
> + }
> + }
> +
> + /* Report receive DMA is finished */
> + s->rx_ctl1 &= ~RX_CTL1_RX_DMA_START;
> + allwinner_sun8i_emac_update_irq(s);
> +
> + return size;
> +}
> +
> +static void allwinner_sun8i_emac_transmit(AwSun8iEmacState *s)
> +{
> + NetClientState *nc = qemu_get_queue(s->nic);
> + FrameDescriptor desc;
> + size_t bytes = 0;
> + size_t packet_bytes = 0;
> + size_t transmitted = 0;
> + static uint8_t packet_buf[2048];
> +
> + s->tx_desc_curr = allwinner_sun8i_emac_tx_desc(s, &desc, 0);
> +
> + /* Read all transmit descriptors */
> + while (s->tx_desc_curr != 0) {
> +
> + /* Read from physical memory into packet buffer */
> + bytes = desc.status2 & DESC_STATUS2_BUF_SIZE_MASK;
> + if (bytes + packet_bytes > sizeof(packet_buf)) {
> + desc.status |= TX_DESC_STATUS_LENGTH_ERR;
> + break;
> + }
> + cpu_physical_memory_read(desc.addr, packet_buf + packet_bytes,
> bytes);
> + packet_bytes += bytes;
> + desc.status &= ~DESC_STATUS_CTL;
> + allwinner_sun8i_emac_flush_desc(&desc, s->tx_desc_curr);
> +
> + /* After the last descriptor, send the packet */
> + if (desc.status2 & TX_DESC_STATUS2_LAST_DESC) {
> + if (desc.status2 & TX_DESC_STATUS2_CHECKSUM_MASK) {
> + net_checksum_calculate(packet_buf, packet_bytes);
> + }
> +
> + qemu_send_packet(nc, packet_buf, packet_bytes);
> + trace_allwinner_sun8i_emac_transmit(s->tx_desc_curr, desc.addr,
> + bytes);
> +
> + packet_bytes = 0;
> + transmitted++;
> + }
> + s->tx_desc_curr = allwinner_sun8i_emac_next_desc(&desc, 0);
> + }
> +
> + /* Raise transmit completed interrupt */
> + if (transmitted > 0) {
> + s->int_sta |= INT_STA_TX;
> + s->tx_ctl1 &= ~TX_CTL1_TX_DMA_START;
> + allwinner_sun8i_emac_update_irq(s);
> + }
> +}
> +
> +static void allwinner_sun8i_emac_reset(DeviceState *dev)
> +{
> + AwSun8iEmacState *s = AW_SUN8I_EMAC(dev);
> + NetClientState *nc = qemu_get_queue(s->nic);
> +
> + trace_allwinner_sun8i_emac_reset();
> +
> + s->mii_cmd = 0;
> + s->mii_data = 0;
> + s->basic_ctl0 = 0;
> + s->basic_ctl1 = REG_BASIC_CTL_1_RST;
> + s->int_en = 0;
> + s->int_sta = 0;
> + s->frm_flt = 0;
> + s->rx_ctl0 = 0;
> + s->rx_ctl1 = RX_CTL1_RX_MD;
> + s->rx_desc_head = 0;
> + s->rx_desc_curr = 0;
> + s->tx_ctl0 = 0;
> + s->tx_ctl1 = 0;
> + s->tx_desc_head = 0;
> + s->tx_desc_curr = 0;
> + s->tx_flowctl = 0;
> +
> + allwinner_sun8i_emac_mii_reset(s, !nc->link_down);
> +}
> +
> +static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset,
> + unsigned size)
> +{
> + AwSun8iEmacState *s = AW_SUN8I_EMAC(opaque);
> + uint64_t value = 0;
> + FrameDescriptor desc;
> +
> + switch (offset) {
> + case REG_BASIC_CTL_0: /* Basic Control 0 */
> + value = s->basic_ctl0;
> + break;
> + case REG_BASIC_CTL_1: /* Basic Control 1 */
> + value = s->basic_ctl1;
> + break;
> + case REG_INT_STA: /* Interrupt Status */
> + value = s->int_sta;
> + break;
> + case REG_INT_EN: /* Interupt Enable */
> + value = s->int_en;
> + break;
> + case REG_TX_CTL_0: /* Transmit Control 0 */
> + value = s->tx_ctl0;
> + break;
> + case REG_TX_CTL_1: /* Transmit Control 1 */
> + value = s->tx_ctl1;
> + break;
> + case REG_TX_FLOW_CTL: /* Transmit Flow Control */
> + value = s->tx_flowctl;
> + break;
> + case REG_TX_DMA_DESC_LIST: /* Transmit Descriptor List Address */
> + value = s->tx_desc_head;
> + break;
> + case REG_RX_CTL_0: /* Receive Control 0 */
> + value = s->rx_ctl0;
> + break;
> + case REG_RX_CTL_1: /* Receive Control 1 */
> + value = s->rx_ctl1;
> + break;
> + case REG_RX_DMA_DESC_LIST: /* Receive Descriptor List Address */
> + value = s->rx_desc_head;
> + break;
> + case REG_FRM_FLT: /* Receive Frame Filter */
> + value = s->frm_flt;
> + break;
> + case REG_RX_HASH_0: /* Receive Hash Table 0 */
> + case REG_RX_HASH_1: /* Receive Hash Table 1 */
> + break;
> + case REG_MII_CMD: /* Management Interface Command */
> + value = s->mii_cmd;
> + break;
> + case REG_MII_DATA: /* Management Interface Data */
> + value = s->mii_data;
> + break;
> + case REG_ADDR_HIGH: /* MAC Address High */
> + value = *(((uint32_t *) (s->conf.macaddr.a)) + 1);
> + break;
> + case REG_ADDR_LOW: /* MAC Address Low */
> + value = *(uint32_t *) (s->conf.macaddr.a);
> + break;
> + case REG_TX_DMA_STA: /* Transmit DMA Status */
> + break;
> + case REG_TX_CUR_DESC: /* Transmit Current Descriptor */
> + value = s->tx_desc_curr;
> + break;
> + case REG_TX_CUR_BUF: /* Transmit Current Buffer */
> + if (s->tx_desc_curr != 0) {
> + cpu_physical_memory_read(s->tx_desc_curr, &desc, sizeof(desc));
> + value = desc.addr;
> + } else {
> + value = 0;
> + }
> + break;
> + case REG_RX_DMA_STA: /* Receive DMA Status */
> + break;
> + case REG_RX_CUR_DESC: /* Receive Current Descriptor */
> + value = s->rx_desc_curr;
> + break;
> + case REG_RX_CUR_BUF: /* Receive Current Buffer */
> + if (s->rx_desc_curr != 0) {
> + cpu_physical_memory_read(s->rx_desc_curr, &desc, sizeof(desc));
> + value = desc.addr;
> + } else {
> + value = 0;
> + }
> + break;
> + case REG_RGMII_STA: /* RGMII Status */
> + break;
> + default:
> + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: read access to unknown "
> + "EMAC register 0x" TARGET_FMT_plx "\n",
> + offset);
> + }
> +
> + trace_allwinner_sun8i_emac_read(offset, value);
> + return value;
> +}
> +
> +static void allwinner_sun8i_emac_write(void *opaque, hwaddr offset,
> + uint64_t value, unsigned size)
> +{
> + AwSun8iEmacState *s = AW_SUN8I_EMAC(opaque);
> + NetClientState *nc = qemu_get_queue(s->nic);
> +
> + trace_allwinner_sun8i_emac_write(offset, value);
> +
> + switch (offset) {
> + case REG_BASIC_CTL_0: /* Basic Control 0 */
> + s->basic_ctl0 = value;
> + break;
> + case REG_BASIC_CTL_1: /* Basic Control 1 */
> + if (value & BASIC_CTL1_SOFTRST) {
> + allwinner_sun8i_emac_reset(DEVICE(s));
> + value &= ~BASIC_CTL1_SOFTRST;
> + }
> + s->basic_ctl1 = value;
> + if (allwinner_sun8i_emac_can_receive(nc)) {
> + qemu_flush_queued_packets(nc);
> + }
> + break;
> + case REG_INT_STA: /* Interrupt Status */
> + s->int_sta &= ~value;
> + allwinner_sun8i_emac_update_irq(s);
> + break;
> + case REG_INT_EN: /* Interrupt Enable */
> + s->int_en = value;
> + allwinner_sun8i_emac_update_irq(s);
> + break;
> + case REG_TX_CTL_0: /* Transmit Control 0 */
> + s->tx_ctl0 = value;
> + break;
> + case REG_TX_CTL_1: /* Transmit Control 1 */
> + s->tx_ctl1 = value;
> + if (value & TX_CTL1_TX_DMA_EN) {
> + allwinner_sun8i_emac_transmit(s);
> + }
> + break;
> + case REG_TX_FLOW_CTL: /* Transmit Flow Control */
> + s->tx_flowctl = value;
> + break;
> + case REG_TX_DMA_DESC_LIST: /* Transmit Descriptor List Address */
> + s->tx_desc_head = value;
> + s->tx_desc_curr = value;
> + break;
> + case REG_RX_CTL_0: /* Receive Control 0 */
> + s->rx_ctl0 = value;
> + break;
> + case REG_RX_CTL_1: /* Receive Control 1 */
> + s->rx_ctl1 = value | RX_CTL1_RX_MD;
> + if ((value & RX_CTL1_RX_DMA_EN) &&
> + allwinner_sun8i_emac_can_receive(nc)) {
> + qemu_flush_queued_packets(nc);
> + }
> + break;
> + case REG_RX_DMA_DESC_LIST: /* Receive Descriptor List Address */
> + s->rx_desc_head = value;
> + s->rx_desc_curr = value;
> + break;
> + case REG_FRM_FLT: /* Receive Frame Filter */
> + s->frm_flt = value;
> + break;
> + case REG_RX_HASH_0: /* Receive Hash Table 0 */
> + case REG_RX_HASH_1: /* Receive Hash Table 1 */
> + break;
> + case REG_MII_CMD: /* Management Interface Command */
> + s->mii_cmd = value & ~MII_CMD_PHY_BUSY;
> + allwinner_sun8i_emac_mii_cmd(s);
> + break;
> + case REG_MII_DATA: /* Management Interface Data */
> + s->mii_data = value;
> + break;
> + case REG_ADDR_HIGH: /* MAC Address High */
> + s->conf.macaddr.a[4] = (value & 0xff);
> + s->conf.macaddr.a[5] = (value & 0xff00) >> 8;
> + break;
> + case REG_ADDR_LOW: /* MAC Address Low */
> + s->conf.macaddr.a[0] = (value & 0xff);
> + s->conf.macaddr.a[1] = (value & 0xff00) >> 8;
> + s->conf.macaddr.a[2] = (value & 0xff0000) >> 16;
> + s->conf.macaddr.a[3] = (value & 0xff000000) >> 24;
> + break;
> + case REG_TX_DMA_STA: /* Transmit DMA Status */
> + case REG_TX_CUR_DESC: /* Transmit Current Descriptor */
> + case REG_TX_CUR_BUF: /* Transmit Current Buffer */
> + case REG_RX_DMA_STA: /* Receive DMA Status */
> + case REG_RX_CUR_DESC: /* Receive Current Descriptor */
> + case REG_RX_CUR_BUF: /* Receive Current Buffer */
> + case REG_RGMII_STA: /* RGMII Status */
> + break;
> + default:
> + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: write access to unknown
> "
> + "EMAC register 0x" TARGET_FMT_plx "\n",
> + offset);
> + }
> +}
> +
> +static void allwinner_sun8i_emac_set_link(NetClientState *nc)
> +{
> + AwSun8iEmacState *s = qemu_get_nic_opaque(nc);
> +
> + trace_allwinner_sun8i_emac_set_link(!nc->link_down);
> + allwinner_sun8i_emac_mii_set_link(s, !nc->link_down);
> +}
> +
> +static const MemoryRegionOps allwinner_sun8i_emac_mem_ops = {
> + .read = allwinner_sun8i_emac_read,
> + .write = allwinner_sun8i_emac_write,
> + .endianness = DEVICE_NATIVE_ENDIAN,
> + .valid = {
> + .min_access_size = 4,
> + .max_access_size = 4,
> + },
> + .impl.min_access_size = 4,
> +};
> +
> +static NetClientInfo net_allwinner_sun8i_emac_info = {
> + .type = NET_CLIENT_DRIVER_NIC,
> + .size = sizeof(NICState),
> + .can_receive = allwinner_sun8i_emac_can_receive,
> + .receive = allwinner_sun8i_emac_receive,
> + .link_status_changed = allwinner_sun8i_emac_set_link,
> +};
> +
> +static void allwinner_sun8i_emac_init(Object *obj)
> +{
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> + AwSun8iEmacState *s = AW_SUN8I_EMAC(obj);
> +
> + memory_region_init_io(&s->iomem, OBJECT(s),
> &allwinner_sun8i_emac_mem_ops,
> + s, TYPE_AW_SUN8I_EMAC, 64 * KiB);
> + sysbus_init_mmio(sbd, &s->iomem);
> + sysbus_init_irq(sbd, &s->irq);
> +}
> +
> +static void allwinner_sun8i_emac_realize(DeviceState *dev, Error **errp)
> +{
> + AwSun8iEmacState *s = AW_SUN8I_EMAC(dev);
> +
> + qemu_macaddr_default_if_unset(&s->conf.macaddr);
> + s->nic = qemu_new_nic(&net_allwinner_sun8i_emac_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 Property allwinner_sun8i_emac_properties[] = {
> + DEFINE_NIC_PROPERTIES(AwSun8iEmacState, conf),
> + DEFINE_PROP_UINT8("phy-addr", AwSun8iEmacState, mii_phy_addr, 0),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static int allwinner_sun8i_emac_post_load(void *opaque, int version_id)
> +{
> + AwSun8iEmacState *s = opaque;
> +
> + allwinner_sun8i_emac_set_link(qemu_get_queue(s->nic));
> +
> + return 0;
> +}
> +
> +static const VMStateDescription vmstate_aw_emac = {
> + .name = "allwinner-sun8i-emac",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .post_load = allwinner_sun8i_emac_post_load,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT8(mii_phy_addr, AwSun8iEmacState),
> + VMSTATE_UINT32(mii_cmd, AwSun8iEmacState),
> + VMSTATE_UINT32(mii_data, AwSun8iEmacState),
> + VMSTATE_UINT32(mii_cr, AwSun8iEmacState),
> + VMSTATE_UINT32(mii_st, AwSun8iEmacState),
> + VMSTATE_UINT32(mii_adv, AwSun8iEmacState),
> + VMSTATE_UINT32(basic_ctl0, AwSun8iEmacState),
> + VMSTATE_UINT32(basic_ctl1, AwSun8iEmacState),
> + VMSTATE_UINT32(int_en, AwSun8iEmacState),
> + VMSTATE_UINT32(int_sta, AwSun8iEmacState),
> + VMSTATE_UINT32(frm_flt, AwSun8iEmacState),
> + VMSTATE_UINT32(rx_ctl0, AwSun8iEmacState),
> + VMSTATE_UINT32(rx_ctl1, AwSun8iEmacState),
> + VMSTATE_UINT32(rx_desc_head, AwSun8iEmacState),
> + VMSTATE_UINT32(rx_desc_curr, AwSun8iEmacState),
> + VMSTATE_UINT32(tx_ctl0, AwSun8iEmacState),
> + VMSTATE_UINT32(tx_ctl1, AwSun8iEmacState),
> + VMSTATE_UINT32(tx_desc_head, AwSun8iEmacState),
> + VMSTATE_UINT32(tx_desc_curr, AwSun8iEmacState),
> + VMSTATE_UINT32(tx_flowctl, AwSun8iEmacState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +static void allwinner_sun8i_emac_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + dc->realize = allwinner_sun8i_emac_realize;
> + dc->reset = allwinner_sun8i_emac_reset;
> + dc->vmsd = &vmstate_aw_emac;
> + device_class_set_props(dc, allwinner_sun8i_emac_properties);
> +}
> +
> +static const TypeInfo allwinner_sun8i_emac_info = {
> + .name = TYPE_AW_SUN8I_EMAC,
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(AwSun8iEmacState),
> + .instance_init = allwinner_sun8i_emac_init,
> + .class_init = allwinner_sun8i_emac_class_init,
> +};
> +
> +static void allwinner_sun8i_emac_register_types(void)
> +{
> + type_register_static(&allwinner_sun8i_emac_info);
> +}
> +
> +type_init(allwinner_sun8i_emac_register_types)
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index dd22fffdb0..e5a876c8d1 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -300,6 +300,7 @@ config ALLWINNER_A10
> config ALLWINNER_H3
> bool
> select ALLWINNER_A10_PIT
> + select ALLWINNER_SUN8I_EMAC
> select SERIAL
> select ARM_TIMER
> select ARM_GIC
> diff --git a/hw/net/Kconfig b/hw/net/Kconfig
> index 54411d3dcc..e43c96dae0 100644
> --- a/hw/net/Kconfig
> +++ b/hw/net/Kconfig
> @@ -79,6 +79,9 @@ config MIPSNET
> config ALLWINNER_EMAC
> bool
>
> +config ALLWINNER_SUN8I_EMAC
> + bool
> +
> config IMX_FEC
> bool
>
> diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
> index 991c46c773..af4d194866 100644
> --- a/hw/net/Makefile.objs
> +++ b/hw/net/Makefile.objs
> @@ -23,6 +23,7 @@ common-obj-$(CONFIG_XGMAC) += xgmac.o
> common-obj-$(CONFIG_MIPSNET) += mipsnet.o
> common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
> common-obj-$(CONFIG_ALLWINNER_EMAC) += allwinner_emac.o
> +common-obj-$(CONFIG_ALLWINNER_SUN8I_EMAC) += allwinner-sun8i-emac.o
> common-obj-$(CONFIG_IMX_FEC) += imx_fec.o
>
> common-obj-$(CONFIG_CADENCE) += cadence_gem.o
> diff --git a/hw/net/trace-events b/hw/net/trace-events
> index a1da98a643..e18f883cfd 100644
> --- a/hw/net/trace-events
> +++ b/hw/net/trace-events
> @@ -1,5 +1,15 @@
> # See docs/devel/tracing.txt for syntax documentation.
>
> +# allwinner-sun8i-emac.c
> +allwinner_sun8i_emac_mii_write_reg(uint32_t reg, uint32_t value) "MII write:
> reg=0x%" PRIx32 " value=0x%" PRIx32
> +allwinner_sun8i_emac_mii_read_reg(uint32_t reg, uint32_t value) "MII read:
> reg=0x%" PRIx32 " value=0x%" PRIx32
> +allwinner_sun8i_emac_receive(uint32_t desc, uint32_t paddr, uint32_t bytes)
> "RX packet: desc=0x%" PRIx32 " paddr=0x%" PRIx32 " bytes=%" PRIu32
> +allwinner_sun8i_emac_transmit(uint32_t desc, uint32_t paddr, uint32_t bytes)
> "TX packet: desc=0x%" PRIx32 " paddr=0x%" PRIx32 " bytes=%" PRIu32
> +allwinner_sun8i_emac_reset(void) "HW reset"
> +allwinner_sun8i_emac_set_link(bool active) "Set link: active=%u"
> +allwinner_sun8i_emac_read(uint64_t offset, uint64_t val) "MMIO read:
> offset=0x%" PRIx64 " value=0x%" PRIx64
> +allwinner_sun8i_emac_write(uint64_t offset, uint64_t val) "MMIO write:
> offset=0x%" PRIx64 " value=0x%" PRIx64
> +
> # etraxfs_eth.c
> mdio_phy_read(int regnum, uint16_t value) "read phy_reg:%d value:0x%04x"
> mdio_phy_write(int regnum, uint16_t value) "write phy_reg:%d value:0x%04x"
--
Alex Bennée
- [PATCH v7 16/18] tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC, (continued)
- [PATCH v7 16/18] tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC, Niek Linnenbank, 2020/03/10
- [PATCH v7 17/18] tests/boot_linux_console: Test booting NetBSD via U-Boot on OrangePi PC, Niek Linnenbank, 2020/03/10
- [PATCH v7 12/18] hw/arm/allwinner: add RTC device support, Niek Linnenbank, 2020/03/10
- [PATCH v7 18/18] docs: add Orange Pi PC document, Niek Linnenbank, 2020/03/10
- [PATCH v7 09/18] hw/arm/allwinner-h3: add EMAC ethernet device, Niek Linnenbank, 2020/03/10
- Re: [PATCH v7 09/18] hw/arm/allwinner-h3: add EMAC ethernet device,
Alex Bennée <=
- [PATCH v7 08/18] hw/arm/allwinner: add SD/MMC host controller, Niek Linnenbank, 2020/03/10
- Re: [PATCH v7 00/18] Add Allwinner H3 SoC and Orange Pi PC Machine, no-reply, 2020/03/10
- Re: [PATCH v7 00/18] Add Allwinner H3 SoC and Orange Pi PC Machine, Alex Bennée, 2020/03/11