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

Commit d2ba2ed8 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: add support for Intel I350 Gigabit Network Connection 



This patch adds support for the the I350 Gigabit network connection which
is the follow-on part to the 82580.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: James Hearn <james.r.hearn@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52a1dd4d

drivers/net/igb/e1000_82575.c

+11 −2
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
	case E1000_DEV_ID_82580_COPPER_DUAL:

		mac->type = e1000_82580;

		break;

	case E1000_DEV_ID_I350_COPPER:

	case E1000_DEV_ID_I350_FIBER:

	case E1000_DEV_ID_I350_SERDES:

	case E1000_DEV_ID_I350_SGMII:

		mac->type = e1000_i350;

		break;

	default:

		return -E1000_ERR_MAC_INIT;

		break;
@@ -154,8 +160,10 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
		mac->rar_entry_count = E1000_RAR_ENTRIES_82576;

	if (mac->type == e1000_82580)

		mac->rar_entry_count = E1000_RAR_ENTRIES_82580;

	if (mac->type == e1000_i350)

		mac->rar_entry_count = E1000_RAR_ENTRIES_I350;

	/* reset */

	if (mac->type == e1000_82580)

	if (mac->type >= e1000_82580)

		mac->ops.reset_hw = igb_reset_hw_82580;

	else

		mac->ops.reset_hw = igb_reset_hw_82575;
@@ -226,7 +234,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
		phy->ops.reset              = igb_phy_hw_reset_sgmii_82575;

		phy->ops.read_reg           = igb_read_phy_reg_sgmii_82575;

		phy->ops.write_reg          = igb_write_phy_reg_sgmii_82575;

	} else if (hw->mac.type == e1000_82580) {

	} else if (hw->mac.type >= e1000_82580) {

		phy->ops.reset              = igb_phy_hw_reset;

		phy->ops.read_reg           = igb_read_phy_reg_82580;

		phy->ops.write_reg          = igb_write_phy_reg_82580;
@@ -262,6 +270,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
		phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state;

		break;

	case I82580_I_PHY_ID:

	case I350_I_PHY_ID:

		phy->type                   = e1000_phy_82580;

		phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_82580;

		phy->ops.get_cable_length   = igb_get_cable_length_82580;

drivers/net/igb/e1000_82575.h

+4 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw); 
#define E1000_RAR_ENTRIES_82575        16

#define E1000_RAR_ENTRIES_82576        24

#define E1000_RAR_ENTRIES_82580        24

#define E1000_RAR_ENTRIES_I350         32



#define E1000_SW_SYNCH_MB              0x00000100

#define E1000_STAT_DEV_RST_SET         0x00100000

drivers/net/igb/e1000_defines.h

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ 
#define M88E1111_I_PHY_ID    0x01410CC0

#define IGP03E1000_E_PHY_ID  0x02A80390

#define I82580_I_PHY_ID      0x015403A0

#define I350_I_PHY_ID        0x015403B0

#define M88_VENDOR           0x0141



/* M88E1000 Specific Registers */

drivers/net/igb/e1000_hw.h

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ struct e1000_hw; 
#define E1000_DEV_ID_82580_SERDES             0x1510

#define E1000_DEV_ID_82580_SGMII              0x1511

#define E1000_DEV_ID_82580_COPPER_DUAL        0x1516

#define E1000_DEV_ID_I350_COPPER              0x1521

#define E1000_DEV_ID_I350_FIBER               0x1522

#define E1000_DEV_ID_I350_SERDES              0x1523

#define E1000_DEV_ID_I350_SGMII               0x1524



#define E1000_REVISION_2 2

#define E1000_REVISION_4 4
@@ -72,6 +76,7 @@ enum e1000_mac_type { 
	e1000_82575,

	e1000_82576,

	e1000_82580,

	e1000_i350,

	e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */

};

drivers/net/igb/igb_ethtool.c

+50 −0
Original line number Diff line number Diff line
@@ -901,6 +901,49 @@ struct igb_reg_test { 
#define TABLE64_TEST_LO	5

#define TABLE64_TEST_HI	6



/* i350 reg test */

static struct igb_reg_test reg_test_i350[] = {

	{ E1000_FCAL,	   0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_FCAH,	   0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },

	{ E1000_FCT,	   0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },

	{ E1000_VET,	   0x100, 1,  PATTERN_TEST, 0xFFFF0000, 0xFFFF0000 },

	{ E1000_RDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },

	{ E1000_RDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_RDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },

	{ E1000_RDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },

	{ E1000_RDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_RDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },

	/* RDH is read-only for i350, only test RDT. */

	{ E1000_RDT(0),	   0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },

	{ E1000_RDT(4),	   0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },

	{ E1000_FCRTH,	   0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },

	{ E1000_FCTTV,	   0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },

	{ E1000_TIPG,	   0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },

	{ E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },

	{ E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },

	{ E1000_TDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },

	{ E1000_TDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_TDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },

	{ E1000_TDT(0),	   0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },

	{ E1000_TDT(4),	   0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },

	{ E1000_RCTL,	   0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },

	{ E1000_RCTL, 	   0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },

	{ E1000_RCTL, 	   0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },

	{ E1000_TCTL,	   0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },

	{ E1000_RA,	   0, 16, TABLE64_TEST_LO,

						0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_RA,	   0, 16, TABLE64_TEST_HI,

						0xC3FFFFFF, 0xFFFFFFFF },

	{ E1000_RA2,	   0, 16, TABLE64_TEST_LO,

						0xFFFFFFFF, 0xFFFFFFFF },

	{ E1000_RA2,	   0, 16, TABLE64_TEST_HI,

						0xC3FFFFFF, 0xFFFFFFFF },

	{ E1000_MTA,	   0, 128, TABLE32_TEST,

						0xFFFFFFFF, 0xFFFFFFFF },

	{ 0, 0, 0, 0 }

};



/* 82580 reg test */

static struct igb_reg_test reg_test_82580[] = {

	{ E1000_FCAL,	   0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
@@ -1076,6 +1119,10 @@ static int igb_reg_test(struct igb_adapter *adapter, u64 *data) 
	u32 i, toggle;



	switch (adapter->hw.mac.type) {

	case e1000_i350:

		test = reg_test_i350;

		toggle = 0x7FEFF3FF;

		break;

	case e1000_82580:

		test = reg_test_82580;

		toggle = 0x7FEFF3FF;
@@ -1237,6 +1284,9 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) 
	case e1000_82580:

		ics_mask = 0x77DCFED5;

		break;

	case e1000_i350:

		ics_mask = 0x77DCFED5;

		break;

	default:

		ics_mask = 0x7FFFFFFF;

		break;