Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753304Ab3H0Lha (ORCPT ); Tue, 27 Aug 2013 07:37:30 -0400 Received: from service87.mimecast.com ([91.220.42.44]:53603 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753064Ab3H0Lh3 convert rfc822-to-8bit (ORCPT ); Tue, 27 Aug 2013 07:37:29 -0400 Message-ID: <521C8F82.6070301@arm.com> Date: Tue, 27 Aug 2013 12:37:38 +0100 From: Sudeep KarkadaNagesha User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Catalin Marinas CC: Sudeep KarkadaNagesha , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Lorenzo Pieralisi , Will Deacon , Thomas Gleixner , Daniel Lezcano Subject: Re: [PATCH v4 1/5] ARM/ARM64: arch_timer: add macros for bits in control register References: <1377274749-6196-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> <1377274749-6196-2-git-send-email-Sudeep.KarkadaNagesha@arm.com> <20130827112144.GG19897@arm.com> In-Reply-To: <20130827112144.GG19897@arm.com> X-OriginalArrivalTime: 27 Aug 2013 11:37:24.0571 (UTC) FILETIME=[CCCB52B0:01CEA319] X-MC-Unique: 113082712372701001 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3169 Lines: 78 On 27/08/13 12:21, Catalin Marinas wrote: > On Fri, Aug 23, 2013 at 05:19:05PM +0100, Sudeep KarkadaNagesha wrote: >> From: Sudeep KarkadaNagesha >> >> Add macros to describe the bitfields in the ARM architected timer >> control register to make code easy to understand. >> >> Cc: Catalin Marinas >> Reviewed-by: Lorenzo Pieralisi >> Reviewed-by: Will Deacon >> Signed-off-by: Sudeep KarkadaNagesha >> --- >> arch/arm/include/asm/arch_timer.h | 9 +++++++-- >> arch/arm64/include/asm/arch_timer.h | 12 ++++++++---- >> include/clocksource/arm_arch_timer.h | 8 ++++++++ >> 3 files changed, 23 insertions(+), 6 deletions(-) >> >> diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h >> index e406d57..9ef74da 100644 >> --- a/arch/arm/include/asm/arch_timer.h >> +++ b/arch/arm/include/asm/arch_timer.h >> @@ -95,8 +95,13 @@ static inline void arch_counter_set_user_access(void) >> >> asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl)); >> >> - /* disable user access to everything */ >> - cntkctl &= ~((3 << 8) | (7 << 0)); >> + /* Disable user access to both physical/virtual counters/timers. */ >> + /* Also disable virtual event stream */ >> + cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN >> + | ARCH_TIMER_USR_VT_ACCESS_EN >> + | ARCH_TIMER_VIRT_EVT_EN >> + | ARCH_TIMER_USR_VCT_ACCESS_EN >> + | ARCH_TIMER_USR_PCT_ACCESS_EN); >> >> asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl)); >> } >> diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h >> index 98abd47..00b09d0 100644 >> --- a/arch/arm64/include/asm/arch_timer.h >> +++ b/arch/arm64/include/asm/arch_timer.h >> @@ -101,12 +101,16 @@ static inline void arch_counter_set_user_access(void) >> { >> u32 cntkctl; >> >> - /* Disable user access to the timers and the physical counter. */ >> asm volatile("mrs %0, cntkctl_el1" : "=r" (cntkctl)); >> - cntkctl &= ~((3 << 8) | (1 << 0)); >> >> - /* Enable user access to the virtual counter and frequency. */ >> - cntkctl |= (1 << 1); >> + /* Disable user access to the timers and the physical counter. */ >> + cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN >> + | ARCH_TIMER_USR_VT_ACCESS_EN >> + | ARCH_TIMER_USR_PCT_ACCESS_EN); >> + >> + /* Enable user access to the virtual counter. */ >> + cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN; >> + >> asm volatile("msr cntkctl_el1, %0" : : "r" (cntkctl)); > > For consistency with arm, I think we should also disable the event > stream explicitly here. > Yes it's done. In PATCH 3/5, a new function arch_timer_evtstrm_config is added which is always called(PATCH 4/5). It's either enabled or disabled explicitly based on config option for event stream. Let me know if you think that's not sufficient. Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/