From patchwork Mon Jul 20 00:17:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 6824661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CE879C05AC for ; Mon, 20 Jul 2015 00:27:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E98DB20640 for ; Mon, 20 Jul 2015 00:27:07 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 0F8592049C for ; Mon, 20 Jul 2015 00:27:07 +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 1ZGysF-0006sv-1O; Mon, 20 Jul 2015 00:24:03 +0000 Received: from mga02.intel.com ([134.134.136.20]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZGyru-0006lL-H1 for linux-arm-kernel@lists.infradead.org; Mon, 20 Jul 2015 00:23:43 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 19 Jul 2015 17:23:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,505,1432623600"; d="scan'208";a="765660405" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.11]) by fmsmga002.fm.intel.com with ESMTP; 19 Jul 2015 17:23:20 -0700 Subject: [PATCH 01/10] mm, x86: Fix warning in ioremap RAM check From: Dan Williams To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com Date: Sun, 19 Jul 2015 20:17:38 -0400 Message-ID: <20150720001738.30857.72850.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <20150720001614.30857.89063.stgit@dwillia2-desk3.amr.corp.intel.com> References: <20150720001614.30857.89063.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-8-g92dd MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150719_172342_616867_AEEC3D94 X-CRM114-Status: GOOD ( 15.14 ) X-Spam-Score: -8.1 (--------) 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: linux-arch@vger.kernel.org, tony.luck@intel.com, toshi.kani@hp.com, arnd@arndb.de, benh@kernel.crashing.org, mcgrof@suse.com, x86@kernel.org, linux-kernel@vger.kernel.org, ralf@linux-mips.org, linux@arm.linux.org.uk, Roland Dreier , Ingo Molnar , geert@linux-m68k.org, Borislav Petkov , ross.zwisler@linux.intel.com, kbuild test robot , hch@lst.de, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Toshi Kani __ioremap_caller() calls __ioremap_check_ram() through walk_system_ram_range() to check if a target range is in RAM. __ioremap_check_ram() has WARN_ONCE() in a wrong place where it warns when the given range is not RAM. This misplaced warning is not exposed since walk_system_ram_range() only calls __ioremap_check_ram() for RAM ranges. Move the WARN_ONCE() to __ioremap_caller(), fix up __ioremap_caller to use the %pa format specifier, and update the message to include the address range. Signed-off-by: Toshi Kani Cc: Roland Dreier Cc: Luis R. Rodriguez Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov [djbw: fix format specifier warnings] Reported-by: kbuild test robot Signed-off-by: Dan Williams --- arch/x86/mm/ioremap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index cc5ccc415cc0..63da79114fe9 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -63,8 +63,6 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages, !PageReserved(pfn_to_page(start_pfn + i))) return 1; - WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn); - return 0; } @@ -102,8 +100,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, return NULL; if (!phys_addr_valid(phys_addr)) { - printk(KERN_WARNING "ioremap: invalid physical address %llx\n", - (unsigned long long)phys_addr); + printk(KERN_WARNING "ioremap: invalid physical address %pa\n", + &phys_addr); WARN_ON_ONCE(1); return NULL; } @@ -131,8 +129,11 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, pfn = phys_addr >> PAGE_SHIFT; last_pfn = last_addr >> PAGE_SHIFT; if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL, - __ioremap_check_ram) == 1) + __ioremap_check_ram) == 1) { + WARN_ONCE(1, "ioremap on RAM at %pa - %pa\n", + &phys_addr, &last_addr); return NULL; + } } /* * Mappings have to be page-aligned @@ -151,10 +152,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, if (pcm != new_pcm) { if (!is_new_memtype_allowed(phys_addr, size, pcm, new_pcm)) { printk(KERN_ERR - "ioremap error for 0x%llx-0x%llx, requested 0x%x, got 0x%x\n", - (unsigned long long)phys_addr, - (unsigned long long)(phys_addr + size), - pcm, new_pcm); + "ioremap error for %pa - %pa, requested 0x%x, got 0x%x\n", + &phys_addr, &last_addr, pcm, new_pcm); goto err_free_memtype; } pcm = new_pcm;