Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp503894pxb; Thu, 9 Sep 2021 06:02:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwN2OjcbeU0+rrpKdkJ8lIv15QAGqmT/fcwb2thrmg+H4J7gvisK3ZIUQiKqloGvDWbrNFl X-Received: by 2002:a05:6512:2354:: with SMTP id p20mr2234566lfu.461.1631192562806; Thu, 09 Sep 2021 06:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631192562; cv=none; d=google.com; s=arc-20160816; b=MdmQyxb2J6ClA9772kzY47G9KGgDn3tmk6MVqYfrkV7PTzaUagGuAoCLAJl8pmbtKR BEvmzJr4CQO1epetPzhSxWxcItXM/4me2Tq4SilAUgPERwFCNtCLh8SoYF9vzFok0Y5A whq/89slVuSAawgTIQrzKuK3+Det11iKS4P4vNSwIrVtktoWdC7LK4nNsHtUOKbud4m9 tVjUsjRQTvSmW5g1XsVku4rvUFGWX1KCPVyegMsAAZDqRIgOk/CWbuW/IftdlYHARVQ7 8e5UI41SWPD4xE/r0jQO4LVFKUa87zG6eZ+gbIOXLPr+YWgbGhniR7SDHBqC4li1NlTx 8dtw== 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=NssRCnNssJHUUHOY76WPII1xAXJV+PkXfxSCrvGbyc0=; b=w9prP30dEqw+rI+tBfHjjI5fschbj0hqAZ7tY82o/htfljz7PP2ciej3SD3vaJKWiu twJwwghGH2qqZtLkLIzZK8U00WaiX35SpU6DZeFTCTR0ho0IeqXBE0Kz/G1V0Ft92P5t UH+sgtV7kl4gfZLui+1z9fvJDPzraewRjvQUwjuqpkoQMVc0xHLkGhLQ8PzqgPzWQ29I 56W2PEIyFscfzVpOSthNKRVzrS3/4/UGRBy5obwj54NeqcCcdhJhizYAQqnciUBQvE1k mdNc84XklpgFNjv2Qs1/XJXNTqnH36DnwsJ63TJzs1zi474B2SaVWZZfUqnYHx8+h6k2 D83g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hYwMqAaq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s22si1608908edx.408.2021.09.09.06.02.03; Thu, 09 Sep 2021 06:02:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hYwMqAaq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355883AbhIINAx (ORCPT + 99 others); Thu, 9 Sep 2021 09:00:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:42404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355256AbhIIMtl (ORCPT ); Thu, 9 Sep 2021 08:49:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 861B663221; Thu, 9 Sep 2021 11:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188615; bh=KyrPSSFkkaFfgTa331w9So5Bp9nfhgXOj9h8Ox5YpWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hYwMqAaqv/R9UhxRqgVquoqaP7dKczbGROY3rUyANFaa4S0EVguAZRIqzkv0pM/eW d0OF96mo+COtf0bTMUZTAJMVUJxbTm557zFrYBQf42aJEEyhYNDCTa1MV6QgpIIW3W 1ucHRdNEJgr96EFdV7nrC5FfCyA1fgLyIQclhartWdXo69zgh5oIbU7Q8MNrTnEuRB hRnIfc9iKELTJ7cu5YjbnQqxjNWScinlqffefah6ApuAx8fCjIUWP8skoD6zxzYgjf Dc5okKtNxLIszubgIG5SqRXWbQ4grCExwMQ2BtzPgNaSAwaW0KhgmmFfaiU5sCNuxA vOa8FMody60RA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cezary Rojewski , Lukasz Majczak , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 085/109] ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER Date: Thu, 9 Sep 2021 07:54:42 -0400 Message-Id: <20210909115507.147917-85-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115507.147917-1-sashal@kernel.org> References: <20210909115507.147917-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cezary Rojewski [ Upstream commit e4e0633bcadc950b4b4af06c7f1bb7f7e3e86321 ] KeyPhrasebuffer, Mixin and Mixout modules configuration is described by firmware's basic module configuration structure. There are no extended parameters required. Update functions taking part in building INIT_INSTANCE IPC payload to reflect that. Signed-off-by: Cezary Rojewski Tested-by: Lukasz Majczak Link: https://lore.kernel.org/r/20210818075742.1515155-6-cezary.rojewski@intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/skylake/skl-messages.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index 476ef1897961..79c6cf2c14bf 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -802,9 +802,12 @@ static u16 skl_get_module_param_size(struct skl_dev *skl, case SKL_MODULE_TYPE_BASE_OUTFMT: case SKL_MODULE_TYPE_MIC_SELECT: - case SKL_MODULE_TYPE_KPB: return sizeof(struct skl_base_outfmt_cfg); + case SKL_MODULE_TYPE_MIXER: + case SKL_MODULE_TYPE_KPB: + return sizeof(struct skl_base_cfg); + default: /* * return only base cfg when no specific module type is @@ -857,10 +860,14 @@ static int skl_set_module_format(struct skl_dev *skl, case SKL_MODULE_TYPE_BASE_OUTFMT: case SKL_MODULE_TYPE_MIC_SELECT: - case SKL_MODULE_TYPE_KPB: skl_set_base_outfmt_format(skl, module_config, *param_data); break; + case SKL_MODULE_TYPE_MIXER: + case SKL_MODULE_TYPE_KPB: + skl_set_base_module_format(skl, module_config, *param_data); + break; + default: skl_set_base_module_format(skl, module_config, *param_data); break; -- 2.30.2