From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751638AbdBMFTr (ORCPT ); Mon, 13 Feb 2017 00:19:47 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51381 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711AbdBMFTq (ORCPT ); Mon, 13 Feb 2017 00:19:46 -0500 From: Pan Xinhui To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, aneesh.kumar@linux.vnet.ibm.com, Pan Xinhui Subject: [PATCH] powerpc/xmon: add turn off xmon option Date: Mon, 13 Feb 2017 05:13:52 -0500 X-Mailer: git-send-email 2.4.11 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021305-0052-0000-0000-00000215B56A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021305-0053-0000-0000-000007C436BA Message-Id: <1486980832-6846-1-git-send-email-xinhui.pan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-13_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702130054 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Once xmon is triggered, there is no interface to turn it off again. However there exists disable/enable xmon code flows. And more important, System reset interrupt on powerVM will fire an oops to make a dump. At that time, xmon should not be triggered. So add 'z' option after current 'x|X' exit commands. Turn xmon off if 'z' is following. Signed-off-by: Pan Xinhui --- arch/powerpc/xmon/xmon.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 9c0e17c..2f4e7b1 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -76,6 +76,7 @@ static int xmon_gate; #endif /* CONFIG_SMP */ static unsigned long in_xmon __read_mostly = 0; +static int xmon_off = 0; static unsigned long adrs; static int size = 1; @@ -255,8 +256,8 @@ Commands:\n\ Sr # read SPR #\n\ Sw #v write v to SPR #\n\ t print backtrace\n\ - x exit monitor and recover\n\ - X exit monitor and don't recover\n" + x[z] exit monitor and recover, turn off xmon with 'z'\n\ + X[z] exit monitor and don't recover, turn off xmon with 'z'\n" #if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_BOOK3E) " u dump segment table or SLB\n" #elif defined(CONFIG_PPC_STD_MMU_32) @@ -952,6 +953,8 @@ cmds(struct pt_regs *excp) break; case 'x': case 'X': + if (inchar() == 'z') + xmon_off = 1; return cmd; case EOF: printf(" \n"); @@ -3248,8 +3251,11 @@ static void xmon_init(int enable) static void sysrq_handle_xmon(int key) { /* ensure xmon is enabled */ + xmon_off = 0; xmon_init(1); debugger(get_irq_regs()); + if (xmon_off) + xmon_init(0); } static struct sysrq_key_op sysrq_xmon_op = { @@ -3266,7 +3272,7 @@ static int __init setup_xmon_sysrq(void) __initcall(setup_xmon_sysrq); #endif /* CONFIG_MAGIC_SYSRQ */ -static int __initdata xmon_early, xmon_off; +static int __initdata xmon_early; static int __init early_parse_xmon(char *p) { -- 2.4.11