Skip to contentSkip to conversation

ASoC: SOF: Intel: work around snd_hdac_aligned_read link failure

PATCH In review Arnd Bergmann 3 participants 6 messages Sep 9, 2019 – Sep 10, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: SOF: Intel: work around snd_hdac_aligned_read link failure

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to snd_hdac_aligned_write'

Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with.

---
 sound/soc/sof/intel/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sof/intel/Kconfig +1 -0
index 479ba249e219..9180184026e1 100644
@@ -248,6 +248,7 @@ config SND_SOC_SOF_HDA_COMMON
 	tristate
 	select SND_SOC_SOF_INTEL_COMMON
 	select SND_SOC_SOF_HDA_LINK_BASELINE
+	select SND_HDA_CORE if SND_HDA_ALIGNED_MMIO
 	help
 	  This option is not user-selectable but automagically handled by
 	  'select' statements at a higher level
Signature · 1 line
2.20.0
#1 lore raw
Quoted 11 lines · Arnd Bergmann

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to snd_hdac_aligned_write'

Quoted 3 lines

Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with.

Thanks for spotting this, I don't think anyone on the SOF team looked at this. Maybe we can filter with depends on !TEGRA or !SND_HDA_ALIGNED_MMIO at the SOF Intel top-level instead?

If you can share your config off-list I can try to simplify this further.

Quoted 19 lines
---
  sound/soc/sof/intel/Kconfig | 1 +
  1 file changed, 1 insertion(+)
sound/soc/sof/intel/Kconfig +1 -0
index 479ba249e219..9180184026e1 100644
@@ -248,6 +248,7 @@ config SND_SOC_SOF_HDA_COMMON
  	tristate
  	select SND_SOC_SOF_INTEL_COMMON
  	select SND_SOC_SOF_HDA_LINK_BASELINE
+	select SND_HDA_CORE if SND_HDA_ALIGNED_MMIO
  	help
  	  This option is not user-selectable but automagically handled by
  	  'select' statements at a higher level
#2 lore raw
Quoted 13 lines · Pierre-Louis Bossart
Quoted 11 lines · Arnd Bergmann

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to snd_hdac_aligned_write'

Quoted 7 lines
Quoted 3 lines

Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with.

Thanks for spotting this, I don't think anyone on the SOF team looked at this. Maybe we can filter with depends on !TEGRA or !SND_HDA_ALIGNED_MMIO at the SOF Intel top-level instead?

That doesn't sound much better than my approach, but could also work. One idea that I had but did not manage to implement was to move out the snd_hdac_aligned_read/write functions from the core hda code into a separate file. I think that would be the cleanest solution, as it decouples the problem from any drivers.

Quoted 1 line

If you can share your config off-list I can try to simplify this further.

I uploaded the .config to https://pastebin.com/raw/RMBGXTky
for reference now. This is with the latest linux-next kernel, plus a series of patches that I keep around for fixing other build problems.

Arnd

#3 lore raw
Quoted 24 lines · Arnd Bergmann
Quoted 13 lines · Pierre-Louis Bossart
Quoted 11 lines · Arnd Bergmann

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to snd_hdac_aligned_write'

Quoted 7 lines
Quoted 3 lines

Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with.

Thanks for spotting this, I don't think anyone on the SOF team looked at this. Maybe we can filter with depends on !TEGRA or !SND_HDA_ALIGNED_MMIO at the SOF Intel top-level instead?

Quoted 5 lines

That doesn't sound much better than my approach, but could also work. One idea that I had but did not manage to implement was to move out the snd_hdac_aligned_read/write functions from the core hda code into a separate file. I think that would be the cleanest solution, as it decouples the problem from any drivers.

Yeah, that's a tricky problem because of the reverse-selection, as usual...

Another solution would be to just avoid byte/word access but use only long access, i.e. replace snd_hdac_chip_readb() with snd_hdac_chip_readl() with the aligned register and bit shift. The aligned access helper is needed only for the register that isn't aligned with 4 bytes offset.

And, one remaining question is whether it makes sense to enable CONFIG_SND_SOC_SOF_HDA without CONFIG_SND_HDA_EXT_CORE (that selects CONFIG_SND_HDA_CORE, too). Currently it seems conditionally selected, but many codes do depend on snd_hdac_ext_*() and other helper code with CONFIG_SND_SOC_SOF_HDA-ifdef.

thanks,

Takashi

