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

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

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2017-10-09

This series contains updates to ixgbe and arch/Kconfig.

Mark fixes a case where PHY register access is not supported and we were
returning a PHY address, when we should have been returning -EOPNOTSUPP.

Sabrina Dubroca fixes the use of a logical "and" when it should have been
the bitwise "and" operator.

Ding Tianhong reverts the commit that added the Kconfig bool option
ARCH_WANT_RELAX_ORDER, since there is now a new flag
PCI_DEV_FLAGS_NO_RELAXED_ORDERING that has been added to indicate that
Relaxed Ordering Attributes should not be used for Transaction Layer
Packets.  Then follows up with making the needed changes to ixgbe to
use the new PCI_DEV_FLAGS_NO_RELAXED_ORDERING flag.

John Fastabend fixes an issue in the ring accounting when the transmit
ring parameters are changed via ethtool when an XDP program is attached.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 996b44fc 8e679021

arch/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -937,9 +937,6 @@ config STRICT_MODULE_RWX 
	  and non-text memory will be made non-executable. This provides

	  protection against certain security exploits (e.g. writing to text)



config ARCH_WANT_RELAX_ORDER

	bool



config ARCH_HAS_REFCOUNT

	bool

	help

arch/sparc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ config SPARC 
	select ARCH_HAS_SG_CHAIN

	select CPU_NO_EFFICIENT_FFS

	select LOCKDEP_SMALL if LOCKDEP

	select ARCH_WANT_RELAX_ORDER



config SPARC32

	def_bool !64BIT

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

+0 −22
Original line number Diff line number Diff line
@@ -175,31 +175,9 @@ static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw) 
 **/

static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw)

{

#ifndef CONFIG_SPARC

	u32 regval;

	u32 i;

#endif

	s32 ret_val;



	ret_val = ixgbe_start_hw_generic(hw);



#ifndef CONFIG_SPARC

	/* Disable relaxed ordering */

	for (i = 0; ((i < hw->mac.max_tx_queues) &&

	     (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {

		regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));

		regval &= ~IXGBE_DCA_TXCTRL_DESC_WRO_EN;

		IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), regval);

	}



	for (i = 0; ((i < hw->mac.max_rx_queues) &&

	     (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {

		regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));

		regval &= ~(IXGBE_DCA_RXCTRL_DATA_WRO_EN |

			    IXGBE_DCA_RXCTRL_HEAD_WRO_EN);

		IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);

	}

#endif

	if (ret_val)

		return ret_val;

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

+0 −19
Original line number Diff line number Diff line
@@ -366,25 +366,6 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw) 
	}

	IXGBE_WRITE_FLUSH(hw);



#ifndef CONFIG_ARCH_WANT_RELAX_ORDER

	/* Disable relaxed ordering */

	for (i = 0; i < hw->mac.max_tx_queues; i++) {

		u32 regval;



		regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(i));

		regval &= ~IXGBE_DCA_TXCTRL_DESC_WRO_EN;

		IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(i), regval);

	}



	for (i = 0; i < hw->mac.max_rx_queues; i++) {

		u32 regval;



		regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));

		regval &= ~(IXGBE_DCA_RXCTRL_DATA_WRO_EN |

			    IXGBE_DCA_RXCTRL_HEAD_WRO_EN);

		IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);

	}

#endif

	return 0;

}

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

+8 −8
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_ring *temp_ring;

	int i, err = 0;

	int i, j, err = 0;

	u32 new_rx_count, new_tx_count;



	if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
@@ -1085,8 +1085,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
	}



	/* allocate temporary buffer to store rings in */

	i = max_t(int, adapter->num_tx_queues, adapter->num_rx_queues);

	i = max_t(int, i, adapter->num_xdp_queues);

	i = max_t(int, adapter->num_tx_queues + adapter->num_xdp_queues,

		  adapter->num_rx_queues);

	temp_ring = vmalloc(i * sizeof(struct ixgbe_ring));



	if (!temp_ring) {
@@ -1118,8 +1118,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			}

		}



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

			memcpy(&temp_ring[i], adapter->xdp_ring[i],

		for (j = 0; j < adapter->num_xdp_queues; j++, i++) {

			memcpy(&temp_ring[i], adapter->xdp_ring[j],

			       sizeof(struct ixgbe_ring));



			temp_ring[i].count = new_tx_count;
@@ -1139,10 +1139,10 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			memcpy(adapter->tx_ring[i], &temp_ring[i],

			       sizeof(struct ixgbe_ring));

		}

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

			ixgbe_free_tx_resources(adapter->xdp_ring[i]);

		for (j = 0; j < adapter->num_xdp_queues; j++, i++) {

			ixgbe_free_tx_resources(adapter->xdp_ring[j]);



			memcpy(adapter->xdp_ring[i], &temp_ring[i],

			memcpy(adapter->xdp_ring[j], &temp_ring[i],

			       sizeof(struct ixgbe_ring));

		}