From nobody Wed Oct 19 23:23:49 2022 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 4Mt6HT4wXyz4g2k1; Wed, 19 Oct 2022 23:23:49 +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 4Mt6HT4Fpdz3VqF; Wed, 19 Oct 2022 23:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666221829; 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=aNnQr2yGASADKd1KE2Um+FMTOQM/KrjfrzaVNZwM5Gc=; b=igzHiW7tUKV5Ir27hTHNIAsaF9DXr8ZhULCkGeRe/ZkwSVN4IugaJsh0RX21Xt2EloWns3 6ialYCKF2K4GXco71Bs8E4IT+eMhfi2NxdwqSSld63BB6cjpHpWdeDVfuTXBG40f2uKOoJ AeKNCHQ8HOTieCf8YRblP3U6nYPgNgstCTmaEE6BOE8rOggtPxE8N6cEvmptx3QznV2hTO ietNBBCOHvR2ai79EY2Vfno3uyD1ZCFumEHiit7e4dRZ/VHDDaFYFx+h+nfdLJmNzHFEEg yJ/TxaPgFev531Wh8xog57x9W0CBoIpI6FFatTu6GDyLDDNJBrC0dA+fdVpzlQ== 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 4Mt6HT37hYzh83; Wed, 19 Oct 2022 23:23:49 +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 29JNNnxV021652; Wed, 19 Oct 2022 23:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JNNnZd021651; Wed, 19 Oct 2022 23:23:49 GMT (envelope-from git) Date: Wed, 19 Oct 2022 23:23:49 GMT Message-Id: <202210192323.29JNNnZd021651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 03b2ad9a03c9 - stable/12 - ixl(4): Add support for I710 devices and remove non-inclusive language 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 03b2ad9a03c92c51711a3100b9aafe1586c8566c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666221829; 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=aNnQr2yGASADKd1KE2Um+FMTOQM/KrjfrzaVNZwM5Gc=; b=wr5/XvOdmR+fNkE7BPssNWgiPwzuMG5OqH3tUG4CUedMJKjRdWngEzRGDPmUiF5/eiybr9 aKxv2khn6L7hzh6z/AlyFiYyHdd2nK1roQuVsD3M43t1czH2m7pOU46n60+rGtA8XeLG+y SQrwXWLonCOER2Kj6Niz36j/5E7PIwQpinsFOrMNwgxSAL3Utif4TtRnssY+Mg7g4f78mJ 5a0BT0nvQ7rbIsb4sDcHVVaQxlx1YI2e3BfsBKD3pyCtLqUsOsafrt0CVcybT73dLWZsBT V8TnEV0YJZI7K3S4c9GEV5iXYlBZo7Fn5ERAUpfE/GwEMTWfuf3s28z13A/D9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666221829; a=rsa-sha256; cv=none; b=nvSwLIAfA3S+1KBdlpW5uOENzcae7PRyYvzNNooh9GAB+sRKL3QExi3Ku4vqJXciyTEScC /Z+ybPSqLwCMWTTQ8Qg8jHf4PpuGRChbqjixj7jXW9bq4bx3/y3yLGO1TWkzKm/R9IVtXa jqjF5o4VprPogBpuRmslQFLkO7KomX1woX5HxpnquqDCet1dJi+s1jnUBWwG0sLU1X8wyW X/8aKkOXAIx9yL9g6wefXYmWANj/DXPhTtc97VMwphd8/J71w4KNqfhAB3e4ud2MwxAYFB zbQidEbAdw4W8C8sJf7nv/hYlReiIhT5dnCxHMiF4n+3OJeGNAPeMdGfi1IKJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=03b2ad9a03c92c51711a3100b9aafe1586c8566c commit 03b2ad9a03c92c51711a3100b9aafe1586c8566c Author: Krzysztof Galazka AuthorDate: 2022-05-24 16:08:57 +0000 Commit: Eric Joyner CommitDate: 2022-10-19 23:19:29 +0000 ixl(4): Add support for I710 devices and remove non-inclusive language Intel introduces a new line of 1G Ethernet adapters with Device ID 0x0DD2. While at that also remove non-inclusive language. Signed-off-by: Eric Joyner Reviewed by: kbowling@ Tested by: gowtham.kumar.ks@intel.com MFC after: 1 week Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D34924 (cherry picked from commit b7b40e4a38d8521a40494d868d0870dfb9d6d77d) --- sys/dev/ixl/i40e_common.c | 7 +++++-- sys/dev/ixl/i40e_devids.h | 4 +++- sys/dev/ixl/i40e_status.h | 2 +- sys/dev/ixl/if_ixl.c | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/dev/ixl/i40e_common.c b/sys/dev/ixl/i40e_common.c index 332893938c19..8d12da942dbd 100644 --- a/sys/dev/ixl/i40e_common.c +++ b/sys/dev/ixl/i40e_common.c @@ -66,6 +66,7 @@ enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw) case I40E_DEV_ID_10G_B: case I40E_DEV_ID_10G_SFP: case I40E_DEV_ID_5G_BASE_T_BC: + case I40E_DEV_ID_1G_BASE_T_BC: case I40E_DEV_ID_20G_KR2: case I40E_DEV_ID_20G_KR2_A: case I40E_DEV_ID_25G_B: @@ -195,8 +196,8 @@ const char *i40e_stat_str(struct i40e_hw *hw, enum i40e_status_code stat_err) return "I40E_ERR_INVALID_MAC_ADDR"; case I40E_ERR_DEVICE_NOT_SUPPORTED: return "I40E_ERR_DEVICE_NOT_SUPPORTED"; - case I40E_ERR_MASTER_REQUESTS_PENDING: - return "I40E_ERR_MASTER_REQUESTS_PENDING"; + case I40E_ERR_PRIMARY_REQUESTS_PENDING: + return "I40E_ERR_PRIMARY_REQUESTS_PENDING"; case I40E_ERR_INVALID_LINK_SETTINGS: return "I40E_ERR_INVALID_LINK_SETTINGS"; case I40E_ERR_AUTONEG_NOT_COMPLETE: @@ -6675,6 +6676,7 @@ enum i40e_status_code i40e_write_phy_register(struct i40e_hw *hw, case I40E_DEV_ID_10G_BASE_T4: case I40E_DEV_ID_10G_BASE_T_BC: case I40E_DEV_ID_5G_BASE_T_BC: + case I40E_DEV_ID_1G_BASE_T_BC: case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_25G_B: case I40E_DEV_ID_25G_SFP28: @@ -6713,6 +6715,7 @@ enum i40e_status_code i40e_read_phy_register(struct i40e_hw *hw, case I40E_DEV_ID_10G_BASE_T4: case I40E_DEV_ID_10G_BASE_T_BC: case I40E_DEV_ID_5G_BASE_T_BC: + case I40E_DEV_ID_1G_BASE_T_BC: case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_25G_B: case I40E_DEV_ID_25G_SFP28: diff --git a/sys/dev/ixl/i40e_devids.h b/sys/dev/ixl/i40e_devids.h index bb6cfba071da..60fe881e4712 100644 --- a/sys/dev/ixl/i40e_devids.h +++ b/sys/dev/ixl/i40e_devids.h @@ -58,9 +58,11 @@ #define I40E_DEV_ID_10G_B 0x104F #define I40E_DEV_ID_10G_SFP 0x104E #define I40E_DEV_ID_5G_BASE_T_BC 0x101F +#define I40E_DEV_ID_1G_BASE_T_BC 0x0DD2 #define I40E_IS_X710TL_DEVICE(d) \ (((d) == I40E_DEV_ID_10G_BASE_T_BC) || \ - ((d) == I40E_DEV_ID_5G_BASE_T_BC)) + ((d) == I40E_DEV_ID_5G_BASE_T_BC) || \ + ((d) == I40E_DEV_ID_1G_BASE_T_BC)) #define I40E_DEV_ID_VF 0x154C #define I40E_DEV_ID_VF_HV 0x1571 #define I40E_DEV_ID_ADAPTIVE_VF 0x1889 diff --git a/sys/dev/ixl/i40e_status.h b/sys/dev/ixl/i40e_status.h index 16dd569c60db..abba820ff8bb 100644 --- a/sys/dev/ixl/i40e_status.h +++ b/sys/dev/ixl/i40e_status.h @@ -49,7 +49,7 @@ enum i40e_status_code { I40E_ERR_ADAPTER_STOPPED = -9, I40E_ERR_INVALID_MAC_ADDR = -10, I40E_ERR_DEVICE_NOT_SUPPORTED = -11, - I40E_ERR_MASTER_REQUESTS_PENDING = -12, + I40E_ERR_PRIMARY_REQUESTS_PENDING = -12, I40E_ERR_INVALID_LINK_SETTINGS = -13, I40E_ERR_AUTONEG_NOT_COMPLETE = -14, I40E_ERR_RESET_FAILED = -15, diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index 845e34a858a7..e81e4a77c69e 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -49,7 +49,7 @@ *********************************************************************/ #define IXL_DRIVER_VERSION_MAJOR 2 #define IXL_DRIVER_VERSION_MINOR 3 -#define IXL_DRIVER_VERSION_BUILD 1 +#define IXL_DRIVER_VERSION_BUILD 2 #define IXL_DRIVER_VERSION_STRING \ __XSTRING(IXL_DRIVER_VERSION_MAJOR) "." \ @@ -86,6 +86,7 @@ static pci_vendor_info_t ixl_vendor_info_array[] = PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_SFP, "Intel(R) Ethernet Controller X710 for 10GbE SFP+"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_B, "Intel(R) Ethernet Controller X710 for 10GbE backplane"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_5G_BASE_T_BC, "Intel(R) Ethernet Controller V710 for 5GBASE-T"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_1G_BASE_T_BC, "Intel(R) Ethernet Controller I710 for 1GBASE-T"), /* required last entry */ PVID_END };