ASoC: Intel: avs: Include CPUID header at file scope

Commit

    cbe37a4d2b3c ("ASoC: Intel: avs: Configure basefw on TGL-based platforms")

includes the main CPUID header from within a C function.  This works by
luck and forbids valid refactoring inside that header.

Include the CPUID header at file scope instead.

Remove the COMPILE_TEST build flag so that the CONFIG_X86 conditionals can
be removed.  The driver gets enough compilation testing already on x86.

For clarity, refactor the CPUID(0x15) code into its own function without
changing any of the driver's logic.

Fixes: cbe37a4d2b3c ("ASoC: Intel: avs: Configure basefw on TGL-based platforms")
Suggested-by: Borislav Petkov <bp@alien8.de>		# CONFIG_X86 removal
Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/all/20250612234010.572636-3-darwi@linutronix.de

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 412555e626b81d80ad8b230d76b7f17d6eaa8cee..63367364916ae000891564f6ea9230ff97b20495 100644 (file)
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -95,7 +95,7 @@ config SND_SOC_INTEL_KEEMBAY
 
 config SND_SOC_INTEL_AVS
        tristate "Intel AVS driver"
-       depends on X86 || COMPILE_TEST
+       depends on X86
        depends on PCI
        depends on COMMON_CLK
        select ACPI_NHLT if ACPI

diff --git a/sound/soc/intel/avs/tgl.c b/sound/soc/intel/avs/tgl.c
index 4649d749b41e001c198ca1e08473a956e30e2d74..a7123639de4311db8e3a26ab4ba5e14418afa4df 100644 (file)
--- a/sound/soc/intel/avs/tgl.c
+++ b/sound/soc/intel/avs/tgl.c
@@ -7,6 +7,7 @@
 //
 
 #include <linux/pci.h>
+#include <asm/cpuid/api.h>
 #include "avs.h"
 #include "debug.h"
 #include "messages.h"
@@ -38,28 +39,38 @@ static int avs_tgl_dsp_core_stall(struct avs_dev *adev, u32 core_mask, bool stal
        return avs_dsp_core_stall(adev, core_mask, stall);
 }
 
-static int avs_tgl_config_basefw(struct avs_dev *adev)
+/*
+ * Succeed if CPUID(0x15) is not available, or if the nominal core crystal clock
+ * frequency cannot be enumerated from it.  There is nothing to do in both cases.
+ */
+static int avs_tgl_set_xtal_freq(struct avs_dev *adev)
 {
-       struct pci_dev *pci = adev->base.pci;
-       struct avs_bus_hwid hwid;
+       unsigned int freq;
        int ret;
-#ifdef CONFIG_X86
-       unsigned int ecx;
-
-#include <asm/cpuid/api.h>
 
        if (boot_cpu_data.cpuid_level < CPUID_LEAF_TSC)
-               goto no_cpuid;
+               return 0;
 
-       ecx = cpuid_ecx(CPUID_LEAF_TSC);
-       if (ecx) {
-               ret = avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(ecx), &ecx);
+       freq = cpuid_ecx(CPUID_LEAF_TSC);
+       if (freq) {
+               ret = avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(freq), &freq);
                if (ret)
                        return AVS_IPC_RET(ret);
        }
-#endif
 
-no_cpuid:
+       return 0;
+}
+
+static int avs_tgl_config_basefw(struct avs_dev *adev)
+{
+       struct pci_dev *pci = adev->base.pci;
+       struct avs_bus_hwid hwid;
+       int ret;
+
+       ret = avs_tgl_set_xtal_freq(adev);
+       if (ret)
+               return ret;
+
        hwid.device = pci->device;
        hwid.subsystem = pci->subsystem_vendor | (pci->subsystem_device << 16);
        hwid.revision = pci->revision;