From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1du24x-0006tK-BD for qemu-devel@nongnu.org; Mon, 18 Sep 2017 15:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1du24v-0006K1-7T for qemu-devel@nongnu.org; Mon, 18 Sep 2017 15:51:39 -0400 From: Andrey Smirnov Date: Mon, 18 Sep 2017 12:50:51 -0700 Message-Id: <20170918195100.17593-9-andrew.smirnov@gmail.com> In-Reply-To: <20170918195100.17593-1-andrew.smirnov@gmail.com> References: <20170918195100.17593-1-andrew.smirnov@gmail.com> Subject: [Qemu-devel] [PATCH 08/17] imx_fec: Add support for multiple Tx DMA rings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org Cc: Andrey Smirnov , Peter Maydell , Jason Wang , qemu-devel@nongnu.org, yurovsky@gmail.com More recent version of the IP block support more than one Tx DMA ring, so add the code implementing that feature. Cc: Peter Maydell Cc: Jason Wang Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Signed-off-by: Andrey Smirnov --- hw/net/imx_fec.c | 97 +++++++++++++++++++++++++++++++++++++++--------- include/hw/net/imx_fec.h | 23 +++++++++++- 2 files changed, 101 insertions(+), 19 deletions(-) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index bd62d7a75f..6045ffe673 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -196,6 +196,17 @@ static const char *imx_eth_reg_name(IMXFECState *s, uint32_t index) } } +static const VMStateDescription vmstate_imx_eth_tx_ring = { + .name = "fec-tx-ring", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(descriptor, IMXFECTxRing), + VMSTATE_UINT32(tdsr, IMXFECTxRing), + VMSTATE_END_OF_LIST() + }, +}; + static const VMStateDescription vmstate_imx_eth = { .name = TYPE_IMX_FEC, .version_id = 2, @@ -203,8 +214,10 @@ static const VMStateDescription vmstate_imx_eth = { .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, IMXFECState, ENET_MAX), VMSTATE_UINT32(rx_descriptor, IMXFECState), - VMSTATE_UINT32(tx_descriptor, IMXFECState), - + VMSTATE_STRUCT_ARRAY(tx_ring, IMXFECState, + ENET_TX_RING_NUM, + 1, vmstate_imx_eth_tx_ring, + IMXFECTxRing), VMSTATE_UINT32(phy_status, IMXFECState), VMSTATE_UINT32(phy_control, IMXFECState), VMSTATE_UINT32(phy_advertise, IMXFECState), @@ -407,7 +420,7 @@ static void imx_fec_do_tx(IMXFECState *s) int frame_size = 0, descnt = 0; uint8_t frame[ENET_MAX_FRAME_SIZE]; uint8_t *ptr = frame; - uint32_t addr = s->tx_descriptor; + uint32_t addr = s->tx_ring[0].descriptor; while (descnt++ < IMX_MAX_DESC) { IMXFECBufDesc bd; @@ -448,17 +461,38 @@ static void imx_fec_do_tx(IMXFECState *s) } } - s->tx_descriptor = addr; + s->tx_ring[0].descriptor = addr; imx_eth_update(s); } -static void imx_enet_do_tx(IMXFECState *s) +static void imx_enet_do_tx(IMXFECState *s, uint32_t index) { int frame_size = 0, descnt = 0; uint8_t frame[ENET_MAX_FRAME_SIZE]; uint8_t *ptr = frame; - uint32_t addr = s->tx_descriptor; + IMXFECTxRing *ring; + uint32_t addr; + + switch (index) { + case ENET_TDAR: + ring = &s->tx_ring[0]; + break; + case ENET_TDAR1: + ring = &s->tx_ring[1]; + break; + case ENET_TDAR2: + ring = &s->tx_ring[2]; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "%s: bogus value for index %x\n", + __func__, index); + abort(); + break; + } + + addr = ring->descriptor; while (descnt++ < IMX_MAX_DESC) { IMXENETBufDesc bd; @@ -502,32 +536,32 @@ static void imx_enet_do_tx(IMXFECState *s) ptr = frame; frame_size = 0; if (bd.option & ENET_BD_TX_INT) { - s->regs[ENET_EIR] |= ENET_INT_TXF; + s->regs[ENET_EIR] |= ring->int_txf; } } if (bd.option & ENET_BD_TX_INT) { - s->regs[ENET_EIR] |= ENET_INT_TXB; + s->regs[ENET_EIR] |= ring->int_txb; } bd.flags &= ~ENET_BD_R; /* Write back the modified descriptor. */ imx_enet_write_bd(&bd, addr); /* Advance to the next descriptor. */ if ((bd.flags & ENET_BD_W) != 0) { - addr = s->regs[ENET_TDSR]; + addr = s->regs[ring->tdsr]; } else { addr += sizeof(bd); } } - s->tx_descriptor = addr; + ring->descriptor = addr; imx_eth_update(s); } -static void imx_eth_do_tx(IMXFECState *s) +static void imx_eth_do_tx(IMXFECState *s, uint32_t index) { if (!s->is_fec && (s->regs[ENET_ECR] & ENET_ECR_EN1588)) { - imx_enet_do_tx(s); + imx_enet_do_tx(s, index); } else { imx_fec_do_tx(s); } @@ -586,7 +620,22 @@ static void imx_eth_reset(DeviceState *d) } s->rx_descriptor = 0; - s->tx_descriptor = 0; + + s->tx_ring[0].tdsr = ENET_TDSR; + s->tx_ring[1].tdsr = ENET_TDSR1; + s->tx_ring[2].tdsr = ENET_TDSR2; + + s->tx_ring[0].int_txf = ENET_INT_TXF; + s->tx_ring[1].int_txf = ENET_INT_TXF1; + s->tx_ring[2].int_txf = ENET_INT_TXF2; + + s->tx_ring[0].int_txb = ENET_INT_TXB; + s->tx_ring[1].int_txb = ENET_INT_TXB1; + s->tx_ring[2].int_txb = ENET_INT_TXB2; + + s->tx_ring[0].descriptor = 0; + s->tx_ring[1].descriptor = 0; + s->tx_ring[2].descriptor = 0; /* We also reset the PHY */ phy_reset(s); @@ -814,10 +863,12 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value, s->regs[index] = 0; } break; + case ENET_TDAR1: /* FALLTHROUGH */ + case ENET_TDAR2: /* FALLTHROUGH */ case ENET_TDAR: if (s->regs[ENET_ECR] & ENET_ECR_ETHEREN) { s->regs[index] = ENET_TDAR_TDAR; - imx_eth_do_tx(s); + imx_eth_do_tx(s, index); } s->regs[index] = 0; break; @@ -829,8 +880,12 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value, if ((s->regs[index] & ENET_ECR_ETHEREN) == 0) { s->regs[ENET_RDAR] = 0; s->rx_descriptor = s->regs[ENET_RDSR]; - s->regs[ENET_TDAR] = 0; - s->tx_descriptor = s->regs[ENET_TDSR]; + s->regs[ENET_TDAR] = 0; + s->regs[ENET_TDAR1] = 0; + s->regs[ENET_TDAR2] = 0; + s->tx_ring[0].descriptor = s->regs[ENET_TDSR]; + s->tx_ring[1].descriptor = s->regs[ENET_TDSR1]; + s->tx_ring[2].descriptor = s->regs[ENET_TDSR2]; } break; case ENET_MMFR: @@ -908,7 +963,15 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value, } else { s->regs[index] = value & ~7; } - s->tx_descriptor = s->regs[index]; + s->tx_ring[0].descriptor = s->regs[index]; + break; + case ENET_TDSR1: + s->regs[index] = value & ~7; + s->tx_ring[1].descriptor = s->regs[index]; + break; + case ENET_TDSR2: + s->regs[index] = value & ~7; + s->tx_ring[2].descriptor = s->regs[index]; break; case ENET_MRBR: s->regs[index] = value & 0x00003ff0; diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index 20a6aa98b4..40bd29771f 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -52,6 +52,8 @@ #define ENET_TFWR 81 #define ENET_FRBR 83 #define ENET_FRSR 84 +#define ENET_TDSR1 89 +#define ENET_TDSR2 92 #define ENET_RDSR 96 #define ENET_TDSR 97 #define ENET_MRBR 98 @@ -66,6 +68,8 @@ #define ENET_FTRL 108 #define ENET_TACC 112 #define ENET_RACC 113 +#define ENET_TDAR1 121 +#define ENET_TDAR2 123 #define ENET_MIIGSK_CFGR 192 #define ENET_MIIGSK_ENR 194 #define ENET_ATCR 256 @@ -106,13 +110,18 @@ #define ENET_INT_WAKEUP (1 << 17) #define ENET_INT_TS_AVAIL (1 << 16) #define ENET_INT_TS_TIMER (1 << 15) +#define ENET_INT_TXF2 (1 << 7) +#define ENET_INT_TXB2 (1 << 6) +#define ENET_INT_TXF1 (1 << 3) +#define ENET_INT_TXB1 (1 << 2) #define ENET_INT_MAC (ENET_INT_HB | ENET_INT_BABR | ENET_INT_BABT | \ ENET_INT_GRA | ENET_INT_TXF | ENET_INT_TXB | \ ENET_INT_RXF | ENET_INT_RXB | ENET_INT_MII | \ ENET_INT_EBERR | ENET_INT_LC | ENET_INT_RL | \ ENET_INT_UN | ENET_INT_PLR | ENET_INT_WAKEUP | \ - ENET_INT_TS_AVAIL) + ENET_INT_TS_AVAIL | ENET_INT_TXF1 | ENET_INT_TXB1 |\ + ENET_INT_TXF2 | ENET_INT_TXB2) /* RDAR */ #define ENET_RDAR_RDAR (1 << 24) @@ -233,6 +242,15 @@ typedef struct { #define ENET_BD_BDU (1 << 31) +#define ENET_TX_RING_NUM 3 + +typedef struct IMXFECTxRing { + uint32_t descriptor; + uint32_t tdsr; + uint32_t int_txf; + uint32_t int_txb; +} IMXFECTxRing; + typedef struct IMXFECState { /*< private >*/ SysBusDevice parent_obj; @@ -245,7 +263,8 @@ typedef struct IMXFECState { uint32_t regs[ENET_MAX]; uint32_t rx_descriptor; - uint32_t tx_descriptor; + + IMXFECTxRing tx_ring[ENET_TX_RING_NUM]; uint32_t phy_status; uint32_t phy_control; -- 2.13.5