From patchwork Mon Apr 16 18:26:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Marinushkin X-Patchwork-Id: 10343679 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 1408B60548 for ; Mon, 16 Apr 2018 18:26:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04CE027FB3 for ; Mon, 16 Apr 2018 18:26:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED62C2886F; Mon, 16 Apr 2018 18:26:39 +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=-2.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable 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 3DAA527FB3 for ; Mon, 16 Apr 2018 18:26:39 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3535F2675DB; Mon, 16 Apr 2018 20:26:34 +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 E378F267601; Mon, 16 Apr 2018 20:26:31 +0200 (CEST) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by alsa0.perex.cz (Postfix) with ESMTP id 144272673D2 for ; Mon, 16 Apr 2018 20:26:29 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id y7so28659984wrh.10 for ; Mon, 16 Apr 2018 11:26: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=VZk/y+cOvnrxhp3c1u1RJPzcTnsBsoYBbhmit3qyPVs=; b=QqtO5GPyr4vZguIfmZjPjkGMPT62uZgry+yH5b9sBgu9MM5D3bnPAmMD/ouv9QSpY0 yor3B7cq8YshRvbxngClHd6IZLK/5DM7cD6cHbUjmWn+hqCTifxbcgfBILR8VE0dgiPV Fe+94qkxuR964jVfEUTi6VuwmbJYAfeLeQiShaqeGfQYv10QvORNWFYYFgYlYh/As0r5 KD2/ZyVuXq2KaODrwlIoZdmR0D1BmPr4VKnrscCpqtBpxUKprqAQWDNDTCbOXYBSlMOc XKSZHNMs9/vYHth80hOkxFt4KcN5nhGL96dsdYx64gr3dOUMhFR02+QTrGQ0kS1hbiIg hkRA== 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=VZk/y+cOvnrxhp3c1u1RJPzcTnsBsoYBbhmit3qyPVs=; b=tGkel6zW4ObZ21u1w6jNiIWKsjL3072we0Yc20xeM5rFw5UKd8yu4QwCM0lY8wzFIN xDJq222d1P0ygc1gWrn2DYBu5axA3bz2OCUkfHti0+fLpDnuqLpyzHMuJ+gzfpa8CU6Q kuTfPPrFAbjyofIy6+42WZYq1eF9eI+Q3buM2TMbvOaMCb/yjrI8cpLaGcoVz2vrTp9b g90imvoYzltCmj1TdndiNjJPpA+P7hSXDK3ITYHNswbaTnwbzzkDzKYXUomd3FGv5Wfd SjCWgIjQM0vm6jGqgO5C4K4b6Q1am2DIxE9/X4kq8N0iTT2M10SPURCKkNESAZ2/ibJa QLdA== X-Gm-Message-State: ALQs6tCUFIwPydFs4L6pewIlOTe4XHad8WqYnSRdKv1JTk5o+O7wcP1v 8wLIb2GU9ZLqtL56YmtrKQ4= X-Google-Smtp-Source: AIpwx48NrewlsOXlgI2nppf6kN62JLvawdR9qVgJk1cqA9G5VL1tKvQmjCxx8I7yIvkXgbF2P2Y/QQ== X-Received: by 10.28.16.18 with SMTP id 18mr11330987wmq.81.1523903189564; Mon, 16 Apr 2018 11:26:29 -0700 (PDT) Received: from gentoo0.localdomain (x4e33bf85.dyn.telefonica.de. [78.51.191.133]) by smtp.gmail.com with ESMTPSA id f84sm10819060wmh.44.2018.04.16.11.26.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 11:26:28 -0700 (PDT) From: Kirill Marinushkin To: Takashi Iwai Date: Mon, 16 Apr 2018 20:26:39 +0200 Message-Id: <20180416182641.30312-3-k.marinushkin@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180416182641.30312-1-k.marinushkin@gmail.com> References: <20180416182641.30312-1-k.marinushkin@gmail.com> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Pan Xiuli , Pierre-Louis Bossart , Liam Girdwood , Mark Brown , Kirill Marinushkin Subject: [alsa-devel] [PATCH alsa-lib v4 2/4] 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 Reviewed-by: Pierre-Louis Bossart Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Mark Brown Cc: Pan Xiuli 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; }