Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af667a29 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs 



Some minor comment errors and whitespace issues discovered while looking
into this are also addressed.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0d6057e4

drivers/net/e1000e/82571.c

+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw) 
		 * apply workaround for hardware errata documented in errata

		 * docs Fixes issue where some error prone or unreliable PCIe

		 * completions are occurring, particularly with ASPM enabled.

		 * Without fix, issue can cause tx timeouts.

		 * Without fix, issue can cause Tx timeouts.

		 */

		reg = er32(GCR2);

		reg |= 1;

drivers/net/e1000e/hw.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ enum e1e_registers { 
	E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */

	E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */

#define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))

	E1000_RADV     = 0x0282C, /* RX Interrupt Absolute Delay Timer - RW */

	E1000_RADV     = 0x0282C, /* Rx Interrupt Absolute Delay Timer - RW */



/* Convenience macros

 *

drivers/net/e1000e/lib.c

+9 −9
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw) 
			mac->autoneg_failed = 1;

			return 0;

		}

		e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");

		e_dbg("NOT Rx'ing /C/, disable AutoNeg and force link.\n");



		/* Disable auto-negotiation in the TXCW register */

		ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
@@ -556,7 +556,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw) 
		 * and disable forced link in the Device Control register

		 * in an attempt to auto-negotiate with our link partner.

		 */

		e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");

		e_dbg("Rx'ing /C/, enable AutoNeg and stop forcing link.\n");

		ew32(TXCW, mac->txcw);

		ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
@@ -598,7 +598,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw) 
			mac->autoneg_failed = 1;

			return 0;

		}

		e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");

		e_dbg("NOT Rx'ing /C/, disable AutoNeg and force link.\n");



		/* Disable auto-negotiation in the TXCW register */

		ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
@@ -621,7 +621,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw) 
		 * and disable forced link in the Device Control register

		 * in an attempt to auto-negotiate with our link partner.

		 */

		e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");

		e_dbg("Rx'ing /C/, enable AutoNeg and stop forcing link.\n");

		ew32(TXCW, mac->txcw);

		ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
@@ -1189,7 +1189,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) 
			} else {

				hw->fc.current_mode = e1000_fc_rx_pause;

				e_dbg("Flow Control = "

					 "RX PAUSE frames only.\r\n");

				      "Rx PAUSE frames only.\r\n");

			}

		}

		/*

drivers/net/e1000e/netdev.c

+112 −109
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = { 
	/* Interrupt Registers */

	{E1000_ICR, "ICR"},



	/* RX Registers */

	/* Rx Registers */

	{E1000_RCTL, "RCTL"},

	{E1000_RDLEN, "RDLEN"},

	{E1000_RDH, "RDH"},
@@ -115,7 +115,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = { 
	{E1000_RDFTS, "RDFTS"},

	{E1000_RDFPC, "RDFPC"},



	/* TX Registers */

	/* Tx Registers */

	{E1000_TCTL, "TCTL"},

	{E1000_TDBAL, "TDBAL"},

	{E1000_TDBAH, "TDBAH"},
@@ -171,9 +171,8 @@ static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo) 
	printk(KERN_CONT "\n");

}





/*

 * e1000e_dump - Print registers, tx-ring and rx-ring

 * e1000e_dump - Print registers, Tx-ring and Rx-ring

 */

static void e1000e_dump(struct e1000_adapter *adapter)

{
@@ -182,12 +181,20 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
	struct e1000_reg_info *reginfo;

	struct e1000_ring *tx_ring = adapter->tx_ring;

	struct e1000_tx_desc *tx_desc;

	struct my_u0 { u64 a; u64 b; } *u0;

	struct my_u0 {

		u64 a;

		u64 b;

	} *u0;

	struct e1000_buffer *buffer_info;

	struct e1000_ring *rx_ring = adapter->rx_ring;

	union e1000_rx_desc_packet_split *rx_desc_ps;

	struct e1000_rx_desc *rx_desc;

	struct my_u1 { u64 a; u64 b; u64 c; u64 d; } *u1;

	struct my_u1 {

		u64 a;

		u64 b;

		u64 c;

		u64 d;

	} *u1;

	u32 staterr;

	int i = 0;
@@ -200,9 +207,7 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
		printk(KERN_INFO "Device Name     state            "

		       "trans_start      last_rx\n");

		printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",

			netdev->name,

			netdev->state,

			netdev->trans_start,

		       netdev->name, netdev->state, netdev->trans_start,

		       netdev->last_rx);

	}
