From nobody Mon Feb 06 22:36:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9h1w55Vzz3nWPY; Mon, 6 Feb 2023 22:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9h1w2K8Wz4K6l; Mon, 6 Feb 2023 22:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675722980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=duL4KqlIPiRXIKKZ5iUCu2NPKejPOkc5MvJG3d+LlAo=; b=s7bpaSWkixpy1crJfgTwTerKH/csB/d/lEIFucUiC1i5FULzsoFQQLyyzQ/Z7YdKvN1gLF ARajPhj0TAImKeUWR2hS/um3QnZvsZrQgYSIxFQiuCrlEI90Xu64LfQ8/yP9O2hYRISdJl s0KTuN8kfNdPiObONC+XHrkV3SpeAVk8P9Escm48W4bjnzBbTu63qT5B4bvkwmf55mINs1 F4fCz6sNW85oZzQJo0I+imt5U0VTAfHsfV1uBZ7dtrnkwpQ72SYj5XvvWtnrDAHxotmrZ8 chRDsjv3IhybPrmA5E3RkMpgIn5s9G7DgkfQsCkZHTXG/IREa3F8CHRaiVusmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675722980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=duL4KqlIPiRXIKKZ5iUCu2NPKejPOkc5MvJG3d+LlAo=; b=M2UvA7wAc+sPfGnb17xOrGJqoZTdt7odAmDAcIRDskVDloFyhOswCnly5W77ghGlO8aawz lZOOUrtlG7n0yKN9cw6/pqzEh6FskdV3wtOhjMsKlxiFgtTrNtvCmPzFzgREApXwz3pbXx n+uvXkKcunFSGstYnCFZ4HTCaMACt17lzbZByrELuIAX7uytmIcGPOQ7PE3egMig89W7IX t/fAxR6cC435IUFQTTqY2uGZ4Y+4a6d2hulE8Xec6r0r8GH/WkfRgIkFfJHoCIoB4bB9zV ++np+Z+a5L1FslWQPkPGfUx2HtSBS+tWyTuuOzX2QFM7qZsKboMP0f3L4UKIHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675722980; a=rsa-sha256; cv=none; b=Wb8Wdtmoeej1WCh5Lw7ahF/EDMKj5UA0Zp76Skynbf8swFr0DhznoP2mhzmV7y2kKRVZjV Qgm69I+6O0HmDK2UrvlphlvEQHs+lTnZjrZ5qeBQnuBNo6EwLWGDj63RPUL9dyRtSPFpGr kjcslgq2E6tCMT1ddhjgrlHSYOQn7rzRBMb4AP8eC4bWYPFObIjQeCyGMBWjDrYRmuk/zv yU6UZvEcoOLq0rKbLXhMIl/ObtfntBt5lR3SA/uS3C6Y5BarjoVlPV+mBE8hhuAlaBEb8P iIrcCIrqxaRuaZCoRRx4sPT/7yoltXFlLtuy0trfGl4lJNwKMfbvpSzr3vl55w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9h1w1Nj7zspD; Mon, 6 Feb 2023 22:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316MaKPb079352; Mon, 6 Feb 2023 22:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316MaKaP079351; Mon, 6 Feb 2023 22:36:20 GMT (envelope-from git) Date: Mon, 6 Feb 2023 22:36:20 GMT Message-Id: <202302062236.316MaKaP079351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: c0548bfc3a09 - main - em(4): Add IDs for new Intel(R) I219 devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0548bfc3a0941e504d673fea7d14a42d4358961 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=c0548bfc3a0941e504d673fea7d14a42d4358961 commit c0548bfc3a0941e504d673fea7d14a42d4358961 Author: Piotr Kubaj AuthorDate: 2023-02-06 22:31:00 +0000 Commit: Eric Joyner CommitDate: 2023-02-06 22:35:56 +0000 em(4): Add IDs for new Intel(R) I219 devices These include I219 (20) through I219 (23), which ends at Raptor Lake. This also corrects a discrepancy where the (16) devices should be mac type "e1000_pch_tgp" and not "e1000_pch_adp". Signed-off-by: Eric Joyner PR: 269224 Reviewed by: erj@ MFC after: 1 day Relnotes: yes Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D38376 --- sys/dev/e1000/e1000_api.c | 12 ++++++++++-- sys/dev/e1000/e1000_hw.h | 8 ++++++++ sys/dev/e1000/if_em.c | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c index 5c778a48bba0..5fd0f598aa6d 100644 --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -333,18 +333,26 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_TGP_I219_V14: case E1000_DEV_ID_PCH_TGP_I219_LM15: case E1000_DEV_ID_PCH_TGP_I219_V15: - mac->type = e1000_pch_tgp; - break; case E1000_DEV_ID_PCH_ADL_I219_LM16: case E1000_DEV_ID_PCH_ADL_I219_V16: + case E1000_DEV_ID_PCH_RPL_I219_LM23: + case E1000_DEV_ID_PCH_RPL_I219_V23: + mac->type = e1000_pch_tgp; + break; case E1000_DEV_ID_PCH_ADL_I219_LM17: case E1000_DEV_ID_PCH_ADL_I219_V17: + case E1000_DEV_ID_PCH_RPL_I219_LM22: + case E1000_DEV_ID_PCH_RPL_I219_V22: mac->type = e1000_pch_adp; break; case E1000_DEV_ID_PCH_MTP_I219_LM18: case E1000_DEV_ID_PCH_MTP_I219_V18: case E1000_DEV_ID_PCH_MTP_I219_LM19: case E1000_DEV_ID_PCH_MTP_I219_V19: + case E1000_DEV_ID_PCH_LNL_I219_LM20: + case E1000_DEV_ID_PCH_LNL_I219_V20: + case E1000_DEV_ID_PCH_LNL_I219_LM21: + case E1000_DEV_ID_PCH_LNL_I219_V21: mac->type = e1000_pch_mtp; break; case E1000_DEV_ID_82575EB_COPPER: diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h index 6ee252e147a4..0a4b03df98b6 100644 --- a/sys/dev/e1000/e1000_hw.h +++ b/sys/dev/e1000/e1000_hw.h @@ -175,6 +175,14 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_MTP_I219_V18 0x550B #define E1000_DEV_ID_PCH_MTP_I219_LM19 0x550C #define E1000_DEV_ID_PCH_MTP_I219_V19 0x550D +#define E1000_DEV_ID_PCH_LNL_I219_LM20 0x550E +#define E1000_DEV_ID_PCH_LNL_I219_V20 0x550F +#define E1000_DEV_ID_PCH_LNL_I219_LM21 0x5510 +#define E1000_DEV_ID_PCH_LNL_I219_V21 0x5511 +#define E1000_DEV_ID_PCH_RPL_I219_LM22 0x0DC7 +#define E1000_DEV_ID_PCH_RPL_I219_V22 0x0DC8 +#define E1000_DEV_ID_PCH_RPL_I219_LM23 0x0DC5 +#define E1000_DEV_ID_PCH_RPL_I219_V23 0x0DC6 #define E1000_DEV_ID_82576 0x10C9 #define E1000_DEV_ID_82576_FIBER 0x10E6 #define E1000_DEV_ID_82576_SERDES 0x10E7 diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 3be1aaeb362e..7135f273fd94 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -194,6 +194,14 @@ static pci_vendor_info_t em_vendor_info_array[] = PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V18, "Intel(R) I219-V MTP(18)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM19, "Intel(R) I219-LM MTP(19)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V19, "Intel(R) I219-V MTP(19)"), + PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM20, "Intel(R) I219-LM LNL(20)"), + PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_V20, "Intel(R) I219-V LNL(20)"), + PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM21, "Intel(R) I219-LM LNL(21)"), + PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_V21, "Intel(R) I219-V LNL(21)"), + PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_LM22, "Intel(R) I219-LM RPL(22)"), + PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_V22, "Intel(R) I219-V RPL(22)"), + PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_LM23, "Intel(R) I219-LM RPL(23)"), + PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_V23, "Intel(R) I219-V RPL(23)"), /* required last entry */ PVID_END };