From patchwork Tue Mar 27 21:00:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Marinushkin X-Patchwork-Id: 10311655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42A556037D for ; Tue, 27 Mar 2018 21:00:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3391B29E34 for ; Tue, 27 Mar 2018 21:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31D6129E0C; Tue, 27 Mar 2018 21:00:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C791629D84 for ; Tue, 27 Mar 2018 21:00:40 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D5C3D2672B2; Tue, 27 Mar 2018 23:00:33 +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 8A4DA267219; Tue, 27 Mar 2018 23:00:31 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by alsa0.perex.cz (Postfix) with ESMTP id 4DB4B26719A for ; Tue, 27 Mar 2018 23:00:29 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id r131so1321547wmb.2 for ; Tue, 27 Mar 2018 14:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4h2KZVk0/Ss+aW8V/fHPTASgMnq5tV8KL6fP4gkHVbA=; b=LBFOP6EAgCAccf/cIzPIq1HV87586Sg091Wvf6O8o5gO4OH1Qdzd0iKr1hCoD/iTi/ 4vfanB353xP6qilHUcLs+dnjZq/7Jf/ujYfZtFf/CW4gub8PgczHuUztDOpJn7qVJiuG 6NTTyU23Ju59IFYq00/0A5TXdP8bmM+xv8fDSd1rG03RN97mYwielIbSdmT1gYtyWFvV Y8ECWB8dFcO1cFZLarirhDHC4GoK+yokKVwSBBEE+2yzlIIKlozP4vmQJ3ZfDi4Ct8n6 k94fUC+SKYP99DCR0zqX5cwUjfBOueF0HO42BWsarUqouq+4nozwoOXdK8UpRkmkHWIp YDFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4h2KZVk0/Ss+aW8V/fHPTASgMnq5tV8KL6fP4gkHVbA=; b=Y9IRpK//AOJ875K1/YeFwHmqEZqH7QABNdcdsehhGk+QotvjhJt1yWeYDkLnHU8JWE yQaADhlmWy7EJ0arVlVdnSXp93eqBSOwKACCWe8YwgJjyoNe7Xmuz26OZaQ194proPaE fuNmeVT9gdQPKvzcxStLnJB7PkfxsmtMJAW/EJjzwoETo6H+s2q7nKBJwcjDMbKRWo0O 8X3jWpT0oTYqDn7HMvk0pF0OVgs20wncovn8hIKkY3PZgzSdWp6IyToOGhRFGtrETscb gD12G7ajEmBJB/sQ2AbmLeAY2LNLAk/jkcWEr7hOSwo6+bGLvyb3FJkEjqjui0AEssqQ hJ+Q== X-Gm-Message-State: AElRT7Gsu755Zvqw0Nq4daL1YcoOTa7HAjE3ZbEU4dHWnGc9WNcPYo4h OJzVk5F+bjahjh29SUE6fn8= X-Google-Smtp-Source: AIpwx482KsY96eHEMCY7LzmY/61uuZDrTY3L+igdEN8Zok/qv4ABkUJ7xWlpTU3hTRu18/KAze4qQg== X-Received: by 10.80.184.198 with SMTP id l64mr725595ede.5.1522184428854; Tue, 27 Mar 2018 14:00:28 -0700 (PDT) Received: from gentoo0.localdomain (x4dbab50a.dyn.telefonica.de. [77.186.181.10]) by smtp.gmail.com with ESMTPSA id q29sm1313896edd.25.2018.03.27.14.00.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 14:00:28 -0700 (PDT) From: Kirill Marinushkin To: Jaroslav Kysela , Takashi Iwai , Mark Brown Date: Tue, 27 Mar 2018 23:00:50 +0200 Message-Id: <20180327210050.3728-3-k.marinushkin@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180327210050.3728-1-k.marinushkin@gmail.com> References: <20180327205632.3677-1-k.marinushkin@gmail.com> <20180327210050.3728-1-k.marinushkin@gmail.com> Cc: alsa-devel@alsa-project.org, Pan Xiuli , Pierre-Louis Bossart , linux-kernel@vger.kernel.org, Liam Girdwood , Kirill Marinushkin Subject: [alsa-devel] [PATCH, alsa-lib, v3 2/2] ASoC: topology: Add missing clock gating parameter when parsing hw_configs 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 X-Virus-Scanned: ClamAV using ClamSMTP Clock gating parameter is a part of `dai_fmt`. It is supported by `alsa-lib` when creating a topology binary file, but ignored by kernel when loading this topology file. After applying this commit, the clock gating parameter is not ignored any more. This solution is backwards compatible. The existing behaviour is not broken, because by default the parameter value is 0 and is ignored. snd_soc_tplg_hw_config.clock_gated = 0 => no effect snd_soc_tplg_hw_config.clock_gated = 1 => SND_SOC_DAIFMT_GATED snd_soc_tplg_hw_config.clock_gated = 2 => SND_SOC_DAIFMT_CONT For example, the following config, based on alsa-lib/src/conf/topology/broadwell/broadwell.conf, is now supported: ~~~~ SectionHWConfig."CodecHWConfig" { id "1" format "I2S" # physical audio format. pm_gate_clocks "true" # clock can be gated } SectionLink."Codec" { # used for binding to the physical link id "0" hw_configs [ "CodecHWConfig" ] default_hw_conf_id "1" } ~~~~ Signed-off-by: Kirill Marinushkin Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Mark Brown Cc: Pan Xiuli Cc: Pierre-Louis Bossart Cc: Liam Girdwood Cc: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org --- include/sound/asoc.h | 7 ++++++- include/topology.h | 2 +- src/topology/pcm.c | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/sound/asoc.h b/include/sound/asoc.h index 89b00703..297e837c 100644 --- a/include/sound/asoc.h +++ b/include/sound/asoc.h @@ -135,6 +135,11 @@ #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS (1 << 1) #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS (1 << 2) +/* DAI clock gating */ +#define SND_SOC_TPLG_DAI_CLK_GATE_UNDEFINED 0 +#define SND_SOC_TPLG_DAI_CLK_GATE_GATED 1 +#define SND_SOC_TPLG_DAI_CLK_GATE_CONT 2 + /* DAI physical PCM data formats. * Add new formats to the end of the list. */ @@ -320,7 +325,7 @@ struct snd_soc_tplg_hw_config { __le32 size; /* in bytes of this structure */ __le32 id; /* unique ID - - used to match */ __le32 fmt; /* SND_SOC_DAI_FORMAT_ format value */ - __u8 clock_gated; /* 1 if clock can be gated to save power */ + __u8 clock_gated; /* SND_SOC_TPLG_DAI_CLK_GATE_ value */ __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ __u8 bclk_master; /* SND_SOC_TPLG_BCLK_ value */ diff --git a/include/topology.h b/include/topology.h index 5d7b46df..3793115c 100644 --- a/include/topology.h +++ b/include/topology.h @@ -997,7 +997,7 @@ struct snd_tplg_pcm_template { struct snd_tplg_hw_config_template { int id; /* unique ID - - used to match */ unsigned int fmt; /* SND_SOC_DAI_FORMAT_ format value */ - unsigned char clock_gated; /* 1 if clock can be gated to save power */ + unsigned char clock_gated; /* SND_SOC_TPLG_DAI_CLK_GATE_ value */ unsigned char invert_bclk; /* 1 for inverted BCLK, 0 for normal */ unsigned char invert_fsync; /* 1 for inverted frame clock, 0 for normal */ unsigned char bclk_master; /* SND_SOC_TPLG_BCLK_ value */ diff --git a/src/topology/pcm.c b/src/topology/pcm.c index d0395182..b53f6b03 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -1233,7 +1233,11 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg, return -EINVAL; if (!strcmp(val, "true")) - hw_cfg->clock_gated = true; + hw_cfg->clock_gated = + SND_SOC_TPLG_DAI_CLK_GATE_GATED; + else + hw_cfg->clock_gated = + SND_SOC_TPLG_DAI_CLK_GATE_CONT; continue; }