From: Sasha Neftin <sasha.neftin@intel.com>
To: Kai-Heng Feng <kai.heng.feng@canonical.com>,
<jesse.brandeburg@intel.com>, <anthony.l.nguyen@intel.com>
Cc: "open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
<acelan.kao@canonical.com>, Jakub Kicinski <kuba@kernel.org>,
"moderated list:INTEL ETHERNET DRIVERS"
<intel-wired-lan@lists.osuosl.org>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [Intel-wired-lan] [PATCH 1/3] e1000e: Separate TGP from SPT
Date: Tue, 13 Jul 2021 20:58:00 +0300 [thread overview]
Message-ID: <d0bc9dbd-9b7a-5807-2ade-e710964a05a1@intel.com> (raw)
In-Reply-To: <20210712133500.1126371-1-kai.heng.feng@canonical.com>
On 7/12/2021 16:34, Kai-Heng Feng wrote:
> Separate TGP from SPT so we can apply specific quirks to TGP.
>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
> drivers/net/ethernet/intel/e1000e/e1000.h | 4 +++-
> drivers/net/ethernet/intel/e1000e/ich8lan.c | 20 ++++++++++++++++++++
> drivers/net/ethernet/intel/e1000e/netdev.c | 13 +++++++------
> 3 files changed, 30 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
> index 5b2143f4b1f8..3178efd98006 100644
> --- a/drivers/net/ethernet/intel/e1000e/e1000.h
> +++ b/drivers/net/ethernet/intel/e1000e/e1000.h
> @@ -113,7 +113,8 @@ enum e1000_boards {
> board_pch2lan,
> board_pch_lpt,
> board_pch_spt,
> - board_pch_cnp
> + board_pch_cnp,
Hello Kai-Heng,
I would agree with you here. I would suggest extending it also for other
PCH (at least ADP and MTP). The same controller on a different PCH.
We will be able to differentiate between boards via MAC type and submit
quirks if need.
> + board_pch_tgp
> };
>
> struct e1000_ps_page {
> @@ -499,6 +500,7 @@ extern const struct e1000_info e1000_pch2_info;
> extern const struct e1000_info e1000_pch_lpt_info;
> extern const struct e1000_info e1000_pch_spt_info;
> extern const struct e1000_info e1000_pch_cnp_info;
> +extern const struct e1000_info e1000_pch_tgp_info;
> extern const struct e1000_info e1000_es2_info;
>
> void e1000e_ptp_init(struct e1000_adapter *adapter);
> diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
> index cf7b3887da1d..654dbe798e55 100644
> --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
> +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
> @@ -5967,3 +5967,23 @@ const struct e1000_info e1000_pch_cnp_info = {
> .phy_ops = &ich8_phy_ops,
> .nvm_ops = &spt_nvm_ops,
> };
> +
> +const struct e1000_info e1000_pch_tgp_info = {
> + .mac = e1000_pch_tgp,
> + .flags = FLAG_IS_ICH
> + | FLAG_HAS_WOL
> + | FLAG_HAS_HW_TIMESTAMP
> + | FLAG_HAS_CTRLEXT_ON_LOAD
> + | FLAG_HAS_AMT
> + | FLAG_HAS_FLASH
> + | FLAG_HAS_JUMBO_FRAMES
> + | FLAG_APME_IN_WUC,
> + .flags2 = FLAG2_HAS_PHY_STATS
> + | FLAG2_HAS_EEE,
> + .pba = 26,
> + .max_hw_frame_size = 9022,
> + .get_variants = e1000_get_variants_ich8lan,
> + .mac_ops = &ich8_mac_ops,
> + .phy_ops = &ich8_phy_ops,
> + .nvm_ops = &spt_nvm_ops,
> +};
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index d150dade06cf..5835d6cf2f51 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -51,6 +51,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
> [board_pch_lpt] = &e1000_pch_lpt_info,
> [board_pch_spt] = &e1000_pch_spt_info,
> [board_pch_cnp] = &e1000_pch_cnp_info,
> + [board_pch_tgp] = &e1000_pch_tgp_info,
> };
>
> struct e1000_reg_info {
> @@ -7843,12 +7844,12 @@ static const struct pci_device_id e1000_pci_tbl[] = {
> { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V11), board_pch_cnp },
> { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM12), board_pch_spt },
> { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V12), board_pch_spt },
> - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM13), board_pch_cnp },
> - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V13), board_pch_cnp },
> - { 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_TGP_I219_V15), board_pch_cnp },
> + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM13), board_pch_tgp },
> + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V13), board_pch_tgp },
> + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14), board_pch_tgp },
> + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp },
> + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp },
> + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp },
> { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_cnp },
> { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_cnp },
> { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_cnp },
>
Thanks,
Sasha
next prev parent reply other threads:[~2021-07-13 17:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 13:34 [PATCH 1/3] e1000e: Separate TGP from SPT Kai-Heng Feng
2021-07-12 13:34 ` [PATCH 2/3] e1000e: Make mei_me active when e1000e is in use Kai-Heng Feng
2021-07-14 5:39 ` [Intel-wired-lan] " Sasha Neftin
2021-07-14 6:28 ` Kai-Heng Feng
2021-07-14 9:05 ` Ruinskiy, Dima
2021-07-14 9:52 ` Kai-Heng Feng
2021-07-18 8:37 ` Sasha Neftin
2021-07-12 13:34 ` [PATCH 3/3] e1000e: Serialize TGP e1000e PM ops Kai-Heng Feng
2021-07-27 6:53 ` Kai-Heng Feng
2021-08-01 4:15 ` Sasha Neftin
2021-07-13 17:58 ` Sasha Neftin [this message]
2021-07-14 4:19 ` [Intel-wired-lan] [PATCH 1/3] e1000e: Separate TGP from SPT Kai-Heng Feng
2021-07-14 8:43 ` Sasha Neftin
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=d0bc9dbd-9b7a-5807-2ade-e710964a05a1@intel.com \
--to=sasha.neftin@intel.com \
--cc=acelan.kao@canonical.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=kai.heng.feng@canonical.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).