From patchwork Sun Jun 19 01:09:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9185999 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 1A6426075F for ; Sun, 19 Jun 2016 01:11:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09FF6269A3 for ; Sun, 19 Jun 2016 01:11:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F15662793B; Sun, 19 Jun 2016 01:11:55 +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 7996A269A3 for ; Sun, 19 Jun 2016 01:11:55 +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 1bERG3-0004QH-Gr; Sun, 19 Jun 2016 01:10:39 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bERFZ-0002sk-RN for linux-arm-kernel@lists.infradead.org; Sun, 19 Jun 2016 01:10:10 +0000 Received: by mail-pf0-x243.google.com with SMTP id 66so8834643pfy.1 for ; Sat, 18 Jun 2016 18:09:49 -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=dKPgsO9DZgcldg2pv+sbB1CdJHRiiVqbeDsCvaSAY3/RB6cQXuGZ3nrozAckhFBeeU frCPe1AzLAYMdled3rADbO9Jb72YY8VbVRph5ya+dMBV01pnwCXbVC6LCEkQxzcvJeZm 3JsZUocCDtIy7mhlmUjZ89Iy4S0q36NXuXX+lyZQqJ7cmYrHYAYN4XaXU9skYivtRNSo QZPzW5HNGDCmqu9+O47BVlWvxImU4WMnUV7gfMUnUKTfXND/SzcZrdFzt84C4MtoG2Sv nrnmVsArW02T73SiBMSJjSa4zQjbj3PHCNvdPtOeLC4bIsO0sB4xKySW9oD+/DcILNi+ wWJg== 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=V+IaNJFx7rREJ9iFSC9CXy8+YTtIiXkH4H0dCPqCP/YFM+Wp4nClx32sn5lEjaRCMm DagYTrx/BxJEbiDGgKq3qkLVU8klDJs4SO+oFy32XXwntkfBp7heCqGPV300BsNbAfXJ r3QibSCIeG6TXyYZdAXs4hWt/7i27TG3daaT1yseWBaWZAL/YMfad4zdbDY/N3Y8zYVE VinmVaRDdjUkNje9zIuvY04gyq5nYjupEiq5sn+elHqAXV9U2pMN7qInuc25ys1v/IWl UbrcQxICFR/Z77ZkMQwt++fqFMaKH7r4oA0LN2/HhlVBU7s+ACZqwHw1QQB6+11pyn2F l68A== X-Gm-Message-State: ALyK8tIfrtfBhJUAaH4baAQyIV9WqGnOJHERFC025T8Fly4aUB4EAVYvvVEYvSjypzed1A== X-Received: by 10.98.41.133 with SMTP id p127mr11927824pfp.18.1466298589321; Sat, 18 Jun 2016 18:09:49 -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 ln4sm15258402pab.38.2016.06.18.18.09.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jun 2016 18:09:48 -0700 (PDT) From: Andrey Smirnov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/5] i.MX: system.c: Remove redundant errata 752271 code Date: Sat, 18 Jun 2016 18:09:28 -0700 Message-Id: <1466298571-7888-3-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466298571-7888-1-git-send-email-andrew.smirnov@gmail.com> References: <1466298571-7888-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_181009_962124_BFE8A56C X-CRM114-Status: GOOD ( 12.79 ) 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); }