From patchwork Sun Apr 24 01:33:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sherry Sun X-Patchwork-Id: 12824722 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9DB2DC433F5 for ; Sun, 24 Apr 2022 01:36:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ziWbaEW09wa0YoUcBnX0vfSJZWsUoFIJJ2nxTf677Hk=; b=r285+LwJIGtbBr qw4e9NaH2+VSR5KFsSw719fb5vQw/Nbtnzj3X3VvifF3fbQeWab4/yT2RkzLF1rkOQz/scenK26cm XAIyRGfBMmqTGi6O9mjd9fyAYrSdtDmn+t0ST4U/yF6ka+Hop83hfQ5oEhny9jirgbBon5zZaG+YH 3um0NPQqZOKZ7WWVciQm8JlcR8/cFZJW6D4wHtW/fv2qBKQlPZik9NOHMBlWGUm6JvYfnwamnFj9G QSsjaX9vdM0anbe4xaXYhO+i8EYygQytLTdFPDeavMwm/P0OcowmK/8rZjd8jl0lUkH/jfb1SyJLQ l5oTje/VxPTmnBytLtZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1niR9N-005UO7-6G; Sun, 24 Apr 2022 01:34:57 +0000 Received: from mail-db8eur05on20623.outbound.protection.outlook.com ([2a01:111:f400:7e1a::623] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1niR9B-005UJg-R0 for linux-arm-kernel@lists.infradead.org; Sun, 24 Apr 2022 01:34:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OrKUu9/ag+yVPPB6YE2d3eFYO65lknvh7woE7+dmPSN6ECyCYVa5fp4mdEZADqo6yOeByaEcVDHTS8b9+0ZpxrmxIuOAe/LxrN6HP9H36x54myyfnpkzg/rsKV67FTWBcKerb24fNl7Xi45pKve/OkN1qeQ2udPC9w40IRYkwKmYakolN/JzOTHJTITI0YcG9WCGJ0MEnAXNu+fmeqeCl5qZRxzcMdjzGLRK/xS0+9VzPeAsdYBIXvfZtoW968XsAI8pf7u/wDScZg6OqBoyb+xo6ouhE0C6RUJWCaAic/GirQtFkFrRLODbZIDTNPgPzEEg68EVt9njZ/5odNOUfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Yy8B46l+aytgc9jY+0qtSLnbsu4WgPkiFuc6kdAEj1Q=; b=HM+EzVnNY1EPUr3j6FGXtwSMyvnpGUpFWhpO9XhIeYUjqE2s/x8vmN1vjYfOltUaNxnld8GOoNWz+eDLj3KsdgzZLlm8d3byx6+BNnYdOYUPFoFKBuO94uzCx5fh3Sc+SSvY6nBXnKGA4eX4kH/bnvusiJDyiGMm+hBG+yh17GrTtBs+IhVl9RmTKlpv/tpGKezYc+xw0HYgUU2nrD5hBOGrnmq/eMW/DZLEbOoiySDr7ywcQ37zgajD8M1PpOX4v8vu7uOyzmyWha9kLgNwzv0zM10QOVn1tj5sWHYSI38e28O30k3VHTSOWrmg0GowsyAagfCYA4N68szghl0cFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yy8B46l+aytgc9jY+0qtSLnbsu4WgPkiFuc6kdAEj1Q=; b=b3ySHB+qPWpSfAR6TY101AMi8gmKMiDK3BRMHt2f2X8OlqAfHux9jRazPK+AAOai/7dTknokReJnqcaf3H3P7q7GZjygCkwIYChpjMlTxyuK2eO5RGA5WURPIXAqD4QNKUtT/m5/ESE6GbRyBGYnbf95RyC3aZNMJMQx4nvcvyk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) by AM9PR04MB8179.eurprd04.prod.outlook.com (2603:10a6:20b:3ec::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.20; Sun, 24 Apr 2022 01:34:42 +0000 Received: from AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::1cff:564b:c3cf:46e6]) by AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::1cff:564b:c3cf:46e6%5]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 01:34:42 +0000 From: Sherry Sun To: michal.simek@xilinx.com, bp@alien8.de, Shubhrajyoti.datta@xilinx.com, mchehab@kernel.org, tony.luck@intel.com, james.morse@arm.com, rric@kernel.org Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com Subject: [PATCH V3 1/2] EDAC/synopsys: Disable the error interrupt on Synopsys EDAC v3.x hardware Date: Sun, 24 Apr 2022 09:33:44 +0800 Message-Id: <20220424013345.7359-2-sherry.sun@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220424013345.7359-1-sherry.sun@nxp.com> References: <20220424013345.7359-1-sherry.sun@nxp.com> X-ClientProxiedBy: SG2PR03CA0121.apcprd03.prod.outlook.com (2603:1096:4:91::25) To AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e631497-f24e-4cef-96b3-08da25929b04 X-MS-TrafficTypeDiagnostic: AM9PR04MB8179:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LT6YTOefKOsT+mNSM9Mni5ISicL37TGmYEy8SCYfGNkLgmE+qFmos49j6BT1lSszM2HpOvQU7lFMOTfIghMlvPqouvWuslT+9y/0GH4I5pTAar205gYd/oSCtc15Pn1lxqU+RBRGVvr4L1/jPRcgChwXGReCkAl6lzHTMANIT08ky0EqjKmCBjpQH/fnJsCG2373RyhNyG0GUqAk/RpUkOIKHCgsMoDy7aSiTAD2DZtAcSa5xbLhSm4FeNfA2nOfQrSUz/qUlgKGz9wv1r4TvIJrBKiUtn0d5Wxs4HB/46d40Cl5zglXa3rEnCjA4GyWL2jVmseBPO8Ij2AVtmowVNp6QzOQZADN7iVtRv1mMN/OjjWxYgY6qhIr7Xv0UnWP3cueS88CYBPLCXdr4mxMLDmwy71WMGEh5WQLLpOp1R3dBG6sHaCG7eORtxhHa6xVbENt9L0ZswgEi+KL7kczB2NUAu349RnLin08MKSxWi9xa+yqF9F0MABNbbUVY+y55x+igFZhfIQM8GH7ScNEXCOZRJnOzSP+ImQQX8AhP0wFYV5xyuyzKf/Yy66PmfTVnKhUWl+1/wj9V/9wCvU5BugJmxicpLTjV0lsE7IqiaQxG2cclJwm9P7Vsfn5jhCltSmljTFwN4C0qDq7Mojqu1KFMbIcBmsvlDhXyCPX1nNIO9+bA20q1uN9fyAJlnx/kHlITtntyBkn9tnb14Ks4Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8404.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(38100700002)(5660300002)(8936002)(7416002)(6486002)(508600001)(66556008)(316002)(8676002)(4326008)(66476007)(66946007)(26005)(186003)(83380400001)(2906002)(1076003)(2616005)(52116002)(44832011)(6506007)(86362001)(6512007)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: buzTfRMP4MfV0S5oXLzkyLVzmWRJmXz7PXr6MTM5Dww/s5mdCcwj/R2STYVMbjDgHvnNSx8w2iNDZCSFIX9FYBW4Ys27dP0Uy2wUfRWjqAQEGCGMbXPua/hNWiAgoDQoyuIjpv1WkxnPv+BxD8Yab2xiGJofCiobInY/MWY+6dvjLOkBAbq7OA0/8iYtGrROySfOT7yPNF+3IgWhNAIjMXoHw/O7F9w+mF3aNkLXnFmddRjKSnUEFvSgMImU5Rp6gK0Rn9eStjr6f9u5GrKALE6awMFmqVO6WVV7d+ypVoMNbk+RqGLSNCBA0+3D65O642Tq1QqD+69APbxzZvKZQRRvScqBjEA9eyO2Y5nqV5xq5N/hXCloyupLAZxW86jqQTdE9Fs3vKV7I6FudAZOQzoK8JA4dJZbZ1Om/+FPInzIsmb/GOYJlF+HOj1bx3Wobk/ujk+Im4Zsjc+WmZh4T23yP2ns2igBm2ygRfazICuLzIXsI+uhfDUpQFTH5YKqHt0LoBqzaMi26S+sdGlBtWGyhFzVPGM2AGURCUE5wu965HtyOwhwFSpuqX7U0MygeUbNfyGhvf1ZdG196K0HUVGZkxscXoVis20nXmsUJHT0HavpxfcUG9ZD1a6vACS/kjIZzcCpmnI7Nw4rXPA3BavZszrVU+Ks36i0RoRrVsiZvDajGNDQkx5vNcK5ora4ic+M7VAPm0icbggF2bBERD5jC/Qy0wfjA79I1V9X9EJd0bJgu2W6oPTWxQD4X8Ybg8Zfn1xWc2NyeYecVEjB/pw+6i+06HyqV1FKuInxdXuVimF9MfCsKgfl93zvpOqNgkoXHy5+6jWsPV9KKmMsjgwgOqvVlJm8Hm3ihheE8ctZuCnYPxxyRr15nX28HXszEJ7OROemwPf2f9ScPPZkO/Y0dhijje98fi8hvPfuqMEoQiz1Y1phKgOy5oH1Q0S71lzDExnHMQgd98McAJojuPXlGejoyDTH2pJnn5MJsIUEqlyYYhWxInmro7EC6LlvZ41DSYxQYwbmTHugVDJZOpEAsaqS5WOnc7qtGPN8tJkUD9tdJ65NxulCLvHmSW6KAgVePxDtgY1f3mawmeem7481xISPvJO94lm177tviP4q12LZGm4/anW9uIOKBOIWgWu/sP33wyglhNw+YhrBz6KYDAZcKn4vCP9o8zMrJp7N14pYLePmnzBvRF7WSK086mc+cOB4OUIHVgxpqmms+l5Ax8ErfHCV5V2t2k1jc/riX7lXvcOLs4tvnndz6qgOO8l7sr1aaLYAYITxrvJrXU0a7oQpMpM6t/pl7mWrga9rpwyhi8gz4poIZyxe9ru0FyAVXKAxs0lYW1VCM6Qu9M5JtcHa50t/f6kiZPofI9IRPgcodXdFNyckZ8rmPkWlvtxd/szfYLfbdYaBFvM5NYepEkLPTLPj/3iVNwHDT7b0CyUybkrrCVUPTGqN5XCnlzl5Jjvutm3wx/K5hcm5lRSLA1vG4sTnDoSNffnOXNRT+sYOvywa9NK5R+y6Okbb3xIe5ZRoM2QNcu2pOKCcOMSPe91O5RYo5uc1N1sGF/6WBYAckNLD8UJwdj7SllkThVrdp6TEn5Ackg/0VowDGv3OtpBCI+hCJzr07DaRtp/AiEwmpcQuKI1Cg63eWyy8IfMePs1cN6ecPWl8OWEpCB5lvGVWwPly/e2ApR/h9AH/VtGWhkBn3CfQzXsIFR4U/We9D7eawlNKXl+47Q+xTQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e631497-f24e-4cef-96b3-08da25929b04 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 01:34:42.6786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZVS9M3VGe/Bfepkj+TOGpQQRrChKyX5I7qZOjTGxHpyGMotm2zxJ1f5DDkQgQQrFkbGh+IhV0bYjYDzHetKMSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8179 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220423_183445_894193_97FFE6D0 X-CRM114-Status: GOOD ( 11.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org v3.x Synopsys EDAC DDR doesn't have the QOS Interrupt register, change to use the ECC Clear Register to disable the error interrupts. Signed-off-by: Sherry Sun Reviewed-by: Shubhrajyoti Datta Acked-by: Michal Simek --- Changes in V3: 1. Improve the patch title and commit message as Borislav suggested. --- drivers/edac/synopsys_edac.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index 40b1abeca856..88a481043d4c 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -865,8 +865,11 @@ static void enable_intr(struct synps_edac_priv *priv) static void disable_intr(struct synps_edac_priv *priv) { /* Disable UE/CE Interrupts */ - writel(DDR_QOSUE_MASK | DDR_QOSCE_MASK, - priv->baseaddr + DDR_QOS_IRQ_DB_OFST); + if (priv->p_data->quirks & DDR_ECC_INTR_SELF_CLEAR) + writel(0x0, priv->baseaddr + ECC_CLR_OFST); + else + writel(DDR_QOSUE_MASK | DDR_QOSCE_MASK, + priv->baseaddr + DDR_QOS_IRQ_DB_OFST); } static int setup_irq(struct mem_ctl_info *mci, From patchwork Sun Apr 24 01:33:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sherry Sun X-Patchwork-Id: 12824724 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 860E7C433F5 for ; Sun, 24 Apr 2022 01:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vn4HHnDfou0BQCYA3dahxIRCfpkYC+9/Brs6NSQRKVY=; b=YBWxN0ebfTxB8N ZVoybRESYTHJfOgjoYi2KL8egz71nmN3AwZkPMGgmGFUu+pMqGjeMDqd7xMakUHjMTIiddVWr5YU7 LTNWUvnDMifNWxEUiBA1K/NSIwZ2inDmABJpDLk/Imfdy1Wp47jAf+G7ODtPRIibDorxBA31w0VCX Jfe60Z5yaxeMWEhD8NPVlPjeBpiOSVUOzpj+CNniQItYnx5LgBR/2hdxs00zyAXSiVZjTFI79OsP2 zF8Bu2ZjTejjKw4bLVh//JXJ1dC/KYYvHHrWK48V9nmP8ksNMnmyXNaWw1oyXcHhUy0lh675McMHS jOJEzCSFRZJTPecDwTdQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1niR9W-005UPt-EK; Sun, 24 Apr 2022 01:35:06 +0000 Received: from mail-db8eur05on20606.outbound.protection.outlook.com ([2a01:111:f400:7e1a::606] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1niR9G-005UKy-Ob for linux-arm-kernel@lists.infradead.org; Sun, 24 Apr 2022 01:34:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QwfGDj6GNjU9zqATBF/d/vVrUFIIXlB0nfOEgtX2sKSKvLDXZ0j2vkF+iDCZBIwwnFwLg2k+hZ1s50lX+7epalCMpiY+4ZwF2q+5mrsKM+hikdjtbngjAgU/lE+5cVXqlnJyUY8bEEmgmZyjrPyw/iY8O2+Vid1wQf5pigqjm7/1Z0Y8YydSKTzlWr6wKDo+0egn/WipGK+JEdYGbX5ti1iy40q8faJhnIIproBMkna6uNv7zupX+pZ8hNQH6Nz+VMDAtHqavnLSl4/+9GkNgh1s3QprieBkPaeO+ch7HGWLUjAdiEj05fh7zRbFLQ+Soj2Ictn3lWARAK2fBWTiMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GBHGuiW5vKz2K5ENMsre4dcfvp6lcl/u03OSfuPSQtg=; b=lKmNUlLRYoYDWzKuOJ8vvlMQNFNnBsNJHk9ert3aS8vWZPU6JWjrYHIkQE74RpP5QNllMRA6+u/BfGNX2tc2gFDpUx/Cytk1G8BGJWthpa2LsBJOUeXFRNqlfqI2PpTBA7KTJrcWoAOeNgysshGlhbD5DVILXWxg9n+PPf+Kw9zdqfRhulqVP+oNKxDDI512LxUpeSK2JE5hHd6VGO4SFWTrzMaVHnoGkpWIJEB3+DfbsILo6NRovPjqayUBT/dST0H6eJvFBjd4QUF0vQlvXrNP2NfkjRyuR4HA7EDa5L0SLAeo0no75yzRxLNTc2iZv4RuKE/cBH2HTycYNIhdpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GBHGuiW5vKz2K5ENMsre4dcfvp6lcl/u03OSfuPSQtg=; b=VgzDz8kR9aqr+rUNXn+2xO8/ZBDHquO/wYlI2jTuasi7StEzPhBU6sV9aTFQPUtRyA35M8YYiA6kjcbbp53rQwT144l+2wWYAVJn+lPbsMyvbzK1RBDi+3TV/kCorht6eTPE2bqx0g4ASC8DV0urCLCGzUUgsroQjX12Ks7HJfo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) by AM9PR04MB8179.eurprd04.prod.outlook.com (2603:10a6:20b:3ec::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.20; Sun, 24 Apr 2022 01:34:47 +0000 Received: from AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::1cff:564b:c3cf:46e6]) by AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::1cff:564b:c3cf:46e6%5]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 01:34:47 +0000 From: Sherry Sun To: michal.simek@xilinx.com, bp@alien8.de, Shubhrajyoti.datta@xilinx.com, mchehab@kernel.org, tony.luck@intel.com, james.morse@arm.com, rric@kernel.org Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com Subject: [PATCH V3 2/2] EDAC/synopsys: Re-enable the interrupts in intr_handler for v3.x Synopsys EDAC DDR Date: Sun, 24 Apr 2022 09:33:45 +0800 Message-Id: <20220424013345.7359-3-sherry.sun@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220424013345.7359-1-sherry.sun@nxp.com> References: <20220424013345.7359-1-sherry.sun@nxp.com> X-ClientProxiedBy: SG2PR03CA0121.apcprd03.prod.outlook.com (2603:1096:4:91::25) To AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95dac565-f69e-49fc-9ffc-08da25929dec X-MS-TrafficTypeDiagnostic: AM9PR04MB8179:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PZ9IslbNCtHp9pqdJEsoY4BLK4X78jHxk/pqg2Yx0nUZf2K3FY8Jn6Dtr/v3X9En5s/kQY1UGr1lkNKCqikGwqXxl8OElMfLHmiIrs45pH87rinKd/uve1EcruO+yjoo6mA8DOYF00JiMFmwq7cNm4O6upJGiqgJaTzYtaSsjw2pVpls+lv5tYQf+cxsiBuYfeUlWDAzshxuFcXIS/tkdXBwfj2XyOhdMG0Hp+teSn8LyxiEM20WFk3kgr+0pKu2EceFIdSTWG9sRCcyFaFh/aJvv6XKXT2M0n7z9CauUlhp2POFE3iS3lkc/b2mx2vTwElx694KMP4qyTrJ+Cxtjd2yu1j2oZCKrGPrX5XdE9DunBBVz7aumY3Xc8ZWfYnOcqpJWjoBFy2qSIf0GHMEyuPH4eOxX2jZBTnMo0ktSImBTvKXTL6dSeEEOFAO+ZMdGyzzit941+49NHEjxboUa2ZkEloeHXInmTzmYyDCSY/M4u4izhexXyOIjSLUul1FKOyc8g2q6lIGAH468x6JYOw4haATK5hTdUFYTEY1gwre7RpicNE5kKCVcit87xNQYpebDzcTatRgE5WmqM015gwl4Bc1Y2wgVvVGIFLLpSL0ksgafZtoW7A6B5/Oi1ZF16BH6Jzn5kwJdu98Z0KJ+ph7DA46ViixkHbSNxNoD0YYO1f71vVhaqWIFc2xirfBAt6bKxD6YCh+rQLyOVuWAg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8404.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(38100700002)(5660300002)(8936002)(7416002)(6486002)(508600001)(66556008)(316002)(8676002)(4326008)(66476007)(66946007)(26005)(186003)(83380400001)(2906002)(1076003)(2616005)(52116002)(44832011)(6506007)(86362001)(6512007)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qi3bYsAaaQP+Yk8Dz+pSalSqnd/ej4aySd4c0ptN38IOMezrEx70Li4GN5mMn+dIqKbEsMo3yneFZofQeW0vMLUxYszCsuR1dkVk2VuNuY5gT9Zbs8pMsl2yhsSmQWy6nMi5AeQK9dM/WLAXfogr+d6+4s9wJN2es4o00IQSRSU5sg67wydUfGX62c7SNT1X0J09bWv+QRIfnMh9KsmWm3LMkvMJSNujFOL1Z8UbiF8CyoL5jPJ/KgrQJWKcdf4bE9M0Ac0t3PXg1BK02I0bRJVyFoZZx4ZKiLc7+O/Vj0b98mfcxNau7y/HLbRbtscWSuSSoQuw8ZGVrPzuJ0WlI0M8OaKDAuJMs/mhu9j+Ko/dz6BfcwJCBeFfOix4wBbPv1RQ7g8s0nS576R8HT/GMMIx8Tzy3FZVR70WoauQNVAHrnZVPjdCyMDBjf/FNzYW42pD2xBSMxNFzRtsF3tMMA8bWXX3pT8gTNWKQ9JtLxl8Yw7CngGNR1QPiRzhbwqQxSlXxR3L3kPd52BqIzoZR62yEW75qXja9lAjrV5lbciogQavemR49f+BCGtqr6IWn/PCNrxrp6vGe7sD7cnvxrU9g+m91yZSRMIKPpYHxEbEndUlp8H2/S83p54ChNGEX3gCqspSvWanWPi5D/+wKB79AB8Zr7YNiP0Iq5Tin4RNIqiL/Yp67B8aTkGSrlW4c4waXxJqbgVsEiRVFazzNRdaZvJsJDOwgc2qEyq2acmz/TnrSzZj3TcZ8vsaZmArU+Gsf0AxYhLb9FAx9YtQp4aFs9NNT8kLmuw7F4L1osYnETgmdJR9m82tIQZnuw0mtXG6fdJJEJ4ypWUqF8teDPYJ4tM1MApaJWSRAyK2+H8Q4ZazqAZLgfhEqxET3SyC6oopeLld0dmT2Eg+SkG0S1+78+MXDn35kdYRm/iVMj5aWczXLcfYJIq9ZRsl+JmrSwdijL0236WaG0LbGIKxcjdlQ9hrocGR5LPGvZ6X3X8wOwpKWbDTr3KgCsIZpYNes9vaxA0LnLCgezYvR05agGu4D3wLgdQZIYjMAKeQdBZkThylha2dVLQt+wTqG0821i4NrKTC4E+oNzRFPyEx1r4bcl94T1uctx6dRSKwCJMf23FBML9uUy0LaEOPy1fH19VjgbvJD5bQviCBDJLAzo+T7tVbbI+9W1VRsLPGOG5b2yA6TzVt+Bi68pytjVuu3suv9l+lpWx6lE9phHwDdvCEYgfHVu4qVVDrE3o10NPYTPLkbpf1PBVCTzgNosvKcuJRsvxhgq8G+qYPxVvcQ0pvDdjlbFeYvqfiv/9bKxzXmb8OincwvFGImZ8YObNGFguLwKmjgh0qdrjUcul0EcMHvRfAxoN+NiJr7g0VLMRM5yKFVeyqlQ/KMlnFnvXf39cnDXgwIFtYDW5z2Zm2/mTx/2DXT1S8+0JV+UUQgGQKbNJngwQD6kJJQFgZCa3b6XvSsEM2J0RiZS0vENcZTBksbOsHJPfon5DIGvVjM4rKB/OpGAXgZPU4GRNqIn6AZTsjINopREpQhggAnZftdiOPBjV2oEsgFR16puNEUVPicnWkl9SECVn+mZfQcE/YmXwyfhmdprSlwDyddpAsWUrQk0u+zEiDKMPQFRm4YuzTRuRq3uJ9XkdVRQEREZu750Nlsa3Ff0jxOINvifyi5vpKEUa5pxufKY47N0qFXlHas9EQ5EQBbtz3R567BTAcORyKjlw5WR4478fMQIXqAw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95dac565-f69e-49fc-9ffc-08da25929dec X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 01:34:47.3360 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wetpHt+Z+npMFZRxE6s5bgoJyT56UeJH/yq8iORP2TUlBmJGyJpHCl0xla9eIg4oP9Wvk2wIXx5IHurThScEnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8179 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220423_183450_876553_38FA6FAA X-CRM114-Status: GOOD ( 14.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org zynqmp_get_error_info() writes 0 to the ECC_CLR_OFST register after an interrupt for a {un-,}correctable error is raised, which disables the error interrupts, then the interrupt handler will be called only once. Therefore, re-enable the error interrupt line at the end of intr_handler for v3.x Synopsys EDAC DDR. Signed-off-by: Sherry Sun Reviewed-by: Shubhrajyoti Datta Acked-by: Michal Simek --- Changes in V3: 1. Improve the patch title and commit message as Borislav suggested. 2. Simply move {enable,disable}_intr() upwards instead of the enable_intr() forward declaration. --- drivers/edac/synopsys_edac.c | 47 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index 88a481043d4c..a14baeca6400 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -527,6 +527,28 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p) memset(p, 0, sizeof(*p)); } +static void enable_intr(struct synps_edac_priv *priv) +{ + /* Enable UE/CE Interrupts */ + if (priv->p_data->quirks & DDR_ECC_INTR_SELF_CLEAR) + writel(DDR_UE_MASK | DDR_CE_MASK, + priv->baseaddr + ECC_CLR_OFST); + else + writel(DDR_QOSUE_MASK | DDR_QOSCE_MASK, + priv->baseaddr + DDR_QOS_IRQ_EN_OFST); + +} + +static void disable_intr(struct synps_edac_priv *priv) +{ + /* Disable UE/CE Interrupts */ + if (priv->p_data->quirks & DDR_ECC_INTR_SELF_CLEAR) + writel(0x0, priv->baseaddr + ECC_CLR_OFST); + else + writel(DDR_QOSUE_MASK | DDR_QOSCE_MASK, + priv->baseaddr + DDR_QOS_IRQ_DB_OFST); +} + /** * intr_handler - Interrupt Handler for ECC interrupts. * @irq: IRQ number. @@ -568,6 +590,9 @@ static irqreturn_t intr_handler(int irq, void *dev_id) /* v3.0 of the controller does not have this register */ if (!(priv->p_data->quirks & DDR_ECC_INTR_SELF_CLEAR)) writel(regval, priv->baseaddr + DDR_QOS_IRQ_STAT_OFST); + else + enable_intr(priv); + return IRQ_HANDLED; } @@ -850,28 +875,6 @@ static void mc_init(struct mem_ctl_info *mci, struct platform_device *pdev) init_csrows(mci); } -static void enable_intr(struct synps_edac_priv *priv) -{ - /* Enable UE/CE Interrupts */ - if (priv->p_data->quirks & DDR_ECC_INTR_SELF_CLEAR) - writel(DDR_UE_MASK | DDR_CE_MASK, - priv->baseaddr + ECC_CLR_OFST); - else - writel(DDR_QOSUE_MASK | DDR_QOSCE_MASK, - priv->baseaddr + DDR_QOS_IRQ_EN_OFST); - -} - -static void disable_intr(struct synps_edac_priv *priv) -{ - /* Disable UE/CE Interrupts */ - if (priv->p_data->quirks & DDR_ECC_INTR_SELF_CLEAR) - writel(0x0, priv->baseaddr + ECC_CLR_OFST); - else - writel(DDR_QOSUE_MASK | DDR_QOSCE_MASK, - priv->baseaddr + DDR_QOS_IRQ_DB_OFST); -} - static int setup_irq(struct mem_ctl_info *mci, struct platform_device *pdev) {