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

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

Merge branch 'intel' 



Jeff Kirsher says:

====================
This series contains updates to ixgbevf, ixgbe and igb.

Don provides 3 patches for ixgbevf where he cleans up a redundant
read mailbox failure check, adds a new function to wait for receive
queues to be disabled before disabling NAPI, and move the API
negotiation so that it occurs in the reset path.  This will allow
the PF to be informed of the API version earlier.

Jacob provides a ixgbevf and ixgbe patch.  His ixgbevf patch removes
the use of hw_dbg when the ixgbe_get_regs function is called in ethtool.
The ixgbe patch renames the LL_EXTENDED_STATS and some of the functions
required to implement busy polling in order to remove the marketing
"low latency" blurb which hides what the code actually does.

Leonardo provides a ixgbe patch to add support for DCB registers dump
using ethtool for 82599 and x540 ethernet controllers.

I (Jeff) provide a ixgbe patch to cleanup whitespace issues seen in a
code review.

Todd provides for igb to add support for i354 in the ethtool offline
tests.

Laura provides an igb patch to add the ethtool callbacks necessary to
configure the number of RSS queues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bc617526 907b7835

drivers/net/ethernet/intel/igb/igb.h

+1 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ int igb_up(struct igb_adapter *); 
void igb_down(struct igb_adapter *);

void igb_reinit_locked(struct igb_adapter *);

void igb_reset(struct igb_adapter *);

int igb_reinit_queues(struct igb_adapter *);

void igb_write_rss_indir_tbl(struct igb_adapter *);

int igb_set_spd_dplx(struct igb_adapter *, u32, u8);

int igb_setup_tx_resources(struct igb_ring *);

drivers/net/ethernet/intel/igb/igb_ethtool.c

