From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A18ABC77B7A for ; Tue, 16 May 2023 06:49:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E10F900004; Tue, 16 May 2023 02:49:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36A24900002; Tue, 16 May 2023 02:49:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20A7B900004; Tue, 16 May 2023 02:49:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 113EF900002 for ; Tue, 16 May 2023 02:49:44 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D4C02414B1 for ; Tue, 16 May 2023 06:49:43 +0000 (UTC) X-FDA: 80795192646.17.2C22FB3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 256D0140016 for ; Tue, 16 May 2023 06:49:41 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="TI/Bn+ON"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684219782; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QxEKZowGZ8LoQJG1rUfxshla7cOugpJ4c+KONMNV7Gc=; b=ZAt77Jid+Ke2fBBw+MWODDc96ji7nmkgcuKobdreiujAHml7zlDmKvBCIftBz3u4RDr4Ix gMpUlcrZOTmZrI4qKWR7HI0ujK4ZelL0M5glQx3MwOpxZtLrWBTLcMb0oJ797CKk88cBD6 MM0diQy9G1oFK/yuhKcWbTZnJoSoEFU= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="TI/Bn+ON"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684219782; a=rsa-sha256; cv=none; b=rRs8H72lGF9wwme/ZgXkDRNQgglSmxX+Hy0fJh9GJsCVcq6UToq6yS1dWDemx1ZVUaxhGA fqQOnH4EvirO/N9kZ6mfwj8DyBugtdkXl4nuAXMdLRSGKfnlzrWS6VeI1ncM6dVtgU+Ubc gJ2WiXEiMBeUMNRw09x9ZcxdMOH0GzI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 601EF63496; Tue, 16 May 2023 06:49:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01E44C4339B; Tue, 16 May 2023 06:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684219780; bh=d2xPxL7hJLLCcdGa/Dam38E/r5WEtsNgznbXdjNHj68=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TI/Bn+ONKSePa8TKHiys+pUWNGrGmYo9caF9YdS/nRRGoqyXGZyXeNDzuZ/1ZvMdV D4GqCgfqiVF+RtiOio4cKExq9JzEMAxF8o+LVhViv3urHEbjL9Xm4TI0Qu1C89MNQT N7gbutob0TgQBwjJ1RYur9/+o2HCUYS6f/pWer72TSG1OoHqCkLH5tPsFbDXszyG5G 0rikMvbtqF3E1c/cuLiOgIzBsXOgR9Usj8zMWLc1mCfBHD4uNBjXBaKakpumyR0Utn 6YrJMfplyVHBr+xusx1oJaeBSZy8u8h1e4vAGBiTGhUoWKsTbyDwBYw4Pu+KPZJAla /iduDoT9ZW/ZQ== Date: Tue, 16 May 2023 09:49:33 +0300 From: Mike Rapoport To: Baoquan He Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@aculab.com, shorne@gmail.com, willy@infradead.org, deller@gmx.de, linux-ia64@vger.kernel.org Subject: Re: [PATCH v5 RESEND 08/17] ia64: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20230515090848.833045-1-bhe@redhat.com> <20230515090848.833045-9-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230515090848.833045-9-bhe@redhat.com> X-Stat-Signature: jhd4n3efr3p859paybiyqd1uwa3ahk5o X-Rspam-User: X-Rspamd-Queue-Id: 256D0140016 X-Rspamd-Server: rspam07 X-HE-Tag: 1684219781-440708 X-HE-Meta: U2FsdGVkX19Gad9I5reHJU5I19f7FB+xZIq7Wh7AwxMq0Ro21/ySUSGSu1m41cV00lX85PxeqXwOTxvCeBSQoTK1QKq9CIsd2Gpfdmwl8tcQojj73T4jmbOIFKhwmuAUuQ6P8neA0GnSiDXYcDS/hUS2asXssPLWzbCopdK+XeSSiBbSdvv6xoEbc1JI3qn2j85/XLqqJk3XaciUeBmTfxnsIIlvKLKYOA52vwdafNN1HMECH8OmuT4Se+O5MmAwy4Tv++LWQzIIwIyJiKhCHFRNH6kIC9iY75iNOFYNyfNEHV6eCqXcptlRngPA2rS9Ovm9JCmNk2Ar+cOfBzeN47+T+6nniUeQdC6V6w37RVaCfRvJMQiVCJukYZxFqNQGB1mcOw9NTYv7oQ9ntwKHFaFlTC5SkRF+n3usFRGYL/FtkIIVXXE+8B4Eaud5c/G8SUqkqPZTVlkU8MW4jifdglkXc5an1BZQ0brrZTUf/5USplD4NBaEQWVJ2iluc26El7tFmPfpPLL7MfYT9/4S0Y2bKvHwfSBZKSKimlcOiSDT2xgRdlHOYxgRHoTu1fVFjSpGmMSyfFJvWSpTwW6AnAe6srlhnr1Vcl11DWkDgs0yzaOMzwLmic/b/VEVaDPQ5sg+avuZ1zWhpCjxU7b3JfnLHVnoHYoFLKMxgw1liGd9WHTjLP4L4ADDYLlbvu6AB/BHI4y0Nf2mMChzYK7cUea0QlMe3odhNt/9SVO8ca/J4U7hgkm7qV6HbB4pSyOwPX3K3rESKLya4876ZjdxeUwqAanT486x7QyREMfEwAVP8IaDlkAN+gr1pgLaU8xAshK5Xne2l5evmDchVImNgNd4jvE0vRB48ke39a2TdEx2F+tomH7K3PPF8Oefimz7CDdXnhw6NBZopaqVjaBLfHHWR+KNfiQ/OG8tOn9sOUuSVHfv268tlKfhiKdfvNQsqooHeW6dFAm1JNW8org 1leLXYTc wCLJ32kqYZuMcyt7VDG4HaISn6m65AlS4vwH8Kz7hZpkmUw0paSRqGTGqHfeVpcdcqWIGBvp5WQGiJV7xe+i2yXDpeXTFZ84PgYY4GH/XG2c4CPVQ46RdC1KzCrP5ykYJMYQkeBmZvXTiHthS/mXl4LCpLnGIlfqe48xICEZMSLCM9OLATzHr16du9I6/j+n/o1+nlliVJCpXEdqRbEJMLVN1maz736Y9Vc7hG/Uu6WfYk3kUw9JaEIm+ghbm5Db/xyLxHcYTCZjhxwJVDB6m3+tW102Lq6jB6krO5jKrBe0k+cAj8tJ1gcAZVKlcCT6XfYqTSHqq5gUudcHosOxsHKecpiIVqGnrdOOuE2KQxfyK2oWTTF5/BTSGuJKnV0UUP8p3PlEhB2v/a/fNADM/b3gTS58CRtoqZwxOVZaNiWAmaPk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, May 15, 2023 at 05:08:39PM +0800, Baoquan He wrote: > By taking GENERIC_IOREMAP method, the generic generic_ioremap_prot(), > generic_iounmap(), and their generic wrapper ioremap_prot(), ioremap() > and iounmap() are all visible and available to arch. Arch needs to > provide wrapper functions to override the generic versions if there's > arch specific handling in its ioremap_prot(), ioremap() or iounmap(). > This change will simplify implementation by removing duplicated codes > with generic_ioremap_prot() and generic_iounmap(), and has the equivalent > functioality as before. > > Here, add wrapper functions ioremap_prot() and iounmap() for ia64's > special operation when ioremap() and iounmap(). > > Signed-off-by: Baoquan He > Cc: linux-ia64@vger.kernel.org Reviewed-by: Mike Rapoport (IBM) > --- > arch/ia64/Kconfig | 1 + > arch/ia64/include/asm/io.h | 13 +++++------- > arch/ia64/mm/ioremap.c | 41 ++++++-------------------------------- > 3 files changed, 12 insertions(+), 43 deletions(-) > > diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig > index 21fa63ce5ffc..4f970b6d8032 100644 > --- a/arch/ia64/Kconfig > +++ b/arch/ia64/Kconfig > @@ -46,6 +46,7 @@ config IA64 > select GENERIC_IRQ_LEGACY > select ARCH_HAVE_NMI_SAFE_CMPXCHG > select GENERIC_IOMAP > + select GENERIC_IOREMAP > select GENERIC_SMP_IDLE_THREAD > select ARCH_TASK_STRUCT_ON_STACK > select ARCH_TASK_STRUCT_ALLOCATOR > diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h > index 83a492c8d298..eedc0afa8cad 100644 > --- a/arch/ia64/include/asm/io.h > +++ b/arch/ia64/include/asm/io.h > @@ -243,15 +243,12 @@ static inline void outsl(unsigned long port, const void *src, > > # ifdef __KERNEL__ > > -extern void __iomem * ioremap(unsigned long offset, unsigned long size); > +#define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL) > + > extern void __iomem * ioremap_uc(unsigned long offset, unsigned long size); > -extern void iounmap (volatile void __iomem *addr); > -static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size) > -{ > - return ioremap(phys_addr, size); > -} > -#define ioremap ioremap > -#define ioremap_cache ioremap_cache > + > +#define ioremap_prot ioremap_prot > +#define ioremap_cache ioremap > #define ioremap_uc ioremap_uc > #define iounmap iounmap > > diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c > index 92b81bc91397..711b6abc822e 100644 > --- a/arch/ia64/mm/ioremap.c > +++ b/arch/ia64/mm/ioremap.c > @@ -29,13 +29,9 @@ early_ioremap (unsigned long phys_addr, unsigned long size) > return __ioremap_uc(phys_addr); > } > > -void __iomem * > -ioremap (unsigned long phys_addr, unsigned long size) > +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, > + unsigned long flags) > { > - void __iomem *addr; > - struct vm_struct *area; > - unsigned long offset; > - pgprot_t prot; > u64 attr; > unsigned long gran_base, gran_size; > unsigned long page_base; > @@ -68,36 +64,12 @@ ioremap (unsigned long phys_addr, unsigned long size) > */ > page_base = phys_addr & PAGE_MASK; > size = PAGE_ALIGN(phys_addr + size) - page_base; > - if (efi_mem_attribute(page_base, size) & EFI_MEMORY_WB) { > - prot = PAGE_KERNEL; > - > - /* > - * Mappings have to be page-aligned > - */ > - offset = phys_addr & ~PAGE_MASK; > - phys_addr &= PAGE_MASK; > - > - /* > - * Ok, go for it.. > - */ > - area = get_vm_area(size, VM_IOREMAP); > - if (!area) > - return NULL; > - > - area->phys_addr = phys_addr; > - addr = (void __iomem *) area->addr; > - if (ioremap_page_range((unsigned long) addr, > - (unsigned long) addr + size, phys_addr, prot)) { > - vunmap((void __force *) addr); > - return NULL; > - } > - > - return (void __iomem *) (offset + (char __iomem *)addr); > - } > + if (efi_mem_attribute(page_base, size) & EFI_MEMORY_WB) > + return generic_ioremap_prot(phys_addr, size, __pgprot(flags)); > > return __ioremap_uc(phys_addr); > } > -EXPORT_SYMBOL(ioremap); > +EXPORT_SYMBOL(ioremap_prot); > > void __iomem * > ioremap_uc(unsigned long phys_addr, unsigned long size) > @@ -114,8 +86,7 @@ early_iounmap (volatile void __iomem *addr, unsigned long size) > { > } > > -void > -iounmap (volatile void __iomem *addr) > +void iounmap(volatile void __iomem *addr) > { > if (REGION_NUMBER(addr) == RGN_GATE) > vunmap((void *) ((unsigned long) addr & PAGE_MASK)); > -- > 2.34.1 > > -- Sincerely yours, Mike.