qlcnic: Bug fixes.
Subsystems (3)
v2 cover qlcnic: Bug fixes.
From: Himanshu Madhani <[email protected]>
This series contains bug fixes for mailbox handling and multi Tx queue support for all supported adapters.
changes from v1 -> v2
o updated patch to fix usage of netif_tx_{wake,stop} api during link change as per David Miller's suggestion.
o Dropped patch to use spinklock per tx queue for more work.
o Added reworked patch for memory allocation failures.
o Added patch to allow capturing of dump, when auto recovery is disabled in firmware.
o Added patches for mailbox interrupt handling and debugging data for mailbox failure.
Please apply to net.
Thanks,
Himanshu
Himanshu Madhani (4):
qlcnic: Fix usage of netif_tx_{wake,stop} api during link change.
qlcnic: Fix diagnostic test for all adapters.
qlcnic: Fix TSS/RSS ring validation logic.
qlcnic: Fix TSS/RSS validation for 83xx/84xx series adapter.
Manish Chopra (2):
qlcnic: Fix memory allocation
qlcnic: Allow firmware dump collection when auto firmware recovery is
disabled
Manish chopra (2):
qlcnic: Fix mailbox processing during diagnostic test
qlcnic: Dump mailbox registers when mailbox command times out.
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 47 +++++++--------- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 1 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 65 +++++++++++++--------- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 19 +++---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 10 +--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- 6 files changed, 73 insertions(+), 71 deletions(-)
Signature · 1 line
1.8.1.4
PATCH v2 1/8 qlcnic: Fix usage of netif_tx_{wake,stop} api during link change.
From: Himanshu Madhani <[email protected]>
o Driver was using netif_tx_{stop,wake}_all_queues() api during link change event. Remove these api calls to manage queue start/stop event, as core networking stack will manage this based on netif_carrier_{on,off} call. These API's were modified as part of commit id 012ec81223aa45d2b80aeafb77392fd1a19c7b10 ("qlcnic: Multi Tx queue support for 82xx Series adapter.")
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +2 -8
@@ -687,17 +687,11 @@ void qlcnic_advert_link_change(struct qlcnic_adapter *adapter, int linkup)if (adapter->ahw->linkup && !linkup) {netdev_info (netdev,"NIC Link is down\n" ); adapter->ahw->linkup =0 ; -if (netif_running (netdev)) { -netif_carrier_off (netdev); -netif_tx_stop_all_queues (netdev); - } +netif_carrier_off (netdev); }else if (!adapter->ahw->linkup && linkup) {netdev_info (netdev,"NIC Link is up\n" ); adapter->ahw->linkup =1 ; -if (netif_running (netdev)) { -netif_carrier_on (netdev); -netif_wake_queue (netdev); - } +netif_carrier_on (netdev); } }
Signature · 1 line
1.8.1.4
PATCH v2 2/8 qlcnic: Fix diagnostic test for all adapters.
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
o Driver should re-allocate all Tx queues after completing diagnostic tests. This regression was added by commit id c2c5e3a0681bb1945c0cb211a5f4baa22cb2cbb3 ("qlcnic: Enable diagnostic test for multiple Tx queues.")
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 ++ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +2 -0
@@ -948,6 +948,7 @@ static int qlcnic_irq_test(struct net_device *netdev)struct qlcnic_hardware_context *ahw = adapter->ahw;struct qlcnic_cmd_args cmd;int ret, drv_sds_rings = adapter->drv_sds_rings; +int drv_tx_rings = adapter->drv_tx_rings;if (qlcnic_83xx_check (adapter))return qlcnic_83xx_interrupt_test (netdev);
@@ -980,6 +981,7 @@ free_diag_res: clear_diag_irq: adapter->drv_sds_rings = drv_sds_rings; + adapter->drv_tx_rings = drv_tx_rings;clear_bit (__QLCNIC_RESETTING, &adapter->state);return ret;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0 -1
@@ -1940,7 +1940,6 @@ int qlcnic_diag_alloc_res(struct net_device *netdev, int test)qlcnic_detach (adapter); adapter->drv_sds_rings =QLCNIC_SINGLE_RING ; - adapter->drv_tx_rings =QLCNIC_SINGLE_RING ; adapter->ahw->diag_test = test; adapter->ahw->linkup =0 ;
Signature · 1 line
1.8.1.4
PATCH v2 3/8 qlcnic: Fix TSS/RSS ring validation logic.
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
o TSS/RSS ring validation does not take into account that either of these ring values can be 0. This patch fixes this validation and would fail set_channel operation if any of these ring value is 0. This regression was added as part of commit id 34e8c406fda5b5a9d2e126a92bab84cd28e3b5fa ("qlcnic: refactor Tx/SDS ring calculation and validation in driver.")
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +++++- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +2 -2
@@ -2073,8 +2073,8 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter) 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 = ahw->max_tx_ques; + adapter->max_sds_rings =QLCNIC_MAX_SDS_RINGS ; + adapter->max_tx_rings =QLCNIC_MAX_TX_RINGS ; }else {return -EIO ; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +5 -1
@@ -667,9 +667,13 @@ qlcnic_set_ringparam(struct net_device *dev,static int qlcnic_validate_ring_count (struct qlcnic_adapter *adapter,u8 rx_ring,u8 tx_ring) { +if (rx_ring ==0 || tx_ring ==0 ) +return -EINVAL ; +if (rx_ring !=0 ) {if (rx_ring > adapter->max_sds_rings) { -netdev_err (adapter->netdev,"Invalid ring count, SDS ring count %d should not be greater than max %d driver sds rings.\n" , +netdev_err (adapter->netdev, +"Invalid ring count, SDS ring count %d should not be greater than max %d driver sds rings.\n" , rx_ring, adapter->max_sds_rings);return -EINVAL ; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 -0
@@ -1178,6 +1178,7 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter) }else { adapter->ahw->nic_mode =QLCNIC_DEFAULT_MODE ; adapter->max_tx_rings =QLCNIC_MAX_HW_TX_RINGS ; + adapter->max_sds_rings =QLCNIC_MAX_SDS_RINGS ; adapter->flags &= ~QLCNIC_ESWITCH_ENABLED ; }
Signature · 1 line
1.8.1.4
PATCH v2 4/8 qlcnic: Fix TSS/RSS validation for 83xx/84xx series adapter.
In reply to Himanshu MadhaniFrom: Himanshu Madhani <[email protected]>
o Current code was not allowing the user to configure more than one Tx ring using ethtool for 83xx/84xx adapter. This regression was introduced by commit id 18afc102fdcb95d6c7d57f2967a06f2f8fe3ba4c ("qlcnic: Enable multiple Tx queue support for 83xx/84xx Series adapter.")
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +1 -10
@@ -680,21 +680,12 @@ static int qlcnic_validate_ring_count(struct qlcnic_adapter *adapter, }if (tx_ring !=0 ) { -if (qlcnic_82xx_check (adapter) && - (tx_ring > adapter->max_tx_rings)) { +if (tx_ring > adapter->max_tx_rings) {netdev_err (adapter->netdev,"Invalid ring count, Tx ring count %d should not be greater than max %d driver Tx rings.\n" , tx_ring, adapter->max_tx_rings);return -EINVAL ; } - -if (qlcnic_83xx_check (adapter) && - (tx_ring >QLCNIC_SINGLE_RING )) { -netdev_err (adapter->netdev, -"Invalid ring count, Tx ring count %d should not be greater than %d driver Tx rings.\n" , - tx_ring,QLCNIC_SINGLE_RING ); -return -EINVAL ; - } }return 0 ;
Signature · 1 line
1.8.1.4
PATCH v2 5/8 qlcnic: Fix memory allocation
In reply to Himanshu MadhaniFrom: Manish Chopra <[email protected]>
o Use vzalloc() instead of kzalloc() for allocation of bootloader size memory. kzalloc() may fail to allocate the size of bootloader
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +4 -4
@@ -1254,24 +1254,24 @@ static int qlcnic_83xx_copy_bootloader(struct qlcnic_adapter *adapter)if (size &0xF ) size = (size +16 ) & ~0xF ; - p_cache =kzalloc (size,GFP_KERNEL ); + p_cache =vzalloc (size);if (p_cache ==NULL )return -ENOMEM ; ret =qlcnic_83xx_lockless_flash_read32 (adapter, src, p_cache, size /sizeof (u32));if (ret) { -kfree (p_cache); +vfree (p_cache);return ret; }/* 16 byte write to MS memory */ ret =qlcnic_83xx_ms_mem_write128 (adapter, dest, (u32 *)p_cache, size /16 );if (ret) { -kfree (p_cache); +vfree (p_cache);return ret; } -kfree (p_cache); +vfree (p_cache);return ret; }
Signature · 1 line
1.8.1.4
PATCH v2 6/8 qlcnic: Allow firmware dump collection when auto firmware recovery is disabled
In reply to Himanshu MadhaniFrom: Manish Chopra <[email protected]>
o Allow driver to collect firmware dump, during a forced firmware dump operation, when auto firmware recovery is disabled. Also, during this operation, driver should not allow reset recovery to be performed.
--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 1 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 53 ++++++++++++++-------- 2 files changed, 35 insertions(+), 19 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +1 -0
@@ -662,4 +662,5 @@ pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *, pci_channel_state_t);pci_ers_result_t qlcnic_83xx_io_slot_reset (struct pci_dev *);void qlcnic_83xx_io_resume (struct pci_dev *); +void qlcnic_83xx_stop_hw (struct qlcnic_adapter *);#endif
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +34 -19
104 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH v2 7/8 qlcnic: Fix mailbox processing during diagnostic test
In reply to Himanshu MadhaniFrom: Manish chopra <[email protected]>
o Do not enable mailbox polling in case of legacy interrupt. Process mailbox AEN/response from the interrupt.
--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 32 ++++------------------ 1 file changed, 6 insertions(+), 26 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +6 -26
@@ -447,8 +447,9 @@ irqreturn_t qlcnic_83xx_intr(int irq, void *data)qlcnic_83xx_poll_process_aen (adapter); -if (ahw->diag_test ==QLCNIC_INTERRUPT_TEST ) { - ahw->diag_cnt++; +if (ahw->diag_test) { +if (ahw->diag_test ==QLCNIC_INTERRUPT_TEST ) + ahw->diag_cnt++;qlcnic_83xx_enable_legacy_msix_mbx_intr (adapter);return IRQ_HANDLED ; }
@@ -1345,11 +1346,6 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test, }if (adapter->ahw->diag_test ==QLCNIC_LOOPBACK_TEST ) { -/* disable and free mailbox interrupt */ -if (!(adapter->flags &QLCNIC_MSIX_ENABLED )) { -qlcnic_83xx_enable_mbx_poll (adapter); -qlcnic_83xx_free_mbx_intr (adapter); - } adapter->ahw->loopback_state =0 ; adapter->ahw->hw_ops->setup_link_event (adapter,1 ); }
@@ -1363,33 +1359,20 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev, {struct qlcnic_adapter *adapter =netdev_priv (netdev);struct qlcnic_host_sds_ring *sds_ring; -int ring, err; +int ring;clear_bit (__QLCNIC_DEV_UP, &adapter->state);if (adapter->ahw->diag_test ==QLCNIC_INTERRUPT_TEST ) {for (ring =0 ; ring < adapter->drv_sds_rings; ring++) { sds_ring = &adapter->recv_ctx->sds_rings[ring]; -qlcnic_83xx_disable_intr (adapter, sds_ring); -if (!(adapter->flags &QLCNIC_MSIX_ENABLED )) -qlcnic_83xx_enable_mbx_poll (adapter); +if (adapter->flags &QLCNIC_MSIX_ENABLED ) +qlcnic_83xx_disable_intr (adapter, sds_ring); } }qlcnic_fw_destroy_ctx (adapter);qlcnic_detach (adapter); -if (adapter->ahw->diag_test ==QLCNIC_LOOPBACK_TEST ) { -if (!(adapter->flags &QLCNIC_MSIX_ENABLED )) { - err =qlcnic_83xx_setup_mbx_intr (adapter); -qlcnic_83xx_disable_mbx_poll (adapter); -if (err) { -dev_err (&adapter->pdev->dev, -"%s: failed to setup mbx interrupt\n" , - __func__); - goto out; - } - } - } adapter->ahw->diag_test =0 ; adapter->drv_sds_rings = drv_sds_rings;
@@ -1399,9 +1382,6 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev,if (netif_running (netdev))__qlcnic_up (adapter, netdev); -if (adapter->ahw->diag_test ==QLCNIC_INTERRUPT_TEST && - !(adapter->flags &QLCNIC_MSIX_ENABLED )) -qlcnic_83xx_disable_mbx_poll (adapter); out:netif_device_attach (netdev); }
Signature · 1 line
1.8.1.4
PATCH v2 8/8 qlcnic: Dump mailbox registers when mailbox command times out.
In reply to Himanshu MadhaniFrom: Manish chopra <[email protected]>
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +15 -0
@@ -3734,6 +3734,19 @@ static void qlcnic_83xx_decode_mbx_rsp(struct qlcnic_adapter *adapter,return ; } +static inline void qlcnic_dump_mailbox_registers (struct qlcnic_adapter *adapter) +{ +struct qlcnic_hardware_context *ahw = adapter->ahw; +u32 offset; + + offset =QLCRDX (ahw,QLCNIC_DEF_INT_MASK ); +dev_info (&adapter->pdev->dev,"Mbx interrupt mask=0x%x, Mbx interrupt enable=0x%x, Host mbx control=0x%x, Fw mbx control=0x%x" , +readl (ahw->pci_base0 + offset), +QLCRDX (ahw,QLCNIC_MBX_INTR_ENBL ), +QLCRDX (ahw,QLCNIC_HOST_MBX_CTRL ), +QLCRDX (ahw,QLCNIC_FW_MBX_CTRL )); +} +static void qlcnic_83xx_mailbox_worker (struct work_struct *work) { struct qlcnic_mailbox *mbx = container_of(work, struct qlcnic_mailbox,
@@ -3778,6 +3791,8 @@ static void qlcnic_83xx_mailbox_worker(struct work_struct *work) __func__, cmd->cmd_op, cmd->type, ahw->pci_func, ahw->op_mode);clear_bit (QLC_83XX_MBX_READY , &mbx->status); +qlcnic_dump_mailbox_registers (adapter); +qlcnic_83xx_get_mbx_data (adapter, cmd);qlcnic_dump_mbx (adapter, cmd);qlcnic_83xx_idc_request_reset (adapter,QLCNIC_FORCE_FW_DUMP_KEY );
Signature · 1 line
1.8.1.4
David Miller
maintainerFrom: Himanshu Madhani <[email protected]>
Date: Mon, 16 Dec 2013 15:36:55 -0500
Quoted 11 lines
This series contains bug fixes for mailbox handling and multi Tx queue support for all supported adapters.
changes from v1 -> v2
o updated patch to fix usage of netif_tx_{wake,stop} api during link change as per David Miller's suggestion.
o Dropped patch to use spinklock per tx queue for more work.
o Added reworked patch for memory allocation failures.
o Added patch to allow capturing of dump, when auto recovery is disabled in firmware.
o Added patches for mailbox interrupt handling and debugging data for mailbox failure.
Quoted 1 line
Please apply to net.
Series applied, thank you.