From patchwork Tue Jun 7 15:29:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9161687 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 B3F9360571 for ; Tue, 7 Jun 2016 15:31:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A62CD2521F for ; Tue, 7 Jun 2016 15:31:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AD1327248; Tue, 7 Jun 2016 15:31:43 +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 47FC82521F for ; Tue, 7 Jun 2016 15:31:43 +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 1bAIxP-0004BX-31; Tue, 07 Jun 2016 15:30:19 +0000 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAIxF-0002u4-CR for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2016 15:30:09 +0000 Received: by mail-pa0-x242.google.com with SMTP id fg1so14438881pad.3 for ; Tue, 07 Jun 2016 08:29: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=fwIFH1YVeaUATXZOo5Pf2RonJN+f8y9hp4DSGfmU3S8=; b=MZn7GBCJz5ePxASv+hOwazjakhKno1dZqwtFM80+8xR7ud6yfCVCtVGGB7H2eS1Qt2 Npb7j+39kjssHwk3YKLOHwnawOfl5iiTNUUa6I9MHOwYBhSSvS1DfotfrY4VvUQkJeBp T6wSWPr7stDQxpJY/5FhfVTisNh2S9HlpZ3faHvJdBANyTzRO1I/BBvahXFKWNZDVg2Z 4dK0ccg0rDGevwBwPE331MDBbOek/ICQgGrYYyX/sO5MJu0rYAews6FbRPvOtILap55w NkXqCVVO6SZiza2jexh4lB/izI3i2cKVTCroKX/0uAFE37kP4HrxYfWaoAV2Dz+GjZnJ BAnA== 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=ftmz6ml4GZN76ZlF+hbULDH2RcMLjQAAtaysEEk1crCGM3hAqUwwsIr55eAnSZ84FN vHv/AETLC94Vfhbqp8mtH1DPeUgTxCMKSyegLBYeCUxx+Ztw5tVEfMcvueOS+sLT7DVW zK/ZeE3soNmDvd77D3LNRzmi3rZd4IdNDdDO7n9928twC34faRcnZBLE1MIT1N5pOFY2 Rw/5dio7rWTcedBvD+YGoupldTLoO93GmOTjw9u5J+6KnH8Ow9VB09DyqHB1AC/vxUe4 1yIp9pfi1+4RRf2INaj+OEU7bOApshOTOA7QcxelBoRYxLt4poHtD4vW08h2A14osbHm n2Vg== X-Gm-Message-State: ALyK8tIQlZSp9joPZ9wwLQY96+q6i6z7klRffRjV3/Rz1MAmASZQxjtRTvGqWn+Qv5ypgA== X-Received: by 10.66.172.49 with SMTP id az17mr23441pac.104.1465313388811; Tue, 07 Jun 2016 08:29: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 dr4sm33973707pac.11.2016.06.07.08.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jun 2016 08:29:48 -0700 (PDT) From: Andrey Smirnov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] i.MX: system.c: Remove redundant errat 752271 code Date: Tue, 7 Jun 2016 08:29:25 -0700 Message-Id: <1465313366-5182-2-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465313366-5182-1-git-send-email-andrew.smirnov@gmail.com> References: <1465313366-5182-1-git-send-email-andrew.smirnov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160607_083009_479919_FAF7A338 X-CRM114-Status: GOOD ( 12.76 ) 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 , 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 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); }