UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'net-stmmac-Couple-of-debug-prints-improvements' 

Florian Fainelli says:

====================
net: stmmac: Couple of debug prints improvements

While working on a particular problem, I had to turn on debug prints and found
them to be useful, but could deserve some improvements in order to help debug
situations.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-01-02 21:54:56 -05:00
parent 21602e1a55 1ca7992cc2
commit 3288ed69c0
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
View File

@ -406,7 +406,7 @@ static void dwmac4_display_ring(void *head, unsigned int size, bool rx)
pr_info("%s descriptor ring:\n", rx ? "RX" : "TX"); pr_info("%s descriptor ring:\n", rx ? "RX" : "TX");
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n", pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
i, (unsigned int)virt_to_phys(p), i, (unsigned int)virt_to_phys(p),
le32_to_cpu(p->des0), le32_to_cpu(p->des1), le32_to_cpu(p->des0), le32_to_cpu(p->des1),
le32_to_cpu(p->des2), le32_to_cpu(p->des3)); le32_to_cpu(p->des2), le32_to_cpu(p->des3));

2
drivers/net/ethernet/stmicro/stmmac/enh_desc.c
View File

@ -428,7 +428,7 @@ static void enh_desc_display_ring(void *head, unsigned int size, bool rx)
u64 x; u64 x;
x = *(u64 *)ep; x = *(u64 *)ep;
pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n", pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
i, (unsigned int)virt_to_phys(ep), i, (unsigned int)virt_to_phys(ep),
(unsigned int)x, (unsigned int)(x >> 32), (unsigned int)x, (unsigned int)(x >> 32),
ep->basic.des2, ep->basic.des3); ep->basic.des2, ep->basic.des3);

2
drivers/net/ethernet/stmicro/stmmac/norm_desc.c
View File

@ -288,7 +288,7 @@ static void ndesc_display_ring(void *head, unsigned int size, bool rx)
u64 x; u64 x;
x = *(u64 *)p; x = *(u64 *)p;
pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x", pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x",
i, (unsigned int)virt_to_phys(p), i, (unsigned int)virt_to_phys(p),
(unsigned int)x, (unsigned int)(x >> 32), (unsigned int)x, (unsigned int)(x >> 32),
p->des2, p->des3); p->des2, p->des3);

5
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -3436,9 +3436,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)
if (netif_msg_rx_status(priv)) { if (netif_msg_rx_status(priv)) {
netdev_dbg(priv->dev, "\tdesc: %p [entry %d] buff=0x%x\n", netdev_dbg(priv->dev, "\tdesc: %p [entry %d] buff=0x%x\n",
p, entry, des); p, entry, des);
if (frame_len > ETH_FRAME_LEN) netdev_dbg(priv->dev, "frame size %d, COE: %d\n",
netdev_dbg(priv->dev, "frame size %d, COE: %d\n", frame_len, status);
frame_len, status);
} }
/* The zero-copy is always used for all the sizes /* The zero-copy is always used for all the sizes