diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-10-23 04:31:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-24 07:27:06 -0400 |
commit | 6d51d307509f98f070688b4bff1d0f7462c4d3ec (patch) | |
tree | 7e3fc832ca03b3ebfe84d8c60a66f3360598a164 /drivers/net/sfc/falcon.c | |
parent | 3ffeabdd2bc62e0ebcb1a51a5d959a86a7a915fc (diff) |
sfc: Define DMA address mask explicitly in terms of descriptor field width
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r-- | drivers/net/sfc/falcon.c | 7 |
1 files changed, 2 insertions, 5 deletions
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"); | |||
127 | ************************************************************************** | 127 | ************************************************************************** |
128 | */ | 128 | */ |
129 | 129 | ||
130 | /* DMA address mask */ | ||
131 | #define FALCON_DMA_MASK DMA_BIT_MASK(46) | ||
132 | |||
133 | /* TX DMA length mask (13-bit) */ | 130 | /* TX DMA length mask (13-bit) */ |
134 | #define FALCON_TX_DMA_MASK (4096 - 1) | 131 | #define FALCON_TX_DMA_MASK (4096 - 1) |
135 | 132 | ||
@@ -3148,7 +3145,7 @@ struct efx_nic_type falcon_a_nic_type = { | |||
3148 | .buf_tbl_base = FR_AA_BUF_FULL_TBL_KER, | 3145 | .buf_tbl_base = FR_AA_BUF_FULL_TBL_KER, |
3149 | .evq_ptr_tbl_base = FR_AA_EVQ_PTR_TBL_KER, | 3146 | .evq_ptr_tbl_base = FR_AA_EVQ_PTR_TBL_KER, |
3150 | .evq_rptr_tbl_base = FR_AA_EVQ_RPTR_KER, | 3147 | .evq_rptr_tbl_base = FR_AA_EVQ_RPTR_KER, |
3151 | .max_dma_mask = FALCON_DMA_MASK, | 3148 | .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH), |
3152 | .tx_dma_mask = FALCON_TX_DMA_MASK, | 3149 | .tx_dma_mask = FALCON_TX_DMA_MASK, |
3153 | .bug5391_mask = 0xf, | 3150 | .bug5391_mask = 0xf, |
3154 | .rx_buffer_padding = 0x24, | 3151 | .rx_buffer_padding = 0x24, |
@@ -3169,7 +3166,7 @@ struct efx_nic_type falcon_b_nic_type = { | |||
3169 | .buf_tbl_base = FR_BZ_BUF_FULL_TBL, | 3166 | .buf_tbl_base = FR_BZ_BUF_FULL_TBL, |
3170 | .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL, | 3167 | .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL, |
3171 | .evq_rptr_tbl_base = FR_BZ_EVQ_RPTR, | 3168 | .evq_rptr_tbl_base = FR_BZ_EVQ_RPTR, |
3172 | .max_dma_mask = FALCON_DMA_MASK, | 3169 | .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH), |
3173 | .tx_dma_mask = FALCON_TX_DMA_MASK, | 3170 | .tx_dma_mask = FALCON_TX_DMA_MASK, |
3174 | .bug5391_mask = 0, | 3171 | .bug5391_mask = 0, |
3175 | .rx_buffer_padding = 0, | 3172 | .rx_buffer_padding = 0, |