@@ -214,11 +219,11 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
		e1000_regdump(hw, reginfo);

	}



	/* Print TX Ring Summary */

	/* Print Tx Ring Summary */

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

		goto exit;



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

	dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");

	printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma  ]"

	       " leng ntw timestamp\n");

	buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
@@ -229,11 +234,11 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
	       buffer_info->next_to_watch,

	       (unsigned long long)buffer_info->time_stamp);



	/* Print TX Rings */

	/* Print Tx Ring */

	if (!netif_msg_tx_done(adapter))

		goto rx_ring_summary;



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

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



	/* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended)

	 *
@@ -300,18 +305,18 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
				       buffer_info->length, true);

	}



	/* Print RX Rings Summary */

	/* Print Rx Ring Summary */

rx_ring_summary:

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

	dev_info(&adapter->pdev->dev, "Rx Ring Summary\n");

	printk(KERN_INFO "Queue [NTU] [NTC]\n");

	printk(KERN_INFO " %5d %5X %5X\n", 0,

	       rx_ring->next_to_use, rx_ring->next_to_clean);



	/* Print RX Rings */

	/* Print Rx Ring */

	if (!netif_msg_rx_status(adapter))

		goto exit;



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

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

	switch (adapter->rx_ps_pages) {

	case 1:

	case 2:
@@ -422,7 +427,8 @@ rx_ring_summary: 
			if (netif_msg_pktdata(adapter))

				print_hex_dump(KERN_INFO, "",

					       DUMP_PREFIX_ADDRESS,

					16, 1, phys_to_virt(buffer_info->dma),

					       16, 1,

					       phys_to_virt(buffer_info->dma),

					       adapter->rx_buffer_len, true);

		}

	}
@@ -450,8 +456,7 @@ static int e1000_desc_unused(struct e1000_ring *ring) 
 * @skb: pointer to sk_buff to be indicated to stack

 **/

static void e1000_receive_skb(struct e1000_adapter *adapter,

			      struct net_device *netdev,

			      struct sk_buff *skb,

			      struct net_device *netdev, struct sk_buff *skb,

			      u8 status, __le16 vlan)

{

	skb->protocol = eth_type_trans(skb, netdev);
@@ -464,7 +469,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter, 
}



/**

 * e1000_rx_checksum - Receive Checksum Offload for 82543

 * e1000_rx_checksum - Receive Checksum Offload

 * @adapter:     board private structure

 * @status_err:  receive descriptor status and error fields

 * @csum:	receive descriptor csum field
@@ -548,7 +553,7 @@ map_skb: 
						  adapter->rx_buffer_len,

						  DMA_FROM_DEVICE);

		if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {

			dev_err(&pdev->dev, "RX DMA map failed\n");

			dev_err(&pdev->dev, "Rx DMA map failed\n");

			adapter->rx_dma_failed++;

			break;

		}
@@ -601,7 +606,8 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter, 
			ps_page = &buffer_info->ps_pages[j];

			if (j >= adapter->rx_ps_pages) {

				/* all unused desc entries get hw null ptr */

				rx_desc->read.buffer_addr[j+1] = ~cpu_to_le64(0);

				rx_desc->read.buffer_addr[j + 1] =

				    ~cpu_to_le64(0);

				continue;

			}

			if (!ps_page->page) {
@@ -617,7 +623,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter, 
				if (dma_mapping_error(&pdev->dev,

						      ps_page->dma)) {

					dev_err(&adapter->pdev->dev,

					  "RX DMA page map failed\n");

						"Rx DMA page map failed\n");

					adapter->rx_dma_failed++;

					goto no_buffers;

				}
@@ -644,7 +650,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter, 
						  adapter->rx_ps_bsize0,

						  DMA_FROM_DEVICE);

		if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {

			dev_err(&pdev->dev, "RX DMA map failed\n");

			dev_err(&pdev->dev, "Rx DMA map failed\n");

			adapter->rx_dma_failed++;

			/* cleanup skb */

			dev_kfree_skb_any(skb);
@@ -1106,11 +1112,10 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 
		cleaned = 1;

		cleaned_count++;

		dma_unmap_single(&pdev->dev, buffer_info->dma,

				 adapter->rx_ps_bsize0,

				 DMA_FROM_DEVICE);

				 adapter->rx_ps_bsize0, DMA_FROM_DEVICE);

		buffer_info->dma = 0;



		/* see !EOP comment in other rx routine */

		/* see !EOP comment in other Rx routine */

		if (!(staterr & E1000_RXD_STAT_EOP))

			adapter->flags2 |= FLAG2_IS_DISCARDING;
