ASoC: SOF: ipc3-topology: subtract ALH dai_index by 2 #5217
Conversation
bardliao
requested review from
lgirdwood,
plbossart,
ranj063 and
dbaluta
as code owners
bardliao
force-pushed
the
ipc3-alh-index
branch
from
04f1c53
to
71a1f8e
Compare
sound/soc/sof/ipc3-topology.c
Outdated
| if (flags & SOF_DAI_CONFIG_FLAGS_HW_PARAMS) { | ||
| /* | ||
| * DAI 2 is used as the first DAI for SDW in topology, normalize | ||
| * it to 0 |
There was a problem hiding this comment.
Maybe refer to sof_sdw.c (something like "see SOC_SDW_INTEL_BIDIR_PDI_BASE in sof_sdw.c") defitinion to explain where the value "2" comes from?
There was a problem hiding this comment.
Maybe refer to sof_sdw.c (something like "see SOC_SDW_INTEL_BIDIR_PDI_BASE in sof_sdw.c") defitinion to explain where the value "2" comes from?
Added. But on the second thought, this is Intel specific. Should we do it here?
| @@ -1594,6 +1594,17 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget) | |||
| if (ret < 0) | |||
There was a problem hiding this comment.
Can you explain in commit this is needed to support 3rd and 4th pins of SDW with IPC3 and Intel platforms. Older topology files have not used these pins, so this has not been an issue before (people will want to understand why this was not needed before and why this is needed now).
There was a problem hiding this comment.
Commit message updated.
sound/soc/sof/ipc3-topology.c
Outdated
| comp_dai->dai_index -= 2; | ||
| if (comp_dai->dai_index < 0) { | ||
| dev_err(sdev->dev, | ||
| "Invalid ALH dai index %d, Please use SDW Pin 2 and above\n", |
There was a problem hiding this comment.
maybe we can say that only Pin numbers > 1 are supported instead of saying please use Pin 2
There was a problem hiding this comment.
maybe we can say that only Pin numbers > 1 are supported instead of saying please use Pin 2
Updated
Intel SoundWire machine driver always use bidirectional DAIs. And the DAI index starts from 2. However, SOF IPC3 firmware assume all DAIs are bidirectional and the index starts from 0. As a result, FW DAI 0 and 1 are never used. That worked fine because we use up to 2 DAIs in a SDW link. But, a multi-function SDW codec needs to use 4 DAIs and some platforms like Tiger Lake supports 4 bidirectional DAIs in each SDW link. That means all bidirectional DAIs include DAI 0 and 1 will be used. Therefore, we need to subtract ALH dai_index by 2 which is the base of bidirectional DAIs. IOW, currently, SDW0 Pin 2 which is the first bidirectional SDW Pin will use FW DAI 2. But FW DAI 4 is invalid. With this commit SDW0 Pin 2 will use FW DAI 0 and SDW0 Pin 5 will use FW DAI 3 which is valid. The issue exists since beginning. And the Fixes tag is the first commit that this commit can be applied. Fixes: b66bfc3 ("ASoC: SOF: sof-audio: Fix broken early bclk feature for SSP") Signed-off-by: Bard Liao <[email protected]>
bardliao
force-pushed
the
ipc3-alh-index
branch
from
71a1f8e
to
ee39ffe
Compare
Yes, Fixes tag added. |
We use SDW pin 2 as for ALH dai 0. However, IPC3 ALH dai index should start from 0.
Fixes: thesofproject/sof#9571