net: qlogic: qlcnic: use new api ethtool_{get|set}_link_ksettings
Subsystems (3)
PATCH 1/1 net: qlogic: qlcnic: use new api ethtool_{get|set}_link_ksettings
The ethtool api {get|set}_settings is deprecated. We move this driver to new api {get|set}_link_ksettings.
As I don't have the hardware, I'd be very pleased if someone may test this patch.
Signed-off-by Philippe Reynes <[email protected]>
--- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 94 ++++++++------- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 6 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 132 ++++++++++--------- 3 files changed, 123 insertions(+), 109 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +50 -44
@@ -3252,12 +3252,13 @@ int qlcnic_83xx_test_link(struct qlcnic_adapter *adapter)return config; } -int qlcnic_83xx_get_settings (struct qlcnic_adapter *adapter, -struct ethtool_cmd *ecmd) +int qlcnic_83xx_get_link_ksettings (struct qlcnic_adapter *adapter, +struct ethtool_link_ksettings *ecmd) {struct qlcnic_hardware_context *ahw = adapter->ahw;u32 config =0 ;int status =0 ; +u32 supported, advertising;if (!test_bit (__QLCNIC_MAINTENANCE_MODE, &adapter->state)) {/* Get port configuration info */
@@ -3271,45 +3272,48 @@ int qlcnic_83xx_get_settings(struct qlcnic_adapter *adapter, ahw->board_type =QLCNIC_BRDTYPE_83XX_10G ;if (netif_running (adapter->netdev) && ahw->has_link_events) { -ethtool_cmd_speed_set (ecmd, ahw->link_speed); - ecmd->duplex = ahw->link_duplex; - ecmd->autoneg = ahw->link_autoneg; + ecmd->base.speed = ahw->link_speed; + ecmd->base.duplex = ahw->link_duplex; + ecmd->base.autoneg = ahw->link_autoneg; }else { -ethtool_cmd_speed_set (ecmd,SPEED_UNKNOWN ); - ecmd->duplex =DUPLEX_UNKNOWN ; - ecmd->autoneg =AUTONEG_DISABLE ; + ecmd->base.speed =SPEED_UNKNOWN ; + ecmd->base.duplex =DUPLEX_UNKNOWN ; + ecmd->base.autoneg =AUTONEG_DISABLE ; } - ecmd->supported = (SUPPORTED_10baseT_Full | + supported = (SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Full | SUPPORTED_10000baseT_Full | SUPPORTED_Autoneg); -if (ecmd->autoneg ==AUTONEG_ENABLE ) { +ethtool_convert_link_mode_to_legacy_u32 (&advertising, + ecmd->link_modes.advertising); + +if (ecmd->base.autoneg ==AUTONEG_ENABLE ) {if (ahw->port_config &QLC_83XX_10_CAPABLE ) - ecmd->advertising |= SUPPORTED_10baseT_Full; + advertising |= SUPPORTED_10baseT_Full;if (ahw->port_config &QLC_83XX_100_CAPABLE ) - ecmd->advertising |= SUPPORTED_100baseT_Full; + advertising |= SUPPORTED_100baseT_Full;if (ahw->port_config &QLC_83XX_1G_CAPABLE ) - ecmd->advertising |= SUPPORTED_1000baseT_Full; + advertising |= SUPPORTED_1000baseT_Full;if (ahw->port_config &QLC_83XX_10G_CAPABLE ) - ecmd->advertising |= SUPPORTED_10000baseT_Full; + advertising |= SUPPORTED_10000baseT_Full;if (ahw->port_config &QLC_83XX_AUTONEG_ENABLE ) - ecmd->advertising |= ADVERTISED_Autoneg; + advertising |= ADVERTISED_Autoneg; }else {switch (ahw->link_speed) {case SPEED_10 : - ecmd->advertising = SUPPORTED_10baseT_Full; + advertising = SUPPORTED_10baseT_Full;break ;case SPEED_100 : - ecmd->advertising = SUPPORTED_100baseT_Full; + advertising = SUPPORTED_100baseT_Full;break ;case SPEED_1000 : - ecmd->advertising = SUPPORTED_1000baseT_Full; + advertising = SUPPORTED_1000baseT_Full;break ;case SPEED_10000 : - ecmd->advertising = SUPPORTED_10000baseT_Full; + advertising = SUPPORTED_10000baseT_Full;break ;default :break ;
@@ -3319,56 +3323,58 @@ int qlcnic_83xx_get_settings(struct qlcnic_adapter *adapter,switch (ahw->supported_type) {case PORT_FIBRE : - ecmd->supported |=SUPPORTED_FIBRE ; - ecmd->advertising |=ADVERTISED_FIBRE ; - ecmd->port =PORT_FIBRE ; - ecmd->transceiver =XCVR_EXTERNAL ; + supported |=SUPPORTED_FIBRE ; + advertising |=ADVERTISED_FIBRE ; + ecmd->base.port =PORT_FIBRE ;break ;case PORT_TP : - ecmd->supported |=SUPPORTED_TP ; - ecmd->advertising |=ADVERTISED_TP ; - ecmd->port =PORT_TP ; - ecmd->transceiver =XCVR_INTERNAL ; + supported |=SUPPORTED_TP ; + advertising |=ADVERTISED_TP ; + ecmd->base.port =PORT_TP ;break ;case PORT_DA : - ecmd->supported |=SUPPORTED_FIBRE ; - ecmd->advertising |=ADVERTISED_FIBRE ; - ecmd->port =PORT_DA ; - ecmd->transceiver =XCVR_EXTERNAL ; + supported |=SUPPORTED_FIBRE ; + advertising |=ADVERTISED_FIBRE ; + ecmd->base.port =PORT_DA ;break ;default : - ecmd->supported |=SUPPORTED_FIBRE ; - ecmd->advertising |=ADVERTISED_FIBRE ; - ecmd->port =PORT_OTHER ; - ecmd->transceiver =XCVR_EXTERNAL ; + supported |=SUPPORTED_FIBRE ; + advertising |=ADVERTISED_FIBRE ; + ecmd->base.port =PORT_OTHER ;break ; } - ecmd->phy_address = ahw->physical_port; + ecmd->base.phy_address = ahw->physical_port; + +ethtool_convert_legacy_u32_to_link_mode (ecmd->link_modes.supported, + supported); +ethtool_convert_legacy_u32_to_link_mode (ecmd->link_modes.advertising, + advertising); +return status; } -int qlcnic_83xx_set_settings (struct qlcnic_adapter *adapter, -struct ethtool_cmd *ecmd) +int qlcnic_83xx_set_link_ksettings (struct qlcnic_adapter *adapter, +const struct ethtool_link_ksettings *ecmd) {struct qlcnic_hardware_context *ahw = adapter->ahw;u32 config = adapter->ahw->port_config;int status =0 ;/* 83xx devices do not support Half duplex */ -if (ecmd->duplex ==DUPLEX_HALF ) { -netdev_info (adapter->netdev, -"Half duplex mode not supported\n" ); -return -EINVAL ; +if (ecmd->base.duplex ==DUPLEX_HALF ) { +netdev_info (adapter->netdev, +"Half duplex mode not supported\n" ); +return -EINVAL ; } -if (ecmd->autoneg) { +if (ecmd->base.autoneg) { ahw->port_config |=QLC_83XX_AUTONEG_ENABLE ; ahw->port_config |= (QLC_83XX_100_CAPABLE |QLC_83XX_1G_CAPABLE |QLC_83XX_10G_CAPABLE ); }else {/* force speed */ ahw->port_config &= ~QLC_83XX_AUTONEG_ENABLE ; -switch (ethtool_cmd_speed (ecmd)) { +switch (ecmd->base.speed) {case SPEED_10 : ahw->port_config &= ~(QLC_83XX_100_CAPABLE | QLC_83XX_1G_CAPABLE |
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +4 -2
@@ -628,8 +628,10 @@ int qlcnic_83xx_get_vnic_vport_info(struct qlcnic_adapter *,void qlcnic_83xx_get_minidump_template (struct qlcnic_adapter *);void qlcnic_83xx_get_stats (struct qlcnic_adapter *adapter,u64 *data);int qlcnic_83xx_extend_md_capab (struct qlcnic_adapter *); -int qlcnic_83xx_get_settings (struct qlcnic_adapter *,struct ethtool_cmd *); -int qlcnic_83xx_set_settings (struct qlcnic_adapter *,struct ethtool_cmd *); +int qlcnic_83xx_get_link_ksettings (struct qlcnic_adapter *adapter, +struct ethtool_link_ksettings *ecmd); +int qlcnic_83xx_set_link_ksettings (struct qlcnic_adapter *adapter, +const struct ethtool_link_ksettings *ecmd);void qlcnic_83xx_get_pauseparam (struct qlcnic_adapter *,struct ethtool_pauseparam *); int qlcnic_83xx_set_pauseparam(struct qlcnic_adapter *,
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +69 -63
284 lines not on this page · raw message
Signature · 1 line
1.7.4.4
From: Philippe Reynes <[email protected]>
Date: Sun, 19 Feb 2017 23:06:01 +0100
Quoted 7 lines
The ethtool api {get|set}_settings is deprecated. We move this driver to new api {get|set}_link_ksettings.
As I don't have the hardware, I'd be very pleased if someone may test this patch.
Signed-off-by Philippe Reynes <[email protected]>
Applied.