qlcnic: Multiple Tx queue support and code refactoring
Subsystems (3)
v2 cover qlcnic: Multiple Tx queue support and code refactoring
From: Himanshu Madhani <[email protected]>
This Patch series contains following changes
o Refactored code to calculate, validate and assign Tx/SDS rings for various modes of driver.
o Enhanced ethtool statistics for multi Tx queue on all supported adapters.
o Enable multiple Tx queue for 83xx and 84xx Series adapters.
o Register netdev for failed device state.
changes from v1 -> v2
o Dropped patch to replace inappropriate usage of kzalloc() with vzalloc().
Please apply to net-next.
Thanks,
Himanshu
Himanshu Madhani (4):
qlcnic: Enhance ethtool Statistics for Multiple Tx queue.
qlcnic: refactor Tx/SDS ring calculation and validation in driver.
qlcnic: Enable multiple Tx queue support for 83xx/84xx Series
adapters.
qlcnic: update version to 5.3.52
Sucheta Chakraborty (1):
qlcnic: Register netdev in FAILED state for 83xx/84xx
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 84 +++-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 105 +++--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 13 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 58 ++- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 20 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 216 ++++++++---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 8 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 65 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 389 +++++++++++---------- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 6 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 12 +- 12 files changed, 569 insertions(+), 409 deletions(-)
Signature · 1 line
1.8.1.4
PATCH v2 1/5 qlcnic: Register netdev in FAILED state for 83xx/84xx
From: Sucheta Chakraborty <[email protected]>
o Without failing probe, register netdev when device is in FAILED state.
o Device will come up with minimum functionality and allow diagnostics and repair of the adapter.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 1 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 32 ++++++++++++++----- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 16 ++++++---- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 37 +++++++++++++++++----- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 8 ++--- 6 files changed, 67 insertions(+), 33 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +1 -0
@@ -961,6 +961,7 @@ struct qlcnic_ipaddr {#define __QLCNIC_SRIOV_CAPABLE 11#define __QLCNIC_MBX_POLL_ENABLE 12#define __QLCNIC_DIAG_MODE 13 +#define __QLCNIC_MAINTENANCE_MODE 16#define QLCNIC_INTERRUPT_TEST 1#define QLCNIC_LOOPBACK_TEST 2
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +24 -8
@@ -325,7 +325,8 @@ inline void qlcnic_83xx_clear_legacy_intr_mask(struct qlcnic_adapter *adapter)inline void qlcnic_83xx_set_legacy_intr_mask (struct qlcnic_adapter *adapter) { -writel (1 , adapter->tgt_mask_reg); +if (adapter->tgt_mask_reg) +writel (1 , adapter->tgt_mask_reg); }/* Enable MSI-x and INT-x interrupts */
@@ -498,8 +499,11 @@ void qlcnic_83xx_free_mbx_intr(struct qlcnic_adapter *adapter) num_msix =0 ;msleep (20 ); -synchronize_irq (adapter->msix_entries[num_msix].vector); -free_irq (adapter->msix_entries[num_msix].vector, adapter); + +if (adapter->msix_entries) { +synchronize_irq (adapter->msix_entries[num_msix].vector); +free_irq (adapter->msix_entries[num_msix].vector, adapter); + } }int qlcnic_83xx_setup_mbx_intr (struct qlcnic_adapter *adapter)
@@ -760,6 +764,9 @@ int qlcnic_83xx_issue_cmd(struct qlcnic_adapter *adapter,int cmd_type, err, opcode;unsigned long timeout; +if (!mbx) +return -EIO ; + opcode =LSW (cmd->req.arg[0 ]); cmd_type = cmd->type; err = mbx->ops->enqueue_cmd (adapter, cmd, &timeout);
@@ -3049,11 +3056,14 @@ int qlcnic_83xx_get_settings(struct qlcnic_adapter *adapter,int status =0 ;struct qlcnic_hardware_context *ahw = adapter->ahw; -/* Get port configuration info */ - status =qlcnic_83xx_get_port_info (adapter); -/* Get Link Status related info */ - config =qlcnic_83xx_test_link (adapter); - ahw->module_type =QLC_83XX_SFP_MODULE_TYPE (config); +if (!test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state)) { +/* Get port configuration info */ + status =qlcnic_83xx_get_port_info (adapter); +/* Get Link Status related info */ + config =qlcnic_83xx_test_link (adapter); + ahw->module_type =QLC_83XX_SFP_MODULE_TYPE (config); + } +/* hard code until there is a way to get it from flash */ ahw->board_type =QLCNIC_BRDTYPE_83XX_10G ;
@@ -3530,6 +3540,9 @@ void qlcnic_83xx_reinit_mbx_work(struct qlcnic_mailbox *mbx)void qlcnic_83xx_free_mailbox (struct qlcnic_mailbox *mbx) { +if (!mbx) +return ; +destroy_workqueue (mbx->work_q);kfree (mbx); }
@@ -3650,6 +3663,9 @@ void qlcnic_83xx_detach_mailbox_work(struct qlcnic_adapter *adapter) {struct qlcnic_mailbox *mbx = adapter->ahw->mailbox; +if (!mbx) +return ; +clear_bit (QLC_83XX_MBX_READY , &mbx->status);complete (&mbx->completion);cancel_work_sync (&mbx->work);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +9 -7
@@ -2190,20 +2190,24 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)return err; } +if (qlcnic_83xx_read_flash_descriptor_table (adapter) || +qlcnic_83xx_read_flash_mfg_id (adapter)) { +dev_err (&adapter->pdev->dev,"Failed reading flash mfg id\n" ); + err = -ENOTRECOVERABLE ; + goto detach_mbx; + } + err =qlcnic_83xx_check_hw_status (adapter);if (err) goto detach_mbx; -if (!qlcnic_83xx_read_flash_descriptor_table (adapter)) -qlcnic_83xx_read_flash_mfg_id (adapter); - err =qlcnic_83xx_get_fw_info (adapter);if (err) goto detach_mbx; err =qlcnic_83xx_idc_init (adapter);if (err) - goto clear_fw_info; + goto detach_mbx; err =qlcnic_setup_intr (adapter,0 ,0 );if (err) {
@@ -2247,12 +2251,10 @@ disable_mbx_intr: disable_intr:qlcnic_teardown_intr (adapter); -clear_fw_info: -kfree (ahw->fw_info); - detach_mbx:qlcnic_83xx_detach_mailbox_work (adapter);qlcnic_83xx_free_mailbox (ahw->mailbox); + ahw->mailbox =NULL ; exit:return err; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +2 -4
@@ -1685,7 +1685,6 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;bool valid_mask = false;int i, ret =0 ; -u32 state;switch (val->flag) {case QLCNIC_FORCE_FW_DUMP_KEY :
@@ -1738,9 +1737,8 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)case QLCNIC_SET_QUIESCENT :case QLCNIC_RESET_QUIESCENT : - state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE ); -if (state ==QLCNIC_DEV_FAILED || (state ==QLCNIC_DEV_BADBAD )) -netdev_info (netdev,"Device in FAILED state\n" ); +if (test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state)) +netdev_info (netdev,"Device is in non-operational state\n" );break ;default :
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +29 -8
@@ -2305,10 +2305,23 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)qlcnic_83xx_check_vf (adapter, ent); adapter->portnum = adapter->ahw->pci_func; err =qlcnic_83xx_init (adapter, pci_using_dac); +if (err) { -dev_err (&pdev->dev,"%s: failed\n" , __func__); - goto err_out_free_hw; +switch (err) { +case -ENOTRECOVERABLE : +dev_err (&pdev->dev,"Adapter initialization failed due to a faulty hardware. Please reboot\n" ); +dev_err (&pdev->dev,"If reboot doesn't help, please replace the adapter with new one and return the faulty adapter for repair\n" ); + goto err_out_free_hw; +case -ENOMEM : +dev_err (&pdev->dev,"Adapter initialization failed. Please reboot\n" ); + goto err_out_free_hw; +default : +dev_err (&pdev->dev,"Adapter initialization failed. A reboot may be required to recover from this failure\n" ); +dev_err (&pdev->dev,"If reboot does not help to recover from this failure, try a flash update of the adapter\n" ); + goto err_out_maintenance_mode; + } } +if (qlcnic_sriov_vf_check (adapter))return 0 ; }else {
@@ -2410,8 +2423,16 @@ err_out_disable_pdev:return err; err_out_maintenance_mode: +set_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state); netdev->netdev_ops = &qlcnic_netdev_failed_ops;SET_ETHTOOL_OPS (netdev, &qlcnic_ethtool_failed_ops); + ahw->port_type =QLCNIC_XGBE ; + +if (qlcnic_83xx_check (adapter)) + adapter->tgt_status_reg =NULL ; +else + ahw->board_type =QLCNIC_BRDTYPE_P3P_10G_SFP_PLUS ; + err =register_netdev (netdev);if (err) {
@@ -2533,12 +2554,11 @@ static int qlcnic_resume(struct pci_dev *pdev)static int qlcnic_open (struct net_device *netdev) {struct qlcnic_adapter *adapter =netdev_priv (netdev); -u32 state;int err; - state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE ); -if (state ==QLCNIC_DEV_FAILED || state ==QLCNIC_DEV_BADBAD ) { -netdev_err (netdev,"%s: Device is in FAILED state\n" , __func__); +if (test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state)) { +netdev_err (netdev,"%s: Device is in non-operational state\n" , + __func__);return -EIO ; }
@@ -3251,8 +3271,9 @@ void qlcnic_82xx_dev_request_reset(struct qlcnic_adapter *adapter, u32 key)return ; state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE ); -if (state ==QLCNIC_DEV_FAILED || state ==QLCNIC_DEV_BADBAD ) { -netdev_err (adapter->netdev,"%s: Device is in FAILED state\n" , + +if (test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state)) { +netdev_err (adapter->netdev,"%s: Device is in non-operational state\n" , __func__);qlcnic_api_unlock (adapter);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +2 -6
@@ -1272,7 +1272,6 @@ void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter)void qlcnic_create_diag_entries (struct qlcnic_adapter *adapter) {struct device *dev = &adapter->pdev->dev; -u32 state;if (device_create_bin_file (dev, &bin_attr_port_stats))dev_info (dev,"failed to create port stats sysfs entry" );
@@ -1286,8 +1285,7 @@ void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)if (device_create_bin_file (dev, &bin_attr_mem))dev_info (dev,"failed to create mem sysfs entry\n" ); - state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE ); -if (state ==QLCNIC_DEV_FAILED || state ==QLCNIC_DEV_BADBAD ) +if (test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state))return ;if (device_create_bin_file (dev, &bin_attr_pci_config))
@@ -1313,7 +1311,6 @@ void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)void qlcnic_remove_diag_entries (struct qlcnic_adapter *adapter) {struct device *dev = &adapter->pdev->dev; -u32 state;device_remove_bin_file (dev, &bin_attr_port_stats);
@@ -1323,8 +1320,7 @@ void qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter)device_remove_bin_file (dev, &bin_attr_crb);device_remove_bin_file (dev, &bin_attr_mem); - state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE ); -if (state ==QLCNIC_DEV_FAILED || state ==QLCNIC_DEV_BADBAD ) +if (test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state))return ;device_remove_bin_file (dev, &bin_attr_pci_config);
Signature · 1 line
1.8.1.4
PATCH v2 2/5 qlcnic: Enhance ethtool Statistics for Multiple Tx queue.
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
o Enhance ethtool statistics to display multiple Tx queue stats for all supported adapters.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 13 ++- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 96 +++++++++++++++------- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 14 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 33 ++++---- 4 files changed, 94 insertions(+), 62 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +9 -4
@@ -533,6 +533,14 @@ struct qlcnic_host_sds_ring {char name[IFNAMSIZ +12 ]; }____cacheline_internodealigned_in_smp ; +struct qlcnic_tx_queue_stats { +u64 xmit_on; +u64 xmit_off; +u64 xmit_called; +u64 xmit_finished; +u64 tx_bytes; +}; +struct qlcnic_host_tx_ring {int irq;void __iomem *crb_intr_mask;
@@ -544,10 +552,7 @@ struct qlcnic_host_tx_ring {u32 sw_consumer;u32 num_desc; -u64 xmit_on; -u64 xmit_off; -u64 xmit_called; -u64 xmit_finished; +struct qlcnic_tx_queue_stats tx_stats;void __iomem *crb_cmd_producer;struct cmd_desc_type0 *desc_head;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +65 -31
163 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +5 -9
@@ -607,8 +607,7 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)if (qlcnic_tx_avail (tx_ring) >TX_STOP_THRESH ) {netif_tx_start_queue (tx_ring->txq); }else { - adapter->stats.xmit_off++; - tx_ring->xmit_off++; + tx_ring->tx_stats.xmit_off++;return NETDEV_TX_BUSY ; } }
@@ -669,9 +668,8 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)if (adapter->drv_mac_learn)qlcnic_send_filter (adapter, first_desc, skb); - adapter->stats.txbytes += skb->len; - adapter->stats.xmitcalled++; - tx_ring->xmit_called++; + tx_ring->tx_stats.tx_bytes += skb->len; + tx_ring->tx_stats.xmit_called++;qlcnic_update_cmd_producer (tx_ring);
@@ -805,8 +803,7 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter, PCI_DMA_TODEVICE); frag->dma =0ULL ; } - adapter->stats.xmitfinished++; - tx_ring->xmit_finished++; + tx_ring->tx_stats.xmit_finished++;dev_kfree_skb_any (buffer->skb); buffer->skb =NULL ; }
@@ -823,8 +820,7 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter, netif_carrier_ok(netdev)) {if (qlcnic_tx_avail (tx_ring) >TX_STOP_THRESH ) {netif_tx_wake_queue (tx_ring->txq); - adapter->stats.xmit_on++; - tx_ring->xmit_on++; + tx_ring->tx_stats.xmit_on++; } } adapter->tx_timeo_cnt =0 ;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +15 -18
@@ -2720,24 +2720,21 @@ static void qlcnic_tx_timeout(struct net_device *netdev) QLCNIC_FORCE_FW_DUMP_KEY); }else {netdev_info (netdev,"Tx timeout, reset adapter context.\n" ); -if (qlcnic_82xx_check (adapter)) { -for (ring =0 ; ring < adapter->max_drv_tx_rings; - ring++) { - tx_ring = &adapter->tx_ring[ring]; -dev_info (&netdev->dev,"ring=%d\n" , ring); -dev_info (&netdev->dev,"crb_intr_mask=%d\n" , -readl (tx_ring->crb_intr_mask)); -dev_info (&netdev->dev,"producer=%d\n" , -readl (tx_ring->crb_cmd_producer)); -dev_info (&netdev->dev,"sw_consumer = %d\n" , - tx_ring->sw_consumer); -dev_info (&netdev->dev,"hw_consumer = %d\n" , -le32_to_cpu (*(tx_ring->hw_consumer))); -dev_info (&netdev->dev,"xmit-on=%llu\n" , - tx_ring->xmit_on); -dev_info (&netdev->dev,"xmit-off=%llu\n" , - tx_ring->xmit_off); - } +for (ring =0 ; ring < adapter->max_drv_tx_rings; ring++) { + tx_ring = &adapter->tx_ring[ring]; +netdev_info (netdev,"Tx ring=%d\n" , ring); +netdev_info (netdev, +"crb_intr_mask=%d, producer=%d, sw_consumer=%d, hw_consumer=%d\n" , +readl (tx_ring->crb_intr_mask), +readl (tx_ring->crb_cmd_producer), + tx_ring->sw_consumer, +le32_to_cpu (*(tx_ring->hw_consumer))); +netdev_info (netdev, +"xmit_finished=%llu, xmit_called=%llu, xmit_on=%llu, xmit_off=%llu\n" , + tx_ring->tx_stats.xmit_finished, + tx_ring->tx_stats.xmit_called, + tx_ring->tx_stats.xmit_on, + tx_ring->tx_stats.xmit_off); } adapter->ahw->reset_context =1 ; }
Signature · 1 line
1.8.1.4
PATCH v2 3/5 qlcnic: refactor Tx/SDS ring calculation and validation in driver.
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
o Current driver has duplicate code for validating user input for changing Tx/SDS rings using set_channel ethtool interface. This patch removes duplicate code and refactored Tx/SDS ring validation for 82xx/83xx/84xx series adapter.
o Refactored code now calculates maximum Tx/Rx ring driver can support based on Default, NPAR and SRIOV PF/VF mode of driver.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 66 +++-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 69 +++-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 13 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 38 ++- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 20 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 116 +++++--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 8 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 46 +-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 327 ++++++++++----------- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 6 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 4 +- 12 files changed, 404 insertions(+), 311 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +41 -25
@@ -98,8 +98,22 @@#define TX_STOP_THRESH ((MAX_SKB_FRAGS >> 2) + MAX_TSO_HEADER_DESC \ + MGMT_CMD_DESC_RESV)#define QLCNIC_MAX_TX_TIMEOUTS 2 -#define QLCNIC_MAX_TX_RINGS 8 -#define QLCNIC_MAX_SDS_RINGS 8 + +/* Driver will use 1 Tx ring in INT-x/MSI/SRIOV mode. */ +#define QLCNIC_SINGLE_RING 1 +#define QLCNIC_DEF_SDS_RINGS 4 +#define QLCNIC_DEF_TX_RINGS 4 +#define QLCNIC_MAX_VNIC_TX_RINGS 4 +#define QLCNIC_MAX_VNIC_SDS_RINGS 4 + +enum qlcnic_queue_type { +QLCNIC_TX_QUEUE =1 , +QLCNIC_RX_QUEUE , +}; + +/* Operational mode for driver */ +#define QLCNIC_VNIC_MODE 0xFF +#define QLCNIC_DEFAULT_MODE 0x0/* * Following are the states of the Phantom. Phantom will set them and
@@ -945,8 +959,6 @@ struct qlcnic_ipaddr {#define QLCNIC_BEACON_EANBLE 0xC#define QLCNIC_BEACON_DISABLE 0xD -#define QLCNIC_DEF_NUM_STS_DESC_RINGS 4 -#define QLCNIC_DEF_NUM_TX_RINGS 4#define QLCNIC_MSIX_TBL_SPACE 8192#define QLCNIC_PCI_REG_MSIX_TBL 0x44#define QLCNIC_MSIX_TBL_PGSIZE 4096
@@ -1017,7 +1029,6 @@ struct qlcnic_adapter {unsigned long state;u32 flags; -int max_drv_tx_rings;u16 num_txd;u16 num_rxd;u16 num_jumbo_rxd;
@@ -1025,7 +1036,13 @@ struct qlcnic_adapter {u16 max_jumbo_rxd;u8 max_rds_rings; -u8 max_sds_rings; + +u8 max_sds_rings;/* max sds rings supported by adapter */ +u8 max_tx_rings;/* max tx rings supported by adapter */ + +u8 drv_tx_rings;/* max tx rings supported by driver */ +u8 drv_sds_rings;/* max sds rings supported by driver */ +u8 rx_csum;u8 portnum;
@@ -1548,12 +1565,13 @@ int qlcnic_loopback_test(struct net_device *, u8);/* Functions from qlcnic_main.c */ int qlcnic_reset_context (struct qlcnic_adapter *); -void qlcnic_diag_free_res (struct net_device *netdev,int max_sds_rings); -int qlcnic_diag_alloc_res (struct net_device *netdev,int test); -netdev_tx_t qlcnic_xmit_frame (struct sk_buff *skb,struct net_device *netdev); -int qlcnic_set_max_rss (struct qlcnic_adapter *,u8 ,int ); -int qlcnic_validate_max_rss (struct qlcnic_adapter *,__u32 ); -int qlcnic_validate_max_tx_rings (struct qlcnic_adapter *,u32 txq); +void qlcnic_diag_free_res (struct net_device *netdev,int ); +int qlcnic_diag_alloc_res (struct net_device *netdev,int ); +netdev_tx_t qlcnic_xmit_frame (struct sk_buff *,struct net_device *); +void qlcnic_set_tx_ring_count (struct qlcnic_adapter *,u8 ); +void qlcnic_set_sds_ring_count (struct qlcnic_adapter *,u8 ); +int qlcnic_setup_rings (struct qlcnic_adapter *,u8 ,u8 ); +int qlcnic_validate_rings (struct qlcnic_adapter *,__u32 ,int );void qlcnic_alloc_lb_filters_mem (struct qlcnic_adapter *adapter);void qlcnic_82xx_set_mac_filter_count (struct qlcnic_adapter *);int qlcnic_enable_msix (struct qlcnic_adapter *,u32 );
@@ -1646,19 +1664,18 @@ static inline u32 qlcnic_tx_avail(struct qlcnic_host_tx_ring *tx_ring)static inline int qlcnic_set_real_num_queues (struct qlcnic_adapter *adapter,struct net_device *netdev) { -int err, tx_q; - - tx_q = adapter->max_drv_tx_rings; +int err; - netdev->num_tx_queues = tx_q; - netdev->real_num_tx_queues = tx_q; + netdev->num_tx_queues = adapter->drv_tx_rings; + netdev->real_num_tx_queues = adapter->drv_tx_rings; - err =netif_set_real_num_tx_queues (netdev, tx_q); + err =netif_set_real_num_tx_queues (netdev, adapter->drv_tx_rings);if (err)dev_err (&adapter->pdev->dev,"failed to set %d Tx queues\n" , - tx_q); + adapter->drv_tx_rings);else -dev_info (&adapter->pdev->dev,"set %d Tx queues\n" , tx_q); +dev_info (&adapter->pdev->dev,"Set %d Tx queues\n" , + adapter->drv_tx_rings);return err; }
@@ -1700,7 +1717,7 @@ struct qlcnic_hardware_ops {int (*write_reg) (struct qlcnic_adapter *,ulong ,u32 );void (*get_ocm_win) (struct qlcnic_hardware_context *);int (*get_mac_address) (struct qlcnic_adapter *,u8 *,u8 ); -int (*setup_intr) (struct qlcnic_adapter *,u8 ,int ); +int (*setup_intr) (struct qlcnic_adapter *);int (*alloc_mbx_args)(struct qlcnic_cmd_args *,struct qlcnic_adapter *,u32 );int (*mbx_cmd) (struct qlcnic_adapter *,struct qlcnic_cmd_args *);
@@ -1771,10 +1788,9 @@ static inline int qlcnic_get_mac_address(struct qlcnic_adapter *adapter,return adapter->ahw->hw_ops->get_mac_address (adapter, mac, function); } -static inline int qlcnic_setup_intr (struct qlcnic_adapter *adapter, -u8 num_intr,int txq) +static inline int qlcnic_setup_intr (struct qlcnic_adapter *adapter) { -return adapter->ahw->hw_ops->setup_intr (adapter, num_intr, txq); +return adapter->ahw->hw_ops->setup_intr (adapter); } static inline int qlcnic_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
@@ -2010,7 +2026,7 @@ static inline bool qlcnic_check_multi_tx(struct qlcnic_adapter *adapter)static inline void qlcnic_disable_multi_tx (struct qlcnic_adapter *adapter) {test_and_clear_bit (__QLCNIC_MULTI_TX_UNIQUE, &adapter->state); - adapter->max_drv_tx_rings =1 ; + adapter->drv_tx_rings =QLCNIC_SINGLE_RING ; }/* When operating in a muti tx mode, driver needs to write 0x1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +34 -35
229 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +5 -8
@@ -61,7 +61,6 @@#define QLC_83XX_HOST_SDS_MBX_IDX 8#define QLCNIC_HOST_RDS_MBX_IDX 88 -#define QLCNIC_MAX_RING_SETS 8/* Pause control registers */ #define QLC_83XX_SRE_SHIM_REG 0x0D200284
@@ -183,8 +182,8 @@ struct qlcnic_rcv_mbx_out {u8 num_pci_func;u8 state;#endif -u32 host_csmr[QLCNIC_MAX_RING_SETS ]; -struct __host_producer_mbx host_prod[QLCNIC_MAX_RING_SETS ]; +u32 host_csmr[QLCNIC_MAX_SDS_RINGS ]; +struct __host_producer_mbx host_prod[QLCNIC_MAX_SDS_RINGS ]; } __packed;struct qlcnic_add_rings_mbx_out {
@@ -197,8 +196,8 @@ struct qlcnic_add_rings_mbx_out {u8 sts_num;u8 rcv_num;#endif -u32 host_csmr[QLCNIC_MAX_RING_SETS ]; -struct __host_producer_mbx host_prod[QLCNIC_MAX_RING_SETS ]; +u32 host_csmr[QLCNIC_MAX_SDS_RINGS ]; +struct __host_producer_mbx host_prod[QLCNIC_MAX_SDS_RINGS ]; } __packed;/* Transmit context mailbox inbox registers
@@ -415,8 +414,6 @@ enum qlcnic_83xx_states {#define QLC_83XX_GET_VLAN_ALIGN_CAPABILITY (val) (val & 0x4000)#define QLC_83XX_GET_FW_LRO_MSS_CAPABILITY (val) (val & 0x20000)#define QLC_83XX_ESWITCH_CAPABILITY BIT_23 -#define QLC_83XX_VIRTUAL_NIC_MODE 0xFF -#define QLC_83XX_DEFAULT_MODE 0x0#define QLC_83XX_SRIOV_MODE 0x1#define QLCNIC_BRDTYPE_83XX_10G 0x0083
@@ -524,7 +521,7 @@ enum qlc_83xx_ext_regs {/* 83xx funcitons */ int qlcnic_83xx_get_fw_version (struct qlcnic_adapter *);int qlcnic_83xx_issue_cmd (struct qlcnic_adapter *,struct qlcnic_cmd_args *); -int qlcnic_83xx_setup_intr (struct qlcnic_adapter *,u8 ,int ); +int qlcnic_83xx_setup_intr (struct qlcnic_adapter *);void qlcnic_83xx_get_func_no (struct qlcnic_adapter *);int qlcnic_83xx_cam_lock (struct qlcnic_adapter *);void qlcnic_83xx_cam_unlock (struct qlcnic_adapter *);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +31 -7
@@ -902,7 +902,7 @@ static int qlcnic_83xx_idc_need_reset_state(struct qlcnic_adapter *adapter)qlcnic_83xx_idc_update_audit_reg (adapter,0 ,1 );set_bit (__QLCNIC_RESETTING, &adapter->state);clear_bit (QLC_83XX_MBX_READY , &mbx->status); -if (adapter->ahw->nic_mode ==QLC_83XX_VIRTUAL_NIC_MODE ) +if (adapter->ahw->nic_mode ==QLCNIC_VNIC_MODE )qlcnic_83xx_disable_vnic_mode (adapter,1 );if (qlcnic_check_diag_status (adapter)) {
@@ -2033,6 +2033,8 @@ int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter) ahw->max_mac_filters = nic_info.max_mac_filters; ahw->max_mtu = nic_info.max_mtu; + adapter->max_tx_rings = ahw->max_tx_ques; + adapter->max_sds_rings = ahw->max_rx_ques;/* eSwitch capability indicates vNIC mode. * vNIC and SRIOV are mutually exclusive operational modes. * If SR-IOV capability is detected, SR-IOV physical function
@@ -2045,7 +2047,7 @@ int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)return QLC_83XX_DEFAULT_OPMODE ;if (ahw->capabilities &QLC_83XX_ESWITCH_CAPABILITY ) -return QLC_83XX_VIRTUAL_NIC_MODE ; +return QLCNIC_VNIC_MODE ;return QLC_83XX_DEFAULT_OPMODE ; }
@@ -2059,15 +2061,20 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)if (ret == -EIO )return -EIO ; -if (ret ==QLC_83XX_VIRTUAL_NIC_MODE ) { - ahw->nic_mode =QLC_83XX_VIRTUAL_NIC_MODE ; +if (ret ==QLCNIC_VNIC_MODE ) { + ahw->nic_mode =QLCNIC_VNIC_MODE ; +if (qlcnic_83xx_config_vnic_opmode (adapter))return -EIO ; + adapter->max_sds_rings =QLCNIC_MAX_VNIC_SDS_RINGS ; + adapter->max_tx_rings =QLCNIC_SINGLE_RING ; }else if (ret ==QLC_83XX_DEFAULT_OPMODE ) { - ahw->nic_mode =QLC_83XX_DEFAULT_MODE ; + ahw->nic_mode =QLCNIC_DEFAULT_MODE ; adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver; ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry; + adapter->max_sds_rings = ahw->max_rx_ques; + adapter->max_tx_rings =QLCNIC_SINGLE_RING ; }else {return -EIO ; }
@@ -2170,6 +2177,19 @@ static int qlcnic_83xx_get_fw_info(struct qlcnic_adapter *adapter)return err; } +static void qlcnic_83xx_init_rings (struct qlcnic_adapter *adapter) +{ + adapter->max_tx_rings =QLCNIC_MAX_TX_RINGS ; + adapter->max_sds_rings =QLCNIC_MAX_SDS_RINGS ; + +qlcnic_set_tx_ring_count (adapter,QLCNIC_SINGLE_RING ); + +/* compute and set drv sds rings */ +if (adapter->ahw->msix_supported) +qlcnic_set_sds_ring_count (adapter,QLCNIC_DEF_SDS_RINGS ); +else +qlcnic_set_sds_ring_count (adapter,QLCNIC_SINGLE_RING ); +}int qlcnic_83xx_init (struct qlcnic_adapter *adapter,int pci_using_dac) {
@@ -2178,6 +2198,9 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)int err =0 ; ahw->msix_supported = !!qlcnic_use_msi_x; + +qlcnic_83xx_init_rings (adapter); + err =qlcnic_83xx_init_mailbox_work (adapter);if (err) goto exit;
@@ -2209,7 +2232,7 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)if (err) goto detach_mbx; - err =qlcnic_setup_intr (adapter,0 ,0 ); + err =qlcnic_setup_intr (adapter);if (err) {dev_err (&adapter->pdev->dev,"Failed to setup interrupt\n" ); goto disable_intr;
@@ -2231,6 +2254,7 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)if (err) goto disable_mbx_intr; +/* Perform operating mode specific initialization */ err = adapter->nic_ops->init_driver (adapter);if (err)
@@ -2267,7 +2291,7 @@ void qlcnic_83xx_aer_stop_poll_work(struct qlcnic_adapter *adapter)clear_bit (QLC_83XX_MBX_READY , &idc->status);cancel_delayed_work_sync (&adapter->fw_work); -if (ahw->nic_mode ==QLC_83XX_VIRTUAL_NIC_MODE ) +if (ahw->nic_mode ==QLCNIC_VNIC_MODE )qlcnic_83xx_disable_vnic_mode (adapter,1 );qlcnic_83xx_idc_detach_driver (adapter);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +11 -9
@@ -270,7 +270,7 @@ int qlcnic_82xx_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)int err; nrds_rings = adapter->max_rds_rings; - nsds_rings = adapter->max_sds_rings; + nsds_rings = adapter->drv_sds_rings; rq_size = SIZEOF_HOSTRQ_RX(struct qlcnic_hostrq_rx_ctx, nrds_rings, nsds_rings);
@@ -475,7 +475,7 @@ int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,if (qlcnic_check_multi_tx (adapter) && !adapter->ahw->diag_test) { - temp_nsds_rings = adapter->max_sds_rings; + temp_nsds_rings = adapter->drv_sds_rings; index = temp_nsds_rings + ring; msix_id = ahw->intr_tbl[index].id; prq->msi_index =cpu_to_le16 (msix_id);
@@ -512,7 +512,7 @@ int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,if (qlcnic_check_multi_tx (adapter) && !adapter->ahw->diag_test && (adapter->flags &QLCNIC_MSIX_ENABLED )) { - index = adapter->max_sds_rings + ring; + index = adapter->drv_sds_rings + ring; intr_mask = ahw->intr_tbl[index].src; tx_ring->crb_intr_mask = ahw->pci_base0 + intr_mask; }
@@ -582,7 +582,7 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter) recv_ctx = adapter->recv_ctx; -for (ring =0 ; ring < adapter->max_drv_tx_rings; ring++) { +for (ring =0 ; ring < adapter->drv_tx_rings; ring++) { tx_ring = &adapter->tx_ring[ring]; ptr = (__le32 *)dma_alloc_coherent(&pdev->dev, sizeof(u32), &tx_ring->hw_cons_phys_addr,
@@ -616,7 +616,7 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter) } -for (ring =0 ; ring < adapter->max_sds_rings; ring++) { +for (ring =0 ; ring < adapter->drv_sds_rings; ring++) { sds_ring = &recv_ctx->sds_rings[ring]; addr = dma_alloc_coherent(&adapter->pdev->dev,
@@ -664,7 +664,7 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev)if (err) goto err_out; -for (ring =0 ; ring < dev->max_drv_tx_rings; ring++) { +for (ring =0 ; ring < dev->drv_tx_rings; ring++) { err =qlcnic_fw_cmd_create_tx_ctx (dev, &dev->tx_ring[ring], ring);
@@ -703,7 +703,7 @@ void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)if (test_and_clear_bit (__QLCNIC_FW_ATTACHED, &adapter->state)) {qlcnic_fw_cmd_del_rx_ctx (adapter); -for (ring =0 ; ring < adapter->max_drv_tx_rings; ring++) +for (ring =0 ; ring < adapter->drv_tx_rings; ring++)qlcnic_fw_cmd_del_tx_ctx (adapter, &adapter->tx_ring[ring]);
@@ -733,7 +733,7 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter) recv_ctx = adapter->recv_ctx; -for (ring =0 ; ring < adapter->max_drv_tx_rings; ring++) { +for (ring =0 ; ring < adapter->drv_tx_rings; ring++) { tx_ring = &adapter->tx_ring[ring];if (tx_ring->hw_consumer !=NULL ) { dma_free_coherent(&adapter->pdev->dev, sizeof(u32),
@@ -764,7 +764,7 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter) } } -for (ring =0 ; ring < adapter->max_sds_rings; ring++) { +for (ring =0 ; ring < adapter->drv_sds_rings; ring++) { sds_ring = &recv_ctx->sds_rings[ring];if (sds_ring->desc_head !=NULL ) {
@@ -895,6 +895,8 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter, npar_info->max_rx_ques =le16_to_cpu (nic_info->max_rx_ques); npar_info->capabilities =le32_to_cpu (nic_info->capabilities); npar_info->max_mtu =le16_to_cpu (nic_info->max_mtu); + adapter->max_tx_rings = npar_info->max_tx_ques; + adapter->max_sds_rings = npar_info->max_rx_ques; }qlcnic_free_mbx_args (&cmd);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +79 -37
224 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h +7 -1
@@ -146,6 +146,12 @@ struct qlcnic_mailbox_metadata {#define QLCNIC_MBX_PORT_RSP_OK 0x1a#define QLCNIC_MBX_ASYNC_EVENT BIT_15 +/* Set HW Tx ring limit for 82xx adapter. */ +#define QLCNIC_MAX_HW_TX_RINGS 8 +#define QLCNIC_MAX_HW_VNIC_TX_RINGS 4 +#define QLCNIC_MAX_TX_RINGS 8 +#define QLCNIC_MAX_SDS_RINGS 8 +struct qlcnic_pci_info ;struct qlcnic_info ;struct qlcnic_cmd_args ;
@@ -176,7 +182,7 @@ int qlcnic_82xx_set_lb_mode(struct qlcnic_adapter *, u8);void qlcnic_82xx_write_crb (struct qlcnic_adapter *,char *,loff_t ,size_t );void qlcnic_82xx_read_crb (struct qlcnic_adapter *,char *,loff_t ,size_t );void qlcnic_82xx_dev_request_reset (struct qlcnic_adapter *,u32 ); -int qlcnic_82xx_setup_intr (struct qlcnic_adapter *,u8 ,int ); +int qlcnic_82xx_setup_intr (struct qlcnic_adapter *);irqreturn_t qlcnic_82xx_clear_legacy_intr (struct qlcnic_adapter *);int qlcnic_82xx_issue_cmd (struct qlcnic_adapter *adapter,struct qlcnic_cmd_args *);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +1 -1
@@ -236,7 +236,7 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter)spin_lock_init (&rds_ring->lock); } -for (ring =0 ; ring < adapter->max_sds_rings; ring++) { +for (ring =0 ; ring < adapter->drv_sds_rings; ring++) { sds_ring = &recv_ctx->sds_rings[ring]; sds_ring->irq = adapter->msix_entries[ring].vector; sds_ring->adapter = adapter;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +25 -21
164 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +163 -164
601 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +5 -1
@@ -508,7 +508,11 @@ static int qlcnic_sriov_setup_vf(struct qlcnic_adapter *adapter,dev_warn (&adapter->pdev->dev,"Device does not support MSI interrupts\n" ); - err =qlcnic_setup_intr (adapter,1 ,0 ); +/* compute and set default and max tx/sds rings */ +qlcnic_set_tx_ring_count (adapter,QLCNIC_SINGLE_RING ); +qlcnic_set_sds_ring_count (adapter,QLCNIC_SINGLE_RING ); + + err =qlcnic_setup_intr (adapter);if (err) {dev_err (&adapter->pdev->dev,"Failed to setup interrupt\n" ); goto err_out_disable_msi;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +2 -2
@@ -156,7 +156,7 @@ static int qlcnic_82xx_store_beacon(struct qlcnic_adapter *adapter, const char *buf, size_t len) {struct qlcnic_hardware_context *ahw = adapter->ahw; -int err, max_sds_rings = adapter->max_sds_rings; +int err, drv_sds_rings = adapter->drv_sds_rings;u16 beacon;u8 h_beacon_state, b_state, b_rate;
@@ -211,7 +211,7 @@ static int qlcnic_82xx_store_beacon(struct qlcnic_adapter *adapter, }if (test_and_clear_bit (__QLCNIC_DIAG_RES_ALLOC, &adapter->state)) -qlcnic_diag_free_res (adapter->netdev, max_sds_rings); +qlcnic_diag_free_res (adapter->netdev, drv_sds_rings); out:if (!ahw->beacon_state)
Signature · 1 line
1.8.1.4
PATCH v2 4/5 qlcnic: Enable multiple Tx queue support for 83xx/84xx Series adapters.
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
o 83xx and 84xx firmware is capable of multiple Tx queues. This patch will enable multiple Tx queues for 83xx/84xx series adapters. Max number of Tx queues supported will be 8.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 ++++ drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 18 +++++++++++------- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 5 +---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 6 +----- 5 files changed, 18 insertions(+), 17 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +4 -0
@@ -1654,6 +1654,7 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode)struct qlcnic_adapter *adapter =netdev_priv (netdev);struct qlcnic_hardware_context *ahw = adapter->ahw;u8 drv_sds_rings = adapter->drv_sds_rings; +u8 drv_tx_rings = adapter->drv_tx_rings;int ret =0 , loop =0 ;if (ahw->op_mode ==QLCNIC_NON_PRIV_FUNC ) {
@@ -1718,6 +1719,7 @@ free_diag_res: fail_diag_alloc: adapter->drv_sds_rings = drv_sds_rings; + adapter->drv_tx_rings = drv_tx_rings;qlcnic_release_diag_lock (adapter);return ret; }
@@ -3303,6 +3305,7 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev)struct qlcnic_hardware_context *ahw = adapter->ahw;struct qlcnic_cmd_args cmd;u8 val, drv_sds_rings = adapter->drv_sds_rings; +u8 drv_tx_rings = adapter->drv_tx_rings;u32 data;u16 intrpt_id, id;int ret;
@@ -3359,6 +3362,7 @@ done: fail_diag_irq: adapter->drv_sds_rings = drv_sds_rings; + adapter->drv_tx_rings = drv_tx_rings;qlcnic_release_diag_lock (adapter);return ret; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +11 -7
@@ -2068,13 +2068,13 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)return -EIO ; adapter->max_sds_rings =QLCNIC_MAX_VNIC_SDS_RINGS ; - adapter->max_tx_rings =QLCNIC_SINGLE_RING ; + adapter->max_tx_rings =QLCNIC_MAX_VNIC_TX_RINGS ; }else if (ret ==QLC_83XX_DEFAULT_OPMODE ) { ahw->nic_mode =QLCNIC_DEFAULT_MODE ; adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver; ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry; adapter->max_sds_rings = ahw->max_rx_ques; - adapter->max_tx_rings =QLCNIC_SINGLE_RING ; + adapter->max_tx_rings = ahw->max_tx_ques; }else {return -EIO ; }
@@ -2179,16 +2179,20 @@ static int qlcnic_83xx_get_fw_info(struct qlcnic_adapter *adapter)static void qlcnic_83xx_init_rings (struct qlcnic_adapter *adapter) { +u8 rx_cnt =QLCNIC_DEF_SDS_RINGS ; +u8 tx_cnt =QLCNIC_DEF_TX_RINGS ; + adapter->max_tx_rings =QLCNIC_MAX_TX_RINGS ; adapter->max_sds_rings =QLCNIC_MAX_SDS_RINGS ; -qlcnic_set_tx_ring_count (adapter,QLCNIC_SINGLE_RING ); +if (!adapter->ahw->msix_supported) { + rx_cnt =QLCNIC_SINGLE_RING ; + tx_cnt =QLCNIC_SINGLE_RING ; + }/* compute and set drv sds rings */ -if (adapter->ahw->msix_supported) -qlcnic_set_sds_ring_count (adapter,QLCNIC_DEF_SDS_RINGS ); -else -qlcnic_set_sds_ring_count (adapter,QLCNIC_SINGLE_RING ); +qlcnic_set_tx_ring_count (adapter, tx_cnt); +qlcnic_set_sds_ring_count (adapter, rx_cnt); }int qlcnic_83xx_init (struct qlcnic_adapter *adapter,int pci_using_dac)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +1 -1
@@ -731,7 +731,7 @@ static int qlcnic_set_channels(struct net_device *dev, } } -if (qlcnic_82xx_check (adapter) && channel->tx_count) { +if (channel->tx_count) { err =qlcnic_validate_rings (adapter, channel->tx_count,QLCNIC_TX_QUEUE );if (err) {
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +1 -4
@@ -581,10 +581,7 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) goto drop_packet; } -if (qlcnic_check_multi_tx (adapter)) - tx_ring = &adapter->tx_ring[skb_get_queue_mapping (skb)]; -else - tx_ring = &adapter->tx_ring[0 ]; + tx_ring = &adapter->tx_ring[skb_get_queue_mapping (skb)]; num_txd = tx_ring->num_desc; frag_count =skb_shinfo (skb)->nr_frags +1 ;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 -5
@@ -3708,11 +3708,7 @@ int qlcnic_validate_rings(struct qlcnic_adapter *adapter, __u32 ring_cnt, cur_rings = adapter->drv_sds_rings;strcpy (buf,"SDS" ); }else if (queue_type ==QLCNIC_TX_QUEUE ) { -if (qlcnic_83xx_check (adapter)) - max_hw_rings =QLCNIC_SINGLE_RING ; -else - max_hw_rings = adapter->max_tx_rings; - + max_hw_rings = adapter->max_tx_rings; cur_rings = adapter->drv_tx_rings;strcpy (buf,"Tx" ); }
Signature · 1 line
1.8.1.4
PATCH v2 5/5 qlcnic: update version to 5.3.52
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +2 -2
@@ -38,8 +38,8 @@#define _QLCNIC_LINUX_MAJOR 5#define _QLCNIC_LINUX_MINOR 3 -#define _QLCNIC_LINUX_SUBVERSION 51 -#define QLCNIC_LINUX_VERSIONID "5.3.51" +#define _QLCNIC_LINUX_SUBVERSION 52 +#define QLCNIC_LINUX_VERSIONID "5.3.52"#define QLCNIC_DRV_IDC_VER 0x01#define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
Signature · 1 line
1.8.1.4
David Miller
maintainerFrom: Himanshu Madhani <[email protected]>
Date: Mon, 4 Nov 2013 13:31:28 -0500
Quoted 9 lines
From: Himanshu Madhani <[email protected]>
This Patch series contains following changes
o Refactored code to calculate, validate and assign Tx/SDS rings for various modes of driver.
o Enhanced ethtool statistics for multi Tx queue on all supported adapters.
o Enable multiple Tx queue for 83xx and 84xx Series adapters.
o Register netdev for failed device state.
Quoted 4 lines
changes from v1 -> v2
o Dropped patch to replace inappropriate usage ofkzalloc()withvzalloc().Please apply to net-next.
Series applied, thanks.