net: hns3: modify some logs format

The pfc_en and pfc_map need to be displayed in hexadecimal notation,
printing dma address should use %pad, and the end of printed string
needs to be add "\n".

This patch modifies them.

Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
index 5cf4c1ecc5b85a2ea4d97cbf7aca6c0aaba5588a..28961a68e333dfec1a364a122cd731d892e3bae8 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
@@ -166,6 +166,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf)
        struct hns3_enet_ring *ring;
        u32 tx_index, rx_index;
        u32 q_num, value;
+       dma_addr_t addr;
        int cnt;
 
        cnt = sscanf(&cmd_buf[8], "%u %u", &q_num, &tx_index);
@@ -194,8 +195,9 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf)
        }
 
        tx_desc = &ring->desc[tx_index];
+       addr = le64_to_cpu(tx_desc->addr);
        dev_info(dev, "TX Queue Num: %u, BD Index: %u\n", q_num, tx_index);
-       dev_info(dev, "(TX)addr: 0x%llx\n", tx_desc->addr);
+       dev_info(dev, "(TX)addr: %pad\n", &addr);
        dev_info(dev, "(TX)vlan_tag: %u\n", tx_desc->tx.vlan_tag);
        dev_info(dev, "(TX)send_size: %u\n", tx_desc->tx.send_size);
        dev_info(dev, "(TX)vlan_tso: %u\n", tx_desc->tx.type_cs_vlan_tso);
@@ -217,8 +219,9 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf)
        rx_index = (cnt == 1) ? value : tx_index;
        rx_desc  = &ring->desc[rx_index];
 
+       addr = le64_to_cpu(rx_desc->addr);
        dev_info(dev, "RX Queue Num: %u, BD Index: %u\n", q_num, rx_index);
-       dev_info(dev, "(RX)addr: 0x%llx\n", rx_desc->addr);
+       dev_info(dev, "(RX)addr: %pad\n", &addr);
        dev_info(dev, "(RX)l234_info: %u\n", rx_desc->rx.l234_info);
        dev_info(dev, "(RX)pkt_len: %u\n", rx_desc->rx.pkt_len);
        dev_info(dev, "(RX)size: %u\n", rx_desc->rx.size);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
index 816f920841384a8c3042b5fd183c3cd0737065c4..c063301d60608cc4730d37e3662efd7eea968689 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
@@ -342,7 +342,7 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc)
        hdev->tm_info.pfc_en = pfc->pfc_en;
 
        netif_dbg(h, drv, netdev,
-                 "set pfc: pfc_en=%u, pfc_map=%u, num_tc=%u\n",
+                 "set pfc: pfc_en=%x, pfc_map=%x, num_tc=%u\n",
                  pfc->pfc_en, pfc_map, hdev->tm_info.num_tc);
 
        hclge_tm_pfc_info_update(hdev);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 8d4dc1b019c173c66f21a71bd871cd1f2eb4ad6c..bc5bad3e845905a846b31a90edcf63d371df8b11 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3751,7 +3751,7 @@ static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle)
        else if (time_after(jiffies, (hdev->last_reset_time + 4 * 5 * HZ)))
                hdev->reset_level = HNAE3_FUNC_RESET;
 
-       dev_info(&hdev->pdev->dev, "received reset event , reset type is %d",
+       dev_info(&hdev->pdev->dev, "received reset event, reset type is %d\n",
                 hdev->reset_level);
 
        /* request reset & schedule reset task */