@@ -2610,7 +2615,7 @@ static void e1000_init_manageability_pt(struct e1000_adapter *adapter) 
}



/**

 * e1000_configure_tx - Configure 8254x Transmit Unit after Reset

 * e1000_configure_tx - Configure Transmit Unit after Reset

 * @adapter: board private structure

 *

 * Configure the Tx unit of the MAC after a reset.
@@ -2663,7 +2668,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) 
		 * hthresh = 1 ==> prefetch when one or more available

		 * pthresh = 0x1f ==> prefetch if internal cache 31 or less

		 * BEWARE: this seems to work but should be considered first if

		 * there are tx hangs or other tx related bugs

		 * there are Tx hangs or other Tx related bugs

		 */

		txdctl |= E1000_TXDCTL_DMA_BURST_ENABLE;

		ew32(TXDCTL(0), txdctl);
@@ -2900,7 +2905,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter) 
		/*

		 * set the writeback threshold (only takes effect if the RDTR

		 * is set). set GRAN=1 and write back up to 0x4 worth, and

		 * enable prefetching of 0x20 rx descriptors

		 * enable prefetching of 0x20 Rx descriptors

		 * granularity = 01

		 * wthresh = 04,

		 * hthresh = 04,
@@ -2981,11 +2986,9 @@ static void e1000_configure_rx(struct e1000_adapter *adapter) 
			 * excessive C-state transition latencies result in

			 * dropped transactions.

			 */

			pm_qos_update_request(

				&adapter->netdev->pm_qos_req, 55);

			pm_qos_update_request(&adapter->netdev->pm_qos_req, 55);

		} else {

			pm_qos_update_request(

				&adapter->netdev->pm_qos_req,

			pm_qos_update_request(&adapter->netdev->pm_qos_req,

					      PM_QOS_DEFAULT_VALUE);

		}

	}
@@ -3152,7 +3155,7 @@ void e1000e_reset(struct e1000_adapter *adapter) 
		/* lower 16 bits has Rx packet buffer allocation size in KB */

		pba &= 0xffff;

		/*

		 * the Tx fifo also stores 16 bytes of information about the tx

		 * the Tx fifo also stores 16 bytes of information about the Tx

		 * but don't include ethernet FCS because hardware appends it

		 */

		min_tx_space = (adapter->max_frame_size +
@@ -3175,7 +3178,7 @@ void e1000e_reset(struct e1000_adapter *adapter) 
			pba -= min_tx_space - tx_space;



			/*

			 * if short on Rx space, Rx wins and must trump tx

			 * if short on Rx space, Rx wins and must trump Tx

			 * adjustment or use Early Receive if available

			 */

			if ((pba < min_rx_space) &&
@@ -4041,9 +4044,9 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) 
	       (adapter->link_duplex == FULL_DUPLEX) ?

	       "Full Duplex" : "Half Duplex",

	       ((ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE)) ?

	                        "RX/TX" :

	       ((ctrl & E1000_CTRL_RFCE) ? "RX" :

	       ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));

	       "Rx/Tx" :

	       ((ctrl & E1000_CTRL_RFCE) ? "Rx" :

		((ctrl & E1000_CTRL_TFCE) ? "Tx" : "None")));

}



static bool e1000e_has_link(struct e1000_adapter *adapter)
@@ -4338,7 +4341,7 @@ link_up: 
	/* Force detection of hung controller every watchdog period */

	adapter->detect_tx_hung = 1;



	/* flush partial descriptors to memory before detecting tx hang */

	/* flush partial descriptors to memory before detecting Tx hang */

	if (adapter->flags2 & FLAG2_DMA_BURST) {

		ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);

		ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
@@ -4588,7 +4591,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 
	return count;



dma_error:

	dev_err(&pdev->dev, "TX DMA map failed\n");

	dev_err(&pdev->dev, "Tx DMA map failed\n");

	buffer_info->dma = 0;

	if (count)

		count--;

drivers/net/e1000e/param.c

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,9 @@ MODULE_PARM_DESC(copybreak, 
	module_param_array_named(X, X, int, &num_##X, 0);	\

	MODULE_PARM_DESC(X, desc);





/*

 * Transmit Interrupt Delay in units of 1.024 microseconds

 * Tx interrupt delay needs to typically be set to something non zero

 * Tx interrupt delay needs to typically be set to something non-zero

 *

 * Valid Range: 0-65535

 */
@@ -112,6 +111,7 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate"); 
#define DEFAULT_ITR 3

#define MAX_ITR 100000

#define MIN_ITR 100



/* IntMode (Interrupt Mode)

 *

 * Valid Range: 0 - 2