From nobody Fri Sep 25 18:21:01 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 D1622563FBD for ; Wed, 9 Sep 2026 15:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788966901; cv=none; b=DbbLUDjq60iDmbhFc2+1XXqv/v0wi9Up1HPOsHw1iIhdRJpAhWYlFoQYG1DaZ2BUgvHeAL56FcThE1MESaQN4aIrwC1SmMtCY4ELV7j5cGLDYCsPB/B/A5SltP+DJ2FuW/sRmSgnwn3uOmxgnqlzU2QxVmBd4qO26Dni30Mj5Qg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788966901; c=relaxed/simple; bh=f0k8e1Um/2ur8NWvk6H6Nte2peT/Kha5SrTEFCWanko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fbeahMJOMJgzITOuRQeG8Tk59bDNEDgLNggpABAPJSukcXNYgXUos6fVYZxJNJKvtDUVTOkM0sR7TBC193oMqOmf5PI4diTnDf/2sC5WJZsit6Id1uPjMGbbcHpQiX1DoRFvgtsOvE/MB0OAsR3FA9TCDZiQlkfkWYbOgfREB14= 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=pGjDr6IZ; arc=none smtp.client-ip=209.85.128.43 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="pGjDr6IZ" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4995b0343c1so83477575e9.3 for ; Wed, 09 Sep 2026 08:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788966897; x=1789571697; 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=DMQlD/kvEb1R1nr991pm2owfqsmrRszs+IoF8p64UKQ=; b=pGjDr6IZSRWBB32IhejURDsJT2Fkm8+DHgkzpDmCweN3rcBjg87v6l/Zi0yLnBQskf 3Y8UxcNSuRJ075RCpxQea9XmJ4mmyAVxpF0NX6QCIuCwhd3DBR6uQMrWcE9EOB7S9LS5 eXo2bVMdezg4RQKOPg5Yhf5tGi50wY4r4tIyPIdeITP5+c6d8Z4tcf4lzfc+GmARPDCQ ulusZh0Qij3nti+FCsF1XlWzi/IkHjrr768yJsWzpsimBsT2CUSNItDzPbe0QQc+FCYG fswWaaBhQyxXNGgv5sdnHSGvc+AJUe0obA4dtq75zhE5CFmJc02KVa6R8qKQshyJQsl3 3j9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788966897; x=1789571697; 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=DMQlD/kvEb1R1nr991pm2owfqsmrRszs+IoF8p64UKQ=; b=PafGwQmDL3r8rQTxZ5PsUZMpJvpEwlQRRLn3qoXX0EJpLUTbWWYaGnT2bUIPBMX5b8 pkYAUPDlwbELjREkd2DJuhrxh3iakqfOBW70xL82joigWjqTa0FGKCOD60TWWqeDZ3B+ kkCGWL6cw+5yV/JKbm/PyTgcISdhzTvCj5LpwuL7M6YE1SQw2Nb+1bpcLznuoBEV8+KJ dAOnPbzDjLe4XVsuE/tfLGUZGyXwid+lEWDYYI4EUeyr0+kkwjCQ8sb8iFM3cmyLco+2 O25EDDxDKdNM5hvKmPydSOpMa4vF2eTF4wv62X9lrIE0D/vdDVQzI2qy5/NTGHRCXhwk gkFg== X-Forwarded-Encrypted: i=1; AKwUvBxo9kIE/ohBDT4YLfmR7UCN6DbGQehYreQ32z3FrzkAMLrRU0beQtHc8l78SAxcL+cURZyU+noJpU1CqEo=@vger.kernel.org X-Gm-Message-State: AFuF++mIh9df1Ftx0eAmCzyIgcUcYqvJU3lRsyxfazYCkSgn91BvuqOZ ZZK1IBudvzubk8qpewgzzhF+TjlXD1i6IqFlbjz5f+azIL2/rPO83ca1 X-Gm-Gg: AYBFou1UaFXpDobvLjfu+ympeUO2JQmhhARIVC6azBzXDJx9lhllmMAeJt8Xn13/uSd T0S4tck3ZjO9VtOjrZ1R1ReFpVKXWltBxkvrvrZSwyxyOvmhcTyjj6hs93PpGdkks6hPujauIW7 o9iukrGinN31nntqFc1b35r1DOYRN6TuhRHU1PXIcQCbbnyc7ogxE3u/9ByhlAo0c5eQerB9wxO x/jT1oVHMF13GiB5XW/eRogcxW5uwb4ScWl/ViHUUf2N9vYBZV8UG04k9wOMSCMrPXk/n/beIKV zr4NsOfSjZCi5kBYKwZrzGpP20mfgsJsXjWHU/gJG7HfSfONxU6qBJnsYzN2yLh4clqWaXpFB6j d868r2fzHKy8WTHfB9Z3bFCDJxajRU9UKl0nXJOGbuKjK8KyvN8b39MEg+/6oG9pwOt/3+ZhXTT yRaFCUQ8lngI0tnpeoODuV/RGiBX39EREz7cOebktAE2/YhA8oMn5l5K+Dwjp+J6wHstHx14yxl VsjRyG2FHAaHN54tUh5fL/p1pbgRG+lAuBYMyamMr0= X-Received: by 2002:a05:600c:8b48:b0:49c:fff9:f684 with SMTP id 5b1f17b1804b1-49cfff9f6efmr275799555e9.21.1788966896538; Wed, 09 Sep 2026 08:14:56 -0700 (PDT) Received: from localhost.localdomain (mob-31-26-103-238.net.vodafone.it. [31.26.103.238]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49cf755c22esm483644155e9.0.2026.09.09.08.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 08:14:56 -0700 (PDT) From: Oleg Keri To: Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Bjorn Andersson , Johan Hovold Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Michael Scott Subject: [PATCH 1/2] phy: qcom: qmp-combo: do not decrement init_count on a forced init failure Date: Wed, 9 Sep 2026 17:14:42 +0200 Message-ID: <20260909151443.10276-2-okerixx@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909151443.10276-1-okerixx@gmail.com> References: <20260909151443.10276-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: quoted-printable Content-Type: text/plain; charset="utf-8" qmp_combo_com_init() only takes a reference when it is not forced: if (!force && qmp->init_count++) return 0; With force set, && short-circuits on !force and init_count++ is never evaluated. The error path decrements unconditionally, so a forced init that fails drops a reference it never took and init_count goes negative. init_count is a plain int, so the damage persists for the rest of the boot. qmp_combo_com_exit() then sees a non-zero value in if (!force && --qmp->init_count) return 0; and returns early every time, so the clocks, resets and regulators are never released; the runtime PM callbacks only bail on exactly zero, so they keep touching hardware that may already be off. Both callers that pass force are the typec_switch and typec_mux callbacks, which tear the common block down and bring it back up on an orientation or altmode change. Only decrement the count when it was actually taken. Fixes: 2851117f8f42 ("phy: qcom-qmp-combo: Introduce orientation switching") Signed-off-by: Oleg Keri --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualco= mm/phy-qcom-qmp-combo.c index bf4d29fe1719..7d740ed0ce16 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -4253,7 +4253,8 @@ static int qmp_combo_com_init(struct qmp_combo *qmp, = bool force) err_disable_regulators: regulator_bulk_disable(cfg->num_vregs, qmp->vregs); err_decrement_count: - qmp->init_count--; + if (!force) + qmp->init_count--; =20 return ret; } --=20 2.55.0 From nobody Fri Sep 25 18:21:01 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 5A9E8563FA3 for ; Wed, 9 Sep 2026 15:15:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788966901; cv=none; b=bTy7tHtXSeHZvfN3bwScmMOUmJCm4Gq/dlznktoEZklXGb25ZEjK1+dclrsvSMysiUXvGcV4MFNvxAITJNTOo/ErQcTJE+djVIhoBgOpUdtnjpHEpOt5z2M+gKWYeSd8nhJG07hFl/XHf7zSH7OK0Zt43dzQq1ESuEsu0RgIaB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788966901; c=relaxed/simple; bh=CzXLOmxgDqahnxvEdsm2tQ0tAQuF+lJlxppti2FcKYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hc2cYY3UrLyYfd5WvMBBeaCEQ2Do360s7McETr3VCE22W0EA9g5u3HV++Ov+OkbNi7HONdZ1AeKOCrESWAXXSBIatqAlNECj0nRPY+As3xpEyArMDApg0zCnrT9Qt3eDGV9gsnqoUXHE/jVRXCF0yAoUilyrwtGEdkB1sm+0Rjw= 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=MFT+TMQU; arc=none smtp.client-ip=209.85.128.53 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="MFT+TMQU" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-49d0b98d6d0so39591925e9.0 for ; Wed, 09 Sep 2026 08:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788966898; x=1789571698; 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=5Hgb+fNNqz3kjuFAqgV/JYmpECXZZxwWjRWGYVFo2S8=; b=MFT+TMQUj5FkFJJ2+j75E22nkp95SeCl79pTFjL2DSGrrns/qZX5of+sE2/bzs79te /c/5wLrgcTdUinp/oVThapsde0DBEuaMJ2OsvkimU5pY6kVY+cF1qNSIUXyoM97t26G3 +sJmkNjo5COtHfM2lGOSFA/eqV5Dt1+69WO9tl991aqIf+Ult9hwk79YSCdItJX9V3Zv +9olFzSMkBTJTrgaW3TAu2yzPsdcHF2yyhX9AA6wfydSJEcDuDN9ZyoNqgAaQ4q4rYTC Zr7+uuSWIj3aAoDOXWTzpxUT0wB6/uGVjZy9fhzCvZZKNdt2kqcU34/8RWc66lx+pGkr Lrww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788966898; x=1789571698; 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=5Hgb+fNNqz3kjuFAqgV/JYmpECXZZxwWjRWGYVFo2S8=; b=EnBkXTVL2xI6MyEWpQ2+4ibV3EX1naC0FCIpT4ex5JY3Gk3Ep4nirWho2mFnTJvDOh UvvlqPo0HIq0Klc7xiIX3B1FOtUY4LmvSP6OeeyhWy1YYE8Ebw5qgJf5SAVURd2tjnjJ WvAQGbEefi0N9Kb5FDcPpAMnzS5l9JjdVNfWAmjP/g7l3YhaTZg/4HHEYZmGzMNfDUmI q6ehg2bmmqRZtvOXN2eTwv0qmdolY8XfujRyryyeXp7lFBRt0hjssuG9vku+B9YP9I6i ebo4M7rHzIQFfjCnCIYGwKLjC9+qskdj+7L/6Q89MipYe3WQRgwjSUlObTPQ2aRMFtoi dGjQ== X-Forwarded-Encrypted: i=1; AKwUvBy/4pWKpwGTuK3Tw7QLh775K8JOBkb/AVWu0pnsf9nu9NsohaXAUvCQzHk9iQl7f7H1dViayLyrIO6TPaU=@vger.kernel.org X-Gm-Message-State: AFuF++nw8TQ5IWPaLldFzFDqkl+wHegjhb3w7J+7n5JoqIkAGEd9t/ee SSxzZ5z+b5x3lpVZ2L/p+LZxkCwHj8XLW+bsd5jLTIjfCIrsDZQ5Jwr6 X-Gm-Gg: AYBFou2GEdY63cNN/sDMO9BUAuTAiPUfGC6fgpKy+roQp8Q9adfLWJbz6iGqWBBUnFz jFrNgmHZA3YKb/93A7kU8iQoZyObpSFpsmtZAjgsWm2MvJxaM8UU9aRIsokN/51aZG3tlVXUJ35 TefxmI8E7DvUMv102OhXCVGxntx1kolSnnsZ1hC/54cpyZO7KYHZ7M9AlItVEDzzfaLd8Pf9W1b dD4ArWzaCs6Ya9wduSnXWyNt0F6zAaWegOGFLZ9SLz8QTkFbvaRiOxeXiH3VJ+ttaKPYkNfqmjq sMlrljvYQmoh8nkYw5uqS/fMyhdJfYlVDWka1wpSRb4859h1dHK6htWTNn0urMJVUOkalgxyxhh p7z16INFituiW7DzSaCDkAKd/eRBfyyuW4HemLx4FsusRHchHdDRu8yMxSwuOnvSqR8Zt/6XnK/ FL679znr6ubyz4C9xonM2+3qm1txd5Mqw4rgfvH6LMIDjTMxaaNdHYbPWsKGGLTTGhLgIHynnjf OuDiyVAn8YwwJE0nyl6bhxlNf0tUj/zIq/YT5T5vAo= X-Received: by 2002:a05:600c:198d:b0:49c:fa21:1c7c with SMTP id 5b1f17b1804b1-49d1ed0b452mr66471895e9.17.1788966898403; Wed, 09 Sep 2026 08:14:58 -0700 (PDT) Received: from localhost.localdomain (mob-31-26-103-238.net.vodafone.it. [31.26.103.238]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49cf755c22esm483644155e9.0.2026.09.09.08.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 08:14:57 -0700 (PDT) From: Oleg Keri To: Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Bjorn Andersson , Johan Hovold Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Michael Scott Subject: [PATCH 2/2] phy: qcom: qmp-combo: check qmp_combo_com_init() in the typec callbacks Date: Wed, 9 Sep 2026 17:14:43 +0200 Message-ID: <20260909151443.10276-3-okerixx@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909151443.10276-1-okerixx@gmail.com> References: <20260909151443.10276-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: quoted-printable Content-Type: text/plain; charset="utf-8" qmp_combo_typec_switch_set() and qmp_combo_typec_mux_set() 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_combo_com_init(qmp, true); if (qmp->usb_init_count) 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 callbacks then carry on and qmp_combo_usb_power_on(), and dp_aux_init() after it, write PHY registers with no clock running. Propagate the failure instead. Fixes: 2851117f8f42 ("phy: qcom-qmp-combo: Introduce orientation switching") Signed-off-by: Oleg Keri --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualco= mm/phy-qcom-qmp-combo.c index 7d740ed0ce16..44b6f29926dc 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -4924,6 +4924,7 @@ static int qmp_combo_typec_switch_set(struct typec_sw= itch_dev *sw, { struct qmp_combo *qmp =3D typec_switch_get_drvdata(sw); const struct qmp_phy_cfg *cfg =3D qmp->cfg; + int ret =3D 0; =20 if (orientation =3D=3D qmp->orientation || orientation =3D=3D TYPEC_ORIEN= TATION_NONE) return 0; @@ -4938,15 +4939,19 @@ 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); =20 - qmp_combo_com_init(qmp, true); + ret =3D qmp_combo_com_init(qmp, true); + if (ret) + goto out; + if (qmp->usb_init_count) qmp_combo_usb_power_on(qmp->usb_phy); if (qmp->dp_init_count) cfg->dp_aux_init(qmp); } +out: mutex_unlock(&qmp->phy_mutex); =20 - return 0; + return ret; } =20 static int qmp_combo_typec_mux_set(struct typec_mux_dev *mux, struct typec= _mux_state *state) @@ -4955,6 +4960,7 @@ static int qmp_combo_typec_mux_set(struct typec_mux_d= ev *mux, struct typec_mux_s const struct qmp_phy_cfg *cfg =3D qmp->cfg; enum qmpphy_mode new_mode; unsigned int svid; + int ret; =20 guard(mutex)(&qmp->phy_mutex); =20 @@ -5012,7 +5018,9 @@ static int qmp_combo_typec_mux_set(struct typec_mux_d= ev *mux, struct typec_mux_s qmp_combo_com_exit(qmp, true); =20 /* Now everything's powered down, power up the right PHYs */ - qmp_combo_com_init(qmp, true); + ret =3D qmp_combo_com_init(qmp, true); + if (ret) + return ret; =20 if (new_mode =3D=3D QMPPHY_MODE_DP_ONLY) { if (qmp->usb_init_count) --=20 2.55.0