From patchwork Thu Dec 10 10:28:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shah X-Patchwork-Id: 11964123 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=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, 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 3866AC4361B for ; Thu, 10 Dec 2020 10:28:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C547123AC4 for ; Thu, 10 Dec 2020 10:28:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C547123AC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=em7PHa0HsbKzLTvAUSuPEbrFuro/TgWb/p4LXZ/MfLI=; b=tXRNDPrvF6bIEfETYE7gS8mrA bXxkqzIZgfWvIKrRb8OMwkxaqpRBEN1lSEFZJacRo70Q1EtxbMD8VKIou6ZUbFI6euLOIe3eUGJlM +Jvgu5tDMqFgA2acxQ6Axf1D6W4pCZPUCcobYF9jj+Nrbuh2n8+h7lyPrXJ3J6WykZK6d5/jCa6gH 5fcUledlJaehYH+PtvLAM9xTHD+tNS761dK5z3ESaGXIILqyZrxwYRNF+18EwsG4UeXSfx43VVfCR XAhhyfLbS09lmA9mxqjkINftzcZ81W0A+6jOqU2GkZU/y9xTtmgoEO4FctJAOmmV2QyGBOO35i/zP ylQTfKiRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knJBV-0006W2-13; Thu, 10 Dec 2020 10:28:29 +0000 Received: from mail-dm6nam12on2052.outbound.protection.outlook.com ([40.107.243.52] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knJBS-0006Uz-V9 for linux-riscv@lists.infradead.org; Thu, 10 Dec 2020 10:28:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zu7Yl6VZJ4dlFG/5luwVXBpxfbcBZZ/jvJJA+Yqy3SyvSJu9hYuHW3gCMeCmloKodOG0cnWQ4aw+i30zZo/TzY4L8qhS6eifgjI5HDqbHf4j/+Fu1lOoFFqlfwycWnMmZ4iLCa1E0RJTuauvcgXkvRuJvsdfv18tQ808gEiX6kJRYYwdzB2j66rBA2f4Fk1ox12laIt1UEfe34WXkkbHoTc0TffN+xQYvHW29Y00iLxEkb7wul6SqLfpL2YX/9QbZwb4UBS3k8XoDf5fEA6H9dXb6AFc2RKtoh3TBpc6xYJjPfi4C8BwXgJuL9q1UUacEOL5sdla4qoZi+GiAHIdhA== 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-SenderADCheck; bh=jmb1CK5yjZ6yBw7ppx6+BtA+rT5yi5GNp2Pp+1yA93M=; b=SU9vwiqpuzjgPYx3b3iv1S+AJb3YNDP9bb+ATQhkTpbJfU3mq7CxTDrih5bpplFAnZYOMc/JmbRxjuIP4j1adBB3f5S4H9iut2ACWA5uIKOsRTBrbhGXcscx58Lu/RBI5m1GR5qMHFuHJ6YjzpoVJ2jFnJjBpL1m1VQ8KqoMXmGV7sVsXz5DNWRzcDM+igNb+im/bRVmqPIptHiFXGpxZOCv8IlW51wDeP9ko0W4TxFCMFRmLz53E36KgUBA5D5c/dMMdgdn2deipwPSNKL8rGkbUHP1TLR62FO1GVcF6I977rFYIUBsCkzZ9NE3a+Ft9fr7P0Z/H69w2Jq6fmt7Hg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=openfive.com; dmarc=pass action=none header.from=sifive.com; dkim=pass header.d=sifive.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jmb1CK5yjZ6yBw7ppx6+BtA+rT5yi5GNp2Pp+1yA93M=; b=tG0bap1M7DF/BB0WYdHA1b6c45NsBxTtFM5jT7PfmeLUeZS1VzDv700R13D2lwTZRsrYrpMKBmm5nhu01/b+0uILVVkD52X35JHisixxjCBMwEgUWGSl4OastOBW3R8BV68XeE67m+iaD1v0pySlUTs23yVZdS4WE4HxJDeLGhA= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=sifive.com; Received: from BY5PR13MB4453.namprd13.prod.outlook.com (2603:10b6:a03:1d1::19) by BYAPR13MB2838.namprd13.prod.outlook.com (2603:10b6:a03:fe::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.11; Thu, 10 Dec 2020 10:28:25 +0000 Received: from BY5PR13MB4453.namprd13.prod.outlook.com ([fe80::7c13:1ac6:9f2a:5eae]) by BY5PR13MB4453.namprd13.prod.outlook.com ([fe80::7c13:1ac6:9f2a:5eae%8]) with mapi id 15.20.3654.015; Thu, 10 Dec 2020 10:28:25 +0000 From: Yash Shah To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH v3 1/2] dt-bindings: riscv: Update l2 cache DT documentation to add support for SiFive FU740 Date: Thu, 10 Dec 2020 15:58:02 +0530 Message-Id: <1607596083-81480-2-git-send-email-yash.shah@sifive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1607596083-81480-1-git-send-email-yash.shah@sifive.com> References: <1607596083-81480-1-git-send-email-yash.shah@sifive.com> X-Originating-IP: [159.117.144.156] X-ClientProxiedBy: CH0PR13CA0015.namprd13.prod.outlook.com (2603:10b6:610:b1::20) To BY5PR13MB4453.namprd13.prod.outlook.com (2603:10b6:a03:1d1::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from osubuntu003.open-silicon.com (159.117.144.156) by CH0PR13CA0015.namprd13.prod.outlook.com (2603:10b6:610:b1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.9 via Frontend Transport; Thu, 10 Dec 2020 10:28:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 925f851d-2c38-4538-980b-08d89cf65384 X-MS-TrafficTypeDiagnostic: BYAPR13MB2838: X-LD-Processed: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /uYoiUqXVMJvWmLotejBADglIU9xR1ODzmoYeKMI90Ub4a0KD0yrukG2w30lyunHr/4xV20wMAxhZQ9fLNJ4c2mwTusReH816RrxcTzkXa4g14+qq0hCwxmw6LIgkCSmcjmSZ51w8CmpYpM0fMio8RG8P8n371WB6V5QucMdJrIkKXDuGQ5XGEGmkOfBub4TVxG0EhTfs6Z31B/eFEmwtUmk5DqOhZS4i6rhe95sBrZ96DUSXhowTUIBEcS69pjLc8LK0mRBpo4vYGs+B+ku1PU17YncxmS7/a9Cn6hhvXrIqE4Vig+kHo4uqD1Y6lD6fn63A6p3r3295dvaRZts3g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR13MB4453.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(6029001)(376002)(366004)(136003)(346002)(15650500001)(7416002)(508600001)(26005)(8676002)(36756003)(4326008)(956004)(66476007)(2616005)(42882007)(66556008)(107886003)(44832011)(8936002)(16526019)(186003)(66946007)(83170400001)(83380400001)(6486002)(52116002)(2906002)(6666004)(5660300002)(6506007)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: erTnY11vkoiMQLDllQ+X+iIjBx4BgS5gliab3iDGQqIRnByOm4m6ek1Xa4YMAOl4bHn6bq2eryZaN/1Fv7m+SbaAhXDRas8WEHqATGMqtRNyfN4LbSu6t4AN2pKK2RfogXa6L4ICG85khPBAMcpjkIROg7x8sEFIGSys/3ctZrTr184A/9dzTfN5zHQ0vMKziqKXfoxQIXTXbGOj70QcFnY1vUGpK1Dhq5FNpAhqcTBWis/3H9Do5Sj7KqqfJMPWvLzu6GZph4ibSK0+tdYfnFjlunFIgbwReBTach0Ei/G3ajV5ZOYTMEy2BJsplRP/9g71bRtr+UHunqvk/uwf/zVBmw5piJ0YKICqp2OGxA1BMdQtmC1Juby/F43qaH1XeYxtDvkZ4v9+VfYGplzx1pPVcP7o+MTPPVqdrD5ls1jM7LZ06+YuplTViozAAHq9EwuzxUUKbi90IEBCrdUcMFbgjyZ1S8z95SqkkVZN4uSVJiW1TT7fqARsaE/MQxjnpAAEy8nFTMvC87BKdMMxZZFGyV9xUomK+RHzm2nxfeesaisJ+E0csctu6hTRD0g/gT9+LqbIZmU9zukYu2Xw0W4G+jzsAP/2msPOulfY3Dyl8TCJJih+X7Ntdg7LOcE8TdbjdUU8Zd/LycwNYBVjLqY4EqNaDd3aZqFit66MSDcFUN8JIjhPduoD4noqbmpXiugb4Y4dUhuNR//hneD2lnz+OlbbjXehbn23FfBEn/CzXEpEhzy6MF/lsIDEJlemfDLGJ/vW0ycN/0yIwilLbSqcSE+yMGhxZjgvHXiept3wkGhaf1HPBHGPMAUGInQkHlBNud9nL9o1hV0ZC/m3p9nf5FZ/tGmiBJ9VXqK3A4fI+X5P+taQEh87qkgF0Xdtdi1XMQ7NPYnKSy7ke5wH8u90qRwCHCXQRhxRVGJNS7TUSc3555ZgIAWFqXy/hFGUeucciTw6vRpvbpZrYb+BR2Fnsgz3U5IFuxzg08L2bHcp5abVJqUvkoCD+mfSjxZg X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-AuthSource: BY5PR13MB4453.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2020 10:28:24.9155 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1 X-MS-Exchange-CrossTenant-Network-Message-Id: 925f851d-2c38-4538-980b-08d89cf65384 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BDXAmXcfqOhYc80BLeKJsDBHu4a0wl1vCs+MoMXqQTH7u14ZQJOaisyLM1J7KBya2T8Sbl0NDqc0I60mXPqi0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR13MB2838 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201210_052827_199190_C6388053 X-CRM114-Status: GOOD ( 10.42 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aou@eecs.berkeley.edu, anup@brainfault.org, paul.walmsley@sifive.com, wsa@kernel.org, sachin.ghadi@sifive.com, Yash Shah , robh+dt@kernel.org, palmer@dabbelt.com, sagar.kadam@sifive.com, Jonathan.Cameron@huawei.com, bp@suse.de, sam@ravnborg.org Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The L2 cache controller in SiFive FU740 has 4 ECC interrupt sources as compared to 3 in FU540. Update the DT documentation accordingly with "compatible" and "interrupt" property changes. Signed-off-by: Yash Shah Reviewed-by: Palmer Dabbelt Acked-by: Palmer Dabbelt Reviewed-by: Rob Herring --- .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 34 +++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml index efc0198..6a576dc 100644 --- a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml +++ b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml @@ -27,6 +27,7 @@ select: items: - enum: - sifive,fu540-c000-ccache + - sifive,fu740-c000-ccache required: - compatible @@ -34,7 +35,9 @@ select: properties: compatible: items: - - const: sifive,fu540-c000-ccache + - enum: + - sifive,fu540-c000-ccache + - sifive,fu740-c000-ccache - const: cache cache-block-size: @@ -52,10 +55,13 @@ properties: cache-unified: true interrupts: - description: | - Must contain entries for DirError, DataError and DataFail signals. minItems: 3 - maxItems: 3 + maxItems: 4 + items: + - description: DirError interrupt + - description: DataError interrupt + - description: DataFail interrupt + - description: DirFail interrupt reg: maxItems: 1 @@ -67,6 +73,26 @@ properties: The reference to the reserved-memory for the L2 Loosely Integrated Memory region. The reserved memory node should be defined as per the bindings in reserved-memory.txt. +if: + properties: + compatible: + contains: + const: sifive,fu540-c000-ccache + +then: + properties: + interrupts: + description: | + Must contain entries for DirError, DataError and DataFail signals. + maxItems: 3 + +else: + properties: + interrupts: + description: | + Must contain entries for DirError, DataError, DataFail, DirFail signals. + minItems: 4 + additionalProperties: false required: From patchwork Thu Dec 10 10:28:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shah X-Patchwork-Id: 11964125 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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY,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 C24C9C433FE for ; Thu, 10 Dec 2020 10:28:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F11023A7C for ; Thu, 10 Dec 2020 10:28:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F11023A7C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IK0asb4qlIPkkRNBrDhCaT6FvosCkS/Yf8/Mqhbqzj0=; b=riXeCR4SYwTDc3CtXbtj0st6j KREmoxz0tlnJqK4/Ly6VgnMA0rIViRyCIR32TvShhyE8IT8dwjeq/UWf7scpwCTmoVm2Oo9u7YONF G2aEP4OU6S5e1GMpsU/6jTl+TRmQUvZT//jnxG3wkXNc2TH2uF332RsOT+nV8kVAmVNcAsQWjN7un pVYkrqeTRJ/KdE3Zdd8PHxxCTlCmp7Mt4//uMBTKzq27j+DdeK3jHenhHcbD8BwteoWuLpYva++Ro HKI7x+FvCEQP6FDIPbldzW+/uoSdHwWFSXkXTsh7qSJL07t9HgM8rQGHDyue/hj+lCfinw34e51aJ ZMZE7uWog==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knJBb-0006Xh-TM; Thu, 10 Dec 2020 10:28:35 +0000 Received: from mail-dm6nam12on2069.outbound.protection.outlook.com ([40.107.243.69] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knJBZ-0006Wk-6t for linux-riscv@lists.infradead.org; Thu, 10 Dec 2020 10:28:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iuGOKvfIqg8wATxYUrdzjOpdXsSucj0gZpB+1rOJoPhT2JogcLpPpoM/s2783qE+eNGwmy5QEphYTZZKKdbjct/iZOh58MVuP/kQ9cGGx2UvO3lMN8icApoinhRYHJ/9vQ8PjmHCyx5K4xwMb5pX2IZdpPvSP+o6CTqtpwTd8oAOTv9Fns8vhutg4yy0xtQ+FPNNSc37EuWyFHMiSMJEQGmKb2Rv11gf6MkvdxE1y6IHcxPvMn480n2jDRLoHXFK/ThUeKqkOGJpiV2G5jE2NoUGKJZ4aJGXfMtET2s+Gi4QFhE+YZDqxoS/4cYnkJbddrzTbtx+XFaAb2KTLv9g1A== 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-SenderADCheck; bh=+G73yeJi5CqkoOSQ0F00zuXL1qkQhjPSyv3ujMlpJ80=; b=IvdaNyq7+xrtN5iXAM8EU+N9M8MJcMIHdSRNUInBcInrARq/vkoXL7b6lJf/DfcBc7Fn/UGosUd+g6hWMTp9u9ABdeG4DyMfBewOW5ZAVBHITAY1frHtQPbtkf8V28Bh/XH4SghpEThypaQL7ywgxSo7E6qabOLVS/tVB9ONGHgMnoJqARvWT0EdFKEIBdl2Pcp7e3uMTKc9NTAsT+LP8i+5g0DEPwrGfv50TRgdtckGN197apbISkgaPkI5SA+heY25pnBiC6I429GoaqUzxbQr3gEKieUcsqqvvoUXJOdfuDHfb9zf77ApgM4+8UfnnfTHUMrPIysv7SCKGtCU+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=openfive.com; dmarc=pass action=none header.from=sifive.com; dkim=pass header.d=sifive.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+G73yeJi5CqkoOSQ0F00zuXL1qkQhjPSyv3ujMlpJ80=; b=dtDVeIEJu9M24E+gTi4vuSSKUQx9toyxrKMH5DP3Vb+FptQ5DsQ6AZ6iqfT6eVwLQotYpujx1nWTtA2T95Wvi2i+1CY+CQpStQ7JhUjRC8jwYcWvkLYOk4QTzfGyAdDj5iRX7Sn20TlicXg3bl/2obnYSne7PB87nEwiDQh/LP8= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=sifive.com; Received: from BY5PR13MB4453.namprd13.prod.outlook.com (2603:10b6:a03:1d1::19) by BYAPR13MB2838.namprd13.prod.outlook.com (2603:10b6:a03:fe::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.11; Thu, 10 Dec 2020 10:28:31 +0000 Received: from BY5PR13MB4453.namprd13.prod.outlook.com ([fe80::7c13:1ac6:9f2a:5eae]) by BY5PR13MB4453.namprd13.prod.outlook.com ([fe80::7c13:1ac6:9f2a:5eae%8]) with mapi id 15.20.3654.015; Thu, 10 Dec 2020 10:28:31 +0000 From: Yash Shah To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH v3 2/2] RISC-V: sifive_l2_cache: Update L2 cache driver to support SiFive FU740 Date: Thu, 10 Dec 2020 15:58:03 +0530 Message-Id: <1607596083-81480-3-git-send-email-yash.shah@sifive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1607596083-81480-1-git-send-email-yash.shah@sifive.com> References: <1607596083-81480-1-git-send-email-yash.shah@sifive.com> X-Originating-IP: [159.117.144.156] X-ClientProxiedBy: CH0PR13CA0015.namprd13.prod.outlook.com (2603:10b6:610:b1::20) To BY5PR13MB4453.namprd13.prod.outlook.com (2603:10b6:a03:1d1::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from osubuntu003.open-silicon.com (159.117.144.156) by CH0PR13CA0015.namprd13.prod.outlook.com (2603:10b6:610:b1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.9 via Frontend Transport; Thu, 10 Dec 2020 10:28:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a98b503a-bbec-433b-ca12-08d89cf6574c X-MS-TrafficTypeDiagnostic: BYAPR13MB2838: X-LD-Processed: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zm2vimluL97kcDT5a+8L+ToIAx6cYUiHqhMosmtcEwywx27m0NjHo4C1Hg3zQ/CqRf9Ta274fWKDTtHNRcnkqfjgB51o8556Sqj6XkEF/v5mA2FWnJHuhcS294HXCuss4pMMMrZXTPqu7Pr5dUqv1oQQiKcy8vpS80HETQDrLoVwS4Vq3Gfp8/K+9ak0xyiVN0xBMmyNSS4FG7PYNYinO9IagsQlZKVVb+HRdGYXe95SBajgHl9v4rloNaMXGeB7E/5Jb/LEPbh4zc/dAcDOzZoXlej3YJsHQwmyjt3yWpwewDwV+01TK+xTih+xTLtx X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR13MB4453.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(6029001)(376002)(366004)(136003)(346002)(15650500001)(7416002)(508600001)(26005)(8676002)(36756003)(4326008)(956004)(66476007)(2616005)(42882007)(66556008)(107886003)(44832011)(8936002)(16526019)(186003)(66946007)(83170400001)(83380400001)(6486002)(52116002)(2906002)(6666004)(5660300002)(6506007)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: tziQNxKmoBzJCe05mQ8XXuYwFXPA2aFsnWEfSeR9ydHXQjNQdfg/aevCttSaPxv9HT7tK0MuEeqlfJwZ05jeoRBkg3bofWl9sfLPXEpJeQ7mclfCXaYFHPwjWywrc6+wrGATliXVAh9F0Ew2zyTG4+Ael/lAuEkDmojOE/Wo5Q9EPjn3eg1Psp3U5tdrjLRdhFB5p7r0KHmE6TL+hOeJIFi3v2g5VxKAw+5M9AqKgWoLdU9etgsk6ZYjTD0Wxsidax/bZ9XLgTkpYyxtu1YtLxbAuGClXkufU+Q/tafVCaSo0jBOhxiyD6IjMFGinSTY3fPdHn7Tvj7Q3+M93a7dF6aSxaKVb/vSz/Rdw0bo0frQ6z+W+/Cxqo8u+grwm860bD3WXqcFDyeU71uEzE+d1lpSxp+Lk8QAcdjNbQ6kQliHfDGpEIrqZGCpbXq/UzaI5GAqsvU0jLbYWxdjKuImXbDyxL2eIJNEdgo1Xqb5BkLZjcDbsOdmodG4oif00u1zfHF8S8f2+hCaW4150tioB/Ecoi86AJ26BPuNvllfFFFE6u5qcZJUPz9RdphT+EelkT4MEgpOgAWYJccL0aH7CNktQ1TVvzcxcjdclaaVTCakI8rIOU54KGlpZlhKQVqIeAHPF9V1SLYwQ20vME8wGcBBfmBsgBcQHnI4P9m6pdcAd6/B9k9SkzF+uKMNrWNtV4e5ECX+RI/P4kl5bsKCGBhcpib0tIEAMorSfSVnJwpoBXrS9UGj0H5rjXmmf7uPxxKn9NPCSL/L5EfMt0ZVlaY9M3g+7h9TKIZmmjKByQDx4lq/pOsKGdgfxUyIe4fDv14h3Ll554SjrUcmLgDJ2cKWy6Ew4naaPKjzDSdU32PZ4SKfjvBut8FmsWfqnr02cQeTiIumIS5BQSOcI/+ww6zYVLhNv2+cnlz04MAEH+tMWWuFoy9U9LTugRAZQFrqkalrIUHm3JJVlv1QPFUOpcu6BR38Wycx7PTlpWU8/TCJSoGbyf9LSaFMty+0xPcs X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-AuthSource: BY5PR13MB4453.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2020 10:28:31.1989 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1 X-MS-Exchange-CrossTenant-Network-Message-Id: a98b503a-bbec-433b-ca12-08d89cf6574c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jRcIDmfGU/S2i3jRkFnLFRS/14lg4zJbIwXbBGM1xaqGufonXqTaKqoJyxzNS5GBrqfw2Kb8AB7A3MnhdpA7cQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR13MB2838 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201210_052833_282915_DC60FC96 X-CRM114-Status: GOOD ( 16.87 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aou@eecs.berkeley.edu, anup@brainfault.org, paul.walmsley@sifive.com, wsa@kernel.org, sachin.ghadi@sifive.com, Yash Shah , robh+dt@kernel.org, palmer@dabbelt.com, sagar.kadam@sifive.com, Jonathan.Cameron@huawei.com, bp@suse.de, sam@ravnborg.org Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org SiFive FU740 has 4 ECC interrupt sources as compared to 3 in FU540. Update the L2 cache controller driver to support this additional interrupt in case of FU740-C000 chip. Signed-off-by: Yash Shah --- drivers/soc/sifive/sifive_l2_cache.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/soc/sifive/sifive_l2_cache.c b/drivers/soc/sifive/sifive_l2_cache.c index 44d7e19..59640a1 100644 --- a/drivers/soc/sifive/sifive_l2_cache.c +++ b/drivers/soc/sifive/sifive_l2_cache.c @@ -17,6 +17,10 @@ #define SIFIVE_L2_DIRECCFIX_HIGH 0x104 #define SIFIVE_L2_DIRECCFIX_COUNT 0x108 +#define SIFIVE_L2_DIRECCFAIL_LOW 0x120 +#define SIFIVE_L2_DIRECCFAIL_HIGH 0x124 +#define SIFIVE_L2_DIRECCFAIL_COUNT 0x128 + #define SIFIVE_L2_DATECCFIX_LOW 0x140 #define SIFIVE_L2_DATECCFIX_HIGH 0x144 #define SIFIVE_L2_DATECCFIX_COUNT 0x148 @@ -29,7 +33,7 @@ #define SIFIVE_L2_WAYENABLE 0x08 #define SIFIVE_L2_ECCINJECTERR 0x40 -#define SIFIVE_L2_MAX_ECCINTR 3 +#define SIFIVE_L2_MAX_ECCINTR 4 static void __iomem *l2_base; static int g_irq[SIFIVE_L2_MAX_ECCINTR]; @@ -39,6 +43,7 @@ enum { DIR_CORR = 0, DATA_CORR, DATA_UNCORR, + DIR_UNCORR, }; #ifdef CONFIG_DEBUG_FS @@ -93,6 +98,7 @@ static void l2_config_read(void) static const struct of_device_id sifive_l2_ids[] = { { .compatible = "sifive,fu540-c000-ccache" }, + { .compatible = "sifive,fu740-c000-ccache" }, { /* end of table */ }, }; @@ -155,6 +161,15 @@ static irqreturn_t l2_int_handler(int irq, void *device) atomic_notifier_call_chain(&l2_err_chain, SIFIVE_L2_ERR_TYPE_CE, "DirECCFix"); } + if (irq == g_irq[DIR_UNCORR]) { + add_h = readl(l2_base + SIFIVE_L2_DIRECCFAIL_HIGH); + add_l = readl(l2_base + SIFIVE_L2_DIRECCFAIL_LOW); + /* Reading this register clears the DirFail interrupt sig */ + readl(l2_base + SIFIVE_L2_DIRECCFAIL_COUNT); + atomic_notifier_call_chain(&l2_err_chain, SIFIVE_L2_ERR_TYPE_UE, + "DirECCFail"); + panic("L2CACHE: DirFail @ 0x%08X.%08X\n", add_h, add_l); + } if (irq == g_irq[DATA_CORR]) { add_h = readl(l2_base + SIFIVE_L2_DATECCFIX_HIGH); add_l = readl(l2_base + SIFIVE_L2_DATECCFIX_LOW); @@ -181,7 +196,7 @@ static int __init sifive_l2_init(void) { struct device_node *np; struct resource res; - int i, rc; + int i, rc, intr_num; np = of_find_matching_node(NULL, sifive_l2_ids); if (!np) @@ -194,7 +209,13 @@ static int __init sifive_l2_init(void) if (!l2_base) return -ENOMEM; - for (i = 0; i < SIFIVE_L2_MAX_ECCINTR; i++) { + intr_num = of_property_count_u32_elems(np, "interrupts"); + if (!intr_num) { + pr_err("L2CACHE: no interrupts property\n"); + return -ENODEV; + } + + for (i = 0; i < intr_num; i++) { g_irq[i] = irq_of_parse_and_map(np, i); rc = request_irq(g_irq[i], l2_int_handler, 0, "l2_ecc", NULL); if (rc) {