Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c29d191 authored by liuzhongzhu's avatar liuzhongzhu Committed by David S. Miller
Browse files

net: hns3: Add "queue map" information query function 



This patch prints queue map information.

debugfs command:
echo dump queue map > cmd

Sample Command:
root@(none)# echo queue map > cmd
 local queue id | global queue id | vector id
          0              32             769
          1              33             770
          2              34             771
          3              35             772
          4              36             773
          5              37             774
          6              38             775
          7              39             776
          8              40             777
          9              41             778
         10              42             779
         11              43             780
         12              44             781
         13              45             782
         14              46             783
         15              47             784
root@(none)#

Signed-off-by: default avatarliuzhongzhu <liuzhongzhu@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0ebebb9

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ enum HCLGE_MBX_OPCODE { 
	HCLGE_MBX_KEEP_ALIVE,		/* (VF -> PF) send keep alive cmd */

	HCLGE_MBX_SET_ALIVE,		/* (VF -> PF) set alive state */

	HCLGE_MBX_SET_MTU,		/* (VF -> PF) set mtu */

	HCLGE_MBX_GET_QID_IN_PF,	/* (VF -> PF) get queue id in pf */

};



/* below are per-VF mac-vlan subcodes */

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

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ struct hnae3_ae_ops { 
	bool (*ae_dev_resetting)(struct hnae3_handle *handle);

	unsigned long (*ae_dev_reset_cnt)(struct hnae3_handle *handle);

	int (*set_gro_en)(struct hnae3_handle *handle, int enable);

	u16 (*get_global_queue_id)(struct hnae3_handle *handle, u16 queue_id);

};



struct hnae3_dcb_ops {

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

+33 −0
Original line number Diff line number Diff line
@@ -125,6 +125,36 @@ static int hns3_dbg_queue_info(struct hnae3_handle *h, char *cmd_buf) 
	return 0;

}



static int hns3_dbg_queue_map(struct hnae3_handle *h)

{

	struct hns3_nic_priv *priv = h->priv;

	struct hns3_nic_ring_data *ring_data;

	int i;



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

		return -EOPNOTSUPP;



	dev_info(&h->pdev->dev, "map info for queue id and vector id\n");

	dev_info(&h->pdev->dev,

		 "local queue id | global queue id | vector id\n");

	for (i = 0; i < h->kinfo.num_tqps; i++) {

		u16 global_qid;



		global_qid = h->ae_algo->ops->get_global_queue_id(h, i);

		ring_data = &priv->ring_data[i];

		if (!ring_data || !ring_data->ring ||

		    !ring_data->ring->tqp_vector)

			continue;



		dev_info(&h->pdev->dev,

			 "      %4d            %4d            %4d\n",

			 i, global_qid,

			 ring_data->ring->tqp_vector->vector_irq);

	}



	return 0;

}



static int hns3_dbg_bd_info(struct hnae3_handle *h, char *cmd_buf)

{

	struct hns3_nic_priv *priv = h->priv;
@@ -207,6 +237,7 @@ static void hns3_dbg_help(struct hnae3_handle *h) 


	dev_info(&h->pdev->dev, "available commands\n");

	dev_info(&h->pdev->dev, "queue info [number]\n");

	dev_info(&h->pdev->dev, "queue map\n");

	dev_info(&h->pdev->dev, "bd info [q_num] <bd index>\n");

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

	dev_info(&h->pdev->dev, "dump tc\n");
@@ -303,6 +334,8 @@ static ssize_t hns3_dbg_cmd_write(struct file *filp, const char __user *buffer, 
		hns3_dbg_help(handle);

	else if (strncmp(cmd_buf, "queue info", 10) == 0)

		ret = hns3_dbg_queue_info(handle, cmd_buf);

	else if (strncmp(cmd_buf, "queue map", 9) == 0)

		ret = hns3_dbg_queue_map(handle);

	else if (strncmp(cmd_buf, "bd info", 7) == 0)

		ret = hns3_dbg_bd_info(handle, cmd_buf);

	else if (handle->ae_algo->ops->dbg_run_cmd)

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

+2 −2
Original line number Diff line number Diff line
@@ -6602,8 +6602,7 @@ static int hclge_get_reset_status(struct hclge_dev *hdev, u16 queue_id) 
	return hnae3_get_bit(req->ready_to_reset, HCLGE_TQP_RESET_B);

}



static u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle,

					  u16 queue_id)

u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id)

{

	struct hnae3_queue *queue;

	struct hclge_tqp *tqp;
@@ -7975,6 +7974,7 @@ static const struct hnae3_ae_ops hclge_ops = { 
	.ae_dev_resetting = hclge_ae_dev_resetting,

	.ae_dev_reset_cnt = hclge_ae_dev_reset_cnt,

	.set_gro_en = hclge_gro_en,

	.get_global_queue_id = hclge_covert_handle_qid_global,

};



static struct hnae3_ae_algo ae_algo = {

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

+1 −0
Original line number Diff line number Diff line
@@ -874,4 +874,5 @@ int hclge_vport_start(struct hclge_vport *vport); 
void hclge_vport_stop(struct hclge_vport *vport);

int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu);

int hclge_dbg_run_cmd(struct hnae3_handle *handle, char *cmd_buf);

u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id);

#endif