From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 211FC1E526; Thu, 15 Aug 2024 14:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731508; cv=none; b=rh/esRaVFBxPZ8RmmgaayFgK3lN81L0cve6Aecfr0L11VrpDm21DRta61CncPEadpDEIhkFeJzYsgekMdSNnUFXlFztym8WZS3oQn+/vMYeDQhMUhlUZzT8aaX6S6omGvDGphfU/dvHkbpVHIVxbNQ+NcQxFlZwmn3ETbn/dR1c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731508; c=relaxed/simple; bh=8U6BkqfiY8eG+oF2guFx7s4crljo2ycxR1MxwKmPeR4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=k49jaOn/LoYde8PMgSg0FJt6xfAhCFY2KRZzH2NLYFpnXzjWHQP9laZioRtU2BTXWW6nmvpL6vJPXGfLET1wrgtc+n432TjNCJ1naX31KD2s1ggjuUF40QOtNUXLbwonzP84QelVVcXa1J8wAiyJLnbS+AlpYDcdqnvN8di1pHY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LT1h66ld; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LT1h66ld" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34A71C32786; Thu, 15 Aug 2024 14:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723731507; bh=8U6BkqfiY8eG+oF2guFx7s4crljo2ycxR1MxwKmPeR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LT1h66ldZHEY90ZPxQx2H0dFYqIDD4g4a8ujmwNlH8xmvsP8tOZSgGqBPGa8URaWX aI8AYbUSbGfjPa4VfB8WXsDrU60uhDDK0Tg3n0INlQl4y0c6mMmyUHD/igFCpUFTO7 C86dLTmCVXXYSo2GEvu8f9PP7hKuCOGosyrEL/mU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Takashi Iwai , Pierre-Louis Bossart , =?UTF-8?q?P=C3=A9ter=20Ujfalusi?= , Bard Liao , Mark Brown , Sasha Levin Subject: [PATCH 5.4 151/259] ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable Date: Thu, 15 Aug 2024 15:24:44 +0200 Message-ID: <20240815131908.618219865@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131902.779125794@linuxfoundation.org> References: <20240815131902.779125794@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pierre-Louis Bossart [ Upstream commit 9931f7d5d251882a147cc5811060097df43e79f5 ] 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 Closes: https://lore.kernel.org/oe-kbuild-all/202407160704.zpdhJ8da-lkp@intel.com/ Suggested-by: Takashi Iwai Signed-off-by: Pierre-Louis Bossart Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao Link: https://patch.msgid.link/20240722083002.10800-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/common/soc-intel-quirks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h index a46be331c178e..a7960b41a6a34 100644 --- a/sound/soc/intel/common/soc-intel-quirks.h +++ b/sound/soc/intel/common/soc-intel-quirks.h @@ -11,7 +11,7 @@ #include -#if IS_ENABLED(CONFIG_X86) +#if IS_REACHABLE(CONFIG_IOSF_MBI) #include #include -- 2.43.0