hinic: add support to set and get pause param
Subsystems (3)
PATCH 1/1 hinic: add support to set and get pause param
add support to set pause param with ethtool -A and get pause param with ethtool -a. Also remove set_link_ksettings ops for VF.
--- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 100 +++++++++++++++++- .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 + .../net/ethernet/huawei/hinic/hinic_hw_io.h | 9 ++ .../net/ethernet/huawei/hinic/hinic_main.c | 27 ++++- .../net/ethernet/huawei/hinic/hinic_port.c | 5 + 5 files changed, 140 insertions(+), 3 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +99 -1
@@ -613,6 +613,78 @@ static int hinic_set_ringparam(struct net_device *netdev,return 0 ; } + +static void hinic_get_pauseparam (struct net_device *netdev, +struct ethtool_pauseparam *pause) +{ +struct hinic_dev *nic_dev =netdev_priv (netdev); +struct hinic_pause_config pause_info = {0 }; +struct hinic_nic_cfg *nic_cfg; +int err; + + nic_cfg = &nic_dev->hwdev->func_to_io.nic_cfg; + + err =hinic_get_hw_pause_info (nic_dev->hwdev, &pause_info); +if (err) { +netif_err (nic_dev, drv, netdev, +"Failed to get pauseparam from hw\n" ); + }else { + pause->autoneg = pause_info.auto_neg; +if (nic_cfg->pause_set) { + pause->rx_pause = nic_cfg->rx_pause; + pause->tx_pause = nic_cfg->tx_pause; + }else { + pause->rx_pause = pause_info.rx_pause; + pause->tx_pause = pause_info.tx_pause; + } + } +} + +static int hinic_set_pauseparam (struct net_device *netdev, +struct ethtool_pauseparam *pause) +{ +struct hinic_dev *nic_dev =netdev_priv (netdev); +struct hinic_pause_config pause_info = {0 }; +struct hinic_port_cap port_cap = {0 }; +int err; + + err =hinic_port_get_cap (nic_dev, &port_cap); +if (err) { +netif_err (nic_dev, drv, netdev, +"Failed to get port capability\n" ); +return -EIO ; + } + +if (pause->autoneg != port_cap.autoneg_state) { +netif_err (nic_dev, drv, netdev, +"To change autoneg please use: ethtool -s <dev> autoneg <on|off>\n" ); +return -EOPNOTSUPP ; + } + + pause_info.auto_neg = pause->autoneg; + pause_info.rx_pause = pause->rx_pause; + pause_info.tx_pause = pause->tx_pause; + +down (&nic_dev->hwdev->func_to_io.nic_cfg.cfg_lock); + err =hinic_set_hw_pause_info (nic_dev->hwdev, &pause_info); +if (err) { +netif_err (nic_dev, drv, netdev,"Failed to set pauseparam\n" ); +up (&nic_dev->hwdev->func_to_io.nic_cfg.cfg_lock); +return err; + } + nic_dev->hwdev->func_to_io.nic_cfg.pause_set = true; + nic_dev->hwdev->func_to_io.nic_cfg.auto_neg = pause->autoneg; + nic_dev->hwdev->func_to_io.nic_cfg.rx_pause = pause->rx_pause; + nic_dev->hwdev->func_to_io.nic_cfg.tx_pause = pause->tx_pause; +up (&nic_dev->hwdev->func_to_io.nic_cfg.cfg_lock); + +netif_info (nic_dev, drv, netdev,"Set pause options, tx: %s, rx: %s\n" , + pause->tx_pause ?"on" :"off" , + pause->rx_pause ?"on" :"off" ); + +return 0 ; +} +static void hinic_get_channels (struct net_device *netdev,struct ethtool_channels *channels) {
@@ -1247,6 +1319,27 @@ static const struct ethtool_ops hinic_ethtool_ops = { .get_link = ethtool_op_get_link, .get_ringparam = hinic_get_ringparam, .set_ringparam = hinic_set_ringparam, + .get_pauseparam = hinic_get_pauseparam, + .set_pauseparam = hinic_set_pauseparam, + .get_channels = hinic_get_channels, + .set_channels = hinic_set_channels, + .get_rxnfc = hinic_get_rxnfc, + .set_rxnfc = hinic_set_rxnfc, + .get_rxfh_key_size = hinic_get_rxfh_key_size, + .get_rxfh_indir_size = hinic_get_rxfh_indir_size, + .get_rxfh = hinic_get_rxfh, + .set_rxfh = hinic_set_rxfh, + .get_sset_count = hinic_get_sset_count, + .get_ethtool_stats = hinic_get_ethtool_stats, + .get_strings = hinic_get_strings, +}; + +static const struct ethtool_ops hinicvf_ethtool_ops = { + .get_link_ksettings = hinic_get_link_ksettings, + .get_drvinfo = hinic_get_drvinfo, + .get_link = ethtool_op_get_link, + .get_ringparam = hinic_get_ringparam, + .set_ringparam = hinic_set_ringparam, .get_channels = hinic_get_channels, .set_channels = hinic_set_channels, .get_rxnfc = hinic_get_rxnfc,
@@ -1262,5 +1355,10 @@ static const struct ethtool_ops hinic_ethtool_ops = {void hinic_set_ethtool_ops (struct net_device *netdev) { - netdev->ethtool_ops = &hinic_ethtool_ops; +struct hinic_dev *nic_dev =netdev_priv (netdev); + +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) + netdev->ethtool_ops = &hinic_ethtool_ops; +else + netdev->ethtool_ops = &hinicvf_ethtool_ops; }
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +2 -0
@@ -777,6 +777,8 @@ struct hinic_hwdev *hinic_init_hwdev(struct pci_dev *pdev) goto err_dev_cap; } +sema_init (&hwdev->func_to_io.nic_cfg.cfg_lock,1 ); + err =hinic_vf_func_init (hwdev);if (err) {dev_err (&pdev->dev,"Failed to init nic mbox\n" );
drivers/net/ethernet/huawei/hinic/hinic_hw_io.h +9 -0
@@ -47,6 +47,14 @@ struct hinic_free_db_area {struct semaphore idx_lock; }; +struct hinic_nic_cfg { +struct semaphore cfg_lock; +bool pause_set; +u32 auto_neg; +u32 rx_pause; +u32 tx_pause; +}; +struct hinic_func_to_io {struct hinic_hwif *hwif;struct hinic_hwdev *hwdev;
@@ -78,6 +86,7 @@ struct hinic_func_to_io {u16 max_vfs;struct vf_data_storage *vf_infos;u8 link_status; +struct hinic_nic_cfg nic_cfg; };struct hinic_wq_page_size {
drivers/net/ethernet/huawei/hinic/hinic_main.c +25 -2
@@ -899,6 +899,26 @@ static void netdev_features_init(struct net_device *netdev) netdev->features = netdev->hw_features |NETIF_F_HW_VLAN_CTAG_FILTER ; } +static void hinic_refresh_nic_cfg (struct hinic_dev *nic_dev) +{ +struct hinic_nic_cfg *nic_cfg = &nic_dev->hwdev->func_to_io.nic_cfg; +struct hinic_pause_config pause_info = {0 }; +struct hinic_port_cap port_cap = {0 }; + +if (hinic_port_get_cap (nic_dev, &port_cap)) +return ; + +down (&nic_cfg->cfg_lock); +if (nic_cfg->pause_set) { + nic_cfg->auto_neg = port_cap.autoneg_state; + pause_info.auto_neg = nic_cfg->auto_neg; + pause_info.rx_pause = nic_cfg->rx_pause; + pause_info.tx_pause = nic_cfg->tx_pause; +hinic_set_hw_pause_info (nic_dev->hwdev, &pause_info); + } +up (&nic_cfg->cfg_lock); +} +/** * link_status_event_handler - link event handler * @handle: nic device for the handler
@@ -930,6 +950,9 @@ static void link_status_event_handler(void *handle, void *buf_in, u16 in_size,up (&nic_dev->mgmt_lock); +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) +hinic_refresh_nic_cfg (nic_dev); +netif_info (nic_dev, drv, nic_dev->netdev,"HINIC_Link is UP\n" ); }else {down (&nic_dev->mgmt_lock);
@@ -1020,8 +1043,6 @@ static int nic_dev_init(struct pci_dev *pdev) goto err_alloc_etherdev; } -hinic_set_ethtool_ops (netdev); -if (!HINIC_IS_VF (hwdev->hwif)) netdev->netdev_ops = &hinic_netdev_ops;else
@@ -1044,6 +1065,8 @@ static int nic_dev_init(struct pci_dev *pdev) nic_dev->sriov_info.pdev = pdev; nic_dev->max_qps = num_qps; +hinic_set_ethtool_ops (netdev); +sema_init (&nic_dev->mgmt_lock,1 ); tx_stats = &nic_dev->tx_stats;
drivers/net/ethernet/huawei/hinic/hinic_port.c +5 -0
@@ -1082,6 +1082,7 @@ int hinic_get_link_mode(struct hinic_hwdev *hwdev,if (!hwdev || !link_mode)return -EINVAL ; + link_mode->func_id =HINIC_HWIF_FUNC_IDX (hwdev->hwif); out_size =sizeof (*link_mode); err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_LINK_MODE,
@@ -1172,6 +1173,8 @@ int hinic_get_hw_pause_info(struct hinic_hwdev *hwdev,u16 out_size =sizeof (*pause_info);int err; + pause_info->func_id =HINIC_HWIF_FUNC_IDX (hwdev->hwif); + err =hinic_port_msg_cmd (hwdev,HINIC_PORT_CMD_GET_PAUSE_INFO , pause_info,sizeof (*pause_info), pause_info, &out_size);
@@ -1190,6 +1193,8 @@ int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev,u16 out_size =sizeof (*pause_info);int err; + pause_info->func_id =HINIC_HWIF_FUNC_IDX (hwdev->hwif); + err =hinic_port_msg_cmd (hwdev,HINIC_PORT_CMD_SET_PAUSE_INFO , pause_info,sizeof (*pause_info), pause_info, &out_size);
Signature · 1 line
2.17.1
Quoted 10 lines · Luo bin
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +10
-0+static int hinic_set_pauseparam (struct net_device *netdev, +struct ethtool_pauseparam *pause) +{ +struct hinic_dev *nic_dev =netdev_priv (netdev); +struct hinic_pause_config pause_info = {0 }; +struct hinic_port_cap port_cap = {0 }; +int err; + + err =hinic_port_get_cap (nic_dev, &port_cap); +if (err) {
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c static int hinic_set_ringparam(struct net_device *netdev, · line 662
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +10
-0+netif_err (nic_dev, drv, netdev, +"Failed to get port capability\n" ); +return -EIO ; + } + +if (pause->autoneg != port_cap.autoneg_state) { +netif_err (nic_dev, drv, netdev, +"To change autoneg please use: ethtool -s <dev> autoneg <on|off>\n" ); +return -EOPNOTSUPP ; + }
It is unclear at the moment if this is the correct thing to do. There was a discussion this week involving Russell King and Doug Berger you might want to read.
Quoted 11 lines
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +11
-0+ + pause_info.auto_neg = pause->autoneg; + pause_info.rx_pause = pause->rx_pause; + pause_info.tx_pause = pause->tx_pause; + +down (&nic_dev->hwdev->func_to_io.nic_cfg.cfg_lock); + err =hinic_set_hw_pause_info (nic_dev->hwdev, &pause_info); +if (err) { +netif_err (nic_dev, drv, netdev,"Failed to set pauseparam\n" ); +up (&nic_dev->hwdev->func_to_io.nic_cfg.cfg_lock); +return err;
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c static int hinic_set_ringparam(struct net_device *netdev, · line 683
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +10
-0+ } + nic_dev->hwdev->func_to_io.nic_cfg.pause_set = true; + nic_dev->hwdev->func_to_io.nic_cfg.auto_neg = pause->autoneg; + nic_dev->hwdev->func_to_io.nic_cfg.rx_pause = pause->rx_pause; + nic_dev->hwdev->func_to_io.nic_cfg.tx_pause = pause->tx_pause; +up (&nic_dev->hwdev->func_to_io.nic_cfg.cfg_lock); + +netif_info (nic_dev, drv, netdev,"Set pause options, tx: %s, rx: %s\n" , + pause->tx_pause ?"on" :"off" , + pause->rx_pause ?"on" :"off" );
netif_dbg()
Andrew
David Miller
maintainerFrom: Luo bin <[email protected]>
Date: Sat, 16 May 2020 02:00:30 +0000
Quoted 4 lines
add support to set pause param with ethtool -A and get pause param with ethtool -a. Also remove
set_link_ksettingsops for VF.Signed-off-by Luo bin <[email protected]>
Why are you using a semaphore and not a plain mutex.
Semaphores should be used as an absolute last resort, and only after trying vigorously to use other locking primitives.
Will fix. Thanks.
Quoted 12 lines · David Miller
From: Luo bin <[email protected]>
Date: Sat, 16 May 2020 02:00:30 +0000Quoted 4 lines
add support to set pause param with ethtool -A and get pause param with ethtool -a. Also remove
set_link_ksettingsops for VF.Signed-off-by Luo bin <[email protected]>Why are you using a semaphore and not a plain mutex.
Semaphores should be used as an absolute last resort, and only after trying vigorously to use other locking primitives. .