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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to i40e and i40evf.

Shannon makes minor changes to the AdminQ interface to bring it up to
date.  Removes the hard coding of stats struct size in ethtool, in prep
for adding data fields which are configuration dependent.

Catherine removes some unused and unneeded PCI bus defines.

Jesse fixes the copyright headers and finishes up the removal of the PTP
Tx work functionality which allows us to rely on the Tx timesync interrupt.

Mitch provides a number of fixes and cleanups for i40e/i40evf based on
suggestions from Ben Hutchings.  First is to use a macro parameter for
ethtool stats instead of just assuming that a valid netdev variable
exists.  Second is not to tell ethtool that the VF can do 10GbaseT, when
it really has no idea what its link speed is, so set the supported value
to 0 instead.  Make the ethtool_ops structure constant since it is
extremely unlikely to change at runtime.  Ethtool consistently reports
0 values for our ITR settings because we never actually use them, so
fix this by setting the default values to the specified default values.

Greg avoids a compile error by wrapping the call to i40e_alloc_vfs() in
CONFIG_PCI_IOV because the function itself is wrapped in the same
conditional compile block.

Alexander Gordeev updates the driver to use the new pci_enable_msi_range()
and pci_enable_msix_range() or pci_enable_msi_exact() and
pci_enable_msix_exact().

Jean Sacren provides a fix where the wrong error code was being passed to
i40e_open().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ca8a2263 ce9ccb17

drivers/net/ethernet/intel/i40e/i40e.h

+0 −4
Original line number Diff line number Diff line
@@ -97,10 +97,6 @@ 
#define STRINGIFY(foo)  #foo

#define XSTRINGIFY(bar) STRINGIFY(bar)



#ifndef ARCH_HAS_PREFETCH

#define prefetch(X)

#endif



#define I40E_RX_DESC(R, i)			\

	((ring_is_16byte_desc_enabled(R))	\

		? (union i40e_32byte_rx_desc *)	\

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+26 −37
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
	I40E_PF_STAT("rx_oversize", stats.rx_oversize),

	I40E_PF_STAT("rx_jabber", stats.rx_jabber),

	I40E_PF_STAT("VF_admin_queue_requests", vf_aq_requests),

	I40E_PF_STAT("tx_hwtstamp_timeouts", tx_hwtstamp_timeouts),

	I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),

	/* LPI stats */

	I40E_PF_STAT("tx_lpi_status", stats.tx_lpi_status),
@@ -122,8 +121,9 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
};



#define I40E_QUEUE_STATS_LEN(n) \

  ((((struct i40e_netdev_priv *)netdev_priv((n)))->vsi->num_queue_pairs + \

    ((struct i40e_netdev_priv *)netdev_priv((n)))->vsi->num_queue_pairs) * 2)

	(((struct i40e_netdev_priv *)netdev_priv((n)))->vsi->num_queue_pairs \

	    * 2 /* Tx and Rx together */                                     \

	    * (sizeof(struct i40e_queue_stats) / sizeof(u64)))

#define I40E_GLOBAL_STATS_LEN	ARRAY_SIZE(i40e_gstrings_stats)

#define I40E_NETDEV_STATS_LEN   ARRAY_SIZE(i40e_gstrings_net_stats)

