Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758697AbZDGGgn (ORCPT ); Tue, 7 Apr 2009 02:36:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758180AbZDGGgT (ORCPT ); Tue, 7 Apr 2009 02:36:19 -0400 Received: from e28smtp08.in.ibm.com ([59.145.155.8]:43516 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755979AbZDGGgR (ORCPT ); Tue, 7 Apr 2009 02:36:17 -0400 Date: Tue, 7 Apr 2009 12:06:11 +0530 From: "K.Prasad" To: Alan Stern Cc: Ingo Molnar , Linux Kernel Mailing List , Andrew Morton , Benjamin Herrenschmidt , Frederic Weisbecker , maneesh@linux.vnet.ibm.com, Roland McGrath , Steven Rostedt , "K.Prasad" Subject: [Patch 05/11] Use wrapper routines around debug registers in processor related functions Message-ID: <20090407063611.GF17461@in.ibm.com> References: <20090407063058.301701787@prasadkr_t60p.in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename=modify_processor_related_05 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 Content-Length: 3750 Lines: 129 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: arch/x86/kernel/smpboot.c =================================================================== --- arch/x86/kernel/smpboot.c.orig 2009-04-01 20:53:43.000000000 +0530 +++ arch/x86/kernel/smpboot.c 2009-04-01 20:54:37.000000000 +0530 @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -326,6 +327,7 @@ setup_secondary_clock(); wmb(); + load_debug_registers(); cpu_idle(); } @@ -1250,6 +1252,7 @@ remove_cpu_from_maps(cpu); unlock_vector_lock(); fixup_irqs(); + hw_breakpoint_disable(); } int native_cpu_disable(void) Index: arch/x86/power/cpu_32.c =================================================================== --- arch/x86/power/cpu_32.c.orig 2009-04-01 20:53:43.000000000 +0530 +++ arch/x86/power/cpu_32.c 2009-04-01 20:54:37.000000000 +0530 @@ -12,6 +12,7 @@ #include #include #include +#include static struct saved_context saved_context; @@ -47,6 +48,7 @@ ctxt->cr2 = read_cr2(); ctxt->cr3 = read_cr3(); ctxt->cr4 = read_cr4_safe(); + hw_breakpoint_disable(); } /* Needed by apm.c */ @@ -79,19 +81,7 @@ 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: arch/x86/power/cpu_64.c =================================================================== --- arch/x86/power/cpu_64.c.orig 2009-04-01 20:53:43.000000000 +0530 +++ arch/x86/power/cpu_64.c 2009-04-01 20:54:37.000000000 +0530 @@ -15,6 +15,7 @@ #include #include #include +#include static void fix_processor_context(void); @@ -70,6 +71,7 @@ ctxt->cr3 = read_cr3(); ctxt->cr4 = read_cr4(); ctxt->cr8 = read_cr8(); + hw_breakpoint_disable(); } void save_processor_state(void) @@ -158,16 +160,5 @@ 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(); } -- 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/