From nobody Tue May 24 16:14:50 2022 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 99EAD1B396B5; Tue, 24 May 2022 16:14:50 +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 4L6zmp3yMjz3GW5; Tue, 24 May 2022 16:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653408890; 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=+GwcnmSRrR8YYDAncklcH1hg/ng5CCgASL0E8DvvQDI=; b=bVArIZIUKHRtwNF/DFwXdVjHgqNQOjmVlTRgDRozPBreC18aXu2SI20iZsKUyB0UyRSGdH BHN3zaROfPs6P0FS9UOGdwyALJ/r8J4qCYebfc7gLGkTvD6q4vyE8/MsUidSEC/wVCyJPF NJk+uza5QHW5bik5bpupx0QcfDBX/hebSqerF490wVrUCwlrKcQ0XKyCUtaCUpJgArYEKG TeBq3f1ApZyjMSPFuCb6sSTv/pQBMtG+DJqPBkytpxIwirTLvieHL17f4vdFvNrDiIEZWb GQfIE9sl7xrvvDtdV1Fj1NqRV7aNCo6Ejw++NJxUwCaIawLnvpxUIKmMCMtg5g== 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 67B2D27D51; Tue, 24 May 2022 16:14:50 +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 24OGEo6M056447; Tue, 24 May 2022 16:14:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OGEoaP056446; Tue, 24 May 2022 16:14:50 GMT (envelope-from git) Date: Tue, 24 May 2022 16:14:50 GMT Message-Id: <202205241614.24OGEoaP056446@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: b7b40e4a38d8 - main - ixl(4): Add support for I710 devices and remove non-inclusive language 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7b40e4a38d8521a40494d868d0870dfb9d6d77d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653408890; 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=+GwcnmSRrR8YYDAncklcH1hg/ng5CCgASL0E8DvvQDI=; b=Ckk0AclYlPaOX3TupXVFsMQBpgLyFeNhHq8fUKDAhIULDkeWWtdzkZn9/DinMcQfslv3pn uwk96MAG+Hj5UJyZKHqPrzqu+ZRyWw13QqT0r4IjVEU7TwO5+aPv+t5dpaTVVS8cgHiSE9 E9nlw8WsAvZNSJRq51F4G3Fob4LJ0Q+ma22sQ1p4zMMXciJiSNUvAZe7HXqpSJ/+4Bv/tQ WUIcAafgA/XDAfGcMDZDj8aOp3n/NPYle3hFCnH1KW0mNfy5AUEfZM+zBIuUFFT2xwGJxM 1OUPI3tq49mv+MV5k+sDHiQzLzR6l2YqpamH2OVqP04DR+q0GFl0IYLazaPRHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653408890; a=rsa-sha256; cv=none; b=btCMZ1isYIKD11kMmlX/0/FxPYVyNAvZUAbJLTqRw22BV+gaEEYLge9S/RgXIOUl7zAyU1 XOgJkqP2ER5L4LJ3C373QEbLRguGv2ZuqPzxhwNqc++M0ChVkk42AWs4OMBotVs5deBpko pcLkwPOsNy66J1YqO15u0FH8J2pVHaO3rBACIkJJxDPnT7/n6DdNLB83xN/TvCk0t69w9L X+IHxaVolLl7kOyYRzBzY/Pi6YQtju9DinNvMMtuWYpm+brwvnZPDxGZ8kxHRfr2MBDCiK zkh78i7hBM4WIgZGEPfXha7/b1fnSjHGx1i7vEOVBEayhwJd+78yLhv0WQhj2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=b7b40e4a38d8521a40494d868d0870dfb9d6d77d commit b7b40e4a38d8521a40494d868d0870dfb9d6d77d Author: Krzysztof Galazka AuthorDate: 2022-05-24 16:08:57 +0000 Commit: Eric Joyner CommitDate: 2022-05-24 16:12:49 +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 --- 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 1a7ec04f3089..c8d97f395efd 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: @@ -6670,6 +6671,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: @@ -6708,6 +6710,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 975aaef0d5c6..cb3ce72a95ed 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 };