From nobody Wed Oct 30 20:57:28 2024 X-Original-To: dev-commits-src-branches@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 4Xdzw911l1z5c1tv; Wed, 30 Oct 2024 20:57:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xdzw86Mqtz4pp6; Wed, 30 Oct 2024 20:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730321848; 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=/Zkp8ZUlq0FN2ZgcrnVdvlID4UOSuv4GDyVH/HIYOM0=; b=BnBywAQqkujd49Obv6gE9/a9rvwPFQO3JsaJXpMNuQGhnH//8fJ/TgcMTsvJUb/MRYj2au DOp3ucB8NLX4UCaXn3+/B4xWv4Q3w+rfxJNisw+DAaUtObYyK1blqMQ6KIe8Ij+ur2fqZJ GQ2VO+Ly0E5e9WK6Caxd88tDH+/RIygYNfLF54jqxs+g251mGNj7ZQd9FS3GiqNmHgcEMG W9tzHoWlSzXT/xekFdwoqNfZyfIbaxHmoZ6yeqYS0fMWWgnkUQ4NXqe8GdE+3A8hFAxbVE iCaa9mIoxgsZeZKgSi+78ZYXDTVyzhkZQGndr1H0BDTEExjtO0Vb9dOgdDGkjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730321848; 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=/Zkp8ZUlq0FN2ZgcrnVdvlID4UOSuv4GDyVH/HIYOM0=; b=eT524FLJiYIy4NAHk3CAXw+ygd2i8nlqOFcWh2QJb6JRFhNVTAlW2n2DdaMBNZH/I2M3nM stAl2QUbyZWINt4UOmKkVJudD5wTPLzxMXzVPJiMWEyCM6Y8ASD3f5ZswOd5MkHLvyylgq /QKvCqhrzjSBHZAVUIcmG6VojAETFia0oNnAqMKOCQyO1BooWviEcpBSGCKuuF2vV6lKRM C65bKyLigS077l/aOKvg7GNUhB8OjkJ8hdtxz2uJKD6md1RQj8r45O8iTn1hwyX96uimgw d1ca+rr18KSxD4Njj7Y3wjSDGg3+Yv5E04MPlbkve/5iT2ZWgOMgEPIBwwv1lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730321848; a=rsa-sha256; cv=none; b=tyKjGNt1O3F9XwEgOdnyru+LV8FwGigfWf1WjOu+T0whE7K4sk5FJz4sxSa9eb+XjpX5od x7wwyb2Yj/5C7aFB7BkxSiC/s0xVfR5a9jzyrQfgCbuvVlBO03jvwHSAEnX+wMWdSZaMwG dlk7WmNI4c9RYYDppDv9hhIOpnDiyWdS7Lsct5Iv/VI3szyZ6vVx44mz6ZjbE8SBbpDIkz oym24VxARdC5bJiYiWo+Lvw082ous6p0f3ChLhKGB8XMuYqBDDNWQjglY9ynEo/X9QcDUf bfIkgmvIYUAl9ZLO3C63bUkqsMzUjn8knY5y8B3xSTtgMLo7OgrLWq/J8FitLg== 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 4Xdzw85xrDz1MdC; Wed, 30 Oct 2024 20:57: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 49UKvSKQ033644; Wed, 30 Oct 2024 20:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UKvSTj033641; Wed, 30 Oct 2024 20:57:28 GMT (envelope-from git) Date: Wed, 30 Oct 2024 20:57:28 GMT Message-Id: <202410302057.49UKvSTj033641@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: 25ad37c9532b - stable/14 - ice: Remove RDMA feature block on E830 devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 25ad37c9532b8c0d753c55347e7e150b40b4929a Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=25ad37c9532b8c0d753c55347e7e150b40b4929a commit 25ad37c9532b8c0d753c55347e7e150b40b4929a Author: Eric Joyner AuthorDate: 2024-10-30 20:35:40 +0000 Commit: Eric Joyner CommitDate: 2024-10-30 20:53:03 +0000 ice: Remove RDMA feature block on E830 devices The decision to disable RDMA on E830 devices has been reversed; some SKUs will officially launch with RDMA support. This reverts a change introduced in "ice: Update to 1.42.5-k". Signed-off-by: Eric Joyner Sponsored by: Intel Corporation (cherry picked from commit 03e1f25dcb200edbd6553ffc2748e7410b9ff264) --- sys/dev/ice/if_ice_iflib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index 9b3f38f885b9..e60ee0f1c5c3 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -2916,8 +2916,7 @@ ice_init_device_features(struct ice_softc *sc) /* Disable features due to hardware limitations... */ if (!hw->func_caps.common_cap.rss_table_size) ice_clear_bit(ICE_FEATURE_RSS, sc->feat_cap); - if (!hw->func_caps.common_cap.iwarp || !ice_enable_irdma || - ice_is_e830(hw)) + if (!hw->func_caps.common_cap.iwarp || !ice_enable_irdma) ice_clear_bit(ICE_FEATURE_RDMA, sc->feat_cap); if (!hw->func_caps.common_cap.dcb) ice_clear_bit(ICE_FEATURE_DCB, sc->feat_cap);