Commit 8beead2d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'there-are-a-cleancode-and-a-parameter-check-for-hns3-driver' 

Jijie Shao says:

====================
There are a cleancode and a parameter check for hns3 driver

This patchset includes:
 1. a parameter check omitted from fix code in net branch
   https://lore.kernel.org/all/20250723072900.GV2459@horms.kernel.org/
 2. a small clean code
====================

Link: https://patch.msgid.link/20250815100414.949752-1-shaojijie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3a752e67 021f989c

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

+33 −0
Original line number Diff line number Diff line
@@ -1927,6 +1927,31 @@ static int hns3_set_tx_spare_buf_size(struct net_device *netdev, 
	return ret;

}



static int hns3_check_tx_copybreak(struct net_device *netdev, u32 copybreak)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	if (copybreak < priv->min_tx_copybreak) {

		netdev_err(netdev, "tx copybreak %u should be no less than %u!\n",

			   copybreak, priv->min_tx_copybreak);

		return -EINVAL;

	}

	return 0;

}



static int hns3_check_tx_spare_buf_size(struct net_device *netdev, u32 buf_size)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	if (buf_size < priv->min_tx_spare_buf_size) {

		netdev_err(netdev,

			   "tx spare buf size %u should be no less than %u!\n",

			   buf_size, priv->min_tx_spare_buf_size);

		return -EINVAL;

	}

	return 0;

}



static int hns3_set_tunable(struct net_device *netdev,

			    const struct ethtool_tunable *tuna,

			    const void *data)
@@ -1943,6 +1968,10 @@ static int hns3_set_tunable(struct net_device *netdev, 


	switch (tuna->id) {

	case ETHTOOL_TX_COPYBREAK:

		ret = hns3_check_tx_copybreak(netdev, *(u32 *)data);

		if (ret)

			return ret;



		priv->tx_copybreak = *(u32 *)data;



		for (i = 0; i < h->kinfo.num_tqps; i++)
@@ -1957,6 +1986,10 @@ static int hns3_set_tunable(struct net_device *netdev, 


		break;

	case ETHTOOL_TX_COPYBREAK_BUF_SIZE:

		ret = hns3_check_tx_spare_buf_size(netdev, *(u32 *)data);

		if (ret)

			return ret;



		old_tx_spare_buf_size = h->kinfo.tx_spare_buf_size;

		new_tx_spare_buf_size = *(u32 *)data;

		netdev_info(netdev, "request to set tx spare buf size from %u to %u\n",

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

+2 −2
Original line number Diff line number Diff line
@@ -2182,7 +2182,7 @@ static bool hclge_drop_pfc_buf_till_fit(struct hclge_dev *hdev, 
	return hclge_is_rx_buf_ok(hdev, buf_alloc, rx_all);

}



static int hclge_only_alloc_priv_buff(struct hclge_dev *hdev,

static bool hclge_only_alloc_priv_buff(struct hclge_dev *hdev,

				       struct hclge_pkt_buf_alloc *buf_alloc)

{

#define COMPENSATE_BUFFER	0x3C00