Skip to content

L
linux
Commit e29b5d8f authored by Tushar Dave's avatar Tushar Dave Committed by Jeff Kirsher
Browse files
Options

v2 e1000: Neaten e1000_dump function 

Use pr_<level> for printk
Use temporary instead of multiple pr_conts
Coalesce formats.

Save a few bytes of object code too:

$ size drivers/net/ethernet/intel/e1000/e1000_main.o*
   text	   data	    bss	    dec	    hex	filename
  60507	    369	  14120	  74996	  124f4
drivers/net/ethernet/intel/e1000/e1000_main.o.new
  60717	    369	  14176	  75262	  125fe
drivers/net/ethernet/intel/e1000/e1000_main.o.old

Removed printing of pktdata.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTushar Dave <tushar.n.dave@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 542c3f4e
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 63 deletions
drivers/net/ethernet/intel/e1000/e1000_main.c
View file @ e29b5d8f
...@@ -3261,16 +3261,16 @@ static void e1000_regdump(struct e1000_adapter *adapter) ...@@ -3261,16 +3261,16 @@ static void e1000_regdump(struct e1000_adapter *adapter)
u32 *regs_buff = regs; u32 *regs_buff = regs;
int i = 0; int i = 0;
char *reg_name[] = { static const char * const reg_name[] = {
"CTRL", "STATUS", "CTRL", "STATUS",
"RCTL", "RDLEN", "RDH", "RDT", "RDTR", "RCTL", "RDLEN", "RDH", "RDT", "RDTR",
"TCTL", "TDBAL", "TDBAH", "TDLEN", "TDH", "TDT", "TCTL", "TDBAL", "TDBAH", "TDLEN", "TDH", "TDT",
"TIDV", "TXDCTL", "TADV", "TARC0", "TIDV", "TXDCTL", "TADV", "TARC0",
"TDBAL1", "TDBAH1", "TDLEN1", "TDH1", "TDT1", "TDBAL1", "TDBAH1", "TDLEN1", "TDH1", "TDT1",
"TXDCTL1", "TARC1", "TXDCTL1", "TARC1",
"CTRL_EXT", "ERT", "RDBAL", "RDBAH", "CTRL_EXT", "ERT", "RDBAL", "RDBAH",
"TDFH", "TDFT", "TDFHS", "TDFTS", "TDFPC", "TDFH", "TDFT", "TDFHS", "TDFTS", "TDFPC",
"RDFH", "RDFT", "RDFHS", "RDFTS", "RDFPC" "RDFH", "RDFT", "RDFHS", "RDFTS", "RDFPC"
}; };
regs_buff[0] = er32(CTRL); regs_buff[0] = er32(CTRL);
...@@ -3316,10 +3316,8 @@ static void e1000_regdump(struct e1000_adapter *adapter) ...@@ -3316,10 +3316,8 @@ static void e1000_regdump(struct e1000_adapter *adapter)
regs_buff[37] = er32(RDFPC); regs_buff[37] = er32(RDFPC);
pr_info("Register dump\n"); pr_info("Register dump\n");
for (i = 0; i < NUM_REGS; i++) { for (i = 0; i < NUM_REGS; i++)
printk(KERN_INFO "%-15s %08x\n", pr_info("%-15s %08x\n", reg_name[i], regs_buff[i]);
reg_name[i], regs_buff[i]);
}
} }
/* /*
...@@ -3370,10 +3368,8 @@ static void e1000_dump(struct e1000_adapter *adapter) ...@@ -3370,10 +3368,8 @@ static void e1000_dump(struct e1000_adapter *adapter)
* +----------------------------------------------------------------+ * +----------------------------------------------------------------+
* 63 48 47 40 39 36 35 32 31 24 23 20 19 0 * 63 48 47 40 39 36 35 32 31 24 23 20 19 0
*/ */
printk(KERN_INFO "Tc[desc] [Ce CoCsIpceCoS] [MssHlRSCm0Plen] [bi->dma ]" pr_info("Tc[desc] [Ce CoCsIpceCoS] [MssHlRSCm0Plen] [bi->dma ] leng ntw timestmp bi->skb\n");
" leng ntw timestmp bi->skb\n"); pr_info("Td[desc] [address 63:0 ] [VlaPoRSCm1Dlen] [bi->dma ] leng ntw timestmp bi->skb\n");
printk(KERN_INFO "Td[desc] [address 63:0 ] [VlaPoRSCm1Dlen] [bi->dma ]"
" leng ntw timestmp bi->skb\n");
if (!netif_msg_tx_done(adapter)) if (!netif_msg_tx_done(adapter))
goto rx_ring_summary; goto rx_ring_summary;
...@@ -3383,27 +3379,23 @@ static void e1000_dump(struct e1000_adapter *adapter) ...@@ -3383,27 +3379,23 @@ static void e1000_dump(struct e1000_adapter *adapter)
struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i]; struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i];
struct my_u { u64 a; u64 b; }; struct my_u { u64 a; u64 b; };
struct my_u *u = (struct my_u *)tx_desc; struct my_u *u = (struct my_u *)tx_desc;
printk(KERN_INFO "T%c[0x%03X] %016llX %016llX %016llX %04X %3X " const char *type;
"%016llX %p",
((le64_to_cpu(u->b) & (1<<20)) ? 'd' : 'c'), i,
le64_to_cpu(u->a), le64_to_cpu(u->b),
(u64)buffer_info->dma, buffer_info->length,
buffer_info->next_to_watch, (u64)buffer_info->time_stamp,
buffer_info->skb);
if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean) if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
printk(KERN_CONT" NTC/U\n"); type = "NTC/U";
else if (i == tx_ring->next_to_use) else if (i == tx_ring->next_to_use)
printk(KERN_CONT " NTU\n"); type = "NTU";
else if (i == tx_ring->next_to_clean) else if (i == tx_ring->next_to_clean)
printk(KERN_CONT " NTC\n"); type = "NTC";
else else
printk(KERN_CONT "\n"); type = "";
pr_info("T%c[0x%03X] %016llX %016llX %016llX %04X %3X %016llX %p %s\n",
if (netif_msg_pktdata(adapter) && buffer_info->dma != 0) ((le64_to_cpu(u->b) & (1<<20)) ? 'd' : 'c'), i,
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, le64_to_cpu(u->a), le64_to_cpu(u->b),
16, 1, phys_to_virt(buffer_info->dma), (u64)buffer_info->dma, buffer_info->length,
buffer_info->length, true); buffer_info->next_to_watch,
(u64)buffer_info->time_stamp, buffer_info->skb, type);
} }
rx_ring_summary: rx_ring_summary:
...@@ -3421,8 +3413,7 @@ static void e1000_dump(struct e1000_adapter *adapter) ...@@ -3421,8 +3413,7 @@ static void e1000_dump(struct e1000_adapter *adapter)
* +-----------------------------------------------------+ * +-----------------------------------------------------+
* 63 48 47 40 39 32 31 16 15 0 * 63 48 47 40 39 32 31 16 15 0
*/ */
printk(KERN_INFO "R[desc] [address 63:0 ] [vl er S cks ln] " pr_info("R[desc] [address 63:0 ] [vl er S cks ln] [bi->dma ] [bi->skb]\n");
"[bi->dma ] [bi->skb]\n");
if (!netif_msg_rx_status(adapter)) if (!netif_msg_rx_status(adapter))
goto exit; goto exit;
...@@ -3432,44 +3423,40 @@ static void e1000_dump(struct e1000_adapter *adapter) ...@@ -3432,44 +3423,40 @@ static void e1000_dump(struct e1000_adapter *adapter)
struct e1000_buffer *buffer_info = &rx_ring->buffer_info[i]; struct e1000_buffer *buffer_info = &rx_ring->buffer_info[i];
struct my_u { u64 a; u64 b; }; struct my_u { u64 a; u64 b; };
struct my_u *u = (struct my_u *)rx_desc; struct my_u *u = (struct my_u *)rx_desc;
printk(KERN_INFO "R[0x%03X] %016llX %016llX %016llX %p", const char *type;
i, le64_to_cpu(u->a), le64_to_cpu(u->b),
(u64)buffer_info->dma, buffer_info->skb);
if (i == rx_ring->next_to_use) if (i == rx_ring->next_to_use)
printk(KERN_CONT " NTU\n"); type = "NTU";
else if (i == rx_ring->next_to_clean) else if (i == rx_ring->next_to_clean)
printk(KERN_CONT " NTC\n"); type = "NTC";
else else
printk(KERN_CONT "\n"); type = "";
if (netif_msg_pktdata(adapter))
print_hex_dump(KERN_INFO, "",
DUMP_PREFIX_ADDRESS, 16, 1,
phys_to_virt(buffer_info->dma),
buffer_info->length, true);
pr_info("R[0x%03X] %016llX %016llX %016llX %p %s\n",
i, le64_to_cpu(u->a), le64_to_cpu(u->b),
(u64)buffer_info->dma, buffer_info->skb, type);
} /* for */ } /* for */
/* dump the descriptor caches */ /* dump the descriptor caches */
/* rx */ /* rx */
printk(KERN_INFO "e1000: Rx descriptor cache in 64bit format\n"); pr_info("Rx descriptor cache in 64bit format\n");
for (i = 0x6000; i <= 0x63FF ; i += 0x10) { for (i = 0x6000; i <= 0x63FF ; i += 0x10) {
printk(KERN_INFO "R%04X: %08X|%08X %08X|%08X\n", pr_info("R%04X: %08X|%08X %08X|%08X\n",
i, i,
readl(adapter->hw.hw_addr + i+4), readl(adapter->hw.hw_addr + i+4),
readl(adapter->hw.hw_addr + i), readl(adapter->hw.hw_addr + i),
readl(adapter->hw.hw_addr + i+12), readl(adapter->hw.hw_addr + i+12),
readl(adapter->hw.hw_addr + i+8)); readl(adapter->hw.hw_addr + i+8));
} }
/* tx */ /* tx */
printk(KERN_INFO "e1000: Tx descriptor cache in 64bit format\n"); pr_info("Tx descriptor cache in 64bit format\n");
for (i = 0x7000; i <= 0x73FF ; i += 0x10) { for (i = 0x7000; i <= 0x73FF ; i += 0x10) {
printk(KERN_INFO "T%04X: %08X|%08X %08X|%08X\n", pr_info("T%04X: %08X|%08X %08X|%08X\n",
i, i,
readl(adapter->hw.hw_addr + i+4), readl(adapter->hw.hw_addr + i+4),
readl(adapter->hw.hw_addr + i), readl(adapter->hw.hw_addr + i),
readl(adapter->hw.hw_addr + i+12), readl(adapter->hw.hw_addr + i+12),
readl(adapter->hw.hw_addr + i+8)); readl(adapter->hw.hw_addr + i+8));
} }
exit: exit:
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7