From patchwork Mon Feb 20 19:44:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 730173 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vRvNJ682nz9s9j for ; Tue, 21 Feb 2017 06:49:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GKAfH6u5"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vRvNJ594yzDqK8 for ; Tue, 21 Feb 2017 06:49:36 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GKAfH6u5"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (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 3vRvGv5MTgzDqGW for ; Tue, 21 Feb 2017 06:44:55 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GKAfH6u5"; dkim-atps=neutral Received: by mail-pg0-x243.google.com with SMTP id s67so3636649pgb.1 for ; Mon, 20 Feb 2017 11:44:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SDt/OdW612O7Qrkf4ViB/5UxMj6q2OjLp+plC/nrG48=; b=GKAfH6u5yNXKM9Dqdc9LyPSnqPLYXPZX+SS/3hGBwKqeyQdBx8D6Riysgn9A/9zRFN wujve8YGfz+5zCnXQ0/8M/g836Z3Jh2tZ2aIaxeJ9Ogi4v9TByrNfyNnSt4HxQ5DXpWP PbeLjaVIVmo3y6Jsq6YjE4YXpAtwtCMpRD7xYR980+ZGlo3qsbrD+LPNeN5TvrhfkzFA QYBAyYBlARoJRp4OfuvsNB6EopCTUv/z8NWgQPT6hmZaEcdC30n9rulcC1i12sol2YXH ewIMy97L9F7jsuXfudWVY66aP7Avk0rIraMRdHmR3/6bAVBBnRM2xcC4EemP8V1KsCDV IiFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SDt/OdW612O7Qrkf4ViB/5UxMj6q2OjLp+plC/nrG48=; b=A6GB48ImNG2h6rCbzxOPoi/dW24fGNVlEKYovEvuO+ORtduZDwOGjIayfwmqXR1FGm PJ07yTlc8oWaJCPQhm5zXumkVnOw2IhgFeKLyqvBmVcBHu3or+QBb084H31sY//ynhjK UyMA+nPTaJjSP7cYe1yFQKE52VamsbxoUhhXaFvQ+R5abfYoLBenNGbn1crKgL1tJOAq 9DnEd7eFVYXI+mUZiXeJ08ClPwryGlcTxYVKoy5WDU/O+ID13Ks0rMmnTjaQPODQPt1y ADjkxyMYaJQULIs9/HqHLBWn1Ry7TUJVVrkHgQiMuTUjc7UxINJjT8aV0TBazT1rknPK A1FA== X-Gm-Message-State: AMke39lUH4w0IQQh/XI1TTbgk9plZSPPZiwFHJH+tR6i0/9l8RdgF/rm8Ll2xoeLzyBlnw== X-Received: by 10.98.201.11 with SMTP id k11mr11227071pfg.71.1487619893877; Mon, 20 Feb 2017 11:44:53 -0800 (PST) Received: from roar.au.ibm.com ([203.221.48.234]) by smtp.gmail.com with ESMTPSA id i10sm36813303pgd.37.2017.02.20.11.44.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 11:44:52 -0800 (PST) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/9] powerpc/64s: allow machine check handler to set severity and initiator Date: Tue, 21 Feb 2017 05:44:23 +1000 Message-Id: <20170220194430.32602-3-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170220194430.32602-1-npiggin@gmail.com> References: <20170220194430.32602-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin , Mahesh Salgaonkar Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Currently these just hardcoded. Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/mce.h | 3 ++- arch/powerpc/kernel/mce.c | 5 +++-- arch/powerpc/kernel/mce_power.c | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/mce.h b/arch/powerpc/include/asm/mce.h index f97d8cb6bdf6..b2a5865ccd87 100644 --- a/arch/powerpc/include/asm/mce.h +++ b/arch/powerpc/include/asm/mce.h @@ -177,7 +177,8 @@ struct mce_error_info { enum MCE_EratErrorType erat_error_type:8; enum MCE_TlbErrorType tlb_error_type:8; } u; - uint8_t reserved[2]; + enum MCE_Severity severity:8; + enum MCE_Initiator initiator:8; }; #define MAX_MC_EVT 100 diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c index 335f8a53f154..ce340207ccb3 100644 --- a/arch/powerpc/kernel/mce.c +++ b/arch/powerpc/kernel/mce.c @@ -90,13 +90,14 @@ void save_mce_event(struct pt_regs *regs, long handled, mce->gpr3 = regs->gpr[3]; mce->in_use = 1; - mce->initiator = MCE_INITIATOR_CPU; /* Mark it recovered if we have handled it and MSR(RI=1). */ if (handled && (regs->msr & MSR_RI)) mce->disposition = MCE_DISPOSITION_RECOVERED; else mce->disposition = MCE_DISPOSITION_NOT_RECOVERED; - mce->severity = MCE_SEV_ERROR_SYNC; + + mce->initiator = mce_err->initiator; + mce->severity = mce_err->severity; /* * Populate the mce error_type and type-specific error_type. diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c index 7353991c4ece..c37fc5fdd433 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -281,6 +281,9 @@ long __machine_check_early_realmode_p7(struct pt_regs *regs) long handled = 1; struct mce_error_info mce_error_info = { 0 }; + mce_error_info.severity = MCE_SEV_ERROR_SYNC; + mce_error_info.initiator = MCE_INITIATOR_CPU; + srr1 = regs->msr; nip = regs->nip; @@ -352,6 +355,9 @@ long __machine_check_early_realmode_p8(struct pt_regs *regs) long handled = 1; struct mce_error_info mce_error_info = { 0 }; + mce_error_info.severity = MCE_SEV_ERROR_SYNC; + mce_error_info.initiator = MCE_INITIATOR_CPU; + srr1 = regs->msr; nip = regs->nip;