Commit 24c93443 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

bnxt_en: Use macros to define port statistics size and offset.

The port statistics structures have hard coded padding and offset.
Define macros to make this look cleaner.
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bfc6e5fb
...@@ -3788,8 +3788,7 @@ static int bnxt_alloc_stats(struct bnxt *bp) ...@@ -3788,8 +3788,7 @@ static int bnxt_alloc_stats(struct bnxt *bp)
if (bp->hw_rx_port_stats) if (bp->hw_rx_port_stats)
goto alloc_ext_stats; goto alloc_ext_stats;
bp->hw_port_stats_size = sizeof(struct rx_port_stats) + bp->hw_port_stats_size = BNXT_PORT_STATS_SIZE;
sizeof(struct tx_port_stats) + 1024;
bp->hw_rx_port_stats = bp->hw_rx_port_stats =
dma_alloc_coherent(&pdev->dev, bp->hw_port_stats_size, dma_alloc_coherent(&pdev->dev, bp->hw_port_stats_size,
...@@ -3798,9 +3797,10 @@ static int bnxt_alloc_stats(struct bnxt *bp) ...@@ -3798,9 +3797,10 @@ static int bnxt_alloc_stats(struct bnxt *bp)
if (!bp->hw_rx_port_stats) if (!bp->hw_rx_port_stats)
return -ENOMEM; return -ENOMEM;
bp->hw_tx_port_stats = (void *)(bp->hw_rx_port_stats + 1) + 512; bp->hw_tx_port_stats = (void *)bp->hw_rx_port_stats +
BNXT_TX_PORT_STATS_BYTE_OFFSET;
bp->hw_tx_port_stats_map = bp->hw_rx_port_stats_map + bp->hw_tx_port_stats_map = bp->hw_rx_port_stats_map +
sizeof(struct rx_port_stats) + 512; BNXT_TX_PORT_STATS_BYTE_OFFSET;
bp->flags |= BNXT_FLAG_PORT_STATS; bp->flags |= BNXT_FLAG_PORT_STATS;
alloc_ext_stats: alloc_ext_stats:
......
...@@ -1926,12 +1926,18 @@ struct bnxt { ...@@ -1926,12 +1926,18 @@ struct bnxt {
struct device *hwmon_dev; struct device *hwmon_dev;
}; };
#define BNXT_PORT_STATS_SIZE \
(sizeof(struct rx_port_stats) + sizeof(struct tx_port_stats) + 1024)
#define BNXT_TX_PORT_STATS_BYTE_OFFSET \
(sizeof(struct rx_port_stats) + 512)
#define BNXT_RX_STATS_OFFSET(counter) \ #define BNXT_RX_STATS_OFFSET(counter) \
(offsetof(struct rx_port_stats, counter) / 8) (offsetof(struct rx_port_stats, counter) / 8)
#define BNXT_TX_STATS_OFFSET(counter) \ #define BNXT_TX_STATS_OFFSET(counter) \
((offsetof(struct tx_port_stats, counter) + \ ((offsetof(struct tx_port_stats, counter) + \
sizeof(struct rx_port_stats) + 512) / 8) BNXT_TX_PORT_STATS_BYTE_OFFSET) / 8)
#define BNXT_RX_STATS_EXT_OFFSET(counter) \ #define BNXT_RX_STATS_EXT_OFFSET(counter) \
(offsetof(struct rx_port_stats_ext, counter) / 8) (offsetof(struct rx_port_stats_ext, counter) / 8)
......
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