From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE0D8C04E84 for ; Wed, 15 May 2019 11:15:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8494F20862 for ; Wed, 15 May 2019 11:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918925; bh=6zO7tVXG4/5IUdBroFzjK/pJRlz3x3muihcqwl8q3JA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Eu127g8BlEvjqoOAMA3+FQtiXbGqu8YaIHvppGn14M7YKWF7lC5+KTuJfMt7w3uXd qBDx8OmKm0w+t8/E58VcG0R0MgoYHZytkt35vlCLdx7lRHmpWtE3odpzg8Ye9UjSnr eLKozU4hPdAt0vE2MT7IXtrZ3GnKpyocLK9RIHSE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729618AbfEOLPY (ORCPT ); Wed, 15 May 2019 07:15:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:51862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730261AbfEOLPX (ORCPT ); Wed, 15 May 2019 07:15:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9DE7920644; Wed, 15 May 2019 11:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918923; bh=6zO7tVXG4/5IUdBroFzjK/pJRlz3x3muihcqwl8q3JA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DROwB0RJHYJpTUXoN+svIIHhRXYWsTqTNJphOE6tKPGSPnD/H0AtBZtKATw5xnSky FIzLs8cUL/DgsnWzrpyaqzFM1o54NfyaM1jJlHIAc91Cb7sKGjd8lm4ee4lqDVxEDb MP/M+NhWBf4vZR0jmWIRfdQjSnYhcptwQNXMgJjk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laurentiu Tudor , Michael Ellerman Subject: [PATCH 4.9 51/51] powerpc/booke64: set RI in default MSR Date: Wed, 15 May 2019 12:56:26 +0200 Message-Id: <20190515090630.242063612@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090616.669619870@linuxfoundation.org> References: <20190515090616.669619870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Laurentiu Tudor commit 5266e58d6cd90ac85c187d673093ad9cb649e16d upstream. Set RI in the default kernel's MSR so that the architected way of detecting unrecoverable machine check interrupts has a chance to work. This is inline with the MSR setup of the rest of booke powerpc architectures configured here. Signed-off-by: Laurentiu Tudor Cc: stable@vger.kernel.org Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/reg_booke.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h @@ -41,7 +41,7 @@ #if defined(CONFIG_PPC_BOOK3E_64) #define MSR_64BIT MSR_CM -#define MSR_ (MSR_ME | MSR_CE) +#define MSR_ (MSR_ME | MSR_RI | MSR_CE) #define MSR_KERNEL (MSR_ | MSR_64BIT) #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE) #define MSR_USER64 (MSR_USER32 | MSR_64BIT)