| Message ID | 20220323092501.145879-1-zhengbin13@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 664d66dc0a64b32e60a5ad59a9aebb08676a612b |
| Headers | show |
| Series | [-next] ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV | expand |
On 3/23/22 04:25, Zheng Bin wrote: > If SND_SOC_SOF_PCI_DEV is n, bulding fails: > > sound/soc/sof/intel/pci-tng.o:(.data+0x1c0): undefined reference to `sof_pci_probe' > sound/soc/sof/intel/pci-tng.o:(.data+0x1c8): undefined reference to `sof_pci_remove' > sound/soc/sof/intel/pci-tng.o:(.data+0x1e0): undefined reference to `sof_pci_shutdown' > sound/soc/sof/intel/pci-tng.o:(.data+0x290): undefined reference to `sof_pci_pm' > > Make SND_SOC_SOF_MERRIFIELD select SND_SOC_SOF_PCI_DEV to fix this. > > Fixes: 8d4ba1be3d22 ("ASoC: SOF: pci: split PCI into different drivers") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Zheng Bin <zhengbin13@huawei.com> Indeed that's a miss, thanks for the patch. We select SND_SOC_SOF_PCI_DEV for all HDaudio-based PCI devices but forgot Merrifield which is PCI-based but not HDaudio-based. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/sof/intel/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig > index b53f216d4ecc..172419392b33 100644 > --- a/sound/soc/sof/intel/Kconfig > +++ b/sound/soc/sof/intel/Kconfig > @@ -84,6 +84,7 @@ if SND_SOC_SOF_PCI > config SND_SOC_SOF_MERRIFIELD > tristate "SOF support for Tangier/Merrifield" > default SND_SOC_SOF_PCI > + select SND_SOC_SOF_PCI_DEV > select SND_SOC_SOF_INTEL_ATOM_HIFI_EP > help > This adds support for Sound Open Firmware for Intel(R) platforms > -- > 2.31.1 >
On Wed, 23 Mar 2022 17:25:01 +0800, Zheng Bin wrote: > If SND_SOC_SOF_PCI_DEV is n, bulding fails: > > sound/soc/sof/intel/pci-tng.o:(.data+0x1c0): undefined reference to `sof_pci_probe' > sound/soc/sof/intel/pci-tng.o:(.data+0x1c8): undefined reference to `sof_pci_remove' > sound/soc/sof/intel/pci-tng.o:(.data+0x1e0): undefined reference to `sof_pci_shutdown' > sound/soc/sof/intel/pci-tng.o:(.data+0x290): undefined reference to `sof_pci_pm' > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV commit: 664d66dc0a64b32e60a5ad59a9aebb08676a612b 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
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index b53f216d4ecc..172419392b33 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,6 +84,7 @@ if SND_SOC_SOF_PCI config SND_SOC_SOF_MERRIFIELD tristate "SOF support for Tangier/Merrifield" default SND_SOC_SOF_PCI + select SND_SOC_SOF_PCI_DEV select SND_SOC_SOF_INTEL_ATOM_HIFI_EP help This adds support for Sound Open Firmware for Intel(R) platforms
If SND_SOC_SOF_PCI_DEV is n, bulding fails: sound/soc/sof/intel/pci-tng.o:(.data+0x1c0): undefined reference to `sof_pci_probe' sound/soc/sof/intel/pci-tng.o:(.data+0x1c8): undefined reference to `sof_pci_remove' sound/soc/sof/intel/pci-tng.o:(.data+0x1e0): undefined reference to `sof_pci_shutdown' sound/soc/sof/intel/pci-tng.o:(.data+0x290): undefined reference to `sof_pci_pm' Make SND_SOC_SOF_MERRIFIELD select SND_SOC_SOF_PCI_DEV to fix this. Fixes: 8d4ba1be3d22 ("ASoC: SOF: pci: split PCI into different drivers") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zheng Bin <zhengbin13@huawei.com> --- sound/soc/sof/intel/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.31.1