From nobody Tue Jun 23 02:20:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B04A2C433EF for ; Sat, 12 Mar 2022 20:20:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232590AbiCLUV6 (ORCPT ); Sat, 12 Mar 2022 15:21:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230017AbiCLUV4 (ORCPT ); Sat, 12 Mar 2022 15:21:56 -0500 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B1FD207A1A for ; Sat, 12 Mar 2022 12:20:50 -0800 (PST) Received: by mail-qt1-x829.google.com with SMTP id 11so10176731qtt.9 for ; Sat, 12 Mar 2022 12:20:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=x64architecture.com; s=x64; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rxkUDg+qBB3WQG4mCBC3m79wqb1PB3BKKrUVCN9KZn0=; b=2tZaw4Qwh/ihASXpHkGEsxQLKIj1+qcRrCZ7L5/y3AauHchtWbFXGIovhMRfZORndK 8X9euYlM/49MOrxzsCq5zpJOwmRjjeeYNC0ZJW4g3xAFp73IbehzbLQW1phi+ugXFPW1 tUWxPzIGITeRjkSmJ5U+YQKdvPOhRnw+TaLnv4jNFKDihCdIkqwZltFzjxUf/g1Rz3/g euVvNrkf3aiab64rMf7aWzIKBczGi0NfElF3+/fX/ACn2OeuYvjtEH8uHm07KURR+zA0 MCy1qG220vPLj/NH/LyyjkV3ZG3avKbXplyYrtefbGOXLgh00qaldxERpzl1tJRWqaCM Bnrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rxkUDg+qBB3WQG4mCBC3m79wqb1PB3BKKrUVCN9KZn0=; b=caEdOY7Ki9SUT/27SnUPij1j8N/dPM19nwOV827+GHne2y8vBWWm2ErF+qClMcSFsz b9C0j/ObwyuqxKi0GYXgUWdDX/UlxjKDn9fe0Pz2blgMvhcDM2ztVK6YJv03Bi6K6wA3 hJ5UhcsqEmMpw90Q+85FgA2ty/E2UvRb9HJooHJq9vT0nfHA2PbtrHlFIrjLA39eR5/w NyVa7uaBdtB7UVTHoFbvRffRW80kXdSETeAbDpxjn/bCAbvEL+C1/VY16L1C1QKzKwuS rLQ2QlrmzzC4dCiWJgTcavUxNFIwDkuqIwoqckaUfw5FaKkhTM6I1+QT/AIRKTA4Rzo+ D1GQ== X-Gm-Message-State: AOAM533NhZ/IqNvnDCAXUkmIBttL46tzauGH9tnlbHEHfYGS/zzIye5B WZhyGgtknjCwn6koVywmjhnkoA== X-Google-Smtp-Source: ABdhPJwQlz+GEvLyQCD1Kv5tSQI55A5GrgRbqCvQTLLCKRhh2ZOSv30BGtcfgL2/z1olP9SXo0ZWZA== X-Received: by 2002:ac8:5dd2:0:b0:2e0:688f:ba8f with SMTP id e18-20020ac85dd2000000b002e0688fba8fmr13227062qtx.139.1647116449276; Sat, 12 Mar 2022 12:20:49 -0800 (PST) Received: from kcancemi-arch.Engineering.com ([167.206.126.218]) by smtp.gmail.com with ESMTPSA id o21-20020ac85a55000000b002e16389b501sm8186224qta.96.2022.03.12.12.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 12:20:49 -0800 (PST) From: Kurt Cancemi To: netdev@vger.kernel.org Cc: kurt@x64architecture.com, kabel@kernel.org, Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Jakub Kicinski , Charles-Antoine Couret , linux-kernel@vger.kernel.org Subject: [PATCH net v3] net: phy: marvell: Fix invalid comparison in the resume and suspend functions Date: Sat, 12 Mar 2022 15:15:13 -0500 Message-Id: <20220312201512.326047-1-kurt@x64architecture.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220312002016.60416-1-kurt@x64architecture.com> References: <20220312002016.60416-1-kurt@x64architecture.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This bug resulted in only the current mode being resumed and suspended when the PHY supported both fiber and copper modes and when the PHY only support= ed copper mode the fiber mode would incorrectly be attempted to be resumed and suspended. Fixes: 3758be3dc162 ("Marvell phy: add functions to suspend and resume both= interfaces: fiber and copper links.") Signed-off-by: Kurt Cancemi Reviewed-by: Andrew Lunn --- I removed the dot from the summary line. drivers/net/phy/marvell.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 2429db614b59..80b888a88127 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1687,7 +1687,7 @@ static int marvell_suspend(struct phy_device *phydev) int err; =20 /* Suspend the fiber mode first */ - if (!linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, + if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported)) { err =3D marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); if (err < 0) @@ -1722,7 +1722,7 @@ static int marvell_resume(struct phy_device *phydev) int err; =20 /* Resume the fiber mode first */ - if (!linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, + if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported)) { err =3D marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); if (err < 0) --=20 2.35.1