Commit ea256222 authored by Luo bin's avatar Luo bin Committed by David S. Miller

hinic: add support to set and get pause params

add support to set pause params with ethtool -A and get pause
params with ethtool -a. Also remove set_link_ksettings ops for VF
and enable pause by default.
Signed-off-by: default avatarLuo bin <luobin9@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 491f14db
...@@ -613,6 +613,64 @@ static int hinic_set_ringparam(struct net_device *netdev, ...@@ -613,6 +613,64 @@ static int hinic_set_ringparam(struct net_device *netdev,
return 0; 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) {
pause->autoneg = pause_info.auto_neg;
if (nic_cfg->pause_set || !pause_info.auto_neg) {
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)
return -EIO;
if (pause->autoneg != port_cap.autoneg_state)
return -EOPNOTSUPP;
pause_info.auto_neg = pause->autoneg;
pause_info.rx_pause = pause->rx_pause;
pause_info.tx_pause = pause->tx_pause;
mutex_lock(&nic_dev->hwdev->func_to_io.nic_cfg.cfg_mutex);
err = hinic_set_hw_pause_info(nic_dev->hwdev, &pause_info);
if (err) {
mutex_unlock(&nic_dev->hwdev->func_to_io.nic_cfg.cfg_mutex);
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;
mutex_unlock(&nic_dev->hwdev->func_to_io.nic_cfg.cfg_mutex);
return 0;
}
static void hinic_get_channels(struct net_device *netdev, static void hinic_get_channels(struct net_device *netdev,
struct ethtool_channels *channels) struct ethtool_channels *channels)
{ {
...@@ -1241,6 +1299,27 @@ static const struct ethtool_ops hinic_ethtool_ops = { ...@@ -1241,6 +1299,27 @@ static const struct ethtool_ops hinic_ethtool_ops = {
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_ringparam = hinic_get_ringparam, .get_ringparam = hinic_get_ringparam,
.set_ringparam = hinic_set_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, .get_channels = hinic_get_channels,
.set_channels = hinic_set_channels, .set_channels = hinic_set_channels,
.get_rxnfc = hinic_get_rxnfc, .get_rxnfc = hinic_get_rxnfc,
...@@ -1256,5 +1335,10 @@ static const struct ethtool_ops hinic_ethtool_ops = { ...@@ -1256,5 +1335,10 @@ static const struct ethtool_ops hinic_ethtool_ops = {
void hinic_set_ethtool_ops(struct net_device *netdev) void hinic_set_ethtool_ops(struct net_device *netdev)
{ {
struct hinic_dev *nic_dev = netdev_priv(netdev);
if (!HINIC_IS_VF(nic_dev->hwdev->hwif))
netdev->ethtool_ops = &hinic_ethtool_ops; netdev->ethtool_ops = &hinic_ethtool_ops;
else
netdev->ethtool_ops = &hinicvf_ethtool_ops;
} }
...@@ -777,6 +777,8 @@ struct hinic_hwdev *hinic_init_hwdev(struct pci_dev *pdev) ...@@ -777,6 +777,8 @@ struct hinic_hwdev *hinic_init_hwdev(struct pci_dev *pdev)
goto err_dev_cap; goto err_dev_cap;
} }
mutex_init(&hwdev->func_to_io.nic_cfg.cfg_mutex);
err = hinic_vf_func_init(hwdev); err = hinic_vf_func_init(hwdev);
if (err) { if (err) {
dev_err(&pdev->dev, "Failed to init nic mbox\n"); dev_err(&pdev->dev, "Failed to init nic mbox\n");
......
...@@ -48,6 +48,8 @@ enum hinic_port_cmd { ...@@ -48,6 +48,8 @@ enum hinic_port_cmd {
HINIC_PORT_CMD_ADD_VLAN = 3, HINIC_PORT_CMD_ADD_VLAN = 3,
HINIC_PORT_CMD_DEL_VLAN = 4, HINIC_PORT_CMD_DEL_VLAN = 4,
HINIC_PORT_CMD_SET_PFC = 5,
HINIC_PORT_CMD_SET_MAC = 9, HINIC_PORT_CMD_SET_MAC = 9,
HINIC_PORT_CMD_GET_MAC = 10, HINIC_PORT_CMD_GET_MAC = 10,
HINIC_PORT_CMD_DEL_MAC = 11, HINIC_PORT_CMD_DEL_MAC = 11,
......
...@@ -47,6 +47,15 @@ struct hinic_free_db_area { ...@@ -47,6 +47,15 @@ struct hinic_free_db_area {
struct semaphore idx_lock; struct semaphore idx_lock;
}; };
struct hinic_nic_cfg {
/* lock for getting nic cfg */
struct mutex cfg_mutex;
bool pause_set;
u32 auto_neg;
u32 rx_pause;
u32 tx_pause;
};
struct hinic_func_to_io { struct hinic_func_to_io {
struct hinic_hwif *hwif; struct hinic_hwif *hwif;
struct hinic_hwdev *hwdev; struct hinic_hwdev *hwdev;
...@@ -78,6 +87,7 @@ struct hinic_func_to_io { ...@@ -78,6 +87,7 @@ struct hinic_func_to_io {
u16 max_vfs; u16 max_vfs;
struct vf_data_storage *vf_infos; struct vf_data_storage *vf_infos;
u8 link_status; u8 link_status;
struct hinic_nic_cfg nic_cfg;
}; };
struct hinic_wq_page_size { struct hinic_wq_page_size {
......
...@@ -887,6 +887,26 @@ static void netdev_features_init(struct net_device *netdev) ...@@ -887,6 +887,26 @@ static void netdev_features_init(struct net_device *netdev)
netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_FILTER; 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;
mutex_lock(&nic_cfg->cfg_mutex);
if (nic_cfg->pause_set || !port_cap.autoneg_state) {
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);
}
mutex_unlock(&nic_cfg->cfg_mutex);
}
/** /**
* link_status_event_handler - link event handler * link_status_event_handler - link event handler
* @handle: nic device for the handler * @handle: nic device for the handler
...@@ -918,6 +938,9 @@ static void link_status_event_handler(void *handle, void *buf_in, u16 in_size, ...@@ -918,6 +938,9 @@ static void link_status_event_handler(void *handle, void *buf_in, u16 in_size,
up(&nic_dev->mgmt_lock); 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"); netif_info(nic_dev, drv, nic_dev->netdev, "HINIC_Link is UP\n");
} else { } else {
down(&nic_dev->mgmt_lock); down(&nic_dev->mgmt_lock);
...@@ -948,28 +971,54 @@ static int set_features(struct hinic_dev *nic_dev, ...@@ -948,28 +971,54 @@ static int set_features(struct hinic_dev *nic_dev,
{ {
netdev_features_t changed = force_change ? ~0 : pre_features ^ features; netdev_features_t changed = force_change ? ~0 : pre_features ^ features;
u32 csum_en = HINIC_RX_CSUM_OFFLOAD_EN; u32 csum_en = HINIC_RX_CSUM_OFFLOAD_EN;
netdev_features_t failed_features = 0;
int ret = 0;
int err = 0; int err = 0;
if (changed & NETIF_F_TSO) if (changed & NETIF_F_TSO) {
err = hinic_port_set_tso(nic_dev, (features & NETIF_F_TSO) ? ret = hinic_port_set_tso(nic_dev, (features & NETIF_F_TSO) ?
HINIC_TSO_ENABLE : HINIC_TSO_DISABLE); HINIC_TSO_ENABLE : HINIC_TSO_DISABLE);
if (ret) {
err = ret;
failed_features |= NETIF_F_TSO;
}
}
if (changed & NETIF_F_RXCSUM) if (changed & NETIF_F_RXCSUM) {
err = hinic_set_rx_csum_offload(nic_dev, csum_en); ret = hinic_set_rx_csum_offload(nic_dev, csum_en);
if (ret) {
err = ret;
failed_features |= NETIF_F_RXCSUM;
}
}
if (changed & NETIF_F_LRO) { if (changed & NETIF_F_LRO) {
err = hinic_set_rx_lro_state(nic_dev, ret = hinic_set_rx_lro_state(nic_dev,
!!(features & NETIF_F_LRO), !!(features & NETIF_F_LRO),
HINIC_LRO_RX_TIMER_DEFAULT, HINIC_LRO_RX_TIMER_DEFAULT,
HINIC_LRO_MAX_WQE_NUM_DEFAULT); HINIC_LRO_MAX_WQE_NUM_DEFAULT);
if (ret) {
err = ret;
failed_features |= NETIF_F_LRO;
}
} }
if (changed & NETIF_F_HW_VLAN_CTAG_RX) if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
err = hinic_set_rx_vlan_offload(nic_dev, ret = hinic_set_rx_vlan_offload(nic_dev,
!!(features & !!(features &
NETIF_F_HW_VLAN_CTAG_RX)); NETIF_F_HW_VLAN_CTAG_RX));
if (ret) {
err = ret;
failed_features |= NETIF_F_HW_VLAN_CTAG_RX;
}
}
return err; if (err) {
nic_dev->netdev->features = features ^ failed_features;
return -EIO;
}
return 0;
} }
/** /**
...@@ -1008,8 +1057,6 @@ static int nic_dev_init(struct pci_dev *pdev) ...@@ -1008,8 +1057,6 @@ static int nic_dev_init(struct pci_dev *pdev)
goto err_alloc_etherdev; goto err_alloc_etherdev;
} }
hinic_set_ethtool_ops(netdev);
if (!HINIC_IS_VF(hwdev->hwif)) if (!HINIC_IS_VF(hwdev->hwif))
netdev->netdev_ops = &hinic_netdev_ops; netdev->netdev_ops = &hinic_netdev_ops;
else else
...@@ -1032,6 +1079,8 @@ static int nic_dev_init(struct pci_dev *pdev) ...@@ -1032,6 +1079,8 @@ static int nic_dev_init(struct pci_dev *pdev)
nic_dev->sriov_info.pdev = pdev; nic_dev->sriov_info.pdev = pdev;
nic_dev->max_qps = num_qps; nic_dev->max_qps = num_qps;
hinic_set_ethtool_ops(netdev);
sema_init(&nic_dev->mgmt_lock, 1); sema_init(&nic_dev->mgmt_lock, 1);
tx_stats = &nic_dev->tx_stats; tx_stats = &nic_dev->tx_stats;
...@@ -1100,6 +1149,11 @@ static int nic_dev_init(struct pci_dev *pdev) ...@@ -1100,6 +1149,11 @@ static int nic_dev_init(struct pci_dev *pdev)
if (err) if (err)
goto err_set_features; goto err_set_features;
/* enable pause and disable pfc by default */
err = hinic_dcb_set_pfc(nic_dev->hwdev, 0, 0);
if (err)
goto err_set_pfc;
SET_NETDEV_DEV(netdev, &pdev->dev); SET_NETDEV_DEV(netdev, &pdev->dev);
err = register_netdev(netdev); err = register_netdev(netdev);
...@@ -1111,6 +1165,7 @@ static int nic_dev_init(struct pci_dev *pdev) ...@@ -1111,6 +1165,7 @@ static int nic_dev_init(struct pci_dev *pdev)
return 0; return 0;
err_reg_netdev: err_reg_netdev:
err_set_pfc:
err_set_features: err_set_features:
hinic_hwdev_cb_unregister(nic_dev->hwdev, hinic_hwdev_cb_unregister(nic_dev->hwdev,
HINIC_MGMT_MSG_CMD_LINK_STATUS); HINIC_MGMT_MSG_CMD_LINK_STATUS);
......
...@@ -1082,6 +1082,7 @@ int hinic_get_link_mode(struct hinic_hwdev *hwdev, ...@@ -1082,6 +1082,7 @@ int hinic_get_link_mode(struct hinic_hwdev *hwdev,
if (!hwdev || !link_mode) if (!hwdev || !link_mode)
return -EINVAL; return -EINVAL;
link_mode->func_id = HINIC_HWIF_FUNC_IDX(hwdev->hwif);
out_size = sizeof(*link_mode); out_size = sizeof(*link_mode);
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_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, ...@@ -1172,6 +1173,8 @@ int hinic_get_hw_pause_info(struct hinic_hwdev *hwdev,
u16 out_size = sizeof(*pause_info); u16 out_size = sizeof(*pause_info);
int err; int err;
pause_info->func_id = HINIC_HWIF_FUNC_IDX(hwdev->hwif);
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_PAUSE_INFO, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_PAUSE_INFO,
pause_info, sizeof(*pause_info), pause_info, sizeof(*pause_info),
pause_info, &out_size); pause_info, &out_size);
...@@ -1190,6 +1193,8 @@ int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev, ...@@ -1190,6 +1193,8 @@ int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev,
u16 out_size = sizeof(*pause_info); u16 out_size = sizeof(*pause_info);
int err; int err;
pause_info->func_id = HINIC_HWIF_FUNC_IDX(hwdev->hwif);
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_PAUSE_INFO, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_PAUSE_INFO,
pause_info, sizeof(*pause_info), pause_info, sizeof(*pause_info),
pause_info, &out_size); pause_info, &out_size);
...@@ -1201,3 +1206,38 @@ int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev, ...@@ -1201,3 +1206,38 @@ int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev,
return 0; return 0;
} }
int hinic_dcb_set_pfc(struct hinic_hwdev *hwdev, u8 pfc_en, u8 pfc_bitmap)
{
struct hinic_nic_cfg *nic_cfg = &hwdev->func_to_io.nic_cfg;
struct hinic_set_pfc pfc = {0};
u16 out_size = sizeof(pfc);
int err;
if (HINIC_IS_VF(hwdev->hwif))
return 0;
mutex_lock(&nic_cfg->cfg_mutex);
pfc.func_id = HINIC_HWIF_FUNC_IDX(hwdev->hwif);
pfc.pfc_bitmap = pfc_bitmap;
pfc.pfc_en = pfc_en;
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_PFC,
&pfc, sizeof(pfc), &pfc, &out_size);
if (err || pfc.status || !out_size) {
dev_err(&hwdev->hwif->pdev->dev, "Failed to %s pfc, err: %d, status: 0x%x, out size: 0x%x\n",
pfc_en ? "enable" : "disable", err, pfc.status,
out_size);
mutex_unlock(&nic_cfg->cfg_mutex);
return -EIO;
}
/* pause settings is opposite from pfc */
nic_cfg->rx_pause = pfc_en ? 0 : 1;
nic_cfg->tx_pause = pfc_en ? 0 : 1;
mutex_unlock(&nic_cfg->cfg_mutex);
return 0;
}
...@@ -641,6 +641,17 @@ struct hinic_pause_config { ...@@ -641,6 +641,17 @@ struct hinic_pause_config {
u32 tx_pause; u32 tx_pause;
}; };
struct hinic_set_pfc {
u8 status;
u8 version;
u8 rsvd0[6];
u16 func_id;
u8 pfc_en;
u8 pfc_bitmap;
u8 rsvd1[4];
};
int hinic_port_add_mac(struct hinic_dev *nic_dev, const u8 *addr, int hinic_port_add_mac(struct hinic_dev *nic_dev, const u8 *addr,
u16 vlan_id); u16 vlan_id);
...@@ -736,6 +747,8 @@ int hinic_get_hw_pause_info(struct hinic_hwdev *hwdev, ...@@ -736,6 +747,8 @@ int hinic_get_hw_pause_info(struct hinic_hwdev *hwdev,
int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev, int hinic_set_hw_pause_info(struct hinic_hwdev *hwdev,
struct hinic_pause_config *pause_info); struct hinic_pause_config *pause_info);
int hinic_dcb_set_pfc(struct hinic_hwdev *hwdev, u8 pfc_en, u8 pfc_bitmap);
int hinic_open(struct net_device *netdev); int hinic_open(struct net_device *netdev);
int hinic_close(struct net_device *netdev); int hinic_close(struct net_device *netdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment