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 0770B26989E; Mon, 24 Feb 2025 11:19:45 +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=1740395985; cv=none; b=Zw0RUod2GvMbJIdTqzAUKNNdCoLqCqWX/l8qqM8y+eT6NMo/qocAamYnfuxM1G/SKzu5g8sL0RdO+etm7kafFDpGnPGhpQz2392t4K+0QgzpgqK6ugvr5Gpq1L76TZf4qGHMmz5eNizOYuklTTIDZReYRBcDWkmo5YX1ot2qNTA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740395985; c=relaxed/simple; bh=vaNLaj3kI/6eNrxfLNxlOGuf3ZdW4gwfI8wVAGG4G3M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MKNzAXUJxtMxlrwkjzCNfZcqtSFNjmhBcOqokGtm598OMrvniNsIb0gAqVBtu8iBzvyKIgxMl44l2XwbzVlOYES4GW4XLaQOFBNwkggOAog02i7DMNdeDT4HCYLl2lyyB0ZQrpwz7/GZm3xWJjGiUT5a3o18P6aVMFd2ndewOMU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VuN6EK+e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VuN6EK+e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26029C4CED6; Mon, 24 Feb 2025 11:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740395984; bh=vaNLaj3kI/6eNrxfLNxlOGuf3ZdW4gwfI8wVAGG4G3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VuN6EK+eXDpmY2esnRKIh+3JZaLNNcvUI21pIcP4YlxWcTOEgvVn7cVCJev4fZQhm Ax3OV0/3VpMWO3iuOYRIr3j/MhkFdZ/FiExv9MHKlwJFW2nAsRUdOxCfxYXk6eNZCJ LTOI3v3ULElvS0CWh8Q7maGVS9iPV9tfiHe2UlStbM14hEw3sxBTCcTy6bZXHyDBj8 uCYUUWaX66GHnJJqEcyOd/aomal3c1UKbyCNd/OqQqAE017dpyOv1SwouuPOvZPfJZ t6I2xJzHbaaONzKu+Y5UKJX7azMPhEubj+M0Hd1fAK+kBWWHAOrht5HQSHafu89ND2 8qokhxPdqkPcQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cristian Ciocaltea , Mark Brown , Sasha Levin , lgirdwood@gmail.com, peter.ujfalusi@linux.intel.com, yung-chuan.liao@linux.intel.com, ranjani.sridharan@linux.intel.com, daniel.baluta@nxp.com, perex@perex.cz, tiwai@suse.com, venkataprasad.potturu@amd.com, gregkh@linuxfoundation.org, peterz@infradead.org, sound-open-firmware@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 10/20] ASoC: SOF: amd: Handle IPC replies before FW_BOOT_COMPLETE Date: Mon, 24 Feb 2025 06:19:03 -0500 Message-Id: <20250224111914.2214326-10-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224111914.2214326-1-sashal@kernel.org> References: <20250224111914.2214326-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.79 Content-Transfer-Encoding: 8bit From: Cristian Ciocaltea [ Upstream commit ac84ca815adb4171a4276b1d44096b75f6a150b7 ] In some cases, e.g. during resuming from suspend, there is a possibility that some IPC reply messages get received by the host while the DSP firmware has not yet reached the complete boot state. Detect when this happens and do not attempt to process the unexpected replies from DSP. Instead, provide proper debugging support. Signed-off-by: Cristian Ciocaltea Link: https://patch.msgid.link/20250207-sof-vangogh-fixes-v1-3-67824c1e4c9a@collabora.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/amd/acp-ipc.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sound/soc/sof/amd/acp-ipc.c b/sound/soc/sof/amd/acp-ipc.c index fcb54f545fea3..a4e9bc20adaff 100644 --- a/sound/soc/sof/amd/acp-ipc.c +++ b/sound/soc/sof/amd/acp-ipc.c @@ -167,6 +167,7 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) if (sdev->first_boot && sdev->fw_state != SOF_FW_BOOT_COMPLETE) { acp_mailbox_read(sdev, sdev->dsp_box.offset, &status, sizeof(status)); + if ((status & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) { snd_sof_dsp_panic(sdev, sdev->dsp_box.offset + sizeof(status), true); @@ -188,13 +189,21 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) dsp_ack = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_SCRATCH_REG_0 + dsp_ack_write); if (dsp_ack) { - spin_lock_irq(&sdev->ipc_lock); - /* handle immediate reply from DSP core */ - acp_dsp_ipc_get_reply(sdev); - snd_sof_ipc_reply(sdev, 0); - /* set the done bit */ - acp_dsp_ipc_dsp_done(sdev); - spin_unlock_irq(&sdev->ipc_lock); + if (likely(sdev->fw_state == SOF_FW_BOOT_COMPLETE)) { + spin_lock_irq(&sdev->ipc_lock); + + /* handle immediate reply from DSP core */ + acp_dsp_ipc_get_reply(sdev); + snd_sof_ipc_reply(sdev, 0); + /* set the done bit */ + acp_dsp_ipc_dsp_done(sdev); + + spin_unlock_irq(&sdev->ipc_lock); + } else { + dev_dbg_ratelimited(sdev->dev, "IPC reply before FW_BOOT_COMPLETE: %#x\n", + dsp_ack); + } + ipc_irq = true; } -- 2.39.5