From patchwork Mon Mar 23 15:13:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 6073831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0FFC2BF90F for ; Mon, 23 Mar 2015 15:16:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35ADA2026D for ; Mon, 23 Mar 2015 15:16:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F9A12026C for ; Mon, 23 Mar 2015 15:16:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ya43d-0003Ml-I6; Mon, 23 Mar 2015 15:14:25 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ya43Y-0003DJ-K1 for linux-arm-kernel@lists.infradead.org; Mon, 23 Mar 2015 15:14:21 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by service87.mimecast.com; Mon, 23 Mar 2015 15:13:52 +0000 Received: from [10.1.209.22] ([10.1.2.79]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 23 Mar 2015 15:13:51 +0000 Message-ID: <55102DAF.7050206@arm.com> Date: Mon, 23 Mar 2015 15:13:51 +0000 From: "Suzuki K. Poulose" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Abhilash Kesavan , Stephen Rothwell Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-perf tree References: <20150323113318.0319c248@canb.auug.org.au> In-Reply-To: X-OriginalArrivalTime: 23 Mar 2015 15:13:51.0173 (UTC) FILETIME=[F81C4750:01D0657B] X-MC-Unique: 115032315135203001 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150323_081421_021345_9470FD15 X-CRM114-Status: GOOD ( 14.32 ) X-Spam-Score: -2.3 (--) Cc: Geert Uytterhoeven , Arnd Bergmann , Will Deacon , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , Olof Johansson , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 23/03/15 14:41, Abhilash Kesavan wrote: > Hi Stephen, > > On Mon, Mar 23, 2015 at 6:03 AM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> drivers/bus/Kconfig between commit c9966c98697a ("arm-cci: Split the >> code for PMU vs driver support") from the arm-perf tree and commit >> 13fbf3c8d0f7 ("drivers: bus: Sort Kconfig entries alphabetically") from >> the arm-soc tree. >> >> I fixed it up (see below) and can carry the fix as necessary (no action >> is required). > > Not sure if this has been reported elsewhere, but I am seeing core > boot-up failures on the exynos5420 with next-20150323 due to this. > Your conflict fix is missing the ARM_CCI symbol because of which the > CCI does not get enabled. > > Suzuki, can you confirm ? > Yes, you are right. We need the config ARM_CCI even now, which enables the building of the arm-cci.c. Stephen, We need the following fix on the linux-next. Suzuki > Regards, > Abhilash >> >> -- >> Cheers, >> Stephen Rothwell sfr@canb.auug.org.au >> >> diff --cc drivers/bus/Kconfig >> index 79e297b1f221,7e9c2674af81..000000000000 >> --- a/drivers/bus/Kconfig >> +++ b/drivers/bus/Kconfig >> @@@ -4,6 -4,21 +4,38 @@@ >> >> menu "Bus devices" >> >> -config ARM_CCI >> - bool "ARM CCI driver support" >> ++config ARM_CCI400_PORT_CTRL >> ++ bool >> + depends on ARM && OF && CPU_V7 >> ++ select ARM_CCI400_COMMON >> + help >> - Driver supporting the CCI cache coherent interconnect for ARM >> - platforms. >> ++ Low level power management driver for CCI400 cache coherent >> ++ interconnect for ARM platforms. >> ++ >> ++config ARM_CCI400_PMU >> ++ bool "ARM CCI400 PMU support" >> ++ default y >> ++ depends on ARM || ARM64 >> ++ depends on HW_PERF_EVENTS >> ++ select ARM_CCI400_COMMON >> ++ help >> ++ Support for PMU events monitoring on the ARM CCI cache coherent >> ++ interconnect. >> ++ >> ++ If unsure, say Y >> ++ >> ++config ARM_CCI400_COMMON >> ++ bool >> ++ select ARM_CCI >> + >> + config ARM_CCN >> + bool "ARM CCN driver support" >> + depends on ARM || ARM64 >> + depends on PERF_EVENTS >> + help >> + PMU (perf) driver supporting the ARM CCN (Cache Coherent Network) >> + interconnect. >> + >> config BRCMSTB_GISB_ARB >> bool "Broadcom STB GISB bus arbiter" >> depends on ARM || MIPS >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >> > diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index f4213b1..e0eac5a 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -4,6 +4,9 @@ menu "Bus devices" +config ARM_CCI + bool + config ARM_CCI400_PORT_CTRL bool depends on ARM && OF && CPU_V7