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 0AF4023CE; Tue, 3 Dec 2024 16:03:27 +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=1733241807; cv=none; b=S5S9rIq853ejulC6Zg/lPq2/uS3KxP21dO7qwS7xtLvoBHOjIobMSglRMI6S3FMop596YwCV4OPkD4AZ907sx1NmVI4pZ0aukZ/OD75YVWWSrtyV+ogAyjcSZUPQVnx+DAXSFEubMxMwF1Wdz+fy+WXTtPr5RxOt0JT5/NPV8gE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733241807; c=relaxed/simple; bh=Ybnk1brpE1/rSwjidjyx7BjmwKQKwo1lFL0flPvKBAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G1dvD/Z5FCDN+C8f9tr0Tt8KEOxEdZvfxO0XTPK9lJyxoSZKGKccVgLcd7jq4z8DqwYQvoas2b+XmQer8Ju/idAeBF7xJ1/CYpHh9Yv1F832O4wzZf9nq/uXZhseARq4MUWCbb4V9VB6T/WvchOxBxWl44ez6/vBh8qofjSsoV4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DJGLJ3/S; 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="DJGLJ3/S" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E729C4CED8; Tue, 3 Dec 2024 16:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733241806; bh=Ybnk1brpE1/rSwjidjyx7BjmwKQKwo1lFL0flPvKBAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJGLJ3/Sk00JND3QVOI6dBlovKvOmqocImAhRfU28C4C3ByZXtGwc0p0jx2VLrmpT GgZk64fKNJsmEtzYbHIjUsKFZQWX+KuLAamvaKGP1IItzyyMVke5RinY6HdzsvDDey iJS5cKJ07XvteFAN02eFP2d1f0D7ceq4u/MYUEGk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sibi Sankar , Douglas Anderson , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.12 523/826] remoteproc: qcom_q6v5_mss: Re-order writes to the IMEM region Date: Tue, 3 Dec 2024 15:44:10 +0100 Message-ID: <20241203144804.161435678@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@linuxfoundation.org> User-Agent: quilt/0.67 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sibi Sankar [ Upstream commit 7b22b7719fc17d5979a991c918c868ab041be5c8 ] Any write access to the IMEM region when the Q6 is setting up XPU protection on it will result in a XPU violation. Fix this by ensuring IMEM writes related to the MBA post-mortem logs happen before the Q6 is brought out of reset. Fixes: 318130cc9362 ("remoteproc: qcom_q6v5_mss: Add MBA log extraction support") Signed-off-by: Sibi Sankar Reviewed-by: Douglas Anderson Tested-by: Douglas Anderson Link: https://lore.kernel.org/r/20240819073020.3291287-1-quic_sibis@quicinc.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/qcom_q6v5_mss.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 2a42215ce8e07..32c3531b20c70 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1162,6 +1162,9 @@ static int q6v5_mba_load(struct q6v5 *qproc) goto disable_active_clks; } + if (qproc->has_mba_logs) + qcom_pil_info_store("mba", qproc->mba_phys, MBA_LOG_SIZE); + writel(qproc->mba_phys, qproc->rmb_base + RMB_MBA_IMAGE_REG); if (qproc->dp_size) { writel(qproc->mba_phys + SZ_1M, qproc->rmb_base + RMB_PMI_CODE_START_REG); @@ -1172,9 +1175,6 @@ static int q6v5_mba_load(struct q6v5 *qproc) if (ret) goto reclaim_mba; - if (qproc->has_mba_logs) - qcom_pil_info_store("mba", qproc->mba_phys, MBA_LOG_SIZE); - ret = q6v5_rmb_mba_wait(qproc, 0, 5000); if (ret == -ETIMEDOUT) { dev_err(qproc->dev, "MBA boot timed out\n"); -- 2.43.0