From patchwork Sat Sep 6 20:49:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 4858131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 162979F2EC for ; Sat, 6 Sep 2014 20:50:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F1F520138 for ; Sat, 6 Sep 2014 20:50:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6878920131 for ; Sat, 6 Sep 2014 20:50:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XQMug-0001SS-7Y; Sat, 06 Sep 2014 20:48:50 +0000 Received: from 36.223.133.77.rev.sfr.net ([77.133.223.36] helo=smtp.natisbad.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XQMud-0001HN-4E; Sat, 06 Sep 2014 20:48:48 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 7AACD170261B; Sat, 6 Sep 2014 22:48:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1410036481; bh=brwH8c995vIxz5Nqi/WhdcpdHvO1PZEM1KNMH2wnJqQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=vwaQjeNKxuUhqT3AzuBFGgJNaQvcpf/lTzN8p5zPu7eL+YQOJmgT0KUn8KGf7uIkY Ylxa+Xd/BuA4JBjipjkfzrxlFNuO5Jy3TTYKdb20tFpP8Kl8qwuzHqUnm/he6XJC5p wPsTOPB+9PdJ8GEYzCtVkhOm5a5tt7nCoPOZ12OQ= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from small (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id 1DAA917001E2; Sat, 6 Sep 2014 22:47:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1410036470; bh=brwH8c995vIxz5Nqi/WhdcpdHvO1PZEM1KNMH2wnJqQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=1us91j/fRKZs73FpLd82f09xDeQpSxrnAPODLr79CDFc/YlrWfIp5x0oo8MX28Sce uaNNznBXA/XsBqK+QVn/kk0CPMlaonhdkA0TjvnktKVWv9pZeufHUCk10GBtlvj4/0 XF3veuLrEALfA9e/mCSmzFKqgq+e5gPAUlbCUQt8= X-Hashcash: 1:20:140906:ezequiel.garcia@free-electrons.com::LIUUebFKp1WHgEFu:0000000000000000000000000000XQY X-Hashcash: 1:20:140906:computersforpeace@gmail.com::EL7v7y1SQI8Qm9y/:000000000000000000000000000000000046p2 X-Hashcash: 1:20:140906:linux@arm.linux.org.uk::TYwMCTbEZCEWi2eR:0000000000000000000000000000000000000000D06 X-Hashcash: 1:20:140906:jason@lakedaemon.net::Yu0hzTOsCYGiFr+q:0000000000000000000000000000000000000000015i5 X-Hashcash: 1:20:140906:klightspeed@killerwolves.net::azlAwdlC08rP7b6d:00000000000000000000000000000000018Zl X-Hashcash: 1:20:140906:linux-arm-kernel@lists.infradead.org::kvQvg2s1JV1/+zMv:00000000000000000000000004Tv4 X-Hashcash: 1:20:140906:linux-mtd@lists.infradead.org::9SYlayLgmvp5OElQ:000000000000000000000000000000000C8S X-Hashcash: 1:20:140906:thomas.petazzoni@free-electrons.com::rQuZIdybNY4p0xfR:000000000000000000000000001mWP X-Hashcash: 1:20:140906:gregory.clement@free-electrons.com::ycWtRtWzGkuT7cik:0000000000000000000000000007jSG X-Hashcash: 1:20:140906:devicetree@vger.kernel.org::mP12o1zLHk5Bxfhh:000000000000000000000000000000000001fZn From: Arnaud Ebalard To: Ezequiel Garcia , Brian Norris , Russell King , Jason Cooper Subject: [PATCH 2/2] ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC In-Reply-To: References: Message-Id: <61f6a1b7ad0adc57a0e201b9680bc2e5f214a317.1410035142.git.arno@natisbad.org> Date: Sat, 06 Sep 2014 22:49:38 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140906_134847_885044_0934D845 X-CRM114-Status: GOOD ( 11.20 ) X-Spam-Score: 1.5 (+) Cc: Thomas Petazzoni , devicetree@vger.kernel.org, Ben Peddell , linux-mtd@lists.infradead.org, Gregory Clement , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 bootloader on the Netgear ReadyNAS RN2120 uses Hardware BCH ECC (strength = 4), while the pxa3xx NAND driver by default uses Hamming ECC (strength = 1). This patch changes the ECC mode on these machines to match that of the bootloader and of the stock firmware. That way, it is now possible to update the kernel from userland (e.g. using standard tools from mtd-utils package); u-boot will happily load and boot it. The issue was initially reported and fixed by Ben Pedell for RN102. The RN2120 shares the same Hynix H27U1G8F2BTR NAND flash and setup. This patch is based on Ben's fix for RN102. Fixes: ad51eddd95ad ("ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file") Depends-on: 5b3e507820c6 ("mtd: nand: pxa3xx: Use ECC strength and step size devicetree binding") Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 0cf999abc4ed..c5ed85a70ed9 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -223,6 +223,10 @@ marvell,nand-enable-arbiter; nand-on-flash-bbt; + /* Use Hardware BCH ECC */ + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + partition@0 { label = "u-boot"; reg = <0x0000000 0x180000>; /* 1.5MB */