Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8116f3cf4a2a5a4fa2335e6f32023ac50506698f
Commit:     8116f3cf4a2a5a4fa2335e6f32023ac50506698f
Parent:     9caab4587b8320c54fc666a6c820e966e6403aea
Author:     Sivakumar Subramani <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 17 13:05:35 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:51:09 2007 -0700

    [S2IO]: Handle and monitor all of the device errors and alarms
    
    - Added support to poll entire set of device errors and alarams.
    - A note on how device errors and alarms are handled:
    - The adapter will automatically recover from uncorrectable ECC errors.
      Packets containing corrupted data will be dropped (not transmitted) or 
tagged
      as invalid before being passed to the host.
    - The adapter cannot recover from any internal state machine errors. A state
      machine error requires a device reset.
    - Any internal error that could potentially result in .store trampling.
      (undesirable PCI behaviour)is tagged as a "serious error". In such cases
      the adapter will give up its ability to be a bus master. In this situation
      the host will still be able to read internal device registers in order to
      generate an error report. A device reset is necessary to return to normal
      operation.
    - In the event of a pcix data parity error, the adapter will automatically
      disable itself. Adapter_En will automatically transition from '1' to '0' 
and
      the adapter will enter its clean-up routine. Once the device has achieved
      quiescence, an adapter reset should be performed.
    - Replaced alarm_intr_handler() with s2io_handle_errors().
    - Added statistic counters to monitor the alarms.
    
    [ Fix warnings wrt. do_s2io_chk_alarm_bit(), Callers pass in an
      "unsigned long long *" but the function takes a "u64 *" which is
      different on many 64-bit platforms. -DaveM ]
    
    Signed-off-by: Sivakumar Subramani <[EMAIL PROTECTED]>
    Signed-off-by: Santosh Rastapur <[EMAIL PROTECTED]>
    Signed-off-by: Ramkrishna Vepa <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/s2io.c |  469 +++++++++++++++++++++++++++++++++++++---------------
 drivers/net/s2io.h |   24 +++-
 2 files changed, 357 insertions(+), 136 deletions(-)

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 6347302..182643f 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -263,7 +263,14 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = 
{
        {"serious_err_cnt"},
        {"soft_reset_cnt"},
        {"fifo_full_cnt"},
-       {"ring_full_cnt"},
+       {"ring_0_full_cnt"},
+       {"ring_1_full_cnt"},
+       {"ring_2_full_cnt"},
+       {"ring_3_full_cnt"},
+       {"ring_4_full_cnt"},
+       {"ring_5_full_cnt"},
+       {"ring_6_full_cnt"},
+       {"ring_7_full_cnt"},
        ("alarm_transceiver_temp_high"),
        ("alarm_transceiver_temp_low"),
        ("alarm_laser_bias_current_high"),
@@ -303,7 +310,24 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = 
{
        ("rx_tcode_fcs_err_cnt"),
        ("rx_tcode_buf_size_err_cnt"),
        ("rx_tcode_rxd_corrupt_cnt"),
-       ("rx_tcode_unkn_err_cnt")
+       ("rx_tcode_unkn_err_cnt"),
+       {"tda_err_cnt"},
+       {"pfc_err_cnt"},
+       {"pcc_err_cnt"},
+       {"tti_err_cnt"},
+       {"tpa_err_cnt"},
+       {"sm_err_cnt"},
+       {"lso_err_cnt"},
+       {"mac_tmac_err_cnt"},
+       {"mac_rmac_err_cnt"},
+       {"xgxs_txgxs_err_cnt"},
+       {"xgxs_rxgxs_err_cnt"},
+       {"rc_err_cnt"},
+       {"prc_pcix_err_cnt"},
+       {"rpa_err_cnt"},
+       {"rda_err_cnt"},
+       {"rti_err_cnt"},
+       {"mc_err_cnt"}
 };
 
 #define S2IO_XENA_STAT_LEN sizeof(ethtool_xena_stats_keys)/ ETH_GSTRING_LEN
@@ -1732,6 +1756,7 @@ static int s2io_link_fault_indication(struct s2io_nic 
*nic)
        else
                return MAC_RMAC_ERR_TIMER;
 }
