From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32D811AF0AF; Mon, 9 Feb 2026 14:34:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770647655; cv=none; b=GcSNiGgxf8cOWBecv7sDrDxv/PQ897yAWKYN9t3qSPy5yaRjZBwmdMUGRIf4nvk+rhISefPqzVr768upqmDJ0zhX7jTPFnZxOw3thSTpKr/cvAlvxyce7sMAmsZezeVDEegw90VxaAfgxK4feL8iBZPKNwPwB9fFa/VsBn0PmdI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770647655; c=relaxed/simple; bh=pgkdTqdUvC2ENs9i27WKqRz3mDTkEsW/KC70GD40QXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gqlqk+5bFbKKm9r5zQbwUKGoL3cFG0TLye3iqSOFo8EubVCEjIO4WUAyJOS5Z9/P/+ld9uc/1/W65g2fjcYY8AtfuQPIv5Znm62RJxBb/Jgo0rQ1pY772yAC06J1IdT5+nUMz2/R1boygJzyiwtkUTZs3ZCn3rviYoMfZWrUrec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=j+juyfJe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="j+juyfJe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B20CC116C6; Mon, 9 Feb 2026 14:34:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770647655; bh=pgkdTqdUvC2ENs9i27WKqRz3mDTkEsW/KC70GD40QXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j+juyfJei95JeiBJ1DGqwFq4vbyAXjuCZowghM9BV1u2xPb109b3HKZZQchYs7msL Svy24EvZqftfQO4Q8OZWerW7ECggsrq0eHzQukhyJB4zqGMrDItJHizCS2i1Q94Par 2wxOOo99DeUHSTBCTvSPP4K77qYctz07mTyrFXvk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Marek=20Beh=C3=BAn?= , Maxime Chevallier , "Russell King (Oracle)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 131/175] net: sfp: Fix quirk for Ubiquiti U-Fiber Instant SFP module Date: Mon, 9 Feb 2026 15:23:24 +0100 Message-ID: <20260209142325.224427566@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260209142320.474120190@linuxfoundation.org> References: <20260209142320.474120190@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Behún [ Upstream commit adcbadfd8e05d3558c9cfaa783f17c645181165f ] Commit fd580c9830316eda ("net: sfp: augment SFP parsing with phy_interface_t bitmap") did not add augumentation for the interface bitmap in the quirk for Ubiquiti U-Fiber Instant. The subsequent commit f81fa96d8a6c7a77 ("net: phylink: use phy_interface_t bitmaps for optical modules") then changed phylink code for selection of SFP interface: instead of using link mode bitmap, the interface bitmap is used, and the fastest interface mode supported by both SFP module and MAC is chosen. Since the interface bitmap contains also modes faster than 1000base-x, this caused a regression wherein this module stopped working out-of-the-box. Fix this. Fixes: fd580c9830316eda ("net: sfp: augment SFP parsing with phy_interface_t bitmap") Signed-off-by: Marek Behún Reviewed-by: Maxime Chevallier Reviewed-by: Russell King (Oracle) Link: https://patch.msgid.link/20260129082227.17443-1-kabel@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/sfp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 47f095bd91cea..3e023723887c4 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -479,6 +479,8 @@ static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id, linkmode_zero(caps->link_modes); linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, caps->link_modes); + phy_interface_zero(caps->interfaces); + __set_bit(PHY_INTERFACE_MODE_1000BASEX, caps->interfaces); } #define SFP_QUIRK(_v, _p, _s, _f) \ -- 2.51.0