+88 −2
Original line number Diff line number Diff line
@@ -1656,7 +1656,8 @@ static int igb_setup_loopback_test(struct igb_adapter *adapter) 
		if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||

		(hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||

		(hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||

		(hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) {

		(hw->device_id == E1000_DEV_ID_DH89XXCC_SFP) ||

		(hw->device_id == E1000_DEV_ID_I354_SGMII)) {



			/* Enable DH89xxCC MPHY for near end loopback */

			reg = rd32(E1000_MPHY_ADDR_CTL);
@@ -1722,7 +1723,8 @@ static void igb_loopback_cleanup(struct igb_adapter *adapter) 
	if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||

	(hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||

	(hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||

	(hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) {

	(hw->device_id == E1000_DEV_ID_DH89XXCC_SFP) ||

	(hw->device_id == E1000_DEV_ID_I354_SGMII)) {

		u32 reg;



		/* Disable near end loopback on DH89xxCC */
@@ -2872,6 +2874,88 @@ static int igb_set_rxfh_indir(struct net_device *netdev, const u32 *indir) 
	return 0;

}



static unsigned int igb_max_channels(struct igb_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;

	unsigned int max_combined = 0;



	switch (hw->mac.type) {

	case e1000_i211:

		max_combined = IGB_MAX_RX_QUEUES_I211;

		break;

	case e1000_82575:

	case e1000_i210:

		max_combined = IGB_MAX_RX_QUEUES_82575;

		break;

	case e1000_i350:

		if (!!adapter->vfs_allocated_count) {

			max_combined = 1;

			break;

		}

		/* fall through */

	case e1000_82576:

		if (!!adapter->vfs_allocated_count) {

			max_combined = 2;

			break;

		}

		/* fall through */

	case e1000_82580:

	case e1000_i354:

	default:

		max_combined = IGB_MAX_RX_QUEUES;

		break;

	}



	return max_combined;

}



static void igb_get_channels(struct net_device *netdev,

			     struct ethtool_channels *ch)

{

	struct igb_adapter *adapter = netdev_priv(netdev);



	/* Report maximum channels */

	ch->max_combined = igb_max_channels(adapter);



	/* Report info for other vector */

	if (adapter->msix_entries) {

		ch->max_other = NON_Q_VECTORS;

		ch->other_count = NON_Q_VECTORS;

	}



	ch->combined_count = adapter->rss_queues;

}



static int igb_set_channels(struct net_device *netdev,

			    struct ethtool_channels *ch)

{

	struct igb_adapter *adapter = netdev_priv(netdev);

	unsigned int count = ch->combined_count;



	/* Verify they are not requesting separate vectors */

	if (!count || ch->rx_count || ch->tx_count)

		return -EINVAL;



	/* Verify other_count is valid and has not been changed */

	if (ch->other_count != NON_Q_VECTORS)

		return -EINVAL;



	/* Verify the number of channels doesn't exceed hw limits */

	if (count > igb_max_channels(adapter))

		return -EINVAL;



	if (count != adapter->rss_queues) {

		adapter->rss_queues = count;



		/* Hardware has to reinitialize queues and interrupts to

		 * match the new configuration.

		 */

		return igb_reinit_queues(adapter);

	}



	return 0;

}



static const struct ethtool_ops igb_ethtool_ops = {

	.get_settings		= igb_get_settings,

	.set_settings		= igb_set_settings,
@@ -2908,6 +2992,8 @@ static const struct ethtool_ops igb_ethtool_ops = { 
	.get_rxfh_indir_size	= igb_get_rxfh_indir_size,

	.get_rxfh_indir		= igb_get_rxfh_indir,

	.set_rxfh_indir		= igb_set_rxfh_indir,

	.get_channels		= igb_get_channels,

	.set_channels		= igb_set_channels,

	.begin			= igb_ethtool_begin,

	.complete		= igb_ethtool_complete,

};

drivers/net/ethernet/intel/igb/igb_main.c

+22 −0
Original line number Diff line number Diff line
@@ -7838,4 +7838,26 @@ s32 igb_write_i2c_byte(struct e1000_hw *hw, u8 byte_offset, 
		return E1000_SUCCESS;



}



int igb_reinit_queues(struct igb_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	struct pci_dev *pdev = adapter->pdev;

	int err = 0;



	if (netif_running(netdev))

		igb_close(netdev);



	igb_clear_interrupt_scheme(adapter);



	if (igb_init_interrupt_scheme(adapter, true)) {

		dev_err(&pdev->dev, "Unable to allocate memory for queues\n");

		return -ENOMEM;

	}



	if (netif_running(netdev))

		err = igb_open(netdev);



	return err;

}

/* igb_main.c */

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+7 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include <net/busy_poll.h>



#ifdef CONFIG_NET_RX_BUSY_POLL

#define LL_EXTENDED_STATS

#define BP_EXTENDED_STATS

#endif

/* common prefix used by pr_<> macros */

#undef pr_fmt
@@ -187,11 +187,11 @@ struct ixgbe_rx_buffer { 
struct ixgbe_queue_stats {

	u64 packets;

	u64 bytes;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

	u64 yields;

	u64 misses;

	u64 cleaned;

#endif  /* LL_EXTENDED_STATS */

#endif  /* BP_EXTENDED_STATS */

};



struct ixgbe_tx_queue_stats {
@@ -399,7 +399,7 @@ static inline bool ixgbe_qv_lock_napi(struct ixgbe_q_vector *q_vector) 
		WARN_ON(q_vector->state & IXGBE_QV_STATE_NAPI);

		q_vector->state |= IXGBE_QV_STATE_NAPI_YIELD;

		rc = false;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

		q_vector->tx.ring->stats.yields++;

#endif

	} else
@@ -432,7 +432,7 @@ static inline bool ixgbe_qv_lock_poll(struct ixgbe_q_vector *q_vector) 
	if ((q_vector->state & IXGBE_QV_LOCKED)) {

		q_vector->state |= IXGBE_QV_STATE_POLL_YIELD;

		rc = false;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

		q_vector->rx.ring->stats.yields++;

#endif

	} else
@@ -457,7 +457,7 @@ static inline bool ixgbe_qv_unlock_poll(struct ixgbe_q_vector *q_vector) 
}



/* true if a socket is polling, even if it did not get the lock */

static inline bool ixgbe_qv_ll_polling(struct ixgbe_q_vector *q_vector)

static inline bool ixgbe_qv_busy_polling(struct ixgbe_q_vector *q_vector)

{

	WARN_ON(!(q_vector->state & IXGBE_QV_LOCKED));

	return q_vector->state & IXGBE_QV_USER_PEND;
@@ -487,7 +487,7 @@ static inline bool ixgbe_qv_unlock_poll(struct ixgbe_q_vector *q_vector) 
	return false;

}



static inline bool ixgbe_qv_ll_polling(struct ixgbe_q_vector *q_vector)

static inline bool ixgbe_qv_busy_polling(struct ixgbe_q_vector *q_vector)

{

	return false;

}

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+74 −29
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static void ixgbe_set_msglevel(struct net_device *netdev, u32 data) 


static int ixgbe_get_regs_len(struct net_device *netdev)

{

#define IXGBE_REGS_LEN  1129

#define IXGBE_REGS_LEN  1139

	return IXGBE_REGS_LEN * sizeof(u32);

}
@@ -602,22 +602,53 @@ static void ixgbe_get_regs(struct net_device *netdev, 
	regs_buff[828] = IXGBE_READ_REG(hw, IXGBE_FHFT(0));



	/* DCB */

	regs_buff[829] = IXGBE_READ_REG(hw, IXGBE_RMCS);

	regs_buff[829] = IXGBE_READ_REG(hw, IXGBE_RMCS);   /* same as FCCFG  */

	regs_buff[831] = IXGBE_READ_REG(hw, IXGBE_PDPMCS); /* same as RTTPCS */



	switch (hw->mac.type) {

	case ixgbe_mac_82598EB:

		regs_buff[830] = IXGBE_READ_REG(hw, IXGBE_DPMCS);

	regs_buff[831] = IXGBE_READ_REG(hw, IXGBE_PDPMCS);

		regs_buff[832] = IXGBE_READ_REG(hw, IXGBE_RUPPBMR);

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

		regs_buff[833 + i] = IXGBE_READ_REG(hw, IXGBE_RT2CR(i));

			regs_buff[833 + i] =

				IXGBE_READ_REG(hw, IXGBE_RT2CR(i));

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

			regs_buff[841 + i] =

				IXGBE_READ_REG(hw, IXGBE_RT2SR(i));

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

			regs_buff[849 + i] =

				IXGBE_READ_REG(hw, IXGBE_TDTQ2TCCR(i));

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

			regs_buff[857 + i] =

				IXGBE_READ_REG(hw, IXGBE_TDTQ2TCSR(i));

		break;

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:

		regs_buff[830] = IXGBE_READ_REG(hw, IXGBE_RTTDCS);

		regs_buff[832] = IXGBE_READ_REG(hw, IXGBE_RTRPCS);

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

			regs_buff[833 + i] =

				IXGBE_READ_REG(hw, IXGBE_RTRPT4C(i));

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

		regs_buff[841 + i] = IXGBE_READ_REG(hw, IXGBE_RT2SR(i));

			regs_buff[841 + i] =

				IXGBE_READ_REG(hw, IXGBE_RTRPT4S(i));

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

		regs_buff[849 + i] = IXGBE_READ_REG(hw, IXGBE_TDTQ2TCCR(i));

			regs_buff[849 + i] =

				IXGBE_READ_REG(hw, IXGBE_RTTDT2C(i));

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

		regs_buff[857 + i] = IXGBE_READ_REG(hw, IXGBE_TDTQ2TCSR(i));

			regs_buff[857 + i] =

				IXGBE_READ_REG(hw, IXGBE_RTTDT2S(i));

		break;

	default:

		break;

	}



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

		regs_buff[865 + i] = IXGBE_READ_REG(hw, IXGBE_TDPT2TCCR(i));

		regs_buff[865 + i] =

		IXGBE_READ_REG(hw, IXGBE_TDPT2TCCR(i)); /* same as RTTPT2C */

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

		regs_buff[873 + i] = IXGBE_READ_REG(hw, IXGBE_TDPT2TCSR(i));

		regs_buff[873 + i] =

		IXGBE_READ_REG(hw, IXGBE_TDPT2TCSR(i)); /* same as RTTPT2S */



	/* Statistics */

	regs_buff[881] = IXGBE_GET_STAT(adapter, crcerrs);
@@ -757,6 +788,20 @@ static void ixgbe_get_regs(struct net_device *netdev, 


	/* 82599 X540 specific registers  */

	regs_buff[1128] = IXGBE_READ_REG(hw, IXGBE_MFLCN);



	/* 82599 X540 specific DCB registers  */

	regs_buff[1129] = IXGBE_READ_REG(hw, IXGBE_RTRUP2TC);

	regs_buff[1130] = IXGBE_READ_REG(hw, IXGBE_RTTUP2TC);

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

		regs_buff[1131 + i] = IXGBE_READ_REG(hw, IXGBE_TXLLQ(i));

	regs_buff[1135] = IXGBE_READ_REG(hw, IXGBE_RTTBCNRM);

					/* same as RTTQCNRM */

	regs_buff[1136] = IXGBE_READ_REG(hw, IXGBE_RTTBCNRD);

					/* same as RTTQCNRR */



	/* X540 specific DCB registers  */

	regs_buff[1137] = IXGBE_READ_REG(hw, IXGBE_RTTQCNCR);

	regs_buff[1138] = IXGBE_READ_REG(hw, IXGBE_RTTQCNTG);

}



static int ixgbe_get_eeprom_len(struct net_device *netdev)
@@ -1072,7 +1117,7 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev, 
			data[i] = 0;

			data[i+1] = 0;

			i += 2;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

			data[i] = 0;

			data[i+1] = 0;

			data[i+2] = 0;
@@ -1087,7 +1132,7 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev, 
			data[i+1] = ring->stats.bytes;

		} while (u64_stats_fetch_retry_bh(&ring->syncp, start));

		i += 2;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

		data[i] = ring->stats.yields;

		data[i+1] = ring->stats.misses;

		data[i+2] = ring->stats.cleaned;
@@ -1100,7 +1145,7 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev, 
			data[i] = 0;

			data[i+1] = 0;

			i += 2;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

			data[i] = 0;

			data[i+1] = 0;

			data[i+2] = 0;
@@ -1115,7 +1160,7 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev, 
			data[i+1] = ring->stats.bytes;

		} while (u64_stats_fetch_retry_bh(&ring->syncp, start));

		i += 2;

#ifdef LL_EXTENDED_STATS

#ifdef BP_EXTENDED_STATS

		data[i] = ring->stats.yields;

		data[i+1] = ring->stats.misses;

		data[i+2] = ring->stats.cleaned;
@@ -1157,28 +1202,28 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset, 
			p += ETH_GSTRING_LEN;

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

			p += ETH_GSTRING_LEN;

#ifdef LL_EXTENDED_STATS

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

#ifdef BP_EXTENDED_STATS

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

			p += ETH_GSTRING_LEN;

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

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

			p += ETH_GSTRING_LEN;

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

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

			p += ETH_GSTRING_LEN;

#endif /* LL_EXTENDED_STATS */

#endif /* BP_EXTENDED_STATS */

		}

		for (i = 0; i < IXGBE_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;

#ifdef LL_EXTENDED_STATS

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

#ifdef BP_EXTENDED_STATS

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

			p += ETH_GSTRING_LEN;

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

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

			p += ETH_GSTRING_LEN;

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

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

			p += ETH_GSTRING_LEN;

#endif /* LL_EXTENDED_STATS */

#endif /* BP_EXTENDED_STATS */

		}

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

			sprintf(p, "tx_pb_%u_pxon", i);