From nobody Sun Oct 27 02:27:20 2024 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 4XbgQc41lKz5bScN; Sun, 27 Oct 2024 02:27: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbgQc3Pdgz42tr; Sun, 27 Oct 2024 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729996040; 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=M+cZcGp0BUBucfvC7BfNs9usstxD+iawqa+bpCahoXw=; b=dMgOjo7Gasfwkfr7YF8ySAKgShySMyRo2kfP9hY1w1TtCTnZBT6kSSGSRn7qmZBFn+6wUp iyobJ1vJXOiWvQbaL242oM25zMsa4F8qHlo5C9jBXJDNJ8mWkmuu28uJ2GV1UpoIBeBVwa dmdfXzv4/I+2lGqKV7v6j3q5MwCoPpnwTydT5K77jnStl+vSBANolBaWu3rCz8W9Xq+Hk3 dgsytizq3Y1ASuLv5MF/PLzMiiMcPpm56pnclZ0q46R+feUNp9JXE9QPGkD8nQ/pPChMjE 8SDJSQ6AC6ncCmI16WETdwLfRUduVRXs8FTVc1dPtRLLwQ/IKF+ISn5R/eTqGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729996040; 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=M+cZcGp0BUBucfvC7BfNs9usstxD+iawqa+bpCahoXw=; b=LDKifh5pqCq4ZiGkxV1TPLMd64YpVFC4SIn3d/Bnegg+4TT5270A0ZWksmQ3BE1rOCh2Ga FdS5GqWCK+ADniuouaX5NQbJQkhWi0XsxTdV4f3DIwOb9XzChURjF5X/rbMWsDCCBJ5tqQ albwq/CEbb/Ot8HvPRzvTN7mxz7nqOUUNgVn9jEhc4f3i51VbzPTWOAxZwfdzbjPM/hC1T VtCniT7zm8jJcnHlVl6E0JCCXFENxJdpak3S9a4fopi80uVFnyeKgjH+vC9O3URcFqm5Pc GVCfJMQ5Pzau3XH8xMfCToQI584RcNQITTi4ZoK+WS13+iActLmgUTXjvFS8fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729996040; a=rsa-sha256; cv=none; b=vYeybROT4mqevtn6q3yBAqFtmYoW3MtAxX5xSt1vhKG1nOkKzaOXKPx6AvArgA4Yx4rLzh LTSVCrdes5fmaLdTRSZYWN1+QHtTBt/L3HzQ5chZ6ym9uwCK37KvVB+iZId2XfgtMzOQ8b bZrSGTRuGz6YC0dc+zEC0u/Fckhqc9eylYNshlZ5Zfoqc2fs5G/0PmL35ngN5AI5bYFC7b 0zBVqo8VSGyVG8nS9kaN2yZqJYfrmhp816orCw4xsHmi/8VZbDZZiCrwT3CjQpXPmhX465 HgzzjtZ0jMQahilg3cVcsKhOLHhEYzRCL06cNx0ZArCmNrfdaa6oTX6892ADWw== 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 4XbgQc2phdzbrd; Sun, 27 Oct 2024 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R2RKK7064914; Sun, 27 Oct 2024 02:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R2RKgI064911; Sun, 27 Oct 2024 02:27:20 GMT (envelope-from git) Date: Sun, 27 Oct 2024 02:27:20 GMT Message-Id: <202410270227.49R2RKgI064911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 02bddce58c71 - stable/14 - e1000: Move I219 LM19/V19 to ADL 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 02bddce58c71f43a440e3c7df75e90889a460aed Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=02bddce58c71f43a440e3c7df75e90889a460aed commit 02bddce58c71f43a440e3c7df75e90889a460aed Author: Kevin Bowling AuthorDate: 2024-10-24 03:31:17 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 02:27:10 +0000 e1000: Move I219 LM19/V19 to ADL This roughly corresponds to Linux 9d9e5347b035412daa844f884b94a05bac94f864 For FreeBSD this is currently not expected to cause any difference in behavior because we do not have the MTP force smbus changes for modern standby. Sponsored by: BBOX.io (cherry picked from commit 77b70ad751dfe3b115112252a5b96f504fcc2e0a) --- sys/dev/e1000/e1000_api.c | 4 ++-- sys/dev/e1000/e1000_hw.h | 4 ++-- sys/dev/e1000/if_em.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c index cace8e563331..6c6cb999f29f 100644 --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -338,6 +338,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_ADL_I219_V16: case E1000_DEV_ID_PCH_ADL_I219_LM17: case E1000_DEV_ID_PCH_ADL_I219_V17: + case E1000_DEV_ID_PCH_ADL_I219_LM19: + case E1000_DEV_ID_PCH_ADL_I219_V19: case E1000_DEV_ID_PCH_RPL_I219_LM22: case E1000_DEV_ID_PCH_RPL_I219_V22: case E1000_DEV_ID_PCH_RPL_I219_LM23: @@ -346,8 +348,6 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) 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: diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h index f17877f3e463..b4a9592cd89b 100644 --- a/sys/dev/e1000/e1000_hw.h +++ b/sys/dev/e1000/e1000_hw.h @@ -172,8 +172,8 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_ADL_I219_V17 0x1A1D #define E1000_DEV_ID_PCH_MTP_I219_LM18 0x550A #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_ADL_I219_LM19 0x550C +#define E1000_DEV_ID_PCH_ADL_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 diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 22578a3d8655..0b99f1b06130 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -193,8 +193,8 @@ static const pci_vendor_info_t em_vendor_info_array[] = PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V17, "Intel(R) I219-V ADL(17)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM18, "Intel(R) I219-LM MTP(18)"), 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_ADL_I219_LM19, "Intel(R) I219-LM ADL(19)"), + PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V19, "Intel(R) I219-V ADL(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)"),