From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755458AbbEZOE7 (ORCPT ); Tue, 26 May 2015 10:04:59 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:61272 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754843AbbEZOEH (ORCPT ); Tue, 26 May 2015 10:04:07 -0400 From: "Suzuki K. Poulose" To: arm@kernel.org Cc: will.deacon@arm.com, punit.agrawal@arm.com, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, pawel.moll@arm.com, linux-kernel@vger.kernel.org, "Suzuki K. Poulose" , Russell King Subject: [PATCH 1/7] arm-cci: Do not enable CCI-400 PMU by default Date: Tue, 26 May 2015 10:53:10 +0100 Message-Id: <1432633996-7229-2-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1432633996-7229-1-git-send-email-suzuki.poulose@arm.com> References: <1432633996-7229-1-git-send-email-suzuki.poulose@arm.com> X-OriginalArrivalTime: 26 May 2015 09:53:42.0282 (UTC) FILETIME=[D9281EA0:01D09799] X-MC-Unique: oRP0h_S4RfuRrOugOSBd9A-1 Content-Type: text/plain; charset=WINDOWS-1252 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id t4QE58Fw011835 From: "Suzuki K. Poulose" Do not enable CCI-400 PMU by default and fix the dependency on PERF_EVENTS than HW_PERF_EVENTS. Reported-by: Russell King Cc: Will Deacon Cc: arm@kernel.org Cc: Russell King Signed-off-by: Suzuki K. Poulose --- Changes since V1: - Make CCI400_PMU depend on CPU_V7 for ARM (Suggested by: Russell) --- drivers/bus/Kconfig | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index a1d4af6..a6b37d4 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -13,15 +13,13 @@ config ARM_CCI400_COMMON config ARM_CCI400_PMU bool "ARM CCI400 PMU support" - default y - depends on ARM || ARM64 - depends on HW_PERF_EVENTS + depends on (ARM && CPU_V7) || ARM64 + depends on PERF_EVENTS select ARM_CCI400_COMMON help - Support for PMU events monitoring on the ARM CCI cache coherent - interconnect. - - If unsure, say Y + Support for PMU events monitoring on the ARM CCI-400 (cache coherent + interconnect). CCI-400 supports counting events related to the + connected slave/master interfaces. config ARM_CCI400_PORT_CTRL bool -- 1.7.9.5