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=unavailable 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 89D4DC282CE for ; Wed, 13 Feb 2019 18:49:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60FB920811 for ; Wed, 13 Feb 2019 18:49:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083755; bh=qCkZdl8s58g3j2gjJNkCsszY+VooiW82dIUeFLAEak0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lf1n4z99osm1CMBwzO0kb2eZN67uYYQcn8rDhSpetrceG3Bg8R3dpIzPEr8SCAZh3 g08M+Rb5kFNJjBzbXfzhWJ2KOyazBgn/4AbTlNX0RB4ESJk3wUv2vwHAu0GgYmgngP XWD6UpGLlWSQJasaM/vzrYJ3jBQb8geJ/oI6kKc0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406339AbfBMSpb (ORCPT ); Wed, 13 Feb 2019 13:45:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:44154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389798AbfBMSpb (ORCPT ); Wed, 13 Feb 2019 13:45:31 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 04529222D1; Wed, 13 Feb 2019 18:45:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083530; bh=qCkZdl8s58g3j2gjJNkCsszY+VooiW82dIUeFLAEak0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G3O9xTfgcUz4IEI7phVSEWEKVk5OsOEJiyLVm7FS8WNx1UblM5qwxIM4cYp43hHir hXlTwgLTy/Rw+gtq92y4YMYAGhOLajbEMeg1PhtfHQKBQ0CjZlj6RgWS8a2OxCxcdv V2KIWXQJV1gRltl2mC6R9FpHplLhwsbnWPyK58G0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Kondratiev , Paul Burton , Ralf Baechle , James Hogan , linux-mips@vger.kernel.org Subject: [PATCH 4.20 23/50] mips: cm: reprime error cause Date: Wed, 13 Feb 2019 19:38:28 +0100 Message-Id: <20190213183657.605430699@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213183655.747168774@linuxfoundation.org> References: <20190213183655.747168774@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladimir Kondratiev commit 05dc6001af0630e200ad5ea08707187fe5537e6d upstream. Accordingly to the documentation ---cut--- The GCR_ERROR_CAUSE.ERR_TYPE field and the GCR_ERROR_MULT.ERR_TYPE fields can be cleared by either a reset or by writing the current value of GCR_ERROR_CAUSE.ERR_TYPE to the GCR_ERROR_CAUSE.ERR_TYPE register. ---cut--- Do exactly this. Original value of cm_error may be safely written back; it clears error cause and keeps other bits untouched. Fixes: 3885c2b463f6 ("MIPS: CM: Add support for reporting CM cache errors") Signed-off-by: Vladimir Kondratiev Signed-off-by: Paul Burton Cc: Ralf Baechle Cc: James Hogan Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org # v4.3+ Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/mips-cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/kernel/mips-cm.c +++ b/arch/mips/kernel/mips-cm.c @@ -457,5 +457,5 @@ void mips_cm_error_report(void) } /* reprime cause register */ - write_gcr_error_cause(0); + write_gcr_error_cause(cm_error); }