* [PATCH net-next 1/5] net: hns3: modify some incorrect spelling
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
@ 2020-05-14 12:41 ` Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 2/5] net: hns3: remove a duplicated printing in hclge_configure() Huazhong Tan
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Huazhong Tan @ 2020-05-14 12:41 UTC (permalink / raw)
To: davem
Cc: netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm, kuba,
Huazhong Tan
This patch modifies some incorrect spelling.
Reported-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +-
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
index 21a7361..1ffe8fa 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
@@ -24,7 +24,7 @@ enum HCLGE_MBX_OPCODE {
HCLGE_MBX_GET_RETA, /* (VF -> PF) get RETA */
HCLGE_MBX_GET_RSS_KEY, /* (VF -> PF) get RSS key */
HCLGE_MBX_GET_MAC_ADDR, /* (VF -> PF) get MAC addr */
- HCLGE_MBX_PF_VF_RESP, /* (PF -> VF) generate respone to VF */
+ HCLGE_MBX_PF_VF_RESP, /* (PF -> VF) generate response to VF */
HCLGE_MBX_GET_BDNUM, /* (VF -> PF) get BD num */
HCLGE_MBX_GET_BUFSIZE, /* (VF -> PF) get buffer size */
HCLGE_MBX_GET_STREAMID, /* (VF -> PF) get stream id */
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index 48c115c..26f6f06 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -691,7 +691,7 @@ static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev,
enum hclge_opcode_type cmd;
struct hclge_desc desc;
int queue_id, group_id;
- u32 qset_maping[32];
+ u32 qset_mapping[32];
int tc_id, qset_id;
int pri_id, ret;
u32 i;
@@ -746,7 +746,7 @@ static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev,
if (ret)
goto err_tm_map_cmd_send;
- qset_maping[group_id] =
+ qset_mapping[group_id] =
le32_to_cpu(bp_to_qs_map_cmd->qs_bit_map);
}
@@ -756,11 +756,11 @@ static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev,
for (group_id = 0; group_id < 4; group_id++) {
dev_info(&hdev->pdev->dev,
"%04d | %08x:%08x:%08x:%08x:%08x:%08x:%08x:%08x\n",
- group_id * 256, qset_maping[(u32)(i + 7)],
- qset_maping[(u32)(i + 6)], qset_maping[(u32)(i + 5)],
- qset_maping[(u32)(i + 4)], qset_maping[(u32)(i + 3)],
- qset_maping[(u32)(i + 2)], qset_maping[(u32)(i + 1)],
- qset_maping[i]);
+ group_id * 256, qset_mapping[(u32)(i + 7)],
+ qset_mapping[(u32)(i + 6)], qset_mapping[(u32)(i + 5)],
+ qset_mapping[(u32)(i + 4)], qset_mapping[(u32)(i + 3)],
+ qset_mapping[(u32)(i + 2)], qset_mapping[(u32)(i + 1)],
+ qset_mapping[i]);
i += 8;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 2/5] net: hns3: remove a duplicated printing in hclge_configure()
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 1/5] net: hns3: modify some incorrect spelling Huazhong Tan
@ 2020-05-14 12:41 ` Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 3/5] net: hns3: modify an incorrect error log in hclge_mbx_handler() Huazhong Tan
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Huazhong Tan @ 2020-05-14 12:41 UTC (permalink / raw)
To: davem
Cc: netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm, kuba,
Huazhong Tan
Since hclge_get_cfg() already has error print, so hclge_configure()
should not print error when calling hclge_get_cfg() fail.
Reported-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 1ff896a..b796d3f 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -1363,10 +1363,8 @@ static int hclge_configure(struct hclge_dev *hdev)
int ret;
ret = hclge_get_cfg(hdev, &cfg);
- if (ret) {
- dev_err(&hdev->pdev->dev, "get mac mode error %d.\n", ret);
+ if (ret)
return ret;
- }
hdev->num_vmdq_vport = cfg.vmdq_vport_num;
hdev->base_tqp_pid = 0;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 3/5] net: hns3: modify an incorrect error log in hclge_mbx_handler()
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 1/5] net: hns3: modify some incorrect spelling Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 2/5] net: hns3: remove a duplicated printing in hclge_configure() Huazhong Tan
@ 2020-05-14 12:41 ` Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 4/5] net: hns3: remove some unused macros Huazhong Tan
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Huazhong Tan @ 2020-05-14 12:41 UTC (permalink / raw)
To: davem
Cc: netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm, kuba,
Huazhong Tan
When handling HCLGE_MBX_GET_LINK_STATUS, PF will return the link
status to the VF, so the error log of hclge_get_link_info() is
incorrect.
Reported-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
index ac70faf..0874ae4 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
@@ -742,7 +742,7 @@ void hclge_mbx_handler(struct hclge_dev *hdev)
ret = hclge_get_link_info(vport, req);
if (ret)
dev_err(&hdev->pdev->dev,
- "PF fail(%d) to get link stat for VF\n",
+ "failed to inform link stat to VF, ret = %d\n",
ret);
break;
case HCLGE_MBX_QUEUE_RESET:
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 4/5] net: hns3: remove some unused macros
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
` (2 preceding siblings ...)
2020-05-14 12:41 ` [PATCH net-next 3/5] net: hns3: modify an incorrect error log in hclge_mbx_handler() Huazhong Tan
@ 2020-05-14 12:41 ` Huazhong Tan
2020-05-14 12:41 ` [PATCH net-next 5/5] net: hns3: remove unnecessary frag list checking in hns3_nic_net_xmit() Huazhong Tan
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Huazhong Tan @ 2020-05-14 12:41 UTC (permalink / raw)
To: davem
Cc: netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm, kuba,
Huazhong Tan
There are some macros defined in hns3_enet.h, but not used in
anywhere.
Reported-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index 240ba06..60f82ad 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -46,23 +46,6 @@ enum hns3_nic_state {
#define HNS3_RING_CFG_VF_NUM_REG 0x00080
#define HNS3_RING_ASID_REG 0x0008C
#define HNS3_RING_EN_REG 0x00090
-#define HNS3_RING_T0_BE_RST 0x00094
-#define HNS3_RING_COULD_BE_RST 0x00098
-#define HNS3_RING_WRR_WEIGHT_REG 0x0009c
-
-#define HNS3_RING_INTMSK_RXWL_REG 0x000A0
-#define HNS3_RING_INTSTS_RX_RING_REG 0x000A4
-#define HNS3_RX_RING_INT_STS_REG 0x000A8
-#define HNS3_RING_INTMSK_TXWL_REG 0x000AC
-#define HNS3_RING_INTSTS_TX_RING_REG 0x000B0
-#define HNS3_TX_RING_INT_STS_REG 0x000B4
-#define HNS3_RING_INTMSK_RX_OVERTIME_REG 0x000B8
-#define HNS3_RING_INTSTS_RX_OVERTIME_REG 0x000BC
-#define HNS3_RING_INTMSK_TX_OVERTIME_REG 0x000C4
-#define HNS3_RING_INTSTS_TX_OVERTIME_REG 0x000C8
-
-#define HNS3_RING_MB_CTRL_REG 0x00100
-#define HNS3_RING_MB_DATA_BASE_REG 0x00200
#define HNS3_TX_REG_OFFSET 0x40
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 5/5] net: hns3: remove unnecessary frag list checking in hns3_nic_net_xmit()
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
` (3 preceding siblings ...)
2020-05-14 12:41 ` [PATCH net-next 4/5] net: hns3: remove some unused macros Huazhong Tan
@ 2020-05-14 12:41 ` Huazhong Tan
2020-05-14 17:29 ` [PATCH net-next 0/5] net: hns3: add some cleanups for -next Jakub Kicinski
2020-05-14 20:18 ` David Miller
6 siblings, 0 replies; 8+ messages in thread
From: Huazhong Tan @ 2020-05-14 12:41 UTC (permalink / raw)
To: davem
Cc: netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm, kuba,
Huazhong Tan
The skb_has_frag_list() in hns3_nic_net_xmit() is redundant, since
skb_walk_frags() includes this checking implicitly.
Reported-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index c79d6a3..9fe40c7 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1445,9 +1445,6 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
bd_num += ret;
- if (!skb_has_frag_list(skb))
- goto out;
-
skb_walk_frags(skb, frag_skb) {
ret = hns3_fill_skb_to_desc(ring, frag_skb,
DESC_TYPE_FRAGLIST_SKB);
@@ -1456,7 +1453,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
bd_num += ret;
}
-out:
+
pre_ntu = ring->next_to_use ? (ring->next_to_use - 1) :
(ring->desc_num - 1);
ring->desc[pre_ntu].tx.bdtp_fe_sc_vld_ra_ri |=
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH net-next 0/5] net: hns3: add some cleanups for -next
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
` (4 preceding siblings ...)
2020-05-14 12:41 ` [PATCH net-next 5/5] net: hns3: remove unnecessary frag list checking in hns3_nic_net_xmit() Huazhong Tan
@ 2020-05-14 17:29 ` Jakub Kicinski
2020-05-14 20:18 ` David Miller
6 siblings, 0 replies; 8+ messages in thread
From: Jakub Kicinski @ 2020-05-14 17:29 UTC (permalink / raw)
To: Huazhong Tan
Cc: davem, netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm
On Thu, 14 May 2020 20:41:21 +0800 Huazhong Tan wrote:
> This patchset adds some cleanups for the HNS3 ethernet driver.
You may want to spell out 'state' instead of 'stat' in patch 3, stat is
often used as abbreviation of statistic. But that's a nit pick, up to
you:
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next 0/5] net: hns3: add some cleanups for -next
2020-05-14 12:41 [PATCH net-next 0/5] net: hns3: add some cleanups for -next Huazhong Tan
` (5 preceding siblings ...)
2020-05-14 17:29 ` [PATCH net-next 0/5] net: hns3: add some cleanups for -next Jakub Kicinski
@ 2020-05-14 20:18 ` David Miller
6 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2020-05-14 20:18 UTC (permalink / raw)
To: tanhuazhong
Cc: netdev, linux-kernel, salil.mehta, yisen.zhuang, linuxarm, kuba
From: Huazhong Tan <tanhuazhong@huawei.com>
Date: Thu, 14 May 2020 20:41:21 +0800
> This patchset adds some cleanups for the HNS3 ethernet driver.
Series applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread