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 45DE23BEEC4; Mon, 5 May 2025 23:23:39 +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=1746487420; cv=none; b=lKnURYwUwXiX6+osriU++JZcL1uhCr7n1nE/QM7PEbuP7Jud4oDxvbjpw4IDYYvIsbXLtsaa2FU+5QaJGLZHHjTWtDWwFRUCi4TVBglI2ZV3QD4T9SCD436svlGaNK9nq57TwbCnPg8jqaafnD3xQQApJMbdgyKkjmClOEoJBqU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487420; c=relaxed/simple; bh=e6EjrVCX7JbG3XU1rbqsmjOintgDWviy07DAme+S1kA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LWGUQB3xKkHKjTkc1f5J60Pfb+Fxu7oigMadmxcZkgz+kcKxHosUrWNIV4KxStsiaZlQEkUGb24RoBP52aGNvSdMbowcctQCZMqaWXdu3XZxVEevOh7sI+cvyd3JK9G02dSitfx3BU47AaYIrrhTRakecyrYgkUFh4T6xvoMgU8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H38Zy5i+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H38Zy5i+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A41BC4CEE4; Mon, 5 May 2025 23:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487419; bh=e6EjrVCX7JbG3XU1rbqsmjOintgDWviy07DAme+S1kA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H38Zy5i+Z0Fs5gbgYErlWY5itQoALS/dczUd5eu6HvGv6tFspBPTcAzYYApEGuZ4w fmmf0xM6JpkPQ8a/Cj5LleDpMC6u3eRJXJ43nihonR1PsVdlG8tFrA6A0IuS/WhROu dnKp9MfOjZ/ARgGsDzHWvHCNE4Vup+WEjuLhQZT7/d1My4LiznJpDD7C6iJHpE9/uE 6hQ8D4V4OwguLIGCBMvZJJ6MS8DrRPZNnJkfBKY604Eh8uFwKclzQ67acJT8+nEiK0 cP+HODBRppN8WJtFZeXBUUxxM35WSDINhhEUX+HISAEBHA/H3tAkVfuy1vx3yYJxa2 QqMeyAZhIBnvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Baryshkov , Damon Ding , Vinod Koul , Sasha Levin , kishon@kernel.org, linux-phy@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 61/79] phy: core: don't require set_mode() callback for phy_get_mode() to work Date: Mon, 5 May 2025 19:21:33 -0400 Message-Id: <20250505232151.2698893-61-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505232151.2698893-1-sashal@kernel.org> References: <20250505232151.2698893-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.293 Content-Transfer-Encoding: 8bit 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 c94a0d2c45161..917e01af4769f 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -360,13 +360,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