From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758379AbcBXRMO (ORCPT ); Wed, 24 Feb 2016 12:12:14 -0500 Received: from foss.arm.com ([217.140.101.70]:45560 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758359AbcBXRMK (ORCPT ); Wed, 24 Feb 2016 12:12:10 -0500 Date: Wed, 24 Feb 2016 17:12:18 +0000 From: Will Deacon To: Olof Johansson Cc: "Suzuki K. Poulose" , arnd@arndb.de, linux-arm-kernel@lists.infradead.org, arm@kernel.org, punit.agrawal@arm.com, mark.rutland@arm.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 00/13] arm-cci: PMU driver updates for 4.6 Message-ID: <20160224171218.GC12471@arm.com> References: <1456224595-3282-1-git-send-email-suzuki.poulose@arm.com> <20160223114003.GF3966@arm.com> <56CC64E7.3040407@arm.com> <20160224165814.GA10126@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160224165814.GA10126@localhost> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 24, 2016 at 08:58:14AM -0800, Olof Johansson wrote: > On Tue, Feb 23, 2016 at 01:55:51PM +0000, Suzuki K. Poulose wrote: > > On 23/02/16 11:40, Will Deacon wrote: > > >On Tue, Feb 23, 2016 at 10:49:42AM +0000, Suzuki K Poulose wrote: > > >>Here are some fixes and updates for arm-cci pmu driver targeting v4.6, > > >>applies on top of v4.5-rc5. > > >> > > >>Highlights include : > > >> - Support for CoreLink CCI-550 PMU > > >> - Reliable writes to PMU Counter registers for CCI-500/550. > > >> > > >>All the patches have been Acked. Please let me know how this > > >>can be merged. > > > > >> > > >> Documentation/devicetree/bindings/arm/cci.txt | 2 + > > >> drivers/bus/Kconfig | 10 +- > > >> drivers/bus/arm-cci.c | 612 +++++++++++++++++-------- > > >> 3 files changed, 427 insertions(+), 197 deletions(-) > > > > > >How do you plan to merge this? I can take it all onto a branch for > > >arm-soc, or I can include it on my perf/updates branch, or ...? > > > > Arnd, Olof, > > > > What do you think would be the best route ? > > Traditionally we've been picking these up in arm-soc in our drivers branch. > > Will, unless you want them in your tree for some reason that's what I'll do > here as well. Just that I already have some CPU PMU patches that I planned to send, so I could bundle these in with those if necessary. I have no preference either way though, as long as they get queued someplace. At some point, those drivers should be largely moved from drivers/bus/ to drivers/perf/, but that's a separate issue. Will