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

Merge branch 'hns3-fixes' 



Guangbin Huang says:

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

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5220a525 c59d6062

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int hclge_comm_tqps_update_stats(struct hnae3_handle *handle, 
		ret = hclge_comm_cmd_send(hw, &desc, 1);

		if (ret) {

			dev_err(&hw->cmq.csq.pdev->dev,

				"failed to get tqp stat, ret = %d, tx = %u.\n",

				"failed to get tqp stat, ret = %d, rx = %u.\n",

				ret, i);

			return ret;

		}
@@ -89,7 +89,7 @@ int hclge_comm_tqps_update_stats(struct hnae3_handle *handle, 
		ret = hclge_comm_cmd_send(hw, &desc, 1);

		if (ret) {

			dev_err(&hw->cmq.csq.pdev->dev,

				"failed to get tqp stat, ret = %d, rx = %u.\n",

				"failed to get tqp stat, ret = %d, tx = %u.\n",

				ret, i);

			return ret;

		}

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

+42 −42
Original line number Diff line number Diff line
@@ -562,12 +562,12 @@ static void hns3_dbg_tx_spare_info(struct hns3_enet_ring *ring, char *buf, 


	for (i = 0; i < ring_num; i++) {

		j = 0;

		sprintf(result[j++], "%8u", i);

		sprintf(result[j++], "%9u", ring->tx_copybreak);

		sprintf(result[j++], "%3u", tx_spare->len);

		sprintf(result[j++], "%3u", tx_spare->next_to_use);

		sprintf(result[j++], "%3u", tx_spare->next_to_clean);

		sprintf(result[j++], "%3u", tx_spare->last_to_clean);

		sprintf(result[j++], "%u", i);

		sprintf(result[j++], "%u", ring->tx_copybreak);

		sprintf(result[j++], "%u", tx_spare->len);

		sprintf(result[j++], "%u", tx_spare->next_to_use);

		sprintf(result[j++], "%u", tx_spare->next_to_clean);

		sprintf(result[j++], "%u", tx_spare->last_to_clean);

		sprintf(result[j++], "%pad", &tx_spare->dma);

		hns3_dbg_fill_content(content, sizeof(content),

				      tx_spare_info_items,
@@ -598,35 +598,35 @@ static void hns3_dump_rx_queue_info(struct hns3_enet_ring *ring, 
	u32 base_add_l, base_add_h;

	u32 j = 0;



	sprintf(result[j++], "%8u", index);

	sprintf(result[j++], "%u", index);



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_BD_NUM_REG));



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_BD_LEN_REG));



	sprintf(result[j++], "%4u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_TAIL_REG));



	sprintf(result[j++], "%4u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_HEAD_REG));



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_FBDNUM_REG));



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_PKTNUM_RECORD_REG));

	sprintf(result[j++], "%9u", ring->rx_copybreak);

	sprintf(result[j++], "%u", ring->rx_copybreak);



	sprintf(result[j++], "%7s", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%s", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_EN_REG) ? "on" : "off");



	if (hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev))

		sprintf(result[j++], "%10s", readl_relaxed(ring->tqp->io_base +

		sprintf(result[j++], "%s", readl_relaxed(ring->tqp->io_base +

			HNS3_RING_RX_EN_REG) ? "on" : "off");

	else

		sprintf(result[j++], "%10s", "NA");

		sprintf(result[j++], "%s", "NA");



	base_add_h = readl_relaxed(ring->tqp->io_base +

					HNS3_RING_RX_RING_BASEADDR_H_REG);
@@ -700,36 +700,36 @@ static void hns3_dump_tx_queue_info(struct hns3_enet_ring *ring, 
	u32 base_add_l, base_add_h;

	u32 j = 0;



	sprintf(result[j++], "%8u", index);

	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", index);

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_BD_NUM_REG));



	sprintf(result[j++], "%2u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_TC_REG));



	sprintf(result[j++], "%4u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_TAIL_REG));



	sprintf(result[j++], "%4u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_HEAD_REG));



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_FBDNUM_REG));



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_OFFSET_REG));



	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_TX_RING_PKTNUM_RECORD_REG));



	sprintf(result[j++], "%7s", readl_relaxed(ring->tqp->io_base +

	sprintf(result[j++], "%s", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_EN_REG) ? "on" : "off");



	if (hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev))

		sprintf(result[j++], "%10s", readl_relaxed(ring->tqp->io_base +

		sprintf(result[j++], "%s", readl_relaxed(ring->tqp->io_base +

			HNS3_RING_TX_EN_REG) ? "on" : "off");

	else

		sprintf(result[j++], "%10s", "NA");

		sprintf(result[j++], "%s", "NA");



	base_add_h = readl_relaxed(ring->tqp->io_base +

					HNS3_RING_TX_RING_BASEADDR_H_REG);
@@ -848,15 +848,15 @@ static void hns3_dump_rx_bd_info(struct hns3_nic_priv *priv, 
{

	unsigned int j = 0;



	sprintf(result[j++], "%5d", idx);

	sprintf(result[j++], "%d", idx);

	sprintf(result[j++], "%#x", le32_to_cpu(desc->rx.l234_info));

	sprintf(result[j++], "%7u", le16_to_cpu(desc->rx.pkt_len));

	sprintf(result[j++], "%4u", le16_to_cpu(desc->rx.size));

	sprintf(result[j++], "%u", le16_to_cpu(desc->rx.pkt_len));

	sprintf(result[j++], "%u", le16_to_cpu(desc->rx.size));

	sprintf(result[j++], "%#x", le32_to_cpu(desc->rx.rss_hash));

	sprintf(result[j++], "%5u", le16_to_cpu(desc->rx.fd_id));

	sprintf(result[j++], "%8u", le16_to_cpu(desc->rx.vlan_tag));

	sprintf(result[j++], "%15u", le16_to_cpu(desc->rx.o_dm_vlan_id_fb));

	sprintf(result[j++], "%11u", le16_to_cpu(desc->rx.ot_vlan_tag));

	sprintf(result[j++], "%u", le16_to_cpu(desc->rx.fd_id));

	sprintf(result[j++], "%u", le16_to_cpu(desc->rx.vlan_tag));

	sprintf(result[j++], "%u", le16_to_cpu(desc->rx.o_dm_vlan_id_fb));

	sprintf(result[j++], "%u", le16_to_cpu(desc->rx.ot_vlan_tag));

	sprintf(result[j++], "%#x", le32_to_cpu(desc->rx.bd_base_info));

	if (test_bit(HNS3_NIC_STATE_RXD_ADV_LAYOUT_ENABLE, &priv->state)) {

		u32 ol_info = le32_to_cpu(desc->rx.ol_info);
@@ -930,19 +930,19 @@ static void hns3_dump_tx_bd_info(struct hns3_nic_priv *priv, 
{

	unsigned int j = 0;



	sprintf(result[j++], "%6d", idx);

	sprintf(result[j++], "%d", idx);

	sprintf(result[j++], "%#llx", le64_to_cpu(desc->addr));

	sprintf(result[j++], "%5u", le16_to_cpu(desc->tx.vlan_tag));

	sprintf(result[j++], "%5u", le16_to_cpu(desc->tx.send_size));

	sprintf(result[j++], "%u", le16_to_cpu(desc->tx.vlan_tag));

	sprintf(result[j++], "%u", le16_to_cpu(desc->tx.send_size));

	sprintf(result[j++], "%#x",

		le32_to_cpu(desc->tx.type_cs_vlan_tso_len));

	sprintf(result[j++], "%5u", le16_to_cpu(desc->tx.outer_vlan_tag));

	sprintf(result[j++], "%5u", le16_to_cpu(desc->tx.tv));

	sprintf(result[j++], "%10u",

	sprintf(result[j++], "%u", le16_to_cpu(desc->tx.outer_vlan_tag));

	sprintf(result[j++], "%u", le16_to_cpu(desc->tx.tv));

	sprintf(result[j++], "%u",

		le32_to_cpu(desc->tx.ol_type_vlan_len_msec));

	sprintf(result[j++], "%#x", le32_to_cpu(desc->tx.paylen_ol4cs));

	sprintf(result[j++], "%#x", le16_to_cpu(desc->tx.bdtp_fe_sc_vld_ra_ri));

	sprintf(result[j++], "%5u", le16_to_cpu(desc->tx.mss_hw_csum));

	sprintf(result[j++], "%u", le16_to_cpu(desc->tx.mss_hw_csum));

}



static int hns3_dbg_tx_bd_info(struct hns3_dbg_data *d, char *buf, int len)

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

+9 −0
Original line number Diff line number Diff line
@@ -5203,6 +5203,13 @@ static void hns3_state_init(struct hnae3_handle *handle) 
		set_bit(HNS3_NIC_STATE_RXD_ADV_LAYOUT_ENABLE, &priv->state);

}



static void hns3_state_uninit(struct hnae3_handle *handle)

{

	struct hns3_nic_priv *priv  = handle->priv;



	clear_bit(HNS3_NIC_STATE_INITED, &priv->state);

}



static int hns3_client_init(struct hnae3_handle *handle)

{

	struct pci_dev *pdev = handle->pdev;
@@ -5320,7 +5327,9 @@ static int hns3_client_init(struct hnae3_handle *handle) 
	return ret;



out_reg_netdev_fail:

	hns3_state_uninit(handle);

	hns3_dbg_uninit(handle);

	hns3_client_stop(handle);

out_client_start:

	hns3_free_rx_cpu_rmap(netdev);

	hns3_nic_uninit_irq(priv);

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

+20 −11
Original line number Diff line number Diff line
@@ -94,6 +94,13 @@ static int hclge_send_mbx_msg(struct hclge_vport *vport, u8 *msg, u16 msg_len, 
	enum hclge_comm_cmd_status status;

	struct hclge_desc desc;



	if (msg_len > HCLGE_MBX_MAX_MSG_SIZE) {

		dev_err(&hdev->pdev->dev,

			"msg data length(=%u) exceeds maximum(=%u)\n",

			msg_len, HCLGE_MBX_MAX_MSG_SIZE);

		return -EMSGSIZE;

	}



	resp_pf_to_vf = (struct hclge_mbx_pf_to_vf_cmd *)desc.data;



	hclge_cmd_setup_basic_desc(&desc, HCLGEVF_OPC_MBX_PF_TO_VF, false);
@@ -176,7 +183,7 @@ static int hclge_get_ring_chain_from_mbx( 
	ring_num = req->msg.ring_num;



	if (ring_num > HCLGE_MBX_MAX_RING_CHAIN_PARAM_NUM)

		return -ENOMEM;

		return -EINVAL;



	for (i = 0; i < ring_num; i++) {

		if (req->msg.param[i].tqp_index >= vport->nic.kinfo.rss_size) {
@@ -587,7 +594,7 @@ static int hclge_set_vf_mtu(struct hclge_vport *vport, 
	return hclge_set_vport_mtu(vport, mtu);

}



static void hclge_get_queue_id_in_pf(struct hclge_vport *vport,

static int hclge_get_queue_id_in_pf(struct hclge_vport *vport,

				    struct hclge_mbx_vf_to_pf_cmd *mbx_req,

				    struct hclge_respond_to_vf_msg *resp_msg)

{
@@ -599,15 +606,16 @@ static void hclge_get_queue_id_in_pf(struct hclge_vport *vport, 
	if (queue_id >= handle->kinfo.num_tqps) {

		dev_err(&hdev->pdev->dev, "Invalid queue id(%u) from VF %u\n",

			queue_id, mbx_req->mbx_src_vfid);

		return;

		return -EINVAL;

	}



	qid_in_pf = hclge_covert_handle_qid_global(&vport->nic, queue_id);

	memcpy(resp_msg->data, &qid_in_pf, sizeof(qid_in_pf));

	resp_msg->len = sizeof(qid_in_pf);

	return 0;

}



static void hclge_get_rss_key(struct hclge_vport *vport,

static int hclge_get_rss_key(struct hclge_vport *vport,

			     struct hclge_mbx_vf_to_pf_cmd *mbx_req,

			     struct hclge_respond_to_vf_msg *resp_msg)

{
@@ -627,13 +635,14 @@ static void hclge_get_rss_key(struct hclge_vport *vport, 
		dev_warn(&hdev->pdev->dev,

			 "failed to get the rss hash key, the index(%u) invalid !\n",

			 index);

		return;

		return -EINVAL;

	}



	memcpy(resp_msg->data,

	       &rss_cfg->rss_hash_key[index * HCLGE_RSS_MBX_RESP_LEN],

	       HCLGE_RSS_MBX_RESP_LEN);

	resp_msg->len = HCLGE_RSS_MBX_RESP_LEN;

	return 0;

}



static void hclge_link_fail_parse(struct hclge_dev *hdev, u8 link_fail_code)
@@ -809,10 +818,10 @@ void hclge_mbx_handler(struct hclge_dev *hdev) 
					"VF fail(%d) to set mtu\n", ret);

			break;

		case HCLGE_MBX_GET_QID_IN_PF:

			hclge_get_queue_id_in_pf(vport, req, &resp_msg);

			ret = hclge_get_queue_id_in_pf(vport, req, &resp_msg);

			break;

		case HCLGE_MBX_GET_RSS_KEY:

			hclge_get_rss_key(vport, req, &resp_msg);

			ret = hclge_get_rss_key(vport, req, &resp_msg);

			break;

		case HCLGE_MBX_GET_LINK_MODE:

			hclge_get_link_mode(vport, req);