| Message ID | 20240209122810.2258042-1-cristian.ciocaltea@collabora.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-59309-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp814057dyd;
Fri, 9 Feb 2024 04:28:48 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IGDjCxQgrhXjdXWrO1Vmng3dWRhF6IUL9WAxj8lx/cb3bYqA8RiodU96FSMOrGwtUy9vrti
X-Received: by 2002:a05:651c:cf:b0:2d0:992a:cc73 with SMTP id
15-20020a05651c00cf00b002d0992acc73mr1325827ljr.5.1707481728528;
Fri, 09 Feb 2024 04:28:48 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1707481728; cv=pass;
d=google.com; s=arc-20160816;
b=QPVZhGH/RpsqGzN/wq8reT4+Cjsz0sVGsPEpsUTr78Qrw1LmpN2vJyylV+Vltib3kr
6biws3CRf2DLEKflcm2cthz1NAWkPacIga7yWNrc18cgG742+pjmzmX4op4Xdn5LzwTe
PNokUyrTCNhCAOKpFJSV1m1V1WqdxCLGVo0acucZcyJyWrqEf7rByRGMRyQaWrE0Fh8w
mD9yxkFiapRApN9Bgtt5mArtbZzsTz7VpCvl+fiKqDiNQbS9CQL0bF6B2sAwzs9k3bJd
hO2VCMfYlO9wLdjwUHNAt+4a7PAhdmhrb/2zReHBCEu/FqXkLD0cpG+qbsxC9PHaTxdv
kjug==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=content-transfer-encoding:mime-version:list-unsubscribe
:list-subscribe:list-id:precedence:message-id:date:subject:cc:to
:from:dkim-signature;
bh=kYPhnsbxrJyEPI0osDuglXL5cjGBwAWS1cVr6O3k5tw=;
fh=yC6lnq0V0QUwXz9u5JWVaAzqsg8lHypCxBJBbkWaMe4=;
b=VF1j83Wv75tXgwTm8PeOYSu78cZnGFDX6t5kbJseeSijEHilIyS/8chaC5Pho5bnx4
Uu1MQ3LvPySx+/kOr44DoZ5qislyswWcPMfN2kFVt94l7iQQd8LHQgLS9ogbuRQVL5ou
I1IRMpliFobIoEDSvZh0KvR+rxFZyfQysX+TR0rgOzj6Q4GTGz3Fe4735SXmtqmJ/Ry7
stDhO5+sEPfDzShTx7D5F485PhLS2j9ALsB5bRICaIyN8JADA8DHhPoyC73uSEjImZw/
aNR26x6msgbjbSq28JOrtlIZya4tNn3QN6mKCLxokwd89RLl2nrvtAhxlvxSsYEvrpwB
SFlg==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=YdKpaOoD;
arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass
dkdomain=collabora.com dmarc=pass fromdomain=collabora.com);
spf=pass (google.com: domain of
linux-kernel+bounces-59309-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-59309-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=collabora.com
X-Forwarded-Encrypted: i=2;
AJvYcCUeYgwApqYKJYytnOU81rwH0S9qgj2+EE/gze5FbEIL+g+CmprPPe0zo1LYEiqCClHA6jXbkmrp2ibXLxJxM+Sd55+Aog==
Received: from am.mirrors.kernel.org (am.mirrors.kernel.org.
[2604:1380:4601:e00::3])
by mx.google.com with ESMTPS id
s5-20020a056402036500b00560d778193asi816633edw.431.2024.02.09.04.28.48
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 09 Feb 2024 04:28:48 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-59309-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Authentication-Results: mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=YdKpaOoD;
arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass
dkdomain=collabora.com dmarc=pass fromdomain=collabora.com);
spf=pass (google.com: domain of
linux-kernel+bounces-59309-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-59309-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=collabora.com
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by am.mirrors.kernel.org (Postfix) with ESMTPS id 00CA61F23259
for <ouuuleilei@gmail.com>; Fri, 9 Feb 2024 12:28:48 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 34C96364D4;
Fri, 9 Feb 2024 12:28:34 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com
header.b="YdKpaOoD"
Received: from madrid.collaboradmins.com (madrid.collaboradmins.com
[46.235.227.194])
(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 38825364A4;
Fri, 9 Feb 2024 12:28:27 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=46.235.227.194
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1707481711; cv=none;
b=j9H+f2VP3e/pj0V6y8f/jHfB7vkH6ia9iraQUH8CucI85UUjLJLaPQRl2ULtp2YjB/7m+c+l4CJZqHsLwRfXQT75HaqM4alDSFKqGBn6toJ+e8fXh50kG/cqobsIucvtuA0FgcLw1AOHselhXwV1YwfxcUCfqnNbpm+XV4F8AZQ=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1707481711; c=relaxed/simple;
bh=fz4nms9uFIzLRt9/3C1od1Er33MdSyqJcC2YXg6fnlg=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version;
b=bWWGBdCzuDZjykn/VLzBeJTd2HIXgp6QGgH09wJd8n/Y2NTs/xEZdSKMILddDwfaU52VvAuXO5aq2HDxxLprXEwrCnu/h5ZoLqJq9gp03s4Y5fid9TvAygfs60sm9Mtpo9tS0uZBiWiznXjNFrzVXyx+aJ0IQFm0dy9rPSQaoRE=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=collabora.com;
spf=pass smtp.mailfrom=collabora.com;
dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com
header.b=YdKpaOoD; arc=none smtp.client-ip=46.235.227.194
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=collabora.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
s=mail; t=1707481705;
bh=fz4nms9uFIzLRt9/3C1od1Er33MdSyqJcC2YXg6fnlg=;
h=From:To:Cc:Subject:Date:From;
b=YdKpaOoD4cIVXKjP0ikOAKrt6jF3Sz3S/LZMFmgJscNA9IArCNkWFEB8iSoUg1Z71
ygbv2TV/SEkWMqNjKNxFCNY5/zfOa664di+9x+LOiOJeYbEhng/IDZV2zDWMj3DgBG
TPNH+3MBpG97pknIeaNfcGs2elxJ4JWuNMFsTs4ZKZ2IEVZXnn3Kua5NLps4bBNj+q
IVk2D1IZR/yeIxgYQmwYEK3x5UKeQKEsdegxDKRsnb3YQZ6eyEncqhClWUdUFssa5S
aG4aM/NmPdaPAq8fR6Km8qOaIAhZsIN0YyImKD4krdNxaQxlghEbJSaTGLyE0vcTif
Y6rhiRRMLzdcw==
Received: from localhost (cola.collaboradmins.com [195.201.22.229])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
(Authenticated sender: cristicc)
by madrid.collaboradmins.com (Postfix) with ESMTPSA id 0D023378000B;
Fri, 9 Feb 2024 12:28:25 +0000 (UTC)
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Daniel Baluta <daniel.baluta@nxp.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
Cc: sound-open-firmware@alsa-project.org,
linux-sound@vger.kernel.org,
linux-kernel@vger.kernel.org,
kernel@collabora.com
Subject: [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam
Deck OLED
Date: Fri, 9 Feb 2024 14:28:09 +0200
Message-ID: <20240209122810.2258042-1-cristian.ciocaltea@collabora.com>
X-Mailer: git-send-email 2.43.0
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1790424360657819815
X-GMAIL-MSGID: 1790424360657819815
|
| Series |
ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED
|
|
Commit Message
Cristian Ciocaltea
Feb. 9, 2024, 12:28 p.m. UTC
The recent introduction of the ACP/PSP communication for IRAM/DRAM fence
register modification breaks the audio support on Valve's Steam Deck
OLED device.
It causes IPC timeout errors when trying to load DSP topology during
probing:
1707255557.688176 kernel: snd_sof_amd_vangogh 0000:04:00.5: ipc tx timed out for 0x30100000 (msg/reply size: 48/0)
1707255557.689035 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump start ]------------
1707255557.689421 kernel: snd_sof_amd_vangogh 0000:04:00.5: dsp_msg = 0x0 dsp_ack = 0x91d14f6f host_msg = 0x1 host_ack = 0xead0f1a4 irq_stat >
1707255557.689730 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump end ]------------
1707255557.690074 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump start ]------------
1707255557.690376 kernel: snd_sof_amd_vangogh 0000:04:00.5: IPC timeout
1707255557.690744 kernel: snd_sof_amd_vangogh 0000:04:00.5: fw_state: SOF_FW_BOOT_COMPLETE (7)
1707255557.691037 kernel: snd_sof_amd_vangogh 0000:04:00.5: invalid header size 0xdb43fe7. FW oops is bogus
1707255557.694824 kernel: snd_sof_amd_vangogh 0000:04:00.5: unexpected fault 0x6942d3b3 trace 0x6942d3b3
1707255557.695392 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump end ]------------
1707255557.695755 kernel: snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN
1707255557.696069 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: tplg component load failed -110
1707255557.696374 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP topology -22
1707255557.697904 kernel: snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_component_probe on 0000:04:00.5: -22
1707255557.698405 kernel: sof_mach nau8821-max: ASoC: failed to instantiate card -22
1707255557.701061 kernel: sof_mach nau8821-max: error -EINVAL: Failed to register card(sof-nau8821-max)
1707255557.701624 kernel: sof_mach: probe of nau8821-max failed with error -22
It's worth noting this is the only Vangogh compatible device for which
signed firmware support has been enabled in AMD ACP SOF driver via
acp_sof_quirk_table.
Hence, use this information and skip IRAM/DRAM size modification for Vangogh
platforms having the signed_fw_image field set.
Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
sound/soc/sof/amd/acp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Comments
On 2/9/24 17:58, Cristian Ciocaltea wrote: > The recent introduction of the ACP/PSP communication for IRAM/DRAM fence > register modification breaks the audio support on Valve's Steam Deck > OLED device. > > It causes IPC timeout errors when trying to load DSP topology during > probing: > > 1707255557.688176 kernel: snd_sof_amd_vangogh 0000:04:00.5: ipc tx timed out for 0x30100000 (msg/reply size: 48/0) > 1707255557.689035 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump start ]------------ > 1707255557.689421 kernel: snd_sof_amd_vangogh 0000:04:00.5: dsp_msg = 0x0 dsp_ack = 0x91d14f6f host_msg = 0x1 host_ack = 0xead0f1a4 irq_stat > > 1707255557.689730 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump end ]------------ > 1707255557.690074 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump start ]------------ > 1707255557.690376 kernel: snd_sof_amd_vangogh 0000:04:00.5: IPC timeout > 1707255557.690744 kernel: snd_sof_amd_vangogh 0000:04:00.5: fw_state: SOF_FW_BOOT_COMPLETE (7) > 1707255557.691037 kernel: snd_sof_amd_vangogh 0000:04:00.5: invalid header size 0xdb43fe7. FW oops is bogus > 1707255557.694824 kernel: snd_sof_amd_vangogh 0000:04:00.5: unexpected fault 0x6942d3b3 trace 0x6942d3b3 > 1707255557.695392 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump end ]------------ > 1707255557.695755 kernel: snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN > 1707255557.696069 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: tplg component load failed -110 > 1707255557.696374 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP topology -22 > 1707255557.697904 kernel: snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_component_probe on 0000:04:00.5: -22 > 1707255557.698405 kernel: sof_mach nau8821-max: ASoC: failed to instantiate card -22 > 1707255557.701061 kernel: sof_mach nau8821-max: error -EINVAL: Failed to register card(sof-nau8821-max) > 1707255557.701624 kernel: sof_mach: probe of nau8821-max failed with error -22 > > It's worth noting this is the only Vangogh compatible device for which > signed firmware support has been enabled in AMD ACP SOF driver via > acp_sof_quirk_table. > > Hence, use this information and skip IRAM/DRAM size modification for Vangogh > platforms having the signed_fw_image field set. > > Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification") > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> > --- > sound/soc/sof/amd/acp.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c > index 9b3c26210db3..71689d2a5b56 100644 > --- a/sound/soc/sof/amd/acp.c > +++ b/sound/soc/sof/amd/acp.c > @@ -278,7 +278,14 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, > } > > /* psp_send_cmd only required for vangogh platform (rev - 5) */ > - if (desc->rev == 5) { > + /* > + * FIXME: This causes IPC timeout when trying to load DSP topology > + * on the Steam Deck OLED device matching acp_sof_quirk_table above. > + * The quirk enables signed firmware support on this particular > + * Vangogh compatible device, hence skip IRAM/DRAM size modification > + * when signed_fw_image is set. > + */ > + if (desc->rev == 5 && !adata->signed_fw_image) { Programming ACP_IRAM_DRAM_FENCE register to modify the size of IRAM and DRAM and it's noting related to signed or unsigned fw_image. This ACP_IRAM_DRAM_FENCE register writing need to do before starting sha dma. > /* Modify IRAM and DRAM size */ > ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); > if (ret)
On 2/9/24 14:49, Venkata Prasad Potturu wrote: > > On 2/9/24 17:58, Cristian Ciocaltea wrote: >> The recent introduction of the ACP/PSP communication for IRAM/DRAM fence >> register modification breaks the audio support on Valve's Steam Deck >> OLED device. >> >> It causes IPC timeout errors when trying to load DSP topology during >> probing: [...] > Programming ACP_IRAM_DRAM_FENCE register to modify the size of IRAM and > DRAM and it's noting related to signed or unsigned fw_image. > > This ACP_IRAM_DRAM_FENCE register writing need to do before starting sha > dma. Unfortunately it doesn't fix the issue - I tested with the psp_send_cmd() calls moved to various positions before the line snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_CMD, ACP_SHA_RUN); and I keep getting the IPC timeouts. However, if I simply comment out the second psp_send_cmd() line psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); the problem is solved, even when the first psp_send_cmd() is kept in the original position. Anything else worth trying? Otherwise I would rework the patch to add a dedicated quirk for getting this ACP_IRAM_DRAM_FENCE processing skipped for Steam Deck OLED. Thanks, Cristian
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 9b3c26210db3..71689d2a5b56 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -278,7 +278,14 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, } /* psp_send_cmd only required for vangogh platform (rev - 5) */ - if (desc->rev == 5) { + /* + * FIXME: This causes IPC timeout when trying to load DSP topology + * on the Steam Deck OLED device matching acp_sof_quirk_table above. + * The quirk enables signed firmware support on this particular + * Vangogh compatible device, hence skip IRAM/DRAM size modification + * when signed_fw_image is set. + */ + if (desc->rev == 5 && !adata->signed_fw_image) { /* Modify IRAM and DRAM size */ ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); if (ret)