From patchwork Fri Nov 9 07:03:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 10675397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7320214D6 for ; Fri, 9 Nov 2018 07:06:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60F7C2E652 for ; Fri, 9 Nov 2018 07:06:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5583A2E658; Fri, 9 Nov 2018 07:06:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DEFA72E652 for ; Fri, 9 Nov 2018 07:06:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=jO070X6roqNtfZRVhxbaoNEJlKEHhLIjXhieC7LXXW0=; b=p/+rP0vTeIFuyy pM7zfJeOkGC1/Qrc+hQasnX4l/GoymxipUFNM1XFFMGwfj5jJOATzGwi6iw4mV2VIkJJ+1aw7KRfQ 9w9nwK0iUAo3Rkv5XI269HqHqiJFd9+K0VSZywTzDd5DagXCjHiNSoTzHXRn38dsykZrLgiDaOHPO 5MhP8KRsv60Ei6s2dpSjBHMEaChGXmfi26fciQTFqAPqYo6j2OAaklmtYy9MDSgZupeWJxei6B9g6 GL1D9mOA1hkQxQ8RmNgHBTacISbEoJ8PFl/ScwXWMhhMx+E77kuY8YlHDSmgeY6f1/hiUDs23iLRj tllLfqC8WZEGLujqx+Hg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL0rk-0000VD-Q4; Fri, 09 Nov 2018 07:06:04 +0000 Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL0qr-0006ez-1o for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 07:05:10 +0000 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 5B38189154; Fri, 9 Nov 2018 20:04:16 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1541747056; bh=oI4+ADffqReYBu1GS1c414QlvVag+1zxLv+5gkp2Lsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GMNKZqPr7gZZiHCvc7XJukxvrxVDnAmq5O9tD4BwiOD4msINier1aYf1XaFw7XHIB ukrB+E1L+B8CBsrGyBMAG8Fi7k51Per1XxUbqr+LSoxJlZh1/64fFzwjXdwAzMrWco 4M6BjCHG1pOFgxD/W+XDvOtvBZbrvaUXgvo7V2XDi/U9Kc80lRFUIgjP8kGT5W3+Re J264o6js1jciuB0iksjR0P/bbjnvWokyYQGfMMsisTa8YjN0YDsU4XQNva2RJkVFPy k0lD2QUzKFyPNnsn+4ruRXmJwkG3XTYoHw2FZjeofzghyU2OrvDlNkFHf1Nn/HCE2x U4Lc/gPZm5W3g== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121) id ; Fri, 09 Nov 2018 20:04:00 +1300 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id C424013EEA1; Fri, 9 Nov 2018 20:04:04 +1300 (NZDT) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 9F96C1E0BC9; Fri, 9 Nov 2018 20:03:59 +1300 (NZDT) From: Chris Packham To: linux@armlinux.org.uk, bp@alien8.de, arnd@arndb.de, jlu@pengutronix.de, gregory.clement@bootlin.com Subject: [PATCH v6 6/9] ARM: l2x0: add marvell,ecc-enable property for aurora Date: Fri, 9 Nov 2018 20:03:46 +1300 Message-Id: <20181109070349.20464-7-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109070349.20464-1-chris.packham@alliedtelesis.co.nz> References: <20181109070349.20464-1-chris.packham@alliedtelesis.co.nz> MIME-Version: 1.0 x-atlnz-ls: pat X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_230509_326853_C5F7A0B3 X-CRM114-Status: GOOD ( 10.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Chris Packham , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The aurora cache on the Marvell Armada-XP SoC supports ECC protection for the L2 data arrays. Add a "marvell,ecc-enable" device tree property which can be used to enable this. Signed-off-by: Chris Packham [jlu@pengutronix.de: use aurora specific define AURORA_ACR_ECC_EN] Signed-off-by: Jan Luebbe --- arch/arm/mm/cache-l2x0.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index b70bee74750d..644f786e4fa9 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -1505,6 +1505,13 @@ static void __init aurora_of_parse(const struct device_node *np, mask |= AURORA_ACR_FORCE_WRITE_POLICY_MASK; } + if (of_property_read_bool(np, "marvell,ecc-enable")) { + mask |= AURORA_ACR_ECC_EN; + val |= AURORA_ACR_ECC_EN; + } else if (of_property_read_bool(np, "marvell,ecc-disable")) { + mask |= AURORA_ACR_ECC_EN; + } + if (of_property_read_bool(np, "arm,parity-enable")) { mask |= AURORA_ACR_PARITY_EN; val |= AURORA_ACR_PARITY_EN;