Message ID | 20230217161410.915202-5-rf@opensource.cirrus.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp974729wrn; Fri, 17 Feb 2023 08:17:13 -0800 (PST) X-Google-Smtp-Source: AK7set8CvTvEwO0cdI9hTrq+XHyYBVOCPpx1DAh38OQQo9Q6RaIb+MHY+rotc8kFx21MZiEAK6SR X-Received: by 2002:aa7:cd84:0:b0:4ac:c5e5:3f33 with SMTP id x4-20020aa7cd84000000b004acc5e53f33mr696931edv.0.1676650633376; Fri, 17 Feb 2023 08:17:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676650633; cv=none; d=google.com; s=arc-20160816; b=W/UYQf/ELogiVAxSHsrOgE/9je2Raw+zABSb6HUAaNJjC77zDjmHFgFs6Jh6I9oMNl 9zhLuo2yZVoIL/hN2WcT/tSv5DNjpZ4Ud7mTXNA4bROXALEvjPtYrReSPUf3AzfBwhqW k7v3B0Bw9bz7DnbK/u9K1XlGbAd+GU6TxsZESV11SKeL2+gpjq1lD82fBKdsl+BX1ou/ 6a/nytzRcq8nIavIADTGq1DXeY9hj2KXXCGG3zwEYfQgbGOoeAuJAyLirKaZ5BmvSof8 TykcowLuJe39H3Lb2lIdpgIKLmYLRUvYmMnt6t53yMv2+hfMG0slE8ilxzgyv5PAP9oj /6Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=89OqfVmfn1Au+gkokDwDQ8MKFgxhf0rl2z2ZybdFitE=; b=Z2Morq6MbODgZym7VUBw84Y6FkSyVGZFDlBBWvyRUZU8kfr01MFYWVQIsDA4vD2Fmz HakT9uFgp6QRdd1IiLr+L+HY3gKM5ul+cggrp6tCE/WKNA2FMecAhwzOYeEh9KgqMbY7 6I1iuNxqxpy9KlrBvcFN1y1oICa686d7/bNk27PMZpmfzb1+BbR1FyOqbxlD9jARxtDC SNL3M9dTxrGA0yfUVr5n51uIi4un6XNC3oXOI8HI6v+k0Kf14UNLYUgakvkiq/9Z50iU 7BAI38sCn+tkTUZmNsljv2Rv5aQRKbePDwxe3Ob8+GfRae2nLe3clEJznB//J92vmEyJ ntqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=i03YE08w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u2-20020aa7d982000000b004ab1624f2d3si5975270eds.276.2023.02.17.08.16.47; Fri, 17 Feb 2023 08:17:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=i03YE08w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230508AbjBQQPB (ORCPT <rfc822;aimixsaka@gmail.com> + 99 others); Fri, 17 Feb 2023 11:15:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230472AbjBQQOc (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 17 Feb 2023 11:14:32 -0500 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 637C2711B6 for <linux-kernel@vger.kernel.org>; Fri, 17 Feb 2023 08:14:30 -0800 (PST) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31HFh1JO028722; Fri, 17 Feb 2023 10:14:14 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=89OqfVmfn1Au+gkokDwDQ8MKFgxhf0rl2z2ZybdFitE=; b=i03YE08wPY3OrJ2YQYBIkNvsvPtd2sMwXp/7hG/75z2NwRc2Ey6Q3lvPm4KkwVKtkr+n nm9dFQd4IABiY2mM4vV5z4K5ILurPTPtOz4xA9rvDY6ncu5q14FVmGW9v7R0nqnHI6Hw +7u/7jQR42QK3MF4H6JCIoiLXnD3WyskNUh0psdbUBXsBjPHqNfqrLGYfXPFvBRt25xb DU3eKVQAggERUX5BpsUYExaLGupEShUOSGKftW8ezGUm0NveC/0B/p67wNjDNbFRk7l7 ZATHqn3zIuuCslB5oKl+XstClizwH6wvwPx+qTrsV0aXIXKFli+FD0/1QaRXgbQdgV8n RA== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3nt1btgsph-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 10:14:14 -0600 Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.21; Fri, 17 Feb 2023 10:14:10 -0600 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.21 via Frontend Transport; Fri, 17 Feb 2023 10:14:10 -0600 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.127]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 741F146B; Fri, 17 Feb 2023 16:14:10 +0000 (UTC) From: Richard Fitzgerald <rf@opensource.cirrus.com> To: <broonie@kernel.org>, <pierre-louis.bossart@linux.intel.com>, <cezary.rojewski@intel.com>, <peter.ujfalusi@linux.intel.com>, <yung-chuan.liao@linux.intel.com>, <kai.vehmanen@linux.intel.com> CC: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>, Simon Trimmer <simont@opensource.cirrus.com>, Richard Fitzgerald <rf@opensource.cirrus.com> Subject: [PATCH 04/10] ASoC: wm_adsp: Support DSPs that don't require firmware download Date: Fri, 17 Feb 2023 16:14:04 +0000 Message-ID: <20230217161410.915202-5-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230217161410.915202-1-rf@opensource.cirrus.com> References: <20230217161410.915202-1-rf@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: pNCSzsW1GfLqnax6WjOhuvOOtdapJCMA X-Proofpoint-GUID: pNCSzsW1GfLqnax6WjOhuvOOtdapJCMA X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758095614455142923?= X-GMAIL-MSGID: =?utf-8?q?1758095614455142923?= |
Series |
ASoC: Initial support for Cirrus Logic CS35L56
|
|
Commit Message
Richard Fitzgerald
Feb. 17, 2023, 4:14 p.m. UTC
From: Simon Trimmer <simont@opensource.cirrus.com> When a DSP can self-boot from ROM it is not necessary to download firmware - when the DSP has the wmfw_optional flag set not finding a wmfw firmware file is a successful outcome and not an error condition. Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 3 +++ sound/soc/codecs/wm_adsp.h | 1 + 2 files changed, 4 insertions(+)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 854d9366a745..8176b6173de9 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -850,6 +850,9 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp, return 0; } + if (dsp->wmfw_optional) + return 0; + adsp_err(dsp, "Failed to request firmware <%s>%s-%s-%s<-%s<%s>>.wmfw\n", cirrus_dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file, system_name, asoc_component_prefix); diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index dc2f7a096e26..173dcae2c260 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -34,6 +34,7 @@ struct wm_adsp { unsigned int sys_config_size; int fw; + bool wmfw_optional; struct work_struct boot_work; int (*pre_run)(struct wm_adsp *dsp);