+
 /**
  *  do_s2io_write_bits -  update alarm bits in alarm register
  *  @value: alarm bits
@@ -3252,135 +3277,6 @@ static void s2io_updt_xpak_counter(struct net_device 
*dev)
 }
 
 /**
- *  alarm_intr_handler - Alarm Interrrupt handler
- *  @nic: device private variable
- *  Description: If the interrupt was neither because of Rx packet or Tx
- *  complete, this function is called. If the interrupt was to indicate
- *  a loss of link, the OSM link status handler is invoked for any other
- *  alarm interrupt the block that raised the interrupt is displayed
- *  and a H/W reset is issued.
- *  Return Value:
- *  NONE
-*/
-
-static void alarm_intr_handler(struct s2io_nic *nic)
-{
-       struct net_device *dev = (struct net_device *) nic->dev;
-       struct XENA_dev_config __iomem *bar0 = nic->bar0;
-       register u64 val64 = 0, err_reg = 0;
-       u64 cnt;
-       int i;
-       if (atomic_read(&nic->card_state) == CARD_DOWN)
-               return;
-       if (pci_channel_offline(nic->pdev))
-               return;
-       nic->mac_control.stats_info->sw_stat.ring_full_cnt = 0;
-       /* Handling the XPAK counters update */
-       if(nic->mac_control.stats_info->xpak_stat.xpak_timer_count < 72000) {
-               /* waiting for an hour */
-               nic->mac_control.stats_info->xpak_stat.xpak_timer_count++;
-       } else {
-               s2io_updt_xpak_counter(dev);
-               /* reset the count to zero */
-               nic->mac_control.stats_info->xpak_stat.xpak_timer_count = 0;
-       }
-
-       /* Handling link status change error Intr */
-       if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER) {
-               err_reg = readq(&bar0->mac_rmac_err_reg);
-               writeq(err_reg, &bar0->mac_rmac_err_reg);
-               if (err_reg & RMAC_LINK_STATE_CHANGE_INT) {
-                       schedule_work(&nic->set_link_task);
-               }
-       }
-
-       /* Handling Ecc errors */
-       val64 = readq(&bar0->mc_err_reg);
-       writeq(val64, &bar0->mc_err_reg);
-       if (val64 & (MC_ERR_REG_ECC_ALL_SNG | MC_ERR_REG_ECC_ALL_DBL)) {
-               if (val64 & MC_ERR_REG_ECC_ALL_DBL) {
-                       nic->mac_control.stats_info->sw_stat.
-                               double_ecc_errs++;
-                       DBG_PRINT(INIT_DBG, "%s: Device indicates ",
-                                 dev->name);
-                       DBG_PRINT(INIT_DBG, "double ECC error!!\n");
-                       if (nic->device_type != XFRAME_II_DEVICE) {
-                               /* Reset XframeI only if critical error */
-                               if (val64 & (MC_ERR_REG_MIRI_ECC_DB_ERR_0 |
-                                            MC_ERR_REG_MIRI_ECC_DB_ERR_1)) {
-                                       netif_stop_queue(dev);
-                                       schedule_work(&nic->rst_timer_task);
-                                       nic->mac_control.stats_info->sw_stat.
-                                                       soft_reset_cnt++;
-                               }
-                       }
-               } else {
-                       nic->mac_control.stats_info->sw_stat.
-                               single_ecc_errs++;
-               }
-       }
-
-       /* In case of a serious error, the device will be Reset. */
-       val64 = readq(&bar0->serr_source);
-       if (val64 & SERR_SOURCE_ANY) {
-               nic->mac_control.stats_info->sw_stat.serious_err_cnt++;
-               DBG_PRINT(ERR_DBG, "%s: Device indicates ", dev->name);
-               DBG_PRINT(ERR_DBG, "serious error %llx!!\n",
-                         (unsigned long long)val64);
-               netif_stop_queue(dev);
-               schedule_work(&nic->rst_timer_task);
-               nic->mac_control.stats_info->sw_stat.soft_reset_cnt++;
-       }
-
-       /*
-        * Also as mentioned in the latest Errata sheets if the PCC_FB_ECC
-        * Error occurs, the adapter will be recycled by disabling the
-        * adapter enable bit and enabling it again after the device
-        * becomes Quiescent.
-        */
-       val64 = readq(&bar0->pcc_err_reg);
-       writeq(val64, &bar0->pcc_err_reg);
-       if (val64 & PCC_FB_ECC_DB_ERR) {
-               u64 ac = readq(&bar0->adapter_control);
-               ac &= ~(ADAPTER_CNTL_EN);
-               writeq(ac, &bar0->adapter_control);
-               ac = readq(&bar0->adapter_control);
-               schedule_work(&nic->set_link_task);
-       }
-       /* Check for data parity error */
-       val64 = readq(&bar0->pic_int_status);
-       if (val64 & PIC_INT_GPIO) {
-               val64 = readq(&bar0->gpio_int_reg);
-               if (val64 & GPIO_INT_REG_DP_ERR_INT) {
-                       nic->mac_control.stats_info->sw_stat.parity_err_cnt++;
-                       schedule_work(&nic->rst_timer_task);
-                       nic->mac_control.stats_info->sw_stat.soft_reset_cnt++;
-               }
-       }
-
-       /* Check for ring full counter */
-       if (nic->device_type & XFRAME_II_DEVICE) {
-               val64 = readq(&bar0->ring_bump_counter1);
-               for (i=0; i<4; i++) {
-                       cnt = ( val64 & vBIT(0xFFFF,(i*16),16));
-                       cnt >>= 64 - ((i+1)*16);
-                       nic->mac_control.stats_info->sw_stat.ring_full_cnt
-                               += cnt;
-               }
-
-               val64 = readq(&bar0->ring_bump_counter2);
-               for (i=0; i<4; i++) {
-                       cnt = ( val64 & vBIT(0xFFFF,(i*16),16));
-                       cnt >>= 64 - ((i+1)*16);
-                       nic->mac_control.stats_info->sw_stat.ring_full_cnt
-                               += cnt;
-               }
-       }
-
-       /* Other type of interrupts are not being handled now,  TODO */
-}
-
-/**
  *  wait_for_cmd_complete - waits for a command to complete.
  *  @sp : private member of the device structure, which is a pointer to the
  *  s2io_nic structure.
@@ -4246,8 +4142,9 @@ static void
 s2io_alarm_handle(unsigned long data)
 {
        struct s2io_nic *sp = (struct s2io_nic *)data;
+       struct net_device *dev = sp->dev;
 
-       alarm_intr_handler(sp);
+       s2io_handle_errors(dev);
        mod_timer(&sp->alarm_timer, jiffies + HZ / 2);
 }
 
@@ -4366,6 +4263,292 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp)
 }
 
 /**
+ *  do_s2io_chk_alarm_bit - Check for alarm and incrment the counter
+ *  @value: alarm bits
+ *  @addr: address value
+ *  @cnt: counter variable
+ *  Description: Check for alarm and increment the counter
+ *  Return Value:
+ *  1 - if alarm bit set
+ *  0 - if alarm bit is not set
+ */
+int do_s2io_chk_alarm_bit(u64 value, void __iomem * addr,
+                         unsigned long long *cnt)
+{
+       u64 val64;
+       val64 = readq(addr);
+       if ( val64 & value ) {
+               writeq(val64, addr);
+               (*cnt)++;
+               return 1;
+       }
+       return 0;
+
+}
+
+/**
+ *  s2io_handle_errors - Xframe error indication handler
+ *  @nic: device private variable
+ *  Description: Handle alarms such as loss of link, single or
+ *  double ECC errors, critical and serious errors.
+ *  Return Value:
+ *  NONE
+ */
+static void s2io_handle_errors(void * dev_id)
+{
+       struct net_device *dev = (struct net_device *) dev_id;
+       struct s2io_nic *sp = dev->priv;
+       struct XENA_dev_config __iomem *bar0 = sp->bar0;
+       u64 temp64 = 0,val64=0;
+       int i = 0;
+
+       struct swStat *sw_stat = &sp->mac_control.stats_info->sw_stat;
+       struct xpakStat *stats = &sp->mac_control.stats_info->xpak_stat;
+
+       if (unlikely(atomic_read(&sp->card_state) == CARD_DOWN))
+               return;
+
+       if (pci_channel_offline(sp->pdev))
+               return;
+
+       memset(&sw_stat->ring_full_cnt, 0,
+               sizeof(sw_stat->ring_full_cnt));
+
+       /* Handling the XPAK counters update */
+       if(stats->xpak_timer_count < 72000) {
+               /* waiting for an hour */
+               stats->xpak_timer_count++;
+       } else {
+               s2io_updt_xpak_counter(dev);
+               /* reset the count to zero */
+               stats->xpak_timer_count = 0;
+       }
+
+       /* Handling link status change error Intr */
+       if (s2io_link_fault_indication(sp) == MAC_RMAC_ERR_TIMER) {
+               val64 = readq(&bar0->mac_rmac_err_reg);
+               writeq(val64, &bar0->mac_rmac_err_reg);
+               if (val64 & RMAC_LINK_STATE_CHANGE_INT)
+                       schedule_work(&sp->set_link_task);
+       }
+
+       /* In case of a serious error, the device will be Reset. */
+       if (do_s2io_chk_alarm_bit(SERR_SOURCE_ANY, &bar0->serr_source,
+                               &sw_stat->serious_err_cnt))
+               goto reset;
+
+       /* Check for data parity error */
+       if (do_s2io_chk_alarm_bit(GPIO_INT_REG_DP_ERR_INT, &bar0->gpio_int_reg,
+                               &sw_stat->parity_err_cnt))
+               goto reset;
+
+       /* Check for ring full counter */
+       if (sp->device_type == XFRAME_II_DEVICE) {
+               val64 = readq(&bar0->ring_bump_counter1);
+               for (i=0; i<4; i++) {
+                       temp64 = ( val64 & vBIT(0xFFFF,(i*16),16));
+                       temp64 >>= 64 - ((i+1)*16);
+                       sw_stat->ring_full_cnt[i] += temp64;
+               }
+
+               val64 = readq(&bar0->ring_bump_counter2);
+               for (i=0; i<4; i++) {
+                       temp64 = ( val64 & vBIT(0xFFFF,(i*16),16));
+                       temp64 >>= 64 - ((i+1)*16);
+                        sw_stat->ring_full_cnt[i+4] += temp64;
+               }
+       }
+
+       val64 = readq(&bar0->txdma_int_status);
+       /*check for pfc_err*/
+       if (val64 & TXDMA_PFC_INT) {
+               if (do_s2io_chk_alarm_bit(PFC_ECC_DB_ERR | PFC_SM_ERR_ALARM|
+                               PFC_MISC_0_ERR | PFC_MISC_1_ERR|
+                               PFC_PCIX_ERR, &bar0->pfc_err_reg,
+                               &sw_stat->pfc_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(PFC_ECC_SG_ERR, &bar0->pfc_err_reg,
+                               &sw_stat->pfc_err_cnt);
+       }
+
+       /*check for tda_err*/
+       if (val64 & TXDMA_TDA_INT) {
+               if(do_s2io_chk_alarm_bit(TDA_Fn_ECC_DB_ERR | TDA_SM0_ERR_ALARM |
+                               TDA_SM1_ERR_ALARM, &bar0->tda_err_reg,
+                               &sw_stat->tda_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(TDA_Fn_ECC_SG_ERR | TDA_PCIX_ERR,
+                               &bar0->tda_err_reg, &sw_stat->tda_err_cnt);
+       }
+       /*check for pcc_err*/
+       if (val64 & TXDMA_PCC_INT) {
+               if (do_s2io_chk_alarm_bit(PCC_SM_ERR_ALARM | PCC_WR_ERR_ALARM
+                               | PCC_N_SERR | PCC_6_COF_OV_ERR
+                               | PCC_7_COF_OV_ERR | PCC_6_LSO_OV_ERR
+                               | PCC_7_LSO_OV_ERR | PCC_FB_ECC_DB_ERR
+                               | PCC_TXB_ECC_DB_ERR, &bar0->pcc_err_reg,
+                               &sw_stat->pcc_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(PCC_FB_ECC_SG_ERR | PCC_TXB_ECC_SG_ERR,
+                               &bar0->pcc_err_reg, &sw_stat->pcc_err_cnt);
+       }
+
+       /*check for tti_err*/
+       if (val64 & TXDMA_TTI_INT) {
+               if (do_s2io_chk_alarm_bit(TTI_SM_ERR_ALARM, &bar0->tti_err_reg,
+                               &sw_stat->tti_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(TTI_ECC_SG_ERR | TTI_ECC_DB_ERR,
+                               &bar0->tti_err_reg, &sw_stat->tti_err_cnt);
+       }
+
+       /*check for lso_err*/
+       if (val64 & TXDMA_LSO_INT) {
+               if (do_s2io_chk_alarm_bit(LSO6_ABORT | LSO7_ABORT
+                               | LSO6_SM_ERR_ALARM | LSO7_SM_ERR_ALARM,
+                               &bar0->lso_err_reg, &sw_stat->lso_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(LSO6_SEND_OFLOW | LSO7_SEND_OFLOW,
+                               &bar0->lso_err_reg, &sw_stat->lso_err_cnt);
+       }
+
+       /*check for tpa_err*/
+       if (val64 & TXDMA_TPA_INT) {
+               if (do_s2io_chk_alarm_bit(TPA_SM_ERR_ALARM, &bar0->tpa_err_reg,
+                       &sw_stat->tpa_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(TPA_TX_FRM_DROP, &bar0->tpa_err_reg,
+                       &sw_stat->tpa_err_cnt);
+       }
+
+       /*check for sm_err*/
+       if (val64 & TXDMA_SM_INT) {
+               if (do_s2io_chk_alarm_bit(SM_SM_ERR_ALARM, &bar0->sm_err_reg,
+                       &sw_stat->sm_err_cnt))
+                       goto reset;
+       }
+
+       val64 = readq(&bar0->mac_int_status);
+       if (val64 & MAC_INT_STATUS_TMAC_INT) {
+               if (do_s2io_chk_alarm_bit(TMAC_TX_BUF_OVRN | TMAC_TX_SM_ERR,
+                               &bar0->mac_tmac_err_reg,
+                               &sw_stat->mac_tmac_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(TMAC_ECC_SG_ERR | TMAC_ECC_DB_ERR
+                               | TMAC_DESC_ECC_SG_ERR | TMAC_DESC_ECC_DB_ERR,
+                               &bar0->mac_tmac_err_reg,
+                               &sw_stat->mac_tmac_err_cnt);
+       }
+
+       val64 = readq(&bar0->xgxs_int_status);
+       if (val64 & XGXS_INT_STATUS_TXGXS) {
+               if (do_s2io_chk_alarm_bit(TXGXS_ESTORE_UFLOW | TXGXS_TX_SM_ERR,
+                               &bar0->xgxs_txgxs_err_reg,
+                               &sw_stat->xgxs_txgxs_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(TXGXS_ECC_SG_ERR | TXGXS_ECC_DB_ERR,
+                               &bar0->xgxs_txgxs_err_reg,
+                               &sw_stat->xgxs_txgxs_err_cnt);
+       }
+
+       val64 = readq(&bar0->rxdma_int_status);
+       if (val64 & RXDMA_INT_RC_INT_M) {
+               if (do_s2io_chk_alarm_bit(RC_PRCn_ECC_DB_ERR | RC_FTC_ECC_DB_ERR
+                               | RC_PRCn_SM_ERR_ALARM |RC_FTC_SM_ERR_ALARM,
+                               &bar0->rc_err_reg, &sw_stat->rc_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(RC_PRCn_ECC_SG_ERR | RC_FTC_ECC_SG_ERR
+                               | RC_RDA_FAIL_WR_Rn, &bar0->rc_err_reg,
+                               &sw_stat->rc_err_cnt);
+               if (do_s2io_chk_alarm_bit(PRC_PCI_AB_RD_Rn | PRC_PCI_AB_WR_Rn
+                               | PRC_PCI_AB_F_WR_Rn, &bar0->prc_pcix_err_reg,
+                               &sw_stat->prc_pcix_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(PRC_PCI_DP_RD_Rn | PRC_PCI_DP_WR_Rn
+                               | PRC_PCI_DP_F_WR_Rn, &bar0->prc_pcix_err_reg,
+                               &sw_stat->prc_pcix_err_cnt);
+       }
+
+       if (val64 & RXDMA_INT_RPA_INT_M) {
+               if (do_s2io_chk_alarm_bit(RPA_SM_ERR_ALARM | RPA_CREDIT_ERR,
+                               &bar0->rpa_err_reg, &sw_stat->rpa_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(RPA_ECC_SG_ERR | RPA_ECC_DB_ERR,
+                               &bar0->rpa_err_reg, &sw_stat->rpa_err_cnt);
+       }
+
+       if (val64 & RXDMA_INT_RDA_INT_M) {
+               if (do_s2io_chk_alarm_bit(RDA_RXDn_ECC_DB_ERR
+                               | RDA_FRM_ECC_DB_N_AERR | RDA_SM1_ERR_ALARM
+                               | RDA_SM0_ERR_ALARM | RDA_RXD_ECC_DB_SERR,
+                               &bar0->rda_err_reg, &sw_stat->rda_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(RDA_RXDn_ECC_SG_ERR | RDA_FRM_ECC_SG_ERR
+                               | RDA_MISC_ERR | RDA_PCIX_ERR,
+                               &bar0->rda_err_reg, &sw_stat->rda_err_cnt);
+       }
+
+       if (val64 & RXDMA_INT_RTI_INT_M) {
+               if (do_s2io_chk_alarm_bit(RTI_SM_ERR_ALARM, &bar0->rti_err_reg,
+                               &sw_stat->rti_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(RTI_ECC_SG_ERR | RTI_ECC_DB_ERR,
+                               &bar0->rti_err_reg, &sw_stat->rti_err_cnt);
+       }
+
+       val64 = readq(&bar0->mac_int_status);
+       if (val64 & MAC_INT_STATUS_RMAC_INT) {
+               if (do_s2io_chk_alarm_bit(RMAC_RX_BUFF_OVRN | RMAC_RX_SM_ERR,
+                               &bar0->mac_rmac_err_reg,
+                               &sw_stat->mac_rmac_err_cnt))
+                       goto reset;
+               do_s2io_chk_alarm_bit(RMAC_UNUSED_INT|RMAC_SINGLE_ECC_ERR|
+                               RMAC_DOUBLE_ECC_ERR, &bar0->mac_rmac_err_reg,
+                               &sw_stat->mac_rmac_err_cnt);
+       }
+
+       val64 = readq(&bar0->xgxs_int_status);
+       if (val64 & XGXS_INT_STATUS_RXGXS) {
+               if (do_s2io_chk_alarm_bit(RXGXS_ESTORE_OFLOW | RXGXS_RX_SM_ERR,
+                               &bar0->xgxs_rxgxs_err_reg,
+                               &sw_stat->xgxs_rxgxs_err_cnt))
+                       goto reset;
+       }
+
+       val64 = readq(&bar0->mc_int_status);
+       if(val64 & MC_INT_STATUS_MC_INT) {
+               if (do_s2io_chk_alarm_bit(MC_ERR_REG_SM_ERR, &bar0->mc_err_reg,
+                               &sw_stat->mc_err_cnt))
+                       goto reset;
+
+               /* Handling Ecc errors */
+               if (val64 & (MC_ERR_REG_ECC_ALL_SNG | MC_ERR_REG_ECC_ALL_DBL)) {
+                       writeq(val64, &bar0->mc_err_reg);
+                       if (val64 & MC_ERR_REG_ECC_ALL_DBL) {
+                               sw_stat->double_ecc_errs++;
+                               if (sp->device_type != XFRAME_II_DEVICE) {
+                                       /*
+                                        * Reset XframeI only if critical error
+                                        */
+                                       if (val64 &
+                                               (MC_ERR_REG_MIRI_ECC_DB_ERR_0 |
+                                               MC_ERR_REG_MIRI_ECC_DB_ERR_1))
+                                                               goto reset;
+                                       }
+                       } else
+                               sw_stat->single_ecc_errs++;
+               }
+       }
+       return;
+
+reset:
+       netif_stop_queue(dev);
+       schedule_work(&sp->rst_timer_task);
+       sw_stat->soft_reset_cnt++;
+       return;
+}
+
+/**
  *  s2io_isr - ISR handler of the device .
  *  @irq: the irq of the device.
  *  @dev_id: a void pointer to the dev structure of the NIC.
@@ -5754,7 +5937,7 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
                                   struct ethtool_stats *estats,
                                   u64 * tmp_stats)
 {
-       int i = 0;
+       int i = 0, k;
        struct s2io_nic *sp = dev->priv;
        struct stat_block *stat_info = sp->mac_control.stats_info;
 
@@ -5949,7 +6132,8 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
        tmp_stats[i++] = stat_info->sw_stat.serious_err_cnt;
        tmp_stats[i++] = stat_info->sw_stat.soft_reset_cnt;
        tmp_stats[i++] = stat_info->sw_stat.fifo_full_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.ring_full_cnt;
+       for (k = 0; k < MAX_RX_RINGS; k++)
+               tmp_stats[i++] = stat_info->sw_stat.ring_full_cnt[k];
        tmp_stats[i++] = stat_info->xpak_stat.alarm_transceiver_temp_high;
        tmp_stats[i++] = stat_info->xpak_stat.alarm_transceiver_temp_low;
        tmp_stats[i++] = stat_info->xpak_stat.alarm_laser_bias_current_high;
@@ -6006,6 +6190,23 @@ static void s2io_get_ethtool_stats(struct net_device 
*dev,
        tmp_stats[i++] = stat_info->sw_stat.rx_buf_size_err_cnt;
        tmp_stats[i++] = stat_info->sw_stat.rx_rxd_corrupt_cnt;
        tmp_stats[i++] = stat_info->sw_stat.rx_unkn_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.tda_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.pfc_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.pcc_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.tti_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.tpa_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.sm_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.lso_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.mac_tmac_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.mac_rmac_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.xgxs_txgxs_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.xgxs_rxgxs_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.rc_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.prc_pcix_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.rpa_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.rda_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.rti_err_cnt;
+       tmp_stats[i++] = stat_info->sw_stat.mc_err_cnt;
 }
 
 static int s2io_ethtool_get_regs_len(struct net_device *dev)
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index b9654df..1e2e72d 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -91,7 +91,7 @@ struct swStat {
        unsigned long long serious_err_cnt;
        unsigned long long soft_reset_cnt;
        unsigned long long fifo_full_cnt;
-       unsigned long long ring_full_cnt;
+       unsigned long long ring_full_cnt[8];
        /* LRO statistics */
        unsigned long long clubbed_frms_cnt;
        unsigned long long sending_both;
@@ -126,6 +126,26 @@ struct swStat {
        unsigned long long rx_buf_size_err_cnt;
        unsigned long long rx_rxd_corrupt_cnt;
        unsigned long long rx_unkn_err_cnt;
+
+       /* Error/alarm statistics*/
+       unsigned long long tda_err_cnt;
+       unsigned long long pfc_err_cnt;
+       unsigned long long pcc_err_cnt;
+       unsigned long long tti_err_cnt;
+       unsigned long long lso_err_cnt;
+       unsigned long long tpa_err_cnt;
+       unsigned long long sm_err_cnt;
+       unsigned long long mac_tmac_err_cnt;
+       unsigned long long mac_rmac_err_cnt;
+       unsigned long long xgxs_txgxs_err_cnt;
+       unsigned long long xgxs_rxgxs_err_cnt;
+       unsigned long long rc_err_cnt;
+       unsigned long long prc_pcix_err_cnt;
+       unsigned long long rpa_err_cnt;
+       unsigned long long rda_err_cnt;
+       unsigned long long rti_err_cnt;
+       unsigned long long mc_err_cnt;
+
 };
 
 /* Xpak releated alarm and warnings */
@@ -1018,7 +1038,7 @@ static void free_shared_mem(struct s2io_nic *sp);
 static int init_nic(struct s2io_nic *nic);
 static void rx_intr_handler(struct ring_info *ring_data);
 static void tx_intr_handler(struct fifo_info *fifo_data);
-static void alarm_intr_handler(struct s2io_nic *sp);
+static void s2io_handle_errors(void * dev_id);
 
 static int s2io_starter(void);
 static void s2io_closer(void);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to