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: 76116 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2275512vqo; Tue, 28 Mar 2023 07:47:27 -0700 (PDT) X-Google-Smtp-Source: AKy350ZwUPkwgRZKY2iuDfpk2kbavUCRLCz3tBdvnReYtVYIDgqhBu1GIELL6GZiydq+hZcp1jZ8 X-Received: by 2002:a17:903:20d4:b0:1a1:c746:7d6f with SMTP id i20-20020a17090320d400b001a1c7467d6fmr11798025plb.53.1680014847075; Tue, 28 Mar 2023 07:47:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680014847; cv=none; d=google.com; s=arc-20160816; b=0DT5F7JFUUNLFW0spRmfMGpd3q/NNtVLI/8ac3hIkvMzAl6Ak4lacEYlw/uAqeSvA8 RNosvIC/m783Ehw4V1Bq5QQdmnSIb/2bHvWyKq+vaEVEp7Z9HTKsyawh+QLk33ZqmY0r 797/SfdLK80Abbq73ppT3H+Hdo5mMSVq7oAF5MdlK9yzad1bGcNwGFYBrHLbOt3tZt4P 4vfkS91pnVTCtAQp9aXR0u7VmdCWEuEjnfgqR9ShyR16OIZB86FZBEUw2a+M4q+97Zu8 xRG/ACm8Q20Tvvoog0nG+z1ewB6m7LqPFMa917POgZdf74g83SNLg85Vl/drbHMm+RW4 YdmQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=wW9W9CkqG+KM5lBkJY8muLRSg60OOyq9sP3UyU5/ri4=; b=DQoe6kLDMTllLMGPYE3O4Pi8qwIMym09fmY1i4MiGxR04UQCHJrYrLIa/rKkVuZZtz c31VzYezrATRqPL4TzVOT7JdILUl0BxWX4K/nA0pqqMy8V7fxizj/AW+DrbWMXGjkrDs uUuwi95qzY49G5mmWczmYltQKl+eSb6caWjxXJj6lLH9hc/iLp+M2uK3YVg4gwlAiQe5 IGZbL66/dLClLIcXQypI/T/ucgLoWdgelQ9E7yv6w92nLvc5I7tZVXGmrfmgJl5bllzA q1wOgtcAGYY1dCpwMa9Zi3i+lO9JKJ6b2+8UPaHUPlTwB/Fs3074RItjq/LWsan85D2o Q6og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SHBSwfpj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s1-20020a63dc01000000b0050c0a48480bsi30504234pgg.798.2023.03.28.07.47.14; Tue, 28 Mar 2023 07:47:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SHBSwfpj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232905AbjC1OoR (ORCPT + 99 others); Tue, 28 Mar 2023 10:44:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231432AbjC1OoP (ORCPT ); Tue, 28 Mar 2023 10:44:15 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D051BBA8 for ; Tue, 28 Mar 2023 07:44:15 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 4C6D9CE1C78 for ; Tue, 28 Mar 2023 14:44:13 +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-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761623248323860732?= X-GMAIL-MSGID: =?utf-8?q?1761623248323860732?= 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