From patchwork Thu Jul 20 00:29:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 9853409 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 6C98E60392 for ; Thu, 20 Jul 2017 00:30:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6511328737 for ; Thu, 20 Jul 2017 00:30:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54B7128724; Thu, 20 Jul 2017 00:30:03 +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.1 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6E81C2872C for ; Thu, 20 Jul 2017 00:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:References :In-Reply-To:Message-Id:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gMw9+UAfq85NqbwDRgh4ymTkluRbN5R5hPKiq+cHtFI=; b=pNJ9nX7HH3Ru41 +AKANuCNJJZHw1p/U32/LO9L091uZv0OTknshZAwXUzj+GoUo2aQZIOAFQzpJYmuOri+FlJS+01ST nPwbNGAzhDdFQJUgOoWtJmz8OTW3Q0vPxZvwGLZ0PgEblEPHoGn/UnehgCL58tUw3yx3PtPBISS/C oRwAr2sVEWjk3Q6iZ23kRTUFhvvRtZQgO0MucNXJn7c/vkmjV1TmrHjVJSpeY2n6JdwLGSrtzHoMR yJzgXsCXOfvg1bzebWI3NBWocE+u15KWXEr9Mt2i2njvN8Y+C0dZ/m/GKlIGkEzdZLaK5SLKH8dP/ RE3IYReSdQyf+lmk6l2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXzLq-0002Rt-96; Thu, 20 Jul 2017 00:29:58 +0000 Received: from rere.qmqm.pl ([91.227.64.183]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXzLl-0001vQ-Pm for linux-arm-kernel@lists.infradead.org; Thu, 20 Jul 2017 00:29:55 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id B4F5B326; Thu, 20 Jul 2017 02:29:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1500510563; bh=GVpkBBNzceRRNG1bEahI6gXqIGn48Q+sj6KOCFHZSYs=; h=Date:In-Reply-To:References:From:Subject:To:From; b=hfmIwnCxmZMThmDnNGYH8Md+nsv6TqQTi59df6qawtjpmAC2Af+sZU24FceaLQKfq HOimzAymFL85rVrJjBNBUsAifo0gUaykPQNOZuYkFJc6y8tjxd86V45LJ8Mh1HQS49 9o9NEie9Ipo9cMsmTYGWKOTK4L4gwKTbzW3ns4dgBAQJ3tdn95G1XEcBQgH/Wutx46 +v17aLvsBkjDqfXb3a/irZsgcFl6JoLN2QQC5C3Jngm221zND2x0hiNd5i7HfxCOuY UiBXYhTt4y9XltzJ6nIvlZKTfRkdESvUgIoBB+Lzpb9UMFWxb5pg+HRuY4Lyw7s9S7 4K5XZXaHn11Hg== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at rere Date: Thu, 20 Jul 2017 02:29:23 +0200 Message-Id: In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH 2/9] arm: cache-l2x0: remove duplicate warning MIME-Version: 1.0 To: linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170719_172954_015459_7BDEBA80 X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Warning abound changing of AUX register in l2x0_of_init() is later repeated in __l2c_init(). Move whole thing over to __l2c_init(). Signed-off-by: Michał Mirosław --- arch/arm/mm/cache-l2x0.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 808efbb89b88..ea1e70ff4568 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -819,6 +819,8 @@ static int __init __l2c_init(const struct l2c_init_data *data, if (old_aux != aux) pr_warn("L2C: DT/platform modifies aux control register: 0x%08x -> 0x%08x\n", old_aux, aux); + else if (aux_mask != ~0U && aux_val != 0) + pr_alert("L2C: platform provided aux values match the hardware, so have no effect. Please remove them.\n"); /* Determine the number of ways */ switch (cache_id & L2X0_CACHE_ID_PART_MASK) { @@ -1755,7 +1757,7 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) const struct l2c_init_data *data; struct device_node *np; struct resource res; - u32 cache_id, old_aux; + u32 cache_id; u32 cache_level = 2; bool nosync = false; @@ -1778,14 +1780,6 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) of_property_read_bool(np, "arm,io-coherent")) data = &of_l2c310_coherent_data; - old_aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); - if (old_aux != ((old_aux & aux_mask) | aux_val)) { - pr_warn("L2C: platform modifies aux control register: 0x%08x -> 0x%08x\n", - old_aux, (old_aux & aux_mask) | aux_val); - } else if (aux_mask != ~0U && aux_val != 0) { - pr_alert("L2C: platform provided aux values match the hardware, so have no effect. Please remove them.\n"); - } - /* All L2 caches are unified, so this property should be specified */ if (!of_property_read_bool(np, "cache-unified")) pr_err("L2C: device tree omits to specify unified cache\n");