Re: [PATCH net-next 1/9] net: hns3: fix some mixed type assignment

From: tanhuazhong
Date: Fri Mar 06 2020 - 01:18:35 EST




On 2020/3/6 11:39, shenjian (K) wrote:


å 2020/3/6 10:57, Huazhong Tan åé:
From: Guojia Liao <liaoguojia@xxxxxxxxxx>

This patch cleans up some incorrect type in assignment reported by sparse
and compiler.
The warning as below:
- warning : restricted __le16 degrades to integer
- warning : cast from restricted __le32
- warning : cast from restricted __be32
- warning : cast from restricted __be16
and "mixed operation".

Signed-off-by: Guojia Liao <liaoguojia@xxxxxxxxxx>
Signed-off-by: Huazhong Tan <tanhuazhong@xxxxxxxxxx>
should add fixes id.

This is just a cleanup.

---
 .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 23 ++++++++++++----------
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 ++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index 6295cf9..5b4045c 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -87,7 +87,7 @@ static int hclge_dbg_get_dfx_bd_num(struct hclge_dev *hdev, int offset)
ÂÂÂÂÂ entries_per_desc = ARRAY_SIZE(desc[0].data);
ÂÂÂÂÂ index = offset % entries_per_desc;
-ÂÂÂ return (int)desc[offset / entries_per_desc].data[index];
+ÂÂÂ return le32_to_cpu(desc[offset / entries_per_desc].data[index]);
 }
 static int hclge_dbg_cmd_send(struct hclge_dev *hdev,
@@ -583,7 +583,7 @@ static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev,
ÂÂÂÂÂ ret = hclge_cmd_send(&hdev->hw, &desc, 1);
ÂÂÂÂÂ if (ret)
ÂÂÂÂÂÂÂÂÂ goto err_tm_map_cmd_send;
-ÂÂÂ qset_id = nq_to_qs_map->qset_id & 0x3FF;
+ÂÂÂ qset_id = le16_to_cpu(nq_to_qs_map->qset_id) & 0x3FF;
ÂÂÂÂÂ cmd = HCLGE_OPC_TM_QS_TO_PRI_LINK;
ÂÂÂÂÂ map = (struct hclge_qs_to_pri_link_cmd *)desc.data;
@@ -623,7 +623,8 @@ static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev,
ÂÂÂÂÂÂÂÂÂ if (ret)
ÂÂÂÂÂÂÂÂÂÂÂÂÂ goto err_tm_map_cmd_send;
-ÂÂÂÂÂÂÂ qset_maping[group_id] = bp_to_qs_map_cmd->qs_bit_map;
+ÂÂÂÂÂÂÂ qset_maping[group_id] =
+ÂÂÂÂÂÂÂÂÂÂÂ le32_to_cpu(bp_to_qs_map_cmd->qs_bit_map);
ÂÂÂÂÂ }
ÂÂÂÂÂ dev_info(&hdev->pdev->dev, "index | tm bp qset maping:\n");
@@ -826,6 +827,7 @@ static void hclge_dbg_dump_mng_table(struct hclge_dev *hdev)
ÂÂÂÂÂ struct hclge_mac_ethertype_idx_rd_cmd *req0;
ÂÂÂÂÂ char printf_buf[HCLGE_DBG_BUF_LEN];
ÂÂÂÂÂ struct hclge_desc desc;
+ÂÂÂ u32 msg_egress_port;
ÂÂÂÂÂ int ret, i;
ÂÂÂÂÂ dev_info(&hdev->pdev->dev, "mng tab:\n");
@@ -867,20 +869,21 @@ static void hclge_dbg_dump_mng_table(struct hclge_dev *hdev)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ HCLGE_DBG_BUF_LEN - strlen(printf_buf),
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ "%xÂÂ |%04x |%xÂÂ |%04x|%xÂÂ |%02xÂÂ |%02xÂÂ |",
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ !!(req0->flags & HCLGE_DBG_MNG_MAC_MASK_B),
-ÂÂÂÂÂÂÂÂÂÂÂÂ req0->ethter_type,
+ÂÂÂÂÂÂÂÂÂÂÂÂ le16_to_cpu(req0->ethter_type),
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ !!(req0->flags & HCLGE_DBG_MNG_ETHER_MASK_B),
-ÂÂÂÂÂÂÂÂÂÂÂÂ req0->vlan_tag & HCLGE_DBG_MNG_VLAN_TAG,
+ÂÂÂÂÂÂÂÂÂÂÂÂ le16_to_cpu(req0->vlan_tag) & HCLGE_DBG_MNG_VLAN_TAG,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ !!(req0->flags & HCLGE_DBG_MNG_VLAN_MASK_B),
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ req0->i_port_bitmap, req0->i_port_direction);
+ÂÂÂÂÂÂÂ msg_egress_port = le16_to_cpu(req0->egress_port);
ÂÂÂÂÂÂÂÂÂ snprintf(printf_buf + strlen(printf_buf),
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ HCLGE_DBG_BUF_LEN - strlen(printf_buf),
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ "%dÂÂÂÂ |%dÂÂÂ |%02dÂÂ |%04d|%x\n",
-ÂÂÂÂÂÂÂÂÂÂÂÂ !!(req0->egress_port & HCLGE_DBG_MNG_E_TYPE_B),
-ÂÂÂÂÂÂÂÂÂÂÂÂ req0->egress_port & HCLGE_DBG_MNG_PF_ID,
-ÂÂÂÂÂÂÂÂÂÂÂÂ (req0->egress_port >> 3) & HCLGE_DBG_MNG_VF_ID,
-ÂÂÂÂÂÂÂÂÂÂÂÂ req0->egress_queue,
-ÂÂÂÂÂÂÂÂÂÂÂÂ !!(req0->egress_port & HCLGE_DBG_MNG_DROP_B));
+ÂÂÂÂÂÂÂÂÂÂÂÂ !!(msg_egress_port & HCLGE_DBG_MNG_E_TYPE_B),
+ÂÂÂÂÂÂÂÂÂÂÂÂ msg_egress_port & HCLGE_DBG_MNG_PF_ID,
+ÂÂÂÂÂÂÂÂÂÂÂÂ (msg_egress_port >> 3) & HCLGE_DBG_MNG_VF_ID,
+ÂÂÂÂÂÂÂÂÂÂÂÂ le16_to_cpu(req0->egress_queue),
+ÂÂÂÂÂÂÂÂÂÂÂÂ !!(msg_egress_port & HCLGE_DBG_MNG_DROP_B));

msg_egress_port is unsigned, but print format is "%d" ?

should use '%x' instead.
Thanks.

ÂÂÂÂÂÂÂÂÂ dev_info(&hdev->pdev->dev, "%s", printf_buf);
ÂÂÂÂÂ }
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 89d3523..e64027c 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -10252,8 +10252,9 @@ static int hclge_dfx_reg_fetch_data(struct hclge_desc *desc_src, int bd_num,
 static int hclge_get_dfx_reg_len(struct hclge_dev *hdev, int *len)
 {
ÂÂÂÂÂ u32 dfx_reg_type_num = ARRAY_SIZE(hclge_dfx_bd_offset_list);
-ÂÂÂ int data_len_per_desc, data_len, bd_num, i;
+ÂÂÂ int data_len_per_desc, bd_num, i;
ÂÂÂÂÂ int bd_num_list[BD_LIST_MAX_NUM];
+ÂÂÂ u32 data_len;
ÂÂÂÂÂ int ret;
ÂÂÂÂÂ ret = hclge_get_dfx_reg_bd_num(hdev, bd_num_list, dfx_reg_type_num);



.