Commit 1541e25e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Huazhong Tan says:

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

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

[patch 1] modifies an unsuitable print when setting dulex mode.
[patch 2] adds some debugfs info for TC and DWRR.
[patch 3] adds some debugfs info for loopback.
[patch 4] adds a missing help info for QS shaper in debugfs.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e99f8e7f 89ec9485

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

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,8 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	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");

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

	dev_info(&h->pdev->dev, "dump qs shaper [qs id]\n");



	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);

	strncat(printf_buf, "dump reg [[bios common] [ssu <port_id>]",

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

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static int hns3_check_ksettings_param(const struct net_device *netdev, 
	if (ops->get_media_type)

		ops->get_media_type(handle, &media_type, &module_type);



	if (cmd->base.duplex != DUPLEX_FULL &&

	if (cmd->base.duplex == DUPLEX_HALF &&

	    media_type != HNAE3_MEDIA_TYPE_COPPER) {

		netdev_err(netdev,

			   "only copper port supports half duplex!");

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

+60 −3
Original line number Diff line number Diff line
@@ -310,8 +310,9 @@ static void hclge_title_idx_print(struct hclge_dev *hdev, bool flag, int index, 
				  char *false_buf)

{

	if (flag)

		dev_info(&hdev->pdev->dev, "%s(%d): %s\n", title_buf, index,

			 true_buf);

		dev_info(&hdev->pdev->dev, "%s(%d): %s weight: %u\n",

			 title_buf, index, true_buf,

			 hdev->tm_info.pg_info[0].tc_dwrr[index]);

	else

		dev_info(&hdev->pdev->dev, "%s(%d): %s\n", title_buf, index,

			 false_buf);
@@ -339,7 +340,8 @@ static void hclge_dbg_dump_tc(struct hclge_dev *hdev) 


	ets_weight = (struct hclge_ets_tc_weight_cmd *)desc.data;



	dev_info(&hdev->pdev->dev, "dump tc\n");

	dev_info(&hdev->pdev->dev, "dump tc: %u tc enabled\n",

		 hdev->tm_info.num_tc);

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

		 ets_weight->weight_offset);
@@ -1169,6 +1171,57 @@ static void hclge_dbg_dump_ncl_config(struct hclge_dev *hdev, 
	}

}



static void hclge_dbg_dump_loopback(struct hclge_dev *hdev,

				    const char *cmd_buf)

{

	struct phy_device *phydev = hdev->hw.mac.phydev;

	struct hclge_config_mac_mode_cmd *req_app;

	struct hclge_serdes_lb_cmd *req_serdes;

	struct hclge_desc desc;

	u8 loopback_en;

	int ret;



	req_app = (struct hclge_config_mac_mode_cmd *)desc.data;

	req_serdes = (struct hclge_serdes_lb_cmd *)desc.data;



	dev_info(&hdev->pdev->dev, "mac id: %u\n", hdev->hw.mac.mac_id);



	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 app loopback status, ret = %d\n", ret);

		return;

	}



	loopback_en = hnae3_get_bit(le32_to_cpu(req_app->txrx_pad_fcs_loop_en),

				    HCLGE_MAC_APP_LP_B);

	dev_info(&hdev->pdev->dev, "app loopback: %s\n",

		 loopback_en ? "on" : "off");



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_SERDES_LOOPBACK, true);

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

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump serdes loopback status, ret = %d\n",

			ret);

		return;

	}



	loopback_en = req_serdes->enable & HCLGE_CMD_SERDES_SERIAL_INNER_LOOP_B;

	dev_info(&hdev->pdev->dev, "serdes serial loopback: %s\n",

		 loopback_en ? "on" : "off");



	loopback_en = req_serdes->enable &

			HCLGE_CMD_SERDES_PARALLEL_INNER_LOOP_B;

	dev_info(&hdev->pdev->dev, "serdes parallel loopback: %s\n",

		 loopback_en ? "on" : "off");



	if (phydev)

		dev_info(&hdev->pdev->dev, "phy loopback: %s\n",

			 phydev->loopback_enabled ? "on" : "off");

}



/* hclge_dbg_dump_mac_tnl_status: print message about mac tnl interrupt

 * @hdev: pointer to struct hclge_dev

 */
@@ -1269,6 +1322,7 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 
{

#define DUMP_REG	"dump reg"

#define DUMP_TM_MAP	"dump tm map"

#define DUMP_LOOPBACK	"dump loopback"



	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;
@@ -1302,6 +1356,9 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 
					  &cmd_buf[sizeof("dump ncl_config")]);

	} else if (strncmp(cmd_buf, "dump mac tnl status", 19) == 0) {

		hclge_dbg_dump_mac_tnl_status(hdev);

	} else if (strncmp(cmd_buf, DUMP_LOOPBACK,

		   strlen(DUMP_LOOPBACK)) == 0) {

		hclge_dbg_dump_loopback(hdev, &cmd_buf[sizeof(DUMP_LOOPBACK)]);

	} else if (strncmp(cmd_buf, "dump qs shaper", 14) == 0) {

		hclge_dbg_dump_qs_shaper(hdev,

					 &cmd_buf[sizeof("dump qs shaper")]);

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

+3 −0
Original line number Diff line number Diff line
@@ -824,6 +824,8 @@ static void hclge_get_mac_stat(struct hnae3_handle *handle, 
static int hclge_parse_func_status(struct hclge_dev *hdev,

				   struct hclge_func_status_cmd *status)

{

#define HCLGE_MAC_ID_MASK	0xF



	if (!(status->pf_state & HCLGE_PF_STATE_DONE))

		return -EINVAL;
@@ -833,6 +835,7 @@ static int hclge_parse_func_status(struct hclge_dev *hdev, 
	else

		hdev->flag &= ~HCLGE_FLAG_MAIN;



	hdev->hw.mac.mac_id = status->mac_id & HCLGE_MAC_ID_MASK;

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ enum HCLGE_MAC_DUPLEX { 
#define QUERY_ACTIVE_SPEED	1



struct hclge_mac {

	u8 mac_id;

	u8 phy_addr;

	u8 flag;

	u8 media_type;	/* port media type, e.g. fibre/copper/backplane */

CRA Git | Maintained and supported by SUSTech CRA and CCSE