From patchwork Wed Feb 27 03:09:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 223481 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 146382C073C for ; Wed, 27 Feb 2013 14:12:35 +1100 (EST) Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mail1.windriver.com", Issuer "Intel External Basic Issuing CA 3A" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 66E482C035D for ; Wed, 27 Feb 2013 14:09:41 +1100 (EST) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r1R39djF029537 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 26 Feb 2013 19:09:39 -0800 (PST) Received: from Linux.corp.ad.wrs.com (128.224.162.178) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.328.9; Tue, 26 Feb 2013 19:09:37 -0800 From: Tiejun Chen To: , Subject: [v3][PATCH 3/6] book3e/kgdb: update thread's dbcr0 Date: Wed, 27 Feb 2013 11:09:25 +0800 Message-ID: <1361934568-31989-4-git-send-email-tiejun.chen@windriver.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1361934568-31989-1-git-send-email-tiejun.chen@windriver.com> References: <1361934568-31989-1-git-send-email-tiejun.chen@windriver.com> MIME-Version: 1.0 Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, jason.wessel@windriver.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" gdb always need to generate a single step properly to invoke a kgdb state. But with lazy interrupt, book3e can't always trigger a debug exception with a single step since the current is blocked for handling those pending exception, then we miss that expected dbcr configuration at last to generate a debug exception. So here we also update thread's dbcr0 to make sure the current can go back with that missed dbcr0 configuration. Signed-off-by: Tiejun Chen --- arch/powerpc/kernel/kgdb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index 5ca82cd..1a57307 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c @@ -410,7 +410,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, struct pt_regs *linux_regs) { char *ptr = &remcom_in_buffer[1]; - unsigned long addr; + unsigned long addr, dbcr0; switch (remcom_in_buffer[0]) { /* @@ -427,8 +427,15 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, /* set the trace bit if we're stepping */ if (remcom_in_buffer[0] == 's') { #ifdef CONFIG_PPC_ADV_DEBUG_REGS - mtspr(SPRN_DBCR0, - mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM); + dbcr0 = mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM; + mtspr(SPRN_DBCR0, dbcr0); +#ifdef CONFIG_PPC_BOOK3E_64 + /* With lazy interrut we have to update thread dbcr0 here + * to make sure we can set debug properly at last to invoke + * kgdb again to work well. + */ + current->thread.dbcr0 = dbcr0; +#endif linux_regs->msr |= MSR_DE; #else linux_regs->msr |= MSR_SE;