Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1962547rdb; Tue, 20 Feb 2024 12:18:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW9PdG1UcPZ/q6kAS+2z2fkhw8vupxU2+Icyf6Y6JL67hBNH9qkJuCNsvoT/tb7LL5Y/mo9LVc+8DIckOUjVGF/68Nm1MvKUV3eZmgIpQ== X-Google-Smtp-Source: AGHT+IEapXXwItavCsI55RwoJp7qQzhOP7O8C58kt4zB0SJviFdlMCdaZckmnsFLp7eduq+QN3fb X-Received: by 2002:a17:902:e5c3:b0:1dc:87:855f with SMTP id u3-20020a170902e5c300b001dc0087855fmr6848293plf.28.1708460292417; Tue, 20 Feb 2024 12:18:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708460292; cv=pass; d=google.com; s=arc-20160816; b=cEFyyJdybnpFocDDOXY4Hfx/iPow8c/LbMYMJIAjwVyUhDk3sK5xJQdXIx0QuCWWAS VCD9SNNNJL/t9GWs6fjulYqQ7GhvSmn+6n4Jv/Q7D8oX3rNaI6navJsuStrkk3yiZS/f osbnNpYGhOyazPuz8g+gfEwXDKQGsQ1QfGnPOLkWFwoJAyw72LOapuRbWXK3ERRL4SRi qcxxtpfeboPnqVpFdgkuGf9r+r7wiAhfhYTajI88Lwbb0vldByU8fxywng75bdXLRfo8 Ht+UU7PmeUZuXqVCyM1lJtwqAE+IADzDknlublxiUdY5WAe6wj+sGO3D72fjrYiiz5kA Gl1w== 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=Osy7yNtUrJZB7M56xHonF3ZO4nKPAL5l/VgGdv/z1KAFs8qcLz1BvysWKPvwQt2nuE Z2OU4vygx5QDZrDQhFONVt+W8uQpf70AnbR7I01vg+3lZPt5M7sPQNdtxFklrOYxgQHU +f9nI3oRXic60qj0jLeWm0SEiPYYR6w354YCHTc8rLxyjVjn0MokbT0JAqhnKXgqy4Kr B7iscyWjZ8N4Dsgpqk3jSTPGATBfOVHkDXmmcMG26p0ULx3XVtUMWJsBM/8rXwIXz7BS KYazNRxmDnn2vuzpwpMd2wXcnfJkCT6zUoWCuopCUIY2szjhSR5NvOUXUr/DV3RSpVJM PtYg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HXCwnRWZ; 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-73664-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73664-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 e1-20020a170902cf4100b001dbdfc34a20si5110908plg.211.2024.02.20.12.18.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:18:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73664-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=HXCwnRWZ; 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-73664-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73664-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 3248DB21D31 for ; Tue, 20 Feb 2024 20:17:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DC8AE14D453; Tue, 20 Feb 2024 20:16:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="HXCwnRWZ" 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 7355514C5BA; Tue, 20 Feb 2024 20:16:31 +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=1708460194; cv=none; b=jKuFjrTtrh472J7mQ6tJAVpcH7F3L+VYQUDwMbgvxrm79nFjl/s0B876scEcrE9DRuoooqdWZ5UKEOxKlVF79E2FEkyfRps6g/6o1hd/D/FXIpFUS256HRAn/Yvtv1ruvO92TkINEuu/mf2dvgt6e6PWu8DCyKZ4xQieVm3A6tk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708460194; c=relaxed/simple; bh=yyYbfe7MYV+zSUFDLRCmIriY0MML29KBgGRbZMEyMio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NeaLCqH535ep5k+/FlGb/bKkQ1XwGenUW/cEIFzIpsnmX6JvQIQ5aK6WHbbxV5kRummo182MUIl2nY+j3Xh6jEHYPbyoQNgQ+3x0R8z6TVFtkS/exVQ5GVSIbBASMYuByBrk9a058NjZSqaqDOxaU1/07cXrc718IHvQOmU/95Q= 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=HXCwnRWZ; 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=1708460189; bh=yyYbfe7MYV+zSUFDLRCmIriY0MML29KBgGRbZMEyMio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HXCwnRWZZXEoqjCL/NuFmaJn880yobgYu8HKFE4HrB1KtHQlcGVi+HSRgmrFS4e2l /qxU78OrvkQbRncW1b3HGUQxBcD4+GfkQfpyBk4aZjQsSlo5HEG81yWleV99M77Lg/ rqCAWB0NWLV0Btryqii0Fw7TfukmaIPyd+rE/ltB7o0BlPhjl8a0SRpommzYtCdbz2 FU1VOKn6Sp6AyEGKyMaAgU+b9oicejTC1UFrkWtlzRgfs7voOF/4EwS8VLEkkllm/8 TZaNLaxH5yARcrJUKlpzbBDy8cA1sA32QX/axHzGNpYehS+QuluMVLpP5XDplu97JL 4cP+95WNhXymg== 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 704F337820CB; Tue, 20 Feb 2024 20:16:29 +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 v3 2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Date: Tue, 20 Feb 2024 22:16:04 +0200 Message-ID: <20240220201623.438944-3-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220201623.438944-1-cristian.ciocaltea@collabora.com> References: <20240220201623.438944-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