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 E0F54222590; Mon, 2 Jun 2025 14:17:23 +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=1748873844; cv=none; b=RgHqoBHPK91A13cBcEALubP768Lcd7iOnqm1dSC7HKpzG/frj8GsPGFBfLSYQO7T7H8A2QsqqWhZ/+non7QuMEdcR0UX4t4YC0XZkAXywodhXTtYFGdbH40yeCWqaxRVKYGOAvqBR+WfSgK5Ne8IVAOO1mLb2R3KVEZob2wBb24= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748873844; c=relaxed/simple; bh=QC2UVfSPRXwE+qliqaKmF8F5JrwljPvi5FrqkXolN28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J/TNzNaoucpm1+mI+OTwRPKNT8HwJqwJJDUUPO8Hes0O6qmDF6F8Iwo0fkdZl3vzGTUH8Srb1FH9fVfp6eBEEGR5F5UopIMTuTpsmxQHSikHXd3qZDmAw1BcwY1Wpf8NfqMMWXAiZ8mcjEhwNhlnlwfd5+ydz/8Uo1NAwTTplZU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZOKzQ2G2; 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="ZOKzQ2G2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62A92C4CEEE; Mon, 2 Jun 2025 14:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748873843; bh=QC2UVfSPRXwE+qliqaKmF8F5JrwljPvi5FrqkXolN28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZOKzQ2G2yrcaom1X8sD6yxMrW+6MZ8gmFKeFbfmLckKYMEEDPrXgeeOKyaGCf8LfW LXicPxnFyuXazL4Rl+M8FKJ76YSbW4gTdMKSwU3apHInM9K8Rafc5Q7dLSkUlfmnjD A/f2ObLp7VA5VAZZ7KuaDnY/YQFy6M2f44WD/ytg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Damon Ding , Dmitry Baryshkov , Vinod Koul , Sasha Levin Subject: [PATCH 6.6 241/444] phy: core: dont require set_mode() callback for phy_get_mode() to work Date: Mon, 2 Jun 2025 15:45:05 +0200 Message-ID: <20250602134350.695888039@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134340.906731340@linuxfoundation.org> References: <20250602134340.906731340@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit d58c04e305afbaa9dda7969151f06c4efe2c98b0 ] As reported by Damon Ding, the phy_get_mode() call doesn't work as expected unless the PHY driver has a .set_mode() call. This prompts PHY drivers to have empty stubs for .set_mode() for the sake of being able to get the mode. Make .set_mode() callback truly optional and update PHY's mode even if it there is none. Cc: Damon Ding Link: https://lore.kernel.org/r/96f8310f-93f1-4bcb-8637-137e1159ff83@rock-chips.com Tested-by: Damon Ding Signed-off-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20250209-phy-fix-set-moe-v2-1-76e248503856@linaro.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/phy-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index a892e1d7e2d02..9417372a01554 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -400,13 +400,14 @@ EXPORT_SYMBOL_GPL(phy_power_off); int phy_set_mode_ext(struct phy *phy, enum phy_mode mode, int submode) { - int ret; + int ret = 0; - if (!phy || !phy->ops->set_mode) + if (!phy) return 0; mutex_lock(&phy->mutex); - ret = phy->ops->set_mode(phy, mode, submode); + if (phy->ops->set_mode) + ret = phy->ops->set_mode(phy, mode, submode); if (!ret) phy->attrs.mode = mode; mutex_unlock(&phy->mutex); -- 2.39.5