linux-stable.git/arch/mips/kernel/setup.c, branch v5.13.2

MIPS: kernel: setup.c: fix compilation error

2021-03-30T12:51:23+00:00

With ath79_defconfig enabling CONFIG_MIPS_ELF_APPENDED_DTB gives a
compilation error. This patch fixes it.

Build log:
...
  CC      kernel/locking/percpu-rwsem.o
../arch/mips/kernel/setup.c:46:39: error: conflicting types for
'__appended_dtb'
 const char __section(".appended_dtb") __appended_dtb[0x100000];
                                       ^~~~~~~~~~~~~~
In file included from ../arch/mips/kernel/setup.c:34:
../arch/mips/include/asm/bootinfo.h:118:13: note: previous declaration
of '__appended_dtb' was here
 extern char __appended_dtb[];
             ^~~~~~~~~~~~~~
  CC      fs/attr.o
make[4]: *** [../scripts/Makefile.build:271: arch/mips/kernel/setup.o]
 Error 1
...

Root cause seems to be:
Fixes: b83ba0b9df56 ("MIPS: of: Introduce helper function to get DTB")

Signed-off-by: Mauri Sandberg 
Reviewed-by: Thomas Bogendoerfer 
Cc: trivial@kernel.org
Signed-off-by: Thomas Bogendoerfer

MIPS: Use common way to parse elfcorehdr

2021-02-13T08:57:22+00:00

"elfcorehdr" can be parsed at kernel/crash_dump.c

Signed-off-by: Jinyang He 
Signed-off-by: Thomas Bogendoerfer

MIPS: remove CONFIG_DMA_MAYBE_COHERENT

2021-02-13T08:51:45+00:00

CONFIG_DMA_MAYBE_COHERENT just guards two early init options now.  Just
enable them unconditionally for CONFIG_DMA_NONCOHERENT.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Thomas Bogendoerfer

driver core: lift dma_default_coherent into common code

2021-02-13T08:51:45+00:00

Lift the dma_default_coherent variable from the mips architecture code
to the driver core.  This allows an architecture to sdefault all device
to be DMA coherent at run time, even if the kernel is build with support
for DMA noncoherent device.  By allowing device_initialize to set the
->dma_coherent field to this default the amount of arch hooks required
for this behavior can be greatly reduced.

Signed-off-by: Christoph Hellwig 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: Thomas Bogendoerfer

MIPS: refactor the runtime coherent vs noncoherent DMA indicators

2021-02-13T08:51:45+00:00

Replace the global coherentio enum, and the hw_coherentio (fake) boolean
variables with a single boolean dma_default_coherent flag.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Thomas Bogendoerfer

Revert "mips: Manually call fdt_init_reserved_mem() method"

2021-02-09T12:28:13+00:00

This reverts commit 3751cbda8f223549d7ea28803cbec8ac87e43ed2.

Originally the patch was created to fix the reserved-memory DT-node
parsing failure on the early stages of the platform memory initialization.
That happened due to the two early memory allocators utilization that
time: bootmem and memblock. At first the platform-specific memory mapping
array was initialized. Then the early_init_fdt_scan_reserved_mem() was
called, which couldn't fully parse the "reserved-memory" DT-node since
neither memblock nor bootmem allocators hadn't been initialized at that
stage, so the fdt_init_reserved_mem() method failed on the memory
allocation calls. Only after that the platform-specific memory mapping
were used to create proper bootmem and memblock structures and let the
early memory allocations work.  That's why we had to call the
fdt_init_reserved_mem() method one more time to retry the initialization
of the features like CMA.

The necessity to have that fix was disappeared after the full memblock
support had been added to the MIPS kernel and all plat_mem_setup() had
been fixed to add the memory regions right into the memblock memory pool.
Let's revert that patch then especially after having Paul reported that
the second fdt_init_reserved_mem() call causes the reserved memory pool
being created twice bigger than implied.

Fixes: a94e4f24ec83 ("MIPS: init: Drop boot_mem_map")
Reported-by: Paul Cercueil 
Signed-off-by: Serge Semin 
Signed-off-by: Thomas Bogendoerfer

MIPS: relocatable: Provide kaslr_offset() to get the kernel offset

2021-02-09T09:54:29+00:00

Provide kaslr_offset() to get the kernel offset when KASLR is enabled.
Error may occur before update_kaslr_offset(), so put it at the end of
the offset branch.

Fixes: a307a4ce9ecd ("MIPS: Loongson64: Add KASLR support")
Reported-by: kernel test robot 
Signed-off-by: Jinyang He 
Signed-off-by: Thomas Bogendoerfer

MIPS: of: Introduce helper function to get DTB

2021-02-04T12:34:51+00:00

Selection of the DTB to be used was burried in more or less readable
code in head.S. Move this code into a inline helper function and
use it.

Signed-off-by: Thomas Bogendoerfer 
Acked-by: Florian Fainelli

MIPS: Move memblock_dump_all() to the end of setup_arch()

2020-12-04T12:01:57+00:00

In order to get more memblock configuration with memblock=debug in the boot
cmdline, move memblock_dump_all() to the end of setup_arch(), this can help
us to get dmi_setup() and resource_init() memblock info, at least for now.

Signed-off-by: Tiezhu Yang 
Signed-off-by: Thomas Bogendoerfer

MIPS: Don't round up kernel sections size for memblock_add()

2020-12-04T12:01:18+00:00

Linux doesn't own the memory immediately after the kernel image. On Octeon
bootloader places a shared structure right close after the kernel _end,
refer to "struct cvmx_bootinfo *octeon_bootinfo" in cavium-octeon/setup.c.

If check_kernel_sections_mem() rounds the PFNs up, first memblock_alloc()
inside early_init_dt_alloc_memory_arch() <= device_tree_init() returns
memory block overlapping with the above octeon_bootinfo structure, which
is being overwritten afterwards.

Fixes: a94e4f24ec83 ("MIPS: init: Drop boot_mem_map")
Signed-off-by: Alexander Sverdlin 
Signed-off-by: Thomas Bogendoerfer