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 08381223C7A; Thu, 12 Dec 2024 15:53:08 +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=1734018788; cv=none; b=WgNWf6QkTgUdkAIyDC/he0nUHfJaD7V6w5O8gfSUAIepVNQhts39Oc6oyjofMYwDD+Q6pXxgFNBomA7MrXOalpSRjhjDWxw4gBoPSsBLGZiWfjDobj7I8giUNjWWSwZxwc44gve3vHURv7CRKdRxYo5XoHaZfMmh6rbtceIIrxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734018788; c=relaxed/simple; bh=Fx+GYVLHBhVMA0PUhR9R0PuHathXWEd2TwK1iXbOJYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o8YWa92wYVSc6DQLrNnOFBqbxGwzsj2TJf4/1DSSKSCimxIAOdzRLJBohTKhalQ0NSa/186UQAhYcppWjWYrJkOJ0Jw6reLLrhgAkLuabyg3l5krzJkW6RxoVWoa1cjkpHj2LHbX6CRiR3Fj514rHt03vSt2BsBoDF7u4kXjsuQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SviPC81y; 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="SviPC81y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68302C4CECE; Thu, 12 Dec 2024 15:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734018787; bh=Fx+GYVLHBhVMA0PUhR9R0PuHathXWEd2TwK1iXbOJYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SviPC81y2ijoby4hWG9C78X5BxPi5YnJFcSFYJJV26uTzn9AdPw7aWSnMNSVr27Z6 PJQCEhDYYWb75K3av6c7BQSbiY7gfpc5HuauBQ4G9UeSKSFu5Fh2cz3dxvpuzvN6oy MAhT6/xvKMPkzdzgPc64hmxPYgLbuXTELHVG4PFo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , "Borislav Petkov (AMD)" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.1 009/772] x86/amd_nb: Fix compile-testing without CONFIG_AMD_NB Date: Thu, 12 Dec 2024 15:49:14 +0100 Message-ID: <20241212144350.326301455@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit fce9642c765a18abd1db0339a7d832c29b68456a ] node_to_amd_nb() is defined to NULL in non-AMD configs: drivers/platform/x86/amd/hsmp/plat.c: In function 'init_platform_device': drivers/platform/x86/amd/hsmp/plat.c:165:68: error: dereferencing 'void *' pointer [-Werror] 165 | sock->root = node_to_amd_nb(i)->root; | ^~ drivers/platform/x86/amd/hsmp/plat.c:165:68: error: request for member 'root' in something not a structure or union Users of the interface who also allow COMPILE_TEST will cause the above build error so provide an inline stub to fix that. [ bp: Massage commit message. ] Signed-off-by: Arnd Bergmann Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Ilpo Järvinen Link: https://lore.kernel.org/r/20241029092329.3857004-1-arnd@kernel.org Signed-off-by: Sasha Levin --- arch/x86/include/asm/amd_nb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h index ed0eaf65c4372..c8cdc69aae098 100644 --- a/arch/x86/include/asm/amd_nb.h +++ b/arch/x86/include/asm/amd_nb.h @@ -116,7 +116,10 @@ static inline bool amd_gart_present(void) #define amd_nb_num(x) 0 #define amd_nb_has_feature(x) false -#define node_to_amd_nb(x) NULL +static inline struct amd_northbridge *node_to_amd_nb(int node) +{ + return NULL; +} #define amd_gart_present(x) false #endif -- 2.43.0