[PATCH v2 RFC] pasemi: Fix boot failure on 4.7-rc1

[Aneesh Kumar K.V]

Darren Stevens <darren at stevens-zone.net> writes:

>     Commit:d6a9996e84ac4beb7713e9485f4563e100a9b03e (powerpc/mm:
>     vmalloc abstraction in preparation for radix) turned kernel memory
>     and IO addresses from #defined constants to variables initialised
>     at runtime.
>     
>     On PA6T systems the setup_arch machine call initialises the onboard
>     PCI-e root-ports, and uses pci_io_base to do this, which is now before
>     its value has been set resulting in a panic right after 'booting 
>     linux via __start()'
>
>     Move the pci_io_base initialisation to the same place as vmalloc
>     ranges are set (hash__early_init_mmu()/radix__early_init_mmu())
>     
>     Reported-by: Christian Zigotzky <chzigotzky at xenosoft.de>
>     Signed-off-by: Darren Stevens <darren at stevens-zone.net>


Reviewed-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>

>     
> ---
>
> Tested on my AmigaOneX1000, I don't have access to a refence board system,
> and our developer with one is on honeymoon.
>
> I am hoping to follow this patch with others to reduce the size of the nemo
> patch we apply, eventually I'd like to see the patch gone, but that is a 
> very big job.
>
> Kind regards
> Darren
> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
> index 88a5eca..ab84c89 100644
> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
> @@ -230,6 +230,7 @@ extern unsigned long __kernel_virt_size;
>  #define KERN_VIRT_SIZE  __kernel_virt_size
>  extern struct page *vmemmap;
>  extern unsigned long ioremap_bot;
> +extern unsigned long pci_io_base;
>  #endif /* __ASSEMBLY__ */
>
>  #include <asm/book3s/64/hash.h>
> diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
> index 3759df5..a5ae49a 100644
> --- a/arch/powerpc/kernel/pci_64.c
> +++ b/arch/powerpc/kernel/pci_64.c
> @@ -47,7 +47,6 @@ static int __init pcibios_init(void)
>
>  	printk(KERN_INFO "PCI: Probing PCI hardware\n");
>
> -	pci_io_base = ISA_IO_BASE;
>  	/* For now, override phys_mem_access_prot. If we need it,g
>  	 * later, we may move that initialization to each ppc_md
>  	 */
> diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
> index 5b22ba0..b5b5fe6 100644
> --- a/arch/powerpc/mm/hash_utils_64.c
> +++ b/arch/powerpc/mm/hash_utils_64.c
> @@ -922,6 +922,8 @@ void __init hash__early_init_mmu(void)
>  	vmemmap = (struct page *)H_VMEMMAP_BASE;
>  	ioremap_bot = IOREMAP_BASE;
>
> +	pci_io_base = ISA_IO_BASE;
> +
>  	/* Initialize the MMU Hash table and create the linear mapping
>  	 * of memory. Has to be done before SLB initialization as this is
>  	 * currently where the page size encoding is obtained.
> diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
> index e58707d..095fbfa 100644
> --- a/arch/powerpc/mm/pgtable-radix.c
> +++ b/arch/powerpc/mm/pgtable-radix.c
> @@ -328,6 +328,9 @@ void __init radix__early_init_mmu(void)
>  	__vmalloc_end = RADIX_VMALLOC_END;
>  	vmemmap = (struct page *)RADIX_VMEMMAP_BASE;
>  	ioremap_bot = IOREMAP_BASE;
> +
> +	pci_io_base = ISA_IO_BASE;
> +
>  	/*
>  	 * For now radix also use the same frag size
>  	 */