S2io: cosmetic changes
Subsystems (2)
PATCH 1/12 S2io: cosmetic changes
Hi All,
This is the first patch in the 12 part series. As requested earlier, I am resending the first 8 patches which were reviewed earlier. The patches 9 to 12 incorporate comments received on the first 8 patches.
This first patch contains mostly cosmetic changes and few other changes. Following is the complete list of changes.
1. Indentation, change in comment styles, variable name changes etc.
2. Changed the value written to dtx_control register to force XGXS reset.
3. weight parameter(NAPI) changed to 90 for better performance.
Signed-off-by Raghavendra Koushik <[email protected]>
---
drivers/net/s2io.c +1000 -943
@@ -69,7 +69,7 @@/* S2io Driver name & version. */ static char s2io_driver_name[] ="s2io" ; -static char s2io_driver_version[] ="Version 1.0" ; +static char s2io_driver_version[] ="Version 1.7.5.1" ;#define LINK_IS_UP (val64) (!(val64 & (ADAPTER_STATUS_RMAC_REMOTE_FAULT | \ ADAPTER_STATUS_RMAC_LOCAL_FAULT)))
@@ -99,45 +99,45 @@ };static char ethtool_stats_keys[][ETH_GSTRING_LEN ] = { -"tmac_frms" , -"tmac_data_octets" , -"tmac_drop_frms" , -"tmac_mcst_frms" , -"tmac_bcst_frms" , -"tmac_pause_ctrl_frms" , -"tmac_any_err_frms" , -"tmac_vld_ip_octets" , -"tmac_vld_ip" , -"tmac_drop_ip" , -"tmac_icmp" , -"tmac_rst_tcp" , -"tmac_tcp" , -"tmac_udp" , -"rmac_vld_frms" , -"rmac_data_octets" , -"rmac_fcs_err_frms" , -"rmac_drop_frms" , -"rmac_vld_mcst_frms" , -"rmac_vld_bcst_frms" , -"rmac_in_rng_len_err_frms" , -"rmac_long_frms" , -"rmac_pause_ctrl_frms" , -"rmac_discarded_frms" , -"rmac_usized_frms" , -"rmac_osized_frms" , -"rmac_frag_frms" , -"rmac_jabber_frms" , -"rmac_ip" , -"rmac_ip_octets" , -"rmac_hdr_err_ip" , -"rmac_drop_ip" , -"rmac_icmp" , -"rmac_tcp" , -"rmac_udp" , -"rmac_err_drp_udp" , -"rmac_pause_cnt" , -"rmac_accepted_ip" , -"rmac_err_tcp" , + {"tmac_frms" }, + {"tmac_data_octets" }, + {"tmac_drop_frms" }, + {"tmac_mcst_frms" }, + {"tmac_bcst_frms" }, + {"tmac_pause_ctrl_frms" }, + {"tmac_any_err_frms" }, + {"tmac_vld_ip_octets" }, + {"tmac_vld_ip" }, + {"tmac_drop_ip" }, + {"tmac_icmp" }, + {"tmac_rst_tcp" }, + {"tmac_tcp" }, + {"tmac_udp" }, + {"rmac_vld_frms" }, + {"rmac_data_octets" }, + {"rmac_fcs_err_frms" }, + {"rmac_drop_frms" }, + {"rmac_vld_mcst_frms" }, + {"rmac_vld_bcst_frms" }, + {"rmac_in_rng_len_err_frms" }, + {"rmac_long_frms" }, + {"rmac_pause_ctrl_frms" }, + {"rmac_discarded_frms" }, + {"rmac_usized_frms" }, + {"rmac_osized_frms" }, + {"rmac_frag_frms" }, + {"rmac_jabber_frms" }, + {"rmac_ip" }, + {"rmac_ip_octets" }, + {"rmac_hdr_err_ip" }, + {"rmac_drop_ip" }, + {"rmac_icmp" }, + {"rmac_tcp" }, + {"rmac_udp" }, + {"rmac_err_drp_udp" }, + {"rmac_pause_cnt" }, + {"rmac_accepted_ip" }, + {"rmac_err_tcp" }, };#define S2IO_STAT_LEN sizeof(ethtool_stats_keys)/ ETH_GSTRING_LEN
@@ -147,7 +147,8 @@#define S2IO_STRINGS_LEN S2IO_TEST_LEN * ETH_GSTRING_LEN -/* Constants to be programmed into the Xena's registers to configure +/* +* Constants to be programmed into the Xena's registers, to configure * the XAUI. */
@@ -188,7 +189,9 @@END_SIGN }; -/* Constants for Fixing the MacAddress problem seen mostly on + +/* +* Constants for Fixing the MacAddress problem seen mostly on * Alpha machines. */ static u64 fix_mac[] = {
@@ -209,7 +212,6 @@ END_SIGN }; -/* Module Loadable parameters. */ static u32 ring_num;static u32 frame_len[MAX_RX_RINGS ];
@@ -218,7 +220,7 @@static u32 fifo_len[MAX_TX_FIFOS ];static u32 rx_prio;static u32 tx_prio; -static u8 latency_timer =0 ; +static u8 latency_timer;/* * S2IO device table.
@@ -241,17 +243,15 @@ remove:__devexit_p(s2io_rem_nic), }; -/* -* Input Arguments: -* Device private variable. -* Return Value: -* SUCCESS on success and an appropriate -ve value on failure. -* Description: -* The function allocates the all memory areas shared -* between the NIC and the driver. This includes Tx descriptors, -* Rx descriptors and the statistics block. +/** +* init_shared_mem - Allocation and Initialization of Memory +* @nic: Device private variable. +* Description: The function allocates all the memory areas shared +* between the NIC and the driver. This includes Tx descriptors, +* Rx descriptors and the statistics block. */ -static int initSharedMem (struct s2io_nic *nic) + +static int init_shared_mem (struct s2io_nic *nic) {u32 size;void *tmp_v_addr, *tmp_v_addr_next;
@@ -269,8 +269,8 @@/* Allocation and initialization of TXDLs in FIOFs */ size =0 ; -for (i =0 ; i < config->TxFIFONum; i++) { - size += config->TxCfg[i].FifoLen; +for (i =0 ; i < config->tx_fifo_num; i++) { + size += config->tx_cfg[i].fifo_len; }if (size >MAX_AVAILABLE_TXDS ) { DBG_PRINT(ERR_DBG, "%s: Total number of Tx FIFOs ",
@@ -279,7 +279,7 @@DBG_PRINT (ERR_DBG ,"that can be used\n" );return FAILURE ; } - size *= (sizeof (TxD_t) * config->MaxTxDs); + size *= (sizeof (TxD_t) * config->max_txds); mac_control->txd_list_mem =pci_alloc_consistent (nic->pdev, size, &mac_control->txd_list_mem_phy);
@@ -295,61 +295,60 @@DBG_PRINT (INIT_DBG ,"%s:List Mem PHY: 0x%llx\n" , dev->name, (unsigned long long ) tmp_p_addr); -for (i =0 ; i < config->TxFIFONum; i++) { +for (i =0 ; i < config->tx_fifo_num; i++) { mac_control->txdl_start_phy[i] = tmp_p_addr; mac_control->txdl_start[i] = (TxD_t *) tmp_v_addr; mac_control->tx_curr_put_info[i].offset =0 ; mac_control->tx_curr_put_info[i].fifo_len = - config->TxCfg[i].FifoLen -1 ; + config->tx_cfg[i].fifo_len -1 ; mac_control->tx_curr_get_info[i].offset =0 ; mac_control->tx_curr_get_info[i].fifo_len = - config->TxCfg[i].FifoLen -1 ; + config->tx_cfg[i].fifo_len -1 ; tmp_p_addr += - (config->TxCfg[i].FifoLen * (sizeof (TxD_t)) * - config->MaxTxDs); + (config->tx_cfg[i].fifo_len * (sizeof (TxD_t)) * + config->max_txds); tmp_v_addr += - (config->TxCfg[i].FifoLen * (sizeof (TxD_t)) * - config->MaxTxDs); + (config->tx_cfg[i].fifo_len * (sizeof (TxD_t)) * + config->max_txds); }/* Allocation and initialization of RXDs in Rings */ size =0 ; -for (i =0 ; i < config->RxRingNum; i++) { -if (config->RxCfg[i].NumRxd % (MAX_RXDS_PER_BLOCK +1 )) { +for (i =0 ; i < config->rx_ring_num; i++) { +if (config->rx_cfg[i].num_rxd % (MAX_RXDS_PER_BLOCK +1 )) {DBG_PRINT (ERR_DBG ,"%s: RxD count of " , dev->name);DBG_PRINT (ERR_DBG ,"Ring%d is not a multiple of " , i);DBG_PRINT (ERR_DBG ,"RxDs per Block" );return FAILURE ; } - size += config->RxCfg[i].NumRxd; + size += config->rx_cfg[i].num_rxd; nic->block_count[i] = - config->RxCfg[i].NumRxd / (MAX_RXDS_PER_BLOCK +1 ); + config->rx_cfg[i].num_rxd / (MAX_RXDS_PER_BLOCK +1 ); nic->pkt_cnt[i] = - config->RxCfg[i].NumRxd - nic->block_count[i]; + config->rx_cfg[i].num_rxd - nic->block_count[i]; } - size = (size * (sizeof (RxD_t))); - mac_control->rxd_ring_mem_sz = size; -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) { mac_control->rx_curr_get_info[i].block_index =0 ; mac_control->rx_curr_get_info[i].offset =0 ; mac_control->rx_curr_get_info[i].ring_len = - config->RxCfg[i].NumRxd -1 ; + config->rx_cfg[i].num_rxd -1 ; mac_control->rx_curr_put_info[i].block_index =0 ; mac_control->rx_curr_put_info[i].offset =0 ; mac_control->rx_curr_put_info[i].ring_len = - config->RxCfg[i].NumRxd -1 ; + config->rx_cfg[i].num_rxd -1 ; blk_cnt = - config->RxCfg[i].NumRxd / (MAX_RXDS_PER_BLOCK +1 ); + config->rx_cfg[i].num_rxd / (MAX_RXDS_PER_BLOCK +1 );/* Allocating all the Rx blocks */ for (j =0 ; j < blk_cnt; j++) { size = (MAX_RXDS_PER_BLOCK +1 ) * (sizeof (RxD_t)); tmp_v_addr =pci_alloc_consistent (nic->pdev, size, &tmp_p_addr);if (tmp_v_addr ==NULL ) { -/* In case of failure, freeSharedMem() +/* +* In case of failure, free_shared_mem() * is called, which should free any * memory that was alloced till the * failure happened.
@@ -390,7 +389,8 @@ (nic->pdev, size, &mac_control->stats_mem_phy);if (!mac_control->stats_mem) { -/* In case of failure, freeSharedMem() is called, which +/* +* In case of failure, free_shared_mem() is called, which * should free any memory that was alloced till the * failure happened. */
@@ -399,7 +399,7 @@ mac_control->stats_mem_sz = size; tmp_v_addr = mac_control->stats_mem; - mac_control->StatsInfo = (StatInfo_t *) tmp_v_addr; + mac_control->stats_info = (StatInfo_t *) tmp_v_addr;memset (tmp_v_addr,0 , size); DBG_PRINT(INIT_DBG, "%s:Ring Mem PHY: 0x%llx\n", dev->name,
@@ -408,16 +408,14 @@return SUCCESS ; } -/* -* Input Arguments: -* Device peivate variable. -* Return Value: -* NONE -* Description: -* This function is to free all memory locations allocated by -* the initSharedMem() function and return it to the kernel. +/** +* free_shared_mem - Free the allocated Memory +* @nic: Device private variable. +* Description: This function is to free all memory locations allocated by +* the init_shared_mem() function and return it to the kernel. */ -static void freeSharedMem (struct s2io_nic *nic) + +static void free_shared_mem (struct s2io_nic *nic) {int i, j, blk_cnt, size;void *tmp_v_addr;
@@ -440,7 +438,7 @@ } size = (MAX_RXDS_PER_BLOCK +1 ) * (sizeof (RxD_t)); -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) { blk_cnt = nic->block_count[i];for (j =0 ; j < blk_cnt; j++) { tmp_v_addr = nic->rx_blocks[i][j].block_virt_addr;
@@ -452,6 +450,7 @@ } } +if (mac_control->stats_mem) { pci_free_consistent(nic->pdev, mac_control->stats_mem_sz,
@@ -460,16 +459,16 @@ } } -/* -* Input Arguments: -* device peivate variable -* Return Value: -* SUCCESS on success and '-1' on failure (endian settings incorrect). -* Description: -* The function sequentially configures every block +/** +* init_nic - Initialization of hardware +* @nic: device peivate variable +* Description: The function sequentially configures every block * of the H/W from their reset values. +* Return Value: SUCCESS on success and +* '-1' on failure (endian settings incorrect). */ -static int initNic (struct s2io_nic *nic) + +static int init_nic (struct s2io_nic *nic) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;struct net_device *dev = nic->dev;
@@ -485,11 +484,13 @@ mac_control = &nic->mac_control; config = &nic->config; -/* Set proper endian settings and verify the same by -* reading the PIF Feed-back register. +/* +* Set proper endian settings and verify the same by +* reading the PIF Feed-back register. */ #ifdef __BIG_ENDIAN -/* The device by default set to a big endian format, so +/* +* The device by default set to a big endian format, so * a big endian driver need not set anything. */ writeq (0xffffffffffffffffULL , &bar0->swapper_ctrl);
@@ -510,7 +511,8 @@ SWAPPER_CTRL_STATS_FE | SWAPPER_CTRL_STATS_SE);writeq (val64, &bar0->swapper_ctrl);#else -/* Initially we enable all bits to make it accessible by +/* +* Initially we enable all bits to make it accessible by * the driver, then we selectively enable only those bits * that we want to set. */
@@ -537,8 +539,9 @@writeq (val64, &bar0->swapper_ctrl);#endif -/* Verifying if endian settings are accurate by reading -* a feedback register. +/* +* Verifying if endian settings are accurate by +* reading a feedback register. */ val64 =readq (&bar0->pif_rd_swapper_fb);if (val64 !=0x0123456789ABCDEFULL ) {
@@ -573,8 +576,9 @@ val64 = dev->mtu;writeq (vBIT (val64,2 ,14 ), &bar0->rmac_max_pyld_len); -/* Configuring the XAUI Interface of Xena. -***************************************** +/* +* Configuring the XAUI Interface of Xena. +* *************************************** * To Configure the Xena's XAUI, one has to write a series * of 64 bit values into two registers in a particular * sequence. Hence a macro 'SWITCH_SIGN' has been defined
@@ -625,13 +629,13 @@writeq (val64, &bar0->tx_fifo_partition_3); -for (i =0 , j =0 ; i < config->TxFIFONum; i++) { +for (i =0 , j =0 ; i < config->tx_fifo_num; i++) { val64 |= -vBIT (config->TxCfg[i].FifoLen -1 , ((i *32 ) +19 ), -13 ) |vBIT (config->TxCfg[i].FifoPriority, +vBIT (config->tx_cfg[i].fifo_len -1 , ((i *32 ) +19 ), +13 ) |vBIT (config->tx_cfg[i].fifo_priority, ((i *32 ) +5 ),3 ); -if (i == (config->TxFIFONum -1 )) { +if (i == (config->tx_fifo_num -1 )) {if (i %2 ==0 ) i++; }
@@ -675,56 +679,59 @@/* Rx DMA intialization. */ val64 =0 ; -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) { val64 |= -vBIT (config->RxCfg[i].RingPriority, (5 + (i *8 )),3 ); +vBIT (config->rx_cfg[i].ring_priority, (5 + (i *8 )), +3 ); }writeq (val64, &bar0->rx_queue_priority); -/* Allocating equal share of memory to all the configured -* Rings. +/* +* Allocating equal share of memory to all the +* configured Rings. */ val64 =0 ; -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) {switch (i) {case 0 : - mem_share = (64 / config->RxRingNum + -64 % config->RxRingNum); + mem_share = (64 / config->rx_ring_num + +64 % config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q0_SZ (mem_share);continue ;case 1 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q1_SZ (mem_share);continue ;case 2 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q2_SZ (mem_share);continue ;case 3 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q3_SZ (mem_share);continue ;case 4 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q4_SZ (mem_share);continue ;case 5 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q5_SZ (mem_share);continue ;case 6 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q6_SZ (mem_share);continue ;case 7 : - mem_share = (64 / config->RxRingNum); + mem_share = (64 / config->rx_ring_num); val64 |=RX_QUEUE_CFG_Q7_SZ (mem_share);continue ; } }writeq (val64, &bar0->rx_queue_cfg); -/* Initializing the Tx round robin registers to 0. +/* +* Initializing the Tx round robin registers to 0. * Filling Tx and Rx round robin registers as per the * number of FIFOs and Rings is still TODO. */
@@ -734,13 +741,15 @@writeq (0 , &bar0->tx_w_round_robin_3);writeq (0 , &bar0->tx_w_round_robin_4); -/* Disable Rx steering. Hard coding all packets be steered to +/* +* TODO +* Disable Rx steering. Hard coding all packets be steered to * Queue 0 for now. -* TODO*/ +*/ if (rx_prio) {u64 def =0x8000000000000000ULL , tmp;for (i =0 ; i <MAX_RX_RINGS ; i++) { - tmp = (u64) (def >> (i % config->RxRingNum)); + tmp = (u64) (def >> (i % config->rx_ring_num)); val64 |= (u64) (tmp >> (i *8 )); }writeq (val64, &bar0->rts_qos_steering);
@@ -763,14 +772,16 @@ val64 =SET_UPDT_PERIOD (8 ) |STAT_CFG_STAT_RO |STAT_CFG_STAT_EN ;writeq (val64, &bar0->stat_cfg); -/* Initializing the sampling rate for the device to calculate the +/* +* Initializing the sampling rate for the device to calculate the * bandwidth utilization. */ val64 =MAC_TX_LINK_UTIL_VAL (0x5 ) |MAC_RX_LINK_UTIL_VAL (0x5 );writeq (val64, &bar0->mac_link_util); -/* Initializing the Transmit and Receive Traffic Interrupt +/* +* Initializing the Transmit and Receive Traffic Interrupt * Scheme. */ /* TTI Initialization */
@@ -787,7 +798,8 @@ val64 =TTI_CMD_MEM_WE |TTI_CMD_MEM_STROBE_NEW_CMD ;writeq (val64, &bar0->tti_command_mem); -/* Once the operation completes, the Strobe bit of the command +/* +* Once the operation completes, the Strobe bit of the command * register will be reset. We poll for this particular condition * We wait for a maximum of 500ms for the operation to complete, * if it's not complete by then we return error.
@@ -821,7 +833,8 @@ val64 =RTI_CMD_MEM_WE |RTI_CMD_MEM_STROBE_NEW_CMD ;writeq (val64, &bar0->rti_command_mem); -/* Once the operation completes, the Strobe bit of the command +/* +* Once the operation completes, the Strobe bit of the command * register will be reset. We poll for this particular condition * We wait for a maximum of 500ms for the operation to complete, * if it's not complete by then we return error.
@@ -842,7 +855,8 @@schedule_timeout (HZ /20 ); } -/* Initializing proper values as Pause threshold into all +/* +* Initializing proper values as Pause threshold into all * the 8 Queues on Rx side. */ writeq (0xffbbffbbffbbffbbULL , &bar0->mc_pause_thresh_q0q3);
@@ -861,19 +875,18 @@return SUCCESS ; } -/* -* Input Arguments: -* device private variable, -* A mask indicating which Intr block must be modified and, -* A flag indicating whether to enable or disable the Intrs. -* Return Value: -* NONE. -* Description: -* This function will either disable or enable the interrupts +/** +* en_dis_able_nic_intrs - Enable or Disable the interrupts +* @nic: device private variable, +* @mask: A mask indicating which Intr block must be modified and, +* @flag: A flag indicating whether to enable or disable the Intrs. +* Description: This function will either disable or enable the interrupts * depending on the flag argument. The mask argument can be used to * enable/disable any Intr block. +* Return Value: NONE. */ -static void en_dis_able_NicIntrs (struct s2io_nic *nic,u16 mask,int flag) + +static void en_dis_able_nic_intrs (struct s2io_nic *nic,u16 mask,int flag) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; registeru64 val64 =0 , temp64 =0 ;
@@ -887,15 +900,20 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* Disabled all PCIX, Flash, MDIO, IIC and GPIO -* interrupts for now. -* TODO */ +/* +* Disabled all PCIX, Flash, MDIO, IIC and GPIO +* interrupts for now. +* TODO +*/ writeq (DISABLE_ALL_INTRS , &bar0->pic_int_mask); -/* No MSI Support is available presently, so TTI and +/* +* No MSI Support is available presently, so TTI and * RTI interrupts are also disabled. */ }else if (flag ==DISABLE_INTRS ) { -/* Disable PIC Intrs in the general intr mask register +/* +* Disable PIC Intrs in the general +* intr mask register */ writeq (DISABLE_ALL_INTRS , &bar0->pic_int_mask); temp64 =readq (&bar0->general_int_mask);
@@ -907,24 +925,34 @@/* DMA Interrupts */ /* Enabling/Disabling Tx DMA interrupts */ if (mask &TX_DMA_INTR ) { -/* Enable TxDMA Intrs in the general intr mask register */ +/* Enable TxDMA Intrs in the general intr mask register */ val64 =TXDMA_INT_M ;if (flag ==ENABLE_INTRS ) { temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* Disable all interrupts other than PFC interrupt in -* DMA level. +/* +* Keep all interrupts other than PFC interrupt +* and PCC interrupt disabled in DMA level. */ - val64 =DISABLE_ALL_INTRS & (~TXDMA_PFC_INT_M ); + val64 =DISABLE_ALL_INTRS & ~(TXDMA_PFC_INT_M | +TXDMA_PCC_INT_M );writeq (val64, &bar0->txdma_int_mask); -/* Enable only the MISC error 1 interrupt in PFC block +/* +* Enable only the MISC error 1 interrupt in PFC block */ val64 =DISABLE_ALL_INTRS & (~PFC_MISC_ERR_1 );writeq (val64, &bar0->pfc_err_mask); +/* +* Enable only the FB_ECC error interrupt in PCC block +*/ + val64 =DISABLE_ALL_INTRS & (~PCC_FB_ECC_ERR ); +writeq (val64, &bar0->pcc_err_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable TxDMA Intrs in the general intr mask -* register */ +/* +* Disable TxDMA Intrs in the general intr mask +* register +*/ writeq (DISABLE_ALL_INTRS , &bar0->txdma_int_mask);writeq (DISABLE_ALL_INTRS , &bar0->pfc_err_mask); temp64 =readq (&bar0->general_int_mask);
@@ -941,12 +969,16 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* All RxDMA block interrupts are disabled for now -* TODO */ +/* +* All RxDMA block interrupts are disabled for now +* TODO +*/ writeq (DISABLE_ALL_INTRS , &bar0->rxdma_int_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable RxDMA Intrs in the general intr mask -* register */ +/* +* Disable RxDMA Intrs in the general intr mask +* register +*/ writeq (DISABLE_ALL_INTRS , &bar0->rxdma_int_mask); temp64 =readq (&bar0->general_int_mask); val64 |= temp64;
@@ -962,9 +994,11 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* All MAC block error interrupts are disabled for now +/* +* All MAC block error interrupts are disabled for now * except the link status change interrupt. -* TODO*/ +* TODO +*/ val64 =MAC_INT_STATUS_RMAC_INT ; temp64 =readq (&bar0->mac_int_mask); temp64 &= ~((u64 ) val64);
@@ -974,7 +1008,8 @@ val64 &= ~((u64 )RMAC_LINK_STATE_CHANGE_INT );writeq (val64, &bar0->mac_rmac_err_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable MAC Intrs in the general intr mask register +/* +* Disable MAC Intrs in the general intr mask register */ writeq (DISABLE_ALL_INTRS , &bar0->mac_int_mask); writeq(DISABLE_ALL_INTRS,
@@ -993,11 +1028,14 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* All XGXS block error interrupts are disabled for now -* TODO */ +/* +* All XGXS block error interrupts are disabled for now +* TODO +*/ writeq (DISABLE_ALL_INTRS , &bar0->xgxs_int_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable MC Intrs in the general intr mask register +/* +* Disable MC Intrs in the general intr mask register */ writeq (DISABLE_ALL_INTRS , &bar0->xgxs_int_mask); temp64 =readq (&bar0->general_int_mask);
@@ -1013,11 +1051,14 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* All MC block error interrupts are disabled for now -* TODO */ +/* +* All MC block error interrupts are disabled for now +* TODO +*/ writeq (DISABLE_ALL_INTRS , &bar0->mc_int_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable MC Intrs in the general intr mask register +/* +* Disable MC Intrs in the general intr mask register */ writeq (DISABLE_ALL_INTRS , &bar0->mc_int_mask); temp64 =readq (&bar0->general_int_mask);
@@ -1034,15 +1075,15 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -/* Enable all the Tx side interrupts */ -writeq (0x0 , &bar0->tx_traffic_mask);/* '0' Enables -* all 64 TX -* interrupt -* levels. -*/ +/* +* Enable all the Tx side interrupts +* writing 0 Enables all 64 TX interrupt levels +*/ +writeq (0x0 , &bar0->tx_traffic_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable Tx Traffic Intrs in the general intr mask -* register. +/* +* Disable Tx Traffic Intrs in the general intr mask +* register. */ writeq (DISABLE_ALL_INTRS , &bar0->tx_traffic_mask); temp64 =readq (&bar0->general_int_mask);
@@ -1058,14 +1099,12 @@ temp64 =readq (&bar0->general_int_mask); temp64 &= ~((u64 ) val64);writeq (temp64, &bar0->general_int_mask); -writeq (0x0 , &bar0->rx_traffic_mask);/* '0' Enables -* all 8 RX -* interrupt -* levels. -*/ +/* writing 0 Enables all 8 RX interrupt levels */ +writeq (0x0 , &bar0->rx_traffic_mask); }else if (flag ==DISABLE_INTRS ) { -/* Disable Rx Traffic Intrs in the general intr mask -* register. +/* +* Disable Rx Traffic Intrs in the general intr mask +* register. */ writeq (DISABLE_ALL_INTRS , &bar0->rx_traffic_mask); temp64 =readq (&bar0->general_int_mask);
@@ -1075,17 +1114,19 @@ } } -/* -* Input Arguments: -* val64 - Value read from adapter status register. -* flag - indicates if the adapter enable bit was ever written once before. -* Return Value: -* void. -* Description: -* Returns whether the H/W is ready to go or not. Depending on whether -* adapter enable bit was written or not the comparison differs and the -* calling function passes the input argument flag to indicate this. +/** +* verify_xena_quiescence - Checks whether the H/W is ready +* @val64 : Value read from adapter status register. +* @flag : indicates if the adapter enable bit was ever written once +* before. +* Description: Returns whether the H/W is ready to go or not. Depending +* on whether adapter enable bit was written or not the comparison +* differs and the calling function passes the input argument flag to +* indicate this. +* Return: 1 If xena is quiescence +* 0 If Xena is not quiescence */ +static int verify_xena_quiescence (u64 val64,int flag) {int ret =0 ;
@@ -1122,11 +1163,15 @@return ret; } -/* +/** +* fix_mac_address - Fix for Mac addr problem on Alpha platforms +* @sp: Pointer to device specifc structure +* Description : * New procedure to clear mac address reading problems on Alpha platforms * */ -void FixMacAddress (nic_t * sp) + +void fix_mac_address (nic_t * sp) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;u64 val64;
@@ -1138,19 +1183,20 @@ } } -/* -* Input Arguments: -* device private variable. -* Return Value: -* SUCCESS on success and -1 on failure. +/** +* start_nic - Turns the device on +* @nic : device private variable. * Description: -* This function actually turns the device on. Before this -* function is called, all Registers are configured from their reset states +* This function actually turns the device on. Before this function is +* called,all Registers are configured from their reset states * and shared memory is allocated but the NIC is still quiescent. On * calling this function, the device interrupts are cleared and the NIC is * literally switched on by writing into the adapter control register. +* Return Value: +* SUCCESS on success and -1 on failure. */ -static int startNic (struct s2io_nic *nic) + +static int start_nic (struct s2io_nic *nic) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;struct net_device *dev = nic->dev;
@@ -1164,7 +1210,7 @@ config = &nic->config;/* PRC Initialization and configuration */ -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) {writeq ((u64 ) nic->rx_blocks[i][0 ].block_dma_addr, &bar0->prc_rxd0_n[i]);
@@ -1173,7 +1219,8 @@writeq (val64, &bar0->prc_ctrl_n[i]); } -/* Enabling MC-RLDRAM. After enabling the device, we timeout +/* +* Enabling MC-RLDRAM. After enabling the device, we timeout * for around 100ms, which is approximately the time required * for the device to be ready for operation. */
@@ -1190,14 +1237,16 @@ val64 &= ~ADAPTER_ECC_EN ;writeq (val64, &bar0->adapter_control); -/* Clearing any possible Link state change interrupts that +/* +* Clearing any possible Link state change interrupts that * could have popped up just before Enabling the card. */ val64 =readq (&bar0->mac_rmac_err_reg);if (val64)writeq (val64, &bar0->mac_rmac_err_reg); -/* Verify if the device is ready to be enabled, if so enable +/* +* Verify if the device is ready to be enabled, if so enable * it. */ val64 =readq (&bar0->adapter_status);
@@ -1211,9 +1260,10 @@/* Enable select interrupts */ interruptible =TX_TRAFFIC_INTR |RX_TRAFFIC_INTR |TX_MAC_INTR |RX_MAC_INTR ; -en_dis_able_NicIntrs (nic, interruptible,ENABLE_INTRS ); +en_dis_able_nic_intrs (nic, interruptible,ENABLE_INTRS ); -/* With some switches, link might be already up at this point. +/* +* With some switches, link might be already up at this point. * Because of this weird behavior, when we enable laser, * we may not get link. We need to handle this. We cannot * figure out which switch is misbehaving. So we are forced to
@@ -1240,82 +1290,72 @@* force link down. Since link is already up, we will get * link state change interrupt after this reset */ -writeq (0x8007051500000000ULL , &bar0->dtx_control); +writeq (0x80010515001E0000ULL , &bar0->dtx_control); val64 =readq (&bar0->dtx_control); -writeq (0x80070515000000E0ULL , &bar0->dtx_control); +udelay (50 ); +writeq (0x80010515001E00E0ULL , &bar0->dtx_control); val64 =readq (&bar0->dtx_control); +udelay (50 );writeq (0x80070515001F00E4ULL , &bar0->dtx_control); val64 =readq (&bar0->dtx_control); +udelay (50 );return SUCCESS ; } -/* -* Input Arguments: -* nic - device private variable. -* Return Value: -* void. +/** +* free_tx_buffers - Free all queued Tx buffers +* @nic : device private variable. * Description: -* Free all queued Tx buffers. -*/ -void freeTxBuffers (struct s2io_nic *nic) +* Free all queued Tx buffers. +* Return Value: void +*/ + +void free_tx_buffers (struct s2io_nic *nic) {struct net_device *dev = nic->dev;struct sk_buff *skb;TxD_t *txdp;int i, j; -#if DEBUG_ON -int cnt =0 ; -#endif mac_info_t *mac_control;struct config_param *config; +int cnt =0 ; mac_control = &nic->mac_control; config = &nic->config; -for (i =0 ; i < config->TxFIFONum; i++) { -for (j =0 ; j < config->TxCfg[i].FifoLen -1 ; j++) { +for (i =0 ; i < config->tx_fifo_num; i++) { +for (j =0 ; j < config->tx_cfg[i].fifo_len -1 ; j++) { txdp = mac_control->txdl_start[i] + - (config->MaxTxDs * j); - -if (!(txdp->Control_1 &TXD_LIST_OWN_XENA )) { -/* If owned by host, ignore */ -continue ; - } + (config->max_txds * j); skb = (struct sk_buff *) ((unsigned long ) txdp-> Host_Control);if (skb ==NULL ) { -DBG_PRINT (ERR_DBG ,"%s: NULL skb " , - dev->name); -DBG_PRINT (ERR_DBG ,"in Tx Int\n" ); -return ; +memset (txdp,0 ,sizeof (TxD_t)); +continue ; } -#if DEBUG_ON - cnt++; -#endif dev_kfree_skb (skb);memset (txdp,0 ,sizeof (TxD_t)); + cnt++; } -#if DEBUG_ON DBG_PRINT (INTR_DBG ,"%s:forcibly freeing %d skbs on FIFO%d\n" , dev->name, cnt, i); -#endif } } -/* -* Input Arguments: -* nic - device private variable. -* Return Value: +/** +* stop_nic - To stop the nic +* @nic ; device private variable. +* Description: +* This function does exactly the opposite of what the start_nic() +* function does. This function is called to stop the device. +* Return Value: * void. -* Description: -* This function does exactly the opposite of what the startNic() -* function does. This function is called to stop -* the device. */ -static void stopNic (struct s2io_nic *nic) + +static void stop_nic (struct s2io_nic *nic) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; registeru64 val64 =0 ;
@@ -1326,24 +1366,23 @@ mac_control = &nic->mac_control; config = &nic->config; -/* Disable all interrupts */ +/* Disable all interrupts */ interruptible =TX_TRAFFIC_INTR |RX_TRAFFIC_INTR |TX_MAC_INTR |RX_MAC_INTR ; -en_dis_able_NicIntrs (nic, interruptible,DISABLE_INTRS ); +en_dis_able_nic_intrs (nic, interruptible,DISABLE_INTRS ); -/* Disable PRCs */ -for (i =0 ; i < config->RxRingNum; i++) { +/* Disable PRCs */ +for (i =0 ; i < config->rx_ring_num; i++) { val64 =readq (&bar0->prc_ctrl_n[i]); val64 &= ~((u64 )PRC_CTRL_RC_ENABLED );writeq (val64, &bar0->prc_ctrl_n[i]); } } -/* -* Input Arguments: -* device private variable -* Return Value: -* SUCCESS on success or an appropriate -ve value on failure. +/** +* fill_rx_buffers - Allocates the Rx side skbs +* @nic: device private variable +* @ring_no: ring number * Description: * The function allocates Rx side skbs and puts the physical * address of these buffers into the RxD buffer pointers, so that the NIC
@@ -1354,9 +1393,13 @@* 3. Five buffer modes. * Each mode defines how many fragments the received frame will be split * up into by the NIC. The frame is split into L3 header, L4 Header, -* L4 payload in three buffer mode and in 5 buffer mode, L4 payload itself -* is split into 3 fragments. As of now only single buffer mode is supported. +* L4 payload in three buffer mode and in 5 buffer mode, L4 payload itself +* is split into 3 fragments. As of now only single buffer mode is +* supported. +* Return Value: +* SUCCESS on success or an appropriate -ve value on failure. */ +int fill_rx_buffers (struct s2io_nic *nic,int ring_no) {struct net_device *dev = nic->dev;
@@ -1392,7 +1435,8 @@ off1 = mac_control->rx_curr_get_info[ring_no].offset; offset = block_no * (MAX_RXDS_PER_BLOCK +1 ) + off; offset1 = block_no1 * (MAX_RXDS_PER_BLOCK +1 ) + off1; - + offset = block_no * (MAX_RXDS_PER_BLOCK ) + off; + offset1 = block_no1 * (MAX_RXDS_PER_BLOCK ) + off1; rxdp = nic->rx_blocks[ring_no][block_no]. block_virt_addr + off;if ((offset == offset1) && (rxdp->Host_Control)) {
@@ -1400,7 +1444,6 @@DBG_PRINT (INTR_DBG ," info equated\n" ); goto end; } -if (rxdp->Control_1 ==END_OF_BLOCK ) { mac_control->rx_curr_put_info[ring_no]. block_index++;
@@ -1412,8 +1455,6 @@ off %= (MAX_RXDS_PER_BLOCK +1 ); mac_control->rx_curr_put_info[ring_no].offset = off; -/*rxdp = nic->rx_blocks[ring_no][block_no]. -block_virt_addr + off; */ rxdp = (RxD_t *) ((unsigned long ) rxdp->Control_2);DBG_PRINT (INTR_DBG ,"%s: Next block at: %p\n" , dev->name, rxdp);
@@ -1450,15 +1491,16 @@return SUCCESS ; } -/* -* Input Arguments: -* device private variable. -* Return Value: -* NONE. +/** +* free_rx_buffers - Frees all Rx buffers +* @sp: device private variable. * Description: * This function will free all Rx buffers allocated by host. +* Return Value: +* NONE. */ -static void freeRxBuffers (struct s2io_nic *sp) + +static void free_rx_buffers (struct s2io_nic *sp) {struct net_device *dev = sp->dev;int i, j, blk =0 , off, buf_cnt =0 ;
@@ -1470,8 +1512,8 @@ mac_control = &sp->mac_control; config = &sp->config; -for (i =0 ; i < config->RxRingNum; i++) { -for (j =0 , blk =0 ; j < config->RxCfg[i].NumRxd; j++) { +for (i =0 ; i < config->rx_ring_num; i++) { +for (j =0 , blk =0 ; j < config->rx_cfg[i].num_rxd; j++) { off = j % (MAX_RXDS_PER_BLOCK +1 ); rxdp = sp->rx_blocks[i][blk].block_virt_addr + off;
@@ -1510,18 +1552,19 @@ } } -/* -* Input Argument: -* dev - pointer to the device structure. -* budget - The number of packets that were budgeted to be processed during -* one pass through the 'Poll" function. -* Return value: -* 0 on success and 1 if there are No Rx packets to be processed. -* Description: -* Comes into picture only if NAPI support has been incorporated. It does -* the same thing that rxIntrHandler does, but not in a interrupt context -* also It will process only a given number of packets. +/** +* s2io_poll - Rx interrupt handler for NAPI support +* @dev : pointer to the device structure. +* @budget : The number of packets that were budgeted to be processed +* during one pass through the 'Poll" function. +* Description: +* Comes into picture only if NAPI support has been incorporated. It does +* the same thing that rx_intr_handler does, but not in a interrupt context +* also It will process only a given number of packets. +* Return value: +* 0 on success and 1 if there are No Rx packets to be processed. */ +#ifdef CONFIG_S2IO_NAPI static int s2io_poll (struct net_device *dev,int *budget) {
@@ -1546,7 +1589,7 @@ val64 =readq (&bar0->rx_traffic_int);writeq (val64, &bar0->rx_traffic_int); -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) {if (--pkts_to_process <0 ) { goto no_rx; }
@@ -1589,7 +1632,7 @@HEADER_802_2_SIZE +HEADER_SNAP_SIZE , PCI_DMA_FROMDEVICE); -rxOsmHandler (nic, val16, rxdp, i); +rx_osm_handler (nic, val16, rxdp, i); pkt_cnt++; offset_info.offset++; offset_info.offset %= (MAX_RXDS_PER_BLOCK +1 );
@@ -1603,38 +1646,39 @@if (!pkt_cnt) pkt_cnt =1 ; -for (i =0 ; i < config->RxRingNum; i++) +for (i =0 ; i < config->rx_ring_num; i++)fill_rx_buffers (nic, i); dev->quota -= pkt_cnt; *budget -= pkt_cnt;netif_rx_complete (dev); -/* Re enable the Rx interrupts. */ -en_dis_able_NicIntrs (nic,RX_TRAFFIC_INTR ,ENABLE_INTRS ); +/* Re enable the Rx interrupts. */ +en_dis_able_nic_intrs (nic,RX_TRAFFIC_INTR ,ENABLE_INTRS );return 0 ; no_rx: -for (i =0 ; i < config->RxRingNum; i++) +for (i =0 ; i < config->rx_ring_num; i++)fill_rx_buffers (nic, i); dev->quota -= pkt_cnt; *budget -= pkt_cnt; return 1; }#else -/* -* Input Arguments: -* device private variable. -* Return Value: -* NONE. +/** +* rx_intr_handler - Rx interrupt handler +* @nic: device private variable. * Description: -* If the interrupt is because of a received frame or if the -* receive ring contains fresh as yet un-processed frames, this function is +* If the interrupt is because of a received frame or if the +* receive ring contains fresh as yet un-processed frames,this function is * called. It picks out the RxD at which place the last Rx processing had * stopped and sends the skb to the OSM's Rx handler and then increments * the offset. +* Return Value: +* NONE. */ -static void rxIntrHandler (struct s2io_nic *nic) + +static void rx_intr_handler (struct s2io_nic *nic) {struct net_device *dev = (struct net_device *) nic->dev;XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
@@ -1643,24 +1687,21 @@struct sk_buff *skb;u16 val16, cksum; registeru64 val64 =0 ; -int i, block_no; +int i, block_no, pkt_cnt =0 ;mac_info_t *mac_control;struct config_param *config; mac_control = &nic->mac_control; config = &nic->config; -#if DEBUG_ON - nic->rxint_cnt++; -#endif - -/* rx_traffic_int reg is an R1 register, hence we read and write back -* the samevalue in the register to clear it. -*/ +/* +* rx_traffic_int reg is an R1 register, hence we read and write back +* the samevalue in the register to clear it. +*/ val64 =readq (&bar0->rx_traffic_int);writeq (val64, &bar0->rx_traffic_int); -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) { offset_info = mac_control->rx_curr_get_info[i]; block_no = offset_info.block_index; rxdp = nic->rx_blocks[i][block_no].block_virt_addr +
@@ -1698,7 +1739,7 @@HEADER_802_2_SIZE +HEADER_SNAP_SIZE , PCI_DMA_FROMDEVICE); -rxOsmHandler (nic, val16, rxdp, i); +rx_osm_handler (nic, val16, rxdp, i); offset_info.offset++; offset_info.offset %= (MAX_RXDS_PER_BLOCK +1 ); rxdp =
@@ -1706,23 +1747,24 @@ offset_info.offset; mac_control->rx_curr_get_info[i].offset = offset_info.offset; + pkt_cnt++; } } }#endif - -/* -* Input Arguments: -* device private variable -* Return Value: -* NONE +/** +* tx_intr_handler - Transmit interrupt handler +* @nic : device private variable * Description: * If an interrupt was raised to indicate DMA complete of the -* Tx packet, this function is called. It identifies the last TxD whose buffer -* was freed and frees all skbs whose data have already DMA'ed into the NICs -* internal memory. +* Tx packet, this function is called. It identifies the last TxD +* whose buffer was freed and frees all skbs whose data have already +* DMA'ed into the NICs internal memory. +* Return Value: +* NONE */ -static void txIntrHandler (struct s2io_nic *nic) + +static void tx_intr_handler (struct s2io_nic *nic) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;struct net_device *dev = (struct net_device *) nic->dev;
@@ -1734,25 +1776,22 @@u16 j, frg_cnt;mac_info_t *mac_control;struct config_param *config; -#if DEBUG_ON -int cnt =0 ; - nic->txint_cnt++; -#endif mac_control = &nic->mac_control; config = &nic->config; -/* tx_traffic_int reg is an R1 register, hence we read and write +/* +* tx_traffic_int reg is an R1 register, hence we read and write * back the samevalue in the register to clear it. */ val64 =readq (&bar0->tx_traffic_int);writeq (val64, &bar0->tx_traffic_int); -for (i =0 ; i < config->TxFIFONum; i++) { +for (i =0 ; i < config->tx_fifo_num; i++) { offset_info = mac_control->tx_curr_get_info[i]; offset_info1 = mac_control->tx_curr_put_info[i]; txdlp = mac_control->txdl_start[i] + - (config->MaxTxDs * offset_info.offset); + (config->max_txds * offset_info.offset);while ((!(txdlp->Control_1 &TXD_LIST_OWN_XENA )) && (offset_info.offset != offset_info1.offset) && (txdlp->Host_Control)) {
@@ -1797,28 +1836,20 @@ txdlp = temp; }memset (txdlp,0 , - (sizeof (TxD_t) * config->MaxTxDs)); + (sizeof (TxD_t) * config->max_txds));/* Updating the statistics block */ nic->stats.tx_packets++; nic->stats.tx_bytes += skb->len; -#if DEBUG_ON - nic->txpkt_bytes += skb->len; - cnt++; -#endif dev_kfree_skb_irq (skb); offset_info.offset++; offset_info.offset %= offset_info.fifo_len +1 ; txdlp = mac_control->txdl_start[i] + - (config->MaxTxDs * offset_info.offset); + (config->max_txds * offset_info.offset); mac_control->tx_curr_get_info[i].offset = offset_info.offset; } -#if DEBUG_ON -DBG_PRINT (INTR_DBG ,"%s: freed %d Tx Pkts\n" , dev->name, - cnt); -#endif }spin_lock (&nic->tx_lock);
@@ -1827,55 +1858,53 @@spin_unlock (&nic->tx_lock); } -/* -* Input Arguments: -* device private variable -* Return Value: +/** +* 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 -* 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. -*/ -static void alarmIntrHandler (struct s2io_nic *nic) +*/ + +static void alarm_intr_handler (struct s2io_nic *nic) {struct net_device *dev = (struct net_device *) nic->dev;XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; registeru64 val64 =0 , err_reg =0 ; -/* Handling link status change error Intr */ err_reg =readq (&bar0->mac_rmac_err_reg);if (err_reg &RMAC_LINK_STATE_CHANGE_INT ) {schedule_work (&nic->set_link_task); } -/* Handling SERR errors by stopping device Xmit queue and forcing -* a H/W reset. -*/ +/* In case of a serious error, the device will be Reset. */ val64 =readq (&bar0->serr_source);if (val64 &SERR_SOURCE_ANY ) {DBG_PRINT (ERR_DBG ,"%s: Device indicates " , dev->name);DBG_PRINT (ERR_DBG ,"serious error!!\n" );netif_stop_queue (dev); } -/* Other type of interrupts are not being handled now, TODO*/ + +/* Other type of interrupts are not being handled now, TODO */ } -/* -* Input Argument: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. +/** +* 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. +* Description: Function that waits for a command to Write into RMAC +* ADDR DATA registers to be completed and returns either success or +* error depending on whether the command was complete or not. * Return value: * SUCCESS on success and FAILURE on failure. -* Description: -* Function that waits for a command to Write into RMAC ADDR DATA registers -* to be completed and returns either success or error depending on whether -* the command was complete or not. */ -int waitForCmdComplete (nic_t * sp) + +int wait_for_cmd_complete (nic_t * sp) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;int ret =FAILURE , cnt =0 ;
@@ -1900,17 +1929,16 @@return ret; } -/* -* Input Argument: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. +/** +* s2io_reset - Resets the card. +* @sp : private member of the device structure. +* Description: Function to Reset the card. This function then also +* restores the previously saved PCI configuration space registers as +* the card reset also resets the configuration space. * Return value: -* void. -* Description: -* Function to Reset the card. This function then also restores the previously -* saved PCI configuration space registers as the card reset also resets the -* Configration space. +* void. */ +void s2io_reset (nic_t * sp) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;
@@ -1920,7 +1948,8 @@ val64 =SW_RESET_ALL ;writeq (val64, &bar0->sw_reset); -/* At this stage, if the PCI write is indeed completed, the +/* +* At this stage, if the PCI write is indeed completed, the * card is reset and so is the PCI Config space of the device. * So a read cannot be issued at this stage on any of the * registers to ensure the write into "sw_reset" register
@@ -1954,29 +1983,31 @@ sp->device_enabled_once = FALSE; } -/* -* Input Argument: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. +/** +* s2io_set_swapper - to set the swapper controle on the card +* @sp : private member of the device structure, +* pointer to the s2io_nic structure. +* Description: Function to set the swapper control on the card +* correctly depending on the 'endianness' of the system. * Return value: * SUCCESS on success and FAILURE on failure. -* Description: -* Function to set the swapper control on the card correctly depending on the -* 'endianness' of the system. */ +int s2io_set_swapper (nic_t * sp) {struct net_device *dev = sp->dev;XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;u64 val64; -/* Set proper endian settings and verify the same by reading the PIF -* Feed-back register. -*/ +/* +* Set proper endian settings and verify the same by reading +* the PIF Feed-back register. +*/ #ifdef __BIG_ENDIAN -/* The device by default set to a big endian format, so a big endian -* driver need not set anything. -*/ +/* +* The device by default set to a big endian format, so a +* big endian driver need not set anything. +*/ writeq (0xffffffffffffffffULL , &bar0->swapper_ctrl); val64 = (SWAPPER_CTRL_PIF_R_FE | SWAPPER_CTRL_PIF_R_SE |
@@ -1995,9 +2026,11 @@ SWAPPER_CTRL_STATS_FE | SWAPPER_CTRL_STATS_SE);writeq (val64, &bar0->swapper_ctrl);#else -/* Initially we enable all bits to make it accessible by the driver, -* then we selectively enable only those bits that we want to set. -*/ +/* +* Initially we enable all bits to make it accessible by the +* driver, then we selectively enable only those bits that +* we want to set. +*/ writeq (0xffffffffffffffffULL , &bar0->swapper_ctrl); val64 = (SWAPPER_CTRL_PIF_R_FE | SWAPPER_CTRL_PIF_R_SE |
@@ -2021,9 +2054,10 @@writeq (val64, &bar0->swapper_ctrl);#endif -/* Verifying if endian settings are accurate by reading a feedback -* register. -*/ +/* +* Verifying if endian settings are accurate by reading a +* feedback register. +*/ val64 =readq (&bar0->pif_rd_swapper_fb);if (val64 !=0x0123456789ABCDEFULL ) {/* Endian settings are incorrect, calls for another dekko. */
@@ -2041,17 +2075,18 @@* Functions defined below concern the OS part of the driver * * ********************************************************* */ -/* -* Input Argument: -* dev - pointer to the device structure. -* Return value: -* '0' on success and an appropriate (-)ve integer as defined in errno.h -* file on failure. +/** +* s2io-open - open entry point of the driver +* @dev : pointer to the device structure. * Description: * This function is the open entry point of the driver. It mainly calls a * function to allocate Rx buffers and inserts them into the buffer * descriptors and then enables the Rx part of the NIC. +* Return value: +* 0 on success and an appropriate (-)ve integer as defined in errno.h +* file on failure. */ +int s2io_open (struct net_device *dev) {nic_t *sp = dev->priv;
@@ -2060,18 +2095,21 @@struct config_param *config; -/* Make sure you have link off by default every time Nic is initialized*/ +/* +* Make sure you have link off by default every time +* Nic is initialized +*/ netif_carrier_off (dev); sp->last_link_state =LINK_DOWN ; -/* Initialize the H/W I/O registers */ -if (initNic (sp) !=0 ) { +/* Initialize the H/W I/O registers */ +if (init_nic (sp) !=0 ) {DBG_PRINT (ERR_DBG ,"%s: H/W initialization failed\n" , dev->name);return -ENODEV ; } -/* After proper initialization of H/W, register ISR */ +/* After proper initialization of H/W, register ISR */ err =request_irq ((int ) sp->irq, s2io_isr,SA_SHIRQ , sp->name, dev);if (err) {
@@ -2087,38 +2125,39 @@ } -/* Setting its receive mode */ +/* Setting its receive mode */ s2io_set_multicast (dev); -/* Initializing the Rx buffers. For now we are considering only 1 Rx ring -* and initializing buffers into 1016 RxDs or 8 Rx blocks -*/ +/* +* Initializing the Rx buffers. For now we are considering only 1 +* Rx ring and initializing buffers into 1016 RxDs or 8 Rx blocks +*/ mac_control = &sp->mac_control; config = &sp->config; -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) {if ((ret =fill_rx_buffers (sp, i))) {DBG_PRINT (ERR_DBG ,"%s: Out of memory in Open\n" , dev->name);s2io_reset (sp);free_irq (dev->irq, dev); -freeRxBuffers (sp); +free_rx_buffers (sp);return -ENOMEM ; }DBG_PRINT (INFO_DBG ,"Buf in ring:%d is %d:\n" , i,atomic_read (&sp->rx_bufs_left[i])); } -/* Enable tasklet for the device */ +/* Enable tasklet for the device */ tasklet_init (&sp->task, s2io_tasklet, (unsigned long ) dev); -/* Enable Rx Traffic and interrupts on the NIC */ -if (startNic (sp)) { +/* Enable Rx Traffic and interrupts on the NIC */ +if (start_nic (sp)) {DBG_PRINT (ERR_DBG ,"%s: Starting NIC failed\n" , dev->name);tasklet_kill (&sp->task);s2io_reset (sp);free_irq (dev->irq, dev); -freeRxBuffers (sp); +free_rx_buffers (sp);return -ENODEV ; }
@@ -2128,18 +2167,19 @@return 0 ; } -/* -* Input Argument/s: -* dev - device pointer. -* Return value: -* '0' on success and an appropriate (-)ve integer as defined in errno.h -* file on failure. +/** +* s2io_close -close entry point of the driver +* @dev : device pointer. * Description: * This is the stop entry point of the driver. It needs to undo exactly -* whatever was done by the open entry point, thus it's usually referred to -* as the close function. Among other things this function mainly stops the +* whatever was done by the open entry point,thus it's usually referred to +* as the close function.Among other things this function mainly stops the * Rx side of the NIC and frees all the Rx buffers in the Rx rings. +* Return value: +* 0 on success and an appropriate (-)ve integer as defined in errno.h +* file on failure. */ +int s2io_close (struct net_device *dev) {nic_t *sp = dev->priv;
@@ -2150,19 +2190,22 @@spin_lock (&sp->isr_lock);netif_stop_queue (dev); -/* disable Tx and Rx traffic on the NIC */ -stopNic (sp); +/* disable Tx and Rx traffic on the NIC */ +stop_nic (sp);spin_unlock (&sp->isr_lock); -/* If the device tasklet is running, wait till its done before killing it */ +/* +* If the device tasklet is running, wait till its done +* before killing it +*/ while (atomic_read (&(sp->tasklet_status))) {set_current_state (TASK_UNINTERRUPTIBLE );schedule_timeout (HZ /10 ); }tasklet_kill (&sp->task); -/* Check if the device is Quiescent and then Reset the NIC */ +/* Check if the device is Quiescent and then Reset the NIC */ do { val64 = readq(&bar0->adapter_status); if (verify_xena_quiescence(val64, sp->device_enabled_once)) {
@@ -2182,32 +2225,33 @@ }while (1 );s2io_reset (sp); -/* Free the Registered IRQ */ +/* Free the Registered IRQ */ free_irq (dev->irq, dev); -/* Free all Tx Buffers waiting for transmission */ -freeTxBuffers (sp); +/* Free all Tx Buffers waiting for transmission */ +free_tx_buffers (sp); -/* Free all Rx buffers allocated by host */ -freeRxBuffers (sp); +/* Free all Rx buffers allocated by host */ +free_rx_buffers (sp); sp->device_close_flag = TRUE;/* Device is shut down. */ return 0 ; } -/* -* Input Argument/s: -* skb - the socket buffer containing the Tx data. -* dev - device pointer. -* Return value: -* '0' on success & 1 on failure. -* NOTE: when device cant queue the pkt, just the trans_start variable will -* not be upadted. -* Description: +/** +* s2io_xmit - Tx entry point of te driver +* @skb : the socket buffer containing the Tx data. +* @dev : device pointer. +* Description : * This function is the Tx entry point of the driver. S2IO NIC supports * certain protocol assist features on Tx side, namely CSO, S/G, LSO. +* NOTE: when device cant queue the pkt,just the trans_start variable will +* not be upadted. +* Return value: +* 0 on success & 1 on failure. */ +int s2io_xmit (struct sk_buff *skb,struct net_device *dev) {nic_t *sp = dev->priv;
@@ -2221,6 +2265,7 @@#endif mac_info_t *mac_control;struct config_param *config; +XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0; mac_control = &sp->mac_control; config = &sp->config;
@@ -2232,14 +2277,14 @@/* Multi FIFO Tx is disabled for now. */ if (!queue && tx_prio) {u8 x = (skb->data)[5 ]; - queue = x % config->TxFIFONum; + queue = x % config->tx_fifo_num; } off = (u16 ) mac_control->tx_curr_put_info[queue].offset; off1 = (u16 ) mac_control->tx_curr_get_info[queue].offset; - txd_len = mac_control->txdl_len; - txdp = mac_control->txdl_start[queue] + (config->MaxTxDs * off); + txd_len = config->max_txds; + txdp = mac_control->txdl_start[queue] + (config->max_txds * off); queue_len = mac_control->tx_curr_put_info[queue].fifo_len +1 ;/* Avoid "put" pointer going beyond "get" pointer */
@@ -2250,7 +2295,6 @@spin_unlock_irqrestore (&sp->tx_lock, flags);return 0 ; } -#ifdef NETIF_F_TSO mss =skb_shinfo (skb)->tso_size;if (mss) {
@@ -2271,7 +2315,7 @@ TXD_TX_CKO_UDP_EN); } - txdp->Control_2 |= config->TxIntrType; + txdp->Control_2 |= config->tx_intr_type; txdp->Control_1 |= (TXD_BUFFER0_SIZE (frg_len) |TXD_GATHER_CODE_FIRST );
@@ -2301,15 +2345,18 @@#endif writeq (val64, &tx_fifo->List_Control); +/* Perform a PCI read to flush previous writes */ + val64 =readq (&bar0->general_int_status); + off++; off %= mac_control->tx_curr_put_info[queue].fifo_len +1 ; mac_control->tx_curr_put_info[queue].offset = off;/* Avoid "put" pointer going beyond "get" pointer */ if (((off +1 ) % queue_len) == off1) { -DBG_PRINT (TX_DBG , -"No free TxDs for xmit, Put: 0x%x Get:0x%x\n" , - off, off1); +DBG_PRINT (TX_DBG , +"No free TxDs for xmit, Put: 0x%x Get:0x%x\n" , + off, off1);netif_stop_queue (dev); }
@@ -2319,21 +2366,20 @@return 0 ; } -/* -* Input Argument/s: -* irq: the irq of the device. -* dev_id: a void pointer to the dev structure of the NIC. -* ptregs: pointer to the registers pushed on the stack. +/** +* 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. +* @pt_regs: pointer to the registers pushed on the stack. +* Description: This function is the ISR handler of the device. It +* identifies the reason for the interrupt and calls the relevant +* service routines. As a contongency measure, this ISR allocates the +* recv buffers, if their numbers are below the panic value which is +* presently set to 25% of the original number of rcv buffers allocated. * Return value: -* void. -* Description: -* This function is the ISR handler of the device. It identifies the reason -* for the interrupt and calls the relevant service routines. -* As a contongency measure, this ISR allocates the recv buffers, if their -* numbers are below the panic value which is presently set to 25% of the -* original number of rcv buffers allocated. +* IRQ_HANDLED: will be returned if IRQ was handled by this routine +* IRQ_NONE: will be returned if interrupt is not from our device */ -static irqreturn_t s2io_isr (int irq,void *dev_id,struct pt_regs *regs) {struct net_device *dev = (struct net_device *) dev_id;
@@ -2348,7 +2394,8 @@spin_lock (&sp->isr_lock); -/* Identify the cause for interrupt and call the appropriate +/* +* Identify the cause for interrupt and call the appropriate * interrupt handler. Causes for the interrupt could be; * 1. Rx of packet. * 2. Tx complete.
@@ -2362,30 +2409,28 @@spin_unlock (&sp->isr_lock);return IRQ_NONE ; } -/* Mask the interrupts on the NIC */ + +/* Mask the Interrupts on the NIC. */ general_mask =readq (&bar0->general_int_mask);writeq (0xFFFFFFFFFFFFFFFFULL , &bar0->general_int_mask); -#if DEBUG_ON - sp->int_cnt++; -#endif -/* If Intr is because of Tx Traffic */ if (reason &GEN_INTR_TXTRAFFIC ) { -txIntrHandler (sp); +tx_intr_handler (sp); }/* If Intr is because of an error */ if (reason & (GEN_ERROR_INTR )) -alarmIntrHandler (sp); +alarm_intr_handler (sp);#ifdef CONFIG_S2IO_NAPI if (reason &GEN_INTR_RXTRAFFIC ) {if (netif_rx_schedule_prep (dev)) { -en_dis_able_NicIntrs (sp,RX_TRAFFIC_INTR , -DISABLE_INTRS ); -/* We retake the snap shot of the general interrupt -* register. +en_dis_able_nic_intrs (sp,RX_TRAFFIC_INTR , +DISABLE_INTRS ); +/* +* Here we take a snap shot of the general +* Intr Register. */ general_mask =readq (&bar0->general_int_mask);__netif_rx_schedule (dev);
@@ -2394,66 +2439,72 @@#else /* If Intr is because of Rx Traffic */ if (reason &GEN_INTR_RXTRAFFIC ) { -rxIntrHandler (sp); +rx_intr_handler (sp); }#endif -/* If the Rx buffer count is below the panic threshold then reallocate the -* buffers from the interrupt handler itself, else schedule a tasklet to -* reallocate the buffers. -*/ +/* +* If the Rx buffer count is below the panic threshold then +* reallocate the buffers from the interrupt handler itself, +* else schedule a tasklet to reallocate the buffers. +*/ #if 1 { -int i; +int i; + +for (i =0 ; i < config->rx_ring_num; i++) { +int rxb_size =atomic_read (&sp->rx_bufs_left[i]); +int level =rx_buffer_level (sp, rxb_size, i); + +if ((level ==PANIC ) && (!TASKLET_IN_USE )) { +int ret; -for (i =0 ; i < config->RxRingNum; i++) { -int rxb_size =atomic_read (&sp->rx_bufs_left[i]); -int level =rx_buffer_level (sp, rxb_size, i); - -if ((level ==PANIC ) && (!TASKLET_IN_USE )) { -int ret; - -DBG_PRINT (ERR_DBG ,"%s: Rx BD hit " , dev->name); -DBG_PRINT (ERR_DBG ,"PANIC levels\n" ); -if ((ret =fill_rx_buffers (sp, i)) == -ENOMEM ) { -DBG_PRINT (ERR_DBG ,"%s:Out of memory" , +DBG_PRINT (INTR_DBG ,"%s: Rx BD hit " , dev->name); -DBG_PRINT (ERR_DBG ," in ISR!!\n" ); -writeq (general_mask, - &bar0->general_int_mask); -spin_unlock (&sp->isr_lock); -return IRQ_HANDLED ; +DBG_PRINT (INTR_DBG ,"PANIC levels\n" ); +if ((ret = +fill_rx_buffers (sp, i)) == -ENOMEM ) { +DBG_PRINT (ERR_DBG , +"%s:Out of memory" , + dev->name); +DBG_PRINT (ERR_DBG ," in ISR!!\n" ); +writeq (general_mask, + &bar0->general_int_mask); +spin_unlock (&sp->isr_lock); +return IRQ_HANDLED ; + } +clear_bit (0 , + (unsigned long *) (&sp-> + tasklet_status)); + }else if ((level ==LOW ) + && (!atomic_read (&sp->tasklet_status))) { +tasklet_schedule (&sp->task); } -clear_bit (0 , - (unsigned long *) (&sp->tasklet_status)); - }else if ((level ==LOW ) - && (!atomic_read (&sp->tasklet_status))) { -tasklet_schedule (&sp->task); - } - } + } }#else tasklet_schedule (&sp->task);#endif -/* Unmask all the previously enabled interrupts on the NIC */ +/* Unmask all previously enabled interrupts on the NIC. */ writeq (general_mask, &bar0->general_int_mask);spin_unlock (&sp->isr_lock);return IRQ_HANDLED ; } -/* -* Input Argument/s: -* dev - pointer to the device structure. -* Return value: -* pointer to the updated net_device_stats structure. +/** +* s2io_get_stats - Updates the device statistics structure. +* @dev : pointer to the device structure. * Description: * This function updates the device statistics structure in the s2io_nic * structure and returns a pointer to the same. +* Return value: +* pointer to the updated net_device_stats structure. */ +struct net_device_stats *s2io_get_stats (struct net_device *dev) {nic_t *sp = dev->priv;
@@ -2463,27 +2514,28 @@ mac_control = &sp->mac_control; config = &sp->config; - sp->stats.tx_errors = mac_control->StatsInfo->tmac_any_err_frms; - sp->stats.rx_errors = mac_control->StatsInfo->rmac_drop_frms; - sp->stats.multicast = mac_control->StatsInfo->rmac_vld_mcst_frms; + sp->stats.tx_errors = mac_control->stats_info->tmac_any_err_frms; + sp->stats.rx_errors = mac_control->stats_info->rmac_drop_frms; + sp->stats.multicast = mac_control->stats_info->rmac_vld_mcst_frms; sp->stats.rx_length_errors = - mac_control->StatsInfo->rmac_long_frms; + mac_control->stats_info->rmac_long_frms;return (&sp->stats); } -/* -* Input Argument/s: -* dev - pointer to the device structure -* Return value: -* void. +/** +* s2io_set_multicast - entry point for multicast address enable/disable. +* @dev : pointer to the device structure * Description: * This function is a driver entry point which gets called by the kernel * whenever multicast addresses must be enabled/disabled. This also gets * called to set/reset promiscuous mode. Depending on the deivce flag, we * determine, if multicast address must be enabled or if promiscuous mode * is to be disabled etc. +* Return value: +* void. */ +static void s2io_set_multicast (struct net_device *dev) {int i, j, prev_cnt;
@@ -2506,7 +2558,7 @@RMAC_ADDR_CMD_MEM_OFFSET (MAC_MC_ALL_MC_ADDR_OFFSET );writeq (val64, &bar0->rmac_addr_cmd_mem);/* Wait till command completes */ -waitForCmdComplete (sp); +wait_for_cmd_complete (sp); sp->m_cast_flg =1 ; sp->all_multi_pos =MAC_MC_ALL_MC_ADDR_OFFSET ;
@@ -2519,7 +2571,7 @@RMAC_ADDR_CMD_MEM_OFFSET (sp->all_multi_pos);writeq (val64, &bar0->rmac_addr_cmd_mem);/* Wait till command completes */ -waitForCmdComplete (sp); +wait_for_cmd_complete (sp); sp->m_cast_flg =0 ; sp->all_multi_pos =0 ;
@@ -2582,7 +2634,7 @@writeq (val64, &bar0->rmac_addr_cmd_mem);/* Wait for command completes */ -if (waitForCmdComplete (sp)) { +if (wait_for_cmd_complete (sp)) {DBG_PRINT (ERR_DBG ,"%s: Adding " , dev->name);DBG_PRINT (ERR_DBG ,"Multicasts failed\n" );
@@ -2609,7 +2661,7 @@writeq (val64, &bar0->rmac_addr_cmd_mem);/* Wait for command completes */ -if (waitForCmdComplete (sp)) { +if (wait_for_cmd_complete (sp)) {DBG_PRINT (ERR_DBG ,"%s: Adding " , dev->name);DBG_PRINT (ERR_DBG ,"Multicasts failed\n" );
@@ -2619,17 +2671,16 @@ } } -/* -* Input Argument/s: -* dev - pointer to the device structure. -* new_mac - a uchar pointer to the new mac address which is to be set. -* Return value: -* SUCCESS on success and an appropriate (-)ve integer as defined in errno.h -* file on failure. -* Description: -* This procedure will program the Xframe to receive frames with new -* Mac Address +/** +* s2io_set_mac_addr - Programs the Xframe mac address +* @dev : pointer to the device structure. +* @addr: a uchar pointer to the new mac address which is to be set. +* Description : This procedure will program the Xframe to receive +* frames with new Mac Address +* Return value: SUCCESS on success and an appropriate (-)ve integer +* as defined in errno.h file on failure. */ +int s2io_set_mac_addr (struct net_device *dev,u8 * addr) {nic_t *sp = dev->priv;
@@ -2655,7 +2706,7 @@RMAC_ADDR_CMD_MEM_OFFSET (0 );writeq (val64, &bar0->rmac_addr_cmd_mem);/* Wait till command completes */ -if (waitForCmdComplete (sp)) { +if (wait_for_cmd_complete (sp)) {DBG_PRINT (ERR_DBG ,"%s: set_mac_addr failed\n" , dev->name);return FAILURE ; }
@@ -2663,18 +2714,18 @@return SUCCESS ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* info - pointer to the structure with parameters given by ethtool to set -* link information. -* Return value: -* 0 on success. +/** +* s2io_ethtool_sset - Sets different link parameters. +* @sp : private member of the device structure, which is a pointer to the * s2io_nic structure. +* @info: pointer to the structure with parameters given by ethtool to set +* link information. * Description: -* The function sets different link parameters provided by the user onto -* the NIC. -*/ +* The function sets different link parameters provided by the user onto +* the NIC. +* Return value: +* 0 on success. +*/ +static int s2io_ethtool_sset (struct net_device *dev,struct ethtool_cmd *info) {
@@ -2690,17 +2741,18 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* info - pointer to the structure with parameters given by ethtool to return -* link information. -* Return value: -* void +/** +* s2io_ethtol_gset - Return link specific information. +* @sp : private member of the device structure, pointer to the +* s2io_nic structure. +* @info : pointer to the structure with parameters given by ethtool +* to return link information. * Description: -* Returns link specefic information like speed, duplex etc.. to ethtool. +* Returns link specific information like speed, duplex etc.. to ethtool. +* Return value : +* return 0 on success. */ +int s2io_ethtool_gset (struct net_device *dev,struct ethtool_cmd *info) {nic_t *sp = dev->priv;
@@ -2721,17 +2773,18 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* info - pointer to the structure with parameters given by ethtool to return -* driver information. +/** +* s2io_ethtool_gdrvinfo - Returns driver specific information. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @info : pointer to the structure with parameters given by ethtool to +* return driver information. +* Description: +* Returns driver specefic information like name, version etc.. to ethtool. * Return value: * void -* Description: -* Returns driver specefic information like name, version etc.. to ethtool. */ +static void s2io_ethtool_gdrvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {
@@ -2748,19 +2801,20 @@ info->n_stats =S2IO_STAT_LEN ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* regs - pointer to the structure with parameters given by ethtool for +/** +* s2io_ethtool_gregs - dumps the entire space of Xfame into the buffer. +* @sp: private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @regs : pointer to the structure with parameters given by ethtool for * dumping the registers. -* reg_space - The input argumnet into which all the registers are dumped. -* Return value: -* void -* Description: -* Dumps the entire register space of xFrame NIC into the user given buffer -* area. -*/ +* @reg_space: The input argumnet into which all the registers are dumped. +* Description: +* Dumps the entire register space of xFrame NIC into the user given +* buffer area. +* Return value : +* void . +*/ +static void s2io_ethtool_gregs (struct net_device *dev,struct ethtool_regs *regs,void *space) {
@@ -2778,17 +2832,15 @@ } } -/* -* Input Argument/s: -* data - address of the private member of the device structure, which +/** +* s2io_phy_id - timer function that alternates adapter LED. +* @data : address of the private member of the device structure, which * is a pointer to the s2io_nic structure, provided as an u32. -* Return value: -* void -* Description: -* This is actually the timer function that alternates the adapter LED bit -* of the adapter control bit to set/reset every time on invocation. -* The timer is set for 1/2 a second, hence tha NIC blinks once every second. -*/ +* Description: This is actually the timer function that alternates the +* adapter LED bit of the adapter control bit to set/reset every time on +* invocation. The timer is set for 1/2 a second, hence tha NIC blinks +* once every second. +*/ static void s2io_phy_id (unsigned long data) {nic_t *sp = (nic_t *) data;
@@ -2810,20 +2862,21 @@mod_timer (&sp->id_timer, jiffies +HZ /2 ); } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* id - pointer to the structure with identification parameters given by -* ethtool. +/** +* s2io_ethtool_idnic - To physically identify the nic on the system. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @id : pointer to the structure with identification parameters given by +* ethtool. +* Description: Used to physically identify the NIC on the system. +* The Link LED will blink for a time specified by the user for +* identification. +* NOTE: The Link has to be Up to be able to blink the LED. Hence +* identification is possible only if it's link is up. * Return value: -* int , returns '0' on success -* Description: -* Used to physically identify the NIC on the system. The Link LED will blink -* for a time specified by the user for identification. -* NOTE: The Link has to be Up to be able to blink the LED. Hence -* identification is possible only if it's link is up. +* int , returns 0 on success */ +static int s2io_ethtool_idnic (struct net_device *dev,u32 data) {u64 val64 =0 ;
@@ -2856,15 +2909,14 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* ep - pointer to the structure with pause parameters given by ethtool. +/** +* s2io_ethtool_getpause_data -Pause frame frame generation and reception. +* @sp : private member of the device structure, which is a pointer to the * s2io_nic structure. +* @ep : pointer to the structure with pause parameters given by ethtool. +* Description: +* Returns the Pause frame generation and reception capability of the NIC. * Return value: * void -* Description: -* Returns the Pause frame generation and reception capability of the NIC. */ static void s2io_ethtool_getpause_data (struct net_device *dev,struct ethtool_pauseparam *ep)
@@ -2881,17 +2933,18 @@ ep->autoneg = FALSE; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* ep - pointer to the structure with pause parameters given by ethtool. -* Return value: -* int, returns '0' on Success +/** +* s2io_ethtool-setpause_data - set/reset pause frame generation. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @ep : pointer to the structure with pause parameters given by ethtool. * Description: -* It can be used to set or reset Pause frame generation or reception support -* of the NIC. +* It can be used to set or reset Pause frame generation or reception +* support of the NIC. +* Return value: +* int, returns 0 on Success */ +int s2io_ethtool_setpause_data (struct net_device *dev,struct ethtool_pauseparam *ep) {
@@ -2912,21 +2965,24 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* off - offset at which the data must be written -* Return value: -* -1 on failure and the value read from the Eeprom if successful. +/** +* read_eeprom - reads 4 bytes of data from user given offset. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @off : offset at which the data must be written +* @data : Its an output parameter where the data read at the given +* offset is stored. * Description: -* Will read 4 bytes of data from the user given offset and return the -* read data. +* Will read 4 bytes of data from the user given offset and return the +* read data. * NOTE: Will allow to read only part of the EEPROM visible through the -* I2C bus. +* I2C bus. +* Return value: +* -1 on failure and 0 on success. */ +#define S2IO_DEV_ID 5 -static u32 readEeprom (nic_t * sp,int off) +static u32 read_eeprom (nic_t * sp,int off) {u32 data =-1 , exit_cnt =0 ;u64 val64;
@@ -2951,21 +3007,22 @@return data; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* off - offset at which the data must be written -* data - The data that is to be written -* cnt - Number of bytes of the data that are actually to be written into +/** +* write_eeprom - actually writes the relevant part of the data value. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @off : offset at which the data must be written +* @data : The data that is to be written +* @cnt : Number of bytes of the data that are actually to be written into * the Eeprom. (max of 3) -* Return value: -* '0' on success, -1 on failure. * Description: * Actually writes the relevant part of the data value into the Eeprom * through the I2C bus. +* Return value: +* 0 on success, -1 on failure. */ -static int writeEeprom (nic_t * sp,int off,u32 data,int cnt) + +static int write_eeprom (nic_t * sp,int off,u32 data,int cnt) {int exit_cnt =0 , ret =-1 ;u64 val64;
@@ -2991,39 +3048,19 @@return ret; } -/* -* A helper function used to invert the 4 byte u32 data field -* byte by byte. This will be used by the Read Eeprom function -* for display purposes. -*/ -u32 inv (u32 data) -{ -static u32 ret =0 ; - -if (data) { -u8 c = data; - ret = ((ret <<8 ) + c); - data >>=8 ; -inv (data); - } - -return ret; -} - -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* eeprom - pointer to the user level structure provided by ethtool, -* containing all relevant information. -* data_buf - user defined value to be written into Eeprom. -* Return value: -* int '0' on success -* Description: -* Reads the values stored in the Eeprom at given offset for a given length. -* Stores these values int the input argument data buffer 'data_buf' and -* returns these to the caller (ethtool.) +/** +* s2io_ethtool_geeprom - reads the value stored in the Eeprom. +* @sp : private member of the device structure, which is a pointer to the * s2io_nic structure. +* @eeprom : pointer to the user level structure provided by ethtool, +* containing all relevant information. +* @data_buf : user defined value to be written into Eeprom. +* Description: Reads the values stored in the Eeprom at given offset +* for a given length. Stores these values int the input argument data +* buffer 'data_buf' and returns these to the caller (ethtool.) +* Return value: +* int 0 on success */ +int s2io_ethtool_geeprom (struct net_device *dev,struct ethtool_eeprom *eeprom,u8 * data_buf) {
@@ -3036,30 +3073,31 @@ eeprom->len =XENA_EEPROM_SPACE - eeprom->offset;for (i =0 ; i < eeprom->len; i +=4 ) { - data =readEeprom (sp, eeprom->offset + i); + data =read_eeprom (sp, eeprom->offset + i);if (data <0 ) {DBG_PRINT (ERR_DBG ,"Read of EEPROM failed\n" );return -EFAULT ; } - valid =inv (data); + valid =INV (data);memcpy ((data_buf + i), &valid,4 ); }return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* eeprom - pointer to the user level structure provided by ethtool, -* containing all relevant information. -* data_buf - user defined value to be written into Eeprom. -* Return value: -* '0' on success, -EFAULT on failure. -* Description: +/** +* s2io_ethtool_seeprom - tries to write the user provided value in Eeprom +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @eeprom : pointer to the user level structure provided by ethtool, +* containing all relevant information. +* @data_buf ; user defined value to be written into Eeprom. +* Description: * Tries to write the user provided value in the Eeprom, at the offset * given by the user. +* Return value: +* 0 on success, -EFAULT on failure. */ +static int s2io_ethtool_seeprom (struct net_device *dev,struct ethtool_eeprom *eeprom,u8 * data_buf)
@@ -3083,7 +3121,7 @@ }else valid = data; -if (writeEeprom (sp, (eeprom->offset + cnt), valid,0 )) { +if (write_eeprom (sp, (eeprom->offset + cnt), valid,0 )) {DBG_PRINT (ERR_DBG ,"ETHTOOL_WRITE_EEPROM Err: Cannot " ); DBG_PRINT(ERR_DBG,
@@ -3097,19 +3135,20 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* data - variable that returns the result of each of the test conducted by -* the driver. -* Return value: -* '0' on success. +/** +* s2io_register_test - reads and writes into all clock domains. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @data : variable that returns the result of each of the test conducted b +* by the driver. * Description: -* Read and write into all clock domains. The NIC has 3 clock domains, -* see that registers in all the three regions are accessible. +* Read and write into all clock domains. The NIC has 3 clock domains, +* see that registers in all the three regions are accessible. +* Return value: +* 0 on success. */ -static int s2io_registerTest (nic_t * sp,uint64_t * data) + +static int s2io_register_test (nic_t * sp,uint64_t * data) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;u64 val64 =0 ;
@@ -3159,88 +3198,90 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* data - variable that returns the result of each of the test conducted by -* the driver. -* Return value: -* '0' on success. +/** +* s2io_eeprom_test - to verify that EEprom in the xena can be programmed. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @data:variable that returns the result of each of the test conducted by +* the driver. * Description: -* Verify that EEPROM in the xena can be programmed using I2C_CONTROL -* register. +* Verify that EEPROM in the xena can be programmed using I2C_CONTROL +* register. +* Return value: +* 0 on success. */ -static int s2io_eepromTest (nic_t * sp,uint64_t * data) + +static int s2io_eeprom_test (nic_t * sp,uint64_t * data) {int fail =0 , ret_data;/* Test Write Error at offset 0 */ -if (!writeEeprom (sp,0 ,0 ,3 )) +if (!write_eeprom (sp,0 ,0 ,3 )) fail =1 ;/* Test Write at offset 4f0 */ -if (writeEeprom (sp,0x4F0 ,0x01234567 ,3 )) +if (write_eeprom (sp,0x4F0 ,0x01234567 ,3 )) fail =1 ; -if ((ret_data =readEeprom (sp,0x4f0 )) <0 ) +if ((ret_data =read_eeprom (sp,0x4F0 )) <0 ) fail =1 ;if (ret_data !=0x01234567 ) fail =1 ;/* Reset the EEPROM data go FFFF */ -writeEeprom (sp,0x4F0 ,0xFFFFFFFF ,3 ); +write_eeprom (sp,0x4F0 ,0xFFFFFFFF ,3 );/* Test Write Request Error at offset 0x7c */ -if (!writeEeprom (sp,0x07C ,0 ,3 )) +if (!write_eeprom (sp,0x07C ,0 ,3 )) fail =1 ;/* Test Write Request at offset 0x7fc */ -if (writeEeprom (sp,0x7FC ,0x01234567 ,3 )) +if (write_eeprom (sp,0x7FC ,0x01234567 ,3 )) fail =1 ; -if ((ret_data =readEeprom (sp,0x7FC )) <0 ) +if ((ret_data =read_eeprom (sp,0x7FC )) <0 ) fail =1 ;if (ret_data !=0x01234567 ) fail =1 ;/* Reset the EEPROM data go FFFF */ -writeEeprom (sp,0x7FC ,0xFFFFFFFF ,3 ); +write_eeprom (sp,0x7FC ,0xFFFFFFFF ,3 );/* Test Write Error at offset 0x80 */ -if (!writeEeprom (sp,0x080 ,0 ,3 )) +if (!write_eeprom (sp,0x080 ,0 ,3 )) fail =1 ;/* Test Write Error at offset 0xfc */ -if (!writeEeprom (sp,0x0FC ,0 ,3 )) +if (!write_eeprom (sp,0x0FC ,0 ,3 )) fail =1 ;/* Test Write Error at offset 0x100 */ -if (!writeEeprom (sp,0x100 ,0 ,3 )) +if (!write_eeprom (sp,0x100 ,0 ,3 )) fail =1 ;/* Test Write Error at offset 4ec */ -if (!writeEeprom (sp,0x4EC ,0 ,3 )) +if (!write_eeprom (sp,0x4EC ,0 ,3 )) fail =1 ; *data = fail;return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* data - variable that returns the result of each of the test conducted by -* the driver. -* Return value: -* '0' on success and -1 on failure. +/** +* s2io_bist_test - invokes the MemBist test of the card . +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @data:variable that returns the result of each of the test conducted by +* the driver. * Description: -* This invokes the MemBist test of the card. We give around -* 2 secs time for the Test to complete. If it's still not complete -* within this peiod, we consider that the test failed. +* This invokes the MemBist test of the card. We give around +* 2 secs time for the Test to complete. If it's still not complete +* within this peiod, we consider that the test failed. +* Return value: +* 0 on success and -1 on failure. */ -static int s2io_bistTest (nic_t * sp,uint64_t * data) + +static int s2io_bist_test (nic_t * sp,uint64_t * data) {u8 bist =0 ;int cnt =0 , ret =-1 ;
@@ -3264,19 +3305,20 @@return ret; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* data - variable that returns the result of each of the test conducted by -* the driver. -* Return value: -* '0' on success. +/** +* s2io-link_test - verifies the link state of the nic +* @sp ; private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @data: variable that returns the result of each of the test conducted by +* the driver. * Description: -* The function verifies the link state of the NIC and updates the input -* argument 'data' appropriately. +* The function verifies the link state of the NIC and updates the input +* argument 'data' appropriately. +* Return value: +* 0 on success. */ -static int s2io_linkTest (nic_t * sp,uint64_t * data) + +static int s2io_link_test (nic_t * sp,uint64_t * data) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;u64 val64;
@@ -3288,19 +3330,20 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* data - variable that returns the result of each of the test conducted by -* the driver. -* Return value: -* '0' on success. +/** +* s2io_rldram_test - offline test for access to the RldRam chip on the NIC +* @sp - private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @data - variable that returns the result of each of the test +* conducted by the driver. * Description: * This is one of the offline test that tests the read and write * access to the RldRam chip on the NIC. +* Return value: +* 0 on success. */ -static int s2io_rldramTest (nic_t * sp,uint64_t * data) + +static int s2io_rldram_test (nic_t * sp,uint64_t * data) {XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;u64 val64;
@@ -3395,20 +3438,21 @@return 0 ; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* ethtest - pointer to a ethtool command specific structure that will be -* returned to the user. -* data - variable that returns the result of each of the test conducted by -* the driver. -* Return value: -* SUCCESS on success and an appropriate -1 on failure. +/** +* s2io_ethtool_test - conducts 6 tsets to determine the health of card. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @ethtest : pointer to a ethtool command specific structure that will be +* returned to the user. +* @data : variable that returns the result of each of the test +* conducted by the driver. * Description: * This function conducts 6 tests ( 4 offline and 2 online) to determine -* the health of the card. +* the health of the card. +* Return value: +* void */ +static void s2io_ethtool_test (struct net_device *dev,struct ethtool_test *ethtest,uint64_t * data)
@@ -3424,22 +3468,22 @@ }else s2io_set_swapper (sp); -if (s2io_registerTest (sp, &data[0 ])) +if (s2io_register_test (sp, &data[0 ])) ethtest->flags |=ETH_TEST_FL_FAILED ;s2io_reset (sp);s2io_set_swapper (sp); -if (s2io_rldramTest (sp, &data[3 ])) +if (s2io_rldram_test (sp, &data[3 ])) ethtest->flags |=ETH_TEST_FL_FAILED ;s2io_reset (sp);s2io_set_swapper (sp); -if (s2io_eepromTest (sp, &data[1 ])) +if (s2io_eeprom_test (sp, &data[1 ])) ethtest->flags |=ETH_TEST_FL_FAILED ; -if (s2io_bistTest (sp, &data[4 ])) +if (s2io_bist_test (sp, &data[4 ])) ethtest->flags |=ETH_TEST_FL_FAILED ;if (orig_state)
@@ -3459,7 +3503,7 @@ data[4 ] =-1 ; } -if (s2io_linkTest (sp, &data[2 ])) +if (s2io_link_test (sp, &data[2 ])) ethtest->flags |=ETH_TEST_FL_FAILED ; data[0 ] =0 ;
@@ -3475,7 +3519,7 @@ {int i =0 ;nic_t *sp = dev->priv; -StatInfo_t *stat_info = sp->mac_control.StatsInfo; +StatInfo_t *stat_info = sp->mac_control.stats_info; tmp_stats[i++] = stat_info->tmac_frms; tmp_stats[i++] = stat_info->tmac_data_octets;
@@ -3597,36 +3641,37 @@ .get_ethtool_stats = s2io_get_ethtool_stats }; -/* -* Input Argument/s: -* dev - Device pointer. -* ifr - An IOCTL specefic structure, that can contain a pointer to -* a proprietary structure used to pass information to the driver. -* cmd - This is used to distinguish between the different commands that -* can be passed to the IOCTL functions. -* Return value: -* '0' on success and an appropriate (-)ve integer as defined in errno.h -* file on failure. +/** +* s2io_ioctl - Entry point for the Ioctl +* @dev : Device pointer. +* @ifr : An IOCTL specefic structure, that can contain a pointer to +* a proprietary structure used to pass information to the driver. +* @cmd : This is used to distinguish between the different commands that +* can be passed to the IOCTL functions. * Description: * This function has support for ethtool, adding multiple MAC addresses on * the NIC and some DBG commands for the util tool. +* Return value: +* Currently the IOCTL supports no operations, hence by default this +* function returns OP NOT SUPPORTED value. */ +int s2io_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) {return -EOPNOTSUPP ; } -/* -* Input Argument/s: -* dev - device pointer. -* new_mtu - the new MTU size for the device. +/** +* s2io_change_mtu - entry point to change MTU size for the device. +* @dev : device pointer. +* @new_mtu : the new MTU size for the device. +* Description: A driver entry point to change MTU size for the device. +* Before changing the MTU the device must be stopped. * Return value: -* '0' on success and an appropriate (-)ve integer as defined in errno.h +* 0 on success and an appropriate (-)ve integer as defined in errno.h * file on failure. -* Description: -* A driver entry point to change MTU size for the device. Before changing -* the MTU the device must be stopped. */ +int s2io_change_mtu (struct net_device *dev,int new_mtu) {nic_t *sp = dev->priv;
@@ -3645,7 +3690,7 @@return -EPERM ; } -/* Set the new MTU into the PYLD register of the NIC */ +/* Set the new MTU into the PYLD register of the NIC */ val64 = new_mtu;writeq (vBIT (val64,2 ,14 ), &bar0->rmac_max_pyld_len);
@@ -3654,18 +3699,19 @@return 0 ; } -/* -* Input Argument/s: -* dev_adr - address of the device structure in dma_addr_t format. -* Return value: -* void. +/** +* s2io_tasklet - Bottom half of the ISR. +* @dev_adr : address of the device structure in dma_addr_t format. * Description: * This is the tasklet or the bottom half of the ISR. This is * an extension of the ISR which is scheduled by the scheduler to be run * when the load on the CPU is low. All low priority tasks of the ISR can * be pushed into the tasklet. For now the tasklet is used only to * replenish the Rx buffers in the Rx buffer descriptors. +* Return value: +* void. */ +static void s2io_tasklet (unsigned long dev_addr) {struct net_device *dev = (struct net_device *) dev_addr;
@@ -3678,29 +3724,30 @@ config = &sp->config;if (!TASKLET_IN_USE ) { -for (i =0 ; i < config->RxRingNum; i++) { +for (i =0 ; i < config->rx_ring_num; i++) { ret =fill_rx_buffers (sp, i);if (ret == -ENOMEM ) {DBG_PRINT (ERR_DBG ,"%s: Out of " , dev->name);DBG_PRINT (ERR_DBG ,"memory in tasklet\n" ); -return ; +break ; }else if (ret == -EFILL ) {DBG_PRINT (ERR_DBG ,"%s: Rx Ring %d is full\n" , dev->name, i); -return ; +break ; } }clear_bit (0 , (unsigned long *) (&sp->tasklet_status)); } } - -/* -* Description: -* +/** +* s2io_set_link - Set the LInk status +* @data: long pointer to device private structue +* Description: Sets the link status for the adapter */ +static void s2io_set_link (unsigned long data) {nic_t *nic = (nic_t *) data;
@@ -3708,7 +3755,8 @@XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; registeru64 val64, err_reg; -/* Allow a small delay for the NICs self initiated +/* +* Allow a small delay for the NICs self initiated * cleanup to complete. */ set_current_state (TASK_UNINTERRUPTIBLE );
@@ -3716,7 +3764,7 @@ val64 =readq (&bar0->adapter_status);if (verify_xena_quiescence (val64, nic->device_enabled_once)) { -/* Acknowledge interrupt and clear the R1 register */ +/* Acknowledge Intr and clear R1 register. */ err_reg =readq (&bar0->mac_rmac_err_reg);writeq (err_reg, &bar0->mac_rmac_err_reg);
@@ -3748,13 +3796,16 @@ } } -/* +/** +* s2io_restart_nic - Resets the NIC. +* @data : long pointer to the device private structure * Description: * This function is scheduled to be run by the s2io_tx_watchdog * function after 0.5 secs to reset the NIC. The idea is to reduce * the run time of the watch dog routine which is run holding a * spin lock. */ +static void s2io_restart_nic (unsigned long data) {struct net_device *dev = (struct net_device *) data;
@@ -3767,18 +3818,19 @@ "%s: was reset by Tx watchdog timer.\n", dev->name); } -/* -* Input Argument/s: -* dev - device pointer. -* Return value: -* void +/** +* s2io_tx_watchdog - Watchdog for transmit side. +* @dev : Pointer to net device structure * Description: * This function is triggered if the Tx Queue is stopped * for a pre-defined amount of time when the Interface is still up. * If the Interface is jammed in such a situation, the hardware is * reset (by s2io_close) and restarted again (by s2io_open) to * overcome any problem that might have been caused in the hardware. +* Return value: +* void */ +static void s2io_tx_watchdog (struct net_device *dev) {nic_t *sp = dev->priv;
@@ -3788,25 +3840,24 @@ } } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* skb - the socket buffer pointer. -* len - length of the packet -* cksum - FCS checksum of the frame. -* ring_no - the ring from which this RxD was extracted. -* Return value: -* SUCCESS on success and -1 on failure. -* Description: -* This function is called by the Tx interrupt serivce routine to perform +/** +* rx_osm_handler - To perform some OS related operations on SKB. +* @sp: private member of the device structure,pointer to s2io_nic structure. +* @skb : the socket buffer pointer. +* @len : length of the packet +* @cksum : FCS checksum of the frame. +* @ring_no : the ring from which this RxD was extracted. +* Description: +* This function is called by the Tx interrupt serivce routine to perform * some OS related operations on the SKB before passing it to the upper * layers. It mainly checks if the checksum is OK, if so adds it to the * SKBs cksum variable, increments the Rx packet count and passes the SKB * to the upper layer. If the checksum is wrong, it increments the Rx * packet error count, frees the SKB and returns error. +* Return value: +* SUCCESS on success and -1 on failure. */ -static int rxOsmHandler (nic_t * sp,u16 len,RxD_t * rxdp,int ring_no) +static int rx_osm_handler (nic_t * sp,u16 len,RxD_t * rxdp,int ring_no) {struct net_device *dev = (struct net_device *) sp->dev; struct sk_buff *skb =
@@ -3817,7 +3868,8 @@if ((rxdp->Control_1 &TCP_OR_UDP_FRAME ) && (sp->rx_csum)) { l4_csum =RXD_GET_L4_CKSUM (rxdp->Control_1);if ((l3_csum ==L3_CKSUM_OK ) && (l4_csum ==L4_CKSUM_OK )) { -/* NIC verifies if the Checksum of the received +/* +* NIC verifies if the Checksum of the received * frame is Ok or not and accordingly returns * a flag in the RxD. */
@@ -3844,25 +3896,21 @@#endif dev->last_rx = jiffies; -#if DEBUG_ON - sp->rxpkt_cnt++; -#endif sp->rx_pkt_count++; sp->stats.rx_packets++; sp->stats.rx_bytes += len; - sp->rxpkt_bytes += len;atomic_dec (&sp->rx_bufs_left[ring_no]); rxdp->Host_Control =0 ;return SUCCESS ; } -int check_for_txSpace (nic_t * sp) +int check_for_tx_space (nic_t * sp) {u32 put_off, get_off, queue_len;int ret = TRUE, i; -for (i =0 ; i < sp->config.TxFIFONum; i++) { +for (i =0 ; i < sp->config.tx_fifo_num; i++) { queue_len = sp->mac_control.tx_curr_put_info[i].fifo_len +1 ; put_off = sp->mac_control.tx_curr_put_info[i].offset;
@@ -3876,18 +3924,19 @@return ret; } -/* -* Input Argument/s: -* sp - private member of the device structure, which is a pointer to the -* s2io_nic structure. -* link - inidicates whether link is UP/DOWN. -* Return value: -* void. -* Description: -* This function stops/starts the Tx queue depending on whether the link -* status of the NIC is is down or up. This is called by the Alarm interrupt -* handler whenever a link change interrupt comes up. -*/ +/** +* s2io_link - stops/starts the Tx queue. +* @sp : private member of the device structure, which is a pointer to the +* s2io_nic structure. +* @link : inidicates whether link is UP/DOWN. +* Description: +* This function stops/starts the Tx queue depending on whether the link +* status of the NIC is is down or up. This is called by the Alarm +* interrupt handler whenever a link change interrupt comes up. +* Return value: +* void. +*/ +void s2io_link (nic_t * sp,int link) {
Lines of this file are not shown. View the raw message.
drivers/net/s2io.h +63 -127
190 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
OK, patches pass review, but now we have a technical problem.
I started to apply your patches, but only #1 and #2 applied successfully with the patch(1) tool. All the other patches generated rejections.
I have attached my tree, which is
2.6.8 + patch-2.6.9-rc2 + s2io-2.6.9-rc2.patch
s2io-2.6.9-rc2.patch is attached, which is what I have applied so far (your #1 and #2).
Can you please re-diff and re-send patches #3 - #12 ?
Everything else (patch content, email format, etc.) looked great.
Regards,
Jeff
Quoted 1 line · Jeff Garzik
Can you please re-diff and re-send patches #3 - #12 ?
BTW, when you re-send, don't forget to format your emails just like you did today -- including description, signed-off-by line, etc.
Thanks,
Jeff
Jeff,
Looks like while copy-pasting the patch from the server into the mail client, it got messed up.
After following a slightly different procedure of ftp from server, copy-paste from notepad, it seems to be fine.
Also, the earlier patch2 too seems to apply with some hunks. So, I will resend all the 12 patches with this new copy-paste method. Is this okay with you ?
Thanks,
Ravi
-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]
Sent: Thursday, October 28, 2004 11:48 AM
To: [email protected]
Cc: 'Francois Romieu'; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2.6.9-rc2 1/12] S2io: cosmetic changes
OK, patches pass review, but now we have a technical problem.
I started to apply your patches, but only #1 and #2 applied successfully with the patch(1) tool. All the other patches generated rejections.
I have attached my tree, which is
2.6.8 + patch-2.6.9-rc2 + s2io-2.6.9-rc2.patch
s2io-2.6.9-rc2.patch is attached, which is what I have applied so far (your #1 and #2).
Can you please re-diff and re-send patches #3 - #12 ?
Everything else (patch content, email format, etc.) looked great.
Regards,
Jeff