This patch series adds parsing the topology clock gating parameter, which
is currently can be set by alsa-lib, but ignored by kernel.
The patch 1/2 modifies the UAPI header. If it is applied, the corresponded
patch should be applied in alsa-lib [2].
Related, but not required alsa-lib patch: [1].
[1]. [alsa-lib,v2,1/2] topology: Fix parsing config with multiple
hw_configs
[2]. [alsa-lib,v2,2/2] ASoC: topology: Add defines for
snd_soc_tplg_hw_config.clock_gated
Signed-off-by: Kirill Marinushkin <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Takashi Sakamoto <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: [email protected]
Cc: [email protected]
Kirill Marinushkin (2):
ASoC: topology: Add defines for snd_soc_tplg_hw_config.clock_gated
ASoC: topology: Add missing clock gating parameter when parsing
hw_configs
include/uapi/sound/asoc.h | 7 ++++++-
sound/soc/soc-topology.c | 7 +++++++
2 files changed, 13 insertions(+), 1 deletion(-)
--
2.13.6
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. The old behaviour is not broken, as by default the parameter value
is 0.
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.
bclk "master" # Platform is master of bit clock
fsync "master" # platform is master of fsync
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 <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Takashi Sakamoto <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
sound/soc/soc-topology.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 01a50413c66f..bac70676a6b4 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1981,6 +1981,13 @@ static void set_link_hw_format(struct snd_soc_dai_link *link,
link->dai_fmt = hw_config->fmt & SND_SOC_DAIFMT_FORMAT_MASK;
+ /* clock gating */
+ if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED)
+ link->dai_fmt |= SND_SOC_DAIFMT_GATED;
+ else if (hw_config->clock_gated ==
+ SND_SOC_TPLG_DAI_CLK_GATE_CONT)
+ link->dai_fmt |= SND_SOC_DAIFMT_CONT;
+
/* clock signal polarity */
invert_bclk = hw_config->invert_bclk;
invert_fsync = hw_config->invert_fsync;
--
2.13.6
In kernel `soc-dai.h`, DAI clock gating is defined as following:
~~~~
\#define SND_SOC_DAIFMT_CONT (1 << 4) /* continuous clock */
\#define SND_SOC_DAIFMT_GATED (0 << 4) /* clock is gated */
~~~~
The corresponding field of struct snd_soc_tplg_hw_config cannot be used as
bool values due to the inverted logic. Therefore this commit adds the
defines for this field.
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
Signed-off-by: Kirill Marinushkin <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Takashi Sakamoto <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
include/uapi/sound/asoc.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 69c37ecbff7e..86d0599a6f13 100644
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -139,6 +139,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.
*/
@@ -312,7 +317,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; /* 1 for master of BCLK, 0 for slave */
--
2.13.6
On Tue, Feb 20, 2018 at 7:44 PM, Kirill Marinushkin
<[email protected]> wrote:
> 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.
> + /* clock gating */
> + if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED)
> + link->dai_fmt |= SND_SOC_DAIFMT_GATED;
> + else if (hw_config->clock_gated ==
> + SND_SOC_TPLG_DAI_CLK_GATE_CONT)
A nit, I would leave it on the same line, even if it ~2-3 characters
longer than 80.
> + link->dai_fmt |= SND_SOC_DAIFMT_CONT;
> +
--
With Best Regards,
Andy Shevchenko
On 02/21/18 15:50, Andy Shevchenko wrote:
> On Tue, Feb 20, 2018 at 7:44 PM, Kirill Marinushkin
> <[email protected]> wrote:
>> 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.
>> + /* clock gating */
>> + if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED)
>> + link->dai_fmt |= SND_SOC_DAIFMT_GATED;
>> + else if (hw_config->clock_gated ==
>> + SND_SOC_TPLG_DAI_CLK_GATE_CONT)
> A nit, I would leave it on the same line, even if it ~2-3 characters
> longer than 80.
Hello Andy,
Thank you for the comment.
I think it is important to stay in the length of 80. I understand your point, but from my perspective, the coding style is a higher priority guideline.
Therefore I would prefer to keep this line as it is now.
Beast Regards,
Kirill
>> + link->dai_fmt |= SND_SOC_DAIFMT_CONT;
>> +