Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2349250pxb; Mon, 20 Sep 2021 19:42:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh8yDMtqTD9Vb29pVOmWmpdWeRDBTbcvF8+7FLeKr54N+/XCW6XpSiUUkQfMv0ZiHD3rir X-Received: by 2002:aa7:db15:: with SMTP id t21mr32187234eds.229.1632192160543; Mon, 20 Sep 2021 19:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192160; cv=none; d=google.com; s=arc-20160816; b=aiwJQu+GuKOvCRv5g89KkF317cCouy6DU07ftqa2Hav60xsvu8yPTbDTZiztHjju9z 8VMuFJfpQnr07RaL/LoMcLx5174oY3sgFMtd6alrdw8DZoLdG7wy1PAmyMfq2H8RDgKJ 8BQ6oCYFr41BxYo+PDPOMvXfGlJpxjk/CMRP0sOBnGph+q28oYF/RoEniL8TcJ/TFLbO xOePLnpt33BtNt6lrz/BVeURiLSmHjErsEJfTiDfqW2GTtHzCe9JVEI0IT/fewfBD0Ik ZNL009oZ88Pz5HsWg0HCaWWFNqeAdNL4OhWtZVv/CYZSErjC6GtccnlsqKa0aXyRIggd kljg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NssRCnNssJHUUHOY76WPII1xAXJV+PkXfxSCrvGbyc0=; b=TxjFNRDqxIgj4DHFfavRiM7XKRJTghuV7knt/RnnrjAe5Ydy12si6hVAnbyQnO6AxC S4zGGIvARy/G4pqsKMuUNPoMg2oC+GTRxrAHA1PTSrrQ4FFN2kFpE7rEN4pfDGxWq7P1 4UjpOmmWMfdkgcK3RyfHmoWhNqhT6U+vAnw3W3Umii+pzlXx7RC6T28m6hL+d+dlLuSR RPD7lOTZoCqpKxHZUEMsThmcv1geFOO7SKkSy+qS4ZOeH9beYXWJNp+PqK6rf/ufXzyH xQYQ5CG1s7kBhre4KxD5poNMEYN00wwTPTuU0ws9q0mx35q9PrnUVtMar8J1d5suS6c9 36pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yYA7rElW; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ne20si10495318ejc.429.2021.09.20.19.42.17; Mon, 20 Sep 2021 19:42:40 -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=@linuxfoundation.org header.s=korg header.b=yYA7rElW; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346440AbhITSUs (ORCPT + 99 others); Mon, 20 Sep 2021 14:20:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:35752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376364AbhITSMG (ORCPT ); Mon, 20 Sep 2021 14:12:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 115EB6327A; Mon, 20 Sep 2021 17:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632158425; bh=KyrPSSFkkaFfgTa331w9So5Bp9nfhgXOj9h8Ox5YpWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yYA7rElWMCgFTYtDb5o9ZbQr9PupdgMgqudbpH+0dD9QSUCCzAheZ654rR3b4RFj6 KnWcBhKc9Iss286NM77Pmj7+Zn6QBTDYdJw8lTcm35Ffcj7fEqiGHTA+QLEbDkwbsR k0s6gW+cAhcXw6m8DSoKa7/DVr/7rq3i1JjCL90o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cezary Rojewski , Lukasz Majczak , Mark Brown , Sasha Levin Subject: [PATCH 5.4 149/260] ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER Date: Mon, 20 Sep 2021 18:42:47 +0200 Message-Id: <20210920163936.174962344@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163931.123590023@linuxfoundation.org> References: <20210920163931.123590023@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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