From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761745AbZBMQ3g (ORCPT ); Fri, 13 Feb 2009 11:29:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761084AbZBMQ2a (ORCPT ); Fri, 13 Feb 2009 11:28:30 -0500 Received: from e28smtp01.in.ibm.com ([59.145.155.1]:59280 "EHLO e28smtp01.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760492AbZBMQ22 (ORCPT ); Fri, 13 Feb 2009 11:28:28 -0500 Date: Fri, 13 Feb 2009 20:26:57 +0530 From: "K.Prasad" To: Ingo Molnar Cc: Andrew Morton , Alan Stern , Roland McGrath , richardj_moore@uk.ibm.com, jason.wessel@windriver.com Subject: [Patch 5/10] Use wrapper routines around debug registers in processor related functions Message-ID: <20090213145657.GE32064@in.ibm.com> Reply-To: prasad@linux.vnet.ibm.com References: <20090213145301.GA31546@in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090213145301.GA31546@in.ibm.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use wrapper routines around debug registers in processor related functions From: Alan Stern This patch enables the use of wrapper routines to access the debug/breakpoint registers. [K.Prasad: Split-out from the bigger patch and minor changes following re-basing] Signed-off-by: K.Prasad Signed-off-by: Alan Stern --- arch/x86/kernel/smpboot.c | 3 +++ arch/x86/power/cpu_32.c | 16 +++------------- arch/x86/power/cpu_64.c | 15 +++------------ 3 files changed, 9 insertions(+), 25 deletions(-) Index: linux-2.6-tip.hbkpt/arch/x86/power/cpu_32.c =================================================================== --- linux-2.6-tip.hbkpt.orig/arch/x86/power/cpu_32.c +++ linux-2.6-tip.hbkpt/arch/x86/power/cpu_32.c @@ -12,6 +12,7 @@ #include #include #include +#include static struct saved_context saved_context; @@ -47,6 +48,7 @@ static void __save_processor_state(struc ctxt->cr2 = read_cr2(); ctxt->cr3 = read_cr3(); ctxt->cr4 = read_cr4_safe(); + disable_debug_registers(); } /* Needed by apm.c */ @@ -79,19 +81,7 @@ static void fix_processor_context(void) load_TR_desc(); /* This does ltr */ load_LDT(¤t->active_mm->context); /* This does lldt */ - /* - * Now maybe reload the debug registers - */ - if (current->thread.debugreg7) { - set_debugreg(current->thread.debugreg0, 0); - set_debugreg(current->thread.debugreg1, 1); - set_debugreg(current->thread.debugreg2, 2); - set_debugreg(current->thread.debugreg3, 3); - /* no 4 and 5 */ - set_debugreg(current->thread.debugreg6, 6); - set_debugreg(current->thread.debugreg7, 7); - } - + load_debug_registers(); } static void __restore_processor_state(struct saved_context *ctxt) Index: linux-2.6-tip.hbkpt/arch/x86/power/cpu_64.c =================================================================== --- linux-2.6-tip.hbkpt.orig/arch/x86/power/cpu_64.c +++ linux-2.6-tip.hbkpt/arch/x86/power/cpu_64.c @@ -15,6 +15,7 @@ #include #include #include +#include static void fix_processor_context(void); @@ -70,6 +71,7 @@ static void __save_processor_state(struc ctxt->cr3 = read_cr3(); ctxt->cr4 = read_cr4(); ctxt->cr8 = read_cr8(); + disable_debug_registers(); } void save_processor_state(void) @@ -158,16 +160,5 @@ static void fix_processor_context(void) load_TR_desc(); /* This does ltr */ load_LDT(¤t->active_mm->context); /* This does lldt */ - /* - * Now maybe reload the debug registers - */ - if (current->thread.debugreg7){ - loaddebug(¤t->thread, 0); - loaddebug(¤t->thread, 1); - loaddebug(¤t->thread, 2); - loaddebug(¤t->thread, 3); - /* no 4 and 5 */ - loaddebug(¤t->thread, 6); - loaddebug(¤t->thread, 7); - } + load_debug_registers(); } Index: linux-2.6-tip.hbkpt/arch/x86/kernel/smpboot.c =================================================================== --- linux-2.6-tip.hbkpt.orig/arch/x86/kernel/smpboot.c +++ linux-2.6-tip.hbkpt/arch/x86/kernel/smpboot.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -338,6 +339,7 @@ notrace static void __cpuinit start_seco setup_secondary_clock(); wmb(); + load_debug_registers(); cpu_idle(); } @@ -1318,6 +1320,7 @@ void cpu_disable_common(void) remove_cpu_from_maps(cpu); unlock_vector_lock(); fixup_irqs(); + disable_debug_registers(); } int native_cpu_disable(void)