From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9202127E045; Wed, 20 May 2026 16:57:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296261; cv=none; b=tjwNnAKXuliyZsyiOOJjjE/a+1aVqiR46kpvx2M3b1drl7CH/CH/GXA+RZ7d0+3smrUj7fpoqZE/7CwSqplpKFCHdXcq3f9nZ81Ik3nGHVGHFlTpVHrp6QRpUOznsoPvIVn9W0gXJ7n/hFW9agK8tgbEy4f9CeEu+BGxoqo7W1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296261; c=relaxed/simple; bh=YA/Q/MnB+BbtLl5EzWbFwbNBJs4qhmoDTc79qcZ9uYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZszsW5Sl/XfBqu91xAoTZ9QMHD5kfpjfILg1LhEIw3nZYvgzMNCqA2neeXk8ynYJ7kYDsCq4im3eRDU2yEXbmOH3UkyhSmQ/36FM7bS+xK+rUerkuX2pe3w7xcERACeYOqN/qiUrqmz7kBsM8g8DO8gdZmvvgYdHrZyV5G4nEao= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M7cwZ8Ml; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="M7cwZ8Ml" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 043781F000E9; Wed, 20 May 2026 16:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779296260; bh=NmWkiWeSrusF9ZDvoz0aEkpz1sW/OsFGdaawBTWIXck=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M7cwZ8MliuUDLGM+CXm/6yfyNuxfDGQwDl69atiBwnjDDBgar85g6BueakF1MsTJi vt0EYTg2FzcS+FetfTGsXTOZfFI+901YHjw4skxIUQceTFSizPxtysO/bs7PM0pCdP t/uoZlT11blskOf1qH+GwTXp4VPkJT3jD2xqO6Pc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vladimir Zapolskiy , Dmitry Baryshkov , Bryan ODonoghue , Bjorn Andersson , Sasha Levin Subject: [PATCH 7.0 0730/1146] clk: qcom: gdsc: Fix error path on registration of multiple pm subdomains Date: Wed, 20 May 2026 18:16:20 +0200 Message-ID: <20260520162204.727177293@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladimir Zapolskiy [ Upstream commit 16ba98dace9e7cfe25ad8a314e34befacd91f86f ] Some pm subdomains may be left in added to a parent domain state, if gdsc_add_subdomain_list() function fails in the middle and bails from a GDSC power domain controller registration out. Fixes: b489235b4dc0 ("clk: qcom: Support attaching GDSCs to multiple parents") Signed-off-by: Vladimir Zapolskiy Reviewed-by: Dmitry Baryshkov Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20260328012619.832770-1-vladimir.zapolskiy@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/clk/qcom/gdsc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index 7deabf8400cf6..95aa071202455 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -518,10 +518,20 @@ static int gdsc_add_subdomain_list(struct dev_pm_domain_list *pd_list, ret = pm_genpd_add_subdomain(genpd, subdomain); if (ret) - return ret; + goto remove_added_subdomains; } return 0; + +remove_added_subdomains: + for (i--; i >= 0; i--) { + struct device *dev = pd_list->pd_devs[i]; + struct generic_pm_domain *genpd = pd_to_genpd(dev->pm_domain); + + pm_genpd_remove_subdomain(genpd, subdomain); + } + + return ret; } static void gdsc_remove_subdomain_list(struct dev_pm_domain_list *pd_list, -- 2.53.0