qlcnic: ethtool enhancements and code cleanup.
Subsystems (3)
v4 cover qlcnic: ethtool enhancements and code cleanup.
From: Himanshu Madhani <[email protected]>
This patch series contains
o updates to ethtool for pause settings and enhance register dump to display mask and ring indices.
o cleanup in DCB code and remove redundant eSwitch enablement command.
o fixed firmware dump collection logic to skip unknown entries.
Changes from v3 -> v4
o Dropped patch for Tx queue validation to be submitted in net.
Changes from v2 -> v3
o Updated patch to print informational messages as per Joe Perches's comment.
Changes from v1 -> v2
o Dropped patch to register device if adapter is in FAILED state for more rework.
o Updated patch to display ring indices via ethtool per Ben Hutchings's comment.
o Update patch for DCB cleanup per Stephen Hemminger's comment.
Please apply to net-next.
Thanks,
Himanshu
Himanshu Madhani (1):
qlcnic: update version to 5.3.51
Jitendra Kalsaria (1):
qlcnic: Update ethtool standard pause settings.
Pratik Pujar (2):
qlcnic: Enhance ethtool to display ring indices and interrupt mask
qlcnic: Firmware dump collection when auto recovery is disabled.
Shahed Shaikh (1):
qlcnic: Skip unknown entry type while collecting firmware dump
Sony Chacko (1):
qlcnic: Remove redundant eSwitch enable commands
Sucheta Chakraborty (2):
qlcnic: Print informational messages only once during driver load.
qlcnic: dcb code cleanup and refactoring.
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 101 +---------- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 40 ++--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 20 ++- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 47 +++--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 184 ++++++++++----------- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 109 ++++++++++-- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 54 ++++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 45 +++-- .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 41 +++-- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 9 +- 12 files changed, 341 insertions(+), 316 deletions(-)
Signature · 1 line
1.8.1.4
PATCH v4 1/8 qlcnic: Print informational messages only once during driver load.
From: Sucheta Chakraborty <[email protected]>
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 1 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 12 ----------- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 24 ++++++++++++++++++---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + 4 files changed, 22 insertions(+), 16 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +1 -0
@@ -1199,6 +1199,7 @@ struct qlcnic_npar_info {u8 promisc_mode;u8 offload_flags;u8 pci_func; +u8 mac[ETH_ALEN ]; };struct qlcnic_eswitch {
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +0 -12
@@ -2321,19 +2321,7 @@ int qlcnic_83xx_get_pci_info(struct qlcnic_adapter *adapter, i++;memcpy (pci_info->mac +sizeof (u32), &cmd.rsp.arg[i],2 ); i = i +3 ; -if (ahw->op_mode ==QLCNIC_MGMT_FUNC ) -dev_info (dev,"id = %d active = %d type = %d\n" -"\tport = %d min bw = %d max bw = %d\n" -"\tmac_addr = %pM\n" , pci_info->id, - pci_info->active, pci_info->type, - pci_info->default_port, - pci_info->tx_min_bw, - pci_info->tx_max_bw, pci_info->mac); } -if (ahw->op_mode ==QLCNIC_MGMT_FUNC ) -dev_info (dev,"Max functions = %d, active functions = %d\n" , - ahw->max_pci_func, ahw->act_pci_func); - }else {dev_err (dev,"Failed to get PCI Info, error = %d\n" , err); err = -EIO ;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +20 -4
@@ -94,13 +94,29 @@ qlcnic_83xx_config_vnic_buff_descriptors(struct qlcnic_adapter *adapter)**/ static int qlcnic_83xx_init_mgmt_vnic (struct qlcnic_adapter *adapter) { -int err = -EIO ; +struct qlcnic_hardware_context *ahw = adapter->ahw; +struct device *dev = &adapter->pdev->dev; +struct qlcnic_npar_info *npar; +int i, err = -EIO ;qlcnic_83xx_get_minidump_template (adapter); +if (!(adapter->flags &QLCNIC_ADAPTER_INITIALIZED )) {if (qlcnic_init_pci_info (adapter))return err; + npar = adapter->npars; + +for (i =0 ; i < ahw->act_pci_func; i++, npar++) { +dev_info (dev,"id:%d active:%d type:%d port:%d min_bw:%d max_bw:%d mac_addr:%pM\n" , + npar->pci_func, npar->active, npar->type, + npar->phy_port, npar->min_bw, npar->max_bw, + npar->mac); + } + +dev_info (dev,"Max functions = %d, active functions = %d\n" , + ahw->max_pci_func, ahw->act_pci_func); +if (qlcnic_83xx_set_vnic_opmode (adapter))return err;
@@ -115,12 +131,12 @@ static int qlcnic_83xx_init_mgmt_vnic(struct qlcnic_adapter *adapter)return err;qlcnic_83xx_config_vnic_buff_descriptors (adapter); - adapter->ahw->msix_supported = !!qlcnic_use_msi_x; + ahw->msix_supported = qlcnic_use_msi_x ?1 :0 ; adapter->flags |=QLCNIC_ADAPTER_INITIALIZED ;qlcnic_83xx_enable_vnic_mode (adapter,1 ); -dev_info (&adapter->pdev->dev,"HAL Version: %d, Management function\n" , - adapter->ahw->fw_hal_version); +dev_info (dev,"HAL Version: %d, Management function\n" , + ahw->fw_hal_version);return 0 ; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 -0
@@ -875,6 +875,7 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *adapter) adapter->npars[j].min_bw = pci_info[i].tx_min_bw; adapter->npars[j].max_bw = pci_info[i].tx_max_bw; +memcpy (&adapter->npars[j].mac, &pci_info[i].mac,ETH_ALEN ); j++; }
Signature · 1 line
1.8.1.4
PATCH v4 2/8 qlcnic: Enhance ethtool to display ring indices and interrupt mask
In reply to Himanshu MadhaniFrom: Pratik Pujar <[email protected]>
o Updated ethtool -d <ethX> option to display ring indices for Transmit(Tx), Receive(Rx), and Status(St) rings.
o Updated ethtool -d <ethX> option to display ring interrupt mask for Transmit(Tx), and Status(St) rings.
--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 8 ++-- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 54 ++++++++++++++++------ 2 files changed, 44 insertions(+), 18 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +4 -4
@@ -3267,12 +3267,12 @@ int qlcnic_83xx_reg_test(struct qlcnic_adapter *adapter)return 0 ; } -int qlcnic_83xx_get_regs_len (struct qlcnic_adapter *adapter) +inline int qlcnic_83xx_get_regs_len (struct qlcnic_adapter *adapter) {return (ARRAY_SIZE (qlcnic_83xx_ext_reg_tbl) * -sizeof (adapter->ahw->ext_reg_tbl)) + - (ARRAY_SIZE (qlcnic_83xx_reg_tbl) + -sizeof (adapter->ahw->reg_tbl)); +sizeof (*adapter->ahw->ext_reg_tbl)) + + (ARRAY_SIZE (qlcnic_83xx_reg_tbl) * +sizeof (*adapter->ahw->reg_tbl)); }int qlcnic_83xx_get_registers (struct qlcnic_adapter *adapter,u32 *regs_buff)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +40 -14
89 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH v4 3/8 qlcnic: Firmware dump collection when auto recovery is disabled.
In reply to Himanshu MadhaniFrom: Pratik Pujar <[email protected]>
o Allow collecting the firmware dump of halted firmware when auto recovery is disabled.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 11 +++++++++++ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +11 -0
@@ -818,6 +818,7 @@ static int qlcnic_83xx_idc_ready_state(struct qlcnic_adapter *adapter)struct qlcnic_hardware_context *ahw = adapter->ahw;struct qlcnic_mailbox *mbx = ahw->mailbox;int ret =0 ; +u32 owner;u32 val;/* Perform NIC configuration based ready state entry actions */
@@ -846,6 +847,10 @@ static int qlcnic_83xx_idc_ready_state(struct qlcnic_adapter *adapter)clear_bit (QLC_83XX_MBX_READY , &mbx->status);set_bit (__QLCNIC_RESETTING, &adapter->state);qlcnic_83xx_idc_enter_need_reset_state (adapter,1 ); + }else { + owner =qlcnic_83xx_idc_find_reset_owner_id (adapter); +if (ahw->pci_func == owner) +qlcnic_dump_fw (adapter); }return -EIO ; }
@@ -1058,6 +1063,12 @@ void qlcnic_83xx_idc_poll_dev_state(struct work_struct *work) adapter->ahw->idc.prev_state = adapter->ahw->idc.curr_state;qlcnic_83xx_periodic_tasks (adapter); +/* Do not reschedule if firmaware is in hanged state and auto +* recovery is disabled +*/ +if ((adapter->flags &QLCNIC_FW_HANG ) && !qlcnic_auto_fw_reset) +return ; +/* Re-schedule the function */ if (test_bit (QLC_83XX_MODULE_LOADED , &adapter->ahw->idc.status)) qlcnic_schedule_work(adapter, qlcnic_83xx_idc_poll_dev_state,
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +6 -1
@@ -3353,6 +3353,8 @@ done:static int qlcnic_check_health (struct qlcnic_adapter *adapter) { +struct qlcnic_hardware_context *ahw = adapter->ahw; +struct qlcnic_fw_dump *fw_dump = &ahw->fw_dump;u32 state =0 , heartbeat;u32 peg_status;int err =0 ;
@@ -3377,7 +3379,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)if (adapter->need_fw_reset) goto detach; -if (adapter->ahw->reset_context && qlcnic_auto_fw_reset) +if (ahw->reset_context && qlcnic_auto_fw_reset)qlcnic_reset_hw_context (adapter);return 0 ;
@@ -3420,6 +3422,9 @@ detach:qlcnic_schedule_work (adapter, qlcnic_detach_work,0 );QLCDB (adapter,DRV ,"fw recovery scheduled.\n" ); + }else if (!qlcnic_auto_fw_reset && fw_dump->enable && + adapter->flags &QLCNIC_FW_RESET_OWNER ) { +qlcnic_dump_fw (adapter); }return 1 ;
Signature · 1 line
1.8.1.4
PATCH v4 4/8 qlcnic: Update ethtool standard pause settings.
In reply to Himanshu MadhaniFrom: Jitendra Kalsaria <[email protected]>
Update ethtool standard pause parameter settings and display
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 18 +++++++++++++++--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 3 +++ 2 files changed, 18 insertions(+), 3 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +15 -3
@@ -3369,10 +3369,21 @@ void qlcnic_83xx_get_pauseparam(struct qlcnic_adapter *adapter, } config = ahw->port_config;if (config &QLC_83XX_CFG_STD_PAUSE ) { -if (config &QLC_83XX_CFG_STD_TX_PAUSE ) +switch (MSW (config)) { +case QLC_83XX_TX_PAUSE : + pause->tx_pause =1 ; +break ; +case QLC_83XX_RX_PAUSE : + pause->rx_pause =1 ; +break ; +case QLC_83XX_TX_RX_PAUSE : +default : +/* Backward compatibility for existing +* flash definitions +*/ pause->tx_pause =1 ; -if (config &QLC_83XX_CFG_STD_RX_PAUSE ) pause->rx_pause =1 ; + } }if (QLC_83XX_AUTONEG (config))
@@ -3415,7 +3426,8 @@ int qlcnic_83xx_set_pauseparam(struct qlcnic_adapter *adapter, ahw->port_config &= ~QLC_83XX_CFG_STD_RX_PAUSE ; ahw->port_config |=QLC_83XX_CFG_STD_TX_PAUSE ; }else if (!pause->rx_pause && !pause->tx_pause) { - ahw->port_config &= ~QLC_83XX_CFG_STD_TX_RX_PAUSE ; + ahw->port_config &= ~(QLC_83XX_CFG_STD_TX_RX_PAUSE | +QLC_83XX_CFG_STD_PAUSE ); } status =qlcnic_83xx_set_port_config (adapter);if (status) {
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +3 -0
@@ -363,6 +363,9 @@ enum qlcnic_83xx_states {#define QLC_83XX_LINK_EEE (data) ((data) & BIT_13)#define QLC_83XX_DCBX (data) (((data) >> 28) & 7)#define QLC_83XX_AUTONEG (data) ((data) & BIT_15) +#define QLC_83XX_TX_PAUSE 0x10 +#define QLC_83XX_RX_PAUSE 0x20 +#define QLC_83XX_TX_RX_PAUSE 0x30#define QLC_83XX_CFG_STD_PAUSE (1 << 5)#define QLC_83XX_CFG_STD_TX_PAUSE (1 << 20)#define QLC_83XX_CFG_STD_RX_PAUSE (2 << 20)
Signature · 1 line
1.8.1.4
PATCH v4 5/8 qlcnic: Remove redundant eSwitch enable commands
In reply to Himanshu MadhaniFrom: Sony Chacko <[email protected]>
When more than one NIC physical functions are enabled on a port, eSwitch on that port gets enabled automatically. Driver need not explicitly enable the eSwitch.
--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 23 ++++------------------ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 13 ++++++------ 3 files changed, 12 insertions(+), 26 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +1 -1
@@ -629,7 +629,7 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *);int qlcnic_83xx_get_vnic_vport_info (struct qlcnic_adapter *,struct qlcnic_info *,u8 );int qlcnic_83xx_get_vnic_pf_info (struct qlcnic_adapter *,struct qlcnic_info *); -int qlcnic_83xx_enable_port_eswitch (struct qlcnic_adapter *,int ); +int qlcnic_83xx_set_port_eswitch_status (struct qlcnic_adapter *,int ,int *);void qlcnic_83xx_get_minidump_template (struct qlcnic_adapter *);void qlcnic_83xx_get_stats (struct qlcnic_adapter *adapter,u64 *data);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +4 -19
@@ -256,8 +256,8 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *adapter)return 0 ; } -static int qlcnic_83xx_get_eswitch_port_info (struct qlcnic_adapter *adapter, -int func,int *port_id) +int qlcnic_83xx_set_port_eswitch_status (struct qlcnic_adapter *adapter, +int func,int *port_id) {struct qlcnic_info nic_info;int err =0 ;
@@ -273,23 +273,8 @@ static int qlcnic_83xx_get_eswitch_port_info(struct qlcnic_adapter *adapter,else err = -EIO ; -return err; -} - -int qlcnic_83xx_enable_port_eswitch (struct qlcnic_adapter *adapter,int func) -{ -int id, err =0 ; - - err =qlcnic_83xx_get_eswitch_port_info (adapter, func, &id); -if (err) -return err; - -if (!(adapter->eswitch[id].flags &QLCNIC_SWITCH_ENABLE )) { -if (!qlcnic_enable_eswitch (adapter, id,1 )) - adapter->eswitch[id].flags |=QLCNIC_SWITCH_ENABLE ; -else - err = -EIO ; - } +if (!err) + adapter->eswitch[*port_id].flags |=QLCNIC_SWITCH_ENABLE ;return err; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +7 -6
@@ -819,7 +819,7 @@ static bool qlcnic_port_eswitch_cfg_capability(struct qlcnic_adapter *adapter)int qlcnic_init_pci_info (struct qlcnic_adapter *adapter) {struct qlcnic_pci_info *pci_info; -int i, ret =0 , j =0 ; +int i, id =0 , ret =0 , j =0 ;u16 act_pci_func;u8 pfn;
@@ -860,7 +860,8 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *adapter)continue ;if (qlcnic_port_eswitch_cfg_capability (adapter)) { -if (!qlcnic_83xx_enable_port_eswitch (adapter, pfn)) +if (!qlcnic_83xx_set_port_eswitch_status (adapter, pfn, + &id)) adapter->npars[j].eswitch_status = true;else continue ;
@@ -879,12 +880,12 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *adapter) j++; } -if (qlcnic_82xx_check (adapter)) { +/* Update eSwitch status for adapters without per port eSwitch +* configuration capability +*/ +if (!qlcnic_port_eswitch_cfg_capability (adapter)) {for (i =0 ; i <QLCNIC_NIU_MAX_XG_PORTS ; i++) adapter->eswitch[i].flags |=QLCNIC_SWITCH_ENABLE ; - }else if (!qlcnic_port_eswitch_cfg_capability (adapter)) { -for (i =0 ; i <QLCNIC_NIU_MAX_XG_PORTS ; i++) -qlcnic_enable_eswitch (adapter, i,1 ); }kfree (pci_info);
Signature · 1 line
1.8.1.4
PATCH v4 6/8 qlcnic: dcb code cleanup and refactoring.
In reply to Himanshu MadhaniFrom: Sucheta Chakraborty <[email protected]>
o Move dcb specific function definitions to dcb files.
o Move dcb specific variables to qlcnic_dcb structure.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 96 ----------- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 9 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 184 ++++++++++----------- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 109 ++++++++++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 24 +-- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 9 +- 8 files changed, 207 insertions(+), 228 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +0 -96
@@ -961,8 +961,6 @@ struct qlcnic_ipaddr {#define __QLCNIC_SRIOV_CAPABLE 11#define __QLCNIC_MBX_POLL_ENABLE 12#define __QLCNIC_DIAG_MODE 13 -#define __QLCNIC_DCB_STATE 14 -#define __QLCNIC_DCB_IN_AEN 15#define QLCNIC_INTERRUPT_TEST 1#define QLCNIC_LOOPBACK_TEST 2
@@ -2116,98 +2114,4 @@ static inline bool qlcnic_sriov_vf_check(struct qlcnic_adapter *adapter) return status; } - -static inline int qlcnic_dcb_get_hw_capability (struct qlcnic_adapter *adapter) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->get_hw_capability) -return dcb->ops->get_hw_capability (adapter); - -return 0 ; -} - -static inline void qlcnic_dcb_free (struct qlcnic_adapter *adapter) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->free) - dcb->ops->free (adapter); -} - -static inline int qlcnic_dcb_attach (struct qlcnic_adapter *adapter) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->attach) -return dcb->ops->attach (adapter); - -return 0 ; -} - -static inline int -qlcnic_dcb_query_hw_capability (struct qlcnic_adapter *adapter,char *buf) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->query_hw_capability) -return dcb->ops->query_hw_capability (adapter, buf); - -return 0 ; -} - -static inline void qlcnic_dcb_get_info (struct qlcnic_adapter *adapter) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->get_info) - dcb->ops->get_info (adapter); -} - -static inline int -qlcnic_dcb_query_cee_param (struct qlcnic_adapter *adapter,char *buf,u8 type) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->query_cee_param) -return dcb->ops->query_cee_param (adapter, buf, type); - -return 0 ; -} - -static inline int qlcnic_dcb_get_cee_cfg (struct qlcnic_adapter *adapter) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->get_cee_cfg) -return dcb->ops->get_cee_cfg (adapter); - -return 0 ; -} - -static inline void -qlcnic_dcb_register_aen (struct qlcnic_adapter *adapter,u8 flag) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->register_aen) - dcb->ops->register_aen (adapter, flag); -} - -static inline void qlcnic_dcb_handle_aen (struct qlcnic_adapter *adapter, -void *msg) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->handle_aen) - dcb->ops->handle_aen (adapter, msg); -} - -static inline void qlcnic_dcb_init_dcbnl_ops (struct qlcnic_adapter *adapter) -{ -struct qlcnic_dcb *dcb = adapter->dcb; - -if (dcb && dcb->ops->init_dcbnl_ops) - dcb->ops->init_dcbnl_ops (adapter); -}#endif /* __QLCNIC_H_ */
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +1 -1
@@ -902,7 +902,7 @@ void __qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter) QLCNIC_MBX_RSP(event[0]));break ;case QLCNIC_MBX_DCBX_CONFIG_CHANGE_EVENT : -qlcnic_dcb_handle_aen (adapter, (void *)&event[1 ]); +qlcnic_dcb_aen_handler (adapter->dcb, (void *)&event[1 ]);break ;default : dev_dbg(&adapter->pdev->dev, "Unsupported AEN:0x%x.\n",
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +6 -3
@@ -636,7 +636,7 @@ int qlcnic_83xx_idc_reattach_driver(struct qlcnic_adapter *adapter)if (adapter->portnum ==0 )qlcnic_set_drv_version (adapter); -qlcnic_dcb_get_info (adapter); +qlcnic_dcb_get_info (adapter->dcb);qlcnic_83xx_idc_attach_driver (adapter);return 0 ;
@@ -2174,6 +2174,7 @@ static int qlcnic_83xx_get_fw_info(struct qlcnic_adapter *adapter)int qlcnic_83xx_init (struct qlcnic_adapter *adapter,int pci_using_dac) {struct qlcnic_hardware_context *ahw = adapter->ahw; +struct qlcnic_dcb *dcb;int err =0 ; ahw->msix_supported = !!qlcnic_use_msi_x;
@@ -2231,8 +2232,10 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)if (err) goto disable_mbx_intr; -if (adapter->dcb &&qlcnic_dcb_attach (adapter)) -qlcnic_clear_dcb_ops (adapter); + dcb = adapter->dcb; + +if (dcb &&qlcnic_dcb_attach (dcb)) +qlcnic_clear_dcb_ops (dcb);/* Periodically monitor device status */ qlcnic_83xx_idc_poll_dev_state (&adapter->fw_work.work);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c +89 -95
492 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h +96 -13
127 lines not on this page · raw message
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +1 -1
@@ -1011,7 +1011,7 @@ static void qlcnic_handle_fw_message(int desc_cnt, int index, }break ;case QLCNIC_C2H_OPCODE_GET_DCB_AEN : -qlcnic_dcb_handle_aen (adapter, (void *)&msg); +qlcnic_dcb_aen_handler (adapter->dcb, (void *)&msg);break ;default :break ;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +8 -16
@@ -2071,7 +2071,7 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,return err; } -qlcnic_dcb_init_dcbnl_ops (adapter); +qlcnic_dcb_init_dcbnl_ops (adapter->dcb);return 0 ; }
@@ -2166,17 +2166,6 @@ void qlcnic_set_drv_version(struct qlcnic_adapter *adapter)qlcnic_fw_cmd_set_drv_version (adapter, fw_cmd); } -static int qlcnic_register_dcb (struct qlcnic_adapter *adapter) -{ -return __qlcnic_register_dcb (adapter); -} - -void qlcnic_clear_dcb_ops (struct qlcnic_adapter *adapter) -{ -kfree (adapter->dcb); - adapter->dcb =NULL ; -} -static int qlcnic_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {
@@ -2185,6 +2174,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)struct qlcnic_hardware_context *ahw;int err, pci_using_dac =-1 ;char board_name[QLCNIC_MAX_BOARD_NAME_LEN +19 ];/* MAC + ": " + name */ +struct qlcnic_dcb *dcb;if (pdev->is_virtfn)return -ENODEV ;
@@ -2305,8 +2295,10 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->flags |=QLCNIC_NEED_FLR ; -if (adapter->dcb &&qlcnic_dcb_attach (adapter)) -qlcnic_clear_dcb_ops (adapter); + dcb = adapter->dcb; + +if (dcb &&qlcnic_dcb_attach (dcb)) +qlcnic_clear_dcb_ops (dcb); }else if (qlcnic_83xx_check (adapter)) { adapter->max_drv_tx_rings =1 ;
@@ -2451,7 +2443,7 @@ static void qlcnic_remove(struct pci_dev *pdev)qlcnic_cancel_idc_work (adapter); ahw = adapter->ahw; -qlcnic_dcb_free (adapter); +qlcnic_dcb_free (adapter->dcb);unregister_netdev (netdev);qlcnic_sriov_cleanup (adapter);
@@ -3329,7 +3321,7 @@ qlcnic_attach_work(struct work_struct *work)return ; } attach: -qlcnic_dcb_get_info (adapter); +qlcnic_dcb_get_info (adapter->dcb);if (netif_running (netdev)) {if (qlcnic_up (adapter, netdev))
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +6 -3
@@ -500,6 +500,7 @@ static int qlcnic_sriov_vf_init_driver(struct qlcnic_adapter *adapter)static int qlcnic_sriov_setup_vf (struct qlcnic_adapter *adapter,int pci_using_dac) { +struct qlcnic_dcb *dcb;int err;INIT_LIST_HEAD (&adapter->vf_mc_list);
@@ -533,8 +534,10 @@ static int qlcnic_sriov_setup_vf(struct qlcnic_adapter *adapter,if (err) goto err_out_send_channel_term; -if (adapter->dcb &&qlcnic_dcb_attach (adapter)) -qlcnic_clear_dcb_ops (adapter); + dcb = adapter->dcb; + +if (dcb &&qlcnic_dcb_attach (dcb)) +qlcnic_clear_dcb_ops (dcb); err =qlcnic_setup_netdev (adapter, adapter->netdev, pci_using_dac);if (err)
@@ -1577,7 +1580,7 @@ static int qlcnic_sriov_vf_reinit_driver(struct qlcnic_adapter *adapter)if (err) goto err_out_term_channel; -qlcnic_dcb_get_info (adapter); +qlcnic_dcb_get_info (adapter->dcb);return 0 ;
Signature · 1 line
1.8.1.4
PATCH v4 7/8 qlcnic: Skip unknown entry type while collecting firmware dump
In reply to Himanshu MadhaniFrom: Shahed Shaikh <[email protected]>
o Driver aborts the minidump collection operation when it finds an unknown entry opcode. This patch skips unknown entry type and resumes the minidump collection operation.
o Removed a comparision of collected dump size with expected dump size. Size may differ when driver decides to skip an entry.
--- .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 41 ++++++++++------------ 1 file changed, 19 insertions(+), 22 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c +19 -22
@@ -1187,41 +1187,38 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter) }if (ops_index == ops_cnt) { -dev_info (&adapter->pdev->dev, -"Invalid entry type %d, exiting dump\n" , +dev_info (dev,"Skipping unknown entry opcode %d\n" , entry->hdr.type); - goto error; + entry->hdr.flags |=QLCNIC_DUMP_SKIP ; + entry_offset += entry->hdr.offset; +continue ; }/* Collect dump for this entry */ dump = fw_dump_ops[ops_index].handler (adapter, entry, buffer); -if (!qlcnic_valid_dump_entry (&adapter->pdev->dev, entry, dump)) +if (!qlcnic_valid_dump_entry (dev, entry, dump)) { entry->hdr.flags |=QLCNIC_DUMP_SKIP ; + entry_offset += entry->hdr.offset; +continue ; + } + buf_offset += entry->hdr.cap_size; entry_offset += entry->hdr.offset; buffer = fw_dump->data + buf_offset; } -if (dump_size != buf_offset) { -dev_info (&adapter->pdev->dev, -"Captured(%d) and expected size(%d) do not match\n" , - buf_offset, dump_size); - goto error; - }else { - fw_dump->clr =1 ; -snprintf (mesg,sizeof (mesg),"FW_DUMP=%s" , - adapter->netdev->name); -dev_info (&adapter->pdev->dev,"%s: Dump data, %d bytes captured\n" , - adapter->netdev->name, fw_dump->size); -/* Send a udev event to notify availability of FW dump */ -kobject_uevent_env (&adapter->pdev->dev.kobj,KOBJ_CHANGE , msg); -return 0 ; - } -error: + + fw_dump->clr =1 ; +snprintf (mesg,sizeof (mesg),"FW_DUMP=%s" , adapter->netdev->name); +dev_info (dev,"%s: Dump data %d bytes captured, template header size %d bytes\n" , + adapter->netdev->name, fw_dump->size, tmpl_hdr->size); +/* Send a udev event to notify availability of FW dump */ +kobject_uevent_env (&dev->kobj,KOBJ_CHANGE , msg); +if (fw_dump->use_pex_dma)dma_free_coherent (dev,QLC_PEX_DMA_READ_SIZE , fw_dump->dma_buffer, fw_dump->phys_addr); -vfree (fw_dump->data); -return -EINVAL ; + +return 0 ; }void qlcnic_83xx_get_minidump_template (struct qlcnic_adapter *adapter)
Signature · 1 line
1.8.1.4
PATCH v4 8/8 qlcnic: update version to 5.3.51
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 50 -#define QLCNIC_LINUX_VERSIONID "5.3.50" +#define _QLCNIC_LINUX_SUBVERSION 51 +#define QLCNIC_LINUX_VERSIONID "5.3.51"#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: Fri, 18 Oct 2013 12:22:27 -0400
Quoted 14 lines
This patch series contains
o updates to ethtool for pause settings and enhance register dump to display mask and ring indices.
o cleanup in DCB code and remove redundant eSwitch enablement command.
o fixed firmware dump collection logic to skip unknown entries.Changes from v3 -> v4
o Dropped patch for Tx queue validation to be submitted in net.Changes from v2 -> v3
o Updated patch to print informational messages as per Joe Perches's comment.
Quoted 7 lines
Changes from v1 -> v2
o Dropped patch to register device if adapter is in FAILED state for more rework.
o Updated patch to display ring indices via ethtool per Ben Hutchings's comment.
o Update patch for DCB cleanup per Stephen Hemminger's comment.Please apply to net-next.
Series applied, thanks.