Commit 57f81782 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-hns3-add-some-fixes-for-net' 

Guangbin Huang says:

====================
net: hns3: add some fixes for -net

This series adds some fixes for the HNS3 ethernet driver.
====================

Link: https://lore.kernel.org/r/1629976921-43438-1-git-send-email-huangguangbin2@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 733c99ee 8c1671e0

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

+7 −7
Original line number Diff line number Diff line
@@ -938,20 +938,19 @@ static int hns3_dbg_dev_info(struct hnae3_handle *h, char *buf, int len) 
	return 0;

}



static int hns3_dbg_get_cmd_index(struct hnae3_handle *handle,

				  const unsigned char *name, u32 *index)

static int hns3_dbg_get_cmd_index(struct hns3_dbg_data *dbg_data, u32 *index)

{

	u32 i;



	for (i = 0; i < ARRAY_SIZE(hns3_dbg_cmd); i++) {

		if (!strncmp(name, hns3_dbg_cmd[i].name,

			     strlen(hns3_dbg_cmd[i].name))) {

		if (hns3_dbg_cmd[i].cmd == dbg_data->cmd) {

			*index = i;

			return 0;

		}

	}



	dev_err(&handle->pdev->dev, "unknown command(%s)\n", name);

	dev_err(&dbg_data->handle->pdev->dev, "unknown command(%d)\n",

		dbg_data->cmd);

	return -EINVAL;

}
@@ -1019,8 +1018,7 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, 
	u32 index;

	int ret;



	ret = hns3_dbg_get_cmd_index(handle, filp->f_path.dentry->d_iname,

				     &index);

	ret = hns3_dbg_get_cmd_index(dbg_data, &index);

	if (ret)

		return ret;
@@ -1090,6 +1088,7 @@ static int hns3_dbg_bd_file_init(struct hnae3_handle *handle, u32 cmd) 
		char name[HNS3_DBG_FILE_NAME_LEN];



		data[i].handle = handle;

		data[i].cmd = hns3_dbg_cmd[cmd].cmd;

		data[i].qid = i;

		sprintf(name, "%s%u", hns3_dbg_cmd[cmd].name, i);

		debugfs_create_file(name, 0400, entry_dir, &data[i],
@@ -1110,6 +1109,7 @@ hns3_dbg_common_file_init(struct hnae3_handle *handle, u32 cmd) 
		return -ENOMEM;



	data->handle = handle;

	data->cmd = hns3_dbg_cmd[cmd].cmd;

	entry_dir = hns3_dbg_dentry[hns3_dbg_cmd[cmd].dentry].dentry;

	debugfs_create_file(hns3_dbg_cmd[cmd].name, 0400, entry_dir,

			    data, &hns3_dbg_fops);

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

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct hns3_dbg_item { 


struct hns3_dbg_data {

	struct hnae3_handle *handle;

	enum hnae3_dbg_cmd cmd;

	u16 qid;

};

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

+5 −1
Original line number Diff line number Diff line
@@ -573,9 +573,13 @@ static void hclge_cmd_uninit_regs(struct hclge_hw *hw) 


void hclge_cmd_uninit(struct hclge_dev *hdev)

{

	set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);

	/* wait to ensure that the firmware completes the possible left

	 * over commands.

	 */

	msleep(HCLGE_CMDQ_CLEAR_WAIT_TIME);

	spin_lock_bh(&hdev->hw.cmq.csq.lock);

	spin_lock(&hdev->hw.cmq.crq.lock);

	set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);

	hclge_cmd_uninit_regs(&hdev->hw);

	spin_unlock(&hdev->hw.cmq.crq.lock);

	spin_unlock_bh(&hdev->hw.cmq.csq.lock);

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

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "hnae3.h"



#define HCLGE_CMDQ_TX_TIMEOUT		30000

#define HCLGE_CMDQ_CLEAR_WAIT_TIME	200

#define HCLGE_DESC_DATA_LEN		6



struct hclge_dev;
@@ -270,6 +271,9 @@ enum hclge_opcode_type { 
	/* Led command */

	HCLGE_OPC_LED_STATUS_CFG	= 0xB000,



	/* clear hardware resource command */

	HCLGE_OPC_CLEAR_HW_RESOURCE	= 0x700B,



	/* NCL config command */

	HCLGE_OPC_QUERY_NCL_CONFIG	= 0x7011,

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

+2 −11
Original line number Diff line number Diff line
@@ -255,21 +255,12 @@ static int hclge_ieee_getpfc(struct hnae3_handle *h, struct ieee_pfc *pfc) 
	u64 requests[HNAE3_MAX_TC], indications[HNAE3_MAX_TC];

	struct hclge_vport *vport = hclge_get_vport(h);

	struct hclge_dev *hdev = vport->back;

	u8 i, j, pfc_map, *prio_tc;

	int ret;

	u8 i;



	memset(pfc, 0, sizeof(*pfc));

	pfc->pfc_cap = hdev->pfc_max;

	prio_tc = hdev->tm_info.prio_tc;

	pfc_map = hdev->tm_info.hw_pfc_map;



	/* Pfc setting is based on TC */

	for (i = 0; i < hdev->tm_info.num_tc; i++) {

		for (j = 0; j < HNAE3_MAX_USER_PRIO; j++) {

			if ((prio_tc[j] == i) && (pfc_map & BIT(i)))

				pfc->pfc_en |= BIT(j);

		}

	}

	pfc->pfc_en = hdev->tm_info.pfc_en;



	ret = hclge_pfc_tx_stats_get(hdev, requests);

	if (ret)