From nobody Wed May 17 10:14:52 2023 X-Original-To: dev-commits-src-main@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 4QLprD6LLXz49wcf; Wed, 17 May 2023 10:14:52 +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 4QLprD5nssz45cX; Wed, 17 May 2023 10:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684318492; 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=+W8EfYRkyaPp2wrHJvT0g0WjyGum+R0AZQn9bCQjc8s=; b=WEwaToKWKOcZyEkXvhq7VgvU7eRNwzb30jQ4aUSxJ3PN9LroQdoRBXcmPZwwXLgdaxFywt GGema2IunDmirT9Y/FW082j9kxHq2rTGpJOAUihptsf45c5uNaIzlCkKVoSHOWmxikEDOx yETdZZaVGQHG37thkrSSju62nANZVxrS1xatBC6xXUjzK+k9BxOZYK7rKLwEHGtYLNddtA 7Wrk6Ivii9tgSYl+5Q5sUz4sdvyacDiq3+5AcmRq4R+Ql5VfXY7SxkLG7AWLRjFKMPM6d0 A6LevWq0HdRjopEQ9QPpNY/S1ew19CJkV1TubZsR4vE7cwWvtVKUzDRSx+KGyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684318492; 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=+W8EfYRkyaPp2wrHJvT0g0WjyGum+R0AZQn9bCQjc8s=; b=M/RMvWcYNGTEuHu+S0ZI/snViWYL6RPlR+AwRlvLomF6J7peeW9vtsTLzXiJ0NH9iOZXdR c8bc4044jVHwo1+JNJyWtJ7tA1pgPM4Uf+7ifEQ72myhXhz7RY0dTK08sBgpouI+pbbzcU AuSB9k+sS5li7JKUDaH1WUKLDzpSKl0cr/alefOeUaI4BusG8WuUcW771+d4QQDVprHZmA HjGr86XKgP8YDHIqpZvqoojmb6VYSi6QyVNkYaB2yQvuM/4kfZi59uJC3rrXTknlhN5Xn9 oSy+vdx0cgIlzYr8zoSU5GpaRPNe7PsMRRZshy36dNkktDl1M0LVCy4vKAdyCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684318492; a=rsa-sha256; cv=none; b=imbKFwwx7jG45FV/aMBM1ZPWF0/ftLz1SuSIbe0KLXlwc7apfturc/ZTFbK+U/Q7mw91oZ /dTDhHEjEQlBqv77s31Eet8L3SOJ5J6JaQouMADZz2awDD+cdCAIi+WMluSKaNxiUZnTC4 4DHztbMON/XHglT9SauS8jRNwec++QJGFXKI8qrqdzmcTrFX4Ft6NUgLgkB4bwC+ZqzEwr 4Kivd30o7JkMrs96jH1Sixp5gQ+WlwZhtrwypqKDQyQUvV8IAr6TzyNyDPX1dpz5DCqJAX 5CZfgJC2vWxtUEn/w2BStrG1ZX9JYM0XuAtRA58Qq7ryBBOqINVZSRNeF1ZAyA== 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 4QLprD4qmQz10lN; Wed, 17 May 2023 10:14:52 +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 34HAEqDH073014; Wed, 17 May 2023 10:14:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HAEq7h073013; Wed, 17 May 2023 10:14:52 GMT (envelope-from git) Date: Wed, 17 May 2023 10:14:52 GMT Message-Id: <202305171014.34HAEq7h073013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: d0cdec7a2042 - main - em: sync platform detection with Linux List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0cdec7a20422bf48dfe9b2118a3d776e8202c57 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0cdec7a20422bf48dfe9b2118a3d776e8202c57 commit d0cdec7a20422bf48dfe9b2118a3d776e8202c57 Author: Piotr Kubaj AuthorDate: 2023-05-17 10:14:02 +0000 Commit: Piotr Kubaj CommitDate: 2023-05-17 10:14:02 +0000 em: sync platform detection with Linux Switch 16 and 23 adapters from tgp to adp. PR: 270929 Differential revision: https://reviews.freebsd.org/D39977 Approved by: erj, kbowling --- sys/dev/e1000/e1000_api.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c index 9442dd26651b..adb6e4d08b8a 100644 --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -333,16 +333,16 @@ 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: - 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_LM16: + 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_RPL_I219_LM22: case E1000_DEV_ID_PCH_RPL_I219_V22: + case E1000_DEV_ID_PCH_RPL_I219_LM23: + case E1000_DEV_ID_PCH_RPL_I219_V23: mac->type = e1000_pch_adp; break; case E1000_DEV_ID_PCH_MTP_I219_LM18: