From patchwork Sat Nov 10 20:38:16 2018 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: 10677425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CAC3314BD for ; Sat, 10 Nov 2018 20:38:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 923F62B961 for ; Sat, 10 Nov 2018 20:38:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8009F2BA67; Sat, 10 Nov 2018 20:38:39 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 2C2632B961 for ; Sat, 10 Nov 2018 20:38:39 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:Message-Id :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=IOGgNjrP7vbRQAHqV3q/nMXe0MhGsbSXhDfDbN0dc9c=; b=Y58ocY/ktLQD8n ZlREg5DLPbTAfUq5fmAZe/SaQ2bKgPuY9xg8085+ueHaLEhuQgA1w7CxZ1nLsctIbur1IQCK3EycX /PXHXPx9yJWU+gLmt8gquOY4A+UGtLKHL32kuH18D0IhapRVM/gAtwMaM7u6eHqvX+yS1E+nd/zkS 4T8S9e1k/jSG6aXMNGuuy8Li9jxrUM7I1fZnacSxuEp2wp69y+dhJ1V6UxfOjWiKbA63IpRuZQ5yh Yr4PAk1+EqaOdud6KWAn08SlF2dK+EolSHtQ7RRvuchwICz/LzfaYHzGVOHk+J7BpVFPf6J1hUOKD se0qWKnmFLSwqd/XcJlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLa1c-0002TR-VH; Sat, 10 Nov 2018 20:38:36 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLa1b-0002TG-BP for linux-arm-kernel@bombadil.infradead.org; Sat, 10 Nov 2018 20:38:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Cc:To:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:From:Message-Id:Date:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=6VnqlNf68Blfwya6Bo9hzdScrVGSvVFpdL7kKc6cPLY=; b=rYS/X3qKkZhT9bqZDtAm8dGbW wLVWMIin4mE4dIWCDkn9YJhjikECX9vQyxMmxqJiJNc1VogE3UlMf+qGQSNM36Q0pRlzCjI1afQmc kGWpzKAC95vpSgmJvF+d0SbbUmg0Qn6EfSYFSCPnOMYWxq4z5UAPDOefVnDkw8IZFEBOhxVGyDJg0 Xkcu7o9igQgYRwTJ1B/kNu3v+0jzAqk7PjvZy7p32b3MY3Nj/OKMPCQb093ZJHTxmOGSeILdhYeco O+5AYOOAj9YQvCxqKbztlKlfaZj5epwdIR7xQ+4RX0E4ZfChzc99NlG8QdO9DvMX/KKZKqxTGVJbb o6a+sEivA==; Received: from rere.qmqm.pl ([91.227.64.183]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLa1Y-0008D5-9C for linux-arm-kernel@lists.infradead.org; Sat, 10 Nov 2018 20:38:33 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42spjT4VHPzBr; Sat, 10 Nov 2018 21:37:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541882237; bh=g+7ckR798XyDuG5ePPN1AuZWmFqFoBVOrjzm/mAeOzs=; h=Date:From:Subject:To:Cc:From; b=YJWBpn55dicGxXmPSZspF7Uxo0iB9SEpQnKPSQCUIJsU0glRqk1PojXe5qHb2v3wW HQr4dlRpyhhfvUDwiUPIWxbli9EZeZYMdBDhYt1+7kfngWXVEbWscK7T/WDVBn7ey0 ULSM4LljzTHzTudSn6lchbtS3SIVkXv0w/Ic9wtXy7iBCQ/US7ZHExrfV70vn/HqF3 tnZTu27bLNrinE4BI94gTl1ZLAuWDxP23qDo4QK+uFD897acIsdL744KO+IaHMf6hB bkRbCNTwvo7JfVd1OuytT9yq0PiH8Oh1tfscbKru0bM9V18/U8Qcv5hr4sXHZvvia8 3tnmSsh8AqSFQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Sat, 10 Nov 2018 21:38:16 +0100 Message-Id: <7be3eaf2ac9db2e2e74900a2d2fa7d085b3d77f4.1541882244.git.mirq-linux@rere.qmqm.pl> From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH] ARM: cache-l2x0: remove duplicate warning MIME-Version: 1.0 To: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181110_153832_465121_EC56EE59 X-CRM114-Status: GOOD ( 10.13 ) 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: , Cc: Russell King 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 abount 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");