Commit e663886c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2021-06-04

This series contains updates to igc driver only.

Sasha utilizes the newly introduced ethtool_sprintf() function, removes
unused defines, and fixes indentation.

Muhammad adds support for hardware VLAN insertion and stripping.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0efea3c6 8d744963

drivers/net/ethernet/intel/igc/igc.h

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ extern char igc_driver_name[]; 


/* VLAN info */

#define IGC_TX_FLAGS_VLAN_MASK	0xffff0000

#define IGC_TX_FLAGS_VLAN_SHIFT	16



/* igc_test_staterr - tests bits within Rx descriptor status and error fields */

static inline __le32 igc_test_staterr(union igc_adv_rx_desc *rx_desc,

drivers/net/ethernet/intel/igc/igc_defines.h

+6 −3
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define IGC_CTRL_SLU		0x00000040  /* Set link up (Force Link) */

#define IGC_CTRL_FRCSPD		0x00000800  /* Force Speed */

#define IGC_CTRL_FRCDPX		0x00001000  /* Force Duplex */

#define IGC_CTRL_VME		0x40000000  /* IEEE VLAN mode enable */



#define IGC_CTRL_RFCE		0x08000000  /* Receive Flow Control enable */

#define IGC_CTRL_TFCE		0x10000000  /* Transmit flow control enable */
@@ -128,7 +129,6 @@ 
#define NWAY_LPAR_ASM_DIR	0x0800 /* LP Asymmetric Pause Direction bit */



/* 1000BASE-T Control Register */

#define CR_1000T_ASYM_PAUSE	0x0080 /* Advertise asymmetric pause bit */

#define CR_1000T_HD_CAPS	0x0100 /* Advertise 1000T HD capability */

#define CR_1000T_FD_CAPS	0x0200 /* Advertise 1000T FD capability  */
@@ -323,6 +323,9 @@ 
#define IGC_RXD_STAT_IXSM	0x04	/* Ignore checksum */

#define IGC_RXD_STAT_UDPCS	0x10	/* UDP xsum calculated */

#define IGC_RXD_STAT_TCPCS	0x20	/* TCP xsum calculated */

#define IGC_RXD_STAT_VP		0x08	/* IEEE VLAN Packet */



#define IGC_RXDEXT_STATERR_LB	0x00040000



/* Advanced Receive Descriptor bit definitions */

#define IGC_RXDADV_STAT_TSIP	0x08000 /* timestamp in packet */

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

+13 −26
Original line number Diff line number Diff line
@@ -765,35 +765,22 @@ static void igc_ethtool_get_strings(struct net_device *netdev, u32 stringset, 
		       IGC_TEST_LEN * ETH_GSTRING_LEN);

		break;

	case ETH_SS_STATS:

		for (i = 0; i < IGC_GLOBAL_STATS_LEN; i++) {

			memcpy(p, igc_gstrings_stats[i].stat_string,

			       ETH_GSTRING_LEN);

			p += ETH_GSTRING_LEN;

		}

		for (i = 0; i < IGC_NETDEV_STATS_LEN; i++) {

			memcpy(p, igc_gstrings_net_stats[i].stat_string,

			       ETH_GSTRING_LEN);

			p += ETH_GSTRING_LEN;

		}

		for (i = 0; i < IGC_GLOBAL_STATS_LEN; i++)

			ethtool_sprintf(&p, igc_gstrings_stats[i].stat_string);

		for (i = 0; i < IGC_NETDEV_STATS_LEN; i++)

			ethtool_sprintf(&p,

					igc_gstrings_net_stats[i].stat_string);

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

			sprintf(p, "tx_queue_%u_packets", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "tx_queue_%u_bytes", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "tx_queue_%u_restart", i);

			p += ETH_GSTRING_LEN;

			ethtool_sprintf(&p, "tx_queue_%u_packets", i);

			ethtool_sprintf(&p, "tx_queue_%u_bytes", i);

			ethtool_sprintf(&p, "tx_queue_%u_restart", i);

		}

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

			sprintf(p, "rx_queue_%u_packets", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_bytes", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_drops", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_csum_err", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_alloc_failed", i);

			p += ETH_GSTRING_LEN;

			ethtool_sprintf(&p, "rx_queue_%u_packets", i);

			ethtool_sprintf(&p, "rx_queue_%u_bytes", i);

			ethtool_sprintf(&p, "rx_queue_%u_drops", i);

			ethtool_sprintf(&p, "rx_queue_%u_csum_err", i);

			ethtool_sprintf(&p, "rx_queue_%u_alloc_failed", i);

		}

		/* BUG_ON(p - data != IGC_STATS_LEN * ETH_GSTRING_LEN); */

		break;

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

