From nobody Fri Oct 10 21:48:12 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8379B2E172D for ; Thu, 12 Jun 2025 23:40:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749771629; cv=none; b=NbJCLG/lLDygm1dgPoPIUoCpLJfUfNeyfmShr3beNT8vYTTos5BP/QEl4hYiHBsujoxOLHbXSydvASfWxiWj0Px/s1nDPJcG2jo1LHOudpr5KMD8UkHr10naEfaifLTfS9baRLVvfmcRSsNrH4OtIKgDw4hnq+EpSfsvpAvZydo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749771629; c=relaxed/simple; bh=j/MxQJmLqteQkdH7tidFHqXDUcSXzs6RjKD25dy1XVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IFwThMuAoOUBwFn/BM2U9ERW19Tx6vq1z3Y6YKB4mn1bvBCeECknn8G7Uk45brrsl3Dx59JQpnh0Lyxd1v+D3/D1eYYfmW+/A0ne0HasK5VqRD8CznKTMHDaD0wZ7G+YIG6sSKm/q3SJ75HuhVeXyM26whjo0w3TYErfPTo5ppU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=QLT4Qa5g; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=sVDSTl54; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QLT4Qa5g"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="sVDSTl54" From: "Ahmed S. Darwish" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1749771626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cq1E0FuKK5sFEDeBEwjwBTOXySpdITktux1efgKrh14=; b=QLT4Qa5g6c815rKobMzPWhP+33yBRR6NWJkD7NVj5j4hTtkAOnFIgfrV8DNzeHtGZhPzIu UnjySnk8Uc1d2pV2TC+sXgMrcL+szzP6/9PNQtoVH7+YPJAyZSK//ErMHJdeYc7egAuvwU OsUrbdNeNAr56na08q0mCXjrxeW33xwykHhNGPINMYwOWV9LUos7zw9Ky/6UY16bwiuH63 tcFVc1P5bHYuoRD+cEPWC7DFuOWUHmu1A8smc8F0JGWZkNfhQowQgkJ4cbKSKnL8l15ixh +osR6Yh2KT5+2TRRKcixO6qpqE/8RUd5oQ6IHi9IPkU2FoG9OjUmGbM4LhnHOw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1749771626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cq1E0FuKK5sFEDeBEwjwBTOXySpdITktux1efgKrh14=; b=sVDSTl54KE9HLWplB35afvhSP1pzGMHIQ8Y93dLRFB7UOiDCll03GVQW1sL2CNYQ+9djon SjJ/sym6z6ETaQDQ== To: Ingo Molnar , Borislav Petkov , Dave Hansen Cc: Thomas Gleixner , Andrew Cooper , "H. Peter Anvin" , Peter Zijlstra , Sean Christopherson , Sohil Mehta , Ard Biesheuvel , John Ogness , x86@kernel.org, x86-cpuid@lists.linux.dev, LKML , "Ahmed S. Darwish" Subject: [PATCH v3 02/44] ASoC: Intel: avs: Include CPUID header at file scope Date: Fri, 13 Jun 2025 01:39:28 +0200 Message-ID: <20250612234010.572636-3-darwi@linutronix.de> In-Reply-To: <20250612234010.572636-1-darwi@linutronix.de> References: <20250612234010.572636-1-darwi@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit cbe37a4d2b3c ("ASoC: Intel: avs: Configure basefw on TGL-based platform= s") includes the main CPUID header from within a C function. This obviously works by luck and forbids valid refactorings inside the CPUID header. Include the CPUID header at file scope instead. Note, for the CPUID(0x15) leaf number, use CPUID_LEAF_TSC instead of defining a custom local macro for it. Signed-off-by: Ahmed S. Darwish Acked-by: Cezary Rojewski --- sound/soc/intel/avs/tgl.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sound/soc/intel/avs/tgl.c b/sound/soc/intel/avs/tgl.c index 9dbb3ad0954a..cf19d3a7ced2 100644 --- a/sound/soc/intel/avs/tgl.c +++ b/sound/soc/intel/avs/tgl.c @@ -10,8 +10,6 @@ #include "avs.h" #include "messages.h" =20 -#define CPUID_TSC_LEAF 0x15 - static int avs_tgl_dsp_core_power(struct avs_dev *adev, u32 core_mask, boo= l power) { core_mask &=3D AVS_MAIN_CORE_MASK; @@ -39,22 +37,31 @@ 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); } =20 +#ifdef CONFIG_X86 +#include +static unsigned int intel_crystal_freq_hz(void) +{ + return cpuid_ecx(CPUID_LEAF_TSC); +} +#else +static unsigned int intel_crystal_freq_hz(void) +{ + return 0; +} +#endif /* !CONFIG_X86 */ + static int avs_tgl_config_basefw(struct avs_dev *adev) { + unsigned int freq =3D intel_crystal_freq_hz(); struct pci_dev *pci =3D adev->base.pci; struct avs_bus_hwid hwid; int ret; -#ifdef CONFIG_X86 - unsigned int ecx; =20 -#include - ecx =3D cpuid_ecx(CPUID_TSC_LEAF); - if (ecx) { - ret =3D avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(e= cx), &ecx); + if (freq) { + ret =3D avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(f= req), &freq); if (ret) return AVS_IPC_RET(ret); } -#endif =20 hwid.device =3D pci->device; hwid.subsystem =3D pci->subsystem_vendor | (pci->subsystem_device << 16); --=20 2.49.0