Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1224076/?format=api
{ "id": 1224076, "url": "http://patchwork.ozlabs.org/api/patches/1224076/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200116085323.3027-1-sasha.neftin@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200116085323.3027-1-sasha.neftin@intel.com>", "list_archive_url": null, "date": "2020-01-16T08:53:23", "name": "[v1] e1000e: Add support for Alder Lake", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d91b6c6e73706cfdc9677e73d9cd7673e580833e", "submitter": { "id": 69860, "url": "http://patchwork.ozlabs.org/api/people/69860/?format=api", "name": "Sasha Neftin", "email": "sasha.neftin@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200116085323.3027-1-sasha.neftin@intel.com/mbox/", "series": [ { "id": 153493, "url": "http://patchwork.ozlabs.org/api/series/153493/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=153493", "date": "2020-01-16T08:53:23", "name": "[v1] e1000e: Add support for Alder Lake", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/153493/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1224076/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1224076/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.138;\n\thelo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 47yyfG6zVBz9sP3\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 16 Jan 2020 19:53:42 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E99718676A;\n\tThu, 16 Jan 2020 08:53:40 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id GOiqnvTiAhm6; Thu, 16 Jan 2020 08:53:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 77ADA867ED;\n\tThu, 16 Jan 2020 08:53:32 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 367E21BF340\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 16 Jan 2020 08:53:31 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 303EF87B81\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 16 Jan 2020 08:53:31 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id pi3M7UsRnRTi for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 16 Jan 2020 08:53:26 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id D6BAB87CC9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 16 Jan 2020 08:53:25 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Jan 2020 00:53:25 -0800", "from ccdlinuxdev08.iil.intel.com ([143.185.161.150])\n\tby orsmga001.jf.intel.com with ESMTP; 16 Jan 2020 00:53:24 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,325,1574150400\"; d=\"scan'208\";a=\"305787549\"", "From": "Sasha Neftin <sasha.neftin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 16 Jan 2020 10:53:23 +0200", "Message-Id": "<20200116085323.3027-1-sasha.neftin@intel.com>", "X-Mailer": "git-send-email 2.11.0", "Subject": "[Intel-wired-lan] [PATCH v1] e1000e: Add support for Alder Lake", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Add devices ID's for the next LOM generations that will be\navailable on the next Intel Client platform (Alder Lake)\nThis patch provides the initial support for these devices\n\nSigned-off-by: Sasha Neftin <sasha.neftin@intel.com>\n---\n drivers/net/ethernet/intel/e1000e/ethtool.c | 2 ++\n drivers/net/ethernet/intel/e1000e/hw.h | 5 +++++\n drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 +++++++\n drivers/net/ethernet/intel/e1000e/netdev.c | 10 ++++++++--\n drivers/net/ethernet/intel/e1000e/ptp.c | 1 +\n 5 files changed, 23 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c\nindex adce7e319b9e..9e7881db7859 100644\n--- a/drivers/net/ethernet/intel/e1000e/ethtool.c\n+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c\n@@ -897,6 +897,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)\n \tcase e1000_pch_cnp:\n \t\t/* fall through */\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tmask |= BIT(18);\n \t\tbreak;\n \tdefault:\n@@ -1561,6 +1562,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tfext_nvm11 = er32(FEXTNVM11);\n \t\tfext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX;\n \t\tew32(FEXTNVM11, fext_nvm11);\ndiff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h\nindex f556163481cb..a1dbf8df1c70 100644\n--- a/drivers/net/ethernet/intel/e1000e/hw.h\n+++ b/drivers/net/ethernet/intel/e1000e/hw.h\n@@ -97,6 +97,10 @@ struct e1000_hw;\n #define E1000_DEV_ID_PCH_TGP_I219_LM14\t\t0x15F9\n #define E1000_DEV_ID_PCH_TGP_I219_V14\t\t0x15FA\n #define E1000_DEV_ID_PCH_TGP_I219_LM15\t\t0x15F4\n+#define E1000_DEV_ID_PCH_ADP_1219_LM16\t\t0x1A1E\n+#define E1000_DEV_ID_PCH_ADP_1219_V16\t\t0x1A1F\n+#define E1000_DEV_ID_PCH_ADP_1219_LM17\t\t0x1A1C\n+#define E1000_DEV_ID_PCH_ADP_1219_V17\t\t0x1A1D\n \n #define E1000_REVISION_4\t4\n \n@@ -121,6 +125,7 @@ enum e1000_mac_type {\n \te1000_pch_spt,\n \te1000_pch_cnp,\n \te1000_pch_tgp,\n+\te1000_pch_adp,\n };\n \n enum e1000_media_type {\ndiff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c\nindex b4135c50e905..735bf25952fc 100644\n--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c\n+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c\n@@ -317,6 +317,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tif (e1000_phy_is_accessible_pchlan(hw))\n \t\t\tbreak;\n \n@@ -460,6 +461,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)\n \t\tcase e1000_pch_spt:\n \t\tcase e1000_pch_cnp:\n \t\tcase e1000_pch_tgp:\n+\t\tcase e1000_pch_adp:\n \t\t\t/* In case the PHY needs to be in mdio slow mode,\n \t\t\t * set slow mode and try to get the PHY id again.\n \t\t\t */\n@@ -703,6 +705,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \tcase e1000_pchlan:\n \t\t/* check management mode */\n \t\tmac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;\n@@ -1642,6 +1645,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\trc = e1000_init_phy_params_pchlan(hw);\n \t\tbreak;\n \tdefault:\n@@ -2095,6 +2099,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tsw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;\n \t\tbreak;\n \tdefault:\n@@ -3133,6 +3138,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tbank1_offset = nvm->flash_bank_size;\n \t\tact_offset = E1000_ICH_NVM_SIG_WORD;\n \n@@ -4077,6 +4083,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \tcase e1000_pch_spt:\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tword = NVM_COMPAT;\n \t\tvalid_csum_mask = NVM_COMPAT_VALID_CSUM;\n \t\tbreak;\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex 60df6f2663c0..25ad824bb431 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -3539,6 +3539,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)\n \t\tbreak;\n \tcase e1000_pch_cnp:\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tif (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {\n \t\t\t/* Stable 24MHz frequency */\n \t\t\tincperiod = INCPERIOD_24MHZ;\n@@ -4052,8 +4053,9 @@ void e1000e_reset(struct e1000_adapter *adapter)\n \tcase e1000_pch_cnp:\n \t\t/* fall-through */\n \tcase e1000_pch_tgp:\n-\t\tfc->refresh_time = 0xFFFF;\n-\t\tfc->pause_time = 0xFFFF;\n+\tcase e1000_pch_adp:\n+\n+\t\tfc->refresh_time = 0x0400;\n \n \t\tif (adapter->netdev->mtu <= ETH_DATA_LEN) {\n \t\t\tfc->high_water = 0x05C20;\n@@ -7764,6 +7766,10 @@ static const struct pci_device_id e1000_pci_tbl[] = {\n \t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14), board_pch_cnp },\n \t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_cnp },\n \t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_cnp },\n+\t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_LM16), board_pch_cnp },\n+\t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_V16), board_pch_cnp },\n+\t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_LM17), board_pch_cnp },\n+\t{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_1219_V17), board_pch_cnp },\n \n \t{ 0, 0, 0, 0, 0, 0, 0 }\t/* terminate list */\n };\ndiff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c\nindex eaa5a0fb99f0..439fda2f5368 100644\n--- a/drivers/net/ethernet/intel/e1000e/ptp.c\n+++ b/drivers/net/ethernet/intel/e1000e/ptp.c\n@@ -297,6 +297,7 @@ void e1000e_ptp_init(struct e1000_adapter *adapter)\n \tcase e1000_pch_cnp:\n \t\t/* fall-through */\n \tcase e1000_pch_tgp:\n+\tcase e1000_pch_adp:\n \t\tif ((hw->mac.type < e1000_pch_lpt) ||\n \t\t (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) {\n \t\t\tadapter->ptp_clock_info.max_adj = 24000000 - 1;\n", "prefixes": [ "v1" ] }