Commit 6d51d307 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller

sfc: Define DMA address mask explicitly in terms of descriptor field width

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ffeabdd
...@@ -127,9 +127,6 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold"); ...@@ -127,9 +127,6 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
************************************************************************** **************************************************************************
*/ */
/* DMA address mask */
#define FALCON_DMA_MASK DMA_BIT_MASK(46)
/* TX DMA length mask (13-bit) */ /* TX DMA length mask (13-bit) */
#define FALCON_TX_DMA_MASK (4096 - 1) #define FALCON_TX_DMA_MASK (4096 - 1)
...@@ -3148,7 +3145,7 @@ struct efx_nic_type falcon_a_nic_type = { ...@@ -3148,7 +3145,7 @@ struct efx_nic_type falcon_a_nic_type = {
.buf_tbl_base = FR_AA_BUF_FULL_TBL_KER, .buf_tbl_base = FR_AA_BUF_FULL_TBL_KER,
.evq_ptr_tbl_base = FR_AA_EVQ_PTR_TBL_KER, .evq_ptr_tbl_base = FR_AA_EVQ_PTR_TBL_KER,
.evq_rptr_tbl_base = FR_AA_EVQ_RPTR_KER, .evq_rptr_tbl_base = FR_AA_EVQ_RPTR_KER,
.max_dma_mask = FALCON_DMA_MASK, .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
.tx_dma_mask = FALCON_TX_DMA_MASK, .tx_dma_mask = FALCON_TX_DMA_MASK,
.bug5391_mask = 0xf, .bug5391_mask = 0xf,
.rx_buffer_padding = 0x24, .rx_buffer_padding = 0x24,
...@@ -3169,7 +3166,7 @@ struct efx_nic_type falcon_b_nic_type = { ...@@ -3169,7 +3166,7 @@ struct efx_nic_type falcon_b_nic_type = {
.buf_tbl_base = FR_BZ_BUF_FULL_TBL, .buf_tbl_base = FR_BZ_BUF_FULL_TBL,
.evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL, .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL,
.evq_rptr_tbl_base = FR_BZ_EVQ_RPTR, .evq_rptr_tbl_base = FR_BZ_EVQ_RPTR,
.max_dma_mask = FALCON_DMA_MASK, .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
.tx_dma_mask = FALCON_TX_DMA_MASK, .tx_dma_mask = FALCON_TX_DMA_MASK,
.bug5391_mask = 0, .bug5391_mask = 0,
.rx_buffer_padding = 0, .rx_buffer_padding = 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment