Commit 602e0f29 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Huazhong Tan says:

====================
code optimizations & bugfixes for HNS3 driver

This patch-set includes code optimizations and bugfixes for the HNS3
ethernet controller driver.

[patch 1/12] fixes a compile warning reported by kbuild test robot.

[patch 2/12] fixes HNS3_RXD_GRO_SIZE_M macro definition error.

[patch 3/12] adds a debugfs command to dump firmware information.

[patch 4/12 - 10/12] adds some code optimizaions and cleanups for
reset and driver unloading.

[patch 11/12 - 12/12] adds two bugfixes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 66350023 49f971bd

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

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	dev_info(&h->pdev->dev, "dump qos buf cfg\n");

	dev_info(&h->pdev->dev, "dump mng tbl\n");

	dev_info(&h->pdev->dev, "dump reset info\n");

	dev_info(&h->pdev->dev, "dump m7 info\n");

	dev_info(&h->pdev->dev, "dump ncl_config <offset> <length>(in hex)\n");

	dev_info(&h->pdev->dev, "dump mac tnl status\n");

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

+2 −2
Original line number Diff line number Diff line
@@ -3901,6 +3901,8 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) 


	hns3_client_stop(handle);



	hns3_uninit_phy(netdev);



	if (!test_and_clear_bit(HNS3_NIC_STATE_INITED, &priv->state)) {

		netdev_warn(netdev, "already uninitialized\n");

		goto out_netdev_free;
@@ -3910,8 +3912,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) 


	hns3_force_clear_all_rx_ring(handle);



	hns3_uninit_phy(netdev);



	hns3_nic_uninit_vector_data(priv);



	ret = hns3_nic_dealloc_vector_data(priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ enum hns3_nic_state { 
#define HNS3_RXD_TSIND_M			(0x7 << HNS3_RXD_TSIND_S)

#define HNS3_RXD_LKBK_B				15

#define HNS3_RXD_GRO_SIZE_S			16

#define HNS3_RXD_GRO_SIZE_M			(0x3ff << HNS3_RXD_GRO_SIZE_S)

#define HNS3_RXD_GRO_SIZE_M			(0x3fff << HNS3_RXD_GRO_SIZE_S)



#define HNS3_TXD_L3T_S				0

#define HNS3_TXD_L3T_M				(0x3 << HNS3_TXD_L3T_S)

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

+2 −4
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring) 
		hclge_write_dev(hw, HCLGE_NIC_CSQ_BASEADDR_H_REG,

				upper_32_bits(dma));

		hclge_write_dev(hw, HCLGE_NIC_CSQ_DEPTH_REG,

				(ring->desc_num >> HCLGE_NIC_CMQ_DESC_NUM_S) |

				HCLGE_NIC_CMQ_ENABLE);

				ring->desc_num >> HCLGE_NIC_CMQ_DESC_NUM_S);

		hclge_write_dev(hw, HCLGE_NIC_CSQ_HEAD_REG, 0);

		hclge_write_dev(hw, HCLGE_NIC_CSQ_TAIL_REG, 0);

	} else {
@@ -120,8 +119,7 @@ static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring) 
		hclge_write_dev(hw, HCLGE_NIC_CRQ_BASEADDR_H_REG,

				upper_32_bits(dma));

		hclge_write_dev(hw, HCLGE_NIC_CRQ_DEPTH_REG,

				(ring->desc_num >> HCLGE_NIC_CMQ_DESC_NUM_S) |

				HCLGE_NIC_CMQ_ENABLE);

				ring->desc_num >> HCLGE_NIC_CMQ_DESC_NUM_S);

		hclge_write_dev(hw, HCLGE_NIC_CRQ_HEAD_REG, 0);

		hclge_write_dev(hw, HCLGE_NIC_CRQ_TAIL_REG, 0);

	}

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

+8 −0
Original line number Diff line number Diff line
@@ -243,6 +243,9 @@ enum hclge_opcode_type { 


	/* NCL config command */

	HCLGE_OPC_QUERY_NCL_CONFIG	= 0x7011,

	/* M7 stats command */

	HCLGE_OPC_M7_STATS_BD		= 0x7012,

	HCLGE_OPC_M7_STATS_INFO		= 0x7013,



	/* SFP command */

	HCLGE_OPC_GET_SFP_INFO		= 0x7104,
@@ -970,6 +973,11 @@ struct hclge_fd_ad_config_cmd { 
	u8 rsv2[8];

};



struct hclge_get_m7_bd_cmd {

	__le32 bd_num;

	u8 rsv[20];

};



int hclge_cmd_init(struct hclge_dev *hdev);

static inline void hclge_write_reg(void __iomem *base, u32 reg, u32 value)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE