Re: [PATCH v5 RESEND 03/17] openrisc: mm: remove unneeded early ioremap code

[Baoquan He]

On 05/16/23 at 09:17am, Mike Rapoport wrote:
> On Mon, May 15, 2023 at 05:08:34PM +0800, Baoquan He wrote:
> > Under arch/openrisc, there isn't any place where ioremap() is called.
> > It means that there isn't early ioremap handling needed in openrisc,
> > So the early ioremap handling code in ioremap() of
> > arch/openrisc/mm/ioremap.c is unnecessary and can be removed.
> 
> It looks like early ioremap was the only user of fixmap on openrisc, so it
> can be removed as well.

You are right, and you are saying the relic in iounmap() about fixmap
handling, hope I got it right. I will remove it, the code will be more
cleaner. Thanks.

>  
> > Link: https://lore.kernel.org/linux-mm/YwxfxKrTUtAuejKQ@oscomms1/
> > Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
> > Acked-by: Stafford Horne <shorne@xxxxxxxxx>
> > Cc: Jonas Bonn <jonas@xxxxxxxxxxxx>
> > Cc: Stefan Kristiansson <stefan.kristiansson@xxxxxxxxxxxxx>
> > Cc: Stafford Horne <shorne@xxxxxxxxx>
> > Cc: openrisc@xxxxxxxxxxxxxxxxxxxx
> > ---
> >  arch/openrisc/mm/ioremap.c | 22 +++++-----------------
> >  1 file changed, 5 insertions(+), 17 deletions(-)
> > 
> > diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c
> > index 8ec0dafecf25..90b59bc53c8c 100644
> > --- a/arch/openrisc/mm/ioremap.c
> > +++ b/arch/openrisc/mm/ioremap.c
> > @@ -22,8 +22,6 @@
> >  
> >  extern int mem_init_done;
> >  
> > -static unsigned int fixmaps_used __initdata;
> > -
> >  /*
> >   * Remap an arbitrary physical address space into the kernel virtual
> >   * address space. Needed when the kernel wants to access high addresses
> > @@ -52,24 +50,14 @@ void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size)
> >  	p = addr & PAGE_MASK;
> >  	size = PAGE_ALIGN(last_addr + 1) - p;
> >  
> > -	if (likely(mem_init_done)) {
> > -		area = get_vm_area(size, VM_IOREMAP);
> > -		if (!area)
> > -			return NULL;
> > -		v = (unsigned long)area->addr;
> > -	} else {
> > -		if ((fixmaps_used + (size >> PAGE_SHIFT)) > FIX_N_IOREMAPS)
> > -			return NULL;
> > -		v = fix_to_virt(FIX_IOREMAP_BEGIN + fixmaps_used);
> > -		fixmaps_used += (size >> PAGE_SHIFT);
> > -	}
> > +	area = get_vm_area(size, VM_IOREMAP);
> > +	if (!area)
> > +		return NULL;
> > +	v = (unsigned long)area->addr;
> >  
> >  	if (ioremap_page_range(v, v + size, p,
> >  			__pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) {
> > -		if (likely(mem_init_done))
> > -			vfree(area->addr);
> > -		else
> > -			fixmaps_used -= (size >> PAGE_SHIFT);
> > +		vfree(area->addr);
> >  		return NULL;
> >  	}
> >  
> > -- 
> > 2.34.1
> > 
> > 
> 
> -- 
> Sincerely yours,
> Mike.
>