mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imx_fec: Add support for multiple Tx DMA rings

Browse Source 
More recent version of the IP block support more than one Tx DMA ring,
so add the code implementing that feature.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Cc: yurovsky@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andrey Smirnov 2018-01-11 13:25:37 +00:00 committed by Peter Maydell
parent ebdd8cddb9
commit f93f961c40
2 changed files with 130 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
hw/net/imx_fec.c
View File

@ -196,6 +196,31 @@ static const char *imx_eth_reg_name(IMXFECState *s, uint32_t index)
} }
} }
/*
* Versions of this device with more than one TX descriptor save the
* 2nd and 3rd descriptors in a subsection, to maintain migration
* compatibility with previous versions of the device that only
* supported a single descriptor.
*/
static bool imx_eth_is_multi_tx_ring(void *opaque)
{
IMXFECState *s = IMX_FEC(opaque);
return s->tx_ring_num > 1;
}
static const VMStateDescription vmstate_imx_eth_txdescs = {
.name = "imx.fec/txdescs",
.version_id = 1,
.minimum_version_id = 1,
.needed = imx_eth_is_multi_tx_ring,
.fields = (VMStateField[]) {
VMSTATE_UINT32(tx_descriptor[1], IMXFECState),
VMSTATE_UINT32(tx_descriptor[2], IMXFECState),
VMSTATE_END_OF_LIST()
}
};
static const VMStateDescription vmstate_imx_eth = { static const VMStateDescription vmstate_imx_eth = {
.name = TYPE_IMX_FEC, .name = TYPE_IMX_FEC,
.version_id = 2, .version_id = 2,
@ -203,15 +228,18 @@ static const VMStateDescription vmstate_imx_eth = {
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, IMXFECState, ENET_MAX), VMSTATE_UINT32_ARRAY(regs, IMXFECState, ENET_MAX),
VMSTATE_UINT32(rx_descriptor, IMXFECState), VMSTATE_UINT32(rx_descriptor, IMXFECState),
VMSTATE_UINT32(tx_descriptor, IMXFECState), VMSTATE_UINT32(tx_descriptor[0], IMXFECState),
VMSTATE_UINT32(phy_status, IMXFECState), VMSTATE_UINT32(phy_status, IMXFECState),
VMSTATE_UINT32(phy_control, IMXFECState), VMSTATE_UINT32(phy_control, IMXFECState),
VMSTATE_UINT32(phy_advertise, IMXFECState), VMSTATE_UINT32(phy_advertise, IMXFECState),
VMSTATE_UINT32(phy_int, IMXFECState), VMSTATE_UINT32(phy_int, IMXFECState),
VMSTATE_UINT32(phy_int_mask, IMXFECState), VMSTATE_UINT32(phy_int_mask, IMXFECState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} },
.subsections = (const VMStateDescription * []) {
&vmstate_imx_eth_txdescs,
NULL
},
}; };
#define PHY_INT_ENERGYON (1 << 7) #define PHY_INT_ENERGYON (1 << 7)
@ -406,7 +434,7 @@ static void imx_fec_do_tx(IMXFECState *s)
{ {
int frame_size = 0, descnt = 0; int frame_size = 0, descnt = 0;
uint8_t *ptr = s->frame; uint8_t *ptr = s->frame;
uint32_t addr = s->tx_descriptor; uint32_t addr = s->tx_descriptor[0];
while (descnt++ < IMX_MAX_DESC) { while (descnt++ < IMX_MAX_DESC) {
IMXFECBufDesc bd; IMXFECBufDesc bd;
@ -447,16 +475,47 @@ static void imx_fec_do_tx(IMXFECState *s)
} }
} }
s->tx_descriptor = addr; s->tx_descriptor[0] = addr;
imx_eth_update(s); 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; int frame_size = 0, descnt = 0;
uint8_t *ptr = s->frame; uint8_t *ptr = s->frame;
uint32_t addr = s->tx_descriptor; uint32_t addr, int_txb, int_txf, tdsr;
size_t ring;
switch (index) {
case ENET_TDAR:
ring = 0;
int_txb = ENET_INT_TXB;
int_txf = ENET_INT_TXF;
tdsr = ENET_TDSR;
break;
case ENET_TDAR1:
ring = 1;
int_txb = ENET_INT_TXB1;
int_txf = ENET_INT_TXF1;
tdsr = ENET_TDSR1;
break;
case ENET_TDAR2:
ring = 2;
int_txb = ENET_INT_TXB2;
int_txf = ENET_INT_TXF2;
tdsr = ENET_TDSR2;
break;
default:
qemu_log_mask(LOG_GUEST_ERROR,
"%s: bogus value for index %x\n",
__func__, index);
abort();
break;
}
addr = s->tx_descriptor[ring];
while (descnt++ < IMX_MAX_DESC) { while (descnt++ < IMX_MAX_DESC) {
IMXENETBufDesc bd; IMXENETBufDesc bd;
@ -502,32 +561,32 @@ static void imx_enet_do_tx(IMXFECState *s)
frame_size = 0; frame_size = 0;
if (bd.option & ENET_BD_TX_INT) { if (bd.option & ENET_BD_TX_INT) {
s->regs[ENET_EIR] |= ENET_INT_TXF; s->regs[ENET_EIR] |= int_txf;
} }
} }
if (bd.option & ENET_BD_TX_INT) { if (bd.option & ENET_BD_TX_INT) {
s->regs[ENET_EIR] |= ENET_INT_TXB; s->regs[ENET_EIR] |= int_txb;
} }
bd.flags &= ~ENET_BD_R; bd.flags &= ~ENET_BD_R;
/* Write back the modified descriptor. */ /* Write back the modified descriptor. */
imx_enet_write_bd(&bd, addr); imx_enet_write_bd(&bd, addr);
/* Advance to the next descriptor. */ /* Advance to the next descriptor. */
if ((bd.flags & ENET_BD_W) != 0) { if ((bd.flags & ENET_BD_W) != 0) {
addr = s->regs[ENET_TDSR]; addr = s->regs[tdsr];
} else { } else {
addr += sizeof(bd); addr += sizeof(bd);
} }
} }
s->tx_descriptor = addr; s->tx_descriptor[ring] = addr;
imx_eth_update(s); 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)) { if (!s->is_fec && (s->regs[ENET_ECR] & ENET_ECR_EN1588)) {
imx_enet_do_tx(s); imx_enet_do_tx(s, index);
} else { } else {
imx_fec_do_tx(s); imx_fec_do_tx(s);
} }
@ -585,7 +644,7 @@ static void imx_eth_reset(DeviceState *d)
} }
s->rx_descriptor = 0; s->rx_descriptor = 0;
s->tx_descriptor = 0; memset(s->tx_descriptor, 0, sizeof(s->tx_descriptor));
/* We also reset the PHY */ /* We also reset the PHY */
phy_reset(s); phy_reset(s);
@ -791,6 +850,7 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value,
unsigned size) unsigned size)
{ {
IMXFECState *s = IMX_FEC(opaque); IMXFECState *s = IMX_FEC(opaque);
const bool single_tx_ring = !imx_eth_is_multi_tx_ring(s);
uint32_t index = offset >> 2; uint32_t index = offset >> 2;
FEC_PRINTF("reg[%s] <= 0x%" PRIx32 "\n", imx_eth_reg_name(s, index), FEC_PRINTF("reg[%s] <= 0x%" PRIx32 "\n", imx_eth_reg_name(s, index),
@ -813,10 +873,18 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value,
s->regs[index] = 0; s->regs[index] = 0;
} }
break; break;
case ENET_TDAR: case ENET_TDAR1: /* FALLTHROUGH */
case ENET_TDAR2: /* FALLTHROUGH */
if (unlikely(single_tx_ring)) {
qemu_log_mask(LOG_GUEST_ERROR,
"[%s]%s: trying to access TDAR2 or TDAR1\n",
TYPE_IMX_FEC, __func__);
return;
}
case ENET_TDAR: /* FALLTHROUGH */
if (s->regs[ENET_ECR] & ENET_ECR_ETHEREN) { if (s->regs[ENET_ECR] & ENET_ECR_ETHEREN) {
s->regs[index] = ENET_TDAR_TDAR; s->regs[index] = ENET_TDAR_TDAR;
imx_eth_do_tx(s); imx_eth_do_tx(s, index);
} }
s->regs[index] = 0; s->regs[index] = 0;
break; break;
@ -829,7 +897,11 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value,
s->regs[ENET_RDAR] = 0; s->regs[ENET_RDAR] = 0;
s->rx_descriptor = s->regs[ENET_RDSR]; s->rx_descriptor = s->regs[ENET_RDSR];
s->regs[ENET_TDAR] = 0; s->regs[ENET_TDAR] = 0;
s->tx_descriptor = s->regs[ENET_TDSR]; s->regs[ENET_TDAR1] = 0;
s->regs[ENET_TDAR2] = 0;
s->tx_descriptor[0] = s->regs[ENET_TDSR];
s->tx_descriptor[1] = s->regs[ENET_TDSR1];
s->tx_descriptor[2] = s->regs[ENET_TDSR2];
} }
break; break;
case ENET_MMFR: case ENET_MMFR:
@ -907,7 +979,29 @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value,
} else { } else {
s->regs[index] = value & ~7; s->regs[index] = value & ~7;
} }
s->tx_descriptor = s->regs[index]; s->tx_descriptor[0] = s->regs[index];
break;
case ENET_TDSR1:
if (unlikely(single_tx_ring)) {
qemu_log_mask(LOG_GUEST_ERROR,
"[%s]%s: trying to access TDSR1\n",
TYPE_IMX_FEC, __func__);
return;
}
s->regs[index] = value & ~7;
s->tx_descriptor[1] = s->regs[index];
break;
case ENET_TDSR2:
if (unlikely(single_tx_ring)) {
qemu_log_mask(LOG_GUEST_ERROR,
"[%s]%s: trying to access TDSR2\n",
TYPE_IMX_FEC, __func__);
return;
}
s->regs[index] = value & ~7;
s->tx_descriptor[2] = s->regs[index];
break; break;
case ENET_MRBR: case ENET_MRBR:
s->regs[index] = value & 0x00003ff0; s->regs[index] = value & 0x00003ff0;
@ -1203,6 +1297,7 @@ static void imx_eth_realize(DeviceState *dev, Error **errp)
static Property imx_eth_properties[] = { static Property imx_eth_properties[] = {
DEFINE_NIC_PROPERTIES(IMXFECState, conf), DEFINE_NIC_PROPERTIES(IMXFECState, conf),
DEFINE_PROP_UINT32("tx-ring-num", IMXFECState, tx_ring_num, 1),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

18
include/hw/net/imx_fec.h
View File

@ -52,6 +52,8 @@
#define ENET_TFWR 81 #define ENET_TFWR 81
#define ENET_FRBR 83 #define ENET_FRBR 83
#define ENET_FRSR 84 #define ENET_FRSR 84
#define ENET_TDSR1 89
#define ENET_TDSR2 92
#define ENET_RDSR 96 #define ENET_RDSR 96
#define ENET_TDSR 97 #define ENET_TDSR 97
#define ENET_MRBR 98 #define ENET_MRBR 98
@ -66,6 +68,8 @@
#define ENET_FTRL 108 #define ENET_FTRL 108
#define ENET_TACC 112 #define ENET_TACC 112
#define ENET_RACC 113 #define ENET_RACC 113
#define ENET_TDAR1 121
#define ENET_TDAR2 123
#define ENET_MIIGSK_CFGR 192 #define ENET_MIIGSK_CFGR 192
#define ENET_MIIGSK_ENR 194 #define ENET_MIIGSK_ENR 194
#define ENET_ATCR 256 #define ENET_ATCR 256
@ -105,13 +109,18 @@
#define ENET_INT_WAKEUP (1 << 17) #define ENET_INT_WAKEUP (1 << 17)
#define ENET_INT_TS_AVAIL (1 << 16) #define ENET_INT_TS_AVAIL (1 << 16)
#define ENET_INT_TS_TIMER (1 << 15) #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 | \ #define ENET_INT_MAC (ENET_INT_HB | ENET_INT_BABR | ENET_INT_BABT | \
ENET_INT_GRA | ENET_INT_TXF | ENET_INT_TXB | \ ENET_INT_GRA | ENET_INT_TXF | ENET_INT_TXB | \
ENET_INT_RXF | ENET_INT_RXB | ENET_INT_MII | \ ENET_INT_RXF | ENET_INT_RXB | ENET_INT_MII | \
ENET_INT_EBERR | ENET_INT_LC | ENET_INT_RL | \ ENET_INT_EBERR | ENET_INT_LC | ENET_INT_RL | \
ENET_INT_UN | ENET_INT_PLR | ENET_INT_WAKEUP | \ 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 */ /* RDAR */
#define ENET_RDAR_RDAR (1 << 24) #define ENET_RDAR_RDAR (1 << 24)
@ -234,6 +243,9 @@ typedef struct {
#define ENET_BD_BDU (1 << 31) #define ENET_BD_BDU (1 << 31)
#define ENET_TX_RING_NUM 3
typedef struct IMXFECState { typedef struct IMXFECState {
/*< private >*/ /*< private >*/
SysBusDevice parent_obj; SysBusDevice parent_obj;
@ -246,7 +258,9 @@ typedef struct IMXFECState {
uint32_t regs[ENET_MAX]; uint32_t regs[ENET_MAX];
uint32_t rx_descriptor; uint32_t rx_descriptor;
uint32_t tx_descriptor;
uint32_t tx_descriptor[ENET_TX_RING_NUM];
uint32_t tx_ring_num;
uint32_t phy_status; uint32_t phy_status;
uint32_t phy_control; uint32_t phy_control;