From patchwork Wed Jun 15 01:29:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9177209 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 5D77A60772 for ; Wed, 15 Jun 2016 01:32:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CEA128327 for ; Wed, 15 Jun 2016 01:32:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41D852833F; Wed, 15 Jun 2016 01:32:08 +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=unavailable 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 0999D28327 for ; Wed, 15 Jun 2016 01:32:08 +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 1bCzfE-0008KQ-Md; Wed, 15 Jun 2016 01:30:40 +0000 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCzf4-0008Eg-JL for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2016 01:30:31 +0000 Received: by mail-pa0-x241.google.com with SMTP id hf6so346129pac.2 for ; Tue, 14 Jun 2016 18:30:10 -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=FGxJ4PSxhT9zWt6lFegj7msH0HJ0xRzGpCt7Y+rFs1I=; b=ds1HXIjsMdbX05MNooWl1bQWWag2MsG5QhBt1Xwq1Xv4odkrI9FBR93Q9IQlIEZSmF 46se3etdjadi7DDlG1TLbdkBzmIrSr3YK2FggAIQq7zjJ0syvg68EgfAfM30r8L1NwRr 09Sttl3d/aVMbM8l2GM0D/QTB+3lXxJMvJ40NTkbbMrh7glK4rlHSk0GQv2/EcYEgju6 TXzXWyTugBZsRRiglPtAr/5Mdd7heeNmOPL1j3qEZpQnB0FYTFE4Yplox4Q1EPynB3eI keqa7zgSP9/9hLmkpiAkzm0Hse5kVItfwllRJ6Ke1lC+bMUyrxaw/SjFdFygcbdZH4D5 Spiw== 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=FGxJ4PSxhT9zWt6lFegj7msH0HJ0xRzGpCt7Y+rFs1I=; b=LDqJavCbHzLG1CCeiU/FE5mbkL9pqbuJpzcPOv9TLzA3Wu9eLmwUm0bwuaLOZMoEkr p/lZfwbtzsCq8Nn24nPVaDbHTu5HwgpiK/+g872O7IEEvYWedfu5d3XoKFdVS+NdOFDi cbQmSOAee0cKtR485kw1fMIcRayEWnkYSxlUtHlY49bkKQSdvvM1bx+VRBqlG9/gR8sc fqlagTubZoj6s8WcW/9NlRwK0VRhBb8CpWNbz1QaanzCSmumvfoZgUS/DrZtsj+/h0j0 JfiyJUb71iZf7hok+LKn4oRSmoNeAIe8Lm9BKwcERVzyyS+atIPbjNSmlzQjcQYIi/yJ GrBQ== X-Gm-Message-State: ALyK8tIWWDis9IMVcBpKA31E0wjtsLEN46uPgZgs0PW3Y7kgYO6c1ooeDEqVDzxts7IxZQ== X-Received: by 10.66.73.138 with SMTP id l10mr765741pav.92.1465954209863; Tue, 14 Jun 2016 18:30:09 -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:09 -0700 (PDT) From: Andrey Smirnov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/6] i.MX: system.c: Convert goto to if statement Date: Tue, 14 Jun 2016 18:29:48 -0700 Message-Id: <1465954193-5894-2-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_183030_665084_4DA7BC79 X-CRM114-Status: GOOD ( 13.80 ) 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 Using goto here doesn't bring any advantages and only makes the code flow less clear. No functional changes. Signed-off-by: Andrey Smirnov --- arch/arm/mach-imx/system.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index 105d1ce..d9f8b0e 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -106,26 +106,24 @@ void __init imx_init_l2cache(void) goto out; } - if (readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN) - goto skip_if_enabled; - - /* 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); + if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) { + /* 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); + } -skip_if_enabled: iounmap(l2x0_base); of_node_put(np);