Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3528568pxf; Mon, 15 Mar 2021 11:34:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYDFYIIgySqULDxZZc+Zzn8D/FZBUBlDDyJ55eVG9sk7/UUcRDMobB2CyXH3IsZtRik6yo X-Received: by 2002:a50:e882:: with SMTP id f2mr31631732edn.184.1615833251837; Mon, 15 Mar 2021 11:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833251; cv=none; d=google.com; s=arc-20160816; b=tRteuhq19TKDQXI9ASEnD+t6m/fHx3jFgbVL8lqXhq0CcqoyrUd8ZqCy3q2WssCUeS JMN8L7Qscm8WFVQJ590UogTuXdUa9DmrQyWJGTgv8zp9Y4PWRLo9hm3HODIiH95Sjlkt dS2GXQOn52thJCrdFfh39bFyMrf09NR0o2k173xUD/igZzVyWEIyraoCqP46mUaaHPot xkJUkJHPLYX+DUIiKCVrKEBkxF+WvDJf89AGO2T+4nyNmnM0MAERK2kMNIC1YcrPxgVh tnNhkR5VMOVGEwv/9lcZJLU5B6yb2odAnNEWeRFTlknaVacuxpaPN4kIX/NG1tMeXh1Z 1sqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=veUwSKQig/42ACsYOwjnWkJqe6dN/mXPx9o4GnyK0bQ=; b=M9E3+Rw6xUsNlVq3ojDkbMFNJ8jdqn+5ZcYpqHeNFpEjbp1EqF7us1eAimdZUmaHl3 6perlpu+2nquLhsCtLLFcpblct2bzkMqgjTxfOpBad3PN6hjE5HEO2rw82Ya3xuFDIPB 7ySs2l17Ec88GL1qnP5FITBQ9n1QqhgGabj5Lr0xCTBgjD8TdS1FHMwC1P94aLNEQcEi A7kxxMQd3ZzsRorAIDkI0Tn69llat9yboQxZQkh8eCN9xWnkZFaiL7tE1Xl8LuOrQACR lQD0WItfi7uK0POQEc9jRNtTG6YxATPvhZEvCugffJxjIscETEx8JCPyk9p3g0wyO7qB BCeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=irN83YvP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gv29si2212771ejc.61.2021.03.15.11.33.49; Mon, 15 Mar 2021 11:34:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=irN83YvP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239038AbhCOOpr (ORCPT + 99 others); Mon, 15 Mar 2021 10:45:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:52480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234590AbhCOOE1 (ORCPT ); Mon, 15 Mar 2021 10:04:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1218364F0A; Mon, 15 Mar 2021 14:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615817062; bh=t6RUt6HUzB0MgaDyS9B4bHBo4NehUJSKVH0UAGG2iL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=irN83YvP4IeyYc8IV7OhdY/gcPSsiheo7SCVRHc7yV2eajuu+a00XAa4rBQtQRWG3 AfllZd/yys2koJ/vnMHIcMSWjBJR7XupI7oUOZuED3C5Qq2kSM55HoUkYFCB0O2TyV s8c2ZoqCKbsmJA2/ArvNVrtG/4ABxZjsaNn4CPJI= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , kernel test robot , Christophe Leroy , Michael Ellerman Subject: [PATCH 5.11 282/306] powerpc: Fix missing declaration of [en/dis]able_kernel_vsx() Date: Mon, 15 Mar 2021 14:55:45 +0100 Message-Id: <20210315135517.220340775@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135507.611436477@linuxfoundation.org> References: <20210315135507.611436477@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Christophe Leroy commit bd73758803c2eedc037c2268b65a19542a832594 upstream. Add stub instances of enable_kernel_vsx() and disable_kernel_vsx() when CONFIG_VSX is not set, to avoid following build failure. CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.o In file included from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services_types.h:29, from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:37, from drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:27: drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c: In function 'dcn_bw_apply_registry_override': ./drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:64:3: error: implicit declaration of function 'enable_kernel_vsx'; did you mean 'enable_kernel_fp'? [-Werror=implicit-function-declaration] 64 | enable_kernel_vsx(); \ | ^~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:640:2: note: in expansion of macro 'DC_FP_START' 640 | DC_FP_START(); | ^~~~~~~~~~~ ./drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:75:3: error: implicit declaration of function 'disable_kernel_vsx'; did you mean 'disable_kernel_fp'? [-Werror=implicit-function-declaration] 75 | disable_kernel_vsx(); \ | ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:676:2: note: in expansion of macro 'DC_FP_END' 676 | DC_FP_END(); | ^~~~~~~~~ cc1: some warnings being treated as errors make[5]: *** [drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.o] Error 1 This works because the caller is checking if VSX is available using cpu_has_feature(): #define DC_FP_START() { \ if (cpu_has_feature(CPU_FTR_VSX_COMP)) { \ preempt_disable(); \ enable_kernel_vsx(); \ } else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \ preempt_disable(); \ enable_kernel_altivec(); \ } else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) { \ preempt_disable(); \ enable_kernel_fp(); \ } \ When CONFIG_VSX is not selected, cpu_has_feature(CPU_FTR_VSX_COMP) constant folds to 'false' so the call to enable_kernel_vsx() is discarded and the build succeeds. Fixes: 16a9dea110a6 ("amdgpu: Enable initial DCN support on POWER") Cc: stable@vger.kernel.org # v5.6+ Reported-by: Geert Uytterhoeven Reported-by: kernel test robot Signed-off-by: Christophe Leroy [mpe: Incorporate some discussion comments into the change log] Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/8d7d285a027e9d21f5ff7f850fa71a2655b0c4af.1615279170.git.christophe.leroy@csgroup.eu Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/switch_to.h | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/arch/powerpc/include/asm/switch_to.h +++ b/arch/powerpc/include/asm/switch_to.h @@ -71,6 +71,16 @@ static inline void disable_kernel_vsx(vo { msr_check_and_clear(MSR_FP|MSR_VEC|MSR_VSX); } +#else +static inline void enable_kernel_vsx(void) +{ + BUILD_BUG(); +} + +static inline void disable_kernel_vsx(void) +{ + BUILD_BUG(); +} #endif #ifdef CONFIG_SPE