From patchwork Mon May 8 13:50:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 91163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2182225vqo; Mon, 8 May 2023 07:06:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7PmM8HLNiZK9frGOc6l+HnbcZCw+NtFof955qwh2n9a+uYEBTa6k4GbiBufS2EmiKhWZq6 X-Received: by 2002:a05:6a20:8f06:b0:ff:e397:a87a with SMTP id b6-20020a056a208f0600b000ffe397a87amr7938495pzk.33.1683554765934; Mon, 08 May 2023 07:06:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683554765; cv=none; d=google.com; s=arc-20160816; b=U3iIN6JlUV2YcJYt7jupZZB66Ci+NIaq9ZLGZocnBlomQdJycFk8uGgx4EQcZpHLUw 7QemoQyGMNSu+XZHnYvTAbkIA4HFeexW1VSvTxseCKup/cQoa2CAy9zD3PbLRmz3s0Yl HAkpy/Zz1XKbWVCAmWmRFTUl2rTQuV1tPV7+irF40mbdiUQBESJ5OO1aFaR9dqADWQ0q ts8JFa0Qlu6uUbnwEYoAiUicxjIgvJu6yTrxrwkD56SfWIba+o+F60PZxXpWm/QLmiV0 /808ZFUNfY4piFVsYUx8lM8hjz1Lei997/MVavOFDwYum9uh+TcgTEScnqp4c4aMlCVi Yw2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=A3UuCiGJtdwTPIFnzAdYJ5VMzaMa5MMW3ZNaqT6yI7s=; b=yxghQz+UeJbARF9AWxRrCwIyMaT84jngJpHHGpTUbAhre32sABd2mK2oCAOl0O/wxf 6SITTZVklFUeYC/0fsbX7TECrtes54LFly+AEcz09W6YgtRexri0gcWxZI6rQF/3r9Ve xi/9AWi+PC4oDYd5NDxOpsUVnbWFioFeHJtQH4CxGebCRZA89lD6Rh6G0xL5sjafPVMs e9c9PYQKk5xEGU0qwRDzkf6ap4BCjeTUTrQqTAV4BEl5ExpEX/dX/CsaqvDPpiAkWYqk MJDFdFtc0APrM/lZrlMFDj5OlcznXQ/tqNpd3dQcV2X+ox//NSG4fBmhF/4e4kju2V0m xITg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AxFw8OEj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g13-20020aa79dcd000000b0063d27c285c9si45079pfq.21.2023.05.08.07.05.47; Mon, 08 May 2023 07:06:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AxFw8OEj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233971AbjEHNuU (ORCPT + 99 others); Mon, 8 May 2023 09:50:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233639AbjEHNuS (ORCPT ); Mon, 8 May 2023 09:50:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36EA613E for ; Mon, 8 May 2023 06:50:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C173762DA5 for ; Mon, 8 May 2023 13:50:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 097CEC4339E; Mon, 8 May 2023 13:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683553816; bh=S6YXxPKCuvrJZSp4g1qPNxn4rPj71MCJ5tyMyEU+OlU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AxFw8OEj80BxtobPqKOSRqxzOa2KOVM4bmUYqapkWP/5Z0mbQPZF6jl7z5oIQ/RVn tm0Vaoxtuo3CnA/lXRJ0mU5NV71LHti3oRtq13lAEs7AX8wfzit28w8psb/edWiC4h vCAraZlJ9NvGPW3g18LgggXDdSxWGG3mIjiwpDEua6u9le2iwW1j8wIX92autH64vp 6XIWeYrsYIk/l6kxEeYI7CLNJ+pAX7/GjAsL0AiHH95Jgy7W9l0th0IISY6AL9Ceo5 Sl5Fst58gM2c3yoFTyq2VFaZMTfSfrDF6OLTmIpFs1kNNL9gjtF7sfV7eEXDC5SJX0 4pmMDgiUyY7Zw== From: Mark Brown Date: Mon, 08 May 2023 22:50:09 +0900 Subject: [PATCH v2 1/2] arm64/esr: Use GENMASK() for the ISS mask MIME-Version: 1.0 Message-Id: <20230417-arm64-iss2-dabt-decode-v2-1-84e1c1463d30@kernel.org> References: <20230417-arm64-iss2-dabt-decode-v2-0-84e1c1463d30@kernel.org> In-Reply-To: <20230417-arm64-iss2-dabt-decode-v2-0-84e1c1463d30@kernel.org> To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=839; i=broonie@kernel.org; h=from:subject:message-id; bh=S6YXxPKCuvrJZSp4g1qPNxn4rPj71MCJ5tyMyEU+OlU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkWP4TjeaZvYFxL/h7LFXHcQN+H9RqTzwFF/rZQ rnnnpqD08+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZFj+EwAKCRAk1otyXVSH 0PxYB/9AMx39UNxBpJUd7O4kCK/+WZzRmWjhtg+cc3RXb7HRBEyyzmepXpUItnArA8HUZ5j8TrI uVzh9Qq8purAor+xfb4+iB/ajujBTpx4Mj/RLF7BhQIXxZ0yw+8Ltj40CwBAVv6YzCN5R9zG9Qr F8fFB4UsItC4J8zzBDyI7Sz9Ky3tkoOhs+GGHNo9a7LWf4gpCS2+B05Az+a3FuThfehe2ORnTA0 ME/D8PTFJSYPG5m8dZdOHa5muZBh8QJOlQdkEeDSCTMU6M6sCzqf85/UIwniFeCSd4gukiw3eMO VEqUGBhyoQbsrhMSxynf+HrRuUgPRVM0QdA2Dkuv8zO+CcJB X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765335122521105884?= X-GMAIL-MSGID: =?utf-8?q?1765335122521105884?= We express the mask for ESR_ELx.ISS in a non-standard manner, not using the standard helpers. In preparation for adding decode for ISS2 convert to use GENMASK(). No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/esr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 8487aec9b658..0bd879007168 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -75,7 +75,7 @@ #define ESR_ELx_IL_SHIFT (25) #define ESR_ELx_IL (UL(1) << ESR_ELx_IL_SHIFT) -#define ESR_ELx_ISS_MASK (ESR_ELx_IL - 1) +#define ESR_ELx_ISS_MASK (GENMASK(24, 0)) #define ESR_ELx_ISS(esr) ((esr) & ESR_ELx_ISS_MASK) /* ISS field definitions shared by different classes */ From patchwork Mon May 8 13:50:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 91171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2196472vqo; Mon, 8 May 2023 07:24:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6HhcbdorVk5cHTJvagxJjciYBwkai4GHs9+x35OiSdfisncU/+X50232+zSXLG9kP7FnoT X-Received: by 2002:a05:6a20:3c8a:b0:f1:b381:67c4 with SMTP id b10-20020a056a203c8a00b000f1b38167c4mr12567475pzj.20.1683555868744; Mon, 08 May 2023 07:24:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683555868; cv=none; d=google.com; s=arc-20160816; b=jvCL5leS4v9DUD4l5YQ1mH2wAVJV2rApTN61ludAWncdcLNgP6/afijjgha5Xncz0Z xSb9EQuZxm5OarRIgBLgIukrBE4n8A3oCTwrBo4vkluvBJUQK3XpKvN8DwL2IIimx5RG kGO0R1zaeo4D9ixPOE4LZgjBPBSBKV4HXLAr8boPDeKYFosHSxONMDGYKrIwcnWiWEK3 2CqJyRzWEIyMFl4QgRcJIi4SpxhOYspmf2lnBlL7lZQ8Ft+Zi7TZFcnyxXCvIMGV+mCJ vXcXcWjb7aiHjf33rcqvNKpQRQarPibx7Na62b4j4PMWmNEqxAT9bcXkfzvkG8jz2YjY yaWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=RGSfzmITvy9Aehm5xL31PiMM3CcQjFbBJ5UqBsDXYlQ=; b=OYBVDrL0cRnPHjVN+q4y9iZF+9uJmR14uyx09IQqic+mCgdFrwtFmIHRAxmcTO78/r WAAJFRW2Jqnqsh574ID7gIRvrttkPOgm+Y0+VHQTvVOSSXQBvSztHaXfvVX0hXLulU9l l1Tw1XmKfmrOzmedlfzpvyN6lFQIHgCoS+MnjdMdnNN/SditDJ5azOgY3jPzgfi1d/Y+ 2i+q+SsLbRaXdgVxFZp/e07YYaMwNNuGrUHlBCMDC5IlR9ssvgoEOtJT/z+jo6JjYX2p rw2JIC1kYryO4Bdxr8qgQrNVKZSAlRRTH0Ov6UmBk4PLIGUFvzChh7w9uzSEEtqt0pyB 74yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z+MXM8Eo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s1-20020a63dc01000000b0052ca3209fc9si8793852pgg.654.2023.05.08.07.24.16; Mon, 08 May 2023 07:24:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z+MXM8Eo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233639AbjEHNu1 (ORCPT + 99 others); Mon, 8 May 2023 09:50:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234001AbjEHNuU (ORCPT ); Mon, 8 May 2023 09:50:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA4C413E for ; Mon, 8 May 2023 06:50:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5A46762D56 for ; Mon, 8 May 2023 13:50:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5163C433D2; Mon, 8 May 2023 13:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683553817; bh=C1NR5gSjYzfXv6MI9yvQteCMANA9pEdgisnHmNWgLBM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Z+MXM8EomgaWpan4a30ED9ckVRDVRyMsee6zKScFeonH9yUPFf4gG764XVgW5tlFf 5TuDC749PuNZqk8DWTYXbI/uXwZy6nSqeO3MjVFkdqCauMKE11jLYCkRNcNf6f0m3v t8noWVA/Td01XM1Y1Vdupp5Fklf9XRKpKcsbEj3jH8VI36qNZxGiG7mj4867nvG2+f VYHKQjIWnU2X/WGn+rwStsVYpq7isKbEfxAvop9elmBCnNbh0D5GCnxhrYeFNhltsO wtnIN4GgOAaKVWqOUdH95RsdO0pZyOXDWHr+qi59KxV5AH65jcmnImHGKz/tBgKNuD ILsQF6MvCy6Wg== From: Mark Brown Date: Mon, 08 May 2023 22:50:10 +0900 Subject: [PATCH v2 2/2] arm64/esr: Add decode of ISS2 to data abort reporting MIME-Version: 1.0 Message-Id: <20230417-arm64-iss2-dabt-decode-v2-2-84e1c1463d30@kernel.org> References: <20230417-arm64-iss2-dabt-decode-v2-0-84e1c1463d30@kernel.org> In-Reply-To: <20230417-arm64-iss2-dabt-decode-v2-0-84e1c1463d30@kernel.org> To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=3601; i=broonie@kernel.org; h=from:subject:message-id; bh=C1NR5gSjYzfXv6MI9yvQteCMANA9pEdgisnHmNWgLBM=; b=owGbwMvMwMWocq27KDak/QLjabUkhpSIfyKvp4gwHJu0PuFYo5GdmNj2Wim5lhS7N/bzrfwWc rdJve3sZDRmYWDkYpAVU2RZ+yxjVXq4xNb5j+a/ghnEygQyhYGLUwAm8tSR/Q+39ketmXqR/dGS ifPf5gs3Mtg2LJbOvcDgp7Ws/WGSdfq1iCNxNwMD13J8Xr4z9VCfdG/EFj1e7X88TuHy5aG/eL+ 5Mv/easI3Q/768bhH7D3C719Vx7/afPJgwm7TiSx+/BtXXnkm5V74szwiMH/jmdf19/6r5n18KP Fne1Jp7OeWCUdL7gXs69slWZ+cxHVPLVpwr9jegrcqxyW9P2wJ8g466xt7yqs++KXt4Um3CiwF7 f0eTlsVYS/4UKnaNYn/Lu9qsUTmnnRGl+Ty5QrTtQ/07L9mp+0gtuHA/bRUY5/ddnWHmTymr265 XfX8J8/ONiMdxvXv26cf1HrkYXnNIYj1peDKqgyh+Jk3AQ== X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765336278820300916?= X-GMAIL-MSGID: =?utf-8?q?1765336278820300916?= The architecture has added more information about faults to ISS2 within ESR. Add decode of this to our data abort fault decode to aid diagnostics. Features that are not currently enabled are included here for completeness. Since the architecture specifies the values of bits within ISS2 in terms of ISS2 rather than in terms of the register as a whole we do so for our definitions as well, this makes it easier to review bitfield definitions. Signed-off-by: Mark Brown --- arch/arm64/include/asm/esr.h | 17 +++++++++++++++++ arch/arm64/mm/fault.c | 17 ++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 0bd879007168..988015fd6bdd 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -77,6 +77,9 @@ #define ESR_ELx_IL (UL(1) << ESR_ELx_IL_SHIFT) #define ESR_ELx_ISS_MASK (GENMASK(24, 0)) #define ESR_ELx_ISS(esr) ((esr) & ESR_ELx_ISS_MASK) +#define ESR_ELx_ISS2_SHIFT (32) +#define ESR_ELx_ISS2_MASK (GENMASK_ULL(55, 32)) +#define ESR_ELx_ISS2(esr) (((esr) & ESR_ELx_ISS_MASK) >> ESR_ELx_ISS2_SHIFT) /* ISS field definitions shared by different classes */ #define ESR_ELx_WNR_SHIFT (6) @@ -140,6 +143,20 @@ #define ESR_ELx_CM_SHIFT (8) #define ESR_ELx_CM (UL(1) << ESR_ELx_CM_SHIFT) +/* ISS2 field definitions for Data Aborts */ +#define ESR_ELx_TnD_SHIFT (10) +#define ESR_ELx_TnD (UL(1) << ESR_ELx_TnD_SHIFT) +#define ESR_ELx_TagAccess_SHIFT (9) +#define ESR_ELx_TagAccess (UL(1) << ESR_ELx_TagAccess_SHIFT) +#define ESR_ELx_GCS_SHIFT (8) +#define ESR_ELx_GCS (UL(1) << ESR_ELx_GCS_SHIFT) +#define ESR_ELx_Overlay_SHIFT (6) +#define ESR_ELx_Overlay (UL(1) << ESR_ELx_Overlay_SHIFT) +#define ESR_ELx_DirtyBit_SHIFT (5) +#define ESR_ELx_DirtyBit (UL(1) << ESR_ELx_DirtyBit_SHIFT) +#define ESR_ELx_Xs_SHIFT (0) +#define ESR_ELx_Xs_MASK (GENMASK_ULL(4, 0)) + /* ISS field definitions for exceptions taken in to Hyp */ #define ESR_ELx_CV (UL(1) << 24) #define ESR_ELx_COND_SHIFT (20) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 9e0db5c387e3..6f08fd9686be 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -66,6 +66,8 @@ static inline const struct fault_info *esr_to_debug_fault_info(unsigned long esr static void data_abort_decode(unsigned long esr) { + unsigned long iss2 = ESR_ELx_ISS2(esr); + pr_alert("Data abort info:\n"); if (esr & ESR_ELx_ISV) { @@ -78,12 +80,21 @@ static void data_abort_decode(unsigned long esr) (esr & ESR_ELx_SF) >> ESR_ELx_SF_SHIFT, (esr & ESR_ELx_AR) >> ESR_ELx_AR_SHIFT); } else { - pr_alert(" ISV = 0, ISS = 0x%08lx\n", esr & ESR_ELx_ISS_MASK); + pr_alert(" ISV = 0, ISS = 0x%08lx, ISS2 = 0x%08lx\n", + esr & ESR_ELx_ISS_MASK, iss2); } - pr_alert(" CM = %lu, WnR = %lu\n", + pr_alert(" CM = %lu, WnR = %lu, TnD = %lu, TagAccess = %lu\n", (esr & ESR_ELx_CM) >> ESR_ELx_CM_SHIFT, - (esr & ESR_ELx_WNR) >> ESR_ELx_WNR_SHIFT); + (esr & ESR_ELx_WNR) >> ESR_ELx_WNR_SHIFT, + (iss2 & ESR_ELx_TnD) >> ESR_ELx_TnD_SHIFT, + (iss2 & ESR_ELx_TagAccess) >> ESR_ELx_TagAccess_SHIFT); + + pr_alert(" GCS = %ld, Overlay = %lu, DirtyBit = %lu, Xs = %llu\n", + (iss2 & ESR_ELx_GCS) >> ESR_ELx_GCS_SHIFT, + (iss2 & ESR_ELx_Overlay) >> ESR_ELx_Overlay_SHIFT, + (iss2 & ESR_ELx_DirtyBit) >> ESR_ELx_DirtyBit_SHIFT, + (iss2 & ESR_ELx_Xs_MASK) >> ESR_ELx_Xs_SHIFT); } static void mem_abort_decode(unsigned long esr)