Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp460758pxb; Thu, 9 Sep 2021 05:06:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBd+zyc+kHu9umT+2r691gxgRS7vSJEqNIH5YbbWnaUZaKEHK3UNeqEcj3FhGnT31ZfSAu X-Received: by 2002:ac2:4c48:: with SMTP id o8mr2050699lfk.224.1631189208157; Thu, 09 Sep 2021 05:06:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631189208; cv=none; d=google.com; s=arc-20160816; b=FgQqsrFJRTHcAKiuFEkcZakX2oWS/UuDrFnNTeRrLOsMH9yZeu7BwVX7wpdagGoEU8 5fiDarJ5yjg++Sowl9aDd80ycaz80LdD459qYk+2KZ9MUlbEPR14kzeNPZQKGVHLRivR 1HE5JREpo6U89VjrME72K14qJF4TgZ3MPSsgMdNp3o0+NDrLY16OSoI4SfoQ+MafAK90 uXZr4GbLgjuUkQrEyxGDY6h67CRFxFDVKiNHtydb6ULRXyVwsq9K6BYJw7WoH/zLseu1 ILWu+Jn/rctDc6B/yn91fZQ+67lwDcLWAbMqKb3D13noX3vsE93cOEIrBdBop27IdmRF mvyQ== 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=NMvgm+x34tgiOVxcpa2s9lRfwAJa7cvPuKPt+35ZpTHNP37DVVZiScJHkReUg2DDt3 0Jm2gGN8aTwYMjvMgiVXG0B+1yGHOLMq4uZV4OwFj43mG/3jOSyCw19LmGmTd6HW/PKF 5EH8nzObjMoDuYaFjhUHHo0OMG55CQNK2aawSK2jBghUPHiKy6DJGfNGH1EgiE7qh/p+ JmRMxJQnYUhL/2qzJQ9/KteFxfsT526zu3d7wQw2WD9COSaQpi64NHaBYcM30/aUQlEa k7o1SXb7VTi9kor4SVm242iFXhE1/glq/0MQ3VaCIAamZUUl8IgtTaBSvsqMfHRuRC5e Ex0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ureXNHZM; 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 ka11si1461724ejc.367.2021.09.09.05.06.07; Thu, 09 Sep 2021 05:06:48 -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=ureXNHZM; 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 S244919AbhIIMDZ (ORCPT + 99 others); Thu, 9 Sep 2021 08:03:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:33084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243180AbhIIL5B (ORCPT ); Thu, 9 Sep 2021 07:57:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6D947613CF; Thu, 9 Sep 2021 11:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187927; bh=KyrPSSFkkaFfgTa331w9So5Bp9nfhgXOj9h8Ox5YpWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ureXNHZMWLhDDjKlks9RXwlKsO/o9Pyk2X+HbBiPQUOhIKlzjJ2+vk8RrMY7sKaPv VrHNTm4LhLlBx/EMp/4BuU/5x8f8Jri/T8CMNQH09gL2QMuVO9cebNdjKAIg8bRYe1 8nGy7SJKwFHJ6YwxMw+r6OtYHAnQR8gXJuzMQW6SzrO3/hIPiB6l4F87m8v10N2Lo9 gSfIYu7dQmcnJz8G4Mijvzy5IaBQV6UjhOLcxlvrszVY7rExzVDUqVCMPFmWiSQ3co DCZ1twVSSRbQEC/xoFgCzJfONg0sjbMKJITgXxv9bkuD2zsZvbYIRcKlVaLOQ585hT IkN9WKKzCQitg== 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.14 200/252] ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER Date: Thu, 9 Sep 2021 07:40:14 -0400 Message-Id: <20210909114106.141462-200-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-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