diff mbox series

ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable

Message ID 20240722083002.10800-1-pierre-louis.bossart@linux.intel.com (mailing list archive)
State Accepted
Commit 9931f7d5d251882a147cc5811060097df43e79f5
Headers show
Series ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable | expand

Commit Message

Pierre-Louis Bossart July 22, 2024, 8:30 a.m. UTC 
the Intel kbuild bot reports a link failure when IOSF_MBI is built-in
but the Merrifield driver is configured as a module. The
soc-intel-quirks.h is included for Merrifield platforms, but IOSF_MBI
is not selected for that platform.

ld.lld: error: undefined symbol: iosf_mbi_read
>>> referenced by atom.c
>>>               sound/soc/sof/intel/atom.o:(atom_machine_select) in archive vmlinux.a

This patch forces the use of the fallback static inline when IOSF_MBI is not reachable.

Fixes: 536cfd2f375d ("ASoC: Intel: use common helpers to detect CPUs")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202407160704.zpdhJ8da-lkp@intel.com/
Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/common/soc-intel-quirks.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown July 22, 2024, 7:12 p.m. UTC | #1 
On Mon, 22 Jul 2024 10:30:02 +0200, Pierre-Louis Bossart wrote:
> the Intel kbuild bot reports a link failure when IOSF_MBI is built-in
> but the Merrifield driver is configured as a module. The
> soc-intel-quirks.h is included for Merrifield platforms, but IOSF_MBI
> is not selected for that platform.
> 
> ld.lld: error: undefined symbol: iosf_mbi_read
> >>> referenced by atom.c
> >>>               sound/soc/sof/intel/atom.o:(atom_machine_select) in archive vmlinux.a
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
      commit: 9931f7d5d251882a147cc5811060097df43e79f5

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 mbox series

Patch

diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h
index de4e550c5b34..42bd51456b94 100644
--- a/sound/soc/intel/common/soc-intel-quirks.h
+++ b/sound/soc/intel/common/soc-intel-quirks.h
@@ -11,7 +11,7 @@ 
 
 #include <linux/platform_data/x86/soc.h>
 
-#if IS_ENABLED(CONFIG_X86)
+#if IS_REACHABLE(CONFIG_IOSF_MBI)
 
 #include <linux/dmi.h>
 #include <asm/iosf_mbi.h>