Unverified Commit 94f199d2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4583 net: hns3: fix a bug and modify the hns3 driver version 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yonglong Liu <liuyonglong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JNG5SUVNB5H2NTGQUFTRR2RHZNJZMXU6/ 
This patch set fix tm port shaping problem and modify the hns3
driver version.

Guangbin Huang (1):
  net: hns3: fix tm port shapping of fibre port is incorrect after
    driver initialization

Yonglong Liu (1):
  net: hns3: update hns3 version to 24.2.1


-- 
2.17.1
 
https://gitee.com/openeuler/kernel/issues/I91FSH 
 
Link:https://gitee.com/openeuler/kernel/pulls/4583

 

Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 7efcac76 aaa5509c

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/types.h>

#include <net/pkt_cls.h>



#define HNAE3_MOD_VERSION "23.7.1"

#define HNAE3_MOD_VERSION "24.2.1"



#define HNAE3_MIN_VECTOR_NUM	2 /* first one for misc, another for IO */

drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#ifndef __HNS3_CAE_VERSION_H__

#define __HNS3_CAE_VERSION_H__



#define HNS3_CAE_MOD_VERSION "23.7.1"

#define HNS3_CAE_MOD_VERSION "24.2.1"



#define CMT_ID_LEN 8

#define RESV_LEN 3

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include "hnae3.h"



#define HNS3_MOD_VERSION "23.7.1"

#define HNS3_MOD_VERSION "24.2.1"



extern char hns3_driver_version[];

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+8 −3
Original line number Diff line number Diff line
@@ -2916,7 +2916,7 @@ static int hclge_get_sfp_info(struct hclge_dev *hdev, struct hclge_mac *mac) 
static int hclge_update_port_info(struct hclge_dev *hdev)

{

	struct hclge_mac *mac = &hdev->hw.mac;

	int speed = HCLGE_MAC_SPEED_UNKNOWN;

	int speed;

	int ret;



	/* get the port info from SFP cmd if not copper port */
@@ -2927,10 +2927,13 @@ static int hclge_update_port_info(struct hclge_dev *hdev) 
	if (!hdev->support_sfp_query)

		return 0;



	if (hdev->pdev->revision >= 0x21)

	if (hdev->pdev->revision >= 0x21) {

		speed = mac->speed;

		ret = hclge_get_sfp_info(hdev, mac);

	else

	} else {

		speed = HCLGE_MAC_SPEED_UNKNOWN;

		ret = hclge_get_sfp_speed(hdev, &speed);

	}



	if (ret == -EOPNOTSUPP) {

		hdev->support_sfp_query = false;
@@ -2942,6 +2945,8 @@ static int hclge_update_port_info(struct hclge_dev *hdev) 
	if (hdev->pdev->revision >= 0x21) {

		if (mac->speed_type == QUERY_ACTIVE_SPEED) {

			hclge_update_port_capability(mac);

			if (mac->speed != speed)

				(void)hclge_tm_port_shaper_cfg(hdev);

			return 0;

		}

		return hclge_cfg_mac_speed_dup(hdev, mac->speed,

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "hclge_cmd.h"

#include "hnae3.h"



#define HCLGE_MOD_VERSION "23.7.1"

#define HCLGE_MOD_VERSION "24.2.1"

#define HCLGE_DRIVER_NAME "hclge"



#define HCLGE_MAX_PF_NUM		8