mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-23 02:51:47 +00:00
Merge branch 'hns3-next'
Huazhong Tan says: ==================== net: hns3: two updates for -next This series includes two updates for the HNS3 ethernet driver. ==================== Acked-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
6c6095214a
6 changed files with 43 additions and 9 deletions
|
@ -90,6 +90,7 @@ enum HNAE3_DEV_CAP_BITS {
|
|||
HNAE3_DEV_SUPPORT_HW_PAD_B,
|
||||
HNAE3_DEV_SUPPORT_STASH_B,
|
||||
HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B,
|
||||
HNAE3_DEV_SUPPORT_PAUSE_B,
|
||||
};
|
||||
|
||||
#define hnae3_dev_fd_supported(hdev) \
|
||||
|
@ -134,6 +135,9 @@ enum HNAE3_DEV_CAP_BITS {
|
|||
#define hnae3_dev_stash_supported(hdev) \
|
||||
test_bit(HNAE3_DEV_SUPPORT_STASH_B, (hdev)->ae_dev->caps)
|
||||
|
||||
#define hnae3_dev_pause_supported(hdev) \
|
||||
test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (hdev)->ae_dev->caps)
|
||||
|
||||
#define hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev) \
|
||||
test_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, (ae_dev)->caps)
|
||||
|
||||
|
|
|
@ -362,6 +362,9 @@ static void hns3_dbg_dev_caps(struct hnae3_handle *h)
|
|||
dev_info(&h->pdev->dev, "support UDP tunnel csum: %s\n",
|
||||
test_bit(HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B, caps) ?
|
||||
"yes" : "no");
|
||||
dev_info(&h->pdev->dev, "support PAUSE: %s\n",
|
||||
test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps) ?
|
||||
"yes" : "no");
|
||||
}
|
||||
|
||||
static void hns3_dbg_dev_specs(struct hnae3_handle *h)
|
||||
|
|
|
@ -642,6 +642,10 @@ static void hns3_get_pauseparam(struct net_device *netdev,
|
|||
struct ethtool_pauseparam *param)
|
||||
{
|
||||
struct hnae3_handle *h = hns3_get_handle(netdev);
|
||||
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev);
|
||||
|
||||
if (!test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps))
|
||||
return;
|
||||
|
||||
if (h->ae_algo->ops->get_pauseparam)
|
||||
h->ae_algo->ops->get_pauseparam(h, ¶m->autoneg,
|
||||
|
@ -652,6 +656,10 @@ static int hns3_set_pauseparam(struct net_device *netdev,
|
|||
struct ethtool_pauseparam *param)
|
||||
{
|
||||
struct hnae3_handle *h = hns3_get_handle(netdev);
|
||||
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev);
|
||||
|
||||
if (!test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
netif_dbg(h, drv, netdev,
|
||||
"set pauseparam: autoneg=%u, rx:%u, tx:%u\n",
|
||||
|
|
|
@ -353,7 +353,10 @@ static void hclge_set_default_capability(struct hclge_dev *hdev)
|
|||
|
||||
set_bit(HNAE3_DEV_SUPPORT_FD_B, ae_dev->caps);
|
||||
set_bit(HNAE3_DEV_SUPPORT_GRO_B, ae_dev->caps);
|
||||
set_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps);
|
||||
if (hdev->ae_dev->dev_version == HNAE3_DEVICE_VERSION_V2) {
|
||||
set_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps);
|
||||
set_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps);
|
||||
}
|
||||
}
|
||||
|
||||
static void hclge_parse_capability(struct hclge_dev *hdev,
|
||||
|
@ -378,6 +381,10 @@ static void hclge_parse_capability(struct hclge_dev *hdev,
|
|||
set_bit(HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B, ae_dev->caps);
|
||||
if (hnae3_get_bit(caps, HCLGE_CAP_FD_FORWARD_TC_B))
|
||||
set_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, ae_dev->caps);
|
||||
if (hnae3_get_bit(caps, HCLGE_CAP_FEC_B))
|
||||
set_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps);
|
||||
if (hnae3_get_bit(caps, HCLGE_CAP_PAUSE_B))
|
||||
set_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps);
|
||||
}
|
||||
|
||||
static __le32 hclge_build_api_caps(void)
|
||||
|
|
|
@ -384,6 +384,8 @@ enum HCLGE_CAP_BITS {
|
|||
HCLGE_CAP_HW_PAD_B,
|
||||
HCLGE_CAP_STASH_B,
|
||||
HCLGE_CAP_UDP_TUNNEL_CSUM_B,
|
||||
HCLGE_CAP_FEC_B = 13,
|
||||
HCLGE_CAP_PAUSE_B = 14,
|
||||
};
|
||||
|
||||
enum HCLGE_API_CAP_BITS {
|
||||
|
|
|
@ -1150,8 +1150,10 @@ static void hclge_parse_fiber_link_mode(struct hclge_dev *hdev,
|
|||
if (hnae3_dev_fec_supported(hdev))
|
||||
hclge_convert_setting_fec(mac);
|
||||
|
||||
if (hnae3_dev_pause_supported(hdev))
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);
|
||||
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mac->supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT, mac->supported);
|
||||
}
|
||||
|
||||
|
@ -1163,8 +1165,11 @@ static void hclge_parse_backplane_link_mode(struct hclge_dev *hdev,
|
|||
hclge_convert_setting_kr(mac, speed_ability);
|
||||
if (hnae3_dev_fec_supported(hdev))
|
||||
hclge_convert_setting_fec(mac);
|
||||
|
||||
if (hnae3_dev_pause_supported(hdev))
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);
|
||||
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, mac->supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT, mac->supported);
|
||||
}
|
||||
|
||||
|
@ -1193,10 +1198,13 @@ static void hclge_parse_copper_link_mode(struct hclge_dev *hdev,
|
|||
linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, supported);
|
||||
}
|
||||
|
||||
if (hnae3_dev_pause_supported(hdev)) {
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, supported);
|
||||
}
|
||||
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_TP_BIT, supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);
|
||||
linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, supported);
|
||||
}
|
||||
|
||||
static void hclge_parse_link_mode(struct hclge_dev *hdev, u16 speed_ability)
|
||||
|
@ -2889,10 +2897,12 @@ static void hclge_update_link_status(struct hclge_dev *hdev)
|
|||
clear_bit(HCLGE_STATE_LINK_UPDATING, &hdev->state);
|
||||
}
|
||||
|
||||
static void hclge_update_port_capability(struct hclge_mac *mac)
|
||||
static void hclge_update_port_capability(struct hclge_dev *hdev,
|
||||
struct hclge_mac *mac)
|
||||
{
|
||||
/* update fec ability by speed */
|
||||
hclge_convert_setting_fec(mac);
|
||||
if (hnae3_dev_fec_supported(hdev))
|
||||
/* update fec ability by speed */
|
||||
hclge_convert_setting_fec(mac);
|
||||
|
||||
/* firmware can not identify back plane type, the media type
|
||||
* read from configuration can help deal it
|
||||
|
@ -3012,7 +3022,7 @@ static int hclge_update_port_info(struct hclge_dev *hdev)
|
|||
|
||||
if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {
|
||||
if (mac->speed_type == QUERY_ACTIVE_SPEED) {
|
||||
hclge_update_port_capability(mac);
|
||||
hclge_update_port_capability(hdev, mac);
|
||||
return 0;
|
||||
}
|
||||
return hclge_cfg_mac_speed_dup(hdev, mac->speed,
|
||||
|
|
Loading…
Reference in a new issue