Skip to content

Commit 68defd5

Browse files
Sasha Neftinanguy11
Sasha Neftin
authored and
anguy11
committed
e1000e: Separate ADP board type from TGP
We have the same LAN controller on different PCH's. Separate ADP board type from a TGP which will allow for specific fixes to be applied for ADP platforms. Suggested-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Suggested-by: Dima Ruinskiy <dima.ruinskiy@intel.com> Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 881cc73 commit 68defd5

3 files changed

Lines changed: 40 additions & 17 deletions

File tree

‎drivers/net/ethernet/intel/e1000e/e1000.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ enum e1000_boards {
115115
board_pch_lpt,
116116
board_pch_spt,
117117
board_pch_cnp,
118-
board_pch_tgp
118+
board_pch_tgp,
119+
board_pch_adp
119120
};
120121

121122
struct e1000_ps_page {
@@ -502,6 +503,7 @@ extern const struct e1000_info e1000_pch_lpt_info;
502503
extern const struct e1000_info e1000_pch_spt_info;
503504
extern const struct e1000_info e1000_pch_cnp_info;
504505
extern const struct e1000_info e1000_pch_tgp_info;
506+
extern const struct e1000_info e1000_pch_adp_info;
505507
extern const struct e1000_info e1000_es2_info;
506508

507509
void e1000e_ptp_init(struct e1000_adapter *adapter);

‎drivers/net/ethernet/intel/e1000e/ich8lan.c‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6021,3 +6021,23 @@ const struct e1000_info e1000_pch_tgp_info = {
60216021
.phy_ops = &ich8_phy_ops,
60226022
.nvm_ops = &spt_nvm_ops,
60236023
};
6024+
6025+
const struct e1000_info e1000_pch_adp_info = {
6026+
.mac = e1000_pch_adp,
6027+
.flags = FLAG_IS_ICH
6028+
| FLAG_HAS_WOL
6029+
| FLAG_HAS_HW_TIMESTAMP
6030+
| FLAG_HAS_CTRLEXT_ON_LOAD
6031+
| FLAG_HAS_AMT
6032+
| FLAG_HAS_FLASH
6033+
| FLAG_HAS_JUMBO_FRAMES
6034+
| FLAG_APME_IN_WUC,
6035+
.flags2 = FLAG2_HAS_PHY_STATS
6036+
| FLAG2_HAS_EEE,
6037+
.pba = 26,
6038+
.max_hw_frame_size = 9022,
6039+
.get_variants = e1000_get_variants_ich8lan,
6040+
.mac_ops = &ich8_mac_ops,
6041+
.phy_ops = &ich8_phy_ops,
6042+
.nvm_ops = &spt_nvm_ops,
6043+
};

‎drivers/net/ethernet/intel/e1000e/netdev.c‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
5252
[board_pch_spt] = &e1000_pch_spt_info,
5353
[board_pch_cnp] = &e1000_pch_cnp_info,
5454
[board_pch_tgp] = &e1000_pch_tgp_info,
55+
[board_pch_adp] = &e1000_pch_adp_info,
5556
};
5657

5758
struct e1000_reg_info {
@@ -7898,22 +7899,22 @@ static const struct pci_device_id e1000_pci_tbl[] = {
78987899
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp },
78997900
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp },
79007901
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp },
7901-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_tgp },
7902-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_tgp },
7903-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_tgp },
7904-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_tgp },
7905-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_tgp },
7906-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_tgp },
7907-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_tgp },
7908-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_tgp },
7909-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_tgp },
7910-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_tgp },
7911-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_tgp },
7912-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_tgp },
7913-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_tgp },
7914-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_tgp },
7915-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_tgp },
7916-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_tgp },
7902+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_adp },
7903+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_adp },
7904+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_adp },
7905+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_adp },
7906+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_adp },
7907+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
7908+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
7909+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
7910+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_adp },
7911+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_adp },
7912+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_adp },
7913+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_adp },
7914+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_adp },
7915+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_adp },
7916+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_adp },
7917+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_adp },
79177918

79187919
{ 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
79197920
};

0 commit comments

Comments
 (0)