]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Initialise pci_io_base as early as possible
authorDarren Stevens <darren@stevens-zone.net>
Wed, 29 Jun 2016 20:06:28 +0000 (21:06 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 30 Jun 2016 06:52:29 +0000 (16:52 +1000)
commitbfa37087aa04e45f56c41142dfceecb79b8e6ef9
tree10c6b93fe8200884e7010e1c3e27ead41cb00765
parent190ce8693c23eae09ba5f303a83bf2fbeb6478b1
powerpc: Initialise pci_io_base as early as possible

Commit d6a9996e84ac ("powerpc/mm: vmalloc abstraction in preparation for
radix") turned kernel memory and IO addresses from #defined constants to
variables initialised at runtime.

On PA6T (pasemi) 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 early in boot before
console IO is initialised.

Move the pci_io_base initialisation to the same place as vmalloc ranges
are set (hash__early_init_mmu()/radix__early_init_mmu()) - this is the
earliest possible place we can initialise it.

Fixes: d6a9996e84ac ("powerpc/mm: vmalloc abstraction in preparation for radix")
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Darren Stevens <darren@stevens-zone.net>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[mpe: Add #ifdef CONFIG_PCI, massage change log slightly]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/include/asm/book3s/64/pgtable.h
arch/powerpc/kernel/pci_64.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/pgtable-radix.c