#4 lore raw
Quoted 31 lines · Takashi Iwai
Quoted 24 lines · Arnd Bergmann
Quoted 13 lines · Pierre-Louis Bossart
Quoted 11 lines · Arnd Bergmann

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to snd_hdac_aligned_write'

Quoted 7 lines
Quoted 3 lines

Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with.

Thanks for spotting this, I don't think anyone on the SOF team looked at this. Maybe we can filter with depends on !TEGRA or !SND_HDA_ALIGNED_MMIO at the SOF Intel top-level instead?

Quoted 5 lines

That doesn't sound much better than my approach, but could also work. One idea that I had but did not manage to implement was to move out the snd_hdac_aligned_read/write functions from the core hda code into a separate file. I think that would be the cleanest solution, as it decouples the problem from any drivers.

Quoted 8 lines

Yeah, that's a tricky problem because of the reverse-selection, as usual...

Another solution would be to just avoid byte/word access but use only long access, i.e. replace snd_hdac_chip_readb() with snd_hdac_chip_readl() with the aligned register and bit shift. The aligned access helper is needed only for the register that isn't aligned with 4 bytes offset.

Ok, so basically open-coding the aligned access to RIRBSTS? That sounds like a much nicer workaround. So in place of

                        sd_status = snd_hdac_stream_readb(s, SD_STS);
                        dev_vdbg(bus->dev, "stream %d status 0x%x\n",
                                 s->index, sd_status);
                        snd_hdac_stream_writeb(s, SD_STS, sd_status);

I suppose one could just readl/writel SOF_HDA_ADSP_REG_CL_SD_CTL and print the shifted value, right?

While I know nothing about the underlying requirements, I wonder about two things that stick out to me:

1. the existing code just writes back the same byte it has read. If this write has no side-effects, why write it at all? OTOH, if it has side-effects, isn't the aligned implementation of writing the whole word in snd_hdac_aligned_write() fundamentally flawed?

2. Doesn't the read-modify-write cycle in snd_hdac_aligned_write() need locking to work correctly?

Arnd

#5 lore raw
Quoted 45 lines · Arnd Bergmann
Quoted 31 lines · Takashi Iwai
Quoted 24 lines · Arnd Bergmann
Quoted 13 lines · Pierre-Louis Bossart
Quoted 11 lines · Arnd Bergmann

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to snd_hdac_aligned_write'

Quoted 7 lines
Quoted 3 lines

Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with.

Thanks for spotting this, I don't think anyone on the SOF team looked at this. Maybe we can filter with depends on !TEGRA or !SND_HDA_ALIGNED_MMIO at the SOF Intel top-level instead?

Quoted 5 lines

That doesn't sound much better than my approach, but could also work. One idea that I had but did not manage to implement was to move out the snd_hdac_aligned_read/write functions from the core hda code into a separate file. I think that would be the cleanest solution, as it decouples the problem from any drivers.

Quoted 8 lines

Yeah, that's a tricky problem because of the reverse-selection, as usual...

Another solution would be to just avoid byte/word access but use only long access, i.e. replace snd_hdac_chip_readb() with snd_hdac_chip_readl() with the aligned register and bit shift. The aligned access helper is needed only for the register that isn't aligned with 4 bytes offset.

Ok, so basically open-coding the aligned access to RIRBSTS? That sounds like a much nicer workaround. So in place of

Quoted 7 lines
                        sd_status = snd_hdac_stream_readb(s, SD_STS);
                        dev_vdbg(bus->dev, "stream %d status 0x%x\n",
                                 s->index, sd_status);
                        snd_hdac_stream_writeb(s, SD_STS, sd_status);

I suppose one could just readl/writel SOF_HDA_ADSP_REG_CL_SD_CTL and print the shifted value, right?

Yes.

Quoted 7 lines

While I know nothing about the underlying requirements, I wonder about two things that stick out to me:

1. the existing code just writes back the same byte it has read. If this write has no side-effects, why write it at all? OTOH, if it has side-effects, isn't the aligned implementation of writing the whole word in snd_hdac_aligned_write() fundamentally flawed?

The aligned read/write does already the whole 4-bytes read/write, so it should work. But we need confirmation with the actual hardware.

Quoted 2 lines

2. Doesn't the read-modify-write cycle in snd_hdac_aligned_write() need locking to work correctly?

The helper doesn't guarantee the atomic write by itself, so a lock would be required in the caller side if needed. Luckily there aren't many places calling the unaligned access.

thanks,

Takashi