From nobody Sun Dec 14 07:59:44 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 AB4841FF7D5 for ; Fri, 17 Jan 2025 13:54:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122053; cv=none; b=fytG9bDYZYhkzrJ9qA6s18exb5FB5mB3jAGubfGYtFvbDzuGY6zb/D3yKbKNwm23LtHS9+/JHYKRRt/DZEfvOC13xLGj5pGlVFpBjF5kEBvxQEjHyP9ih14RbDai15d/oCqkv24bUPcxLZ0kaJulka0TFbDJ49UULUKgqvZI2Q8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122053; c=relaxed/simple; bh=omQ0q5abBpkqFmtYz9fwRWfVIX08QuZYwIw+MD/b79k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k6KGE7LQetVMzwONHYO8Z0mr//DjSQYynkR/LVep9KaDoZWR2dVwE8zsBBltPNalrlhmp/rLvfAP5lqg2cqa5ovx1eIFI/5tQBIQBXKq59rGDMnD/YrMn8T/GeGktwkMTJGmBnYRtS8vfChStaDKhDtyIXL5HTDNAw8LFgw7vt4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=mwrVVWG8; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mwrVVWG8" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4361f65ca01so20558995e9.1 for ; Fri, 17 Jan 2025 05:54:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737122050; x=1737726850; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=15Ks6wACBMUt+4Fhjb6F/swKHnhyTvT40HtN0zm9yGU=; b=mwrVVWG8w/RSivIzMfzqWiK5Qcb3+bwgwMj5kQ6uixnvHpWThQXSYwRvlgf2936N3N UlCoDENsk3KKsOgRGEp4RuptBjLEN9ODcIuUDmvH6cHTYvTaJwF/Mjj8MJq3h5FoloA4 PeRnVgXFpACxnGIOieCtHGoUaT+pPQDmwILSkbRAqnpTx/A61tOrCa7u7lG+uFSfI8bN 28zA4QFbHfYl5z283A03ZnqiVRlfahQrn0pVE7veTR64DJNMgmQ5zSyg0JAO6ePYm9rX 2KTjjSxBQGynbesuaHX3b5x7w7M/L3bDvL07gGvWLOTtFHGunDAIu5ckeL7cwLCFLGzZ 7pug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737122050; x=1737726850; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=15Ks6wACBMUt+4Fhjb6F/swKHnhyTvT40HtN0zm9yGU=; b=AtJ/FjOyb8GsYHVeXqUQGiC84AKlImnLAyyLbaeWY118gU4eiZRnVd/Aj4I/aCzd5F wdCqp4bMDFK2l/BJEWvxvC9rYYw2LeVWJR0O9yF4mS2h92X/WLE/Am0A11ctxlEPhamP ZC01U/6wLni1WgQ/hFxnLkr4aECXOjZApp74pfX+8y7VZo4j+byr0RMBV+SE2fE2iNcc fLFZqOXnKgAuUCpnRkstwz9TdWOOhh3obTCt80VKkKqB0QbhudWmEUYjet5Mw+MkHsqm v1l5GjeBehVNNfy2udE9tvFsNgcwAFZgsqPR0p6nsJv6S7qRuaeexkClU2lrdU+Zr6wK Mu1Q== X-Forwarded-Encrypted: i=1; AJvYcCUsG/r+Fq1gD4ZB25cZRafbBksNAHDdGroFAdHTOuM+kF7WPoIA7mnxBmJyCaiIrHhjS84vTD3gKPtye+4=@vger.kernel.org X-Gm-Message-State: AOJu0YzX1b/3mkBWBfvcSk4OhxV5evZvtPMcJYo+fpIVgmH+j2YAgNxJ UUje3KeSgOLGy5LBb/v7UjqBtenjv7u+7OAfGtAjnP2aOraJI5GkkVD/RduRnaE= X-Gm-Gg: ASbGncumEzH+9ohRv7mdg2RfF7qEM+Ac8O5fXdgFV5cn/FxyAUatVLSpWTVFKdxJaBT x+2ifD2fR6kKTiBiAGLOALMksGQpdC8ZfvPH22nSzQd+YGkrMOOctHPu+IINHXLhEExxeDwUxyl mPoUTCnaP735PW0HkmIoy4BUq6+iiIap+L0F6o4LuUgvoxaBdUqc/QDJqmdBfai/17mtRGni3TZ pooVND4LVPs5fMORc6P+R40jyYyyx+0sY6k5xKd5RUA8Ls8mjw7mDaFKN9bMKe3jA== X-Google-Smtp-Source: AGHT+IHNmLQm1j06TtGNOkJWIFaFS+c+vU1YTf1B5SrEFcW5N5PbHLEVJA/tlx1fts1YuOCHHCZpgQ== X-Received: by 2002:a05:6000:1faa:b0:38b:f04c:25e6 with SMTP id ffacd0b85a97d-38bf56626d4mr3033027f8f.14.1737122050037; Fri, 17 Jan 2025 05:54:10 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3221bf0sm2545279f8f.28.2025.01.17.05.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 05:54:09 -0800 (PST) From: Bryan O'Donoghue Date: Fri, 17 Jan 2025 13:54:07 +0000 Subject: [PATCH v10 1/4] clk: qcom: gdsc: Release pm subdomains in reverse add order Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-1-13f2bb656dad@linaro.org> References: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> In-Reply-To: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd , Dmitry Baryshkov , Vladimir Zapolskiy , Rajendra Nayak Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , stable@vger.kernel.org X-Mailer: b4 0.15-dev-1b0d6 gdsc_unregister() should release subdomains in the reverse order to the order in which those subdomains were added. I've made this patch a standalone patch because it facilitates a subsequent fix to stable. Fixes: 1b771839de05 ("clk: qcom: gdsc: enable optional power domain support= ") Cc: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue --- drivers/clk/qcom/gdsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index fa5fe4c2a2ee7786c2e8858f3e41301f639e5d59..bc1b1e37bf4222017c172b77603= f8dedba961ed5 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -571,7 +571,7 @@ void gdsc_unregister(struct gdsc_desc *desc) size_t num =3D desc->num; =20 /* Remove subdomains */ - for (i =3D 0; i < num; i++) { + for (i =3D num - 1; i >=3D 0; i--) { if (!scs[i]) continue; if (scs[i]->parent) --=20 2.47.1 From nobody Sun Dec 14 07:59:44 2025 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.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 9F3BF1FF7D9 for ; Fri, 17 Jan 2025 13:54:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122055; cv=none; b=hWUq97PRkC72BpbNXpkkgc8E7NczrlXhAsjC2QpeYcwk84vObPKSZ9Rim27VqMx1sC+IlrWr8ZR09P+GEmIhw0YJ25+1q9hmrtK3gMlLTnBHXOFHf6SRvELKCvdo75UkWbTnk72aSEB06+aih6tNrWhvRwP/txWCF3WER9caEg0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122055; c=relaxed/simple; bh=MAgPHU1Bz2sNDNZOkc4tcdXK0ulAsoRdPInzeOCBuFw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MNHMB529OinilSVEz0KHJyHR+4jRQkkDdQCqCFiJREfU3+DZcZfWi3zvxVkDliUJsMONwVJFLm8c7JtZ0BS3UxuaCjvMykYSCh1YPQ1jH0vvZNuoFBmAtRPqrA9R6gDdumWrJ8rTKPtTRRKDLsYbmeKb5gQGObCclMqYAPnEazs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=olwd0Whf; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="olwd0Whf" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-385deda28b3so1324562f8f.0 for ; Fri, 17 Jan 2025 05:54:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737122051; x=1737726851; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=XTx7trlO+qhAIZBVr4sCxA6UgBBZ6iW+pqhCeQ0jUHA=; b=olwd0WhfJHs1nlCt7ZFpe26jJ5Fkc0+UG1ZoPVuauVKFqw614ula0o2e8kqa05C8GK lTkjqnUWlff1TFbBcl5ijSIQGM/DeEqbAsZKbtBCoc4F1yoFr46Qe5MGhLpoedtZZDPf yd4S3oBpjHl3ft6NZAMIdoEn5FdNjuxbtEL0MyHyHF86YjyOtX9hU5dwAuvv2LNTsLLZ c2WSMtUkqFwoYlXjGcekGE0WNDADEWJlvdZM2sUFliy8XQFfCQXe4my2wXpbzk6g/qOT gHwVXPV5HCF6RTZdA0gaJu8gQNFm4leIgxf6bBgIkDgwqoTAFGRHe31x7KOjvz8FZOlP ArFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737122051; x=1737726851; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XTx7trlO+qhAIZBVr4sCxA6UgBBZ6iW+pqhCeQ0jUHA=; b=IhsqrV7UG0jg9bFVxnAt+j0STAiEmBiEHl7LtXkt7bP4sZD5xnpe/n5/SFHoFSPwUC xfD1eHmEUwrljx/ls4FZVRLY2wkRYiqhLnnggAk8F539xfaGD8zWXpnYuox48PJ9oH2O sN7NSiDRQ0pc3DOGI4LCKajNZ9WjVuXY3a/0MqIUpVouKVygJHFvxQ/17lXwJbt/Mi2m 55SSIrriXN5zG9vCs90s/cQGaEKa4s0rcNFrb8MMdaGr+kSO8Tb54C59v/bESIEkreE+ vbb5besLgYqBJXULJVmHrcgzE0Q9TxRHiCsSPFGld6Hbt9j7uAF9KDu3F2DdM0UotEm/ PVLw== X-Forwarded-Encrypted: i=1; AJvYcCVbPZt2JQw0vfU1P0un6N/TC/7J6jLo3iMn2LgUdJvcNBvUXClRKDlwx7fKqYLy5DwzBxZ5IVNv5QK0RFo=@vger.kernel.org X-Gm-Message-State: AOJu0YwduiDOyaaDyaCA9LKIiKC7hOYyZvFoJPHo9gY30O1RNtfh3wcR 1VUlukMz8TW6UEupqmkcMBaXccDmBP7ZpZQUYS5xE7ILY6I7BmiUdM177HxcTiQ= X-Gm-Gg: ASbGncv8xbZBO1DL0c9j90WKiftGnTnJcQYfyoc1EYKu8bZldpJ0LmjAP9/fTwYiBCA fX4fNKSDHDMxNZWMDflW3t0QgY0y5B3f25Uk5ZboPiwk53fVueJbZ1TytYIqSXYUJ+OKtOU82vc /kZ7l2BLub9Fm+HBvCn+g+q3fcOg8/bBuBh/NAwc+1g/wVWDyuLGpUI7Zf2hcYLZJTwBS9BGP0n topoqO9lbhlgnb0fpeBIlugVjhAi+nam4xOU73ETZVsSrkB6mFcwKlnSNPbgcl1wQ== X-Google-Smtp-Source: AGHT+IEDPXdDbnFx8QRaTJCrevmOYsul85rv9RHdhHqFBMauSQzaP+fCqw7xsorGDbZRjoKdq/HThQ== X-Received: by 2002:a05:6000:4021:b0:38a:a055:8498 with SMTP id ffacd0b85a97d-38bf57a9436mr2476005f8f.42.1737122050978; Fri, 17 Jan 2025 05:54:10 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3221bf0sm2545279f8f.28.2025.01.17.05.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 05:54:10 -0800 (PST) From: Bryan O'Donoghue Date: Fri, 17 Jan 2025 13:54:08 +0000 Subject: [PATCH v10 2/4] clk: qcom: gdsc: Capture pm_genpd_add_subdomain result code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-2-13f2bb656dad@linaro.org> References: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> In-Reply-To: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd , Dmitry Baryshkov , Vladimir Zapolskiy , Rajendra Nayak Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , stable@vger.kernel.org X-Mailer: b4 0.15-dev-1b0d6 Adding a new clause to this if/else I noticed the existing usage of pm_genpd_add_subdomain() wasn't capturing and returning the result code. pm_genpd_add_subdomain() returns an int and can fail. Capture that result code and throw it up the call stack if something goes wrong. Fixes: 1b771839de05 ("clk: qcom: gdsc: enable optional power domain support= ") Cc: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue --- drivers/clk/qcom/gdsc.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index bc1b1e37bf4222017c172b77603f8dedba961ed5..fdedf6dfe7b90c074b200353fc0= c2b897863c79f 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -506,6 +506,23 @@ static int gdsc_init(struct gdsc *sc) return ret; } =20 +static void gdsc_pm_subdomain_remove(struct gdsc_desc *desc, size_t num) +{ + struct device *dev =3D desc->dev; + struct gdsc **scs =3D desc->scs; + int i; + + /* Remove subdomains */ + for (i =3D num - 1; i >=3D 0; i--) { + if (!scs[i]) + continue; + if (scs[i]->parent) + pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd); + else if (!IS_ERR_OR_NULL(dev->pm_domain)) + pm_genpd_remove_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd); + } +} + int gdsc_register(struct gdsc_desc *desc, struct reset_controller_dev *rcdev, struct regmap *regmap) { @@ -555,30 +572,27 @@ int gdsc_register(struct gdsc_desc *desc, if (!scs[i]) continue; if (scs[i]->parent) - pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd); + ret =3D pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd); else if (!IS_ERR_OR_NULL(dev->pm_domain)) - pm_genpd_add_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd); + ret =3D pm_genpd_add_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd= ); + if (ret) + goto err_pm_subdomain_remove; } =20 return of_genpd_add_provider_onecell(dev->of_node, data); + +err_pm_subdomain_remove: + gdsc_pm_subdomain_remove(desc, i); + + return ret; } =20 void gdsc_unregister(struct gdsc_desc *desc) { - int i; struct device *dev =3D desc->dev; - struct gdsc **scs =3D desc->scs; size_t num =3D desc->num; =20 - /* Remove subdomains */ - for (i =3D num - 1; i >=3D 0; i--) { - if (!scs[i]) - continue; - if (scs[i]->parent) - pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd); - else if (!IS_ERR_OR_NULL(dev->pm_domain)) - pm_genpd_remove_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd); - } + gdsc_pm_subdomain_remove(desc, num); of_genpd_del_provider(dev->of_node); } =20 --=20 2.47.1 From nobody Sun Dec 14 07:59:44 2025 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.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 AEF4720010C for ; Fri, 17 Jan 2025 13:54:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122055; cv=none; b=euK3bplqevr0XJIiGA6J2kxvF1/+HhJqRKcHJjjrqz6UVcaadaO9J4lJc1VCj93qP1D87q+rzYIelk/VERuoblQv1tsNQE+JtcJYHiH4Glc5QwGOeyvmsKC5T+GPV4wP+wVct3cDGbVZG+lfTJEig/I+YKIuJNBOl+1SMGUVUHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122055; c=relaxed/simple; bh=1bB7zeKYEAvds04CMWVz2vrkT1T8fqTENFgm3Croh80=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QEkrl5W0E6GYdW6f1N9E1j+71xc8SPZm4XzThlJ5NWpZXk7CrucvDA/Zr5QFIi7z5zeOJbt3k5aL0u9XXJCfVhwiOgKBKTluNNTISB2rKxfaNxGGoAlltrVHlPFBoCjzw23HHFGXJICji0P6ogLD5b3AoKvnXsnrYxBX7AQ8FCg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=SnVR3NzC; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SnVR3NzC" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-38a25d4b9d4so1142175f8f.0 for ; Fri, 17 Jan 2025 05:54:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737122052; x=1737726852; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZqX0V1eNStAoo4sPWKD9j/tGcT46bicfpPkCKdYvW2Y=; b=SnVR3NzCUmvpXnDtqZd4tKvH5ne1HlBhOpgAJL2Zaul60AYcGOB9AXg3ih0s7oRjBo PBS8FO89JcWfyBsXcu+6A3ZDv0f8MAYdN7kM26ll1KZugsJoUj37Ep9ne5LdWf2a1lgy a+APGVmxaEo2yVpUPDagg6qT8eRPopp6ydRtESrro88FE4afh6Yu0BTI7WaP3XFLpxAQ Dps66CkoTEvkCpnWwCWWma+KaX/dVaD4VNLBDbm/fXupn5NS3xZ7xfVXAiU3Kg3q5Cdm 0A2rxYE48MFGW2kXnJuIw2fCQNIGtRxI+G76yQL423vIpbFjLtFHxH5kvesqjoqI7qD1 gt7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737122052; x=1737726852; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZqX0V1eNStAoo4sPWKD9j/tGcT46bicfpPkCKdYvW2Y=; b=ZHV0Q4dbYI/fACf5sBG1fbvunxm1oFn4rtdF0D91otqNVBx0AWcJQPJLPT4dMi0qch NpC2lUaox6NKdRr9B4Oj/2yl59DxPbjlV68FVctdF64emr0zLWFo2tvRW/J60UGnCDjb +G1QY24X+DWoNBzP1kLqNbnnbnC47++w5L2KNlyX4cjGdrmUKe+2OrdWf0hG0qYNpWsG zEt8CIxhHOFSDZ10rcGlt/9hDzMKKaJeD9P9oHcLuZW08yfw/OwcupTMxVM5sb6sLxOt g3LP/6uA0q4ZBS12ThhbxvHbRRwUdwwYn8IaFHHSyEYMF8OB8PfuOoHX0ATq1xDb3l9d Kddw== X-Forwarded-Encrypted: i=1; AJvYcCXDdAFxS5dzYmGISaliX0hkZIGxZLy2ng0ATP3ty0Efa5layv/dO2uhGmphHveCSWVCn07J1xPF+y7hSTQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxN3TUCxjYEY1S66gqsQHQTlC4l0vNADJJLWzOHDExPGT9gqEui qZAwo9vn1EwXZzDl30AjiqR+elexdMlstvzwX85IHQps7wKiPy4X2bHCEg7UCZM= X-Gm-Gg: ASbGnct4yDsaM39/7IxJNfRuFCu/Rtu29fOOtte8vvMl4eOOZWgJ9wBlkga8mFEPedJ EvWVawT64VByZmkYrUhNTyTLpoSMdYgVHxucgZsOMYGdqdFlEQIY3bu2Oy9fMGXnQ1oEHp9zQkO T3GD+jVc/61yq9vUEFqHIA4yZbHaUVPbRiiqG0hZalriNPiSjWQC2+hnkWIPPApgtozhJdWNtZs zVJZic8xCakAElcI6M5kWgmEBhc+K++Lhu4hbumLEaXGkggJdoewq5XUxoSeIYpRw== X-Google-Smtp-Source: AGHT+IERIKprTfj4TGtNFTV+dziWvvun8Na1x5lCmNRgusK6uCzT/L4ml4i+lIBUsBATJIfoN1WugA== X-Received: by 2002:a05:6000:1445:b0:38a:418e:21c7 with SMTP id ffacd0b85a97d-38bf57c0546mr2616282f8f.53.1737122052049; Fri, 17 Jan 2025 05:54:12 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3221bf0sm2545279f8f.28.2025.01.17.05.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 05:54:11 -0800 (PST) From: Bryan O'Donoghue Date: Fri, 17 Jan 2025 13:54:09 +0000 Subject: [PATCH v10 3/4] clk: qcom: common: Add support for power-domain attachment Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-3-13f2bb656dad@linaro.org> References: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> In-Reply-To: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd , Dmitry Baryshkov , Vladimir Zapolskiy , Rajendra Nayak Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15-dev-1b0d6 Right now we support one power-domain per clock controller. These single power-domains are switched on by the driver platform logic. However when we have multiple power-domains attached to a clock-controller that list of power-domains must be handled outside of driver platform logic. Use devm_pm_domain_attach_list() to automatically hook the list of given power-domains in the dtsi for the clock-controller driver. Signed-off-by: Bryan O'Donoghue --- drivers/clk/qcom/common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index 33cc1f73c69d1f875a193aea0552902268dc8716..b79e6a73b53a4113ca324d102d7= be5504a9fe85e 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -22,6 +22,7 @@ struct qcom_cc { struct qcom_reset_controller reset; struct clk_regmap **rclks; size_t num_rclks; + struct dev_pm_domain_list *pd_list; }; =20 const @@ -299,6 +300,10 @@ int qcom_cc_really_probe(struct device *dev, if (!cc) return -ENOMEM; =20 + ret =3D devm_pm_domain_attach_list(dev, NULL, &cc->pd_list); + if (ret < 0 && ret !=3D -EEXIST) + return ret; + reset =3D &cc->reset; reset->rcdev.of_node =3D dev->of_node; reset->rcdev.ops =3D &qcom_reset_ops; --=20 2.47.1 From nobody Sun Dec 14 07:59:44 2025 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 4D0C7202C2A for ; Fri, 17 Jan 2025 13:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122060; cv=none; b=uU5Tcmt9vCEoOJ644tEekzfMHkaAyrzAgl1N42eLHqyYSofCLFhvoczen3Z+3a3IA+S5XGWDObby4UxnG7Ok7CZUmKtmxnT45BWSkIma/4wd0hqnAEr08m76rdt8XWxWkfBetQPySz+v0q3n3KzuRRtcpaWT213sI/ICaPgYyKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737122060; c=relaxed/simple; bh=mMqiI/+I+zEagfKuHYtYK6UtY5ankGGl9IJrIWTvRH8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=blJgTGk4QTKTpCjhRphLU1BJPHOes5uCYTo5LIdKQ60aF1b65K3Sbv8quQssB0XZ45Pzv2cObfiN1J9SLjMoA64DH880alJBu5zbFSZLTU41LIsE4Ymhx5ZOb46P64EM0wrIdNK5Wkk0hVKJfJA+U8CcwOIO7WBa33TfjTvDKOk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=lCput38k; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="lCput38k" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-385e1fcb0e1so1111177f8f.2 for ; Fri, 17 Jan 2025 05:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737122055; x=1737726855; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rqLgiwkb25f50FFmindGDO9xj3DpwPWvWiLB7nut8us=; b=lCput38k635S6xJaKgADG7xUt+QbFWWqQNWADURs8diRJC5hVTztDA+wRwA7Jz6mAf 1wee0ZUIme8cmiXXSaJBhJIaeGPX9S/Wb+mkzOsh4l4oxgk3ITiThU1WsEp1tDzP+a7s jvnl4MALG8FxK9TsgZl0kaepPyZPFr6Pg1zO7MucsPqT2XrfzLFKSjIhTx34ay4wHqF/ JY0ngRSwMm3qjtkMW07sFu16RH6NRjNcAvAt5h/8wTFLYd19bHo5ALERaY2GQ7TtlFMr /kLxiPhv7RZDygINgamsdDE3n7rXeqlSLMNdLYabbJBbxa/GRAIjDCBE63b5vguQK8UH au7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737122055; x=1737726855; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rqLgiwkb25f50FFmindGDO9xj3DpwPWvWiLB7nut8us=; b=NZxvpiUor7/y7xeaBA1lRNHtgmoayccLSXpyebusZLjJy8OQdw/Bj3qXtZLCKZKx5p H+OfZE9fnvgP01LeYKTLj0KuxI/3vw+gyww4UmqnEYfyK5gKtcvQlWSXHCi2RK6zpA4x /7XA5kzTTUUCAKUZr9AiJVS2wc5rGuW/OxEfYiTSZ67RgdhBLEGEMQM6QvfHjpldlN35 dlzsTUNqA7ogem7XXP4dC8rnBDv4q3mOKrfiJUGohLclHmkXtzCXoj4A9v3eRrvqhBzQ VPyfoDPQtTa95aTPnTPK5hd7GDsGNER+wMJP0DMOgC2kA1joY9a+tpBYHT8r+LLcBqc/ e7EA== X-Forwarded-Encrypted: i=1; AJvYcCXpgJsESRGVOIy86hhzvhmSFEyOUY0RjyGbCJZcrVGxkDm6rLM4y/Z/2gC7XhFJk8dIGc3mYTLLwe+/hs0=@vger.kernel.org X-Gm-Message-State: AOJu0YybIisUjtx30sN8+ecJ9KIQ5EH0xUEXjgiekyPMdde8B+1dpTv3 B/Wc9F4J5cru7ZAj0VIJfiebo64Ba1MoHpcGgABQ7522vU0hgQ93n+yJNYZ6PxQ= X-Gm-Gg: ASbGncvFBKu1njgIrpVKmwRsJj62U+J0B03iYkY8u2pzvrS0S+u9HRDirnqE0PtHrCw HEBOdr7KRaBkmXphcEDryqrmKQ1yg8WNKEqVKkM0/xvITvFvCZoyL4DiuPKmyMNr/HJobT7Sbho TenT9Dyyn1VFDceJrL7fxNfldj2hCpPlj+JvTbIzEH+f5S0+M/4T9tMqvtQTsiKOqifs5CwhGQg Z7sAfF2XQ+Uyzv7MR6RaEPOIXJIWLrT6nTiWn9EYq/homrZLQjwD4sMIgSakcu2cg== X-Google-Smtp-Source: AGHT+IGaJSeW2w7x6eBG4XpsNAmWHIvhG8jsJzu3RDMO/gYbJM75+0vPf6DPLMTpEA3hk3sTOsZFzg== X-Received: by 2002:a5d:4007:0:b0:38a:888c:7dec with SMTP id ffacd0b85a97d-38bf5675e61mr2124765f8f.28.1737122053112; Fri, 17 Jan 2025 05:54:13 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3221bf0sm2545279f8f.28.2025.01.17.05.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 05:54:12 -0800 (PST) From: Bryan O'Donoghue Date: Fri, 17 Jan 2025 13:54:10 +0000 Subject: [PATCH v10 4/4] clk: qcom: Support attaching GDSCs to multiple parents Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-4-13f2bb656dad@linaro.org> References: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> In-Reply-To: <20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-0-13f2bb656dad@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd , Dmitry Baryshkov , Vladimir Zapolskiy , Rajendra Nayak Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15-dev-1b0d6 When a clock-controller lists multiple power-domains we need make each GDSC= a subdomain of each of the clock-controller's listed power-domains. GDSCs without an explicitly defined parent should be a subdomain of each of the clock-controller's listed power-domains. GDSCs with an explicitly defined parent should attach only to the parent GDSC and not the listed power-domains. Any votes will trickle through the hierarchy up to the external power-domains. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D :: arch/arm64/boot/dts/example.dtsi :: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D clockcc: clock-controller@0 { compat =3D"qcom,example-clockcc"; power-domains =3D <&pd_a, &pd_b>; } =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D :: drivers/clk/qcom/example-clockcc.c :: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D static struct gdsc parent_gdsc =3D { .pd =3D { .name =3D "parent_gdsc", }, }; static struct gdsc child0_gdsc =3D { .pd =3D { .name =3D "child0_gdsc", }, .parent =3D &parent_gdsc.pd, }; static struct gdsc child1_gdsc =3D { .pd =3D { .name =3D "child1_gdsc", }, .parent =3D &parent_gdsc.pd, }; =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D :: power-subdomains :: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D pm-domain::pd_a =E2=94=94=E2=94=80=E2=94=80 pm-subdomain::clockcc::parent_gdsc =E2=94=9C=E2=94=80=E2=94=80 pm-subdomain::clockcc::child0_gdsc =E2=94=94=E2=94=80=E2=94=80 pm-subdomain::clockcc::child1_gdsc pm-domain::pd_b =E2=94=94=E2=94=80=E2=94=80 pm-subdomain::clockcc::parent_gdsc =E2=94=9C=E2=94=80=E2=94=80 pm-subdomain::clockcc::child1_gdsc =E2=94=94=E2=94=80=E2=94=80 pm-subdomain::clockcc::child2_gdsc The performance states will percolate through the pm-domain hierarchy to the domains that handle the relevant states. Signed-off-by: Bryan O'Donoghue --- drivers/clk/qcom/common.c | 1 + drivers/clk/qcom/gdsc.c | 35 +++++++++++++++++++++++++++++++++++ drivers/clk/qcom/gdsc.h | 1 + 3 files changed, 37 insertions(+) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index b79e6a73b53a4113ca324d102d7be5504a9fe85e..9e3380fd718198c9fe63d736161= 5a91c3ecb3d60 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -323,6 +323,7 @@ int qcom_cc_really_probe(struct device *dev, scd->dev =3D dev; scd->scs =3D desc->gdscs; scd->num =3D desc->num_gdscs; + scd->pd_list =3D cc->pd_list; ret =3D gdsc_register(scd, &reset->rcdev, regmap); if (ret) return ret; diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index fdedf6dfe7b90c074b200353fc0c2b897863c79f..7687661491f1fd5a3076c839c4f= 70f430783fc51 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -506,6 +506,36 @@ static int gdsc_init(struct gdsc *sc) return ret; } =20 +static int gdsc_add_subdomain_list(struct dev_pm_domain_list *pd_list, + struct generic_pm_domain *subdomain) +{ + int i, ret; + + for (i =3D 0; i < pd_list->num_pds; i++) { + struct device *dev =3D pd_list->pd_devs[i]; + struct generic_pm_domain *genpd =3D pd_to_genpd(dev->pm_domain); + + ret =3D pm_genpd_add_subdomain(genpd, subdomain); + if (ret) + return ret; + } + + return 0; +} + +static void gdsc_remove_subdomain_list(struct dev_pm_domain_list *pd_list, + struct generic_pm_domain *subdomain) +{ + int i; + + for (i =3D 0; i < pd_list->num_pds; i++) { + struct device *dev =3D pd_list->pd_devs[i]; + struct generic_pm_domain *genpd =3D pd_to_genpd(dev->pm_domain); + + pm_genpd_remove_subdomain(genpd, subdomain); + } +} + static void gdsc_pm_subdomain_remove(struct gdsc_desc *desc, size_t num) { struct device *dev =3D desc->dev; @@ -520,6 +550,8 @@ static void gdsc_pm_subdomain_remove(struct gdsc_desc *= desc, size_t num) pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd); else if (!IS_ERR_OR_NULL(dev->pm_domain)) pm_genpd_remove_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd); + else if (desc->pd_list) + gdsc_remove_subdomain_list(desc->pd_list, &scs[i]->pd); } } =20 @@ -575,6 +607,9 @@ int gdsc_register(struct gdsc_desc *desc, ret =3D pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd); else if (!IS_ERR_OR_NULL(dev->pm_domain)) ret =3D pm_genpd_add_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd= ); + else if (desc->pd_list) + ret =3D gdsc_add_subdomain_list(desc->pd_list, &scs[i]->pd); + if (ret) goto err_pm_subdomain_remove; } diff --git a/drivers/clk/qcom/gdsc.h b/drivers/clk/qcom/gdsc.h index 1e2779b823d1c8ca077c9b4cd0a0dbdf5f9457ef..dd843e86c05b2f30e6d9e978681= 580016333839d 100644 --- a/drivers/clk/qcom/gdsc.h +++ b/drivers/clk/qcom/gdsc.h @@ -80,6 +80,7 @@ struct gdsc_desc { struct device *dev; struct gdsc **scs; size_t num; + struct dev_pm_domain_list *pd_list; }; =20 #ifdef CONFIG_QCOM_GDSC --=20 2.47.1