redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

skge: internal stats

Browse source 
Use internal stats structure

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger 2007-10-16 12:15:52 -07:00 committed by Jeff Garzik
parent 501fb72d05
commit da00772fb5
2 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
drivers/net/skge.c
View file

@ -445,15 +445,15 @@ static struct net_device_stats *skge_get_stats(struct net_device *dev)
else else
yukon_get_stats(skge, data); yukon_get_stats(skge, data);
skge->net_stats.tx_bytes = data[0]; dev->stats.tx_bytes = data[0];
skge->net_stats.rx_bytes = data[1]; dev->stats.rx_bytes = data[1];
skge->net_stats.tx_packets = data[2] + data[4] + data[6]; dev->stats.tx_packets = data[2] + data[4] + data[6];
skge->net_stats.rx_packets = data[3] + data[5] + data[7]; dev->stats.rx_packets = data[3] + data[5] + data[7];
skge->net_stats.multicast = data[3] + data[5]; dev->stats.multicast = data[3] + data[5];
skge->net_stats.collisions = data[10]; dev->stats.collisions = data[10];
skge->net_stats.tx_aborted_errors = data[12]; dev->stats.tx_aborted_errors = data[12];
return &skge->net_stats; return &dev->stats;
} }
static void skge_get_strings(struct net_device *dev, u32 stringset, u8 *data) static void skge_get_strings(struct net_device *dev, u32 stringset, u8 *data)
@ -1684,12 +1684,13 @@ static void genesis_get_stats(struct skge_port *skge, u64 *data)
static void genesis_mac_intr(struct skge_hw *hw, int port) static void genesis_mac_intr(struct skge_hw *hw, int port)
{ {
struct skge_port *skge = netdev_priv(hw->dev[port]); struct net_device *dev = hw->dev[port];
struct skge_port *skge = netdev_priv(dev);
u16 status = xm_read16(hw, port, XM_ISRC); u16 status = xm_read16(hw, port, XM_ISRC);
if (netif_msg_intr(skge)) if (netif_msg_intr(skge))
printk(KERN_DEBUG PFX "%s: mac interrupt status 0x%x\n", printk(KERN_DEBUG PFX "%s: mac interrupt status 0x%x\n",
skge->netdev->name, status); dev->name, status);
if (hw->phy_type == SK_PHY_XMAC && (status & XM_IS_INP_ASS)) { if (hw->phy_type == SK_PHY_XMAC && (status & XM_IS_INP_ASS)) {
xm_link_down(hw, port); xm_link_down(hw, port);
@ -1698,12 +1699,12 @@ static void genesis_mac_intr(struct skge_hw *hw, int port)
if (status & XM_IS_TXF_UR) { if (status & XM_IS_TXF_UR) {
xm_write32(hw, port, XM_MODE, XM_MD_FTF); xm_write32(hw, port, XM_MODE, XM_MD_FTF);
++skge->net_stats.tx_fifo_errors; ++dev->stats.tx_fifo_errors;
} }
if (status & XM_IS_RXF_OV) { if (status & XM_IS_RXF_OV) {
xm_write32(hw, port, XM_MODE, XM_MD_FRF); xm_write32(hw, port, XM_MODE, XM_MD_FRF);
++skge->net_stats.rx_fifo_errors; ++dev->stats.rx_fifo_errors;
} }
} }
@ -2200,12 +2201,12 @@ static void yukon_mac_intr(struct skge_hw *hw, int port)
dev->name, status); dev->name, status);
if (status & GM_IS_RX_FF_OR) { if (status & GM_IS_RX_FF_OR) {
++skge->net_stats.rx_fifo_errors; ++dev->stats.rx_fifo_errors;
skge_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_CLI_RX_FO); skge_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_CLI_RX_FO);
} }
if (status & GM_IS_TX_FF_UR) { if (status & GM_IS_TX_FF_UR) {
++skge->net_stats.tx_fifo_errors; ++dev->stats.tx_fifo_errors;
skge_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_CLI_TX_FU); skge_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_CLI_TX_FU);
} }
@ -3039,18 +3040,18 @@ error:
if (skge->hw->chip_id == CHIP_ID_GENESIS) { if (skge->hw->chip_id == CHIP_ID_GENESIS) {
if (status & (XMR_FS_RUNT|XMR_FS_LNG_ERR)) if (status & (XMR_FS_RUNT|XMR_FS_LNG_ERR))
skge->net_stats.rx_length_errors++; dev->stats.rx_length_errors++;
if (status & XMR_FS_FRA_ERR) if (status & XMR_FS_FRA_ERR)
skge->net_stats.rx_frame_errors++; dev->stats.rx_frame_errors++;
if (status & XMR_FS_FCS_ERR) if (status & XMR_FS_FCS_ERR)
skge->net_stats.rx_crc_errors++; dev->stats.rx_crc_errors++;
} else { } else {
if (status & (GMR_FS_LONG_ERR|GMR_FS_UN_SIZE)) if (status & (GMR_FS_LONG_ERR|GMR_FS_UN_SIZE))
skge->net_stats.rx_length_errors++; dev->stats.rx_length_errors++;
if (status & GMR_FS_FRAGMENT) if (status & GMR_FS_FRAGMENT)
skge->net_stats.rx_frame_errors++; dev->stats.rx_frame_errors++;
if (status & GMR_FS_CRC_ERR) if (status & GMR_FS_CRC_ERR)
skge->net_stats.rx_crc_errors++; dev->stats.rx_crc_errors++;
} }
resubmit: resubmit:
@ -3148,10 +3149,7 @@ static void skge_mac_parity(struct skge_hw *hw, int port)
{ {
struct net_device *dev = hw->dev[port]; struct net_device *dev = hw->dev[port];
if (dev) { ++dev->stats.tx_heartbeat_errors;
struct skge_port *skge = netdev_priv(dev);
++skge->net_stats.tx_heartbeat_errors;
}
if (hw->chip_id == CHIP_ID_GENESIS) if (hw->chip_id == CHIP_ID_GENESIS)
skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), skge_write16(hw, SK_REG(port, TX_MFF_CTRL1),
@ -3304,9 +3302,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id)
skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX1); skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX1);
if (status & IS_PA_TO_RX1) { if (status & IS_PA_TO_RX1) {
struct skge_port *skge = netdev_priv(hw->dev[0]); ++hw->dev[0]->stats.rx_over_errors;
++skge->net_stats.rx_over_errors;
skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX1); skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX1);
} }
@ -3323,7 +3319,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id)
} }
if (status & IS_PA_TO_RX2) { if (status & IS_PA_TO_RX2) {
++skge->net_stats.rx_over_errors; ++hw->dev[1]->stats.rx_over_errors;
skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX2); skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX2);
} }

2
drivers/net/skge.h
View file

@ -2467,8 +2467,6 @@ struct skge_port {
void *mem; /* PCI memory for rings */ void *mem; /* PCI memory for rings */
dma_addr_t dma; dma_addr_t dma;
unsigned long mem_size; unsigned long mem_size;
struct net_device_stats net_stats;
}; };