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

i.MX: Rename i.MX FEC defines to ENET_XXX

Browse Source 
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Jean-Christophe Dubois 2016-05-30 19:26:02 +02:00 committed by Jason Wang
parent ff4b325f5e
commit 1bb3c37182
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
hw/net/imx_fec.c
View File

@ -266,7 +266,7 @@ static void imx_fec_update(IMXFECState *s)
static void imx_fec_do_tx(IMXFECState *s) static void imx_fec_do_tx(IMXFECState *s)
{ {
int frame_size = 0; int frame_size = 0;
uint8_t frame[FEC_MAX_FRAME_SIZE]; uint8_t frame[ENET_MAX_FRAME_SIZE];
uint8_t *ptr = frame; uint8_t *ptr = frame;
uint32_t addr = s->tx_descriptor; uint32_t addr = s->tx_descriptor;
@ -277,31 +277,31 @@ static void imx_fec_do_tx(IMXFECState *s)
imx_fec_read_bd(&bd, addr); imx_fec_read_bd(&bd, addr);
FEC_PRINTF("tx_bd %x flags %04x len %d data %08x\n", FEC_PRINTF("tx_bd %x flags %04x len %d data %08x\n",
addr, bd.flags, bd.length, bd.data); addr, bd.flags, bd.length, bd.data);
if ((bd.flags & FEC_BD_R) == 0) { if ((bd.flags & ENET_BD_R) == 0) {
/* Run out of descriptors to transmit. */ /* Run out of descriptors to transmit. */
break; break;
} }
len = bd.length; len = bd.length;
if (frame_size + len > FEC_MAX_FRAME_SIZE) { if (frame_size + len > ENET_MAX_FRAME_SIZE) {
len = FEC_MAX_FRAME_SIZE - frame_size; len = ENET_MAX_FRAME_SIZE - frame_size;
s->eir |= FEC_INT_BABT; s->eir |= ENET_INT_BABT;
} }
dma_memory_read(&address_space_memory, bd.data, ptr, len); dma_memory_read(&address_space_memory, bd.data, ptr, len);
ptr += len; ptr += len;
frame_size += len; frame_size += len;
if (bd.flags & FEC_BD_L) { if (bd.flags & ENET_BD_L) {
/* Last buffer in frame. */ /* Last buffer in frame. */
qemu_send_packet(qemu_get_queue(s->nic), frame, len); qemu_send_packet(qemu_get_queue(s->nic), frame, len);
ptr = frame; ptr = frame;
frame_size = 0; frame_size = 0;
s->eir |= FEC_INT_TXF; s->eir |= ENET_INT_TXF;
} }
s->eir |= FEC_INT_TXB; s->eir |= ENET_INT_TXB;
bd.flags &= ~FEC_BD_R; bd.flags &= ~ENET_BD_R;
/* Write back the modified descriptor. */ /* Write back the modified descriptor. */
imx_fec_write_bd(&bd, addr); imx_fec_write_bd(&bd, addr);
/* Advance to the next descriptor. */ /* Advance to the next descriptor. */
if ((bd.flags & FEC_BD_W) != 0) { if ((bd.flags & ENET_BD_W) != 0) {
addr = s->etdsr; addr = s->etdsr;
} else { } else {
addr += 8; addr += 8;
@ -320,7 +320,7 @@ static void imx_fec_enable_rx(IMXFECState *s)
imx_fec_read_bd(&bd, s->rx_descriptor); imx_fec_read_bd(&bd, s->rx_descriptor);
tmp = ((bd.flags & FEC_BD_E) != 0); tmp = ((bd.flags & ENET_BD_E) != 0);
if (!tmp) { if (!tmp) {
FEC_PRINTF("RX buffer full\n"); FEC_PRINTF("RX buffer full\n");
@ -438,21 +438,21 @@ static void imx_fec_write(void *opaque, hwaddr addr,
s->eimr = value; s->eimr = value;
break; break;
case 0x010: /* RDAR */ case 0x010: /* RDAR */
if ((s->ecr & FEC_EN) && !s->rx_enabled) { if ((s->ecr & ENET_ECR_ETHEREN) && !s->rx_enabled) {
imx_fec_enable_rx(s); imx_fec_enable_rx(s);
} }
break; break;
case 0x014: /* TDAR */ case 0x014: /* TDAR */
if (s->ecr & FEC_EN) { if (s->ecr & ENET_ECR_ETHEREN) {
imx_fec_do_tx(s); imx_fec_do_tx(s);
} }
break; break;
case 0x024: /* ECR */ case 0x024: /* ECR */
s->ecr = value; s->ecr = value;
if (value & FEC_RESET) { if (value & ENET_ECR_RESET) {
imx_fec_reset(DEVICE(s)); imx_fec_reset(DEVICE(s));
} }
if ((s->ecr & FEC_EN) == 0) { if ((s->ecr & ENET_ECR_ETHEREN) == 0) {
s->rx_enabled = 0; s->rx_enabled = 0;
s->rx_descriptor = s->erdsr; s->rx_descriptor = s->erdsr;
s->tx_descriptor = s->etdsr; s->tx_descriptor = s->etdsr;
@ -467,7 +467,7 @@ static void imx_fec_write(void *opaque, hwaddr addr,
do_phy_write(s, extract32(value, 18, 10), extract32(value, 0, 16)); do_phy_write(s, extract32(value, 18, 10), extract32(value, 0, 16));
} }
/* raise the interrupt as the PHY operation is done */ /* raise the interrupt as the PHY operation is done */
s->eir |= FEC_INT_MII; s->eir |= ENET_INT_MII;
break; break;
case 0x044: /* MSCR */ case 0x044: /* MSCR */
s->mscr = value & 0xfe; s->mscr = value & 0xfe;
@ -484,7 +484,7 @@ static void imx_fec_write(void *opaque, hwaddr addr,
/* We transmit immediately, so raise GRA immediately. */ /* We transmit immediately, so raise GRA immediately. */
s->tcr = value; s->tcr = value;
if (value & 1) { if (value & 1) {
s->eir |= FEC_INT_GRA; s->eir |= ENET_INT_GRA;
} }
break; break;
case 0x0e4: /* PALR */ case 0x0e4: /* PALR */
@ -574,20 +574,20 @@ static ssize_t imx_fec_receive(NetClientState *nc, const uint8_t *buf,
crc_ptr = (uint8_t *) &crc; crc_ptr = (uint8_t *) &crc;
/* Huge frames are truncted. */ /* Huge frames are truncted. */
if (size > FEC_MAX_FRAME_SIZE) { if (size > ENET_MAX_FRAME_SIZE) {
size = FEC_MAX_FRAME_SIZE; size = ENET_MAX_FRAME_SIZE;
flags |= FEC_BD_TR | FEC_BD_LG; flags |= ENET_BD_TR | ENET_BD_LG;
} }
/* Frames larger than the user limit just set error flags. */ /* Frames larger than the user limit just set error flags. */
if (size > (s->rcr >> 16)) { if (size > (s->rcr >> 16)) {
flags |= FEC_BD_LG; flags |= ENET_BD_LG;
} }
addr = s->rx_descriptor; addr = s->rx_descriptor;
while (size > 0) { while (size > 0) {
imx_fec_read_bd(&bd, addr); imx_fec_read_bd(&bd, addr);
if ((bd.flags & FEC_BD_E) == 0) { if ((bd.flags & ENET_BD_E) == 0) {
/* No descriptors available. Bail out. */ /* No descriptors available. Bail out. */
/* /*
* FIXME: This is wrong. We should probably either * FIXME: This is wrong. We should probably either
@ -616,18 +616,18 @@ static ssize_t imx_fec_receive(NetClientState *nc, const uint8_t *buf,
crc_ptr, 4 - size); crc_ptr, 4 - size);
crc_ptr += 4 - size; crc_ptr += 4 - size;
} }
bd.flags &= ~FEC_BD_E; bd.flags &= ~ENET_BD_E;
if (size == 0) { if (size == 0) {
/* Last buffer in frame. */ /* Last buffer in frame. */
bd.flags |= flags | FEC_BD_L; bd.flags |= flags | ENET_BD_L;
FEC_PRINTF("rx frame flags %04x\n", bd.flags); FEC_PRINTF("rx frame flags %04x\n", bd.flags);
s->eir |= FEC_INT_RXF; s->eir |= ENET_INT_RXF;
} else { } else {
s->eir |= FEC_INT_RXB; s->eir |= ENET_INT_RXB;
} }
imx_fec_write_bd(&bd, addr); imx_fec_write_bd(&bd, addr);
/* Advance to the next descriptor. */ /* Advance to the next descriptor. */
if ((bd.flags & FEC_BD_W) != 0) { if ((bd.flags & ENET_BD_W) != 0) {
addr = s->erdsr; addr = s->erdsr;
} else { } else {
addr += 8; addr += 8;

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

@ -30,24 +30,24 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "net/net.h" #include "net/net.h"
#define FEC_MAX_FRAME_SIZE 2032 #define ENET_MAX_FRAME_SIZE 2032
#define FEC_INT_HB (1 << 31) #define ENET_INT_HB (1 << 31)
#define FEC_INT_BABR (1 << 30) #define ENET_INT_BABR (1 << 30)
#define FEC_INT_BABT (1 << 29) #define ENET_INT_BABT (1 << 29)
#define FEC_INT_GRA (1 << 28) #define ENET_INT_GRA (1 << 28)
#define FEC_INT_TXF (1 << 27) #define ENET_INT_TXF (1 << 27)
#define FEC_INT_TXB (1 << 26) #define ENET_INT_TXB (1 << 26)
#define FEC_INT_RXF (1 << 25) #define ENET_INT_RXF (1 << 25)
#define FEC_INT_RXB (1 << 24) #define ENET_INT_RXB (1 << 24)
#define FEC_INT_MII (1 << 23) #define ENET_INT_MII (1 << 23)
#define FEC_INT_EBERR (1 << 22) #define ENET_INT_EBERR (1 << 22)
#define FEC_INT_LC (1 << 21) #define ENET_INT_LC (1 << 21)
#define FEC_INT_RL (1 << 20) #define ENET_INT_RL (1 << 20)
#define FEC_INT_UN (1 << 19) #define ENET_INT_UN (1 << 19)
#define FEC_EN 2 #define ENET_ECR_RESET (1 << 0)
#define FEC_RESET 1 #define ENET_ECR_ETHEREN (1 << 1)
/* Buffer Descriptor. */ /* Buffer Descriptor. */
typedef struct { typedef struct {
@ -56,22 +56,22 @@ typedef struct {
uint32_t data; uint32_t data;
} IMXFECBufDesc; } IMXFECBufDesc;
#define FEC_BD_R (1 << 15) #define ENET_BD_R (1 << 15)
#define FEC_BD_E (1 << 15) #define ENET_BD_E (1 << 15)
#define FEC_BD_O1 (1 << 14) #define ENET_BD_O1 (1 << 14)
#define FEC_BD_W (1 << 13) #define ENET_BD_W (1 << 13)
#define FEC_BD_O2 (1 << 12) #define ENET_BD_O2 (1 << 12)
#define FEC_BD_L (1 << 11) #define ENET_BD_L (1 << 11)
#define FEC_BD_TC (1 << 10) #define ENET_BD_TC (1 << 10)
#define FEC_BD_ABC (1 << 9) #define ENET_BD_ABC (1 << 9)
#define FEC_BD_M (1 << 8) #define ENET_BD_M (1 << 8)
#define FEC_BD_BC (1 << 7) #define ENET_BD_BC (1 << 7)
#define FEC_BD_MC (1 << 6) #define ENET_BD_MC (1 << 6)
#define FEC_BD_LG (1 << 5) #define ENET_BD_LG (1 << 5)
#define FEC_BD_NO (1 << 4) #define ENET_BD_NO (1 << 4)
#define FEC_BD_CR (1 << 2) #define ENET_BD_CR (1 << 2)
#define FEC_BD_OV (1 << 1) #define ENET_BD_OV (1 << 1)
#define FEC_BD_TR (1 << 0) #define ENET_BD_TR (1 << 0)
typedef struct IMXFECState { typedef struct IMXFECState {
/*< private >*/ /*< private >*/