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

Commit 27dff8b2 authored by Todd Fujinaka's avatar Todd Fujinaka Committed by Jeff Kirsher
Browse files

igb: add defaults for i210 TX/RX PBSIZE 



Set the defaults on probe for the packet buffer size registers for the
i210.

Signed-off-by: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3cfcf036

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -329,6 +329,9 @@ 
/* Timestamp in Rx buffer */

/* Timestamp in Rx buffer */

#define E1000_RXPBS_CFG_TS_EN           0x80000000

#define E1000_RXPBS_CFG_TS_EN           0x80000000





#define I210_RXPBSIZE_DEFAULT		0x000000A2 /* RXPBSIZE default */

#define I210_TXPBSIZE_DEFAULT		0x04000014 /* TXPBSIZE default */



/* SerDes Control */

/* SerDes Control */

#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400

#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,10 @@ 
				    : (0x0E038 + ((_n) * 0x40)))

				    : (0x0E038 + ((_n) * 0x40)))

#define E1000_TDWBAH(_n)  ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) \

#define E1000_TDWBAH(_n)  ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) \

				    : (0x0E03C + ((_n) * 0x40)))

				    : (0x0E03C + ((_n) * 0x40)))



#define E1000_RXPBS	0x02404  /* Rx Packet Buffer Size - RW */

#define E1000_TXPBS	0x03404  /* Tx Packet Buffer Size - RW */



#define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */

#define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */

#define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */

#define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */

#define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */

#define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -2433,6 +2433,12 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* get firmware version for ethtool -i */

	/* get firmware version for ethtool -i */

	igb_set_fw_version(adapter);

	igb_set_fw_version(adapter);





	/* configure RXPBSIZE and TXPBSIZE */

	if (hw->mac.type == e1000_i210) {

		wr32(E1000_RXPBS, I210_RXPBSIZE_DEFAULT);

		wr32(E1000_TXPBS, I210_TXPBSIZE_DEFAULT);

	}



	setup_timer(&adapter->watchdog_timer, igb_watchdog,

	setup_timer(&adapter->watchdog_timer, igb_watchdog,

		    (unsigned long) adapter);

		    (unsigned long) adapter);

	setup_timer(&adapter->phy_info_timer, igb_update_phy_info,

	setup_timer(&adapter->phy_info_timer, igb_update_phy_info,