+72 −2
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ void igc_reset(struct igc_adapter *adapter) 
	if (!netif_running(adapter->netdev))

		igc_power_down_phy_copper_base(&adapter->hw);



	/* Enable HW to recognize an 802.1Q VLAN Ethernet packet */

	wr32(IGC_VET, ETH_P_8021Q);



	/* Re-enable PTP, where applicable. */

	igc_ptp_reset(adapter);
@@ -1122,13 +1125,17 @@ static inline int igc_maybe_stop_tx(struct igc_ring *tx_ring, const u16 size) 
	 ((u32)((_input) & (_flag)) * ((_result) / (_flag))) :	\

	 ((u32)((_input) & (_flag)) / ((_flag) / (_result))))



static u32 igc_tx_cmd_type(u32 tx_flags)

static u32 igc_tx_cmd_type(struct sk_buff *skb, u32 tx_flags)

{

	/* set type for advanced descriptor with frame checksum insertion */

	u32 cmd_type = IGC_ADVTXD_DTYP_DATA |

		       IGC_ADVTXD_DCMD_DEXT |

		       IGC_ADVTXD_DCMD_IFCS;



	/* set HW vlan bit if vlan is present */

	cmd_type |= IGC_SET_FLAG(tx_flags, IGC_TX_FLAGS_VLAN,

				 IGC_ADVTXD_DCMD_VLE);



	/* set segmentation bits for TSO */

	cmd_type |= IGC_SET_FLAG(tx_flags, IGC_TX_FLAGS_TSO,

				 (IGC_ADVTXD_DCMD_TSE));
@@ -1137,6 +1144,9 @@ static u32 igc_tx_cmd_type(u32 tx_flags) 
	cmd_type |= IGC_SET_FLAG(tx_flags, IGC_TX_FLAGS_TSTAMP,

				 (IGC_ADVTXD_MAC_TSTAMP));



	/* insert frame checksum */

	cmd_type ^= IGC_SET_FLAG(skb->no_fcs, 1, IGC_ADVTXD_DCMD_IFCS);



	return cmd_type;

}
@@ -1171,8 +1181,9 @@ static int igc_tx_map(struct igc_ring *tx_ring, 
	u16 i = tx_ring->next_to_use;

	unsigned int data_len, size;

	dma_addr_t dma;

	u32 cmd_type = igc_tx_cmd_type(tx_flags);

	u32 cmd_type;



	cmd_type = igc_tx_cmd_type(skb, tx_flags);

	tx_desc = IGC_TX_DESC(tx_ring, i);



	igc_tx_olinfo_status(tx_ring, tx_desc, tx_flags, skb->len - hdr_len);
@@ -1443,6 +1454,11 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb, 
		}

	}



	if (skb_vlan_tag_present(skb)) {

		tx_flags |= IGC_TX_FLAGS_VLAN;

		tx_flags |= (skb_vlan_tag_get(skb) << IGC_TX_FLAGS_VLAN_SHIFT);

	}



	/* record initial flags and protocol */

	first->tx_flags = tx_flags;

	first->protocol = protocol;
@@ -1542,6 +1558,25 @@ static inline void igc_rx_hash(struct igc_ring *ring, 
			     PKT_HASH_TYPE_L3);

}



static void igc_rx_vlan(struct igc_ring *rx_ring,

			union igc_adv_rx_desc *rx_desc,

			struct sk_buff *skb)

{

	struct net_device *dev = rx_ring->netdev;

	u16 vid;



