Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1954862rdb; Tue, 20 Feb 2024 12:02:52 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW71x6xaA71vEfjZnEgJj0q7a9D7+mAj/f/fF01j4ssuZwDeSzlZ8T5K1kpi7Ez9v9rkV7Cq3zp0EqzHOphHTl+A/ci5yU2Lx06KKEMkA== X-Google-Smtp-Source: AGHT+IH395255k8PaZxnAY9747HzyQuc+ybg6qQAFxGsO2NHYFn47GD55b1OL4+sg+xWGvO9aQ8I X-Received: by 2002:a05:6a00:228f:b0:6e4:7847:9281 with SMTP id f15-20020a056a00228f00b006e478479281mr4820415pfe.21.1708459372280; Tue, 20 Feb 2024 12:02:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708459372; cv=pass; d=google.com; s=arc-20160816; b=vlpTIAI8lmrbzWHUtdqEYeUe+U/EAR7N6X4jPxgDS05buDv8gNm3VLTXTgtjCK+bQ2 ZwE0U3lKJPOTpWV0kiDAYOeClvolFzQbaIAL/keMDsIII5toF3Wei6GXt4LuWrmNk7gT vFVr3O9uVAUi6X7U0rwZ5N+CGcQoB8Ubh++M9fCMwUErcTMqLknbdbMU6r/RltK1ymgE aWiJJD1/sMiCcC9OotDFJ/Q7nXilMIedv+unIe7O3/dr/J9peVXqQ0TOd0vbTqeZ2tj7 U6vuu1N74Sgi2QiKXrRDXOTk4SDjX5umCqq5iuljRv45ENj9vxvwwuvgsZJGPtr8m0Ls +h0Q== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=jJhyszKDMKAjLpajlSwzCDO6UxKttvFe5wOvOXCUCS8=; fh=xT2oOr1dKVJIKjRhPxGPiYzd2KIQPfFRAiJKqI2GKP0=; b=dvAMm/Wpd3aJqdazUrMUSnbO+wb8T8wud5kVcWxi847UQXE4ZhNtkYfRmBAYOqRj3h cAlTFqd6f6tgJFqSYxeRLiAljff03dD90ABFn6wp9ICq0QLRCO6v+dqhMOguaI7Vfe+/ k3KMhjpK97oC1KdyMna4vqA5RJzeFC65MQJ0jcrAfg6iqT4jn/PxDNVhQK+fcfE4YHtV wPBnpJEL8hb7PeIR/pYRwHVqXsK4z2zT3koEhkcNEwo0K/v/s+03xN4odKjZGAzz3DtT jHHsX4lkk6SyNr+xc5jetVM4X0PYOkQ7mzPaPwyS+7q1ZXhCI95exktgLIPLcZBruuYD IHLA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=xfbtaRwU; 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-73637-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73637-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id c15-20020a6566cf000000b005cf5895bfa6si6699735pgw.814.2024.02.20.12.02.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:02:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73637-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=xfbtaRwU; 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-73637-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73637-linux.lists.archive=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 64DD0B222F3 for ; Tue, 20 Feb 2024 20:02:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3F7AF14AD19; Tue, 20 Feb 2024 20:01:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="xfbtaRwU" 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 A3F9314AD11; Tue, 20 Feb 2024 20:01:24 +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=1708459286; cv=none; b=WyIlRAOGNJXRoEAmXCvnNio5zpC48XhMI3FTv2L6h5ApB+XEigrYjNyj+38YV/Dd8hmjXKRcwyZwg7x0UjS0t5ysSUFh7itsqnCBdYU740bsreShsJT968Mr0RPw4VaEPEKlvtdR7uERkcGyK8Qg+sa4OKTaTUrSuuIBUdFOGz4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708459286; c=relaxed/simple; bh=yyYbfe7MYV+zSUFDLRCmIriY0MML29KBgGRbZMEyMio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GoJ49d6krlurpAuOIHRsmCZsSwE2T2k2rjRoEuc0puhZ2WzjRZ53OXk/SfkxqoIhJQUW+vvHrMfFCikW/yBZ/Jgz/WPkO2R92ZSBUXW45oKXoSRzMHTE+GWLOMeTLrAf33iuCCp4QnOuq9lcdIH1yoBqWD5MuDLqGcmuhSDVL6E= 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=xfbtaRwU; 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=1708459282; bh=yyYbfe7MYV+zSUFDLRCmIriY0MML29KBgGRbZMEyMio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xfbtaRwUyxbkg1qJbonJSI1czecmACHWIvixLNBKyd9EKTGyFib2QRMO4e18yvttW leyXCGKa6h63m7A8tifRyXQmVfkqfez4gbJBup491hFZYu3Quhvck99ua3qfJryT2A Afrq8IAPQi2ZXBAJznzL+BNQ2BFlT2e87eUMAkuKXKPxp3vqmJAV11RYNE/XHDe9kM 0Ao+hGLUvzYKyo9HO0tu3JrxzLTBLRihQVwFO4n48EJKOlgqkL27C6VZNlvFAgbJbd QhLcdjuwZFLA9RbLOQfhV4ez2IYtTiJP2zn4BlBVysmMaanef+B6s8QaWM/Eo6d+zz Ish82GNKlJWag== 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 9AADC37820CB; Tue, 20 Feb 2024 20:01:22 +0000 (UTC) From: Cristian Ciocaltea To: Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Daniel Baluta , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai , Venkata Prasad Potturu Cc: sound-open-firmware@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v2 2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Date: Tue, 20 Feb 2024 22:01:15 +0200 Message-ID: <20240220200116.438346-4-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220200116.438346-1-cristian.ciocaltea@collabora.com> References: <20240220200116.438346-1-cristian.ciocaltea@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Introduce a new member skip_iram_dram_size_mod to struct acp_quirk_entry and use it to skip IRAM/DRAM size modification for Vangogh Galileo device. Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification") Signed-off-by: Cristian Ciocaltea --- sound/soc/sof/amd/acp.c | 3 ++- sound/soc/sof/amd/acp.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 9d9197fa83ed..be7dc1e02284 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -26,6 +26,7 @@ MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug"); static struct acp_quirk_entry quirk_valve_galileo = { .signed_fw_image = true, + .skip_iram_dram_size_mod = true, }; const struct dmi_system_id acp_sof_quirk_table[] = { @@ -280,7 +281,7 @@ 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) { + if (desc->rev == 5 && !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { /* Modify IRAM and DRAM size */ ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); if (ret) diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index b648ed194b9f..e229bb6b849d 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -209,6 +209,7 @@ struct sof_amd_acp_desc { struct acp_quirk_entry { bool signed_fw_image; + bool skip_iram_dram_size_mod; }; /* Common device data struct for ACP devices */ -- 2.43.2