From nobody Thu Oct 24 03:33:27 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 4XYs2J1rwVz5b1HL; Thu, 24 Oct 2024 03:33:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYs2J1KP4z4GR7; Thu, 24 Oct 2024 03:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729740808; 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=EsfsIW1623KQoAogSxBNdfM1b9ISqnajZvhe8bBFgbs=; b=CdY6BPRtPk4cDBb2OFSPnT2ZAHi5aTZloV1s3+Efw7aIrcX6IgH8u2ntF+hI+aTTjnuZzm hNpDDQam4W8LCp0Eg7arB0d+yzhU0cJQRCys+dnJx+ieaC4Ya+O1XBBwAaNd91OQoagT7f iqcnH5LNP8BHDVpE4qLglIdLIYBl7sgYIuN2/aM19aaEEsG6YOj8qK+R0fzA5NP2SSTaRF dlnQg24Qs+iBUame6a+tv2LDa31jsdQd0oPGd7SkI9y8Ulq3HccqLT6Ol4EogORCUaw0/L 3dn7qCGPz34698w49iJWTZWYiSXfh6OGGcimqVP/Df/qpvJdkxQv6PvPh7rZvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729740808; 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=EsfsIW1623KQoAogSxBNdfM1b9ISqnajZvhe8bBFgbs=; b=nFYWuQ2SbQjjlVe7YYrLvfnVTY2m0FwWgw+5QZ4wXXj1GZrkuAWQku/ceuqK+oSWyRQp25 MH1sa/hbX07Gj8wy4Fui4mtKh7iRTNHw7lOrdVPgUvNv3mw0vyEWBRSXEgvzlq/FKH4TFB IPZARHvcWZu5HtUlyOTPB2deMGM3zobW85x4snr2KL3OS9b5toOd9rmzKToyk6+2zBCeCl 3k6LDfhhcQuUEAmOMMESy2oXptaPcIJrTZCweCwCDlYtc9uw3e5O8B1s2mZtKH1QQ10Cqr 2hDQa2pDRkMGnXwYNTbf9teRTXKzISkkixIm9b4C7gd2MZTZwf7H0dVXJwDYjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729740808; a=rsa-sha256; cv=none; b=Dhs25l0CUVUjENNGVe6jHaodF0VnPuSlRgH5OWgwTpeu6ScotEjQ5cqdbphyO9S3XlaEjf W0hjMmwecCypPST2jBWErkGOlgkM+r4m0aJhf4wrcevNlGetRDhe1bjsIiET0yHNY3ZyE6 D83nJBRyZ1iXgCgZFMtsPeIYazKlcs833ye6swE3p8M/8+QB4hlOQf4G4/jOtkY5PupyHY ORzHrXs+4fFMvtyXO27Z4nFOQGL4ObU4x/va49mtBSBZ0OXDx2pp7szyRqBJENL7EA3smQ MOh53C1QsHlttZ0ixDElPHczU0YxdMMi4+AxJWNzpJ107SN7yMnNaBcuv9hseQ== 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 4XYs2J0kW1zQt2; Thu, 24 Oct 2024 03:33:28 +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 49O3XSdO079621; Thu, 24 Oct 2024 03:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3XRhx079618; Thu, 24 Oct 2024 03:33:27 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:33:27 GMT Message-Id: <202410240333.49O3XRhx079618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 77b70ad751df - main - 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/main X-Git-Reftype: branch X-Git-Commit: 77b70ad751dfe3b115112252a5b96f504fcc2e0a Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=77b70ad751dfe3b115112252a5b96f504fcc2e0a commit 77b70ad751dfe3b115112252a5b96f504fcc2e0a Author: Kevin Bowling AuthorDate: 2024-10-24 03:31:17 +0000 Commit: Kevin Bowling CommitDate: 2024-10-24 03:31:17 +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. MFC after: 3 days Sponsored by: BBOX.io --- 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)"),