qed, qede: add support for new operating modes
Subsystems (6)
v3 cover qed, qede: add support for new operating modes
This series covers the support for the following:
- new port modes;
- loopback modes, previously missing;
- new speed/link modes;
- several FEC modes;
- multi-rate transceivers;
and also cleans up and optimizes several related parts of code.
v3 (from [2]):
- dropped custom link mode declaration; qed, qede and qedf switched to Ethtool link modes and definitions (#0001, #0002, per Andrew Lunn's suggestion);
- exchange more .text size to .initconst and .ro_after_init in qede (#0003).
v2 (from [1]):
- added a patch (#0010) that drops discussed dead struct member;
- addressed checkpatch complaints on #0014 (former #0013);
- rebased on top of latest net-next;
- no other changes.
[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/[email protected]/
Alexander Lobakin (16):
linkmode: introduce linkmode_intersects()
qed, qede, qedf: convert link mode from u32 to ETHTOOL_LINK_MODE
qede: populate supported link modes maps on module init
qed: reformat public_port::transceiver_data a bit
qed: add support for multi-rate transceivers
qed: use transceiver data to fill link partner's advertising speeds
qed: reformat several structures a bit
qed: add support for Forward Error Correction
qede: format qede{,_vf}_ethtool_ops
qede: introduce support for FEC control
qed: reformat several structures a bit
qed: remove unused qed_hw_info::port_mode and QED_PORT_MODE
qed: add support for new port modes
qed: add missing loopback modes
qed: populate supported link modes maps on module init
qed: add support for the extended speed and FEC modes
drivers/net/ethernet/qlogic/qed/qed.h | 125 ++- drivers/net/ethernet/qlogic/qed/qed_dev.c | 172 +++- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 786 ++++++++++-------- drivers/net/ethernet/qlogic/qed/qed_main.c | 765 +++++++++++++---- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 126 ++- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 146 ++-- drivers/net/ethernet/qlogic/qede/qede.h | 2 + .../net/ethernet/qlogic/qede/qede_ethtool.c | 497 +++++------ drivers/net/ethernet/qlogic/qede/qede_main.c | 2 + drivers/scsi/qedf/qedf_main.c | 78 +- include/linux/linkmode.h | 6 + include/linux/qed/qed_if.h | 128 ++- 12 files changed, 1829 insertions(+), 1004 deletions(-)
--
Netdev maintainers, patch #0001 affects qedf under scsi tree, but could you take it through yours after all necessary acks? It will break incremental buildability and bisecting otherwise. Thanks.
Signature · 1 line
2.25.1
PATCH v3 1/16 linkmode: introduce linkmode_intersects()
Add a new helper to find intersections between Ethtool link modes, linkmode_intersects(), similar to the other linkmode helpers.
--- include/linux/linkmode.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/linkmode.h +6 -0
@@ -82,6 +82,12 @@ static inline int linkmode_equal(const unsigned long *src1,return bitmap_equal (src1, src2, __ETHTOOL_LINK_MODE_MASK_NBITS); } +static inline int linkmode_intersects (const unsigned long *src1, +const unsigned long *src2) +{ +return bitmap_intersects (src1, src2, __ETHTOOL_LINK_MODE_MASK_NBITS); +} +static inline int linkmode_subset (const unsigned long *src1,const unsigned long *src2) {
Signature · 1 line
2.25.1
Re: [PATCH v3 net-next 01/16] linkmode: introduce linkmode_intersects()
Quoted 5 lines · Alexander Lobakin
Add a new helper to find intersections between Ethtool link modes,
linkmode_intersects(), similar to the other linkmode helpers.Signed-off-by Alexander Lobakin <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Andrew
PATCH v3 2/16 qed, qede, qedf: convert link mode from u32 to ETHTOOL_LINK_MODE
In reply to Alexander LobakinCurrently qed driver already ran out of 32 bits to store link modes, and this doesn't allow to add and support more speeds. Convert custom link mode to generic Ethtool bitmap and definitions (convenient Phylink shorthands are used for elegance and readability). This allowed us to drop all conversions/mappings between the driver and Ethtool.
This involves changes in qede and qedf as well, as they used definitions from shared "qed_if.h".
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 288 ++++++++++-------- .../net/ethernet/qlogic/qede/qede_ethtool.c | 200 ++++-------- drivers/scsi/qedf/qedf_main.c | 78 +++-- include/linux/qed/qed_if.h | 47 +-- 4 files changed, 268 insertions(+), 345 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +158 -130
@@ -24,6 +24,7 @@#include <linux/qed/qed_ll2_if.h> #include <net/devlink.h> #include <linux/aer.h> +#include <linux/phylink.h> #include "qed.h" #include "qed_sriov.h"
@@ -1456,10 +1457,11 @@ static bool qed_can_link_change(struct qed_dev *cdev)static int qed_set_link (struct qed_dev *cdev,struct qed_link_params *params) { -struct qed_hwfn *hwfn; +__ETHTOOL_DECLARE_LINK_MODE_MASK (sup_caps);struct qed_mcp_link_params *link_params; +struct qed_hwfn *hwfn;struct qed_ptt *ptt; -u32 sup_caps; +u32 as;int rc;if (!cdev)
@@ -1482,57 +1484,79 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params)return -EBUSY ; link_params =qed_mcp_get_link_params (hwfn); +if (!link_params) +return -ENODATA ; +if (params->override_flags &QED_LINK_OVERRIDE_SPEED_AUTONEG ) link_params->speed.autoneg = params->autoneg; +if (params->override_flags &QED_LINK_OVERRIDE_SPEED_ADV_SPEEDS ) { - link_params->speed.advertised_speeds =0 ; - sup_caps = QED_LM_1000baseT_Full_BIT | - QED_LM_1000baseKX_Full_BIT | - QED_LM_1000baseX_Full_BIT; -if (params->adv_speeds & sup_caps) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ; - sup_caps = QED_LM_10000baseT_Full_BIT | - QED_LM_10000baseKR_Full_BIT | - QED_LM_10000baseKX4_Full_BIT | - QED_LM_10000baseR_FEC_BIT | - QED_LM_10000baseCR_Full_BIT | - QED_LM_10000baseSR_Full_BIT | - QED_LM_10000baseLR_Full_BIT | - QED_LM_10000baseLRM_Full_BIT; -if (params->adv_speeds & sup_caps) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ; -if (params->adv_speeds & QED_LM_20000baseKR2_Full_BIT) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ; - sup_caps = QED_LM_25000baseKR_Full_BIT | - QED_LM_25000baseCR_Full_BIT | - QED_LM_25000baseSR_Full_BIT; -if (params->adv_speeds & sup_caps) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ; - sup_caps = QED_LM_40000baseLR4_Full_BIT | - QED_LM_40000baseKR4_Full_BIT | - QED_LM_40000baseCR4_Full_BIT | - QED_LM_40000baseSR4_Full_BIT; -if (params->adv_speeds & sup_caps) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ; - sup_caps = QED_LM_50000baseKR2_Full_BIT | - QED_LM_50000baseCR2_Full_BIT | - QED_LM_50000baseSR2_Full_BIT; -if (params->adv_speeds & sup_caps) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ; - sup_caps = QED_LM_100000baseKR4_Full_BIT | - QED_LM_100000baseSR4_Full_BIT | - QED_LM_100000baseCR4_Full_BIT | - QED_LM_100000baseLR4_ER4_Full_BIT; -if (params->adv_speeds & sup_caps) - link_params->speed.advertised_speeds |= -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ; + as =0 ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 1000baseT_Full); + phylink_set(sup_caps, 1000baseKX_Full); + phylink_set(sup_caps, 1000baseX_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 10000baseT_Full); + phylink_set(sup_caps, 10000baseKR_Full); + phylink_set(sup_caps, 10000baseKX4_Full); + phylink_set(sup_caps, 10000baseR_FEC); + phylink_set(sup_caps, 10000baseCR_Full); + phylink_set(sup_caps, 10000baseSR_Full); + phylink_set(sup_caps, 10000baseLR_Full); + phylink_set(sup_caps, 10000baseLRM_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 20000baseKR2_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 25000baseKR_Full); + phylink_set(sup_caps, 25000baseCR_Full); + phylink_set(sup_caps, 25000baseSR_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 40000baseLR4_Full); + phylink_set(sup_caps, 40000baseKR4_Full); + phylink_set(sup_caps, 40000baseCR4_Full); + phylink_set(sup_caps, 40000baseSR4_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 50000baseKR2_Full); + phylink_set(sup_caps, 50000baseCR2_Full); + phylink_set(sup_caps, 50000baseSR2_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ; + +phylink_zero (sup_caps); + phylink_set(sup_caps, 100000baseKR4_Full); + phylink_set(sup_caps, 100000baseSR4_Full); + phylink_set(sup_caps, 100000baseCR4_Full); + phylink_set(sup_caps, 100000baseLR4_ER4_Full); + +if (linkmode_intersects (params->adv_speeds, sup_caps)) + as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ; + + link_params->speed.advertised_speeds = as; } +if (params->override_flags &QED_LINK_OVERRIDE_SPEED_FORCED_SPEED ) link_params->speed.forced_speed = params->forced_speed;if (params->override_flags &QED_LINK_OVERRIDE_PAUSE_CONFIG ) {
@@ -1644,7 +1668,7 @@ static int qed_get_link_data(struct qed_hwfn *hwfn,static void qed_fill_link_capability (struct qed_hwfn *hwfn,struct qed_ptt *ptt,u32 capability, -u32 *if_capability) +unsigned long *if_caps) {u32 media_type, tcvr_state, tcvr_type;u32 speed_mask, board_cfg;
@@ -1667,113 +1691,117 @@ static void qed_fill_link_capability(struct qed_hwfn *hwfn,switch (media_type) {case MEDIA_DA_TWINAX : - *if_capability |=QED_LM_FIBRE_BIT ; +phylink_set (if_caps,FIBRE ); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ) - *if_capability |= QED_LM_20000baseKR2_Full_BIT; + phylink_set(if_caps, 20000baseKR2_Full); +/* For DAC media multiple speed capabilities are supported*/ capability = capability & speed_mask;if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) - *if_capability |= QED_LM_1000baseKX_Full_BIT; + phylink_set(if_caps, 1000baseKX_Full);if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) - *if_capability |= QED_LM_10000baseCR_Full_BIT; + phylink_set(if_caps, 10000baseCR_Full);if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ) - *if_capability |= QED_LM_40000baseCR4_Full_BIT; + phylink_set(if_caps, 40000baseCR4_Full);if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ) - *if_capability |= QED_LM_25000baseCR_Full_BIT; + phylink_set(if_caps, 25000baseCR_Full);if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ) - *if_capability |= QED_LM_50000baseCR2_Full_BIT; + phylink_set(if_caps, 50000baseCR2_Full);if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ) - *if_capability |= QED_LM_100000baseCR4_Full_BIT; +NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ) + phylink_set(if_caps, 100000baseCR4_Full); +break ;case MEDIA_BASE_T : - *if_capability |=QED_LM_TP_BIT ; +phylink_set (if_caps,TP ); +if (board_cfg &NVM_CFG1_PORT_PORT_TYPE_EXT_PHY ) {if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) { - *if_capability |= QED_LM_1000baseT_Full_BIT; - } +NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) + phylink_set(if_caps, 1000baseT_Full);if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) { - *if_capability |= QED_LM_10000baseT_Full_BIT; - } +NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) + phylink_set(if_caps, 10000baseT_Full); } +if (board_cfg &NVM_CFG1_PORT_PORT_TYPE_MODULE ) { - *if_capability |=QED_LM_FIBRE_BIT ; +phylink_set (if_caps,FIBRE ); +if (tcvr_type ==ETH_TRANSCEIVER_TYPE_1000BASET ) - *if_capability |= QED_LM_1000baseT_Full_BIT; + phylink_set(if_caps, 1000baseT_Full);if (tcvr_type ==ETH_TRANSCEIVER_TYPE_10G_BASET ) - *if_capability |= QED_LM_10000baseT_Full_BIT; + phylink_set(if_caps, 10000baseT_Full); } +break ;case MEDIA_SFP_1G_FIBER :case MEDIA_SFPP_10G_FIBER :case MEDIA_XFP_FIBER :case MEDIA_MODULE_FIBER : - *if_capability |=QED_LM_FIBRE_BIT ; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) { +phylink_set (if_caps,FIBRE ); + +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) {if ((tcvr_type ==ETH_TRANSCEIVER_TYPE_1G_LX ) || (tcvr_type ==ETH_TRANSCEIVER_TYPE_1G_SX )) - *if_capability |= QED_LM_1000baseKX_Full_BIT; + phylink_set(if_caps, 1000baseKX_Full); } -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) { + +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) {if (tcvr_type ==ETH_TRANSCEIVER_TYPE_10G_SR ) - *if_capability |= QED_LM_10000baseSR_Full_BIT; + phylink_set(if_caps, 10000baseSR_Full);if (tcvr_type ==ETH_TRANSCEIVER_TYPE_10G_LR ) - *if_capability |= QED_LM_10000baseLR_Full_BIT; + phylink_set(if_caps, 10000baseLR_Full);if (tcvr_type ==ETH_TRANSCEIVER_TYPE_10G_LRM ) - *if_capability |= QED_LM_10000baseLRM_Full_BIT; + phylink_set(if_caps, 10000baseLRM_Full);if (tcvr_type ==ETH_TRANSCEIVER_TYPE_10G_ER ) - *if_capability |= QED_LM_10000baseR_FEC_BIT; + phylink_set(if_caps, 10000baseR_FEC); } +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ) - *if_capability |= QED_LM_20000baseKR2_Full_BIT; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ) { + phylink_set(if_caps, 20000baseKR2_Full); + +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ) {if (tcvr_type ==ETH_TRANSCEIVER_TYPE_25G_SR ) - *if_capability |= QED_LM_25000baseSR_Full_BIT; + phylink_set(if_caps, 25000baseSR_Full); } -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ) { + +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ) {if (tcvr_type ==ETH_TRANSCEIVER_TYPE_40G_LR4 ) - *if_capability |= QED_LM_40000baseLR4_Full_BIT; + phylink_set(if_caps, 40000baseLR4_Full);if (tcvr_type ==ETH_TRANSCEIVER_TYPE_40G_SR4 ) - *if_capability |= QED_LM_40000baseSR4_Full_BIT; + phylink_set(if_caps, 40000baseSR4_Full); } -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ) - *if_capability |= QED_LM_50000baseKR2_Full_BIT; + +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ) + phylink_set(if_caps, 50000baseKR2_Full); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ) {if (tcvr_type ==ETH_TRANSCEIVER_TYPE_100G_SR4 ) - *if_capability |= QED_LM_100000baseSR4_Full_BIT; + phylink_set(if_caps, 100000baseSR4_Full); }break ;case MEDIA_KR : - *if_capability |= QED_LM_Backplane_BIT; +phylink_set (if_caps, Backplane); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ) - *if_capability |= QED_LM_20000baseKR2_Full_BIT; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) - *if_capability |= QED_LM_1000baseKX_Full_BIT; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) - *if_capability |= QED_LM_10000baseKR_Full_BIT; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ) - *if_capability |= QED_LM_25000baseKR_Full_BIT; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ) - *if_capability |= QED_LM_40000baseKR4_Full_BIT; -if (capability & -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ) - *if_capability |= QED_LM_50000baseKR2_Full_BIT; + phylink_set(if_caps, 20000baseKR2_Full); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ) + phylink_set(if_caps, 1000baseKX_Full); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ) + phylink_set(if_caps, 10000baseKR_Full); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ) + phylink_set(if_caps, 25000baseKR_Full); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ) + phylink_set(if_caps, 40000baseKR4_Full); +if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ) + phylink_set(if_caps, 50000baseKR2_Full);if (capability &NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ) - *if_capability |= QED_LM_100000baseKR4_Full_BIT; + phylink_set(if_caps, 100000baseKR4_Full); +break ;case MEDIA_UNSPECIFIED :case MEDIA_NOT_PRESENT :
@@ -1806,26 +1834,27 @@ static void qed_fill_link(struct qed_hwfn *hwfn,/* TODO - at the moment assume supported and advertised speed equal */ if (link_caps.default_speed_autoneg) - if_link->supported_caps |= QED_LM_Autoneg_BIT; +phylink_set (if_link->supported_caps, Autoneg);if (params.pause.autoneg || (params.pause.forced_rx && params.pause.forced_tx)) - if_link->supported_caps |= QED_LM_Asym_Pause_BIT; +phylink_set (if_link->supported_caps, Asym_Pause);if (params.pause.autoneg || params.pause.forced_rx || params.pause.forced_tx) - if_link->supported_caps |= QED_LM_Pause_BIT; +phylink_set (if_link->supported_caps, Pause); + +linkmode_copy (if_link->advertised_caps, if_link->supported_caps); - if_link->advertised_caps = if_link->supported_caps;if (params.speed.autoneg) - if_link->advertised_caps |= QED_LM_Autoneg_BIT; +phylink_set (if_link->advertised_caps, Autoneg);else - if_link->advertised_caps &= ~QED_LM_Autoneg_BIT; +phylink_clear (if_link->advertised_caps, Autoneg);/* Fill link advertised capability*/ qed_fill_link_capability (hwfn, ptt, params.speed.advertised_speeds, - &if_link->advertised_caps); + if_link->advertised_caps);/* Fill link supported capability*/ qed_fill_link_capability (hwfn, ptt, link_caps.speed_capabilities, - &if_link->supported_caps); + if_link->supported_caps);if (link.link_up) if_link->speed = link.speed;
@@ -1845,30 +1874,29 @@ static void qed_fill_link(struct qed_hwfn *hwfn, if_link->pause_config |=QED_LINK_PAUSE_TX_ENABLE ;/* Link partner capabilities */ -if (link.partner_adv_speed & -QED_LINK_PARTNER_SPEED_1G_FD ) - if_link->lp_caps |= QED_LM_1000baseT_Full_BIT; + +if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_1G_FD ) + phylink_set(if_link->lp_caps, 1000baseT_Full);if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_10G ) - if_link->lp_caps |= QED_LM_10000baseKR_Full_BIT; + phylink_set(if_link->lp_caps, 10000baseKR_Full);if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_20G ) - if_link->lp_caps |= QED_LM_20000baseKR2_Full_BIT; + phylink_set(if_link->lp_caps, 20000baseKR2_Full);if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_25G ) - if_link->lp_caps |= QED_LM_25000baseKR_Full_BIT; + phylink_set(if_link->lp_caps, 25000baseKR_Full);if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_40G ) - if_link->lp_caps |= QED_LM_40000baseLR4_Full_BIT; + phylink_set(if_link->lp_caps, 40000baseLR4_Full);if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_50G ) - if_link->lp_caps |= QED_LM_50000baseKR2_Full_BIT; + phylink_set(if_link->lp_caps, 50000baseKR2_Full);if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_100G ) - if_link->lp_caps |= QED_LM_100000baseKR4_Full_BIT; + phylink_set(if_link->lp_caps, 100000baseKR4_Full);if (link.an_complete) - if_link->lp_caps |= QED_LM_Autoneg_BIT; - +phylink_set (if_link->lp_caps, Autoneg);if (link.partner_adv_pause) - if_link->lp_caps |= QED_LM_Pause_BIT; +phylink_set (if_link->lp_caps, Pause);if (link.partner_adv_pause ==QED_LINK_PARTNER_ASYMMETRIC_PAUSE || link.partner_adv_pause ==QED_LINK_PARTNER_BOTH_PAUSE ) - if_link->lp_caps |= QED_LM_Asym_Pause_BIT; +phylink_set (if_link->lp_caps, Asym_Pause);if (link_caps.default_eee ==QED_MCP_EEE_UNSUPPORTED ) { if_link->eee_supported = false;
drivers/net/ethernet/qlogic/qede/qede_ethtool.c +54 -146
278 lines not on this page · raw message
drivers/scsi/qedf/qedf_main.c +50 -28
102 lines not on this page · raw message
include/linux/qed/qed_if.h +6 -41
65 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v3 net-next 02/16] qed, qede, qedf: convert link mode from u32 to ETHTOOL_LINK_MODE
Quoted 13 lines · Alexander Lobakin
Currently qed driver already ran out of 32 bits to store link modes, and this doesn't allow to add and support more speeds. Convert custom link mode to generic Ethtool bitmap and definitions (convenient Phylink shorthands are used for elegance and readability). This allowed us to drop all conversions/mappings between the driver and Ethtool.
This involves changes in qede and qedf as well, as they used definitions from shared "
qed_if.h".Suggested-by Andrew Lunn <[email protected]>Signed-off-by Alexander Lobakin <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Quoted 6 lines
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 288 ++++++++++-------- .../net/ethernet/qlogic/qede/qede_ethtool.c | 200 ++++-------- drivers/scsi/qedf/qedf_main.c | 78 +++-- include/linux/qed/qed_if.h | 47 +-- 4 files changed, 268 insertions(+), 345 deletions(-)
Nice diffstat.
Andrew
PATCH v3 3/16 qede: populate supported link modes maps on module init
In reply to Alexander LobakinSimplify and lighten qede_set_link_ksettings() by declaring static link modes maps and populating them on module init. This way we save plenty of text size at the low expense of __ro_after_init and __initconst data (the latter will be purged after module init is done).
--- drivers/net/ethernet/qlogic/qede/qede.h | 2 + .../net/ethernet/qlogic/qede/qede_ethtool.c | 158 ++++++++++++------ drivers/net/ethernet/qlogic/qede/qede_main.c | 2 + 3 files changed, 108 insertions(+), 54 deletions(-)
drivers/net/ethernet/qlogic/qede/qede.h +2 -0
@@ -557,6 +557,8 @@ void qede_update_rx_prod(struct qede_dev *edev, struct qede_rx_queue *rxq);int qede_add_tc_flower_fltr (struct qede_dev *edev,__be16 proto,struct flow_cls_offload *f); +void qede_forced_speed_maps_init (void ); +#define RX_RING_SIZE_POW 13#define RX_RING_SIZE ((u16)BIT(RX_RING_SIZE_POW))#define NUM_RX_BDS_MAX (RX_RING_SIZE - 1)
drivers/net/ethernet/qlogic/qede/qede_ethtool.c +104 -54
185 lines not on this page · raw message
drivers/net/ethernet/qlogic/qede/qede_main.c +2 -0
@@ -263,6 +263,8 @@ int __init qede_init(void)pr_info ("qede_init: %s\n" , version); +qede_forced_speed_maps_init (); + qed_ops =qed_get_eth_ops ();if (!qed_ops) {pr_notice ("Failed to get qed ethtool operations\n" );
Signature · 1 line
2.25.1
PATCH v3 4/16 qed: reformat public_port::transceiver_data a bit
In reply to Alexander LobakinPrior to adding new bitfields, reformat the existing ones from spaces to tabs, and unify all hex values to lowercase.
--- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 108 +++++++++++----------- 1 file changed, 55 insertions(+), 53 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_hsi.h +55 -53
@@ -11973,59 +11973,61 @@ struct public_port {struct dcbx_mib operational_dcbx_mib;u32 reserved[2 ]; -u32 transceiver_data; -#define ETH_TRANSCEIVER_STATE_MASK 0x000000FF -#define ETH_TRANSCEIVER_STATE_SHIFT 0x00000000 -#define ETH_TRANSCEIVER_STATE_OFFSET 0x00000000 -#define ETH_TRANSCEIVER_STATE_UNPLUGGED 0x00000000 -#define ETH_TRANSCEIVER_STATE_PRESENT 0x00000001 -#define ETH_TRANSCEIVER_STATE_VALID 0x00000003 -#define ETH_TRANSCEIVER_STATE_UPDATING 0x00000008 -#define ETH_TRANSCEIVER_TYPE_MASK 0x0000FF00 -#define ETH_TRANSCEIVER_TYPE_OFFSET 0x8 -#define ETH_TRANSCEIVER_TYPE_NONE 0x00 -#define ETH_TRANSCEIVER_TYPE_UNKNOWN 0xFF -#define ETH_TRANSCEIVER_TYPE_1G_PCC 0x01 -#define ETH_TRANSCEIVER_TYPE_1G_ACC 0x02 -#define ETH_TRANSCEIVER_TYPE_1G_LX 0x03 -#define ETH_TRANSCEIVER_TYPE_1G_SX 0x04 -#define ETH_TRANSCEIVER_TYPE_10G_SR 0x05 -#define ETH_TRANSCEIVER_TYPE_10G_LR 0x06 -#define ETH_TRANSCEIVER_TYPE_10G_LRM 0x07 -#define ETH_TRANSCEIVER_TYPE_10G_ER 0x08 -#define ETH_TRANSCEIVER_TYPE_10G_PCC 0x09 -#define ETH_TRANSCEIVER_TYPE_10G_ACC 0x0a -#define ETH_TRANSCEIVER_TYPE_XLPPI 0x0b -#define ETH_TRANSCEIVER_TYPE_40G_LR4 0x0c -#define ETH_TRANSCEIVER_TYPE_40G_SR4 0x0d -#define ETH_TRANSCEIVER_TYPE_40G_CR4 0x0e -#define ETH_TRANSCEIVER_TYPE_100G_AOC 0x0f -#define ETH_TRANSCEIVER_TYPE_100G_SR4 0x10 -#define ETH_TRANSCEIVER_TYPE_100G_LR4 0x11 -#define ETH_TRANSCEIVER_TYPE_100G_ER4 0x12 -#define ETH_TRANSCEIVER_TYPE_100G_ACC 0x13 -#define ETH_TRANSCEIVER_TYPE_100G_CR4 0x14 -#define ETH_TRANSCEIVER_TYPE_4x10G_SR 0x15 -#define ETH_TRANSCEIVER_TYPE_25G_CA_N 0x16 -#define ETH_TRANSCEIVER_TYPE_25G_ACC_S 0x17 -#define ETH_TRANSCEIVER_TYPE_25G_CA_S 0x18 -#define ETH_TRANSCEIVER_TYPE_25G_ACC_M 0x19 -#define ETH_TRANSCEIVER_TYPE_25G_CA_L 0x1a -#define ETH_TRANSCEIVER_TYPE_25G_ACC_L 0x1b -#define ETH_TRANSCEIVER_TYPE_25G_SR 0x1c -#define ETH_TRANSCEIVER_TYPE_25G_LR 0x1d -#define ETH_TRANSCEIVER_TYPE_25G_AOC 0x1e -#define ETH_TRANSCEIVER_TYPE_4x10G 0x1f -#define ETH_TRANSCEIVER_TYPE_4x25G_CR 0x20 -#define ETH_TRANSCEIVER_TYPE_1000BASET 0x21 -#define ETH_TRANSCEIVER_TYPE_10G_BASET 0x22 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_SR 0x30 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_CR 0x31 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_LR 0x32 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_SR 0x33 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_CR 0x34 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_LR 0x35 -#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_AOC 0x36 + +u32 transceiver_data; +#define ETH_TRANSCEIVER_STATE_MASK 0x000000ff +#define ETH_TRANSCEIVER_STATE_SHIFT 0x00000000 +#define ETH_TRANSCEIVER_STATE_OFFSET 0x00000000 +#define ETH_TRANSCEIVER_STATE_UNPLUGGED 0x00000000 +#define ETH_TRANSCEIVER_STATE_PRESENT 0x00000001 +#define ETH_TRANSCEIVER_STATE_VALID 0x00000003 +#define ETH_TRANSCEIVER_STATE_UPDATING 0x00000008 +#define ETH_TRANSCEIVER_TYPE_MASK 0x0000ff00 +#define ETH_TRANSCEIVER_TYPE_OFFSET 0x8 +#define ETH_TRANSCEIVER_TYPE_NONE 0x00 +#define ETH_TRANSCEIVER_TYPE_UNKNOWN 0xff +#define ETH_TRANSCEIVER_TYPE_1G_PCC 0x01 +#define ETH_TRANSCEIVER_TYPE_1G_ACC 0x02 +#define ETH_TRANSCEIVER_TYPE_1G_LX 0x03 +#define ETH_TRANSCEIVER_TYPE_1G_SX 0x04 +#define ETH_TRANSCEIVER_TYPE_10G_SR 0x05 +#define ETH_TRANSCEIVER_TYPE_10G_LR 0x06 +#define ETH_TRANSCEIVER_TYPE_10G_LRM 0x07 +#define ETH_TRANSCEIVER_TYPE_10G_ER 0x08 +#define ETH_TRANSCEIVER_TYPE_10G_PCC 0x09 +#define ETH_TRANSCEIVER_TYPE_10G_ACC 0x0a +#define ETH_TRANSCEIVER_TYPE_XLPPI 0x0b +#define ETH_TRANSCEIVER_TYPE_40G_LR4 0x0c +#define ETH_TRANSCEIVER_TYPE_40G_SR4 0x0d +#define ETH_TRANSCEIVER_TYPE_40G_CR4 0x0e +#define ETH_TRANSCEIVER_TYPE_100G_AOC 0x0f +#define ETH_TRANSCEIVER_TYPE_100G_SR4 0x10 +#define ETH_TRANSCEIVER_TYPE_100G_LR4 0x11 +#define ETH_TRANSCEIVER_TYPE_100G_ER4 0x12 +#define ETH_TRANSCEIVER_TYPE_100G_ACC 0x13 +#define ETH_TRANSCEIVER_TYPE_100G_CR4 0x14 +#define ETH_TRANSCEIVER_TYPE_4x10G_SR 0x15 +#define ETH_TRANSCEIVER_TYPE_25G_CA_N 0x16 +#define ETH_TRANSCEIVER_TYPE_25G_ACC_S 0x17 +#define ETH_TRANSCEIVER_TYPE_25G_CA_S 0x18 +#define ETH_TRANSCEIVER_TYPE_25G_ACC_M 0x19 +#define ETH_TRANSCEIVER_TYPE_25G_CA_L 0x1a +#define ETH_TRANSCEIVER_TYPE_25G_ACC_L 0x1b +#define ETH_TRANSCEIVER_TYPE_25G_SR 0x1c +#define ETH_TRANSCEIVER_TYPE_25G_LR 0x1d +#define ETH_TRANSCEIVER_TYPE_25G_AOC 0x1e +#define ETH_TRANSCEIVER_TYPE_4x10G 0x1f +#define ETH_TRANSCEIVER_TYPE_4x25G_CR 0x20 +#define ETH_TRANSCEIVER_TYPE_1000BASET 0x21 +#define ETH_TRANSCEIVER_TYPE_10G_BASET 0x22 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_SR 0x30 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_CR 0x31 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_LR 0x32 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_SR 0x33 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_CR 0x34 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_LR 0x35 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_AOC 0x36 +u32 wol_info;u32 wol_pkt_len;u32 wol_pkt_details;
Signature · 1 line
2.25.1
PATCH v3 5/16 qed: add support for multi-rate transceivers
In reply to Alexander LobakinSet the corresponding advertised and supported link modes according to the detected transceiver type and device capabilities.
--- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 4 + drivers/net/ethernet/qlogic/qed/qed_main.c | 120 ++++++++++++++++----- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 9 +- 3 files changed, 106 insertions(+), 27 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_hsi.h +4 -0
@@ -12027,6 +12027,10 @@ struct public_port {#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_CR 0x34#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_LR 0x35#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_40G_100G_AOC 0x36 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_25G_SR 0x37 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_25G_LR 0x38 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_1G_10G_SR 0x39 +#define ETH_TRANSCEIVER_TYPE_MULTI_RATE_1G_10G_LR 0x3au32 wol_info;u32 wol_pkt_len;
drivers/net/ethernet/qlogic/qed/qed_main.c +94 -26
178 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_mcp.c +8 -1
@@ -2193,6 +2193,11 @@ int qed_mcp_trans_speed_mask(struct qed_hwfn *p_hwfn,NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G |NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ;break ; +case ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_25G_SR : +case ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_25G_LR : + *p_speed_mask =NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G | +NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ; +break ;case ETH_TRANSCEIVER_TYPE_40G_CR4 :case ETH_TRANSCEIVER_TYPE_MULTI_RATE_10G_40G_CR : *p_speed_mask = NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G |
@@ -2223,8 +2228,10 @@ int qed_mcp_trans_speed_mask(struct qed_hwfn *p_hwfn, *p_speed_mask =NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ;break ;case ETH_TRANSCEIVER_TYPE_10G_BASET : +case ETH_TRANSCEIVER_TYPE_MULTI_RATE_1G_10G_SR : +case ETH_TRANSCEIVER_TYPE_MULTI_RATE_1G_10G_LR : *p_speed_mask =NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G | -NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ; +NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ;break ;default : DP_INFO(p_hwfn, "Unknown transceiver type 0x%x\n",
Signature · 1 line
2.25.1
PATCH v3 6/16 qed: use transceiver data to fill link partner's advertising speeds
In reply to Alexander LobakinCurrently qed driver does not take into consideration transceiver's capabilities when generating link partner's speed advertisement. This leads to e.g. incorrect ethtool link info on 10GbaseT modules. Use transceiver info not only for advertisement and support arrays, but also for link partner's abilities to fix it.
Misc: fix a couple of comments nearby.
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 49 +++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +29 -20
@@ -1879,6 +1879,27 @@ static void qed_fill_link_capability(struct qed_hwfn *hwfn, } } +static void qed_lp_caps_to_speed_mask (u32 caps,u32 *speed_mask) +{ + *speed_mask =0 ; + +if (caps & + (QED_LINK_PARTNER_SPEED_1G_FD |QED_LINK_PARTNER_SPEED_1G_HD )) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ; +if (caps &QED_LINK_PARTNER_SPEED_10G ) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ; +if (caps &QED_LINK_PARTNER_SPEED_20G ) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ; +if (caps &QED_LINK_PARTNER_SPEED_25G ) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ; +if (caps &QED_LINK_PARTNER_SPEED_40G ) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ; +if (caps &QED_LINK_PARTNER_SPEED_50G ) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ; +if (caps &QED_LINK_PARTNER_SPEED_100G ) + *speed_mask |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ; +} +static void qed_fill_link (struct qed_hwfn *hwfn,struct qed_ptt *ptt,struct qed_link_output *if_link)
@@ -1886,7 +1907,7 @@ static void qed_fill_link(struct qed_hwfn *hwfn,struct qed_mcp_link_capabilities link_caps;struct qed_mcp_link_params params;struct qed_mcp_link_state link; -u32 media_type; +u32 media_type, speed_mask;memset (if_link,0 ,sizeof (*if_link));
@@ -1917,13 +1938,18 @@ static void qed_fill_link(struct qed_hwfn *hwfn,else phylink_clear (if_link->advertised_caps, Autoneg); -/* Fill link advertised capability*/ +/* Fill link advertised capability */ qed_fill_link_capability (hwfn, ptt, params.speed.advertised_speeds, if_link->advertised_caps); -/* Fill link supported capability*/ + +/* Fill link supported capability */ qed_fill_link_capability (hwfn, ptt, link_caps.speed_capabilities, if_link->supported_caps); +/* Fill partner advertised capability */ +qed_lp_caps_to_speed_mask (link.partner_adv_speed, &speed_mask); +qed_fill_link_capability (hwfn, ptt, speed_mask, if_link->lp_caps); +if (link.link_up) if_link->speed = link.speed;
@@ -1941,23 +1967,6 @@ static void qed_fill_link(struct qed_hwfn *hwfn,if (params.pause.forced_tx) if_link->pause_config |=QED_LINK_PAUSE_TX_ENABLE ; -/* Link partner capabilities */ - -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_1G_FD ) - phylink_set(if_link->lp_caps, 1000baseT_Full); -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_10G ) - phylink_set(if_link->lp_caps, 10000baseKR_Full); -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_20G ) - phylink_set(if_link->lp_caps, 20000baseKR2_Full); -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_25G ) - phylink_set(if_link->lp_caps, 25000baseKR_Full); -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_40G ) - phylink_set(if_link->lp_caps, 40000baseLR4_Full); -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_50G ) - phylink_set(if_link->lp_caps, 50000baseKR2_Full); -if (link.partner_adv_speed &QED_LINK_PARTNER_SPEED_100G ) - phylink_set(if_link->lp_caps, 100000baseKR4_Full); -if (link.an_complete)phylink_set (if_link->lp_caps, Autoneg);if (link.partner_adv_pause)
Signature · 1 line
2.25.1
PATCH v3 7/16 qed: reformat several structures a bit
In reply to Alexander LobakinPrior to adding new fields and bitfields, reformat the related structures according to the Linux style (spaces to tabs, lowercase hex, indentation etc.).
--- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 256 +++++++++++----------- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 85 ++++--- include/linux/qed/qed_if.h | 64 +++--- 3 files changed, 205 insertions(+), 200 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_hsi.h +130 -126
@@ -11536,34 +11536,35 @@ typedef u32 offsize_t; /* In DWORDS !!! *//* PHY configuration */ struct eth_phy_cfg { -u32 speed; -#define ETH_SPEED_AUTONEG 0 -#define ETH_SPEED_SMARTLINQ 0x8 - -u32 pause; -#define ETH_PAUSE_NONE 0x0 -#define ETH_PAUSE_AUTONEG 0x1 -#define ETH_PAUSE_RX 0x2 -#define ETH_PAUSE_TX 0x4 - -u32 adv_speed; -u32 loopback_mode; -#define ETH_LOOPBACK_NONE (0) -#define ETH_LOOPBACK_INT_PHY (1) -#define ETH_LOOPBACK_EXT_PHY (2) -#define ETH_LOOPBACK_EXT (3) -#define ETH_LOOPBACK_MAC (4) - -u32 eee_cfg; +u32 speed; +#define ETH_SPEED_AUTONEG 0x0 +#define ETH_SPEED_SMARTLINQ 0x8 + +u32 pause; +#define ETH_PAUSE_NONE 0x0 +#define ETH_PAUSE_AUTONEG 0x1 +#define ETH_PAUSE_RX 0x2 +#define ETH_PAUSE_TX 0x4 + +u32 adv_speed; + +u32 loopback_mode; +#define ETH_LOOPBACK_NONE 0x0 +#define ETH_LOOPBACK_INT_PHY 0x1 +#define ETH_LOOPBACK_EXT_PHY 0x2 +#define ETH_LOOPBACK_EXT 0x3 +#define ETH_LOOPBACK_MAC 0x4 + +u32 eee_cfg;#define EEE_CFG_EEE_ENABLED BIT(0)#define EEE_CFG_TX_LPI BIT(1)#define EEE_CFG_ADV_SPEED_1G BIT(2)#define EEE_CFG_ADV_SPEED_10G BIT(3) -#define EEE_TX_TIMER_USEC_MASK (0xfffffff0) +#define EEE_TX_TIMER_USEC_MASK 0xfffffff0#define EEE_TX_TIMER_USEC_OFFSET 4 -#define EEE_TX_TIMER_USEC_BALANCED_TIME (0xa00) -#define EEE_TX_TIMER_USEC_AGGRESSIVE_TIME (0x100) -#define EEE_TX_TIMER_USEC_LATENCY_TIME (0x6000) +#define EEE_TX_TIMER_USEC_BALANCED_TIME 0xa00 +#define EEE_TX_TIMER_USEC_AGGRESSIVE_TIME 0x100 +#define EEE_TX_TIMER_USEC_LATENCY_TIME 0x6000u32 feature_config_flags;#define ETH_EEE_MODE_ADV_LPI (1 << 0)
@@ -11895,41 +11896,36 @@ struct public_path { };struct public_port { -u32 validity_map; - -u32 link_status; -#define LINK_STATUS_LINK_UP 0x00000001 -#define LINK_STATUS_SPEED_AND_DUPLEX_MASK 0x0000001e -#define LINK_STATUS_SPEED_AND_DUPLEX_1000THD (1 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_1000TFD (2 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_10G (3 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_20G (4 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_40G (5 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_50G (6 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_100G (7 << 1) -#define LINK_STATUS_SPEED_AND_DUPLEX_25G (8 << 1) - -#define LINK_STATUS_AUTO_NEGOTIATE_ENABLED 0x00000020 - -#define LINK_STATUS_AUTO_NEGOTIATE_COMPLETE 0x00000040 -#define LINK_STATUS_PARALLEL_DETECTION_USED 0x00000080 - +u32 validity_map; + +u32 link_status; +#define LINK_STATUS_LINK_UP 0x00000001 +#define LINK_STATUS_SPEED_AND_DUPLEX_MASK 0x0000001e +#define LINK_STATUS_SPEED_AND_DUPLEX_1000THD (1 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_1000TFD (2 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_10G (3 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_20G (4 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_40G (5 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_50G (6 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_100G (7 << 1) +#define LINK_STATUS_SPEED_AND_DUPLEX_25G (8 << 1) +#define LINK_STATUS_AUTO_NEGOTIATE_ENABLED 0x00000020 +#define LINK_STATUS_AUTO_NEGOTIATE_COMPLETE 0x00000040 +#define LINK_STATUS_PARALLEL_DETECTION_USED 0x00000080#define LINK_STATUS_PFC_ENABLED 0x00000100 -#define LINK_STATUS_LINK_PARTNER_1000TFD_CAPABLE 0x00000200 -#define LINK_STATUS_LINK_PARTNER_1000THD_CAPABLE 0x00000400 +#define LINK_STATUS_LINK_PARTNER_1000TFD_CAPABLE 0x00000200 +#define LINK_STATUS_LINK_PARTNER_1000THD_CAPABLE 0x00000400#define LINK_STATUS_LINK_PARTNER_10G_CAPABLE 0x00000800#define LINK_STATUS_LINK_PARTNER_20G_CAPABLE 0x00001000#define LINK_STATUS_LINK_PARTNER_40G_CAPABLE 0x00002000#define LINK_STATUS_LINK_PARTNER_50G_CAPABLE 0x00004000#define LINK_STATUS_LINK_PARTNER_100G_CAPABLE 0x00008000#define LINK_STATUS_LINK_PARTNER_25G_CAPABLE 0x00010000 - -#define LINK_STATUS_LINK_PARTNER_FLOW_CONTROL_MASK 0x000C0000 +#define LINK_STATUS_LINK_PARTNER_FLOW_CONTROL_MASK 0x000c0000#define LINK_STATUS_LINK_PARTNER_NOT_PAUSE_CAPABLE (0 << 18)#define LINK_STATUS_LINK_PARTNER_SYMMETRIC_PAUSE (1 << 18)#define LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE (2 << 18)#define LINK_STATUS_LINK_PARTNER_BOTH_PAUSE (3 << 18) -#define LINK_STATUS_SFP_TX_FAULT 0x00100000#define LINK_STATUS_TX_FLOW_CONTROL_ENABLED 0x00200000#define LINK_STATUS_RX_FLOW_CONTROL_ENABLED 0x00400000
@@ -12630,49 +12626,49 @@ struct public_drv_mb {#define FW_MSG_CODE_MDUMP_INVALID_CMD 0x00030000 -u32 fw_mb_param; -#define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR_MASK 0xFFFF0000 +u32 fw_mb_param; +#define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR_MASK 0xffff0000#define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR_SHIFT 16 -#define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR_MASK 0x0000FFFF +#define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR_MASK 0x0000ffff#define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR_SHIFT 0 -/* get pf rdma protocol command responce */ -#define FW_MB_PARAM_GET_PF_RDMA_NONE 0x0 -#define FW_MB_PARAM_GET_PF_RDMA_ROCE 0x1 -#define FW_MB_PARAM_GET_PF_RDMA_IWARP 0x2 -#define FW_MB_PARAM_GET_PF_RDMA_BOTH 0x3 +/* Get PF RDMA protocol command response */ +#define FW_MB_PARAM_GET_PF_RDMA_NONE 0x0 +#define FW_MB_PARAM_GET_PF_RDMA_ROCE 0x1 +#define FW_MB_PARAM_GET_PF_RDMA_IWARP 0x2 +#define FW_MB_PARAM_GET_PF_RDMA_BOTH 0x3 -/* get MFW feature support response */ -#define FW_MB_PARAM_FEATURE_SUPPORT_SMARTLINQ 0x00000001 -#define FW_MB_PARAM_FEATURE_SUPPORT_EEE 0x00000002 -#define FW_MB_PARAM_FEATURE_SUPPORT_VLINK 0x00010000 +/* Get MFW feature support response */ +#define FW_MB_PARAM_FEATURE_SUPPORT_SMARTLINQ 0x00000001 +#define FW_MB_PARAM_FEATURE_SUPPORT_EEE 0x00000002 +#define FW_MB_PARAM_FEATURE_SUPPORT_VLINK 0x00010000 -#define FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR (1 << 0) +#define FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR BIT(0) -#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALID_MASK 0x00000001 -#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALID_SHIFT 0 -#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALUE_MASK 0x00000002 -#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALUE_SHIFT 1 -#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALID_MASK 0x00000004 -#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALID_SHIFT 2 -#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALUE_MASK 0x00000008 -#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALUE_SHIFT 3 +#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALID_MASK 0x00000001 +#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALID_SHIFT 0 +#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALUE_MASK 0x00000002 +#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALUE_SHIFT 1 +#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALID_MASK 0x00000004 +#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALID_SHIFT 2 +#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALUE_MASK 0x00000008 +#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALUE_SHIFT 3 -#define FW_MB_PARAM_PPFID_BITMAP_MASK 0xFF -#define FW_MB_PARAM_PPFID_BITMAP_SHIFT 0 +#define FW_MB_PARAM_PPFID_BITMAP_MASK 0xff +#define FW_MB_PARAM_PPFID_BITMAP_SHIFT 0 -u32 drv_pulse_mb; -#define DRV_PULSE_SEQ_MASK 0x00007fff -#define DRV_PULSE_SYSTEM_TIME_MASK 0xffff0000 -#define DRV_PULSE_ALWAYS_ALIVE 0x00008000 +u32 drv_pulse_mb; +#define DRV_PULSE_SEQ_MASK 0x00007fff +#define DRV_PULSE_SYSTEM_TIME_MASK 0xffff0000 +#define DRV_PULSE_ALWAYS_ALIVE 0x00008000 -u32 mcp_pulse_mb; -#define MCP_PULSE_SEQ_MASK 0x00007fff -#define MCP_PULSE_ALWAYS_ALIVE 0x00008000 -#define MCP_EVENT_MASK 0xffff0000 -#define MCP_EVENT_OTHER_DRIVER_RESET_REQ 0x00010000 +u32 mcp_pulse_mb; +#define MCP_PULSE_SEQ_MASK 0x00007fff +#define MCP_PULSE_ALWAYS_ALIVE 0x00008000 +#define MCP_EVENT_MASK 0xffff0000 +#define MCP_EVENT_OTHER_DRIVER_RESET_REQ 0x00010000 -union drv_union_data union_data; +union drv_union_data union_data; };#define FW_MB_PARAM_NVM_PUT_FILE_REQ_OFFSET_MASK 0x00ffffff
@@ -13048,24 +13044,27 @@ struct nvm_cfg1_path { };struct nvm_cfg1_port { -u32 reserved__m_relocated_to_option_123; -u32 reserved__m_relocated_to_option_124; -u32 generic_cont0; -#define NVM_CFG1_PORT_DCBX_MODE_MASK 0x000F0000 +u32 rel_to_opt123; +u32 rel_to_opt124; + +u32 generic_cont0; +#define NVM_CFG1_PORT_DCBX_MODE_MASK 0x000f0000#define NVM_CFG1_PORT_DCBX_MODE_OFFSET 16#define NVM_CFG1_PORT_DCBX_MODE_DISABLED 0x0#define NVM_CFG1_PORT_DCBX_MODE_IEEE 0x1#define NVM_CFG1_PORT_DCBX_MODE_CEE 0x2#define NVM_CFG1_PORT_DCBX_MODE_DYNAMIC 0x3 -#define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_MASK 0x00F00000 +#define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_MASK 0x00f00000#define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_OFFSET 20#define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_ETHERNET 0x1#define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_FCOE 0x2#define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_ISCSI 0x4 -u32 pcie_cfg; -u32 features; -u32 speed_cap_mask; -#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_MASK 0x0000FFFF + +u32 pcie_cfg; +u32 features; + +u32 speed_cap_mask; +#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_MASK 0x0000ffff#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_OFFSET 0#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G 0x1#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G 0x2
@@ -13074,8 +13073,9 @@ struct nvm_cfg1_port {#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G 0x10#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G 0x20#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G 0x40 -u32 link_settings; -#define NVM_CFG1_PORT_DRV_LINK_SPEED_MASK 0x0000000F + +u32 link_settings; +#define NVM_CFG1_PORT_DRV_LINK_SPEED_MASK 0x0000000f#define NVM_CFG1_PORT_DRV_LINK_SPEED_OFFSET 0#define NVM_CFG1_PORT_DRV_LINK_SPEED_AUTONEG 0x0#define NVM_CFG1_PORT_DRV_LINK_SPEED_1G 0x1
@@ -13091,49 +13091,53 @@ struct nvm_cfg1_port {#define NVM_CFG1_PORT_DRV_FLOW_CONTROL_AUTONEG 0x1#define NVM_CFG1_PORT_DRV_FLOW_CONTROL_RX 0x2#define NVM_CFG1_PORT_DRV_FLOW_CONTROL_TX 0x4 -u32 phy_cfg; -u32 mgmt_traffic; -u32 ext_phy; +u32 phy_cfg; +u32 mgmt_traffic; + +u32 ext_phy;/* EEE power saving mode */ -#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_MASK 0x00FF0000 +#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_MASK 0x00ff0000#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_OFFSET 16#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_DISABLED 0x0#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_BALANCED 0x1#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_AGGRESSIVE 0x2#define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_LOW_LATENCY 0x3 -u32 mba_cfg1; -u32 mba_cfg2; -u32 vf_cfg; -struct nvm_cfg_mac_address lldp_mac_address; -u32 led_port_settings; -u32 transceiver_00; -u32 device_ids; -u32 board_cfg; -#define NVM_CFG1_PORT_PORT_TYPE_MASK 0x000000FF -#define NVM_CFG1_PORT_PORT_TYPE_OFFSET 0 -#define NVM_CFG1_PORT_PORT_TYPE_UNDEFINED 0x0 -#define NVM_CFG1_PORT_PORT_TYPE_MODULE 0x1 -#define NVM_CFG1_PORT_PORT_TYPE_BACKPLANE 0x2 -#define NVM_CFG1_PORT_PORT_TYPE_EXT_PHY 0x3 -#define NVM_CFG1_PORT_PORT_TYPE_MODULE_SLAVE 0x4 -u32 mnm_10g_cap; -u32 mnm_10g_ctrl; -u32 mnm_10g_misc; -u32 mnm_25g_cap; -u32 mnm_25g_ctrl; -u32 mnm_25g_misc; -u32 mnm_40g_cap; -u32 mnm_40g_ctrl; -u32 mnm_40g_misc; -u32 mnm_50g_cap; -u32 mnm_50g_ctrl; -u32 mnm_50g_misc; -u32 mnm_100g_cap; -u32 mnm_100g_ctrl; -u32 mnm_100g_misc; -u32 reserved[116 ]; +u32 mba_cfg1; +u32 mba_cfg2; +u32 vf_cfg; +struct nvm_cfg_mac_address lldp_mac_address; +u32 led_port_settings; +u32 transceiver_00; +u32 device_ids; + +u32 board_cfg; +#define NVM_CFG1_PORT_PORT_TYPE_MASK 0x000000ff +#define NVM_CFG1_PORT_PORT_TYPE_OFFSET 0 +#define NVM_CFG1_PORT_PORT_TYPE_UNDEFINED 0x0 +#define NVM_CFG1_PORT_PORT_TYPE_MODULE 0x1 +#define NVM_CFG1_PORT_PORT_TYPE_BACKPLANE 0x2 +#define NVM_CFG1_PORT_PORT_TYPE_EXT_PHY 0x3 +#define NVM_CFG1_PORT_PORT_TYPE_MODULE_SLAVE 0x4 + +u32 mnm_10g_cap; +u32 mnm_10g_ctrl; +u32 mnm_10g_misc; +u32 mnm_25g_cap; +u32 mnm_25g_ctrl; +u32 mnm_25g_misc; +u32 mnm_40g_cap; +u32 mnm_40g_ctrl; +u32 mnm_40g_misc; +u32 mnm_50g_cap; +u32 mnm_50g_ctrl; +u32 mnm_50g_misc; +u32 mnm_100g_cap; +u32 mnm_100g_ctrl; +u32 mnm_100g_misc; + +u32 reserved[116 ]; };struct nvm_cfg1_func {
drivers/net/ethernet/qlogic/qed/qed_mcp.h +42 -43
103 lines not on this page · raw message
include/linux/qed/qed_if.h +33 -31
84 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 8/16 qed: add support for Forward Error Correction
In reply to Alexander LobakinAdd all necessary routines for reading supported FEC modes from NVM and querying FEC control to the MFW (if the running version supports it).
--- drivers/net/ethernet/qlogic/qed/qed_dev.c | 54 +++++++++++++++------- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 24 +++++++++- drivers/net/ethernet/qlogic/qed/qed_main.c | 6 +++ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 47 +++++++++++++++---- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 4 ++ include/linux/qed/qed_if.h | 13 ++++++ 6 files changed, 121 insertions(+), 27 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_dev.c +37 -17
@@ -3968,7 +3968,7 @@ static int qed_hw_get_resc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)static int qed_hw_get_nvm_info (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt) { -u32 port_cfg_addr, link_temp, nvm_cfg_addr, device_capabilities; +u32 port_cfg_addr, link_temp, nvm_cfg_addr, device_capabilities, fc;u32 nvm_cfg1_offset, mf_mode, addr, generic_cont0, core_cfg;struct qed_mcp_link_capabilities *p_caps;struct qed_mcp_link_params *link;
@@ -4081,16 +4081,38 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) p_hwfn->mcp_info->link_capabilities.default_speed_autoneg = link->speed.autoneg; - link_temp &=NVM_CFG1_PORT_DRV_FLOW_CONTROL_MASK ; - link_temp >>=NVM_CFG1_PORT_DRV_FLOW_CONTROL_OFFSET ; - link->pause.autoneg = !!(link_temp & -NVM_CFG1_PORT_DRV_FLOW_CONTROL_AUTONEG ); - link->pause.forced_rx = !!(link_temp & -NVM_CFG1_PORT_DRV_FLOW_CONTROL_RX ); - link->pause.forced_tx = !!(link_temp & -NVM_CFG1_PORT_DRV_FLOW_CONTROL_TX ); + fc =GET_MFW_FIELD (link_temp,NVM_CFG1_PORT_DRV_FLOW_CONTROL ); + link->pause.autoneg = !!(fc &NVM_CFG1_PORT_DRV_FLOW_CONTROL_AUTONEG ); + link->pause.forced_rx = !!(fc &NVM_CFG1_PORT_DRV_FLOW_CONTROL_RX ); + link->pause.forced_tx = !!(fc &NVM_CFG1_PORT_DRV_FLOW_CONTROL_TX ); link->loopback_mode =0 ; +if (p_hwfn->mcp_info->capabilities & +FW_MB_PARAM_FEATURE_SUPPORT_FEC_CONTROL ) { +switch (GET_MFW_FIELD (link_temp, +NVM_CFG1_PORT_FEC_FORCE_MODE )) { +case NVM_CFG1_PORT_FEC_FORCE_MODE_NONE : + p_caps->fec_default |=QED_FEC_MODE_NONE ; +break ; +case NVM_CFG1_PORT_FEC_FORCE_MODE_FIRECODE : + p_caps->fec_default |=QED_FEC_MODE_FIRECODE ; +break ; +case NVM_CFG1_PORT_FEC_FORCE_MODE_RS : + p_caps->fec_default |=QED_FEC_MODE_RS ; +break ; +case NVM_CFG1_PORT_FEC_FORCE_MODE_AUTO : + p_caps->fec_default |=QED_FEC_MODE_AUTO ; +break ; +default : +DP_VERBOSE (p_hwfn,NETIF_MSG_LINK , +"unknown FEC mode in 0x%08x\n" , link_temp); + } + }else { + p_caps->fec_default =QED_FEC_MODE_UNSUPPORTED ; + } + + link->fec = p_caps->fec_default; +if (p_hwfn->mcp_info->capabilities &FW_MB_PARAM_FEATURE_SUPPORT_EEE ) { link_temp =qed_rd (p_hwfn, p_ptt, port_cfg_addr + offsetof(struct nvm_cfg1_port , ext_phy));
@@ -4122,14 +4144,12 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) p_caps->default_eee =QED_MCP_EEE_UNSUPPORTED ; } -DP_VERBOSE (p_hwfn, -NETIF_MSG_LINK , -"Read default link: Speed 0x%08x, Adv. Speed 0x%08x, AN: 0x%02x, PAUSE AN: 0x%02x EEE: %02x [%08x usec]\n" , - link->speed.forced_speed, - link->speed.advertised_speeds, - link->speed.autoneg, - link->pause.autoneg, - p_caps->default_eee, p_caps->eee_lpi_timer); +DP_VERBOSE (p_hwfn,NETIF_MSG_LINK , +"Read default link: Speed 0x%08x, Adv. Speed 0x%08x, AN: 0x%02x, PAUSE AN: 0x%02x, EEE: 0x%02x [0x%08x usec], FEC: 0x%02x\n" , + link->speed.forced_speed, link->speed.advertised_speeds, + link->speed.autoneg, link->pause.autoneg, + p_caps->default_eee, p_caps->eee_lpi_timer, + p_caps->fec_default);if (IS_LEAD_HWFN (p_hwfn)) {struct qed_dev *cdev = p_hwfn->cdev;
drivers/net/ethernet/qlogic/qed/qed_hsi.h +22 -2
@@ -11566,8 +11566,15 @@ struct eth_phy_cfg {#define EEE_TX_TIMER_USEC_AGGRESSIVE_TIME 0x100#define EEE_TX_TIMER_USEC_LATENCY_TIME 0x6000 -u32 feature_config_flags; -#define ETH_EEE_MODE_ADV_LPI (1 << 0) +u32 deprecated; + +u32 fec_mode; +#define FEC_FORCE_MODE_MASK 0x000000ff +#define FEC_FORCE_MODE_OFFSET 0 +#define FEC_FORCE_MODE_NONE 0x00 +#define FEC_FORCE_MODE_FIRECODE 0x01 +#define FEC_FORCE_MODE_RS 0x02 +#define FEC_FORCE_MODE_AUTO 0x07 };struct port_mf_cfg {
@@ -11934,6 +11941,11 @@ struct public_port {#define LINK_STATUS_MAC_REMOTE_FAULT 0x02000000#define LINK_STATUS_UNSUPPORTED_SPD_REQ 0x04000000 +#define LINK_STATUS_FEC_MODE_MASK 0x38000000 +#define LINK_STATUS_FEC_MODE_NONE (0 << 27) +#define LINK_STATUS_FEC_MODE_FIRECODE_CL74 (1 << 27) +#define LINK_STATUS_FEC_MODE_RS_CL91 (2 << 27) +u32 link_status1;u32 ext_phy_fw_version;u32 drv_phy_cfg_addr;
@@ -12553,6 +12565,7 @@ struct public_drv_mb {#define DRV_MB_PARAM_FEATURE_SUPPORT_PORT_MASK 0x0000FFFF#define DRV_MB_PARAM_FEATURE_SUPPORT_PORT_OFFSET 0#define DRV_MB_PARAM_FEATURE_SUPPORT_PORT_EEE 0x00000002 +#define DRV_MB_PARAM_FEATURE_SUPPORT_PORT_FEC_CONTROL 0x00000004#define DRV_MB_PARAM_FEATURE_SUPPORT_FUNC_VLINK 0x00010000/* DRV_MSG_CODE_DEBUG_DATA_SEND parameters */
@@ -12641,6 +12654,7 @@ struct public_drv_mb {/* Get MFW feature support response */ #define FW_MB_PARAM_FEATURE_SUPPORT_SMARTLINQ 0x00000001#define FW_MB_PARAM_FEATURE_SUPPORT_EEE 0x00000002 +#define FW_MB_PARAM_FEATURE_SUPPORT_FEC_CONTROL 0x00000020#define FW_MB_PARAM_FEATURE_SUPPORT_VLINK 0x00010000#define FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR BIT(0)
@@ -13091,6 +13105,12 @@ struct nvm_cfg1_port {#define NVM_CFG1_PORT_DRV_FLOW_CONTROL_AUTONEG 0x1#define NVM_CFG1_PORT_DRV_FLOW_CONTROL_RX 0x2#define NVM_CFG1_PORT_DRV_FLOW_CONTROL_TX 0x4 +#define NVM_CFG1_PORT_FEC_FORCE_MODE_MASK 0x000e0000 +#define NVM_CFG1_PORT_FEC_FORCE_MODE_OFFSET 17 +#define NVM_CFG1_PORT_FEC_FORCE_MODE_NONE 0x0 +#define NVM_CFG1_PORT_FEC_FORCE_MODE_FIRECODE 0x1 +#define NVM_CFG1_PORT_FEC_FORCE_MODE_RS 0x2 +#define NVM_CFG1_PORT_FEC_FORCE_MODE_AUTO 0x7u32 phy_cfg;u32 mgmt_traffic;
drivers/net/ethernet/qlogic/qed/qed_main.c +6 -0
@@ -1597,6 +1597,9 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params)memcpy (&link_params->eee, ¶ms->eee,sizeof (link_params->eee)); +if (params->override_flags &QED_LINK_OVERRIDE_FEC_CONFIG ) + link_params->fec = params->fec; + rc =qed_mcp_set_link (hwfn, ptt, params->link_up);qed_ptt_release (hwfn, ptt);
@@ -1938,6 +1941,9 @@ static void qed_fill_link(struct qed_hwfn *hwfn,else phylink_clear (if_link->advertised_caps, Autoneg); + if_link->sup_fec = link_caps.fec_default; + if_link->active_fec = params.fec; +/* Fill link advertised capability */ qed_fill_link_capability (hwfn, ptt, params.speed.advertised_speeds, if_link->advertised_caps);
drivers/net/ethernet/qlogic/qed/qed_mcp.c +39 -8
76 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_mcp.h +4 -0
@@ -38,11 +38,13 @@ struct qed_mcp_link_params {struct qed_mcp_link_pause_params pause;u32 loopback_mode;struct qed_link_eee_params eee; +u32 fec; };struct qed_mcp_link_capabilities {u32 speed_capabilities;bool default_speed_autoneg; +u32 fec_default;enum qed_mcp_eee_mode default_eee;u32 eee_lpi_timer;u8 eee_speed_caps;
@@ -88,6 +90,8 @@ struct qed_mcp_link_state {bool eee_active;u8 eee_adv_caps;u8 eee_lp_adv_caps; + +u32 fec_active; };struct qed_mcp_function_info {
include/linux/qed/qed_if.h +13 -0
@@ -661,6 +661,14 @@ enum qed_protocol { QED_PROTOCOL_FCOE, }; +enum qed_fec_mode { +QED_FEC_MODE_NONE =BIT (0 ), +QED_FEC_MODE_FIRECODE =BIT (1 ), +QED_FEC_MODE_RS =BIT (2 ), +QED_FEC_MODE_AUTO =BIT (3 ), +QED_FEC_MODE_UNSUPPORTED =BIT (4 ), +}; +struct qed_link_params {bool link_up;
@@ -671,6 +679,7 @@ struct qed_link_params {#define QED_LINK_OVERRIDE_PAUSE_CONFIG BIT(3)#define QED_LINK_OVERRIDE_LOOPBACK_MODE BIT(4)#define QED_LINK_OVERRIDE_EEE_CONFIG BIT(5) +#define QED_LINK_OVERRIDE_FEC_CONFIG BIT(6)bool autoneg;__ETHTOOL_DECLARE_LINK_MODE_MASK (adv_speeds);
@@ -689,6 +698,7 @@ struct qed_link_params {#define QED_LINK_LOOPBACK_MAC BIT(4)struct qed_link_eee_params eee; +u32 fec; };struct qed_link_output {
@@ -709,6 +719,9 @@ struct qed_link_output {bool eee_active;u8 sup_caps;struct qed_link_eee_params eee; + +u32 sup_fec; +u32 active_fec; };struct qed_probe_params {
Signature · 1 line
2.25.1
PATCH v3 9/16 qede: format qede{,_vf}_ethtool_ops
In reply to Alexander LobakinPrior to adding new callbacks, format qede ethtool_ops structs to make declarations more fancy and readable.
--- .../net/ethernet/qlogic/qede/qede_ethtool.c | 137 +++++++++--------- 1 file changed, 68 insertions(+), 69 deletions(-)
drivers/net/ethernet/qlogic/qede/qede_ethtool.c +68 -69
@@ -2032,78 +2032,77 @@ static int qede_get_dump_data(struct net_device *dev, }static const struct ethtool_ops qede_ethtool_ops = { - .supported_coalesce_params =ETHTOOL_COALESCE_USECS , - .get_link_ksettings = qede_get_link_ksettings, - .set_link_ksettings = qede_set_link_ksettings, - .get_drvinfo = qede_get_drvinfo, - .get_regs_len = qede_get_regs_len, - .get_regs = qede_get_regs, - .get_wol = qede_get_wol, - .set_wol = qede_set_wol, - .get_msglevel = qede_get_msglevel, - .set_msglevel = qede_set_msglevel, - .nway_reset = qede_nway_reset, - .get_link = qede_get_link, - .get_coalesce = qede_get_coalesce, - .set_coalesce = qede_set_coalesce, - .get_ringparam = qede_get_ringparam, - .set_ringparam = qede_set_ringparam, - .get_pauseparam = qede_get_pauseparam, - .set_pauseparam = qede_set_pauseparam, - .get_strings = qede_get_strings, - .set_phys_id = qede_set_phys_id, - .get_ethtool_stats = qede_get_ethtool_stats, - .get_priv_flags = qede_get_priv_flags, - .set_priv_flags = qede_set_priv_flags, - .get_sset_count = qede_get_sset_count, - .get_rxnfc = qede_get_rxnfc, - .set_rxnfc = qede_set_rxnfc, - .get_rxfh_indir_size = qede_get_rxfh_indir_size, - .get_rxfh_key_size = qede_get_rxfh_key_size, - .get_rxfh = qede_get_rxfh, - .set_rxfh = qede_set_rxfh, - .get_ts_info = qede_get_ts_info, - .get_channels = qede_get_channels, - .set_channels = qede_set_channels, - .self_test = qede_self_test, - .get_module_info = qede_get_module_info, - .get_module_eeprom = qede_get_module_eeprom, - .get_eee = qede_get_eee, - .set_eee = qede_set_eee, - - .get_tunable = qede_get_tunable, - .set_tunable = qede_set_tunable, - .flash_device = qede_flash_device, - .get_dump_flag = qede_get_dump_flag, - .get_dump_data = qede_get_dump_data, - .set_dump = qede_set_dump, + .supported_coalesce_params =ETHTOOL_COALESCE_USECS , + .get_link_ksettings = qede_get_link_ksettings, + .set_link_ksettings = qede_set_link_ksettings, + .get_drvinfo = qede_get_drvinfo, + .get_regs_len = qede_get_regs_len, + .get_regs = qede_get_regs, + .get_wol = qede_get_wol, + .set_wol = qede_set_wol, + .get_msglevel = qede_get_msglevel, + .set_msglevel = qede_set_msglevel, + .nway_reset = qede_nway_reset, + .get_link = qede_get_link, + .get_coalesce = qede_get_coalesce, + .set_coalesce = qede_set_coalesce, + .get_ringparam = qede_get_ringparam, + .set_ringparam = qede_set_ringparam, + .get_pauseparam = qede_get_pauseparam, + .set_pauseparam = qede_set_pauseparam, + .get_strings = qede_get_strings, + .set_phys_id = qede_set_phys_id, + .get_ethtool_stats = qede_get_ethtool_stats, + .get_priv_flags = qede_get_priv_flags, + .set_priv_flags = qede_set_priv_flags, + .get_sset_count = qede_get_sset_count, + .get_rxnfc = qede_get_rxnfc, + .set_rxnfc = qede_set_rxnfc, + .get_rxfh_indir_size = qede_get_rxfh_indir_size, + .get_rxfh_key_size = qede_get_rxfh_key_size, + .get_rxfh = qede_get_rxfh, + .set_rxfh = qede_set_rxfh, + .get_ts_info = qede_get_ts_info, + .get_channels = qede_get_channels, + .set_channels = qede_set_channels, + .self_test = qede_self_test, + .get_module_info = qede_get_module_info, + .get_module_eeprom = qede_get_module_eeprom, + .get_eee = qede_get_eee, + .set_eee = qede_set_eee, + .get_tunable = qede_get_tunable, + .set_tunable = qede_set_tunable, + .flash_device = qede_flash_device, + .get_dump_flag = qede_get_dump_flag, + .get_dump_data = qede_get_dump_data, + .set_dump = qede_set_dump, };static const struct ethtool_ops qede_vf_ethtool_ops = { - .supported_coalesce_params =ETHTOOL_COALESCE_USECS , - .get_link_ksettings = qede_get_link_ksettings, - .get_drvinfo = qede_get_drvinfo, - .get_msglevel = qede_get_msglevel, - .set_msglevel = qede_set_msglevel, - .get_link = qede_get_link, - .get_coalesce = qede_get_coalesce, - .set_coalesce = qede_set_coalesce, - .get_ringparam = qede_get_ringparam, - .set_ringparam = qede_set_ringparam, - .get_strings = qede_get_strings, - .get_ethtool_stats = qede_get_ethtool_stats, - .get_priv_flags = qede_get_priv_flags, - .get_sset_count = qede_get_sset_count, - .get_rxnfc = qede_get_rxnfc, - .set_rxnfc = qede_set_rxnfc, - .get_rxfh_indir_size = qede_get_rxfh_indir_size, - .get_rxfh_key_size = qede_get_rxfh_key_size, - .get_rxfh = qede_get_rxfh, - .set_rxfh = qede_set_rxfh, - .get_channels = qede_get_channels, - .set_channels = qede_set_channels, - .get_tunable = qede_get_tunable, - .set_tunable = qede_set_tunable, + .supported_coalesce_params =ETHTOOL_COALESCE_USECS , + .get_link_ksettings = qede_get_link_ksettings, + .get_drvinfo = qede_get_drvinfo, + .get_msglevel = qede_get_msglevel, + .set_msglevel = qede_set_msglevel, + .get_link = qede_get_link, + .get_coalesce = qede_get_coalesce, + .set_coalesce = qede_set_coalesce, + .get_ringparam = qede_get_ringparam, + .set_ringparam = qede_set_ringparam, + .get_strings = qede_get_strings, + .get_ethtool_stats = qede_get_ethtool_stats, + .get_priv_flags = qede_get_priv_flags, + .get_sset_count = qede_get_sset_count, + .get_rxnfc = qede_get_rxnfc, + .set_rxnfc = qede_set_rxnfc, + .get_rxfh_indir_size = qede_get_rxfh_indir_size, + .get_rxfh_key_size = qede_get_rxfh_key_size, + .get_rxfh = qede_get_rxfh, + .set_rxfh = qede_set_rxfh, + .get_channels = qede_get_channels, + .set_channels = qede_set_channels, + .get_tunable = qede_get_tunable, + .set_tunable = qede_set_tunable, };void qede_set_ethtool_ops (struct net_device *dev)
Signature · 1 line
2.25.1
PATCH v3 10/16 qede: introduce support for FEC control
In reply to Alexander LobakinAdd Ethtool callbacks for querying and setting FEC parameters if it's supported by the underlying qed module and MFW version running on the device.
--- .../net/ethernet/qlogic/qede/qede_ethtool.c | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+)
drivers/net/ethernet/qlogic/qede/qede_ethtool.c +74 -0
@@ -1834,6 +1834,78 @@ static int qede_set_eee(struct net_device *dev, struct ethtool_eee *edata)return 0 ; } +static u32 qede_link_to_ethtool_fec (u32 link_fec) +{ +u32 eth_fec =0 ; + +if (link_fec &QED_FEC_MODE_NONE ) + eth_fec |=ETHTOOL_FEC_OFF ; +if (link_fec &QED_FEC_MODE_FIRECODE ) + eth_fec |=ETHTOOL_FEC_BASER ; +if (link_fec &QED_FEC_MODE_RS ) + eth_fec |=ETHTOOL_FEC_RS ; +if (link_fec &QED_FEC_MODE_AUTO ) + eth_fec |=ETHTOOL_FEC_AUTO ; +if (link_fec &QED_FEC_MODE_UNSUPPORTED ) + eth_fec |=ETHTOOL_FEC_NONE ; + +return eth_fec; +} + +static u32 qede_ethtool_to_link_fec (u32 eth_fec) +{ +u32 link_fec =0 ; + +if (eth_fec ÐTOOL_FEC_OFF ) + link_fec |=QED_FEC_MODE_NONE ; +if (eth_fec ÐTOOL_FEC_BASER ) + link_fec |=QED_FEC_MODE_FIRECODE ; +if (eth_fec ÐTOOL_FEC_RS ) + link_fec |=QED_FEC_MODE_RS ; +if (eth_fec ÐTOOL_FEC_AUTO ) + link_fec |=QED_FEC_MODE_AUTO ; +if (eth_fec ÐTOOL_FEC_NONE ) + link_fec |=QED_FEC_MODE_UNSUPPORTED ; + +return link_fec; +} + +static int qede_get_fecparam (struct net_device *dev, +struct ethtool_fecparam *fecparam) +{ +struct qede_dev *edev =netdev_priv (dev); +struct qed_link_output curr_link; + +memset (&curr_link,0 ,sizeof (curr_link)); + edev->ops->common->get_link (edev->cdev, &curr_link); + + fecparam->active_fec =qede_link_to_ethtool_fec (curr_link.active_fec); + fecparam->fec =qede_link_to_ethtool_fec (curr_link.sup_fec); + +return 0 ; +} + +static int qede_set_fecparam (struct net_device *dev, +struct ethtool_fecparam *fecparam) +{ +struct qede_dev *edev =netdev_priv (dev); +struct qed_link_params params; + +if (!edev->ops || !edev->ops->common->can_link_change (edev->cdev)) { +DP_INFO (edev,"Link settings are not allowed to be changed\n" ); +return -EOPNOTSUPP ; + } + +memset (¶ms,0 ,sizeof (params)); + params.override_flags |=QED_LINK_OVERRIDE_FEC_CONFIG ; + params.fec =qede_ethtool_to_link_fec (fecparam->fec); + params.link_up = true; + + edev->ops->common->set_link (edev->cdev, ¶ms); + +return 0 ; +} +static int qede_get_module_info (struct net_device *dev,struct ethtool_modinfo *modinfo) {
@@ -2070,6 +2142,8 @@ static const struct ethtool_ops qede_ethtool_ops = { .get_module_eeprom = qede_get_module_eeprom, .get_eee = qede_get_eee, .set_eee = qede_set_eee, + .get_fecparam = qede_get_fecparam, + .set_fecparam = qede_set_fecparam, .get_tunable = qede_get_tunable, .set_tunable = qede_set_tunable, .flash_device = qede_flash_device,
Signature · 1 line
2.25.1
PATCH v3 11/16 qed: reformat several structures a bit
In reply to Alexander LobakinReformat a few nvm_cfg* structures (and partly qed_dev) prior to adding new fields and definitions.
--- drivers/net/ethernet/qlogic/qed/qed.h | 109 +++---- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 345 +++++++++++----------- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 12 +- 3 files changed, 237 insertions(+), 229 deletions(-)
drivers/net/ethernet/qlogic/qed/qed.h +55 -54
@@ -280,48 +280,49 @@ enum qed_db_rec_exec {struct qed_hw_info {/* PCI personality */ -enum qed_pci_personality personality; -#define QED_IS_RDMA_PERSONALITY (dev) \ - ((dev)->hw_info.personality == QED_PCI_ETH_ROCE || \ - (dev)->hw_info.personality == QED_PCI_ETH_IWARP || \ +enum qed_pci_personality personality; +#define QED_IS_RDMA_PERSONALITY (dev) \ + ((dev)->hw_info.personality == QED_PCI_ETH_ROCE || \ + (dev)->hw_info.personality == QED_PCI_ETH_IWARP || \ (dev)->hw_info.personality == QED_PCI_ETH_RDMA) -#define QED_IS_ROCE_PERSONALITY (dev) \ - ((dev)->hw_info.personality == QED_PCI_ETH_ROCE || \ +#define QED_IS_ROCE_PERSONALITY (dev) \ + ((dev)->hw_info.personality == QED_PCI_ETH_ROCE || \ (dev)->hw_info.personality == QED_PCI_ETH_RDMA) -#define QED_IS_IWARP_PERSONALITY (dev) \ - ((dev)->hw_info.personality == QED_PCI_ETH_IWARP || \ +#define QED_IS_IWARP_PERSONALITY (dev) \ + ((dev)->hw_info.personality == QED_PCI_ETH_IWARP || \ (dev)->hw_info.personality == QED_PCI_ETH_RDMA) -#define QED_IS_L2_PERSONALITY (dev) \ - ((dev)->hw_info.personality == QED_PCI_ETH || \ +#define QED_IS_L2_PERSONALITY (dev) \ + ((dev)->hw_info.personality == QED_PCI_ETH || \ QED_IS_RDMA_PERSONALITY(dev)) -#define QED_IS_FCOE_PERSONALITY (dev) \ +#define QED_IS_FCOE_PERSONALITY (dev) \ ((dev)->hw_info.personality == QED_PCI_FCOE) -#define QED_IS_ISCSI_PERSONALITY (dev) \ +#define QED_IS_ISCSI_PERSONALITY (dev) \ ((dev)->hw_info.personality == QED_PCI_ISCSI)/* Resource Allocation scheme results */ u32 resc_start[QED_MAX_RESC ];u32 resc_num[QED_MAX_RESC ]; -u32 feat_num[QED_MAX_FEATURES ]; +#define RESC_START (_p_hwfn, resc) ((_p_hwfn)->hw_info.resc_start[resc]) +#define RESC_NUM (_p_hwfn, resc) ((_p_hwfn)->hw_info.resc_num[resc]) +#define RESC_END (_p_hwfn, resc) (RESC_START(_p_hwfn, resc) + \ + RESC_NUM(_p_hwfn, resc)) -#define RESC_START (_p_hwfn, resc) ((_p_hwfn)->hw_info.resc_start[resc]) -#define RESC_NUM (_p_hwfn, resc) ((_p_hwfn)->hw_info.resc_num[resc]) -#define RESC_END (_p_hwfn, resc) (RESC_START(_p_hwfn, resc) + \ - RESC_NUM(_p_hwfn, resc)) -#define FEAT_NUM (_p_hwfn, resc) ((_p_hwfn)->hw_info.feat_num[resc]) +u32 feat_num[QED_MAX_FEATURES ]; +#define FEAT_NUM (_p_hwfn, resc) ((_p_hwfn)->hw_info.feat_num[resc])/* Amount of traffic classes HW supports */ -u8 num_hw_tc; +u8 num_hw_tc;/* Amount of TCs which should be active according to DCBx or upper * layer driver configuration. */ -u8 num_active_tc; +u8 num_active_tc; +u8 offload_tc;bool offload_tc_set;bool multi_tc_roce_en; -#define IS_QED_MULTI_TC_ROCE (p_hwfn) (((p_hwfn)->hw_info.multi_tc_roce_en)) +#define IS_QED_MULTI_TC_ROCE (p_hwfn) ((p_hwfn)->hw_info.multi_tc_roce_en)u32 concrete_fid;u16 opaque_fid;
@@ -338,10 +339,10 @@ struct qed_hw_info {u32 port_mode;u32 hw_mode; -unsigned long device_capabilities; +unsigned long device_capabilities;u16 mtu; -enum qed_wol_support b_wol_support; +enum qed_wol_support b_wol_support; };/* maximun size of read/write commands (HW limit) */
@@ -715,41 +716,41 @@ struct qed_dbg_feature { };struct qed_dev { -u32 dp_module; -u8 dp_level; -char name[NAME_SIZE ]; - -enum qed_dev_type type; -/* Translate type/revision combo into the proper conditions */ -#define QED_IS_BB (dev) ((dev)->type == QED_DEV_TYPE_BB) -#define QED_IS_BB_B0 (dev) (QED_IS_BB(dev) && \ - CHIP_REV_IS_B0(dev)) -#define QED_IS_AH (dev) ((dev)->type == QED_DEV_TYPE_AH) -#define QED_IS_K2 (dev) QED_IS_AH(dev) - -u16 vendor_id; -u16 device_id; -#define QED_DEV_ID_MASK 0xff00 -#define QED_DEV_ID_MASK_BB 0x1600 -#define QED_DEV_ID_MASK_AH 0x8000 -#define QED_IS_E4 (dev) (QED_IS_BB(dev) || QED_IS_AH(dev)) - -u16 chip_num; -#define CHIP_NUM_MASK 0xffff -#define CHIP_NUM_SHIFT 16 - -u16 chip_rev; -#define CHIP_REV_MASK 0xf -#define CHIP_REV_SHIFT 12 -#define CHIP_REV_IS_B0 (_cdev) ((_cdev)->chip_rev == 1) +u32 dp_module; +u8 dp_level; +char name[NAME_SIZE ]; + +enum qed_dev_type type; +/* Translate type/revision combo into the proper conditions */ +#define QED_IS_BB (dev) ((dev)->type == QED_DEV_TYPE_BB) +#define QED_IS_BB_B0 (dev) (QED_IS_BB(dev) && CHIP_REV_IS_B0(dev)) +#define QED_IS_AH (dev) ((dev)->type == QED_DEV_TYPE_AH) +#define QED_IS_K2 (dev) QED_IS_AH(dev) +#define QED_IS_E4 (dev) (QED_IS_BB(dev) || QED_IS_AH(dev)) + +u16 vendor_id; + +u16 device_id; +#define QED_DEV_ID_MASK 0xff00 +#define QED_DEV_ID_MASK_BB 0x1600 +#define QED_DEV_ID_MASK_AH 0x8000 + +u16 chip_num; +#define CHIP_NUM_MASK 0xffff +#define CHIP_NUM_SHIFT 16 + +u16 chip_rev; +#define CHIP_REV_MASK 0xf +#define CHIP_REV_SHIFT 12 +#define CHIP_REV_IS_B0 (_cdev) ((_cdev)->chip_rev == 1)u16 chip_metal; -#define CHIP_METAL_MASK 0xff -#define CHIP_METAL_SHIFT 4 +#define CHIP_METAL_MASK 0xff +#define CHIP_METAL_SHIFT 4u16 chip_bond_id; -#define CHIP_BOND_ID_MASK 0xf -#define CHIP_BOND_ID_SHIFT 0 +#define CHIP_BOND_ID_MASK 0xf +#define CHIP_BOND_ID_SHIFT 0u8 num_engines;u8 num_ports;
drivers/net/ethernet/qlogic/qed/qed_hsi.h +176 -169
399 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_mcp.h +6 -6
@@ -16,15 +16,15 @@#include "qed_dev_api.h" struct qed_mcp_link_speed_params { -bool autoneg; -u32 advertised_speeds;/* bitmask of DRV_SPEED_CAPABILITY */ -u32 forced_speed;/* In Mb/s */ +bool autoneg; +u32 advertised_speeds; +u32 forced_speed;/* In Mb/s */ };struct qed_mcp_link_pause_params { -bool autoneg; -bool forced_rx; -bool forced_tx; +bool autoneg; +bool forced_rx; +bool forced_tx; };enum qed_mcp_eee_mode {
Signature · 1 line
2.25.1
PATCH v3 12/16 qed: remove unused qed_hw_info::port_mode and QED_PORT_MODE
In reply to Alexander LobakinStruct field qed_hw_info::port_mode isn't used anywhere in the code, so can be safely removed to prevent possible dead code addition. Also remove the enumeration QED_PORT_MODE orphaned after this deletion.
--- drivers/net/ethernet/qlogic/qed/qed.h | 15 --------------- drivers/net/ethernet/qlogic/qed/qed_dev.c | 21 --------------------- 2 files changed, 36 deletions(-)
drivers/net/ethernet/qlogic/qed/qed.h +0 -15
@@ -245,20 +245,6 @@ enum QED_FEATURE { QED_MAX_FEATURES, }; -enum QED_PORT_MODE { -QED_PORT_MODE_DE_2X40G , -QED_PORT_MODE_DE_2X50G , -QED_PORT_MODE_DE_1X100G , -QED_PORT_MODE_DE_4X10G_F , -QED_PORT_MODE_DE_4X10G_E , -QED_PORT_MODE_DE_4X20G , -QED_PORT_MODE_DE_1X40G , -QED_PORT_MODE_DE_2X25G , -QED_PORT_MODE_DE_1X25G , -QED_PORT_MODE_DE_4X25G , -QED_PORT_MODE_DE_2X10G , -}; -enum qed_dev_cap {QED_DEV_CAP_ETH ,QED_DEV_CAP_FCOE ,
@@ -337,7 +323,6 @@ struct qed_hw_info {struct qed_igu_info *p_igu_info; -u32 port_mode;u32 hw_mode;unsigned long device_capabilities;u16 mtu;
drivers/net/ethernet/qlogic/qed/qed_dev.c +0 -21
@@ -3994,37 +3994,16 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)switch ((core_cfg &NVM_CFG1_GLOB_NETWORK_PORT_MODE_MASK ) >>NVM_CFG1_GLOB_NETWORK_PORT_MODE_OFFSET ) {case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_2X40G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_2X40G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X50G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_2X50G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_1X100G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_1X100G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X10G_F : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_4X10G_F ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X10G_E : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_4X10G_E ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X20G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_4X20G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X40G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_1X40G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_2X25G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_2X10G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_1X25G ; -break ;case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G : - p_hwfn->hw_info.port_mode =QED_PORT_MODE_DE_4X25G ;break ;default :DP_NOTICE (p_hwfn,"Unknown port mode in 0x%08x\n" , core_cfg);
Signature · 1 line
2.25.1
PATCH v3 13/16 qed: add support for new port modes
In reply to Alexander LobakinThese ports ship on new boards revisions and are supported by newer firmware versions.
--- drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 +++++ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 5 +++++ 2 files changed, 10 insertions(+)
drivers/net/ethernet/qlogic/qed/qed_dev.c +5 -0
@@ -4004,6 +4004,11 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G :case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G :case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G : +case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1 : +case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1 : +case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2 : +case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2 : +case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4 :break ;default :DP_NOTICE (p_hwfn,"Unknown port mode in 0x%08x\n" , core_cfg);
drivers/net/ethernet/qlogic/qed/qed_hsi.h +5 -0
@@ -13015,6 +13015,11 @@ struct nvm_cfg1_glob {#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G 0xd#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G 0xe#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G 0xf +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1 0x11 +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1 0x12 +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2 0x13 +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2 0x14 +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4 0x15u32 e_lane_cfg1;u32 e_lane_cfg2;
Signature · 1 line
2.25.1
PATCH v3 14/16 qed: add missing loopback modes
In reply to Alexander LobakinThese modes are relevant only for several boards, but may be reported by MFW as well as the others.
--- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 5 +++++ drivers/net/ethernet/qlogic/qed/qed_main.c | 19 +++++++++++++++++++ include/linux/qed/qed_if.h | 5 +++++ 3 files changed, 29 insertions(+)
drivers/net/ethernet/qlogic/qed/qed_hsi.h +5 -0
@@ -11554,6 +11554,11 @@ struct eth_phy_cfg {#define ETH_LOOPBACK_EXT_PHY 0x2#define ETH_LOOPBACK_EXT 0x3#define ETH_LOOPBACK_MAC 0x4 +#define ETH_LOOPBACK_CNIG_AH_ONLY_0123 0x5 +#define ETH_LOOPBACK_CNIG_AH_ONLY_2301 0x6 +#define ETH_LOOPBACK_PCS_AH_ONLY 0x7 +#define ETH_LOOPBACK_REVERSE_MAC_AH_ONLY 0x8 +#define ETH_LOOPBACK_INT_PHY_FEA_AH_ONLY 0x9u32 eee_cfg;#define EEE_CFG_EEE_ENABLED BIT(0)
drivers/net/ethernet/qlogic/qed/qed_main.c +19 -0
@@ -1587,6 +1587,25 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params)case QED_LINK_LOOPBACK_MAC : link_params->loopback_mode =ETH_LOOPBACK_MAC ;break ; +case QED_LINK_LOOPBACK_CNIG_AH_ONLY_0123 : + link_params->loopback_mode = +ETH_LOOPBACK_CNIG_AH_ONLY_0123 ; +break ; +case QED_LINK_LOOPBACK_CNIG_AH_ONLY_2301 : + link_params->loopback_mode = +ETH_LOOPBACK_CNIG_AH_ONLY_2301 ; +break ; +case QED_LINK_LOOPBACK_PCS_AH_ONLY : + link_params->loopback_mode =ETH_LOOPBACK_PCS_AH_ONLY ; +break ; +case QED_LINK_LOOPBACK_REVERSE_MAC_AH_ONLY : + link_params->loopback_mode = +ETH_LOOPBACK_REVERSE_MAC_AH_ONLY ; +break ; +case QED_LINK_LOOPBACK_INT_PHY_FEA_AH_ONLY : + link_params->loopback_mode = +ETH_LOOPBACK_INT_PHY_FEA_AH_ONLY ; +break ;default : link_params->loopback_mode =ETH_LOOPBACK_NONE ;break ;
include/linux/qed/qed_if.h +5 -0
@@ -696,6 +696,11 @@ struct qed_link_params {#define QED_LINK_LOOPBACK_EXT_PHY BIT(2)#define QED_LINK_LOOPBACK_EXT BIT(3)#define QED_LINK_LOOPBACK_MAC BIT(4) +#define QED_LINK_LOOPBACK_CNIG_AH_ONLY_0123 BIT(5) +#define QED_LINK_LOOPBACK_CNIG_AH_ONLY_2301 BIT(6) +#define QED_LINK_LOOPBACK_PCS_AH_ONLY BIT(7) +#define QED_LINK_LOOPBACK_REVERSE_MAC_AH_ONLY BIT(8) +#define QED_LINK_LOOPBACK_INT_PHY_FEA_AH_ONLY BIT(9)struct qed_link_eee_params eee;u32 fec;
Signature · 1 line
2.25.1
PATCH v3 15/16 qed: populate supported link modes maps on module init
In reply to Alexander LobakinSimplify and lighten qed_set_link() by declaring static link modes maps and populating them on module init. This way we save plenty of text size at the low expense of __ro_after_init and __initconst data (the latter will be purged after module init is done).
Misc: sanitize exit callback.
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 189 +++++++++++++-------- 1 file changed, 118 insertions(+), 71 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +118 -71
@@ -65,20 +65,118 @@ MODULE_VERSION(DRV_MODULE_VERSION);MODULE_FIRMWARE (QED_FW_FILE_NAME ); +/* MFW speed capabilities maps */ + +struct qed_mfw_speed_map { +u32 mfw_val; +__ETHTOOL_DECLARE_LINK_MODE_MASK (caps); + +const u32 *cap_arr; +u32 arr_size; +}; + +#define QED_MFW_SPEED_MAP (type, arr) \ +{ \ + .mfw_val = (type), \ + .cap_arr = (arr), \ + .arr_size = ARRAY_SIZE(arr), \ +} + +static const u32 qed_mfw_legacy_1g[]__initconst = { + ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + ETHTOOL_LINK_MODE_1000baseKX_Full_BIT, + ETHTOOL_LINK_MODE_1000baseX_Full_BIT, +}; + +static const u32 qed_mfw_legacy_10g[]__initconst = { + ETHTOOL_LINK_MODE_10000baseT_Full_BIT, + ETHTOOL_LINK_MODE_10000baseKR_Full_BIT, + ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT, + ETHTOOL_LINK_MODE_10000baseR_FEC_BIT, + ETHTOOL_LINK_MODE_10000baseCR_Full_BIT, + ETHTOOL_LINK_MODE_10000baseSR_Full_BIT, + ETHTOOL_LINK_MODE_10000baseLR_Full_BIT, + ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT, +}; + +static const u32 qed_mfw_legacy_20g[]__initconst = { + ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT, +}; + +static const u32 qed_mfw_legacy_25g[]__initconst = { + ETHTOOL_LINK_MODE_25000baseKR_Full_BIT, + ETHTOOL_LINK_MODE_25000baseCR_Full_BIT, + ETHTOOL_LINK_MODE_25000baseSR_Full_BIT, +}; + +static const u32 qed_mfw_legacy_40g[]__initconst = { + ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT, + ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT, + ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT, + ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT, +}; + +static const u32 qed_mfw_legacy_50g[]__initconst = { + ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT, + ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT, + ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT, +}; + +static const u32 qed_mfw_legacy_bb_100g[]__initconst = { + ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT, + ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT, + ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT, + ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT, +}; + +static struct qed_mfw_speed_map qed_mfw_legacy_maps[]__ro_after_init = { +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G , + qed_mfw_legacy_1g), +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G , + qed_mfw_legacy_10g), +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G , + qed_mfw_legacy_20g), +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G , + qed_mfw_legacy_25g), +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G , + qed_mfw_legacy_40g), +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G , + qed_mfw_legacy_50g), +QED_MFW_SPEED_MAP (NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G , + qed_mfw_legacy_bb_100g), +}; + +static void __init qed_mfw_speed_map_populate (struct qed_mfw_speed_map *map) +{ +linkmode_set_bit_array (map->cap_arr, map->arr_size, map->caps); + + map->cap_arr =NULL ; + map->arr_size =0 ; +} + +static void __init qed_mfw_speed_maps_init (void ) +{ +u32 i; + +for (i =0 ; i <ARRAY_SIZE (qed_mfw_legacy_maps); i++) +qed_mfw_speed_map_populate (qed_mfw_legacy_maps + i); +} +static int __init qed_init (void ) {pr_info ("%s" , version); +qed_mfw_speed_maps_init (); +return 0 ; } +module_init (qed_init); -static void __exit qed_cleanup(void) +static void __exit qed_exit(void) { -pr_notice ("qed_cleanup called\n" ); +/* To prevent marking this module as "permanent" */ } - -module_init (qed_init); -module_exit (qed_cleanup); +module_exit (qed_exit);/* Check if the DMA controller on the machine can properly handle the DMA * addressing required by the device.
@@ -1457,12 +1555,13 @@ static bool qed_can_link_change(struct qed_dev *cdev)static int qed_set_link (struct qed_dev *cdev,struct qed_link_params *params) { -__ETHTOOL_DECLARE_LINK_MODE_MASK (sup_caps);struct qed_mcp_link_params *link_params; +struct qed_mcp_link_speed_params *speed; +const struct qed_mfw_speed_map *map;struct qed_hwfn *hwfn;struct qed_ptt *ptt; -u32 as;int rc; +u32 i;if (!cdev)return -ENODEV ;
@@ -1487,78 +1586,25 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params)if (!link_params)return -ENODATA ; + speed = &link_params->speed; +if (params->override_flags &QED_LINK_OVERRIDE_SPEED_AUTONEG ) - link_params->speed.autoneg = params->autoneg; + speed->autoneg = !!params->autoneg;if (params->override_flags &QED_LINK_OVERRIDE_SPEED_ADV_SPEEDS ) { - as =0 ; - -phylink_zero (sup_caps); - phylink_set(sup_caps, 1000baseT_Full); - phylink_set(sup_caps, 1000baseKX_Full); - phylink_set(sup_caps, 1000baseX_Full); - -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G ; - -phylink_zero (sup_caps); - phylink_set(sup_caps, 10000baseT_Full); - phylink_set(sup_caps, 10000baseKR_Full); - phylink_set(sup_caps, 10000baseKX4_Full); - phylink_set(sup_caps, 10000baseR_FEC); - phylink_set(sup_caps, 10000baseCR_Full); - phylink_set(sup_caps, 10000baseSR_Full); - phylink_set(sup_caps, 10000baseLR_Full); - phylink_set(sup_caps, 10000baseLRM_Full); - -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G ; + speed->advertised_speeds =0 ; -phylink_zero (sup_caps); - phylink_set(sup_caps, 20000baseKR2_Full); +for (i =0 ; i <ARRAY_SIZE (qed_mfw_legacy_maps); i++) { + map = qed_mfw_legacy_maps + i; -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G ; - -phylink_zero (sup_caps); - phylink_set(sup_caps, 25000baseKR_Full); - phylink_set(sup_caps, 25000baseCR_Full); - phylink_set(sup_caps, 25000baseSR_Full); - -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G ; - -phylink_zero (sup_caps); - phylink_set(sup_caps, 40000baseLR4_Full); - phylink_set(sup_caps, 40000baseKR4_Full); - phylink_set(sup_caps, 40000baseCR4_Full); - phylink_set(sup_caps, 40000baseSR4_Full); - -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G ; - -phylink_zero (sup_caps); - phylink_set(sup_caps, 50000baseKR2_Full); - phylink_set(sup_caps, 50000baseCR2_Full); - phylink_set(sup_caps, 50000baseSR2_Full); - -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G ; - -phylink_zero (sup_caps); - phylink_set(sup_caps, 100000baseKR4_Full); - phylink_set(sup_caps, 100000baseSR4_Full); - phylink_set(sup_caps, 100000baseCR4_Full); - phylink_set(sup_caps, 100000baseLR4_ER4_Full); - -if (linkmode_intersects (params->adv_speeds, sup_caps)) - as |=NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G ; - - link_params->speed.advertised_speeds = as; +if (linkmode_intersects (params->adv_speeds, map->caps)) + speed->advertised_speeds |= map->mfw_val; + } }if (params->override_flags &QED_LINK_OVERRIDE_SPEED_FORCED_SPEED ) - link_params->speed.forced_speed = params->forced_speed; + speed->forced_speed = params->forced_speed; +if (params->override_flags &QED_LINK_OVERRIDE_PAUSE_CONFIG ) {if (params->pause_config &QED_LINK_PAUSE_AUTONEG_ENABLE ) link_params->pause.autoneg = true;
@@ -1573,6 +1619,7 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params)else link_params->pause.forced_tx = false; } +if (params->override_flags &QED_LINK_OVERRIDE_LOOPBACK_MODE ) {switch (params->loopback_mode) {case QED_LINK_LOOPBACK_INT_PHY :
Signature · 1 line
2.25.1
PATCH v3 16/16 qed: add support for the extended speed and FEC modes
In reply to Alexander LobakinAdd all necessary code (NVM parsing, MFW and Ethtool reports etc.) to support extended speed and FEC modes.
These new modes are supported by the new boards revisions and newer MFW versions.
Misc: correct port type for MEDIA_KR.
--- drivers/net/ethernet/qlogic/qed/qed.h | 1 + drivers/net/ethernet/qlogic/qed/qed_dev.c | 102 +++++++- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 85 ++++++- drivers/net/ethernet/qlogic/qed/qed_main.c | 264 ++++++++++++++++++++- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 74 +++++- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 45 ++++ include/linux/qed/qed_if.h | 1 + 7 files changed, 547 insertions(+), 25 deletions(-)
drivers/net/ethernet/qlogic/qed/qed.h +1 -0
@@ -712,6 +712,7 @@ struct qed_dev {#define QED_IS_AH (dev) ((dev)->type == QED_DEV_TYPE_AH)#define QED_IS_K2 (dev) QED_IS_AH(dev)#define QED_IS_E4 (dev) (QED_IS_BB(dev) || QED_IS_AH(dev)) +#define QED_IS_E5 (dev) ((dev)->type == QED_DEV_TYPE_E5)u16 vendor_id;
drivers/net/ethernet/qlogic/qed/qed_dev.c +93 -9
128 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_hsi.h +84 -1
109 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_main.c +253 -11
312 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_mcp.c +70 -4
98 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_mcp.h +45 -0
71 lines not on this page · raw message
include/linux/qed/qed_if.h +1 -0
@@ -594,6 +594,7 @@ enum qed_hw_err_type {enum qed_dev_type {QED_DEV_TYPE_BB ,QED_DEV_TYPE_AH , +QED_DEV_TYPE_E5 , };struct qed_dev_info {
Signature · 1 line
2.25.1
Quoted 8 lines · On Mon, 20 Jul 2020 21:07:59 +0300 Alexander Lobakin wrote:
This series covers the support for the following:
- new port modes;
- loopback modes, previously missing;
- new speed/link modes;
- several FEC modes;
- multi-rate transceivers;and also cleans up and optimizes several related parts of code.
David Miller
maintainerFrom: Alexander Lobakin <[email protected]>
Date: Mon, 20 Jul 2020 21:07:59 +0300
Quoted 16 lines
This series covers the support for the following:
- new port modes;
- loopback modes, previously missing;
- new speed/link modes;
- several FEC modes;
- multi-rate transceivers;and also cleans up and optimizes several related parts of code.
v3 (from [2]):
- dropped custom link mode declaration; qed, qede and qedf switched to Ethtool link modes and definitions (#0001, #0002, per Andrew Lunn's suggestion);
- exchange more .text size to .initconst and .ro_after_init in qede (#0003).
Quoted 8 lines
v2 (from [1]):
- added a patch (#0010) that drops discussed dead struct member;
- addressed checkpatch complaints on #0014 (former #0013);
- rebased on top of latest net-next;
- no other changes.[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/[email protected]/
Series applied, thank you.