From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-x22e.google.com (mail-pg0-x22e.google.com [IPv6:2607:f8b0:400e:c05::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xMFK80VCczDrMP for ; Tue, 1 Aug 2017 22:01:16 +1000 (AEST) Received: by mail-pg0-x22e.google.com with SMTP id l64so6997675pge.5 for ; Tue, 01 Aug 2017 05:01:15 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin Subject: [PATCH v2 1/4] powerpc/64s: fix mce accounting for powernv Date: Tue, 1 Aug 2017 22:00:51 +1000 Message-Id: <20170801120054.3447-2-npiggin@gmail.com> In-Reply-To: <20170801120054.3447-1-npiggin@gmail.com> References: <20170801120054.3447-1-npiggin@gmail.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , --- arch/powerpc/kernel/traps.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index bfcfd9ef09f2..5adfea2dc822 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -755,7 +755,14 @@ void machine_check_exception(struct pt_regs *regs) enum ctx_state prev_state = exception_enter(); int recover = 0; +#ifdef CONFIG_PPC_BOOK3S_64 + /* 64s accounts the mce in machine_check_early when in HVMODE */ + if (!cpu_has_feature(CPU_FTR_HVMODE)) + __this_cpu_inc(irq_stat.mce_exceptions); +#else __this_cpu_inc(irq_stat.mce_exceptions); +#endif + add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE); -- 2.11.0