From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr2-f12.google.com (mail-wr2-f12.google.com [74.125.225.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B928354AE3 for ; Wed, 16 Sep 2026 12:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789563398; cv=none; b=DL1mLDDwd+YJwDAAf/cWaRTJIucDsjOLEKIZOuuM+kwJXBoY9UYC8RDGTD1501AEQ3oK/S0a3dUHSqltSc9QxQ4wkmIX2Px2W4dUqiVWheOpqIzBweWJY4i+QDhbPLyU1XyET9D9bg4VvwbtjZDPKg/gzZXRGZs7Z6+m+4GDaDg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789563398; c=relaxed/simple; bh=97JmprBqbeoexeJnNQ50AWIZviL4S7SD0NO1tVXsgKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bcn67HWU3+eShI1p5pHbP1Xz20/j1e+iHpBCHvWUht4UOiofoGpwY4wf/8gH3h64TAJkgKwEpc7MeBIK/nd/R4sFGwRxPjHKlWnxpnwkBS1naAkieA0xkSkIiC9cYTHEf0+Vzq2K45pxjMjODWeREkD4EdwFhC9IAMx2yVHlYqs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BWpz5N1r; arc=none smtp.client-ip=74.125.225.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BWpz5N1r" Received: by mail-wr2-f12.google.com with SMTP id ffacd0b85a97d-485933b24c3so472233f8f.0 for ; Wed, 16 Sep 2026 05:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789563390; x=1790168190; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ka5zpxp/jCsYjEbSlG1itlHgACxSBnD5svSTVFgMxoQ=; b=BWpz5N1rKqSglVhiC7uzoHIaVvtCEIFpJuQ9DShTdK5FnCq6mm/eIizPONhVnkrUjD 4/IZtlWE8D4yFu7/wcQoi/AAd/if/4CfdYAruU6xaRaKDOacQq0B/2a8YrvqjVud74h3 jDnSOZt3X4EP6YSezi18J2TuD8Z6MAdKRbRtFECiUWiLC6EyTBVop1x/VdsytiJFJbO0 Zf/4QVY/bXHJkJw/LdlStS9yzStkSbNaEuvlgaIQK9qr2rOpzIS0EMgXIXXASiB3KfuP tiWuehPLTlSD19B3QNDt78A2yCV3KPr+lbsD3UEAve5SvrFda0KWAqSipZJXDtj3piuE KhKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789563390; x=1790168190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ka5zpxp/jCsYjEbSlG1itlHgACxSBnD5svSTVFgMxoQ=; b=ZjKmr2Jiq9RkWk8TCANMSG3oGjQJ620+uV5qF1lx3veX8xBNQoxUgTTGis5RjJNGWL VWHRJdTPSJBEvoMIyKb20rxrTvq+ejIGUpsSMYlwqXifW21tYGTSoQvg+DL736gfSdLp i0du8FlopzTDGtDqsHYCQ29GxjBJUrZKcJuqe5VlDNvkt+MrunckHtGyaI6hHEMv8Q36 ur3dPeUtJKuCspHjvyFUve9tYgnt+923Hc4lmCp52mGy/OG1h5R1jwohPjFmgpAsKGXg EQ/TMtCJPgDY2QVxqbgEd2Gf5NVUQnFN8sf+9YO5hdugfjeoHFjtCEHH+m/Gc1SUl9ff xzXw== X-Forwarded-Encrypted: i=1; AKwUvBxkpvNzgnHTm0QwFtoV2TYOkZZSXJppF+dVPPA7aaW+sRpy+oUuk/Pqyw55wsvxXqf6okRkOGmaispKFBM=@vger.kernel.org X-Gm-Message-State: AFuF++l8y9gsHyiFdeUzaqLsP3cLXj6hgjQee6DAj+r5uBx/blXNBti6 oUoktg4pCvv4DTJXbI4DVXmjIOrpsKkIpR6fo+a4Tc2CHU+B3EiKyE/m X-Gm-Gg: AYBFou0kMjuOu9gjX87KX5E0Z5Jqog98NCFsuL8AzWRkRuKIqu8/nEfoPI4wX/r1gIz FNmgl9hDIuFSmLMsZYO9CtCdxtb8/acKIhp2vhyfGLFV9PURSrhA9H+yDFacaAvjgU3wTRhN2jZ +c44xHoREeAinMiVOu1pif7KjGrZ78mtP+Wv5HkfCUiOuaQCjTMwFYeaviu63eJF6kYVK83aM4P KQI61XRrdJ2GlJTZv9TuAlaW5OpKUYAafl56vVknrRsvBJYnf5uL1XfDu30Yxag1W0t2er2SG5t GDrNaENNEidZaxbP87c61aa/jqWnP5iAlt8yB+uoW00bqjao36RcfLePLoLbKYb2Vltuup+0j7y OpN2NsAu9lpFj9SU7CiP0cYCQhZwVRhk3fOZoelmmMAtIvw7SkIyJXZQoWdy+U892+8lUMaGDBl 8ChygZe1yvRhsDEpvLZoHM8pOUtnLlSENIpRK7lzEJQXC3Kin11Al+43Kq3Ng+fpHZRhEzB0udK Id4Vs38+fM= X-Received: by 2002:a05:6000:460c:b0:487:767:b301 with SMTP id ffacd0b85a97d-4870d2921d6mr2931012f8f.57.1789563390295; Wed, 16 Sep 2026 05:56:30 -0700 (PDT) Received: from localhost.localdomain ([194.154.195.114]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-4870bf342a0sm6750729f8f.24.2026.09.16.05.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 05:56:29 -0700 (PDT) From: Oleg Keri To: Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Johan Hovold , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Konrad Dybcio Subject: [PATCH v2 2/2] phy: qcom: qmp-combo: check qmp_combo_com_init() in the typec callbacks Date: Wed, 16 Sep 2026 14:56:19 +0200 Message-ID: <20260916125619.4587-3-okerixx@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260916125619.4587-1-okerixx@gmail.com> References: <20260916125619.4587-1-okerixx@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit qmp_combo_typec_switch_set() and qmp_combo_reconfigure_phy(), which the typec mux callback and the USB4 init path use, tear the common block down and bring it straight back up on an orientation or altmode change, but they discard the result of the bringup: qmp_combo_com_exit(qmp, true); qmp->qmpphy_mode = new_mode; /* Now everything's powered down, power up the right PHYs */ qmp_combo_com_init(qmp, true); if ((qmp->usb_init_count || qmp->usb4_init_count) && new_mode != QMPPHY_MODE_DP_ONLY) qmp_combo_usb_power_on(qmp->usb_phy); If qmp_combo_com_init() fails - a regulator, a reset or clk_bulk_prepare_enable() - it unwinds what it had brought up and returns an error, leaving the clocks disabled. Both paths then carry on and qmp_combo_usb_power_on(), and dp_aux_init() after it, write PHY registers with no clock running. qmp_combo_usb4_init() already checks the return value of qmp_combo_reconfigure_phy(), but never sees a failure from it. Propagate the failure instead. The PHY is then left logically initialised with its clocks off, which is the state any forced bringup failure already produces and which these callbacks have no way to report to the PHY consumers; what changes is that the register writes that would fault no longer happen. Fixes: 2851117f8f42 ("phy: qcom-qmp-combo: Introduce orientation switching") Signed-off-by: Oleg Keri --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index f6d3320a59d9..ae70ebba36c4 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -4601,6 +4601,8 @@ static int qmp_combo_usb_set_mode(struct phy *phy, enum phy_mode mode, int submo static int qmp_combo_reconfigure_phy(struct qmp_combo *qmp, enum qmpphy_mode new_mode) { + int ret; + dev_dbg(qmp->dev, "qmp_combo_reconfigure_phy: switching from qmpphy mode %d to %d\n", qmp->qmpphy_mode, new_mode); @@ -4615,7 +4617,9 @@ static int qmp_combo_reconfigure_phy(struct qmp_combo *qmp, enum qmpphy_mode new qmp->qmpphy_mode = new_mode; /* Now everything's powered down, power up the right PHYs */ - qmp_combo_com_init(qmp, true); + ret = qmp_combo_com_init(qmp, true); + if (ret) + return ret; if ((qmp->usb_init_count || qmp->usb4_init_count) && new_mode != QMPPHY_MODE_DP_ONLY) @@ -5166,6 +5170,7 @@ static int qmp_combo_typec_switch_set(struct typec_switch_dev *sw, { struct qmp_combo *qmp = typec_switch_get_drvdata(sw); const struct qmp_phy_cfg *cfg = qmp->cfg; + int ret; if (qmp->qmpphy_mode == QMPPHY_MODE_USB4) { /* QMPPHY has no orientation handling in USB4 mode, don't cache the setting */ @@ -5186,7 +5191,10 @@ static int qmp_combo_typec_switch_set(struct typec_switch_dev *sw, qmp_combo_usb_power_off(qmp->usb_phy); qmp_combo_com_exit(qmp, true); - qmp_combo_com_init(qmp, true); + ret = qmp_combo_com_init(qmp, true); + if (ret) + return ret; + if (qmp->usb_init_count || qmp->usb4_init_count) qmp_combo_usb_power_on(qmp->usb_phy); if (qmp->dp_init_count) -- 2.55.0