From patchwork Thu Apr 13 03:35:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 750243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w3RK30bSjz9sNj for ; Thu, 13 Apr 2017 13:36:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755705AbdDMDfx (ORCPT ); Wed, 12 Apr 2017 23:35:53 -0400 Received: from ozlabs.org ([103.22.144.67]:57597 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755254AbdDMDfx (ORCPT ); Wed, 12 Apr 2017 23:35:53 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3w3RJl0WlMz9rxm; Thu, 13 Apr 2017 13:35:51 +1000 (AEST) From: Michael Ellerman To: Benjamin Herrenschmidt , Lorenzo Pieralisi Cc: linux-pci@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bjorn Helgaas , Paul Mackerras Subject: Re: [PATCH v3 21/32] powerpc: include default ioremap_nopost() implementation In-Reply-To: <1491952528.7236.26.camel@kernel.crashing.org> References: <20170411122923.6285-1-lorenzo.pieralisi@arm.com> <20170411122923.6285-22-lorenzo.pieralisi@arm.com> <1491917928.7236.8.camel@kernel.crashing.org> <20170411142456.GB6821@red-moon> <1491952528.7236.26.camel@kernel.crashing.org> User-Agent: Notmuch/0.21 (https://notmuchmail.org) Date: Thu, 13 Apr 2017 13:35:47 +1000 Message-ID: <87shld9dyk.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Benjamin Herrenschmidt writes: > On Tue, 2017-04-11 at 15:24 +0100, Lorenzo Pieralisi wrote: >> Ok, point taken. BTW, may I ask you guys to have a look into this >> please ? >> >> https://lkml.org/lkml/2017/4/6/743 >> >> It is a side effect of this thread (v2), not sure why >> on powerpc has to include . > > Not sure how we ended up with that... it's odd indeed. > > Michael ? Any reason we can't just remove it ? No ... idea. Looks like it was added in: commit b41e5fffe8b81fc939067d8c1c195cc79115d5a3 Author: Emil Medve AuthorDate: Sat May 3 06:34:04 2008 +1000 Commit: Paul Mackerras CommitDate: Mon May 5 16:47:14 2008 +1000 [POWERPC] devres: Add devm_ioremap_prot() We provide an ioremap_flags, so this provides a corresponding devm_ioremap_prot. The slight name difference is at Ben Herrenschmidt's request as he plans on changing ioremap_flags to ioremap_prot in the future. Signed-off-by: Emil Medve Signed-off-by: Kumar Gala Acked-by: Tejun Heo Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras I'll try removing it and see what breaks. cheers diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h index afae0697e8ce..e0062d73db1c 100644 --- a/include/asm-powerpc/io.h +++ b/include/asm-powerpc/io.h @@ -18,6 +18,9 @@ extern int check_legacy_ioport(unsigned long base_port); #define _PNPWRP 0xa79 #define PNPBIOS_BASE 0xf000 +#include +#include + #include #include #include @@ -744,6 +747,9 @@ static inline void * bus_to_virt(unsigned long address) #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set) +void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset, + size_t size, unsigned long flags); + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_IO_H */