From: Wenzhuo Lu <wenzhuo.lu@intel.com>
To: dev@dpdk.org
Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
Subject: [PATCH 14/16] e1000/base: support more i219 devices
Date: Wed, 23 Nov 2016 12:22:58 -0500 [thread overview]
Message-ID: <1479921780-9813-15-git-send-email-wenzhuo.lu@intel.com> (raw)
In-Reply-To: <1479921780-9813-1-git-send-email-wenzhuo.lu@intel.com>
Add the support of more new i219 devices.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/e1000/base/e1000_api.c | 7 +++++++
drivers/net/e1000/base/e1000_hw.h | 5 +++++
drivers/net/e1000/base/e1000_ich8lan.c | 7 +++++++
3 files changed, 19 insertions(+)
diff --git a/drivers/net/e1000/base/e1000_api.c b/drivers/net/e1000/base/e1000_api.c
index 2abe8db..f7cf83b 100644
--- a/drivers/net/e1000/base/e1000_api.c
+++ b/drivers/net/e1000/base/e1000_api.c
@@ -309,6 +309,12 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
case E1000_DEV_ID_PCH_SPT_I219_V5:
mac->type = e1000_pch_spt;
break;
+ case E1000_DEV_ID_PCH_CNP_I219_LM6:
+ case E1000_DEV_ID_PCH_CNP_I219_V6:
+ case E1000_DEV_ID_PCH_CNP_I219_LM7:
+ case E1000_DEV_ID_PCH_CNP_I219_V7:
+ mac->type = e1000_pch_cnp;
+ break;
case E1000_DEV_ID_82575EB_COPPER:
case E1000_DEV_ID_82575EB_FIBER_SERDES:
case E1000_DEV_ID_82575GB_QUAD_COPPER:
@@ -460,6 +466,7 @@ s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device)
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
e1000_init_function_pointers_ich8lan(hw);
break;
case e1000_82575:
diff --git a/drivers/net/e1000/base/e1000_hw.h b/drivers/net/e1000/base/e1000_hw.h
index 39a2a41..d9de9fc 100644
--- a/drivers/net/e1000/base/e1000_hw.h
+++ b/drivers/net/e1000/base/e1000_hw.h
@@ -145,6 +145,10 @@ struct e1000_hw;
#define E1000_DEV_ID_PCH_SPT_I219_V4 0x15D8
#define E1000_DEV_ID_PCH_SPT_I219_LM5 0x15E3
#define E1000_DEV_ID_PCH_SPT_I219_V5 0x15D6
+#define E1000_DEV_ID_PCH_CNP_I219_LM6 0x15BD
+#define E1000_DEV_ID_PCH_CNP_I219_V6 0x15BE
+#define E1000_DEV_ID_PCH_CNP_I219_LM7 0x15BB
+#define E1000_DEV_ID_PCH_CNP_I219_V7 0x15BC
#define E1000_DEV_ID_82576 0x10C9
#define E1000_DEV_ID_82576_FIBER 0x10E6
#define E1000_DEV_ID_82576_SERDES 0x10E7
@@ -231,6 +235,7 @@ enum e1000_mac_type {
e1000_pch2lan,
e1000_pch_lpt,
e1000_pch_spt,
+ e1000_pch_cnp,
e1000_82575,
e1000_82576,
e1000_82580,
diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/e1000/base/e1000_ich8lan.c
index 92d92c8..6dd046d 100644
--- a/drivers/net/e1000/base/e1000_ich8lan.c
+++ b/drivers/net/e1000/base/e1000_ich8lan.c
@@ -346,6 +346,7 @@ STATIC s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
switch (hw->mac.type) {
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
if (e1000_phy_is_accessible_pchlan(hw))
break;
@@ -494,6 +495,7 @@ STATIC s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
/* In case the PHY needs to be in mdio slow mode,
* set slow mode and try to get the PHY id again.
*/
@@ -798,6 +800,7 @@ STATIC s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
/* fall-through */
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
#ifndef NO_NON_BLOCKING_PHY_MTA_UPDATE_SUPPORT
/* multicast address update for pch2 */
mac->ops.update_mc_addr_list =
@@ -1788,6 +1791,7 @@ void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw)
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
hw->phy.ops.init_params = e1000_init_phy_params_pchlan;
break;
default:
@@ -2254,6 +2258,7 @@ STATIC s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
break;
default:
@@ -3378,6 +3383,7 @@ STATIC s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
switch (hw->mac.type) {
case e1000_pch_spt:
+ case e1000_pch_cnp:
bank1_offset = nvm->flash_bank_size;
act_offset = E1000_ICH_NVM_SIG_WORD;
@@ -4353,6 +4359,7 @@ STATIC s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
switch (hw->mac.type) {
case e1000_pch_lpt:
case e1000_pch_spt:
+ case e1000_pch_cnp:
word = NVM_COMPAT;
valid_csum_mask = NVM_COMPAT_VALID_CSUM;
break;
--
1.9.3
next prev parent reply other threads:[~2016-11-24 1:32 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 17:22 [PATCH 00/16] e1000 base code update Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 01/16] e1000/base: increased ULP timer Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 02/16] e1000/base: increase PHY PLL clock gate timing Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 03/16] e1000/base: try more times to get HW mailbox lock Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 04/16] e1000/base: add getting HW version support for i354 Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 05/16] e1000/base: expose e1000_write_vfta_i350 Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 06/16] e1000/base: add max RX jumbo frame define Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 07/16] e1000/base: restore link speed after ULP exit Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 08/16] e1000/base: clear ULP configuration register on " Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 09/16] e1000/base: increase LANPHYPC low duration Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 10/16] e1000/base: workaround for ULP entry flow Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 11/16] e1000/base: enable new i219 devices Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 12/16] e1000/base: always request clock during K1 at 1G link speed Wenzhuo Lu
2016-11-23 17:22 ` [PATCH 13/16] e1000/base: ability to force K1-off disabled Wenzhuo Lu
2016-11-23 17:22 ` Wenzhuo Lu [this message]
2016-11-23 17:22 ` [PATCH 15/16] e1000/base: update readme Wenzhuo Lu
2016-11-23 17:23 ` [PATCH 16/16] e1000: add new i219 devices Wenzhuo Lu
2016-11-25 12:54 ` [PATCH 00/16] e1000 base code update Ferruh Yigit
2016-11-28 1:15 ` Lu, Wenzhuo
2016-11-25 12:58 ` Ferruh Yigit
2016-11-28 1:16 ` Lu, Wenzhuo
2016-11-28 11:33 ` Thomas Monjalon
2016-11-29 0:30 ` Lu, Wenzhuo
2016-11-29 9:28 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479921780-9813-15-git-send-email-wenzhuo.lu@intel.com \
--to=wenzhuo.lu@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.