#define I40E_VSI_STATS_LEN(n)   (I40E_NETDEV_STATS_LEN + \
@@ -1009,14 +1009,13 @@ static int i40e_get_coalesce(struct net_device *netdev, 
	ec->rx_max_coalesced_frames_irq = vsi->work_limit;



	if (ITR_IS_DYNAMIC(vsi->rx_itr_setting))

		ec->rx_coalesce_usecs = 1;

	else

		ec->rx_coalesce_usecs = vsi->rx_itr_setting;

		ec->use_adaptive_rx_coalesce = 1;



	if (ITR_IS_DYNAMIC(vsi->tx_itr_setting))

		ec->tx_coalesce_usecs = 1;

	else

		ec->tx_coalesce_usecs = vsi->tx_itr_setting;

		ec->use_adaptive_tx_coalesce = 1;



	ec->rx_coalesce_usecs = vsi->rx_itr_setting & ~I40E_ITR_DYNAMIC;

	ec->tx_coalesce_usecs = vsi->tx_itr_setting & ~I40E_ITR_DYNAMIC;



	return 0;

}
@@ -1035,37 +1034,27 @@ static int i40e_set_coalesce(struct net_device *netdev, 
	if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)

		vsi->work_limit = ec->tx_max_coalesced_frames_irq;



	switch (ec->rx_coalesce_usecs) {

	case 0:

		vsi->rx_itr_setting = 0;

		break;

	case 1:

		vsi->rx_itr_setting = (I40E_ITR_DYNAMIC |

				       ITR_REG_TO_USEC(I40E_ITR_RX_DEF));

		break;

	default:

		if ((ec->rx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||

		    (ec->rx_coalesce_usecs > (I40E_MAX_ITR << 1)))

			return -EINVAL;

	if ((ec->rx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&

	    (ec->rx_coalesce_usecs <= (I40E_MAX_ITR << 1)))

		vsi->rx_itr_setting = ec->rx_coalesce_usecs;

		break;

	}



	switch (ec->tx_coalesce_usecs) {

	case 0:

		vsi->tx_itr_setting = 0;

		break;

	case 1:

		vsi->tx_itr_setting = (I40E_ITR_DYNAMIC |

				       ITR_REG_TO_USEC(I40E_ITR_TX_DEF));

		break;

	default:

		if ((ec->tx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||

		    (ec->tx_coalesce_usecs > (I40E_MAX_ITR << 1)))

	else

		return -EINVAL;



	if ((ec->tx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&

	    (ec->tx_coalesce_usecs <= (I40E_MAX_ITR << 1)))

		vsi->tx_itr_setting = ec->tx_coalesce_usecs;

		break;

	}

	else

		return -EINVAL;



	if (ec->use_adaptive_rx_coalesce)

		vsi->rx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->rx_itr_setting &= ~I40E_ITR_DYNAMIC;



	if (ec->use_adaptive_tx_coalesce)

		vsi->tx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->tx_itr_setting &= ~I40E_ITR_DYNAMIC;



	vector = vsi->base_vector;

	for (i = 0; i < vsi->num_q_vectors; i++, vector++) {

drivers/net/ethernet/intel/i40e/i40e_main.c

+7 −1
Original line number Diff line number Diff line
@@ -4333,7 +4333,7 @@ int i40e_vsi_open(struct i40e_vsi *vsi) 
			 dev_driver_string(&pf->pdev->dev));

		err = i40e_vsi_request_irq(vsi, int_name);

	} else {

		err = EINVAL;

		err = -EINVAL;

		goto err_setup_rx;

	}
@@ -6368,6 +6368,10 @@ static int i40e_sw_init(struct i40e_pf *pf) 
		    I40E_FLAG_MSIX_ENABLED    |

		    I40E_FLAG_RX_1BUF_ENABLED;



	/* Set default ITR */

	pf->rx_itr_default = I40E_ITR_DYNAMIC | I40E_ITR_RX_DEF;

	pf->tx_itr_default = I40E_ITR_DYNAMIC | I40E_ITR_TX_DEF;



	/* Depending on PF configurations, it is possible that the RSS

	 * maximum might end up larger than the available queues

	 */
@@ -8364,6 +8368,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		}

	}



#ifdef CONFIG_PCI_IOV

	/* prep for VF support */

	if ((pf->flags & I40E_FLAG_SRIOV_ENABLED) &&

	    (pf->flags & I40E_FLAG_MSIX_ENABLED) &&
@@ -8386,6 +8391,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
					 err);

		}

	}

#endif /* CONFIG_PCI_IOV */



	pfs_found++;

drivers/net/ethernet/intel/i40e/i40e_ptp.c

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
					I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)

#define I40E_PRTTSYN_CTL1_TSYNTYPE_V2  (0x2 << \

					I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)

#define I40E_PTP_TX_TIMEOUT  (HZ * 15)



/**

 * i40e_ptp_read - Read the PHC time from the device

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 *

 ******************************************************************************/



#include <linux/prefetch.h>

#include "i40e.h"

#include "i40e_prototype.h"