[PATCH] balance ioremap/iounmap in {sycamore, walnut}_setup_arch()

[Valentine Barshak]

Roel Kluin wrote:
> I guess it should be done after the last usage of kb_data or fpga_status?

I think no iounmap(kb_data) needed. Looks like the pointer kn_cs (kb_cs 
= kb_data + 1) is used by the serio driver 
(drivers/input/serio/i8042-ppcio.h).
Please note that we just ioremap and assign pointers here, not actually 
reading the registers.
Also, looks like you unmap the fpga registers too early.
Thanks,
Valentine.

> --
> Balance ioremap/iounmap
> 
> Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
> ---
> diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c
> index 8689f3e..4f3bac1 100644
> --- a/arch/ppc/platforms/4xx/sycamore.c
> +++ b/arch/ppc/platforms/4xx/sycamore.c
> @@ -99,28 +99,30 @@ sycamore_setup_arch(void)
>  	kb_data = ioremap(SYCAMORE_PS2_BASE, 8);
>  	if (!kb_data) {
>  		printk(KERN_CRIT
>  		       "sycamore_setup_arch() kb_data ioremap failed\n");
>  		return;
>  	}
>  
>  	kb_cs = kb_data + 1;
> +	iounmap(kb_data);
>  
>  	fpga_status = ioremap(PPC40x_FPGA_BASE, 8);
>  	if (!fpga_status) {
>  		printk(KERN_CRIT
>  		       "sycamore_setup_arch() fpga_status ioremap failed\n");
>  		return;
>  	}
>  
>  	fpga_enable = fpga_status + 1;
>  	fpga_polarity = fpga_status + 2;
>  	fpga_trigger = fpga_status + 3;
>  	fpga_brdc = fpga_status + 4;
> +	iounmap(fpga_status);
>  
>  	/* split the keyboard and mouse interrupts */
>  	fpga_brdc_data = readb(fpga_brdc);
>  	fpga_brdc_data |= 0x80;
>  	writeb(fpga_brdc_data, fpga_brdc);
>  
>  	writeb(0x3, fpga_enable);
>  
> diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c
> index 2f97723..8cfeb94 100644
> --- a/arch/ppc/platforms/4xx/walnut.c
> +++ b/arch/ppc/platforms/4xx/walnut.c
> @@ -81,28 +81,30 @@ walnut_setup_arch(void)
>  	kb_data = ioremap(WALNUT_PS2_BASE, 8);
>  	if (!kb_data) {
>  		printk(KERN_CRIT
>  		       "walnut_setup_arch() kb_data ioremap failed\n");
>  		return;
>  	}
>  
>  	kb_cs = kb_data + 1;
> +	iounmap(kb_data);
>  
>  	fpga_status = ioremap(PPC40x_FPGA_BASE, 8);
>  	if (!fpga_status) {
>  		printk(KERN_CRIT
>  		       "walnut_setup_arch() fpga_status ioremap failed\n");
>  		return;
>  	}
>  
>  	fpga_enable = fpga_status + 1;
>  	fpga_polarity = fpga_status + 2;
>  	fpga_trigger = fpga_status + 3;
>  	fpga_brdc = fpga_status + 4;
> +	iounmap(fpga_status);
>  
>  	/* split the keyboard and mouse interrupts */
>  	fpga_brdc_data = readb(fpga_brdc);
>  	fpga_brdc_data |= 0x80;
>  	writeb(fpga_brdc_data, fpga_brdc);
>  
>  	writeb(0x3, fpga_enable);
>  
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev