Skip to content

Commit

Permalink
hw/net/cadence_gem: use FIELD to describe DMACFG register fields
Browse files Browse the repository at this point in the history 
Use de FIELD macro to describe the DMACFG register fields.

Signed-off-by: Luc Michel <luc.michel@amd.com>
Reviewed-by: sai.pavan.boddu@amd.com
Message-id: 20231017194422.4124691-6-luc.michel@amd.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
@pm215
Luc Michel authored and pm215 committed Oct 27, 2023
1 parent 87a49c3 commit 01f9175
Showing 1 changed file with 31 additions and 17 deletions.
48 changes: 31 additions & 17 deletions hw/net/cadence_gem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,27 @@ REG32(NWCFG, 0x4) /* Network Config reg */

REG32(NWSTATUS, 0x8) /* Network Status reg */
REG32(USERIO, 0xc) /* User IO reg */

REG32(DMACFG, 0x10) /* DMA Control reg */
FIELD(DMACFG, SEND_BCAST_TO_ALL_QS, 31, 1)
FIELD(DMACFG, DMA_ADDR_BUS_WIDTH, 30, 1)
FIELD(DMACFG, TX_BD_EXT_MODE_EN , 29, 1)
FIELD(DMACFG, RX_BD_EXT_MODE_EN , 28, 1)
FIELD(DMACFG, FORCE_MAX_AMBA_BURST_TX, 26, 1)
FIELD(DMACFG, FORCE_MAX_AMBA_BURST_RX, 25, 1)
FIELD(DMACFG, FORCE_DISCARD_ON_ERR, 24, 1)
FIELD(DMACFG, RX_BUF_SIZE, 16, 8)
FIELD(DMACFG, CRC_ERROR_REPORT, 13, 1)
FIELD(DMACFG, INF_LAST_DBUF_SIZE_EN, 12, 1)
FIELD(DMACFG, TX_PBUF_CSUM_OFFLOAD, 11, 1)
FIELD(DMACFG, TX_PBUF_SIZE, 10, 1)
FIELD(DMACFG, RX_PBUF_SIZE, 8, 2)
FIELD(DMACFG, ENDIAN_SWAP_PACKET, 7, 1)
FIELD(DMACFG, ENDIAN_SWAP_MGNT, 6, 1)
FIELD(DMACFG, HDR_DATA_SPLIT_EN, 5, 1)
FIELD(DMACFG, AMBA_BURST_LEN , 0, 5)
#define GEM_DMACFG_RBUFSZ_MUL 64 /* DMA RX Buffer Size multiplier */

REG32(TXSTATUS, 0x14) /* TX Status reg */
REG32(RXQBASE, 0x18) /* RX Q Base address reg */
REG32(TXQBASE, 0x1c) /* TX Q Base address reg */
Expand Down Expand Up @@ -265,13 +285,6 @@ REG32(TYPE2_COMPARE_0_WORD_1, 0x704)
FIELD(TYPE2_COMPARE_0_WORD_1, COMPARE_VLAN_ID, 10, 1)

/*****************************************/
#define GEM_DMACFG_ADDR_64B (1U << 30)
#define GEM_DMACFG_TX_BD_EXT (1U << 29)
#define GEM_DMACFG_RX_BD_EXT (1U << 28)
#define GEM_DMACFG_RBUFSZ_M 0x00FF0000 /* DMA RX Buffer Size mask */
#define GEM_DMACFG_RBUFSZ_S 16 /* DMA RX Buffer Size shift */
#define GEM_DMACFG_RBUFSZ_MUL 64 /* DMA RX Buffer Size multiplier */
#define GEM_DMACFG_TXCSUM_OFFL 0x00000800 /* Transmit checksum offload */

#define GEM_TXSTATUS_TXCMPL 0x00000020 /* Transmit Complete */
#define GEM_TXSTATUS_USED 0x00000001 /* sw owned descriptor encountered */
Expand Down Expand Up @@ -369,7 +382,7 @@ static inline uint64_t tx_desc_get_buffer(CadenceGEMState *s, uint32_t *desc)
{
uint64_t ret = desc[0];

if (s->regs[R_DMACFG] & GEM_DMACFG_ADDR_64B) {
if (FIELD_EX32(s->regs[R_DMACFG], DMACFG, DMA_ADDR_BUS_WIDTH)) {
ret |= (uint64_t)desc[2] << 32;
}
return ret;
Expand Down Expand Up @@ -414,7 +427,7 @@ static inline uint64_t rx_desc_get_buffer(CadenceGEMState *s, uint32_t *desc)
{
uint64_t ret = desc[0] & ~0x3UL;

if (s->regs[R_DMACFG] & GEM_DMACFG_ADDR_64B) {
if (FIELD_EX32(s->regs[R_DMACFG], DMACFG, DMA_ADDR_BUS_WIDTH)) {
ret |= (uint64_t)desc[2] << 32;
}
return ret;
Expand All @@ -424,11 +437,11 @@ static inline int gem_get_desc_len(CadenceGEMState *s, bool rx_n_tx)
{
int ret = 2;

if (s->regs[R_DMACFG] & GEM_DMACFG_ADDR_64B) {
if (FIELD_EX32(s->regs[R_DMACFG], DMACFG, DMA_ADDR_BUS_WIDTH)) {
ret += 2;
}
if (s->regs[R_DMACFG] & (rx_n_tx ? GEM_DMACFG_RX_BD_EXT
: GEM_DMACFG_TX_BD_EXT)) {
if (s->regs[R_DMACFG] & (rx_n_tx ? R_DMACFG_RX_BD_EXT_MODE_EN_MASK
: R_DMACFG_TX_BD_EXT_MODE_EN_MASK)) {
ret += 2;
}

Expand Down Expand Up @@ -942,7 +955,7 @@ static hwaddr gem_get_desc_addr(CadenceGEMState *s, bool tx, int q)
{
hwaddr desc_addr = 0;

if (s->regs[R_DMACFG] & GEM_DMACFG_ADDR_64B) {
if (FIELD_EX32(s->regs[R_DMACFG], DMACFG, DMA_ADDR_BUS_WIDTH)) {
desc_addr = s->regs[tx ? R_TBQPH : R_RBQPH];
}
desc_addr <<= 32;
Expand Down Expand Up @@ -1024,8 +1037,9 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
/* The configure size of each receive buffer. Determines how many
* buffers needed to hold this packet.
*/
rxbufsize = ((s->regs[R_DMACFG] & GEM_DMACFG_RBUFSZ_M) >>
GEM_DMACFG_RBUFSZ_S) * GEM_DMACFG_RBUFSZ_MUL;
rxbufsize = FIELD_EX32(s->regs[R_DMACFG], DMACFG, RX_BUF_SIZE);
rxbufsize *= GEM_DMACFG_RBUFSZ_MUL;

bytes_to_copy = size;

/* Hardware allows a zero value here but warns against it. To avoid QEMU
Expand Down Expand Up @@ -1308,7 +1322,7 @@ static void gem_transmit(CadenceGEMState *s)
gem_update_int_status(s);

/* Is checksum offload enabled? */
if (s->regs[R_DMACFG] & GEM_DMACFG_TXCSUM_OFFL) {
if (FIELD_EX32(s->regs[R_DMACFG], DMACFG, TX_PBUF_CSUM_OFFLOAD)) {
net_checksum_calculate(s->tx_packet, total_bytes, CSUM_ALL);
}

Expand All @@ -1332,7 +1346,7 @@ static void gem_transmit(CadenceGEMState *s)

/* read next descriptor */
if (tx_desc_get_wrap(desc)) {
if (s->regs[R_DMACFG] & GEM_DMACFG_ADDR_64B) {
if (FIELD_EX32(s->regs[R_DMACFG], DMACFG, DMA_ADDR_BUS_WIDTH)) {
packet_desc_addr = s->regs[R_TBQPH];
packet_desc_addr <<= 32;
} else {
Expand Down

0 comments on commit 01f9175

Please sign in to comment.