Commit 0fa1484e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Huazhong Tan says:

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

This patchset includes some misc updates for the HNS3 ethernet driver.

[patch 1&2] separates two bloated function.
[patch 3-5] removes some redundant code.
[patch 6-7] cleans up some coding style issues.
[patch 8-10] adds some debugging information.

Change log:
V1->V2:	removes an unnecessary initialization in [patch 1] which
	suggested by David Miller.
	modified some print format issue and commit log in [patch 8].
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b785b06c d8355240

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

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
		" [igu egu <port_id>] [rpu <tc_queue_num>]",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	strncat(printf_buf + strlen(printf_buf),

		" [rtc] [ppp] [rcb] [tqp <queue_num>]]\n",

		" [rtc] [ppp] [rcb] [tqp <queue_num>] [mac]]\n",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	dev_info(&h->pdev->dev, "%s", printf_buf);

drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3

ccflags-y += -I $(srctree)/$(src)



obj-$(CONFIG_HNS3_HCLGE) += hclge.o

hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_err.o  hclge_debugfs.o

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

+0 −25
Original line number Diff line number Diff line
@@ -733,31 +733,6 @@ struct hclge_mac_mgr_tbl_entry_cmd { 
	u8      rsv3[2];

};



struct hclge_mac_vlan_add_cmd {

	__le16  flags;

	__le16  mac_addr_hi16;

	__le32  mac_addr_lo32;

	__le32  mac_addr_msk_hi32;

	__le16  mac_addr_msk_lo16;

	__le16  vlan_tag;

	__le16  ingress_port;

	__le16  egress_port;

	u8      rsv[4];

};



#define HNS3_MAC_VLAN_CFG_FLAG_BIT 0

struct hclge_mac_vlan_remove_cmd {

	__le16  flags;

	__le16  mac_addr_hi16;

	__le32  mac_addr_lo32;

	__le32  mac_addr_msk_hi32;

	__le16  mac_addr_msk_lo16;

	__le16  vlan_tag;

	__le16  ingress_port;

	__le16  egress_port;

	u8      rsv[4];

};



struct hclge_vlan_filter_ctrl_cmd {

	u8 vlan_type;

	u8 vlan_fe;

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

+114 −1
Original line number Diff line number Diff line
@@ -173,6 +173,114 @@ static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev, 
	kfree(desc_src);

}



static void hclge_dbg_dump_mac_enable_status(struct hclge_dev *hdev)

{

	struct hclge_config_mac_mode_cmd *req;

	struct hclge_desc desc;

	u32 loop_en;

	int ret;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CONFIG_MAC_MODE, true);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump mac enable status, ret = %d\n", ret);

		return;

	}



	req = (struct hclge_config_mac_mode_cmd *)desc.data;

	loop_en = le32_to_cpu(req->txrx_pad_fcs_loop_en);



	dev_info(&hdev->pdev->dev, "config_mac_trans_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_TX_EN_B));

	dev_info(&hdev->pdev->dev, "config_mac_rcv_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_RX_EN_B));

	dev_info(&hdev->pdev->dev, "config_pad_trans_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_PAD_TX_B));

	dev_info(&hdev->pdev->dev, "config_pad_rcv_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_PAD_RX_B));

	dev_info(&hdev->pdev->dev, "config_1588_trans_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_1588_TX_B));

	dev_info(&hdev->pdev->dev, "config_1588_rcv_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_1588_RX_B));

	dev_info(&hdev->pdev->dev, "config_mac_app_loop_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_APP_LP_B));

	dev_info(&hdev->pdev->dev, "config_mac_line_loop_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_LINE_LP_B));

	dev_info(&hdev->pdev->dev, "config_mac_fcs_tx_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_FCS_TX_B));

	dev_info(&hdev->pdev->dev, "config_mac_rx_oversize_truncate_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_RX_OVERSIZE_TRUNCATE_B));

	dev_info(&hdev->pdev->dev, "config_mac_rx_fcs_strip_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_RX_FCS_STRIP_B));

	dev_info(&hdev->pdev->dev, "config_mac_rx_fcs_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_RX_FCS_B));

	dev_info(&hdev->pdev->dev, "config_mac_tx_under_min_err_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_TX_UNDER_MIN_ERR_B));

	dev_info(&hdev->pdev->dev, "config_mac_tx_oversize_truncate_en: %#x\n",

		 hnae3_get_bit(loop_en, HCLGE_MAC_TX_OVERSIZE_TRUNCATE_B));

}



static void hclge_dbg_dump_mac_frame_size(struct hclge_dev *hdev)

{

	struct hclge_config_max_frm_size_cmd *req;

	struct hclge_desc desc;

	int ret;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CONFIG_MAX_FRM_SIZE, true);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump mac frame size, ret = %d\n", ret);

		return;

	}



	req = (struct hclge_config_max_frm_size_cmd *)desc.data;



	dev_info(&hdev->pdev->dev, "max_frame_size: %u\n",

		 le16_to_cpu(req->max_frm_size));

	dev_info(&hdev->pdev->dev, "min_frame_size: %u\n", req->min_frm_size);

}



static void hclge_dbg_dump_mac_speed_duplex(struct hclge_dev *hdev)

{

#define HCLGE_MAC_SPEED_SHIFT	0

#define HCLGE_MAC_SPEED_MASK	GENMASK(5, 0)

#define HCLGE_MAC_DUPLEX_SHIFT	7



	struct hclge_config_mac_speed_dup_cmd *req;

	struct hclge_desc desc;

	int ret;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CONFIG_SPEED_DUP, true);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump mac speed duplex, ret = %d\n", ret);

		return;

	}



	req = (struct hclge_config_mac_speed_dup_cmd *)desc.data;



	dev_info(&hdev->pdev->dev, "speed: %#lx\n",

		 hnae3_get_field(req->speed_dup, HCLGE_MAC_SPEED_MASK,

				 HCLGE_MAC_SPEED_SHIFT));

	dev_info(&hdev->pdev->dev, "duplex: %#x\n",

		 hnae3_get_bit(req->speed_dup, HCLGE_MAC_DUPLEX_SHIFT));

}



static void hclge_dbg_dump_mac(struct hclge_dev *hdev)

{

	hclge_dbg_dump_mac_enable_status(hdev);



	hclge_dbg_dump_mac_frame_size(hdev);



	hclge_dbg_dump_mac_speed_duplex(hdev);

}



static void hclge_dbg_dump_dcb(struct hclge_dev *hdev, const char *cmd_buf)

{

	struct device *dev = &hdev->pdev->dev;
@@ -304,6 +412,11 @@ static void hclge_dbg_dump_reg_cmd(struct hclge_dev *hdev, const char *cmd_buf) 
		}

	}



	if (strncmp(cmd_buf, "mac", strlen("mac")) == 0) {

		hclge_dbg_dump_mac(hdev);

		has_dump = true;

	}



	if (strncmp(cmd_buf, "dcb", 3) == 0) {

		hclge_dbg_dump_dcb(hdev, &cmd_buf[sizeof("dcb")]);

		has_dump = true;

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

+370 −280

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE