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

Commit 258152ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (38 commits)
  ip_gre: include route header_len in max_headroom calculation
  if_tunnel.h: add missing ams/byteorder.h include
  ipv4: Don't drop redirected route cache entry unless PTMU actually expired
  net: suppress lockdep-RCU false positive in FIB trie.
  Bluetooth: Fix kernel crash on L2CAP stress tests
  Bluetooth: Convert debug files to actually use debugfs instead of sysfs
  Bluetooth: Fix potential bad memory access with sysfs files
  netfilter: ctnetlink: fix reliable event delivery if message building fails
  netlink: fix NETLINK_RECV_NO_ENOBUFS in netlink_set_err()
  NET_DMA: free skbs periodically
  netlink: fix unaligned access in nla_get_be64()
  tcp: Fix tcp_mark_head_lost() with packets == 0
  net: ipmr/ip6mr: fix potential out-of-bounds vif_table access
  KS8695: update ksp->next_rx_desc_read at the end of rx loop
  igb: Add support for 82576 ET2 Quad Port Server Adapter
  ixgbevf: Message formatting cleanups
  ixgbevf: Shorten up delay timer for watchdog task
  ixgbevf: Fix VF Stats accounting after reset
  ixgbe: Set IXGBE_RSC_CB(skb)->DMA field to zero after unmapping the address
  ixgbe: fix for real_num_tx_queues update issue
  ...
parents e9192415 243aad83

drivers/net/arm/ks8695net.c

+9 −15
Original line number Diff line number Diff line
@@ -451,9 +451,8 @@ ks8695_rx_irq(int irq, void *dev_id) 
/**

 *	ks8695_rx - Receive packets called by NAPI poll method

 *	@ksp: Private data for the KS8695 Ethernet

 *	@budget: The max packets would be receive

 *	@budget: Number of packets allowed to process

 */



static int ks8695_rx(struct ks8695_priv *ksp, int budget)

{

	struct net_device *ndev = ksp->ndev;
@@ -461,7 +460,6 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget) 
	int buff_n;

	u32 flags;

	int pktlen;

	int last_rx_processed = -1;

	int received = 0;



	buff_n = ksp->next_rx_desc_read;
@@ -471,6 +469,7 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget) 
					cpu_to_le32(RDES_OWN)))) {

			rmb();

			flags = le32_to_cpu(ksp->rx_ring[buff_n].status);



			/* Found an SKB which we own, this means we

			 * received a packet

			 */
@@ -533,23 +532,18 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget) 
			ksp->rx_ring[buff_n].status = cpu_to_le32(RDES_OWN);

rx_finished:

			received++;

			/* And note this as processed so we can start

			 * from here next time

			 */

			last_rx_processed = buff_n;

			buff_n = (buff_n + 1) & MAX_RX_DESC_MASK;

			/*And note which RX descriptor we last did */

			if (likely(last_rx_processed != -1))

				ksp->next_rx_desc_read =

					(last_rx_processed + 1) &

					MAX_RX_DESC_MASK;

	}



	/* And note which RX descriptor we last did */

	ksp->next_rx_desc_read = buff_n;



	/* And refill the buffers */

	ks8695_refill_rxbuffers(ksp);



	/* Kick the RX DMA engine, in case it became

	 *  suspended */

	/* Kick the RX DMA engine, in case it became suspended */

	ks8695_writereg(ksp, KS8695_DRSC, 0);



	return received;

}

drivers/net/igb/e1000_82575.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
	case E1000_DEV_ID_82576_FIBER:

	case E1000_DEV_ID_82576_SERDES:

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

	case E1000_DEV_ID_82576_SERDES_QUAD:

		mac->type = e1000_82576;

		break;

drivers/net/igb/e1000_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct e1000_hw; 
#define E1000_DEV_ID_82576_FIBER              0x10E6

#define E1000_DEV_ID_82576_SERDES             0x10E7

#define E1000_DEV_ID_82576_QUAD_COPPER        0x10E8

#define E1000_DEV_ID_82576_QUAD_COPPER_ET2    0x1526

#define E1000_DEV_ID_82576_NS                 0x150A

#define E1000_DEV_ID_82576_NS_SERDES          0x1518

#define E1000_DEV_ID_82576_SERDES_QUAD        0x150D

drivers/net/igb/igb_main.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { 
	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },

drivers/net/ixgbe/ixgbe_82599.c

+42 −36
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define IXGBE_82599_MC_TBL_SIZE   128

#define IXGBE_82599_VFT_TBL_SIZE  128



void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

                                          ixgbe_link_speed speed,

                                          bool autoneg,
@@ -68,7 +69,9 @@ static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw) 
	if (hw->phy.multispeed_fiber) {

		/* Set up dual speed SFP+ support */

		mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber;

		mac->ops.flap_tx_laser = &ixgbe_flap_tx_laser_multispeed_fiber;

	} else {

		mac->ops.flap_tx_laser = NULL;

		if ((mac->ops.get_media_type(hw) ==

		     ixgbe_media_type_backplane) &&

		    (hw->phy.smart_speed == ixgbe_smart_speed_auto ||
@@ -412,6 +415,41 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, 
	return status;

}



/**

 *  ixgbe_flap_tx_laser_multispeed_fiber - Flap Tx laser

 *  @hw: pointer to hardware structure

 *

 *  When the driver changes the link speeds that it can support,

 *  it sets autotry_restart to true to indicate that we need to

 *  initiate a new autotry session with the link partner.  To do

 *  so, we set the speed then disable and re-enable the tx laser, to

 *  alert the link partner that it also needs to restart autotry on its

 *  end.  This is consistent with true clause 37 autoneg, which also

 *  involves a loss of signal.

 **/

void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

{

	u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);



	hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n");



	if (hw->mac.autotry_restart) {

		/* Disable tx laser; allow 100us to go dark per spec */

		esdp_reg |= IXGBE_ESDP_SDP3;

		IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

		IXGBE_WRITE_FLUSH(hw);

		udelay(100);



		/* Enable tx laser; allow 100ms to light up */

		esdp_reg &= ~IXGBE_ESDP_SDP3;

		IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

		IXGBE_WRITE_FLUSH(hw);

		msleep(100);



		hw->mac.autotry_restart = false;

	}

}



/**

 *  ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed

 *  @hw: pointer to hardware structure
@@ -439,16 +477,6 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
	hw->mac.ops.get_link_capabilities(hw, &phy_link_speed, &negotiation);

	speed &= phy_link_speed;



	/*

	 * When the driver changes the link speeds that it can support,

	 * it sets autotry_restart to true to indicate that we need to

	 * initiate a new autotry session with the link partner.  To do

	 * so, we set the speed then disable and re-enable the tx laser, to

	 * alert the link partner that it also needs to restart autotry on its

	 * end.  This is consistent with true clause 37 autoneg, which also

	 * involves a loss of signal.

	 */



	/*

	 * Try each speed one by one, highest priority first.  We do this in

	 * software because 10gb fiber doesn't support speed autonegotiation.
@@ -466,6 +494,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
		/* Set the module link speed */

		esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);

		IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

		IXGBE_WRITE_FLUSH(hw);



		/* Allow module to change analog characteristics (1G->10G) */

		msleep(40);
@@ -478,19 +507,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
			return status;



		/* Flap the tx laser if it has not already been done */

		if (hw->mac.autotry_restart) {

			/* Disable tx laser; allow 100us to go dark per spec */

			esdp_reg |= IXGBE_ESDP_SDP3;

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			udelay(100);



			/* Enable tx laser; allow 2ms to light up per spec */

			esdp_reg &= ~IXGBE_ESDP_SDP3;

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			msleep(2);



			hw->mac.autotry_restart = false;

		}

		hw->mac.ops.flap_tx_laser(hw);



		/*

		 * Wait for the controller to acquire link.  Per IEEE 802.3ap,
@@ -525,6 +542,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
		esdp_reg &= ~IXGBE_ESDP_SDP5;

		esdp_reg |= IXGBE_ESDP_SDP5_DIR;

		IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

		IXGBE_WRITE_FLUSH(hw);



		/* Allow module to change analog characteristics (10G->1G) */

		msleep(40);
@@ -537,19 +555,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 
			return status;



		/* Flap the tx laser if it has not already been done */

		if (hw->mac.autotry_restart) {

			/* Disable tx laser; allow 100us to go dark per spec */

			esdp_reg |= IXGBE_ESDP_SDP3;

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			udelay(100);



			/* Enable tx laser; allow 2ms to light up per spec */

			esdp_reg &= ~IXGBE_ESDP_SDP3;

			IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);

			msleep(2);



			hw->mac.autotry_restart = false;

		}

		hw->mac.ops.flap_tx_laser(hw);



		/* Wait for the link partner to also set speed */

		msleep(100);