Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp4564119iog; Wed, 22 Jun 2022 01:04:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sJ2KKO3Bue1AqecvTrUp9dsInNl9m/l1KY5tULhKjZoDqgqs8p8OLSwSfDXMIu6FojaS0Z X-Received: by 2002:a17:902:f391:b0:16a:2d12:152c with SMTP id f17-20020a170902f39100b0016a2d12152cmr11259055ple.102.1655885059171; Wed, 22 Jun 2022 01:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655885059; cv=none; d=google.com; s=arc-20160816; b=WALgpET+n3l+xzvvzYUEUEwk4zs7ui6G/lMrx5gX0Ge1Lej/vizo+m+UCBIrHmWcxq jvaxFzmPHISi+uA/cXCgcR/Jy35n8Gh9XXus5CDwQmSkm1oyZ7pQsCBOjcMw/EyC0PQI T1QyZz1pTO3QmbmvfHWEx4emaTrDC95h4/ypreVFiZTbtijq2UBt57oYdIaZcQK1GlxN nYkG4ACFJ0XjzkPTE4egvS1YyHAMWfODqRfEk7pIDLOtJbqUtE3xEyC9Xm30VvPmsTU8 vRR08g9HAa42hHFwpQuAsBJl2dIb/dRYnj4pm0WDa7pGx0YS1oWpsUOLpu9zpdtnMKWx ByCA== 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=i2GlN7h4TCNJX78uJ9xbCqKDkFCcSex86cITEC2VbPI=; b=nwv+VvR/x/D/P9HMWePJEpxaAeEVmwswiabalKQx8gA2eZCo8AbJSvPRTfK8uHlOch 0d3Z5OvmlXgZ2z4AQ3XuBPu4sNrtR67I2n5ZCBrwH6oSl15XfkzV0nFF9gRlmQ5evw4D JRb+vEnCjLjXLf0BKyF/TYCucw4FeFl5GJ9NBLMBNkBesIJlOv0Pxkzx1m/e+gCqXpNd VJUiBVg4nA2Pu6UDgOrTRMm4suQwWWK+47S7xATCJPbnYwxmamTQLBHmMw1wQERlQl5m Hn29n6qrAekR+GP+mNzRkC+Oszqlydg0ZAOcvRCe1fTHL8UnBHxrH8X5YV1I11KyJYij XIMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="Nfq//OJT"; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 2-20020a17090a030200b001e3446e5c51si21208794pje.179.2022.06.22.01.04.07; Wed, 22 Jun 2022 01:04:19 -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="Nfq//OJT"; 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 S1354272AbiFVHry (ORCPT + 99 others); Wed, 22 Jun 2022 03:47:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353912AbiFVHrT (ORCPT ); Wed, 22 Jun 2022 03:47:19 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6280E37A14 for ; Wed, 22 Jun 2022 00:47:16 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25M5nide032367; Wed, 22 Jun 2022 02:47:03 -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=i2GlN7h4TCNJX78uJ9xbCqKDkFCcSex86cITEC2VbPI=; b=Nfq//OJT/Xn1BDiymW0nJmJ4zAlM+cx4A0NO1zBfGFELk8TWG1ZOEv/AzzYwc3h8IUny wZzAtX7X494aOCcjGOEOStAZG537FJFIycCz66vo/QNDBXU4DTUUb0zw2Jin7My6d8HF +6oDzb0ZUwkElxTl7eE7muoZYAwkFYVMQNiHiChMSj6K2snwN4CBXBu6jTbIO7jQQ7Ni sbLdSypmcBFGSvuiulW5AviMueykYlPpwlALVy9khERy8eZP9l7ATZLAAaAmK8kObx6Z Dw/PMkQVnxYwPSjshUf3b3nBvtaOmVQ/m9WRXYrxzPPmoIGF7V3wWsfnS3tPVT48PcQ0 ew== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3gsc41cqh2-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 22 Jun 2022 02:47:03 -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_128_GCM_SHA256) id 15.1.2375.28; Wed, 22 Jun 2022 08:47:00 +0100 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.1.2375.28 via Frontend Transport; Wed, 22 Jun 2022 08:47:00 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.175]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 870A87C; Wed, 22 Jun 2022 07:47:00 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH v7 14/14] ALSA: hda: cs35l41: Add module parameter to control firmware load Date: Wed, 22 Jun 2022 08:46:53 +0100 Message-ID: <20220622074653.179078-15-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220622074653.179078-1-vitalyr@opensource.cirrus.com> References: <20220622074653.179078-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: nFV1EIyYUTpIEkyYW9vKdkiupNmAxgj1 X-Proofpoint-ORIG-GUID: nFV1EIyYUTpIEkyYW9vKdkiupNmAxgj1 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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 From: Stefan Binding By default, the driver will automatically load DSP firmware for the amps, if available. Adding this option allows the autoload to be optional, which allows for different configurations. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov --- sound/pci/hda/cs35l41_hda.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index 3aa36c5ff972..4151ac5ab399 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,11 @@ #define CAL_DSP_CTL_TYPE 5 #define CAL_DSP_CTL_ALG 205 +static bool firmware_autostart = 1; +module_param(firmware_autostart, bool, 0444); +MODULE_PARM_DESC(firmware_autostart, "Allow automatic firmware download on boot" + "(0=Disable, 1=Enable) (default=1); "); + static const struct reg_sequence cs35l41_hda_config[] = { { CS35L41_PLL_CLK_CTRL, 0x00000430 }, // 3072000Hz, BCLK Input, PLL_REFCLK_EN = 1 { CS35L41_DSP_CLK_CTRL, 0x00000003 }, // DSP CLK EN @@ -862,11 +868,16 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas cs35l41->firmware_type = HDA_CS_DSP_FW_SPK_PROT; - cs35l41->request_fw_load = true; - mutex_lock(&cs35l41->fw_mutex); - if (cs35l41_smart_amp(cs35l41) < 0) - dev_warn(cs35l41->dev, "Cannot Run Firmware, reverting to dsp bypass...\n"); - mutex_unlock(&cs35l41->fw_mutex); + if (firmware_autostart) { + dev_dbg(cs35l41->dev, "Firmware Autostart.\n"); + cs35l41->request_fw_load = true; + mutex_lock(&cs35l41->fw_mutex); + if (cs35l41_smart_amp(cs35l41) < 0) + dev_warn(cs35l41->dev, "Cannot Run Firmware, reverting to dsp bypass...\n"); + mutex_unlock(&cs35l41->fw_mutex); + } else { + dev_dbg(cs35l41->dev, "Firmware Autostart is disabled.\n"); + } ret = cs35l41_create_controls(cs35l41); -- 2.34.1