| Message ID | 20200119115713.12710-1-sasha.neftin@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | [v3] e1000e: Add support for Alder Lake | expand |
Dear Sasha, Am 19.01.20 um 12:57 schrieb Sasha Neftin: > Add devices ID's for the next LOM generations that will be > available on the next Intel Client platform (Alder Lake) > This patch provides the initial support for these devices > > v1->v2: > Address community comments > v2->v3: > Fix minor typo … and back out fall-through change (no need for v4) > Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> Kind regards, Paul
On 1/19/2020 15:23, Paul Menzel wrote: > Dear Sasha, > > > Am 19.01.20 um 12:57 schrieb Sasha Neftin: >> Add devices ID's for the next LOM generations that will be >> available on the next Intel Client platform (Alder Lake) >> This patch provides the initial support for these devices >> >> v1->v2: >> Address community comments >> v2->v3: >> Fix minor typo > > … and back out fall-through change (no need for v4) > "fall through" statements not related to this patch. >> Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> > > Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> > > > Kind regards, > > Paul
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Sasha Neftin > Sent: Sunday, January 19, 2020 3:57 AM > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [PATCH v3] e1000e: Add support for Alder Lake > > Add devices ID's for the next LOM generations that will be > available on the next Intel Client platform (Alder Lake) > This patch provides the initial support for these devices > > v1->v2: > Address community comments > v2->v3: > Fix minor typo > > Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> > --- > drivers/net/ethernet/intel/e1000e/ethtool.c | 2 ++ > drivers/net/ethernet/intel/e1000e/hw.h | 5 +++++ > drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 +++++++ > drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++ > drivers/net/ethernet/intel/e1000e/ptp.c | 1 + > 5 files changed, 21 insertions(+) > > diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c > b/drivers/net/ethernet/intel/e1000e/ethtool.c > index adce7e319b9e..9e7881db7859 100644 > --- a/drivers/net/ethernet/intel/e1000e/ethtool.c > +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c > @@ -897,6 +897,7 @@ static int e1000_reg_test(struct e1000_adapter > *adapter, u64 *data) > case e1000_pch_cnp: > /* fall through */ > case e1000_pch_tgp: > + case e1000_pch_adp: > mask |= BIT(18); > break; > default: > @@ -1561,6 +1562,7 @@ static void e1000_loopback_cleanup(struct > e1000_adapter *adapter) > case e1000_pch_spt: > case e1000_pch_cnp: > case e1000_pch_tgp: > + case e1000_pch_adp: > fext_nvm11 = er32(FEXTNVM11); > fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX; > ew32(FEXTNVM11, fext_nvm11); > diff --git a/drivers/net/ethernet/intel/e1000e/hw.h > b/drivers/net/ethernet/intel/e1000e/hw.h > index f556163481cb..a1dbf8df1c70 100644 > --- a/drivers/net/ethernet/intel/e1000e/hw.h > +++ b/drivers/net/ethernet/intel/e1000e/hw.h > @@ -97,6 +97,10 @@ struct e1000_hw; > #define E1000_DEV_ID_PCH_TGP_I219_LM14 0x15F9 > #define E1000_DEV_ID_PCH_TGP_I219_V14 0x15FA > #define E1000_DEV_ID_PCH_TGP_I219_LM15 0x15F4 > +#define E1000_DEV_ID_PCH_ADP_1219_LM16 0x1A1E > +#define E1000_DEV_ID_PCH_ADP_1219_V16 0x1A1F > +#define E1000_DEV_ID_PCH_ADP_1219_LM17 0x1A1C > +#define E1000_DEV_ID_PCH_ADP_1219_V17 0x1A1D Something seems to be missing. After building and booting to the kernel with this patch included I do not see the a 1a1e, 1a1f, 1a1c or 1a1d device from modinfo: u1519:[1]/usr/src/kernels/next-queue> modinfo igc|grep -i 1a1 u1519:[1]/usr/src/kernels/next-queue>
On 1/25/2020 04:50, Brown, Aaron F wrote: >> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of >> Sasha Neftin >> Sent: Sunday, January 19, 2020 3:57 AM >> To: intel-wired-lan@lists.osuosl.org >> Subject: [Intel-wired-lan] [PATCH v3] e1000e: Add support for Alder Lake >> >> Add devices ID's for the next LOM generations that will be >> available on the next Intel Client platform (Alder Lake) >> This patch provides the initial support for these devices >> >> v1->v2: >> Address community comments >> v2->v3: >> Fix minor typo >> >> Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> >> --- >> drivers/net/ethernet/intel/e1000e/ethtool.c | 2 ++ >> drivers/net/ethernet/intel/e1000e/hw.h | 5 +++++ >> drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 +++++++ >> drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++ >> drivers/net/ethernet/intel/e1000e/ptp.c | 1 + >> 5 files changed, 21 insertions(+) >> >> diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c >> b/drivers/net/ethernet/intel/e1000e/ethtool.c >> index adce7e319b9e..9e7881db7859 100644 >> --- a/drivers/net/ethernet/intel/e1000e/ethtool.c >> +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c >> @@ -897,6 +897,7 @@ static int e1000_reg_test(struct e1000_adapter >> *adapter, u64 *data) >> case e1000_pch_cnp: >> /* fall through */ >> case e1000_pch_tgp: >> + case e1000_pch_adp: >> mask |= BIT(18); >> break; >> default: >> @@ -1561,6 +1562,7 @@ static void e1000_loopback_cleanup(struct >> e1000_adapter *adapter) >> case e1000_pch_spt: >> case e1000_pch_cnp: >> case e1000_pch_tgp: >> + case e1000_pch_adp: >> fext_nvm11 = er32(FEXTNVM11); >> fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX; >> ew32(FEXTNVM11, fext_nvm11); >> diff --git a/drivers/net/ethernet/intel/e1000e/hw.h >> b/drivers/net/ethernet/intel/e1000e/hw.h >> index f556163481cb..a1dbf8df1c70 100644 >> --- a/drivers/net/ethernet/intel/e1000e/hw.h >> +++ b/drivers/net/ethernet/intel/e1000e/hw.h >> @@ -97,6 +97,10 @@ struct e1000_hw; >> #define E1000_DEV_ID_PCH_TGP_I219_LM14 0x15F9 >> #define E1000_DEV_ID_PCH_TGP_I219_V14 0x15FA >> #define E1000_DEV_ID_PCH_TGP_I219_LM15 0x15F4 >> +#define E1000_DEV_ID_PCH_ADP_1219_LM16 0x1A1E >> +#define E1000_DEV_ID_PCH_ADP_1219_V16 0x1A1F >> +#define E1000_DEV_ID_PCH_ADP_1219_LM17 0x1A1C >> +#define E1000_DEV_ID_PCH_ADP_1219_V17 0x1A1D > > Something seems to be missing. After building and booting to the kernel with this patch included I do not see the a 1a1e, 1a1f, 1a1c or 1a1d device from modinfo: > u1519:[1]/usr/src/kernels/next-queue> modinfo igc|grep -i 1a1 > u1519:[1]/usr/src/kernels/next-queue> > you might run run modinfo e1000e | grep -i 0x1a1*
> From: Neftin, Sasha <sasha.neftin@intel.com> > Sent: Saturday, January 25, 2020 11:51 PM > To: Brown, Aaron F <aaron.f.brown@intel.com>; intel-wired- > lan@lists.osuosl.org > Subject: Re: [Intel-wired-lan] [PATCH v3] e1000e: Add support for Alder Lake > > On 1/25/2020 04:50, Brown, Aaron F wrote: > >> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf > Of > >> Sasha Neftin > >> Sent: Sunday, January 19, 2020 3:57 AM > >> To: intel-wired-lan@lists.osuosl.org > >> Subject: [Intel-wired-lan] [PATCH v3] e1000e: Add support for Alder Lake > >> > >> Add devices ID's for the next LOM generations that will be > >> available on the next Intel Client platform (Alder Lake) > >> This patch provides the initial support for these devices > >> > >> v1->v2: > >> Address community comments > >> v2->v3: > >> Fix minor typo > >> > >> Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> > >> --- > >> drivers/net/ethernet/intel/e1000e/ethtool.c | 2 ++ > >> drivers/net/ethernet/intel/e1000e/hw.h | 5 +++++ > >> drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 +++++++ > >> drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++ > >> drivers/net/ethernet/intel/e1000e/ptp.c | 1 + > >> 5 files changed, 21 insertions(+) > >> Tested-by: Aaron Brown <aaron.f.brown@intel.com> > >> <snip> ... > > Something seems to be missing. After building and booting to the kernel > with this patch included I do not see the a 1a1e, 1a1f, 1a1c or 1a1d device > from modinfo: > > u1519:[1]/usr/src/kernels/next-queue> modinfo igc|grep -i 1a1 > > u1519:[1]/usr/src/kernels/next-queue> > > > you might run run modinfo e1000e | grep -i 0x1a1* Yes of course, thanks. End of a long week ://) u1459:[1]/usr/src/kernels/next-queue> modinfo e1000e | grep -i 1a1 alias: pci:v00008086d00001A1Dsv*sd*bc*sc*i* alias: pci:v00008086d00001A1Csv*sd*bc*sc*i* alias: pci:v00008086d00001A1Fsv*sd*bc*sc*i* alias: pci:v00008086d00001A1Esv*sd*bc*sc*i* u1459:[1]/usr/src/kernels/next-queue>
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index adce7e319b9e..9e7881db7859 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -897,6 +897,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) case e1000_pch_cnp: /* fall through */ case e1000_pch_tgp: + case e1000_pch_adp: mask |= BIT(18); break; default: @@ -1561,6 +1562,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: fext_nvm11 = er32(FEXTNVM11); fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX; ew32(FEXTNVM11, fext_nvm11); diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h index f556163481cb..a1dbf8df1c70 100644 --- a/drivers/net/ethernet/intel/e1000e/hw.h +++ b/drivers/net/ethernet/intel/e1000e/hw.h @@ -97,6 +97,10 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_TGP_I219_LM14 0x15F9 #define E1000_DEV_ID_PCH_TGP_I219_V14 0x15FA #define E1000_DEV_ID_PCH_TGP_I219_LM15 0x15F4 +#define E1000_DEV_ID_PCH_ADP_1219_LM16 0x1A1E +#define E1000_DEV_ID_PCH_ADP_1219_V16 0x1A1F +#define E1000_DEV_ID_PCH_ADP_1219_LM17 0x1A1C +#define E1000_DEV_ID_PCH_ADP_1219_V17 0x1A1D #define E1000_REVISION_4 4 @@ -121,6 +125,7 @@ enum e1000_mac_type { e1000_pch_spt, e1000_pch_cnp, e1000_pch_tgp, + e1000_pch_adp, }; enum e1000_media_type { diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index b4135c50e905..735bf25952fc 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -317,6 +317,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: if (e1000_phy_is_accessible_pchlan(hw)) break; @@ -460,6 +461,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: /* In case the PHY needs to be in mdio slow mode, * set slow mode and try to get the PHY id again. */ @@ -703,6 +705,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: case e1000_pchlan: /* check management mode */ mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan; @@ -1642,6 +1645,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: rc = e1000_init_phy_params_pchlan(hw); break; default: @@ -2095,6 +2099,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M; break; default: @@ -3133,6 +3138,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: bank1_offset = nvm->flash_bank_size; act_offset = E1000_ICH_NVM_SIG_WORD; @@ -4077,6 +4083,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw) case e1000_pch_spt: case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: word = NVM_COMPAT; valid_csum_mask = NVM_COMPAT_VALID_CSUM; break; diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 60df6f2663c0..bf9de9af1b10 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -3539,6 +3539,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) break; case e1000_pch_cnp: case e1000_pch_tgp: + case e1000_pch_adp: if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) { /* Stable 24MHz frequency */ incperiod = INCPERIOD_24MHZ; @@ -4052,6 +4053,7 @@ void e1000e_reset(struct e1000_adapter *adapter) case e1000_pch_cnp: /* fall-through */ case e1000_pch_tgp: + case e1000_pch_adp: fc->refresh_time = 0xFFFF; fc->pause_time = 0xFFFF; @@ -7764,6 +7766,10 @@ static const struct pci_device_id e1000_pci_tbl[] = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14), board_pch_cnp }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_cnp }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_cnp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_LM16), board_pch_cnp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_V16), board_pch_cnp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_LM17), board_pch_cnp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_V17), board_pch_cnp }, { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ }; diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c index eaa5a0fb99f0..439fda2f5368 100644 --- a/drivers/net/ethernet/intel/e1000e/ptp.c +++ b/drivers/net/ethernet/intel/e1000e/ptp.c @@ -297,6 +297,7 @@ void e1000e_ptp_init(struct e1000_adapter *adapter) case e1000_pch_cnp: /* fall-through */ case e1000_pch_tgp: + case e1000_pch_adp: if ((hw->mac.type < e1000_pch_lpt) || (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) { adapter->ptp_clock_info.max_adj = 24000000 - 1;
Add devices ID's for the next LOM generations that will be available on the next Intel Client platform (Alder Lake) This patch provides the initial support for these devices v1->v2: Address community comments v2->v3: Fix minor typo Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> --- drivers/net/ethernet/intel/e1000e/ethtool.c | 2 ++ drivers/net/ethernet/intel/e1000e/hw.h | 5 +++++ drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 +++++++ drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++ drivers/net/ethernet/intel/e1000e/ptp.c | 1 + 5 files changed, 21 insertions(+)