ASoC: topology: Fix TLV size calculation.
PATCH 1/1 ASoC: topology: Fix TLV size calculation.
TLV size calculation was incorrectly calculated. Fix this according to include/sound/tlv.h
--- sound/soc/soc-topology.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
sound/soc/soc-topology.c +10 -11
@@ -580,27 +580,26 @@ static int soc_tplg_init_kcontrol(struct soc_tplg *tplg, }static int soc_tplg_create_tlv (struct soc_tplg *tplg, -struct snd_kcontrol_new *kc,u32 tlv_size) +struct snd_kcontrol_new *kc,struct snd_soc_tplg_ctl_tlv *tplg_tlv) { -struct snd_soc_tplg_ctl_tlv *tplg_tlv;struct snd_ctl_tlv *tlv; +int size; -if (tlv_size ==0 ) +if (tplg_tlv->count ==0 )return 0 ; - tplg_tlv = (struct snd_soc_tplg_ctl_tlv *) tplg->pos; - tplg->pos += tlv_size; - - tlv =kzalloc (sizeof (*tlv) + tlv_size,GFP_KERNEL ); + size = ((tplg_tlv->count + (sizeof (unsigned int ) -1 )) & + ~(sizeof (unsigned int ) -1 )); + tlv =kzalloc (sizeof (*tlv) + size,GFP_KERNEL );if (tlv ==NULL )return -ENOMEM ;dev_dbg (tplg->dev," created TLV type %d size %d bytes\n" , - tplg_tlv->numid, tplg_tlv->size); + tplg_tlv->numid, size); tlv->numid = tplg_tlv->numid; - tlv->length = tplg_tlv->size; -memcpy (tlv->tlv, tplg_tlv +1 , tplg_tlv->size); + tlv->length = size; +memcpy (&tlv->tlv[0 ], tplg_tlv->data, size); kc->tlv.p = (void *)tlv;return 0 ;
@@ -773,7 +772,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count, }/* create any TLV data */ -soc_tplg_create_tlv (tplg, &kc, mc->hdr.tlv_size); +soc_tplg_create_tlv (tplg, &kc, &mc->tlv);/* register control here */ err = soc_tplg_add_kcontrol(tplg, &kc,
Signature · 1 line
2.1.4
PATCH 1/1 ASoC: Topology: Add subsequence in topology
From: "Subhransu S. Prusty" <[email protected]>
Some widgets may need sorting within, So add this support in topology.
--- include/uapi/sound/asoc.h | 1 + sound/soc/soc-topology.c | 1 + 2 files changed, 2 insertions(+)
include/uapi/sound/asoc.h +1 -0
@@ -347,6 +347,7 @@ struct snd_soc_tplg_dapm_widget {__le32 reg;/* negative reg = no direct dapm */ __le32 shift;/* bits to shift */ __le32 mask;/* non-shifted mask */ +__le32 subseq;/* sort within widget type */ __u32 invert;/* invert the power bit */ __u32 ignore_suspend;/* kept enabled over suspend */ __u16 event_flags;
sound/soc/soc-topology.c +1 -0
@@ -1350,6 +1350,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, template.reg = w->reg; template.shift = w->shift; template.mask = w->mask; + template.subseq = w->subseq; template.on_val = w->invert ?0 :1 ; template.off_val = w->invert ?1 :0 ; template.ignore_suspend = w->ignore_suspend;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: topology: Add subsequence in topology" to the asoc tree
The patch
ASoC: topology: Add subsequence in topology
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
Quoted 1 line
From
f5a2ee50635baabcb88a559ae1ced69d5d8ef6ebMon Sep 17 00:00:00 2001
From: "Subhransu S. Prusty" <[email protected]>
Date: Mon, 29 Jun 2015 17:36:44 +0100
Subject: [PATCH] ASoC: topology: Add subsequence in topology
Some widgets may need sorting within, So add this support in topology.
--- include/uapi/sound/asoc.h | 1 + sound/soc/soc-topology.c | 1 + 2 files changed, 2 insertions(+)
include/uapi/sound/asoc.h +1 -0
@@ -347,6 +347,7 @@ struct snd_soc_tplg_dapm_widget {__le32 reg;/* negative reg = no direct dapm */ __le32 shift;/* bits to shift */ __le32 mask;/* non-shifted mask */ +__le32 subseq;/* sort within widget type */ __u32 invert;/* invert the power bit */ __u32 ignore_suspend;/* kept enabled over suspend */ __u16 event_flags;
sound/soc/soc-topology.c +1 -0
@@ -1351,6 +1351,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, template.reg = w->reg; template.shift = w->shift; template.mask = w->mask; + template.subseq = w->subseq; template.on_val = w->invert ?0 :1 ; template.off_val = w->invert ?1 :0 ; template.ignore_suspend = w->ignore_suspend;
Signature · 1 line
2.1.4
PATCH 1/1 ASoC: topology: fix typos in topology header
In reply to Liam GirdwoodFrom: Vinod Koul <[email protected]>
--- include/uapi/sound/asoc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/sound/asoc.h +2 -2
@@ -110,7 +110,7 @@/* * Block Header. -* This header preceeds all object and object arrays below. +* This header precedes all object and object arrays below. */ struct snd_soc_tplg_hdr {__le32 magic;/* magic number */
@@ -222,7 +222,7 @@ struct snd_soc_tplg_stream_config {/* * Manifest. List totals for each payload type. Not used in parsing, but will * be passed to the component driver before any other objects in order for any -* global componnent resource allocations. +* global component resource allocations. * * File block representation for manifest :- * +-----------------------------------+----+
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: topology: fix typos in topology header" to the asoc tree
The patch
ASoC: topology: fix typos in topology header
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
Quoted 1 line
From
9c3a473220dda073603a24e93d3015322bda950aMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Mon, 29 Jun 2015 17:36:45 +0100
Subject: [PATCH] ASoC: topology: fix typos in topology header
--- include/uapi/sound/asoc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/sound/asoc.h +2 -2
@@ -110,7 +110,7 @@/* * Block Header. -* This header preceeds all object and object arrays below. +* This header precedes all object and object arrays below. */ struct snd_soc_tplg_hdr {__le32 magic;/* magic number */
@@ -222,7 +222,7 @@ struct snd_soc_tplg_stream_config {/* * Manifest. List totals for each payload type. Not used in parsing, but will * be passed to the component driver before any other objects in order for any -* global componnent resource allocations. +* global component resource allocations. * * File block representation for manifest :- * +-----------------------------------+----+
Signature · 1 line
2.1.4
PATCH 1/1 ASoC: topology: add private data to manifest
In reply to Liam GirdwoodFrom: Vinod Koul <[email protected]>
The topology file manifest should include a private data field. This allows vendors to specify vendor data in the manifest, like timestamps, hashes, additional information for removing platform configuration out of drivers and making these configurable per platform
--- include/uapi/sound/asoc.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/sound/asoc.h +1 -0
@@ -238,6 +238,7 @@ struct snd_soc_tplg_manifest {__le32 graph_elems;/* number of graph elements */ __le32 dai_elems;/* number of DAI elements */ __le32 dai_link_elems;/* number of DAI link elements */ +struct snd_soc_tplg_private priv; } __attribute__((packed));/*
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: topology: add private data to manifest" to the asoc tree
The patch
ASoC: topology: add private data to manifest
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
Quoted 1 line
From
cabb9294a5a9a856a75ec5270a9930e66d28b001Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Mon, 29 Jun 2015 17:36:46 +0100
Subject: [PATCH] ASoC: topology: add private data to manifest
The topology file manifest should include a private data field. This allows vendors to specify vendor data in the manifest, like timestamps, hashes, additional information for removing platform configuration out of drivers and making these configurable per platform
--- include/uapi/sound/asoc.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/sound/asoc.h +1 -0
@@ -238,6 +238,7 @@ struct snd_soc_tplg_manifest {__le32 graph_elems;/* number of graph elements */ __le32 dai_elems;/* number of DAI elements */ __le32 dai_link_elems;/* number of DAI link elements */ +struct snd_soc_tplg_private priv; } __attribute__((packed));/*
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: topology: Fix TLV size calculation." to the asoc tree
In reply to Liam GirdwoodThe patch
ASoC: topology: Fix TLV size calculation.
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
Quoted 1 line
From
7084ffbff494669b06ceb457150c38887e26d2a3Mon Sep 17 00:00:00 2001
From: Liam Girdwood <[email protected]>
Date: Mon, 29 Jun 2015 17:36:43 +0100
Subject: [PATCH] ASoC: topology: Fix TLV size calculation.
TLV size calculation was incorrectly calculated. Fix this according to include/sound/tlv.h
--- sound/soc/soc-topology.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
sound/soc/soc-topology.c +10 -11
@@ -580,27 +580,26 @@ static int soc_tplg_init_kcontrol(struct soc_tplg *tplg, }static int soc_tplg_create_tlv (struct soc_tplg *tplg, -struct snd_kcontrol_new *kc,u32 tlv_size) +struct snd_kcontrol_new *kc,struct snd_soc_tplg_ctl_tlv *tplg_tlv) { -struct snd_soc_tplg_ctl_tlv *tplg_tlv;struct snd_ctl_tlv *tlv; +int size; -if (tlv_size ==0 ) +if (tplg_tlv->count ==0 )return 0 ; - tplg_tlv = (struct snd_soc_tplg_ctl_tlv *) tplg->pos; - tplg->pos += tlv_size; - - tlv =kzalloc (sizeof (*tlv) + tlv_size,GFP_KERNEL ); + size = ((tplg_tlv->count + (sizeof (unsigned int ) -1 )) & + ~(sizeof (unsigned int ) -1 )); + tlv =kzalloc (sizeof (*tlv) + size,GFP_KERNEL );if (tlv ==NULL )return -ENOMEM ;dev_dbg (tplg->dev," created TLV type %d size %d bytes\n" , - tplg_tlv->numid, tplg_tlv->size); + tplg_tlv->numid, size); tlv->numid = tplg_tlv->numid; - tlv->length = tplg_tlv->size; -memcpy (tlv->tlv, tplg_tlv +1 , tplg_tlv->size); + tlv->length = size; +memcpy (&tlv->tlv[0 ], tplg_tlv->data, size); kc->tlv.p = (void *)tlv;return 0 ;
@@ -773,7 +772,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count, }/* create any TLV data */ -soc_tplg_create_tlv (tplg, &kc, mc->hdr.tlv_size); +soc_tplg_create_tlv (tplg, &kc, &mc->tlv);/* register control here */ err = soc_tplg_add_kcontrol(tplg, &kc,
Signature · 1 line
2.1.4