From nobody Tue Oct 18 04:55:07 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 4Ms1kh1HXnz4g13B;
Tue, 18 Oct 2022 04:55:08 +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 4Ms1kh07hgz3Vn4;
Tue, 18 Oct 2022 04:55:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1666068908;
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=9cKkqHXdJl0GCMhIXBKkF0tjusuwFXMhKZ2b/K/iPNk=;
b=PA1XynVQX6wpzHcRHZMZZFhD1OmLnq/y4dC5P0d/xqP69yiB3L+ijSDgJJiX1V3mhv2/Ay
7j15eMRYLbBwsghlYnY3nmFklm22RFsZlepBXDqnLybWm0zsybX5j6WUOFBacDKuNkq8Yy
Edh5SlaaZhtgBW2V3JgcQZ86ZvpJStrscJzx5rQEvYNyuspioB+71YIHcm4GS+tt05WQ6w
dOGOHnDUK+6p6RyrbOirHnQ5XZvaDnD5vi98nM5drLb7PmRk3xA+E/x9T3tPs4vouGB2CY
V5Wu4nDjJl2SJOaKRGXdMtrESoukB+sexHx2h8Tw0z/VsIfz1SezmGlom9ufmQ==
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 4Ms1kg4w6zz13x5;
Tue, 18 Oct 2022 04:55:07 +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 29I4t7fB009541;
Tue, 18 Oct 2022 04:55:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I4t7Ch009540;
Tue, 18 Oct 2022 04:55:07 GMT
(envelope-from git)
Date: Tue, 18 Oct 2022 04:55:07 GMT
Message-Id: <202210180455.29I4t7Ch009540@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eric Joyner <erj@FreeBSD.org>
Subject: git: 2ff005433446 - stable/13 - ixl(4): Add support for I710 devices and remove non-inclusive language
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/13
X-Git-Reftype: branch
X-Git-Commit: 2ff0054334460c9ecc3df34a202d82f6138c9c8a
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1666068908;
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=9cKkqHXdJl0GCMhIXBKkF0tjusuwFXMhKZ2b/K/iPNk=;
b=CHd/OAF+o0P+K/n6N6ynXLD8yzOK8eBiQtg6l2cZoXBIgGd8kCuiJWvjbmeMwb9lK3ZOB7
nCcDVry32NIR0fYAsF4dbmVt2sHHBYsMpt9mxXLWSku+R8oyIaz/R/QAoS9fLfcgYkh+gU
l5sC4/mnn8CGn3JsGN4f1KBvAd3kx8K2y7jTtMVtR/ga1NIkF9D2vcQEZt+RAz/RXEoeh+
Hf+g99SSRDZ1qFKtsGlXSsS73/YAwEa6WopTEd2xHEqXg5GrCoouewfyQ0e3/Jcwy6XeHW
inR0n3ZAYyOpp1MhO4egcEDTHOx1EuP8EYoCqP5xM+EFRyzdakpPNOvAwuSy5Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666068908; a=rsa-sha256; cv=none;
b=ShnZjfp44RL4eveEEXUkAhQCxzjhIGdXzjUmChN7iBpBnymfSxvm3Wg2LVlqUM57dwVFvI
C8ZJR/cdHFZp3c2rwfo2sGiSezKGpWfJ8zvwx+x/w8BP08AEGOYTeatHFdxJqWY08wZ7Pl
dH14WQFtYq0T+kQ1qbaI7gPiWNZgS/7oMTJpQPNFUA2q5aeBO1dlenTeuOFD86LsixylW5
I68KZvgGtMzptxLoH7K80X68vcLKP1/GcA5W8bY6oTeojXYZccQSBstbMPkFXfsdXUi8w0
J7qCQb3inPGK9oGR4GDa8Ei5FeIpKYOrZxLZKrecoN/1ZVykSRKDosc0mWADAQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by erj:
URL: https://cgit.FreeBSD.org/src/commit/?id=2ff0054334460c9ecc3df34a202d82f6138c9c8a
commit 2ff0054334460c9ecc3df34a202d82f6138c9c8a
Author: Krzysztof Galazka <krzysztof.galazka@intel.com>
AuthorDate: 2022-05-24 16:08:57 +0000
Commit: Eric Joyner <erj@FreeBSD.org>
CommitDate: 2022-10-18 04:19:41 +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 <erj@FreeBSD.org>
Reviewed by: kbowling@
Tested by: gowtham.kumar.ks@intel.com
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 7fa2318db300..cbf6f9444c18 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
};