From patchwork Sun Aug 27 13:39:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 111081 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp3583710qge; Sun, 27 Aug 2017 06:40:51 -0700 (PDT) X-Received: by 10.28.98.213 with SMTP id w204mr1814625wmb.39.1503841251231; Sun, 27 Aug 2017 06:40:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503841251; cv=none; d=google.com; s=arc-20160816; b=MqqqGY6HWOybrEyWO0L1v+x7jGovB1GSrJPJeBu0cZg1PWmXWshWYlZVf4RUXn5Qnf eKYOSrJk77QHMNT2PDssD7+9veXwOkyvZ0PzWghZOCaFm8S7Anc9TQDv3m13O09lrm7j RJWvYH5ysOLglnGIXESIVOm/8hlYU0X0jM0TGQfTiMycBF3LW9F/vuiXczIYdEPPtzzj c3NLaEqr2hkqXPZulbHkg1jiStM+m//A4TZk/PTB4bDkp2EUACTXwrp1NsT3Mb9lYb17 t1ygYd1OWnkCW9tFAfG4t3SZO4Y99ytmxuYBwfIbwfA3knWKtUjsDIhSeNx7nJWahYsh Txqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=0WJIerZa0aFxzgwooxbai5p18Y2UKsnVWbp2JyaIPaY=; b=LxWMi6TZ0SB/jwNB4UjlR6oXiUutxsydr7kJdnYjYPP2/wB09R0HZ8A0bVmNTofb3B LIDfDsbR9/u7OcuOVMdvukLY5y9oDQgVjhtcNXNZy2eNPB4gSiVXUnariyAdMS9Jr+BA 5a3s0WcyLUYNfDNsGDQ/sXYV4CM0tNvWCq0l++CT/BsWYrIuCapvt3gJHpMVm0ilHIm8 y7dyLKEev8yQWRtjG0sb6U+q50uaiB/PvFjETYnrbGvXMsQ0TpiUgMEE7ZoB2VdB8lkY xf82YXd+jKnp0UAg5B6kuPKk8IBs1wexYJd6bV9+wtaf/Zn8upBtNc68vXNN3CXAgxZZ brVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=rq7txswI; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id q2si4157941wra.546.2017.08.27.06.40.51; Sun, 27 Aug 2017 06:40:51 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=rq7txswI; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D97A2267654; Sun, 27 Aug 2017 15:40:48 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CFC66267650; Sun, 27 Aug 2017 15:40:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 3E8D92674F7 for ; Sun, 27 Aug 2017 15:39:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=JVNcGcjhGl8sQkzwynxMAqxkhgty5DvnLG0qMt/wqUw=; b=rq7txswIm2++ b56vq3cXaiHdIaKrII/Ieo8GQItAegK66Qb4jJFLm/aip/YCn+20hNiKvdIG3I0IvVRLYdzBjtLH7 1wS3KB2lDd6YobDvpa7GjN72B81f3ynQ0FTyr5ptlADHMpzt7AhjuGyxVEo0xUKQHjiqT8VuWIMLw cuzvM=; Received: from [2001:4d48:ad55:2401:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dlxmU-0005Tp-2k; Sun, 27 Aug 2017 13:39:14 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id B0EC84400E7; Sun, 27 Aug 2017 14:39:13 +0100 (BST) From: Mark Brown To: Shreyas NC In-Reply-To: <20170821084646.6525-2-guneshwor.o.singh@intel.com> Message-Id: <20170827133913.B0EC84400E7@finisterre.ee.mobilebroadband> Date: Sun, 27 Aug 2017 14:39:13 +0100 (BST) Cc: alsa-devel@alsa-project.org, Takashi Iwai , Guneshwor Singh , Liam Girdwood , Patches Audio , Mark Brown , Vinod Koul Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: Parse multiple manifest data blocks" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: Intel: Skylake: Parse multiple manifest data blocks has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 9fc129f6e5de01ce5fccf033485e40dfa429b45c Mon Sep 17 00:00:00 2001 From: Shreyas NC Date: Wed, 23 Aug 2017 19:33:48 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Parse multiple manifest data blocks Currently we can parse a single manifest data block. But manifest private data can have multiple data blocks. So, fix the parsing logic to parse multiple data blocks by returning offset of each parsed data block. Signed-off-by: Shreyas NC Signed-off-by: Guneshwor Singh Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-topology.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 350d2387f737..f14b373f65d7 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2721,14 +2721,12 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, tkn_count = tkn_count + ret; tkn_elem++; - tuple_size += tkn_count * - sizeof(struct snd_soc_tplg_vendor_value_elem); - break; } + tuple_size += (tkn_count * sizeof(*tkn_elem)); tkn_count = 0; } - return 0; + return off; } /* @@ -2751,11 +2749,10 @@ static int skl_tplg_get_manifest_data(struct snd_soc_tplg_manifest *manifest, num_blocks = ret; off += array->size; - array = (struct snd_soc_tplg_vendor_array *) - (manifest->priv.data + off); - /* Read the BLOCK_TYPE and BLOCK_SIZE descriptor */ while (num_blocks > 0) { + array = (struct snd_soc_tplg_vendor_array *) + (manifest->priv.data + off); ret = skl_tplg_get_desc_blocks(dev, array); if (ret < 0) @@ -2789,6 +2786,7 @@ static int skl_tplg_get_manifest_data(struct snd_soc_tplg_manifest *manifest, } else { return -EINVAL; } + off += ret; } return 0;