From patchwork Sun Jun 19 00:31:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9185949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 367386075F for ; Sun, 19 Jun 2016 00:35:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 248642094F for ; Sun, 19 Jun 2016 00:35:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1920324151; Sun, 19 Jun 2016 00:35:00 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BFA602094F for ; Sun, 19 Jun 2016 00:34:59 +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 1bEQf3-0002c7-Lw; Sun, 19 Jun 2016 00:32:25 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bEQeT-0002Eo-Bd for linux-arm-kernel@lists.infradead.org; Sun, 19 Jun 2016 00:31:51 +0000 Received: by mail-pf0-x244.google.com with SMTP id i123so5777741pfg.3 for ; Sat, 18 Jun 2016 17:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8C8MLg97Cpo3u6UaZvII3NiLPK27W+MgSLyQum81ddw=; b=DMGPus/3iqQQl9bXlfVNywzUCaMFgrnPYtqBd130O2ZfNUS0WgilO3qJGq/HMBVEYd 43MF9L92NGLgKlHjVYWJl738pqWGtew/qBxTOpmz4eIJDOGe3swhNyhbAHvybT/eR+Qz Vgmn/8N9pRWKAX+tcwsGYxEnAdjDcns64FAh6gjr7E+JrNNTjyYzJnvIr2WEBwwPatJQ Bwy8tG3w09Ucg8/17EO3t+sFTJ32EqoDDtRcsim9hIRN4HrIBCm8TLG5/jwM5QUds594 q3zUnUmW/BvFP9ICMUAEQUhYa6xwG7hl02RH/zxt/yNjPjU51F7UxCMMt/5ImxKTA5Y9 NkcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8C8MLg97Cpo3u6UaZvII3NiLPK27W+MgSLyQum81ddw=; b=CtlZf1nxeCBNKtYDgCJVCM+vVElE3oZBAyqxcnC5Ln2QWfoxWl2/zX2/b9Q8RtmYTC QDUuKwCxM7OgDkpENvQpagwljzyursupWOWhp6n4uhVNkY9rwT/+xlDnpiHg2ytCXdbk E9XlYAZJ3fmlKm1aLCLHdX4r7MieewPgOIEnNo8aYGSrsHJyPcpoHxT7BV6Y1qbTRcd8 gZZZ/avGbERXQK/Dk8Xo/IPe7T9w3K61ETXhaw5dISaI6WGJJVg0FP7DkRUVidYbwdpZ +LjTFD8/lBkjmgsotTAC3PkQrLJ8qleb3zCth515opEUjx8OCkTOjNu1FzzMjQ0Z4uja c6gA== X-Gm-Message-State: ALyK8tJESDPPInTH+rpjF9uSa2IOzTYgxi3gnXK3jyTwDHguNEUr2+8XWpbeDPsDL2uMnw== X-Received: by 10.98.207.132 with SMTP id b126mr12064209pfg.20.1466296288798; Sat, 18 Jun 2016 17:31:28 -0700 (PDT) Received: from squirtle.localdomain.localdomain (c-73-225-163-254.hsd1.wa.comcast.net. [73.225.163.254]) by smtp.gmail.com with ESMTPSA id uj5sm56195069pac.28.2016.06.18.17.31.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jun 2016 17:31:28 -0700 (PDT) From: Andrey Smirnov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/5] i.MX: system.c: Remove redundant errata 752271 code Date: Sat, 18 Jun 2016 17:31:05 -0700 Message-Id: <1466296268-27099-5-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466296268-27099-1-git-send-email-andrew.smirnov@gmail.com> References: <1466296268-27099-1-git-send-email-andrew.smirnov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160618_173149_494783_04466377 X-CRM114-Status: GOOD ( 12.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Arnd Bergmann , Andrey Smirnov , linux-kernel@vger.kernel.org, Sascha Hauer , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Shawn Guo MIME-Version: 1.0 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 Applying a fix for ARM errata 752271 would already be taken care by a call to a 'fixup' hook as a part of l2x0_of_init() -> __l2c_init() call chain. Moreso the code in 'fixup' function would do that based on the PL310's revsion information, whereas removed code does so based on SoC version which does not work very well on i.MX6Q+ which identifies itself as i.MX6Q as well but is not affected by 752271. Acked-by: Arnd Bergmann Signed-off-by: Andrey Smirnov --- arch/arm/mach-imx/system.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index d9f8b0e..b153376 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -110,17 +110,6 @@ void __init imx_init_l2cache(void) /* Configure the L2 PREFETCH and POWER registers */ val = readl_relaxed(l2x0_base + L310_PREFETCH_CTRL); val |= 0x70800000; - /* - * The L2 cache controller(PL310) version on the i.MX6D/Q is r3p1-50rel0 - * The L2 cache controller(PL310) version on the i.MX6DL/SOLO/SL is r3p2 - * But according to ARM PL310 errata: 752271 - * ID: 752271: Double linefill feature can cause data corruption - * Fault Status: Present in: r3p0, r3p1, r3p1-50rel0. Fixed in r3p2 - * Workaround: The only workaround to this erratum is to disable the - * double linefill feature. This is the default behavior. - */ - if (cpu_is_imx6q()) - val &= ~(1 << 30 | 1 << 23); writel_relaxed(val, l2x0_base + L310_PREFETCH_CTRL); }