From patchwork Tue Mar 28 14:43:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13191162 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 23839C76196 for ; Tue, 28 Mar 2023 14:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qPsEa+CA9YwTmcB026C0RTT0nQ3ZhqUoDykw3yKr0yo=; b=GeICtnee8hZQyR A7+s7QFhAwBAODqj8yYXrGexF6eDBmUFVdvLO2zxGpaNuZ4kET0uOscs/Ul1Zik/sGFI14q7EWcMx tuMuVKBp48wIdyclJUdWPGS88vIOiGcg1IYMyWcs9qUQoBB8sO+uGXPGbIaIk5Vaqb8W7RkqmP8RO 4T3kNgAi7l55dUIso9J9ZyRWX2C23RK4UcTAZL6tu3o/74Z6Tt5DYsHJw99O4xPogHv2keHDP3rlp 1vVApVGnChbsl/TM6cM1idh6TmV8WeUrfc/GZ7ZkvzProGiAJdd85rxQ17wppBe4mTsdD86B46sJP C8+zSj3CR2xX8QrdIEDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phAYb-00EoMB-1q; Tue, 28 Mar 2023 14:44:17 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phAYY-00EoLR-1L for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2023 14:44:15 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A67DAB81D6E; Tue, 28 Mar 2023 14:44:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 776CFC433D2; Tue, 28 Mar 2023 14:44:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680014651; bh=GjbFF5kxNZ3VUOnYj3ADIwJWyTgKZ4fW4nbBVLgpyPU=; h=From:To:Cc:Subject:Date:From; b=SHBSwfpjaX4oP6cW5QVDvPrlYqVd4uHOXupPZOUUTkB0o8HtGQtLjhyR6AbEcoOK0 tFwOeiVZkrYmbil21063Xaefm/LQ/zmjFF6ik6SUF7nRcKY6F2IAPKS1VZQ8NGo39X u3ka72zPzjlYEC9cKgAsiMnk20ZONUqNLH2tFrSZ2H7s6rKQEaBKLgMvyvhl0/tdyP ngfm8hnIpf9g8xTBVlJugDT7vM0H49dR4nWNAd3eYspE4KuwW5VXM4QzOYEgk33fiS 3Y1u73HvQMr0CVjY0c7eD7UM6C9yCpDbGJaJGG1yN9Ru+UquPK7L2BPVZoYin4e2cr PyJtvK4ColtEw== From: Arnd Bergmann To: Zaid Al-Bassam , Marc Zyngier , Will Deacon Cc: Arnd Bergmann , Russell King , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: mach-virt: fix PMUv3 dependendency Date: Tue, 28 Mar 2023 16:43:44 +0200 Message-Id: <20230328144405.1527555-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230328_074414_612631_B0D66286 X-CRM114-Status: GOOD ( 14.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann Selecting a ARM_PMUV3 from a platform option breaks the build when CONFIG_ARM_PMU is not already set: WARNING: unmet direct dependencies detected for ARM_PMUV3 Depends on [n]: PERF_EVENTS [=y] && HW_PERF_EVENTS [=n] && (ARM [=y] && CPU_V7 [=y] || ARM64) Selected by [y]: - ARCH_VIRT [=y] && ARCH_MULTI_V7 [=y] && PERF_EVENTS [=y] drivers/perf/arm_pmuv3.c:48:9: error: 'PERF_MAP_ALL_UNSUPPORTED' undeclared here (not in a function) 48 | PERF_MAP_ALL_UNSUPPORTED, | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/perf/arm_pmuv3.c:63:9: error: 'PERF_CACHE_MAP_ALL_UNSUPPORTED' undeclared here (not in a function) 63 | PERF_CACHE_MAP_ALL_UNSUPPORTED, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/perf/arm_pmuv3.c:65:10: error: implicit declaration of function 'C' [-Werror=implicit-function-declaration] 65 | [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)] = ARMV8_PMUV3_PERFCTR_L1D_CACHE, Fixes: 3b16f6268e66 ("ARM: mach-virt: Select PMUv3 driver by default") Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e8ccacb3653b..700458c7cace 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -397,7 +397,7 @@ config ARCH_VIRT select ARM_GIC_V3 select ARM_GIC_V3_ITS if PCI select ARM_PSCI - select ARM_PMUV3 if PERF_EVENTS + select ARM_PMUV3 if PERF_EVENTS && ARM_PMU select HAVE_ARM_ARCH_TIMER config ARCH_AIROHA