Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1733528pxb; Thu, 16 Sep 2021 14:17:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJqqwqjHyrjoFI8Vs3vrNWSS6O4jvh89K0Vf+VFb3o0jjd3B1+p2YjExGgQnDZQrfYS2Ek X-Received: by 2002:a92:6907:: with SMTP id e7mr5334529ilc.301.1631827025405; Thu, 16 Sep 2021 14:17:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631827025; cv=none; d=google.com; s=arc-20160816; b=JsoKAxlVX2LNnywo6FAQvDFTrI70DBgY2D/x7m1SJBmh/vwhwymU/fFnaEe/qimqVW ePXeSZDK8lsdNRRTpJKnWwTpzqtBo8ZqTtUUPcnq40euPSYSOZH5l/j6JI6tbPJmInVe yKUo32Tzn88dmo4niFOdZmJtqZszI279eQblYIe+PR6i07D7tPL1iZZkU2FwB1dShJNE 0mF/3xpj08rIOqQlkprBaNamK8zkJbDQHVfVu9hZ8fKG/ynAzOp5Gxwt7pxKxRrWVTwO 7EupjgUTWFJKT6BkmisiXaTHdGEj5Bnk6hnC2vN+0JfVjt0kkzFzduixNcxHtuTvDoXH 3R8w== 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=heHp/JjrN+R33DUsYBoy+GwXuqpdag/4gaN1oMkxMmrOdjNF11uQJsY3lpouqBN66J eUyegrQsgjAgs8GAkovnWbHn0aChw9oEoqBnkJ02RRprCiU7rq4rrmFejAUNrFH1/Y3H DiOYwSHAlFHL55hbnXzjqOoJL6N7Xy+sR2ak5Q3Bg+m9M5tsb2iB0UARhd0xbMu/2D25 eW/Alq/HHgLDcgrscRksA4j1KwO+q5nipeGAT6Ftp65sSBQcZh0vQx3oWRfEaDyW4/YJ 0tTLMF7eB8lqb1KQg4g1V/u+YuKFFpl1WLJ/PyeC/yWFZwKNNteTU7CCGnF+KcBlxznN JOAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gBFnU+tr; 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 m1si3977120ilu.13.2021.09.16.14.16.52; Thu, 16 Sep 2021 14:17:05 -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=gBFnU+tr; 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 S242632AbhIPQcU (ORCPT + 99 others); Thu, 16 Sep 2021 12:32:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:59314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234853AbhIPQXs (ORCPT ); Thu, 16 Sep 2021 12:23:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B83D613AC; Thu, 16 Sep 2021 16:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808961; bh=KyrPSSFkkaFfgTa331w9So5Bp9nfhgXOj9h8Ox5YpWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gBFnU+trfrTdjp8zXtK1LYAxQl23iSZW8dLqCUr8D8EYbGMdVk1MB0RySzHZmk1Sc zNGq9cOAzmuf68bh9LCkm74K4rf+hhnRLKquCXP+Fm9ZrlrMoJe9WUIn13mIT96bR9 sx2M3AsP9iZr3rJXV7E4sw476tV6NPFYCjDomVaM= 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.10 244/306] ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER Date: Thu, 16 Sep 2021 17:59:49 +0200 Message-Id: <20210916155802.381969720@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@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