Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1814887pxb; Thu, 16 Sep 2021 16:42:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoVYeZOlvPsGYxuQz0/9OOAdhfwrhft+yVxKfiefe2upcvvppN530H3XhJ8Kebf3rzNLaP X-Received: by 2002:a6b:c80f:: with SMTP id y15mr6221771iof.80.1631835757960; Thu, 16 Sep 2021 16:42:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631835757; cv=none; d=google.com; s=arc-20160816; b=qCIQCnQU9EmYIt7x0LYPCOkUVZeXSeH1kvX2o0MCHpr/JCMl0CoqxDXLuNg7s7jNp9 h2eSbvlykzKu6Y1044LZQbEpAZJSm6shJVcZJse4x9eqxPSIKHA7MkeKzexK5UCWYZqn u7qcIOP8yckSJ30wd4fP+AA/XygZ4BCK2E2hCv27SquCV8OrXQFcABeArGEoKXhuEsWs +FxSm/ycpnI8JV9FGi4LMk+uIenHmhgJOlZPgtiaQJow+/K+KsKeiFb+9qf9mvArtRQ0 x190QG0XHTAMu2KsTI/g5sfXfHbmH+5Vhhu/F6ze+Fs7JkC5C14jo3qIEv+Q+Shg3oIJ Xn7A== 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=PMAFZV9phkrpzxk+s1hnzPvMf5CnkDIt8VAITxUDQJDbYTMOOMowwKKNJGcA1Cvkzg 4cv/+u0yTRcI8JaFrbXvZmEokcb7LW97lExnqlLPBiOO7TsghhaHe0t4nwUS8GpO/Kyb uolfmIAzo9M1Nfb/8yA9zx8KtbR7vid8/DbYVK4OkVyP12+Hx+PSXeJX+cwbL+rDKkmH XfeOOQCIACxlS1mjZ/gaAK0w9jkNMmJc5uFWyMnYrWZvMvP2CnSWza/dtz93JImMiFF9 dHURoPt4BcOkTU1vHgE6hlwU7qT4OsjfKtN1CZVrPuLEFdOtH3zwi8Arxiltcl7E/AU9 9kNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iD1PTHFs; 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 x13si4748972ilu.41.2021.09.16.16.42.26; Thu, 16 Sep 2021 16:42:37 -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=iD1PTHFs; 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 S1348969AbhIPRDX (ORCPT + 99 others); Thu, 16 Sep 2021 13:03:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:55316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346809AbhIPQ4M (ORCPT ); Thu, 16 Sep 2021 12:56:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 45B7A613AD; Thu, 16 Sep 2021 16:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809845; bh=KyrPSSFkkaFfgTa331w9So5Bp9nfhgXOj9h8Ox5YpWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iD1PTHFshgJmI2Z+Tt2pGqEsjGcKBKeKafSbAfWKnjIPtRG6aHZotFzn9TKtskndG F4hxBTikM1XIwTZYqbD1gt74xXhEWFNlkKyNFuMQUAOGbHIcOkja5pyHEcFJXsYK/X RZaFTGUqz7BnpFZ+0ePokCI3NJWJpN4Vul4rpQd4= 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.13 304/380] ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER Date: Thu, 16 Sep 2021 18:01:01 +0200 Message-Id: <20210916155814.396725353@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@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