aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c74
1 files changed, 36 insertions, 38 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7b6dcd8cf1a6..edb71e1bc43a 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -282,17 +282,17 @@ static void ixgbe_regdump(struct ixgbe_hw *hw, struct ixgbe_reg_info *reginfo)
282 regs[i] = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i)); 282 regs[i] = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
283 break; 283 break;
284 default: 284 default:
285 printk(KERN_INFO "%-15s %08x\n", reginfo->name, 285 pr_info("%-15s %08x\n", reginfo->name,
286 IXGBE_READ_REG(hw, reginfo->ofs)); 286 IXGBE_READ_REG(hw, reginfo->ofs));
287 return; 287 return;
288 } 288 }
289 289
290 for (i = 0; i < 8; i++) { 290 for (i = 0; i < 8; i++) {
291 snprintf(rname, 16, "%s[%d-%d]", reginfo->name, i*8, i*8+7); 291 snprintf(rname, 16, "%s[%d-%d]", reginfo->name, i*8, i*8+7);
292 printk(KERN_ERR "%-15s ", rname); 292 pr_err("%-15s", rname);
293 for (j = 0; j < 8; j++) 293 for (j = 0; j < 8; j++)
294 printk(KERN_CONT "%08x ", regs[i*8+j]); 294 pr_cont(" %08x", regs[i*8+j]);
295 printk(KERN_CONT "\n"); 295 pr_cont("\n");
296 } 296 }
297 297
298} 298}
@@ -322,18 +322,18 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
322 /* Print netdevice Info */ 322 /* Print netdevice Info */
323 if (netdev) { 323 if (netdev) {
324 dev_info(&adapter->pdev->dev, "Net device Info\n"); 324 dev_info(&adapter->pdev->dev, "Net device Info\n");
325 printk(KERN_INFO "Device Name state " 325 pr_info("Device Name state "
326 "trans_start last_rx\n"); 326 "trans_start last_rx\n");
327 printk(KERN_INFO "%-15s %016lX %016lX %016lX\n", 327 pr_info("%-15s %016lX %016lX %016lX\n",
328 netdev->name, 328 netdev->name,
329 netdev->state, 329 netdev->state,
330 netdev->trans_start, 330 netdev->trans_start,
331 netdev->last_rx); 331 netdev->last_rx);
332 } 332 }
333 333
334 /* Print Registers */ 334 /* Print Registers */
335 dev_info(&adapter->pdev->dev, "Register Dump\n"); 335 dev_info(&adapter->pdev->dev, "Register Dump\n");
336 printk(KERN_INFO " Register Name Value\n"); 336 pr_info(" Register Name Value\n");
337 for (reginfo = (struct ixgbe_reg_info *)ixgbe_reg_info_tbl; 337 for (reginfo = (struct ixgbe_reg_info *)ixgbe_reg_info_tbl;
338 reginfo->name; reginfo++) { 338 reginfo->name; reginfo++) {
339 ixgbe_regdump(hw, reginfo); 339 ixgbe_regdump(hw, reginfo);
@@ -344,13 +344,12 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
344 goto exit; 344 goto exit;
345 345
346 dev_info(&adapter->pdev->dev, "TX Rings Summary\n"); 346 dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
347 printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma ] " 347 pr_info("Queue [NTU] [NTC] [bi(ntc)->dma ] leng ntw timestamp\n");
348 "leng ntw timestamp\n");
349 for (n = 0; n < adapter->num_tx_queues; n++) { 348 for (n = 0; n < adapter->num_tx_queues; n++) {
350 tx_ring = adapter->tx_ring[n]; 349 tx_ring = adapter->tx_ring[n];
351 tx_buffer_info = 350 tx_buffer_info =
352 &tx_ring->tx_buffer_info[tx_ring->next_to_clean]; 351 &tx_ring->tx_buffer_info[tx_ring->next_to_clean];
353 printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n", 352 pr_info(" %5d %5X %5X %016llX %04X %3X %016llX\n",
354 n, tx_ring->next_to_use, tx_ring->next_to_clean, 353 n, tx_ring->next_to_use, tx_ring->next_to_clean,
355 (u64)tx_buffer_info->dma, 354 (u64)tx_buffer_info->dma,
356 tx_buffer_info->length, 355 tx_buffer_info->length,
@@ -377,10 +376,10 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
377 376
378 for (n = 0; n < adapter->num_tx_queues; n++) { 377 for (n = 0; n < adapter->num_tx_queues; n++) {
379 tx_ring = adapter->tx_ring[n]; 378 tx_ring = adapter->tx_ring[n];
380 printk(KERN_INFO "------------------------------------\n"); 379 pr_info("------------------------------------\n");
381 printk(KERN_INFO "TX QUEUE INDEX = %d\n", tx_ring->queue_index); 380 pr_info("TX QUEUE INDEX = %d\n", tx_ring->queue_index);
382 printk(KERN_INFO "------------------------------------\n"); 381 pr_info("------------------------------------\n");
383 printk(KERN_INFO "T [desc] [address 63:0 ] " 382 pr_info("T [desc] [address 63:0 ] "
384 "[PlPOIdStDDt Ln] [bi->dma ] " 383 "[PlPOIdStDDt Ln] [bi->dma ] "
385 "leng ntw timestamp bi->skb\n"); 384 "leng ntw timestamp bi->skb\n");
386 385
@@ -388,7 +387,7 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
388 tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i); 387 tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
389 tx_buffer_info = &tx_ring->tx_buffer_info[i]; 388 tx_buffer_info = &tx_ring->tx_buffer_info[i];
390 u0 = (struct my_u0 *)tx_desc; 389 u0 = (struct my_u0 *)tx_desc;
391 printk(KERN_INFO "T [0x%03X] %016llX %016llX %016llX" 390 pr_info("T [0x%03X] %016llX %016llX %016llX"
392 " %04X %3X %016llX %p", i, 391 " %04X %3X %016llX %p", i,
393 le64_to_cpu(u0->a), 392 le64_to_cpu(u0->a),
394 le64_to_cpu(u0->b), 393 le64_to_cpu(u0->b),
@@ -399,13 +398,13 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
399 tx_buffer_info->skb); 398 tx_buffer_info->skb);
400 if (i == tx_ring->next_to_use && 399 if (i == tx_ring->next_to_use &&
401 i == tx_ring->next_to_clean) 400 i == tx_ring->next_to_clean)
402 printk(KERN_CONT " NTC/U\n"); 401 pr_cont(" NTC/U\n");
403 else if (i == tx_ring->next_to_use) 402 else if (i == tx_ring->next_to_use)
404 printk(KERN_CONT " NTU\n"); 403 pr_cont(" NTU\n");
405 else if (i == tx_ring->next_to_clean) 404 else if (i == tx_ring->next_to_clean)
406 printk(KERN_CONT " NTC\n"); 405 pr_cont(" NTC\n");
407 else 406 else
408 printk(KERN_CONT "\n"); 407 pr_cont("\n");
409 408
410 if (netif_msg_pktdata(adapter) && 409 if (netif_msg_pktdata(adapter) &&
411 tx_buffer_info->dma != 0) 410 tx_buffer_info->dma != 0)
@@ -419,11 +418,11 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
419 /* Print RX Rings Summary */ 418 /* Print RX Rings Summary */
420rx_ring_summary: 419rx_ring_summary:
421 dev_info(&adapter->pdev->dev, "RX Rings Summary\n"); 420 dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
422 printk(KERN_INFO "Queue [NTU] [NTC]\n"); 421 pr_info("Queue [NTU] [NTC]\n");
423 for (n = 0; n < adapter->num_rx_queues; n++) { 422 for (n = 0; n < adapter->num_rx_queues; n++) {
424 rx_ring = adapter->rx_ring[n]; 423 rx_ring = adapter->rx_ring[n];
425 printk(KERN_INFO "%5d %5X %5X\n", n, 424 pr_info("%5d %5X %5X\n",
426 rx_ring->next_to_use, rx_ring->next_to_clean); 425 n, rx_ring->next_to_use, rx_ring->next_to_clean);
427 } 426 }
428 427
429 /* Print RX Rings */ 428 /* Print RX Rings */
@@ -454,13 +453,13 @@ rx_ring_summary:
454 */ 453 */
455 for (n = 0; n < adapter->num_rx_queues; n++) { 454 for (n = 0; n < adapter->num_rx_queues; n++) {
456 rx_ring = adapter->rx_ring[n]; 455 rx_ring = adapter->rx_ring[n];
457 printk(KERN_INFO "------------------------------------\n"); 456 pr_info("------------------------------------\n");
458 printk(KERN_INFO "RX QUEUE INDEX = %d\n", rx_ring->queue_index); 457 pr_info("RX QUEUE INDEX = %d\n", rx_ring->queue_index);
459 printk(KERN_INFO "------------------------------------\n"); 458 pr_info("------------------------------------\n");
460 printk(KERN_INFO "R [desc] [ PktBuf A0] " 459 pr_info("R [desc] [ PktBuf A0] "
461 "[ HeadBuf DD] [bi->dma ] [bi->skb] " 460 "[ HeadBuf DD] [bi->dma ] [bi->skb] "
462 "<-- Adv Rx Read format\n"); 461 "<-- Adv Rx Read format\n");
463 printk(KERN_INFO "RWB[desc] [PcsmIpSHl PtRs] " 462 pr_info("RWB[desc] [PcsmIpSHl PtRs] "
464 "[vl er S cks ln] ---------------- [bi->skb] " 463 "[vl er S cks ln] ---------------- [bi->skb] "
465 "<-- Adv Rx Write-Back format\n"); 464 "<-- Adv Rx Write-Back format\n");
466 465
@@ -471,13 +470,13 @@ rx_ring_summary:
471 staterr = le32_to_cpu(rx_desc->wb.upper.status_error); 470 staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
472 if (staterr & IXGBE_RXD_STAT_DD) { 471 if (staterr & IXGBE_RXD_STAT_DD) {
473 /* Descriptor Done */ 472 /* Descriptor Done */
474 printk(KERN_INFO "RWB[0x%03X] %016llX " 473 pr_info("RWB[0x%03X] %016llX "
475 "%016llX ---------------- %p", i, 474 "%016llX ---------------- %p", i,
476 le64_to_cpu(u0->a), 475 le64_to_cpu(u0->a),
477 le64_to_cpu(u0->b), 476 le64_to_cpu(u0->b),
478 rx_buffer_info->skb); 477 rx_buffer_info->skb);
479 } else { 478 } else {
480 printk(KERN_INFO "R [0x%03X] %016llX " 479 pr_info("R [0x%03X] %016llX "
481 "%016llX %016llX %p", i, 480 "%016llX %016llX %p", i,
482 le64_to_cpu(u0->a), 481 le64_to_cpu(u0->a),
483 le64_to_cpu(u0->b), 482 le64_to_cpu(u0->b),
@@ -503,11 +502,11 @@ rx_ring_summary:
503 } 502 }
504 503
505 if (i == rx_ring->next_to_use) 504 if (i == rx_ring->next_to_use)
506 printk(KERN_CONT " NTU\n"); 505 pr_cont(" NTU\n");
507 else if (i == rx_ring->next_to_clean) 506 else if (i == rx_ring->next_to_clean)
508 printk(KERN_CONT " NTC\n"); 507 pr_cont(" NTC\n");
509 else 508 else
510 printk(KERN_CONT "\n"); 509 pr_cont("\n");
511 510
512 } 511 }
513 } 512 }
@@ -7176,8 +7175,7 @@ static struct pci_driver ixgbe_driver = {
7176static int __init ixgbe_init_module(void) 7175static int __init ixgbe_init_module(void)
7177{ 7176{
7178 int ret; 7177 int ret;
7179 pr_info("%s - version %s\n", ixgbe_driver_string, 7178 pr_info("%s - version %s\n", ixgbe_driver_string, ixgbe_driver_version);
7180 ixgbe_driver_version);
7181 pr_info("%s\n", ixgbe_copyright); 7179 pr_info("%s\n", ixgbe_copyright);
7182 7180
7183#ifdef CONFIG_IXGBE_DCA 7181#ifdef CONFIG_IXGBE_DCA
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-13 23:19:32 -0400