diff options
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r-- | drivers/net/bnx2.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index b87925f6a228..5845e334941b 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -231,6 +231,7 @@ struct statistics_block { | |||
231 | u32 stat_GenStat13; | 231 | u32 stat_GenStat13; |
232 | u32 stat_GenStat14; | 232 | u32 stat_GenStat14; |
233 | u32 stat_GenStat15; | 233 | u32 stat_GenStat15; |
234 | u32 stat_FwRxDrop; | ||
234 | }; | 235 | }; |
235 | 236 | ||
236 | 237 | ||
@@ -3481,6 +3482,8 @@ struct l2_fhdr { | |||
3481 | 3482 | ||
3482 | #define BNX2_COM_SCRATCH 0x00120000 | 3483 | #define BNX2_COM_SCRATCH 0x00120000 |
3483 | 3484 | ||
3485 | #define BNX2_FW_RX_DROP_COUNT 0x00120084 | ||
3486 | |||
3484 | 3487 | ||
3485 | /* | 3488 | /* |
3486 | * cp_reg definition | 3489 | * cp_reg definition |
@@ -3747,7 +3750,12 @@ struct l2_fhdr { | |||
3747 | #define DMA_READ_CHANS 5 | 3750 | #define DMA_READ_CHANS 5 |
3748 | #define DMA_WRITE_CHANS 3 | 3751 | #define DMA_WRITE_CHANS 3 |
3749 | 3752 | ||
3750 | #define BCM_PAGE_BITS 12 | 3753 | /* Use CPU native page size up to 16K for the ring sizes. */ |
3754 | #if (PAGE_SHIFT > 14) | ||
3755 | #define BCM_PAGE_BITS 14 | ||
3756 | #else | ||
3757 | #define BCM_PAGE_BITS PAGE_SHIFT | ||
3758 | #endif | ||
3751 | #define BCM_PAGE_SIZE (1 << BCM_PAGE_BITS) | 3759 | #define BCM_PAGE_SIZE (1 << BCM_PAGE_BITS) |
3752 | 3760 | ||
3753 | #define TX_DESC_CNT (BCM_PAGE_SIZE / sizeof(struct tx_bd)) | 3761 | #define TX_DESC_CNT (BCM_PAGE_SIZE / sizeof(struct tx_bd)) |
@@ -3770,7 +3778,7 @@ struct l2_fhdr { | |||
3770 | 3778 | ||
3771 | #define RX_RING_IDX(x) ((x) & bp->rx_max_ring_idx) | 3779 | #define RX_RING_IDX(x) ((x) & bp->rx_max_ring_idx) |
3772 | 3780 | ||
3773 | #define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> 8) | 3781 | #define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> (BCM_PAGE_BITS - 4)) |
3774 | #define RX_IDX(x) ((x) & MAX_RX_DESC_CNT) | 3782 | #define RX_IDX(x) ((x) & MAX_RX_DESC_CNT) |
3775 | 3783 | ||
3776 | /* Context size. */ | 3784 | /* Context size. */ |
@@ -4048,6 +4056,9 @@ struct bnx2 { | |||
4048 | u32 flash_size; | 4056 | u32 flash_size; |
4049 | 4057 | ||
4050 | int status_stats_size; | 4058 | int status_stats_size; |
4059 | |||
4060 | struct z_stream_s *strm; | ||
4061 | void *gunzip_buf; | ||
4051 | }; | 4062 | }; |
4052 | 4063 | ||
4053 | static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset); | 4064 | static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset); |