From: Ben Hutchings Date: Fri, 23 Oct 2009 08:31:07 +0000 (+0000) Subject: sfc: Define DMA address mask explicitly in terms of descriptor field width X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d51d307509f98f070688b4bff1d0f7462c4d3ec;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git sfc: Define DMA address mask explicitly in terms of descriptor field width Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 3cb7e613ab30..47507b67ba80 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -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) */ #define FALCON_TX_DMA_MASK (4096 - 1) @@ -3148,7 +3145,7 @@ struct efx_nic_type falcon_a_nic_type = { .buf_tbl_base = FR_AA_BUF_FULL_TBL_KER, .evq_ptr_tbl_base = FR_AA_EVQ_PTR_TBL_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, .bug5391_mask = 0xf, .rx_buffer_padding = 0x24, @@ -3169,7 +3166,7 @@ struct efx_nic_type falcon_b_nic_type = { .buf_tbl_base = FR_BZ_BUF_FULL_TBL, .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL, .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, .bug5391_mask = 0, .rx_buffer_padding = 0,