Commit 5c32bac9 authored by Andre Guedes's avatar Andre Guedes Committed by Jeff Kirsher
Browse files

igc: Use netdev log helpers in igc_dump.c 



In igc_dump.c we print log messages using dev_* and pr_* helpers,
generating inconsistent output with the rest of the driver. Since this
is a network device driver, we should preferably use netdev_* helpers
because they append the interface name to the message, helping making
sense out of the logs.

This patch converts all dev_* and pr_* calls to netdev_*.

Quick note about igc_rings_dump(): This function is always called with
valid adapter->netdev so there is not need to check it.

Signed-off-by: default avatarAndre Guedes <andre.guedes@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 916a3c65

drivers/net/ethernet/intel/igc/igc_dump.c

+54 −55
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static const struct igc_reg_info igc_reg_info_tbl[] = { 
/* igc_regdump - register printout routine */

static void igc_regdump(struct igc_hw *hw, struct igc_reg_info *reginfo)

{

	struct net_device *dev = igc_get_hw_dev(hw);

	int n = 0;

	char rname[16];

	u32 regs[8];
@@ -101,12 +102,13 @@ static void igc_regdump(struct igc_hw *hw, struct igc_reg_info *reginfo) 
			regs[n] = rd32(IGC_TXDCTL(n));

		break;

	default:

		pr_info("%-15s %08x\n", reginfo->name, rd32(reginfo->ofs));

		netdev_info(dev, "%-15s %08x\n", reginfo->name,

			    rd32(reginfo->ofs));

		return;

	}



	snprintf(rname, 16, "%s%s", reginfo->name, "[0-3]");

	pr_info("%-15s %08x %08x %08x %08x\n", rname, regs[0], regs[1],

	netdev_info(dev, "%-15s %08x %08x %08x %08x\n", rname, regs[0], regs[1],

		    regs[2], regs[3]);

}
@@ -125,27 +127,22 @@ void igc_rings_dump(struct igc_adapter *adapter) 
	if (!netif_msg_hw(adapter))

		return;



	/* Print netdevice Info */

	if (netdev) {

		dev_info(&adapter->pdev->dev, "Net device Info\n");

		pr_info("Device Name     state            trans_start\n");

		pr_info("%-15s %016lX %016lX\n", netdev->name,

	netdev_info(netdev, "Device info: state %016lX trans_start %016lX\n",

		    netdev->state, dev_trans_start(netdev));

	}



	/* Print TX Ring Summary */

	if (!netdev || !netif_running(netdev))

	if (!netif_running(netdev))

		goto exit;



	dev_info(&adapter->pdev->dev, "TX Rings Summary\n");

	pr_info("Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");

	netdev_info(netdev, "TX Rings Summary\n");

	netdev_info(netdev, "Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");

	for (n = 0; n < adapter->num_tx_queues; n++) {

		struct igc_tx_buffer *buffer_info;



		tx_ring = adapter->tx_ring[n];

		buffer_info = &tx_ring->tx_buffer_info[tx_ring->next_to_clean];



		pr_info(" %5d %5X %5X %016llX %04X %p %016llX\n",

		netdev_info(netdev, "%5d %5X %5X %016llX %04X %p %016llX\n",

			    n, tx_ring->next_to_use, tx_ring->next_to_clean,

			    (u64)dma_unmap_addr(buffer_info, dma),

			    dma_unmap_len(buffer_info, len),
@@ -157,7 +154,7 @@ void igc_rings_dump(struct igc_adapter *adapter) 
	if (!netif_msg_tx_done(adapter))

		goto rx_ring_summary;



	dev_info(&adapter->pdev->dev, "TX Rings Dump\n");

	netdev_info(netdev, "TX Rings Dump\n");



	/* Transmit Descriptor Formats

	 *
@@ -172,10 +169,11 @@ void igc_rings_dump(struct igc_adapter *adapter) 


	for (n = 0; n < adapter->num_tx_queues; n++) {

		tx_ring = adapter->tx_ring[n];

		pr_info("------------------------------------\n");

		pr_info("TX QUEUE INDEX = %d\n", tx_ring->queue_index);

		pr_info("------------------------------------\n");

		pr_info("T [desc]     [address 63:0  ] [PlPOCIStDDM Ln] [bi->dma       ] leng  ntw timestamp        bi->skb\n");

		netdev_info(netdev, "------------------------------------\n");

		netdev_info(netdev, "TX QUEUE INDEX = %d\n",

			    tx_ring->queue_index);

		netdev_info(netdev, "------------------------------------\n");

		netdev_info(netdev, "T [desc]     [address 63:0  ] [PlPOCIStDDM Ln] [bi->dma       ] leng  ntw timestamp        bi->skb\n");



		for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {

			const char *next_desc;
@@ -194,7 +192,7 @@ void igc_rings_dump(struct igc_adapter *adapter) 
			else

				next_desc = "";



			pr_info("T [0x%03X]    %016llX %016llX %016llX %04X  %p %016llX %p%s\n",

			netdev_info(netdev, "T [0x%03X]    %016llX %016llX %016llX %04X  %p %016llX %p%s\n",

				    i, le64_to_cpu(u0->a),

				    le64_to_cpu(u0->b),

				    (u64)dma_unmap_addr(buffer_info, dma),
@@ -214,19 +212,19 @@ void igc_rings_dump(struct igc_adapter *adapter) 


	/* Print RX Rings Summary */

rx_ring_summary:

	dev_info(&adapter->pdev->dev, "RX Rings Summary\n");

	pr_info("Queue [NTU] [NTC]\n");

	netdev_info(netdev, "RX Rings Summary\n");

	netdev_info(netdev, "Queue [NTU] [NTC]\n");

	for (n = 0; n < adapter->num_rx_queues; n++) {

		rx_ring = adapter->rx_ring[n];

		pr_info(" %5d %5X %5X\n",

			n, rx_ring->next_to_use, rx_ring->next_to_clean);

		netdev_info(netdev, "%5d %5X %5X\n", n, rx_ring->next_to_use,

			    rx_ring->next_to_clean);

	}



	/* Print RX Rings */

	if (!netif_msg_rx_status(adapter))

		goto exit;



	dev_info(&adapter->pdev->dev, "RX Rings Dump\n");

	netdev_info(netdev, "RX Rings Dump\n");



	/* Advanced Receive Descriptor (Read) Format

	 *    63                                           1        0
@@ -251,11 +249,12 @@ rx_ring_summary: 


	for (n = 0; n < adapter->num_rx_queues; n++) {

		rx_ring = adapter->rx_ring[n];

		pr_info("------------------------------------\n");

		pr_info("RX QUEUE INDEX = %d\n", rx_ring->queue_index);

		pr_info("------------------------------------\n");

		pr_info("R  [desc]      [ PktBuf     A0] [  HeadBuf   DD] [bi->dma       ] [bi->skb] <-- Adv Rx Read format\n");

		pr_info("RWB[desc]      [PcsmIpSHl PtRs] [vl er S cks ln] ---------------- [bi->skb] <-- Adv Rx Write-Back format\n");

		netdev_info(netdev, "------------------------------------\n");

		netdev_info(netdev, "RX QUEUE INDEX = %d\n",

			    rx_ring->queue_index);

		netdev_info(netdev, "------------------------------------\n");

		netdev_info(netdev, "R  [desc]      [ PktBuf     A0] [  HeadBuf   DD] [bi->dma       ] [bi->skb] <-- Adv Rx Read format\n");

		netdev_info(netdev, "RWB[desc]      [PcsmIpSHl PtRs] [vl er S cks ln] ---------------- [bi->skb] <-- Adv Rx Write-Back format\n");



		for (i = 0; i < rx_ring->count; i++) {

			const char *next_desc;
@@ -275,13 +274,13 @@ rx_ring_summary: 


			if (staterr & IGC_RXD_STAT_DD) {

				/* Descriptor Done */

				pr_info("%s[0x%03X]     %016llX %016llX ---------------- %s\n",

				netdev_info(netdev, "%s[0x%03X]     %016llX %016llX ---------------- %s\n",

					    "RWB", i,

					    le64_to_cpu(u0->a),

					    le64_to_cpu(u0->b),

					    next_desc);

			} else {

				pr_info("%s[0x%03X]     %016llX %016llX %016llX %s\n",

				netdev_info(netdev, "%s[0x%03X]     %016llX %016llX %016llX %s\n",

					    "R  ", i,

					    le64_to_cpu(u0->a),

					    le64_to_cpu(u0->b),
@@ -314,8 +313,8 @@ void igc_regs_dump(struct igc_adapter *adapter) 
	struct igc_reg_info *reginfo;



	/* Print Registers */

	dev_info(&adapter->pdev->dev, "Register Dump\n");

	pr_info(" Register Name   Value\n");

	netdev_info(adapter->netdev, "Register Dump\n");

	netdev_info(adapter->netdev, "Register Name   Value\n");

	for (reginfo = (struct igc_reg_info *)igc_reg_info_tbl;

	     reginfo->name; reginfo++) {

		igc_regdump(hw, reginfo);

CRA Git | Maintained and supported by SUSTech CRA and CCSE