From patchwork Mon Mar 20 11:22:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 72127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1161792wrt; Mon, 20 Mar 2023 04:37:50 -0700 (PDT) X-Google-Smtp-Source: AK7set8vS0TtrosWBv6Bzmdu+DcKaiDhO2nDy5SlIPrA5cSfpFDZRKPiTkDAO1HDtd+xFoF/KQPz X-Received: by 2002:a17:902:e0c3:b0:1a0:4b9a:bae6 with SMTP id e3-20020a170902e0c300b001a04b9abae6mr14240448pla.30.1679312270547; Mon, 20 Mar 2023 04:37:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679312270; cv=none; d=google.com; s=arc-20160816; b=zVYVKbvfPbz2iL6M59bpw2P4/pPLEcClCuchF+83i2DokSfVFFyf46hdy/kNGxc5Ov m/Fpb2u7AI5EE7vWxspJqpg5hlqn31vxMNl+OyXMSvSpR66OlDnibjQFKxN9C4R7VBBd dqKm4POrlsQiaCvs1cyn71b7xCRN4CwITz3YZl1AGC1+6OkLS4oACf6dIpCFZIJ+1oQF 9KnndSUwcyVK/LUiXfEQ5g55VytmmLb3g4/GvQovixYHeDVn5xKK4L0amQ1uqUZkDbX1 HyNqMmT7uWVNYAc2x6tj874VQml3FpZkIXrgycpi/4c/LsE4NX/jS4E1kI2qAOqxXorm HP2A== 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=xuluCf4DfgZqd5mE95VrvHWgK4IMtCG1lzUraM8ivXZqQauNqrbqslwfp/nPCwiM4c bONo3J+yLuTvUOMmLdSizJjQXheLJTCuRjCpa5KaVFEnd/tVXs7N5HStGMIHH1gOTq0z b5lMNnRdOmKfsLf7YaWH2CQYPkpT17wegyTAV/Tlx/KjfeWhNltusrxThXwrJYcMeINY ppA0Shaiq/BvauPV1Xn7FaxtJG/JgB0MPGVz1E84z5lpyGWhyfn8v9g0Xvn/9a8/aksN KW3mwyCQuRCIHEg1pVCqwnE2PZjqn02fjsubiMmqEJ1LlB5dT0jCNcQfS8sZ3Qr22/dp 2xtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=Q3cVgane; 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 r8-20020a654988000000b0050c0674ab43si10247083pgs.378.2023.03.20.04.37.34; Mon, 20 Mar 2023 04:37:50 -0700 (PDT) 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=Q3cVgane; 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 S230520AbjCTLX3 (ORCPT + 99 others); Mon, 20 Mar 2023 07:23:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbjCTLXB (ORCPT ); Mon, 20 Mar 2023 07:23:01 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 218D330D7 for ; Mon, 20 Mar 2023 04:22:58 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32K6vbPp027039; Mon, 20 Mar 2023 06:22:48 -0500 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=Q3cVganeQlgCFirBm+XPAqP1ugDmKN+ISg3siNhcQtG77rzoirpbBDjc/ebxZvMakP0k wDsuccEzCnS9906vQ6MTy+cFvCP3c1rwUbBk78Yu9N58mbvjzvBNHM5i8PyvXwmOXMk4 pZ9reDRoJJ4LJfAvvNaN3kHYS4f5+M9Dv8mVjjOc+wv2j/H5D9hCfv2e+8ebgdzAh7gK /HHPKXJwcVxznxzxLBDCZjIbY6OADD1SYIHymKaxbfsfB5cPrMWp1v/f9EAgwWaQl5IB DLilh/in5woRGRmiJbQIn4THC1HSZJBYKycRAXmbKXl6GhPbUj7bouvWlNMYgsV/GqFf vw== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3pd9qptc81-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 06:22:48 -0500 Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Mon, 20 Mar 2023 06:22:45 -0500 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.25 via Frontend Transport; Mon, 20 Mar 2023 06:22:45 -0500 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 C4099B0E; Mon, 20 Mar 2023 11:22:45 +0000 (UTC) From: Richard Fitzgerald To: , CC: , , , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH v3 4/8] ASoC: wm_adsp: Support DSPs that don't require firmware download Date: Mon, 20 Mar 2023 11:22:41 +0000 Message-ID: <20230320112245.115720-5-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230320112245.115720-1-rf@opensource.cirrus.com> References: <20230320112245.115720-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: TI0r-AqSctrZMmftNLkYKOn11qvOnz6- X-Proofpoint-ORIG-GUID: TI0r-AqSctrZMmftNLkYKOn11qvOnz6- 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760886543602377535?= X-GMAIL-MSGID: =?utf-8?q?1760886543602377535?= From: Simon Trimmer 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 Signed-off-by: Richard Fitzgerald --- 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);