From patchwork Mon Jun 13 05:55: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: 9172015 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 8013560573 for ; Mon, 13 Jun 2016 05:57:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 749E9200E7 for ; Mon, 13 Jun 2016 05:57:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6928025EF7; Mon, 13 Jun 2016 05:57:56 +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=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,T_DKIM_INVALID autolearn=no 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 9DE7C200E7 for ; Mon, 13 Jun 2016 05:57:47 +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 1bCKrP-00049m-If; Mon, 13 Jun 2016 05:56:31 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCKr2-0003wq-VC for linux-arm-kernel@lists.infradead.org; Mon, 13 Jun 2016 05:56:09 +0000 Received: by mail-pf0-x241.google.com with SMTP id t190so9826498pfb.2 for ; Sun, 12 Jun 2016 22:55:48 -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=vLl+z1aJJezM9z6mrAAIes4mLucuLKhVxT9LPILlIFc=; b=iKHcF7CxQy3rqN3wB3mvUB6Qs2WOTD4qkE53x9AnU92QuZ7KKRiTnu4lnBygmRYCj7 xopgv5BoX0TRg1sEqRYLvg79D7X8gmIlv37mam2uyPcRy9cMs12LnVcl3mP73rR7NsHI mjFEWY6bCpDZrunmsH01IO3oR1Q10ri3K9L6h3vEVLcjM0r4fDe1ov6DUn5yyIyqi0Fb dglFb7+VWB/QQwlhOEESs2haeM6pZv+t8OQt/lcG5CpQMmJF+RTS4e5jsJzUH5TQH1Ai UhXRhD2BFPoGTw9YuaZSc8S3BYtYllh7pfUPfYAgGIev92pYhq1e5C/gwURXdgzHRvVE okeQ== 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=vLl+z1aJJezM9z6mrAAIes4mLucuLKhVxT9LPILlIFc=; b=ecPBCWjoxQ686RO4FJBvzcoL40xY6suGLEs55LY/k+mEAlfzfteAC8jc9pXRLLECMP 4jd526vpTxM8PIDUJjY8oNAk3gv9dM4frkPykcwP/xwp4PS5kPlH6eApI1MEhcUZ4byl ITq8Ftbmun32Et/MHGpwZ2+atmv1OBW746H5jjeWNMKaeILtSTXnjKtz1zPE4yfP+i2U KK3KxK+5E0Jp6S8TDW8/f5RiWQnlvRCy6VK22nUJjpVFiQyMNanRtUv80W/qFGiJo2CN PjmKl+hDd6uRvwnOCGlHTpeM+G6onHu6RCARTEu0TfljCvP7kGGCfVR1Vbj2PHAV7XEz 3kFA== X-Gm-Message-State: ALyK8tIZhfmv1sDhhWmz1311MoE+Kc3u7Kbv+MbpmcXC11Ynq2aK5HlJ3bi53WAhniOW9Q== X-Received: by 10.98.24.134 with SMTP id 128mr7014853pfy.52.1465797348183; Sun, 12 Jun 2016 22:55:48 -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 fl1sm34039523pab.43.2016.06.12.22.55.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jun 2016 22:55:47 -0700 (PDT) From: Andrey Smirnov To: linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH 2/3] i.MX: system.c: Remove redundant errata 752271 code Date: Sun, 12 Jun 2016 22:55:28 -0700 Message-Id: <1465797329-22537-2-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465797329-22537-1-git-send-email-andrew.smirnov@gmail.com> References: <1465797329-22537-1-git-send-email-andrew.smirnov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160612_225609_053533_F673333B X-CRM114-Status: GOOD ( 12.21 ) 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: Andrey Smirnov , Shawn Guo , Russell King , linux-kernel@vger.kernel.org, Sascha Hauer 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, but is not affected by 752271. Signed-off-by: Andrey Smirnov --- RESEND, now with Russell King on CC list. 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); }