Commit 92c6f2cf authored by Hao Lan's avatar Hao Lan Committed by Jiantao Xiao
Browse files

net: hns3: sync linux kernel hns3 wol to openeuler 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I72OPH


CVE: NA

----------------------------------------------------------------------

After the wol is commit to the linux community,
the code is different from the openEuler.
This patch synchronizes the kernel differences to the openEuler.

Signed-off-by: default avatarHao Lan <lanhao@huawei.com>
parent 8bfaf346

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

+6 −0
Original line number Diff line number Diff line
@@ -755,6 +755,12 @@ static inline unsigned int hns3_page_order(struct hns3_enet_ring *ring) 
#define hns3_get_handle(ndev) \

	(((struct hns3_nic_priv *)netdev_priv(ndev))->ae_handle)



#define hns3_get_ae_dev(handle) \

	(pci_get_drvdata((handle)->pdev))



#define hns3_get_ops(handle) \

	((handle)->ae_algo->ops)



#define hns3_gl_usec_to_reg(int_gl) ((int_gl) >> 1)

#define hns3_gl_round_down(int_gl) round_down(int_gl, 2)

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+6 −6
Original line number Diff line number Diff line
@@ -2046,10 +2046,10 @@ static int hns3_get_link_ext_state(struct net_device *netdev, 
static void hns3_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

{

	struct hnae3_handle *handle = hns3_get_handle(netdev);

	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	const struct hnae3_ae_ops *ops = handle->ae_algo->ops;

	const struct hnae3_ae_ops *ops = hns3_get_ops(handle);

	struct hnae3_ae_dev *ae_dev = hns3_get_ae_dev(handle);



	if (!hnae3_ae_dev_wol_supported(ae_dev) || !ops->get_wol)

	if (!hnae3_ae_dev_wol_supported(ae_dev))

		return;



	ops->get_wol(handle, wol);
@@ -2059,10 +2059,10 @@ static int hns3_set_wol(struct net_device *netdev, 
			struct ethtool_wolinfo *wol)

{

	struct hnae3_handle *handle = hns3_get_handle(netdev);

	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	const struct hnae3_ae_ops *ops = handle->ae_algo->ops;

	const struct hnae3_ae_ops *ops = hns3_get_ops(handle);

	struct hnae3_ae_dev *ae_dev = hns3_get_ae_dev(handle);



	if (!hnae3_ae_dev_wol_supported(ae_dev) || !ops->set_wol)

	if (!hnae3_ae_dev_wol_supported(ae_dev))

		return -EOPNOTSUPP;



	return ops->set_wol(handle, wol);

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

+0 −12
Original line number Diff line number Diff line
@@ -898,18 +898,6 @@ struct hclge_phy_reg_cmd { 
	u8 rsv2[12];

};



enum HCLGE_WOL_MODE {

	HCLGE_WOL_PHY           = BIT(0),

	HCLGE_WOL_UNICAST       = BIT(1),

	HCLGE_WOL_MULTICAST     = BIT(2),

	HCLGE_WOL_BROADCAST     = BIT(3),

	HCLGE_WOL_ARP           = BIT(4),

	HCLGE_WOL_MAGIC         = BIT(5),

	HCLGE_WOL_MAGICSECURED  = BIT(6),

	HCLGE_WOL_FILTER        = BIT(7),

	HCLGE_WOL_DISABLE       = 0,

};



struct hclge_wol_cfg_cmd {

	__le32 wake_on_lan_mode;

	u8 sopass[SOPASS_MAX];

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

+8 −8
Original line number Diff line number Diff line
@@ -2497,29 +2497,29 @@ static int hclge_dbg_dump_mac_mc(struct hclge_dev *hdev, char *buf, int len) 


static void hclge_dump_wol_mode(u32 mode, char *buf, int len, int *pos)

{

	if (mode & HCLGE_WOL_PHY)

	if (mode & WAKE_PHY)

		*pos += scnprintf(buf + *pos, len - *pos, "  [p]phy\n");



	if (mode & HCLGE_WOL_UNICAST)

	if (mode & WAKE_UCAST)

		*pos += scnprintf(buf + *pos, len - *pos, "  [u]unicast\n");



	if (mode & HCLGE_WOL_MULTICAST)

	if (mode & WAKE_MCAST)

		*pos += scnprintf(buf + *pos, len - *pos, "  [m]multicast\n");



	if (mode & HCLGE_WOL_BROADCAST)

	if (mode & WAKE_BCAST)

		*pos += scnprintf(buf + *pos, len - *pos, "  [b]broadcast\n");



	if (mode & HCLGE_WOL_ARP)

	if (mode & WAKE_ARP)

		*pos += scnprintf(buf + *pos, len - *pos, "  [a]arp\n");



	if (mode & HCLGE_WOL_MAGIC)

	if (mode & WAKE_MAGIC)

		*pos += scnprintf(buf + *pos, len - *pos, "  [g]magic\n");



	if (mode & HCLGE_WOL_MAGICSECURED)

	if (mode & WAKE_MAGICSECURE)

		*pos += scnprintf(buf + *pos, len - *pos,

				 "  [s]magic secured\n");



	if (mode & HCLGE_WOL_FILTER)

	if (mode & WAKE_FILTER)

		*pos += scnprintf(buf + *pos, len - *pos, "  [f]filter\n");

}

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

+21 −74
Original line number Diff line number Diff line
@@ -12067,69 +12067,15 @@ static void hclge_uninit_rxd_adv_layout(struct hclge_dev *hdev) 
		hclge_write_dev(&hdev->hw, HCLGE_RXD_ADV_LAYOUT_EN_REG, 0);

}



static __u32 hclge_wol_mode_to_ethtool(u32 mode)

static struct hclge_wol_info *hclge_get_wol_info(struct hnae3_handle *handle)

{

	__u32 ret = 0;



	if (mode & HCLGE_WOL_PHY)

		ret |= WAKE_PHY;



	if (mode & HCLGE_WOL_UNICAST)

		ret |= WAKE_UCAST;



	if (mode & HCLGE_WOL_MULTICAST)

		ret |= WAKE_MCAST;



	if (mode & HCLGE_WOL_BROADCAST)

		ret |= WAKE_BCAST;



	if (mode & HCLGE_WOL_ARP)

		ret |= WAKE_ARP;



	if (mode & HCLGE_WOL_MAGIC)

		ret |= WAKE_MAGIC;



	if (mode & HCLGE_WOL_MAGICSECURED)

		ret |= WAKE_MAGICSECURE;



	if (mode & HCLGE_WOL_FILTER)

		ret |= WAKE_FILTER;



	return ret;

}



static u32 hclge_wol_mode_from_ethtool(__u32 mode)

{

	u32 ret = HCLGE_WOL_DISABLE;



	if (mode & WAKE_PHY)

		ret |= HCLGE_WOL_PHY;



	if (mode & WAKE_UCAST)

		ret |= HCLGE_WOL_UNICAST;



	if (mode & WAKE_MCAST)

		ret |= HCLGE_WOL_MULTICAST;



	if (mode & WAKE_BCAST)

		ret |= HCLGE_WOL_BROADCAST;



	if (mode & WAKE_ARP)

		ret |= HCLGE_WOL_ARP;



	if (mode & WAKE_MAGIC)

		ret |= HCLGE_WOL_MAGIC;



	if (mode & WAKE_MAGICSECURE)

		ret |= HCLGE_WOL_MAGICSECURED;



	if (mode & WAKE_FILTER)

		ret |= HCLGE_WOL_FILTER;

	struct hclge_vport *vport = hclge_get_vport(handle);



	return ret;

	return &vport->back->hw.mac.wol;

}



int hclge_get_wol_supported_mode(struct hclge_dev *hdev, u32 *wol_supported)

int hclge_get_wol_supported_mode(struct hclge_dev *hdev,

				 u32 *wol_supported)

{

	struct hclge_query_wol_supported_cmd *wol_supported_cmd;

	struct hclge_desc desc;
@@ -12214,7 +12160,7 @@ static int hclge_init_wol(struct hclge_dev *hdev) 
	ret = hclge_get_wol_supported_mode(hdev,

					   &wol_info->wol_support_mode);

	if (ret) {

		wol_info->wol_support_mode = HCLGE_WOL_DISABLE;

		wol_info->wol_support_mode = 0;

		return ret;

	}
@@ -12224,38 +12170,39 @@ static int hclge_init_wol(struct hclge_dev *hdev) 
static void hclge_get_wol(struct hnae3_handle *handle,

			  struct ethtool_wolinfo *wol)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;

	struct hclge_wol_info *wol_info = &hdev->hw.mac.wol;

	struct hclge_wol_info *wol_info = hclge_get_wol_info(handle);



	wol->supported = hclge_wol_mode_to_ethtool(wol_info->wol_support_mode);

	wol->wolopts =

		hclge_wol_mode_to_ethtool(wol_info->wol_current_mode);

	if (wol_info->wol_current_mode & HCLGE_WOL_MAGICSECURED)

		memcpy(&wol->sopass, wol_info->wol_sopass, SOPASS_MAX);

	wol->supported = wol_info->wol_support_mode;

	wol->wolopts = wol_info->wol_current_mode;

	if (wol_info->wol_current_mode & WAKE_MAGICSECURE)

		memcpy(wol->sopass, wol_info->wol_sopass, SOPASS_MAX);

}



static int hclge_set_wol(struct hnae3_handle *handle,

			 struct ethtool_wolinfo *wol)

{

	struct hclge_wol_info *wol_info = hclge_get_wol_info(handle);

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;

	struct hclge_wol_info *wol_info = &hdev->hw.mac.wol;

	u32 wol_mode;

	int ret;



	wol_mode = hclge_wol_mode_from_ethtool(wol->wolopts);

	wol_mode = wol->wolopts;

	if (wol_mode & ~wol_info->wol_support_mode)

		return -EINVAL;



	wol_info->wol_current_mode = wol_mode;

	if (wol_mode & HCLGE_WOL_MAGICSECURED) {

		memcpy(wol_info->wol_sopass, &wol->sopass, SOPASS_MAX);

	if (wol_mode & WAKE_MAGICSECURE) {

		memcpy(wol_info->wol_sopass, wol->sopass, SOPASS_MAX);

		wol_info->wol_sopass_size = SOPASS_MAX;

	} else {

		wol_info->wol_sopass_size = 0;

	}



	return hclge_set_wol_cfg(hdev, wol_info);

	ret = hclge_set_wol_cfg(vport->back, wol_info);

	if (ret)

		wol_info->wol_current_mode = 0;



	return ret;

}



static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)