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 C03F3396565; Tue, 16 Dec 2025 12:31:55 +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=1765888315; cv=none; b=jmDqj7598uI2tKNa6BFuTd+cu7KzkDe46dVw0aGtdRKhOprnkDYvJvqQ4NttKjCw2g5zWyYV94t+LIDLL/1gPERQIMzyxpvqiA1Vw47BveWSFFWyk8D3wVA8PfgkF39KGo2eUaYGqrqECGFFgDIEW3ieiaobKaBG127juZF3UeE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765888315; c=relaxed/simple; bh=8RCF+W/rLxpfSsWF9yVjUdVGjzW1u7yGbYYs5i1KMj4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jd3I1fBeog5Nh/F45noaGYR9oaQvfbZwJnJwKbkw9NN5BRmk5K2YMknQy8T4Si+Bha+InqSBw7t+uh2z1QkNagfkx4nK3Db4Qcko09FTY996hsUQP8f9QCuLFJaufCfQpyOlgtgQHz3MYstT1TH5sorLHbHXsP8P1w/1KpMXXEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S539wvIE; 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="S539wvIE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF8ACC4CEF1; Tue, 16 Dec 2025 12:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765888315; bh=8RCF+W/rLxpfSsWF9yVjUdVGjzW1u7yGbYYs5i1KMj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S539wvIE7vYVFsMnD6o777jCii9iLWlPgy/6Wzds7A+W+ON5fIHSYXQ3pLae7X3ix aGoM+vJNJnv0qq7aap17hRn0BGLJqR5ba0KAB/ndy0Vw+laGthhqLHeZzGKT+dKRPf TNtTFWi3Z5esCtZSIQpxiUP0WcUHTxgZH3j9Ev4E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexandru Gagniuc , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.18 498/614] remoteproc: qcom_q6v5_wcss: fix parsing of qcom,halt-regs Date: Tue, 16 Dec 2025 12:14:25 +0100 Message-ID: <20251216111419.414499062@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexandru Gagniuc [ Upstream commit 7e81fa8d809ed1e67ae9ecd52d20a20c2c65d877 ] The "qcom,halt-regs" consists of a phandle reference followed by the three offsets within syscon for halt registers. Thus, we need to request 4 integers from of_property_read_variable_u32_array(), with the halt_reg ofsets at indexes 1, 2, and 3. Offset 0 is the phandle. With MAX_HALT_REG at 3, of_property_read_variable_u32_array() returns -EOVERFLOW, causing .probe() to fail. Increase MAX_HALT_REG to 4, and update the indexes accordingly. Fixes: 0af65b9b915e ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404") Signed-off-by: Alexandru Gagniuc Link: https://lore.kernel.org/r/20251129013207.3981517-1-mr.nuke.me@gmail.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/qcom_q6v5_wcss.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c index 07c88623f5978..23ec87827d4f8 100644 --- a/drivers/remoteproc/qcom_q6v5_wcss.c +++ b/drivers/remoteproc/qcom_q6v5_wcss.c @@ -85,7 +85,7 @@ #define TCSR_WCSS_CLK_MASK 0x1F #define TCSR_WCSS_CLK_ENABLE 0x14 -#define MAX_HALT_REG 3 +#define MAX_HALT_REG 4 enum { WCSS_IPQ8074, WCSS_QCS404, @@ -864,9 +864,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss, return -EINVAL; } - wcss->halt_q6 = halt_reg[0]; - wcss->halt_wcss = halt_reg[1]; - wcss->halt_nc = halt_reg[2]; + wcss->halt_q6 = halt_reg[1]; + wcss->halt_wcss = halt_reg[2]; + wcss->halt_nc = halt_reg[3]; return 0; } -- 2.51.0