Skip to content

Commit db2d737

Browse files
Sasha Neftinanguy11
authored andcommitted
e1000e: Separate MTP board type from ADP
We have the same LAN controller on different PCH's. Separate MTP board type from an ADP which will allow for specific fixes to be applied for MTP platforms. Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> Tested-by: Naama Meir <naamax.meir@linux.intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent ef2dd61 commit db2d737

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ enum e1000_boards {
116116
board_pch_spt,
117117
board_pch_cnp,
118118
board_pch_tgp,
119-
board_pch_adp
119+
board_pch_adp,
120+
board_pch_mtp
120121
};
121122

122123
struct e1000_ps_page {
@@ -504,6 +505,7 @@ extern const struct e1000_info e1000_pch_spt_info;
504505
extern const struct e1000_info e1000_pch_cnp_info;
505506
extern const struct e1000_info e1000_pch_tgp_info;
506507
extern const struct e1000_info e1000_pch_adp_info;
508+
extern const struct e1000_info e1000_pch_mtp_info;
507509
extern const struct e1000_info e1000_es2_info;
508510

509511
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
@@ -6041,3 +6041,23 @@ const struct e1000_info e1000_pch_adp_info = {
60416041
.phy_ops = &ich8_phy_ops,
60426042
.nvm_ops = &spt_nvm_ops,
60436043
};
6044+
6045+
const struct e1000_info e1000_pch_mtp_info = {
6046+
.mac = e1000_pch_mtp,
6047+
.flags = FLAG_IS_ICH
6048+
| FLAG_HAS_WOL
6049+
| FLAG_HAS_HW_TIMESTAMP
6050+
| FLAG_HAS_CTRLEXT_ON_LOAD
6051+
| FLAG_HAS_AMT
6052+
| FLAG_HAS_FLASH
6053+
| FLAG_HAS_JUMBO_FRAMES
6054+
| FLAG_APME_IN_WUC,
6055+
.flags2 = FLAG2_HAS_PHY_STATS
6056+
| FLAG2_HAS_EEE,
6057+
.pba = 26,
6058+
.max_hw_frame_size = 9022,
6059+
.get_variants = e1000_get_variants_ich8lan,
6060+
.mac_ops = &ich8_mac_ops,
6061+
.phy_ops = &ich8_phy_ops,
6062+
.nvm_ops = &spt_nvm_ops,
6063+
};

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
5353
[board_pch_cnp] = &e1000_pch_cnp_info,
5454
[board_pch_tgp] = &e1000_pch_tgp_info,
5555
[board_pch_adp] = &e1000_pch_adp_info,
56+
[board_pch_mtp] = &e1000_pch_mtp_info,
5657
};
5758

5859
struct e1000_reg_info {
@@ -7905,14 +7906,14 @@ static const struct pci_device_id e1000_pci_tbl[] = {
79057906
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
79067907
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
79077908
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
7908-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_adp },
7909-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_adp },
7910-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_adp },
7911-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_adp },
7912-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_adp },
7913-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_adp },
7914-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_adp },
7915-
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_adp },
7909+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_mtp },
7910+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_mtp },
7911+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_mtp },
7912+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_mtp },
7913+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_mtp },
7914+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_mtp },
7915+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_mtp },
7916+
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_mtp },
79167917

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

0 commit comments

Comments
 (0)