From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4802BA94A; Tue, 8 Apr 2025 11:47:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112822; cv=none; b=Y7waNiLAUSpXi/cBt0DUWz4PGzGKVWMYzo6MVwZ63ll49Kd2ezr4h0tP7SjH3+wP6QRE5tBh6+up60n00kl/+fnAfL2loHg2BOcwONXs7FUs0GiTl6exH5P5KdjLXgv+XPO11/jHMdZNTF/f+1cPcjJWsTzuGQIMWRelw69pJfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112822; c=relaxed/simple; bh=8Byvm07nEitBAArI5ZGR+kvK5yYhx3VAqJLC+yhbwnM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=owOlpLpFkzdqB05bhkgRt/T85sFkYK4JcxN6VRxkR60Bn1Vbb9eLcRv4nrONnTThOhHxnslTjdoJvoFyKgXA6aJpTHyslRnjImltdk/TylTuOIEYidoe/r5jmkvue4ReR59IeTtK2CA3G9GKYz8bLe/BBKvAX9ZBSJ3MBhkdExI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hEkMf7K5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hEkMf7K5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD084C4CEE5; Tue, 8 Apr 2025 11:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112822; bh=8Byvm07nEitBAArI5ZGR+kvK5yYhx3VAqJLC+yhbwnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEkMf7K58CMaNjbhAye6kT17Z1/alxFUbrTQ9yAAz6bZ+rSEC3/galMDfbKy/MpUD uMUfs+2bst/ighK04mBJ38CAiCG95wQpkQQzjLGdfmbPATzk6aywp7hYyPB2m3qoJY 5jSTe+izvi3uc11bXR+8o5tZyWHd/8Rn7gY5dGTw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stephan Gerhold , Luca Weiss , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.15 170/279] remoteproc: qcom_q6v5_pas: Make single-PD handling more robust Date: Tue, 8 Apr 2025 12:49:13 +0200 Message-ID: <20250408104830.917444914@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luca Weiss [ Upstream commit e917b73234b02aa4966325e7380d2559bf127ba9 ] Only go into the if condition for single-PD handling when there's actually just one power domain specified there. Otherwise it'll be an issue in the dts and we should fail in the regular code path. This also mirrors the latest changes in the qcom_q6v5_mss driver. Suggested-by: Stephan Gerhold Fixes: 17ee2fb4e856 ("remoteproc: qcom: pas: Vote for active/proxy power domains") Signed-off-by: Luca Weiss Reviewed-by: Stephan Gerhold Link: https://lore.kernel.org/r/20250128-pas-singlepd-v1-2-85d9ae4b0093@lucaweiss.eu Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/qcom_q6v5_pas.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index fbcbc00f2e645..776319ab1baf9 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -330,16 +330,16 @@ static int adsp_pds_attach(struct device *dev, struct device **devs, if (!pd_names) return 0; + while (pd_names[num_pds]) + num_pds++; + /* Handle single power domain */ - if (dev->pm_domain) { + if (num_pds == 1 && dev->pm_domain) { devs[0] = dev; pm_runtime_enable(dev); return 1; } - while (pd_names[num_pds]) - num_pds++; - for (i = 0; i < num_pds; i++) { devs[i] = dev_pm_domain_attach_by_name(dev, pd_names[i]); if (IS_ERR_OR_NULL(devs[i])) { @@ -364,7 +364,7 @@ static void adsp_pds_detach(struct qcom_adsp *adsp, struct device **pds, int i; /* Handle single power domain */ - if (dev->pm_domain && pd_count) { + if (pd_count == 1 && dev->pm_domain) { pm_runtime_disable(dev); return; } -- 2.39.5