Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 16 May 2023 09:17:51 +0300
From:   Mike Rapoport <rppt@kernel.org>
To:     Baoquan He <bhe@redhat.com>
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
Subject: Re: [PATCH v5 RESEND 04/17] mm/ioremap: Define
 generic_ioremap_prot() and generic_iounmap()
Message-ID: <ZGMgD178fqCF2fZf@kernel.org>
References: <20230515090848.833045-1-bhe@redhat.com>
 <20230515090848.833045-5-bhe@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230515090848.833045-5-bhe@redhat.com>
Precedence: bulk

On Mon, May 15, 2023 at 05:08:35PM +0800, Baoquan He wrote:
> From: Christophe Leroy <christophe.leroy@csgroup.eu>
> 
> Define a generic version of ioremap_prot() and iounmap() that
> architectures can call after they have performed the necessary
> alteration to parameters and/or necessary verifications.
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> Signed-off-by: Baoquan He <bhe@redhat.com>

Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>

> ---
>  include/asm-generic/io.h |  4 ++++
>  mm/ioremap.c             | 22 ++++++++++++++++------
>  2 files changed, 20 insertions(+), 6 deletions(-)
> 
> diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
> index 587e7e9b9a37..a7ca2099ba19 100644
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@ -1073,9 +1073,13 @@ static inline bool iounmap_allowed(void *addr)
>  }
>  #endif
>  
> +void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
> +				   pgprot_t prot);
> +
>  void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
>  			   unsigned long prot);
>  void iounmap(volatile void __iomem *addr);
> +void generic_iounmap(volatile void __iomem *addr);
>  
>  static inline void __iomem *ioremap(phys_addr_t addr, size_t size)
>  {
> diff --git a/mm/ioremap.c b/mm/ioremap.c
> index 8652426282cc..db6234b9db59 100644
> --- a/mm/ioremap.c
> +++ b/mm/ioremap.c
> @@ -11,8 +11,8 @@
>  #include <linux/io.h>
>  #include <linux/export.h>
>  
> -void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
> -			   unsigned long prot)
> +void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
> +				   pgprot_t prot)
>  {
>  	unsigned long offset, vaddr;
>  	phys_addr_t last_addr;
> @@ -28,7 +28,7 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
>  	phys_addr -= offset;
>  	size = PAGE_ALIGN(size + offset);
>  
> -	if (!ioremap_allowed(phys_addr, size, prot))
> +	if (!ioremap_allowed(phys_addr, size, pgprot_val(prot)))
>  		return NULL;
>  
>  	area = get_vm_area_caller(size, VM_IOREMAP,
> @@ -38,17 +38,22 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
>  	vaddr = (unsigned long)area->addr;
>  	area->phys_addr = phys_addr;
>  
> -	if (ioremap_page_range(vaddr, vaddr + size, phys_addr,
> -			       __pgprot(prot))) {
> +	if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
>  		free_vm_area(area);
>  		return NULL;
>  	}
>  
>  	return (void __iomem *)(vaddr + offset);
>  }
> +
> +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
> +			   unsigned long prot)
> +{
> +	return generic_ioremap_prot(phys_addr, size, __pgprot(prot));
> +}
>  EXPORT_SYMBOL(ioremap_prot);
>  
> -void iounmap(volatile void __iomem *addr)
> +void generic_iounmap(volatile void __iomem *addr)
>  {
>  	void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);
>  
> @@ -58,4 +63,9 @@ void iounmap(volatile void __iomem *addr)
>  	if (is_vmalloc_addr(vaddr))
>  		vunmap(vaddr);
>  }
> +
> +void iounmap(volatile void __iomem *addr)
> +{
> +	generic_iounmap(addr);
> +}
>  EXPORT_SYMBOL(iounmap);
> -- 
> 2.34.1
> 
> 

-- 
Sincerely yours,
Mike.