	if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    igc_test_staterr(rx_desc, IGC_RXD_STAT_VP)) {

		if (igc_test_staterr(rx_desc, IGC_RXDEXT_STATERR_LB) &&

		    test_bit(IGC_RING_FLAG_RX_LB_VLAN_BSWAP, &rx_ring->flags))

			vid = be16_to_cpu((__force __be16)rx_desc->wb.upper.vlan);

		else

			vid = le16_to_cpu(rx_desc->wb.upper.vlan);



		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);

	}

}



/**

 * igc_process_skb_fields - Populate skb header fields from Rx descriptor

 * @rx_ring: rx descriptor ring packet is being transacted on
@@ -1560,11 +1595,37 @@ static void igc_process_skb_fields(struct igc_ring *rx_ring, 


	igc_rx_checksum(rx_ring, rx_desc, skb);



	igc_rx_vlan(rx_ring, rx_desc, skb);



	skb_record_rx_queue(skb, rx_ring->queue_index);



	skb->protocol = eth_type_trans(skb, rx_ring->netdev);

}



static void igc_vlan_mode(struct net_device *netdev, netdev_features_t features)

{

	bool enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX);

	struct igc_adapter *adapter = netdev_priv(netdev);

	struct igc_hw *hw = &adapter->hw;

	u32 ctrl;



	ctrl = rd32(IGC_CTRL);



	if (enable) {

		/* enable VLAN tag insert/strip */

		ctrl |= IGC_CTRL_VME;

	} else {

		/* disable VLAN tag insert/strip */

		ctrl &= ~IGC_CTRL_VME;

	}

	wr32(IGC_CTRL, ctrl);

}



static void igc_restore_vlan(struct igc_adapter *adapter)

{

	igc_vlan_mode(adapter->netdev, adapter->netdev->features);

}



static struct igc_rx_buffer *igc_get_rx_buffer(struct igc_ring *rx_ring,

					       const unsigned int size,

					       int *rx_buffer_pgcnt)
@@ -3248,6 +3309,8 @@ static void igc_configure(struct igc_adapter *adapter) 
	igc_get_hw_control(adapter);

	igc_set_rx_mode(netdev);



	igc_restore_vlan(adapter);



	igc_setup_tctl(adapter);

	igc_setup_mrqc(adapter);

	igc_setup_rctl(adapter);
@@ -4547,6 +4610,9 @@ static int igc_set_features(struct net_device *netdev, 
	netdev_features_t changed = netdev->features ^ features;

	struct igc_adapter *adapter = netdev_priv(netdev);



	if (changed & NETIF_F_HW_VLAN_CTAG_RX)

		igc_vlan_mode(netdev, features);



	/* Add VLAN support */

	if (!(changed & (NETIF_F_RXALL | NETIF_F_NTUPLE)))

		return 0;
@@ -5873,11 +5939,15 @@ static int igc_probe(struct pci_dev *pdev, 


	/* copy netdev features into list of user selectable features */

	netdev->hw_features |= NETIF_F_NTUPLE;

	netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX;

	netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;

	netdev->hw_features |= netdev->features;



	if (pci_using_dac)

		netdev->features |= NETIF_F_HIGHDMA;



	netdev->vlan_features |= netdev->features;



	/* MTU range: 68 - 9216 */

	netdev->min_mtu = ETH_MIN_MTU;

	netdev->max_mtu = MAX_STD_JUMBO_FRAME_SIZE;

drivers/net/ethernet/intel/igc/igc_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
#define IGC_EECD		0x00010  /* EEPROM/Flash Control - RW */

#define IGC_CTRL_EXT		0x00018  /* Extended Device Control - RW */

#define IGC_MDIC		0x00020  /* MDI Control - RW */

#define IGC_MDICNFG		0x00E04  /* MDC/MDIO Configuration - RW */

#define IGC_CONNSW		0x00034  /* Copper/Fiber switch control - RW */

#define IGC_VET			0x00038  /* VLAN Ether Type - RW */

#define IGC_I225_PHPM		0x00E14  /* I225 PHY Power Management */

#define IGC_GPHY_VERSION	0x0001E  /* I225 gPHY Firmware Version */