From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795025234; b=Pc6++/Ry8umiNIdGxl6IRd9e3WTmecxacjsxWb8EALpeYzpuEvUwQf6eULFiseos1tu9 ajjawJNMw3RoMNBnKiyNyEV73OGnITgbL037aACE2pM5EkS3U1vulyVgeG/dmIBK4di/J 9TVDzUx+JdJo60OyMtVuSSmX7eQFYdzVkFmnXjpBXcrBlBfGJLFgfRniMayYOVY1FI+u8 yXyM9bSwZ6DHeDKaloQifKyIC8RHJmTN47Q41MCIgQVcu5hAKqnRAyzziylDQoxz6ZTIz 6jTbVwXzPmbnGKOnqibk+5eg0DWlWny+LgI3nbTqEMtOAkgC6mROTYyEKYYYjaV7/5Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795025234; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=0qKGa8ObF/vAzxrndKlw1tNMoqX1+XKTcEsdhr374Eo=; b=Yz94qaMAptQhpnO3vDMJ+gPx5v87abr9iZaAxqEDI32H60X/xBH7Sk5DlV/9CuWUGGUG bd7EeYfEMC1/I//khiR5tLBm2i9gkqaTie/h32Gs8TUtn9PjT/zo7gSmHlBisI18J4CGZ 6DsGlVhq0TWqsgNNjdMgtDLHRGjRqSWhbxzIF1keLvYApn0g7od+ZFPzBKg9qYi043ZK/ yCriOWQjrH//HzaQSeRwzICL/+Cr735v9Mwf1uexrr88HMthp/An7WQGHqDEj82czKRG6 T0G/vjblyatwAliMnn9J0ZBZWrOfWu4KZDecXCEBNAX6g4Onz0iOHrqX4O6JZ31WhwQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Ej88HFpE; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78307606A320; Wed, 18 Nov 2026 18:07:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Ej88HFpE Received: by smtp.kernel.org (Postfix) with ESMTPSA id D23E91F000C7; Wed, 18 Nov 2026 18:07:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795025234; bh=0qKGa8ObF/vAzxrndKlw1tNMoqX1+XKTcEsdhr374Eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ej88HFpE6TcP141xmLF31QxcagEZ7tM8ozq/OW3UUxcovkvVPezCGMj7w3F/OHl7q /tiuS6nCdUpGgzk09/Wm+LO+uvpWAkEDvHi3B0IaP7ZsAtCjq+0LJnomAiK/J+hKTg ORVH798lgamC11AADNfvktbwJz5Om99TjAvD2E/g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Sebastian Reichel , Manivannan Sadhasivam , Vinod Koul , Sasha Levin , Igor Paunovic Subject: [PATCH 6.18 1006/2151] phy: rockchip: usbdp: Handle rk_udphy_reset_deassert errors Date: Wed, 18 Nov 2026 15:45:41 +0100 Message-ID: <20261118150159.081888652@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Reichel [ Upstream commit 35101e2f49c04bf1cfc69b8a0d3f85c742369ccc ] Handle rk_udphy_reset_deassert returning errors to avoid theoretical (Rockchip reset controller driver does not return errors) SError. Fixes: 2f70bbddeb45 ("phy: rockchip: add usbdp combo phy driver") Reported-by: Sashiko Closes: https://sashiko.dev/#/message/20260626211151.2332F1F000E9%40smtp.kernel.org Tested-by: Igor Paunovic # Orange Pi 5 Plus Signed-off-by: Sebastian Reichel Reviewed-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260915-rockchip-usbdp-cleanup-part2-v15-10-8d507cb1174f@collabora.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 25 +++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c index 4a86da0617a92..f50346a16ba7b 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -771,8 +771,12 @@ static int rk_udphy_init(struct rk_udphy *udphy) /* Step 1: power on pma and deassert apb rstn */ rk_udphy_grfreg_write(udphy->udphygrf, &cfg->grfcfg.low_pwrn, true); - rk_udphy_reset_deassert(udphy, "pma_apb"); - rk_udphy_reset_deassert(udphy, "pcs_apb"); + ret = rk_udphy_reset_deassert(udphy, "pma_apb"); + if (ret) + goto assert_resets; + ret = rk_udphy_reset_deassert(udphy, "pcs_apb"); + if (ret) + goto assert_resets; /* Step 2: set init sequence and phy refclk */ ret = regmap_multi_reg_write(udphy->pma_regmap, rk_udphy_init_sequence, @@ -798,8 +802,11 @@ static int rk_udphy_init(struct rk_udphy *udphy) FIELD_PREP(CMN_DP_LANE_EN_ALL, 0)); /* Step 4: deassert init rstn and wait for 200ns from datasheet */ - if (udphy->mode & UDPHY_MODE_USB) - rk_udphy_reset_deassert(udphy, "init"); + if (udphy->mode & UDPHY_MODE_USB) { + ret = rk_udphy_reset_deassert(udphy, "init"); + if (ret) + goto assert_resets; + } if (udphy->mode & UDPHY_MODE_DP) { regmap_update_bits(udphy->pma_regmap, CMN_DP_RSTN_OFFSET, @@ -811,8 +818,14 @@ static int rk_udphy_init(struct rk_udphy *udphy) /* Step 5: deassert cmn/lane rstn */ if (udphy->mode & UDPHY_MODE_USB) { - rk_udphy_reset_deassert(udphy, "cmn"); - rk_udphy_reset_deassert(udphy, "lane"); + ret = rk_udphy_reset_deassert(udphy, "cmn"); + if (ret) + goto assert_resets; + + ret = rk_udphy_reset_deassert(udphy, "lane"); + if (ret) + goto assert_resets; + } /* Step 6: wait for lock done of pll */ -- 2.53.0