Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section
When not aligned, random bits could be written in the initial page table
by the __create_page_tables() function.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Catalin Marinas and committed by Russell King cc9897df cf0bb91b
+2
-1
arch/arm/mach-realview/realview_eb.c
+2
-1
arch/arm/mach-realview/realview_eb.c
···
32
32
#include <asm/leds.h>
33
33
#include <asm/mach-types.h>
34
34
#include <asm/pmu.h>
35
+
#include <asm/pgtable.h>
35
36
#include <asm/hardware/gic.h>
36
37
#include <asm/hardware/cache-l2x0.h>
37
38
#include <asm/localtimer.h>
···
458
457
459
458
MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
460
459
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
461
-
.phys_io = REALVIEW_EB_UART0_BASE,
460
+
.phys_io = REALVIEW_EB_UART0_BASE & SECTION_MASK,
462
461
.io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc,
463
462
.boot_params = PHYS_OFFSET + 0x00000100,
464
463
.fixup = realview_fixup,
+2
-1
arch/arm/mach-realview/realview_pb1176.c
+2
-1
arch/arm/mach-realview/realview_pb1176.c
···
32
32
#include <asm/leds.h>
33
33
#include <asm/mach-types.h>
34
34
#include <asm/pmu.h>
35
+
#include <asm/pgtable.h>
35
36
#include <asm/hardware/gic.h>
36
37
#include <asm/hardware/cache-l2x0.h>
37
38
···
352
351
353
352
MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
354
353
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
355
-
.phys_io = REALVIEW_PB1176_UART0_BASE,
354
+
.phys_io = REALVIEW_PB1176_UART0_BASE & SECTION_MASK,
356
355
.io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc,
357
356
.boot_params = PHYS_OFFSET + 0x00000100,
358
357
.fixup = realview_pb1176_fixup,
+2
-1
arch/arm/mach-realview/realview_pb11mp.c
+2
-1
arch/arm/mach-realview/realview_pb11mp.c
···
32
32
#include <asm/leds.h>
33
33
#include <asm/mach-types.h>
34
34
#include <asm/pmu.h>
35
+
#include <asm/pgtable.h>
35
36
#include <asm/hardware/gic.h>
36
37
#include <asm/hardware/cache-l2x0.h>
37
38
#include <asm/localtimer.h>
···
374
373
375
374
MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")
376
375
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
377
-
.phys_io = REALVIEW_PB11MP_UART0_BASE,
376
+
.phys_io = REALVIEW_PB11MP_UART0_BASE & SECTION_MASK,
378
377
.io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc,
379
378
.boot_params = PHYS_OFFSET + 0x00000100,
380
379
.fixup = realview_fixup,
+2
-1
arch/arm/mach-realview/realview_pba8.c
+2
-1
arch/arm/mach-realview/realview_pba8.c
···
31
31
#include <asm/leds.h>
32
32
#include <asm/mach-types.h>
33
33
#include <asm/pmu.h>
34
+
#include <asm/pgtable.h>
34
35
#include <asm/hardware/gic.h>
35
36
36
37
#include <asm/mach/arch.h>
···
324
323
325
324
MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
326
325
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
327
-
.phys_io = REALVIEW_PBA8_UART0_BASE,
326
+
.phys_io = REALVIEW_PBA8_UART0_BASE & SECTION_MASK,
328
327
.io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc,
329
328
.boot_params = PHYS_OFFSET + 0x00000100,
330
329
.fixup = realview_fixup,
+2
-1
arch/arm/mach-realview/realview_pbx.c
+2
-1
arch/arm/mach-realview/realview_pbx.c
···
31
31
#include <asm/mach-types.h>
32
32
#include <asm/pmu.h>
33
33
#include <asm/smp_twd.h>
34
+
#include <asm/pgtable.h>
34
35
#include <asm/hardware/gic.h>
35
36
#include <asm/hardware/cache-l2x0.h>
36
37
···
410
409
411
410
MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")
412
411
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
413
-
.phys_io = REALVIEW_PBX_UART0_BASE,
412
+
.phys_io = REALVIEW_PBX_UART0_BASE & SECTION_MASK,
414
413
.io_pg_offst = (IO_ADDRESS(REALVIEW_PBX_UART0_BASE) >> 18) & 0xfffc,
415
414
.boot_params = PHYS_OFFSET + 0x00000100,
416
415
.fixup = realview_pbx_fixup,