From patchwork Wed Jun 15 01:29:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9177213 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 9B20860772 for ; Wed, 15 Jun 2016 01:32:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A95D28327 for ; Wed, 15 Jun 2016 01:32:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F7872833F; Wed, 15 Jun 2016 01:32:29 +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 4196A28327 for ; Wed, 15 Jun 2016 01:32:29 +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 1bCzfV-00006q-3K; Wed, 15 Jun 2016 01:30:57 +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 1bCzf5-0008Eh-GS for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2016 01:30:31 +0000 Received: by mail-pf0-x243.google.com with SMTP id 62so517199pfd.3 for ; Tue, 14 Jun 2016 18:30:11 -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=fwIFH1YVeaUATXZOo5Pf2RonJN+f8y9hp4DSGfmU3S8=; b=H8F4N3FxbLugbw1aeszdQ8FDNr4B7ulC3Kj7NeW2ebymk/xmNHLggDMCkpNHcby+Ki uN2wbcbLhTEWE7/jqSy3d17r9xeZFEuZM2rBr5ZycOjolO4JFJK+3BMICNUJRrUcvyUS PCKwA+qUGyaU2muyJcxCYRU/Na9JAb16ffPQyax3PmgBm/DcTMstcEChS5m0Ft8IGK8/ 32SQAHnLMb4KdS+YsUM1i/WyeBgSAw28PoQ1c8oF/jDhTVYJRo2XzcFYfC0Vi1+kkjCA vVw/9QcsuZbHdF0tVMBWm3NCQEM/Nmja/QUbOrOo3KHs3LUJo4rjJINmzws49yLbVWqB XvOg== 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=fwIFH1YVeaUATXZOo5Pf2RonJN+f8y9hp4DSGfmU3S8=; b=foLaQq6XT6xrzwQhoGoYW5Emk/6mOI2R1c/HoFOs4FIi2MaSayLchH2B3+F/+FrCK+ ch8CL+f3Xf7wxU6kHS2qGk7L9C8o/YEvcE2aZHUx8b24raEbJQdU9VSjDbtwx3BqqDBp Y1jtWDyXtdnaa2IkjM6buUEz3DN/exoSYfBZ4FcOuDVgHnhIquyMbTA2O3RIRSK54SGv Zwd2OsQU1jRLgND2M0N23N3+Uy1fsr5hovjx34iN2Fp0gDFjlywK8RKb3+6gN+XlE5m6 Ht6vL4fhsHfdDUFu6s+AJcSCm28sSmZ0Ms20/6zylIQNci+BzSxf/huiCPWoPKtYOFfp 5JUQ== X-Gm-Message-State: ALyK8tKKe5BLsp6rplenbK+2GSbKLNkBPgKpZwdf8HsfOqc0rPe++iILO0oRAFPDKmv94A== X-Received: by 10.98.0.21 with SMTP id 21mr726821pfa.81.1465954210698; Tue, 14 Jun 2016 18:30:10 -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 c8sm25647274pfb.33.2016.06.14.18.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jun 2016 18:30:10 -0700 (PDT) From: Andrey Smirnov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/6] i.MX: system.c: Remove redundant errata 752271 code Date: Tue, 14 Jun 2016 18:29:49 -0700 Message-Id: <1465954193-5894-3-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465954193-5894-1-git-send-email-andrew.smirnov@gmail.com> References: <1465954193-5894-1-git-send-email-andrew.smirnov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160614_183031_572260_4AA66FBD X-CRM114-Status: GOOD ( 13.10 ) 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 , 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 removde 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. 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); }