Commit 78936acc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-hns3-updates-for-next' 

Huazhong Tan says:

====================
net: hns3: updates for -next

This series adds some code optimizations and compatibility
handlings for the HNS3 ethernet driver.

change log:
V2: refactor #2 as Jukub Kicinski reported and remove the part
    about RSS size which will not be different in different hw.
    updates netdev->max_mtu as well in #4 reported by Jakub Kicinski.

previous version:
V1: https://patchwork.kernel.org/project/netdevbpf/cover/1612269593-18691-1-git-send-email-tanhuazhong@huawei.com/
====================

Link: https://lore.kernel.org/r/1612513969-9278-1-git-send-email-tanhuazhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 74c05b9f 3f094bd1

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

+2 −3
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ struct hnae3_dev_specs { 
	u16 int_ql_max; /* max value of interrupt coalesce based on INT_QL */

	u16 max_int_gl; /* max value of interrupt coalesce based on INT_GL */

	u8 max_non_tso_bd_num; /* max BD number of one non-TSO packet */

	u16 max_frm_size;

	u16 max_qset_num;

};



struct hnae3_client_ops {
@@ -410,8 +412,6 @@ struct hnae3_ae_dev { 
 *   Get the len of the regs dump

 * get_rss_key_size()

 *   Get rss key size

 * get_rss_indir_size()

 *   Get rss indirection table size

 * get_rss()

 *   Get rss table

 * set_rss()
@@ -555,7 +555,6 @@ struct hnae3_ae_ops { 
	int (*get_regs_len)(struct hnae3_handle *handle);



	u32 (*get_rss_key_size)(struct hnae3_handle *handle);

	u32 (*get_rss_indir_size)(struct hnae3_handle *handle);

	int (*get_rss)(struct hnae3_handle *handle, u32 *indir, u8 *key,

		       u8 *hfunc);

	int (*set_rss)(struct hnae3_handle *handle, const u32 *indir,

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

+3 −0
Original line number Diff line number Diff line
@@ -389,6 +389,9 @@ static void hns3_dbg_dev_specs(struct hnae3_handle *h) 
		 kinfo->tc_info.num_tc);

	dev_info(priv->dev, "MAX INT QL: %u\n", dev_specs->int_ql_max);

	dev_info(priv->dev, "MAX INT GL: %u\n", dev_specs->max_int_gl);

	dev_info(priv->dev, "MAX frame size: %u\n", dev_specs->max_frm_size);

	dev_info(priv->dev, "MAX TM RATE: %uMbps\n", dev_specs->max_tm_rate);

	dev_info(priv->dev, "MAX QSET number: %u\n", dev_specs->max_qset_num);

}



static ssize_t hns3_dbg_cmd_read(struct file *filp, char __user *buffer,

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

+1 −2
Original line number Diff line number Diff line
@@ -4281,8 +4281,7 @@ static int hns3_client_init(struct hnae3_handle *handle) 


	hns3_dbg_init(handle);



	/* MTU range: (ETH_MIN_MTU(kernel default) - 9702) */

	netdev->max_mtu = HNS3_MAX_MTU;

	netdev->max_mtu = HNS3_MAX_MTU(ae_dev->dev_specs.max_frm_size);



	if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps))

		set_bit(HNS3_NIC_STATE_HW_TX_CSUM_ENABLE, &priv->state);

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

+2 −3
Original line number Diff line number Diff line
@@ -56,9 +56,8 @@ enum hns3_nic_state { 
#define HNS3_RING_MIN_PENDING			72

#define HNS3_RING_BD_MULTIPLE			8

/* max frame size of mac */

#define HNS3_MAC_MAX_FRAME			9728

#define HNS3_MAX_MTU \

	(HNS3_MAC_MAX_FRAME - (ETH_HLEN + ETH_FCS_LEN + 2 * VLAN_HLEN))

#define HNS3_MAX_MTU(max_frm_size) \

	((max_frm_size) - (ETH_HLEN + ETH_FCS_LEN + 2 * VLAN_HLEN))



#define HNS3_BD_SIZE_512_TYPE			0

#define HNS3_BD_SIZE_1024_TYPE			1

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

+2 −4
Original line number Diff line number Diff line
@@ -859,11 +859,9 @@ static u32 hns3_get_rss_key_size(struct net_device *netdev) 
static u32 hns3_get_rss_indir_size(struct net_device *netdev)

{

	struct hnae3_handle *h = hns3_get_handle(netdev);

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



	if (!h->ae_algo->ops->get_rss_indir_size)

		return 0;



	return h->ae_algo->ops->get_rss_indir_size(h);

	return ae_dev->dev_specs.rss_ind_tbl_size;

}



static int hns3_get_rss(struct net_device *netdev, u32 *indir, u8 *key,