From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit acdc6399306d47f8d737124d380f9ca3116e0056.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/vdso/vgettimeofday.c | 5 ----- 1 file changed, 5 deletions(-)

diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 3842e5fbc196..a003beacac76 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -4,11 +4,6 @@ * * Copyright 2015 Mentor Graphics Corporation. */ - -#ifdef CONFIG_RANDOMIZE_BASE -#pragma GCC visibility pop -#endif - #include <linux/time.h> #include <linux/types.h> #include <asm/vdso.h>

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit d29736d398ca69516e102766c691edb356faffb5.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/include/asm/memory.h | 14 -------------- arch/arm/kernel/head.S | 6 +++--- arch/arm/kernel/setup.c | 31 ------------------------------- 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 11bf7814fb93..ef2aa79ece5a 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -171,20 +171,6 @@ extern unsigned long vectors_base; extern u64 kernel_sec_start; extern u64 kernel_sec_end;

-#ifdef CONFIG_RANDOMIZE_BASE -extern unsigned long __kaslr_offset; - -static inline unsigned long kaslr_offset(void) -{ - return __kaslr_offset; -} -#else -static inline unsigned long kaslr_offset(void) -{ - return 0; -} -#endif - /* * Physical vs virtual RAM address space conversion. These are * private definitions which should NOT be used outside memory.h diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 9da384ff7c8a..13a84864d771 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -119,11 +119,11 @@ ENTRY(stext) #ifdef CONFIG_RANDOMIZE_BASE str_l r3, __kaslr_offset, r9 @ offset in r3 if entered via kaslr ep

- .pushsection .data @ data in bss will be cleared + .section ".bss", "aw", %nobits .align 2 -ENTRY(__kaslr_offset) +__kaslr_offset: .long 0 @ will be wiped before entering C code - .popsection + .previous #endif

#ifdef CONFIG_ARM_VIRT_EXT diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 5cfc9c5056a7..c66b560562b3 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -60,7 +60,6 @@ #include <asm/memblock.h> #include <asm/virt.h> #include <asm/kasan.h> -#include <linux/panic_notifier.h>

#include "atags.h"

@@ -1360,33 +1359,3 @@ const struct seq_operations cpuinfo_op = { .stop = c_stop, .show = c_show }; - -/* - * Dump out kernel offset information on panic. - */ -static int dump_kernel_offset(struct notifier_block *self, unsigned long v, - void *p) -{ - const unsigned long offset = kaslr_offset(); - - if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && offset > 0) { - pr_emerg("Kernel Offset: 0x%lx from 0x%lx\n", - offset, PAGE_OFFSET); - - } else { - pr_emerg("Kernel Offset: disabled\n"); - } - return 0; -} - -static struct notifier_block kernel_offset_notifier = { - .notifier_call = dump_kernel_offset -}; - -static int __init register_kernel_offset_dumper(void) -{ - atomic_notifier_chain_register(&panic_notifier_list, - &kernel_offset_notifier); - return 0; -} -__initcall(register_kernel_offset_dumper);

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 3fa7cb6e31b8fa1cfdc9b2e65a613abaa426c053.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/boot/compressed/head.S | 31 ------------------------------- 1 file changed, 31 deletions(-)

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index f3a99e6aef19..79d88fb10714 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -472,29 +472,6 @@ dtb_check_done: bne 1f

stmfd sp!, {r0-r3, ip, lr} -#ifdef CONFIG_ARCH_HISI -#ifdef CONFIG_ARM_APPENDED_DTB -#ifdef CONFIG_START_MEM_2M_ALIGN - mov r0, r4 -#ifdef CONFIG_CORTEX_A9 - lsr r0, r0, #20 - lsl r0, r0, #20 -#else - lsr r0, r0, #21 - lsl r0, r0, #21 -#endif - add r0, r0, #0x1000 - ldr r1, [r0] -#ifndef __ARMEB__ - ldr r2, =0xedfe0dd0 @ sig is 0xd00dfeed big endian -#else - ldr r2, =0xd00dfeed -#endif - cmp r1, r2 - moveq r8, r0 -#endif -#endif -#endif adr_l r2, _text @ start of zImage stmfd sp!, {r2, r8, r10} @ pass stack arguments

@@ -516,14 +493,6 @@ dtb_check_done: add sp, sp, #12 cmp r0, #0 addne r4, r4, r0 @ add offset to base address -#ifdef CONFIG_VXBOOT -#ifdef CONFIG_START_MEM_2M_ALIGN -#ifdef CONFIG_CORTEX_A9 - adr r1, vx_edata - strne r6, [r1] -#endif -#endif -#endif ldmfd sp!, {r0-r3, ip, lr} bne restart 1:

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 60c8a2d415995e359fd2b9f2da6acb0bc392127a.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/boot/compressed/Makefile | 9 +- arch/arm/boot/compressed/head.S | 88 ------ arch/arm/boot/compressed/kaslr.c | 433 ----------------------------- arch/arm/include/asm/vmlinux.lds.h | 3 +- arch/arm/kernel/vmlinux.lds.S | 15 +- 5 files changed, 3 insertions(+), 545 deletions(-) delete mode 100644 arch/arm/boot/compressed/kaslr.c

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 203efc1d0c81..abba7458d1c3 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -85,17 +85,10 @@ compress-$(CONFIG_KERNEL_LZ4) = lz4_with_size

libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o

-ifneq ($(CONFIG_ARM_ATAG_DTB_COMPAT)$(CONFIG_RANDOMIZE_BASE),) -OBJS += $(libfdt_objs) ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y) CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN} CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280 -OBJS += atags_to_fdt.o -endif -ifeq ($(CONFIG_RANDOMIZE_BASE),y) -OBJS += kaslr.o -CFLAGS_kaslr.o := -I $(srctree)/scripts/dtc/libfdt -endif +OBJS += $(libfdt_objs) atags_to_fdt.o endif ifeq ($(CONFIG_USE_OF),y) OBJS += $(libfdt_objs) fdt_check_mem_start.o diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 79d88fb10714..2021baee35ad 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -174,25 +174,6 @@ #endif .endm

- .macro record_seed -#ifdef CONFIG_RANDOMIZE_BASE - sub ip, r1, ip, ror #1 @ poor man's kaslr seed, will - sub ip, r2, ip, ror #2 @ be superseded by kaslr-seed - sub ip, r3, ip, ror #3 @ from /chosen if present - sub ip, r4, ip, ror #5 - sub ip, r5, ip, ror #8 - sub ip, r6, ip, ror #13 - sub ip, r7, ip, ror #21 - sub ip, r8, ip, ror #3 - sub ip, r9, ip, ror #24 - sub ip, r10, ip, ror #27 - sub ip, r11, ip, ror #19 - sub ip, r13, ip, ror #14 - sub ip, r14, ip, ror #2 - str_l ip, __kaslr_seed, r9 -#endif - .endm - .section ".start", "ax" /* * sort out different calling conventions @@ -241,7 +222,6 @@ start: __EFI_HEADER 1: ARM_BE8( setend be ) @ go BE8 if compiled for BE8 - record_seed AR_CLASS( mrs r9, cpsr ) #ifdef CONFIG_ARM_VIRT_EXT bl __hyp_stub_install @ get into SVC mode, reversibly @@ -466,38 +446,6 @@ restart: adr r0, LC1 dtb_check_done: #endif

-#ifdef CONFIG_RANDOMIZE_BASE - ldr r1, __kaslr_offset @ check if the kaslr_offset is - cmp r1, #0 @ already set - bne 1f - - stmfd sp!, {r0-r3, ip, lr} - adr_l r2, _text @ start of zImage - stmfd sp!, {r2, r8, r10} @ pass stack arguments - - ldr_l r3, __kaslr_seed -#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) - /* - * Get some pseudo-entropy from the low bits of the generic - * timer if it is implemented. - */ - mrc p15, 0, r1, c0, c1, 1 @ read ID_PFR1 register - tst r1, #0x10000 @ have generic timer? - mrrcne p15, 1, r3, r1, c14 @ read CNTVCT -#endif - adr_l r0, __kaslr_offset @ pass &__kaslr_offset in r0 - mov r1, r4 @ pass base address - mov r2, r9 @ pass decompressed image size - eor r3, r3, r3, ror #16 @ pass pseudorandom seed - bl kaslr_early_init - add sp, sp, #12 - cmp r0, #0 - addne r4, r4, r0 @ add offset to base address - ldmfd sp!, {r0-r3, ip, lr} - bne restart -1: -#endif - /* * Check to see if we will overwrite ourselves. * r4 = final kernel address (possibly with LSB set) @@ -1491,46 +1439,10 @@ __enter_kernel: mov r0, #0 @ must be 0 mov r1, r7 @ restore architecture number mov r2, r8 @ restore atags pointer -#ifdef CONFIG_RANDOMIZE_BASE - ldr r3, __kaslr_offset - add r4, r4, #4 @ skip first instruction -#endif ARM( mov pc, r4 ) @ call kernel M_CLASS( add r4, r4, #1 ) @ enter in Thumb mode for M class THUMB( bx r4 ) @ entry point is always ARM for A/R classes

-#ifdef CONFIG_RANDOMIZE_BASE - /* - * Minimal implementation of CRC-16 that does not use a - * lookup table and uses 32-bit wide loads, so it still - * performs reasonably well with the D-cache off. Equivalent - * to lib/crc16.c for input sizes that are 4 byte multiples. - */ -ENTRY(__crc16) - push {r4, lr} - ldr r3, =0xa001 @ CRC-16 polynomial -0: subs r2, r2, #4 - popmi {r4, pc} - ldr r4, [r1], #4 -#ifdef __ARMEB__ - eor ip, r4, r4, ror #16 @ endian swap - bic ip, ip, #0x00ff0000 - mov r4, r4, ror #8 - eor r4, r4, ip, lsr #8 -#endif - eor r0, r0, r4 - .rept 32 - lsrs r0, r0, #1 - eorcs r0, r0, r3 - .endr - b 0b -ENDPROC(__crc16) - - .align 2 -__kaslr_seed: .long 0 -__kaslr_offset: .long 0 -#endif - reloc_code_end:

#ifdef CONFIG_EFI_STUB diff --git a/arch/arm/boot/compressed/kaslr.c b/arch/arm/boot/compressed/kaslr.c deleted file mode 100644 index 169c6774f5ad..000000000000 --- a/arch/arm/boot/compressed/kaslr.c +++ /dev/null @@ -1,433 +0,0 @@ -/* - * Copyright (C) 2017 Linaro Ltd; ard.biesheuvel@linaro.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - */ - -#include <linux/libfdt_env.h> -#include <libfdt.h> -#include <linux/types.h> -#include <generated/compile.h> -#include <generated/utsrelease.h> -#include <generated/utsversion.h> -#include <linux/pgtable.h> - -#include CONFIG_UNCOMPRESS_INCLUDE - -struct regions { - u32 pa_start; - u32 pa_end; - u32 image_size; - u32 zimage_start; - u32 zimage_size; - u32 dtb_start; - u32 dtb_size; - u32 initrd_start; - u32 initrd_size; - int reserved_mem; - int reserved_mem_addr_cells; - int reserved_mem_size_cells; -}; - -extern u32 __crc16(u32 crc, u32 const input[], int byte_count); - -static u32 __memparse(const char *val, const char **retptr) -{ - int base = 10; - u32 ret = 0; - - if (*val == '0') { - val++; - if (*val == 'x' || *val == 'X') { - val++; - base = 16; - } else { - base = 8; - } - } - - while (*val != ',' && *val != ' ' && *val != '\0') { - char c = *val++; - - switch (c) { - case '0' ... '9': - ret = ret * base + (c - '0'); - continue; - case 'a' ... 'f': - ret = ret * base + (c - 'a' + 10); - continue; - case 'A' ... 'F': - ret = ret * base + (c - 'A' + 10); - continue; - case 'g': - case 'G': - ret <<= 10; - fallthrough; - case 'm': - case 'M': - ret <<= 10; - fallthrough; - case 'k': - case 'K': - ret <<= 10; - break; - default: - if (retptr) - *retptr = NULL; - return 0; - } - } - if (retptr) - *retptr = val; - return ret; -} - -static bool regions_intersect(u32 s1, u32 e1, u32 s2, u32 e2) -{ - return e1 >= s2 && e2 >= s1; -} - -static bool intersects_reserved_region(const void *fdt, u32 start, - u32 end, struct regions *regions) -{ - int subnode, len, i; - u64 base, size; - - /* check for overlap with /memreserve/ entries */ - for (i = 0; i < fdt_num_mem_rsv(fdt); i++) { - if (fdt_get_mem_rsv(fdt, i, &base, &size) < 0) - continue; - if (regions_intersect(start, end, base, base + size)) - return true; - } - - if (regions->reserved_mem < 0) - return false; - - /* check for overlap with static reservations in /reserved-memory */ - for (subnode = fdt_first_subnode(fdt, regions->reserved_mem); - subnode >= 0; - subnode = fdt_next_subnode(fdt, subnode)) { - const fdt32_t *reg; - - len = 0; - reg = fdt_getprop(fdt, subnode, "reg", &len); - while (len >= (regions->reserved_mem_addr_cells + - regions->reserved_mem_size_cells)) { - - base = fdt32_to_cpu(reg[0]); - if (regions->reserved_mem_addr_cells == 2) - base = (base << 32) | fdt32_to_cpu(reg[1]); - - reg += regions->reserved_mem_addr_cells; - len -= 4 * regions->reserved_mem_addr_cells; - - size = fdt32_to_cpu(reg[0]); - if (regions->reserved_mem_size_cells == 2) - size = (size << 32) | fdt32_to_cpu(reg[1]); - - reg += regions->reserved_mem_size_cells; - len -= 4 * regions->reserved_mem_size_cells; - - if (base >= regions->pa_end) - continue; - - if (regions_intersect(start, end, base, - min(base + size, (u64)U32_MAX))) - return true; - } - } - return false; -} - -static bool intersects_occupied_region(const void *fdt, u32 start, - u32 end, struct regions *regions) -{ - if (regions_intersect(start, end, regions->zimage_start, - regions->zimage_start + regions->zimage_size)) - return true; - - if (regions_intersect(start, end, regions->initrd_start, - regions->initrd_start + regions->initrd_size)) - return true; - - if (regions_intersect(start, end, regions->dtb_start, - regions->dtb_start + regions->dtb_size)) - return true; - - return intersects_reserved_region(fdt, start, end, regions); -} - -static u32 count_suitable_regions(const void *fdt, struct regions *regions, - u32 *bitmap) -{ - u32 pa, i = 0, ret = 0; - - for (pa = regions->pa_start; pa < regions->pa_end; pa += SZ_2M, i++) { - if (!intersects_occupied_region(fdt, pa, - pa + regions->image_size, - regions)) { - ret++; - } else { - /* set 'occupied' bit */ - bitmap[i >> 5] |= BIT(i & 0x1f); - } - } - return ret; -} - -/* The caller ensures that num is within the range of regions.*/ -static u32 get_region_number(u32 num, u32 *bitmap, u32 size) -{ - u32 i, cnt = size * BITS_PER_BYTE * sizeof(u32); - - for (i = 0; i < cnt; i++) { - if (bitmap[i >> 5] & BIT(i & 0x1f)) - continue; - if (num-- == 0) - break; - } - - return i; -} - -static void get_cell_sizes(const void *fdt, int node, int *addr_cells, - int *size_cells) -{ - const int *prop; - int len; - - /* - * Retrieve the #address-cells and #size-cells properties - * from the 'node', or use the default if not provided. - */ - *addr_cells = *size_cells = 1; - - prop = fdt_getprop(fdt, node, "#address-cells", &len); - if (len == 4) - *addr_cells = fdt32_to_cpu(*prop); - prop = fdt_getprop(fdt, node, "#size-cells", &len); - if (len == 4) - *size_cells = fdt32_to_cpu(*prop); -} - -/* - * Original method only consider the first memory node in dtb, - * but there may be more than one memory nodes, we only consider - * the memory node zImage exists. - */ -static u32 get_memory_end(const void *fdt, u32 zimage_start) -{ - int mem_node, address_cells, size_cells, len; - const fdt32_t *reg; - - /* Look for a node called "memory" at the lowest level of the tree */ - mem_node = fdt_path_offset(fdt, "/memory"); - if (mem_node <= 0) - return 0; - - get_cell_sizes(fdt, 0, &address_cells, &size_cells); - - while (mem_node >= 0) { - /* - * Now find the 'reg' property of the /memory node, and iterate over - * the base/size pairs. - */ - len = 0; - reg = fdt_getprop(fdt, mem_node, "reg", &len); - while (len >= 4 * (address_cells + size_cells)) { - u64 base, size; - base = fdt32_to_cpu(reg[0]); - if (address_cells == 2) - base = (base << 32) | fdt32_to_cpu(reg[1]); - - reg += address_cells; - len -= 4 * address_cells; - - size = fdt32_to_cpu(reg[0]); - if (size_cells == 2) - size = (size << 32) | fdt32_to_cpu(reg[1]); - - reg += size_cells; - len -= 4 * size_cells; - - /* Get the base and size of the zimage memory node */ - if (zimage_start >= base && zimage_start < base + size) - return base + size; - } - /* If current memory node is not the one zImage exists, then traverse next memory node. */ - mem_node = fdt_node_offset_by_prop_value(fdt, mem_node, "device_type", "memory", sizeof("memory")); - } - - return 0; -} - -static char *__strstr(const char *s1, const char *s2, int l2) -{ - int l1; - - l1 = strlen(s1); - while (l1 >= l2) { - l1--; - if (!memcmp(s1, s2, l2)) - return (char *)s1; - s1++; - } - return NULL; -} - -static const char *get_cmdline_param(const char *cmdline, const char *param, - int param_size) -{ - static const char default_cmdline[] = CONFIG_CMDLINE; - const char *p; - - if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline != NULL) { - p = __strstr(cmdline, param, param_size); - if (p == cmdline || - (p > cmdline && *(p - 1) == ' ')) - return p; - } - - if (IS_ENABLED(CONFIG_CMDLINE_FORCE) || - IS_ENABLED(CONFIG_CMDLINE_EXTEND)) { - p = __strstr(default_cmdline, param, param_size); - if (p == default_cmdline || - (p > default_cmdline && *(p - 1) == ' ')) - return p; - } - return NULL; -} - -u32 kaslr_early_init(u32 *kaslr_offset, u32 image_base, u32 image_size, - u32 seed, u32 zimage_start, const void *fdt, - u32 zimage_end) -{ - static const char __aligned(4) build_id[] = UTS_VERSION UTS_RELEASE; - u32 bitmap[(VMALLOC_END - PAGE_OFFSET) / SZ_2M / 32] = {}; - struct regions regions; - const char *command_line; - const char *p; - int chosen, len; - u32 lowmem_top, count, num, mem_fdt; - - if (IS_ENABLED(CONFIG_EFI_STUB)) { - extern u32 __efi_kaslr_offset; - - if (__efi_kaslr_offset == U32_MAX) - return 0; - } - - if (fdt_check_header(fdt)) - return 0; - - chosen = fdt_path_offset(fdt, "/chosen"); - if (chosen < 0) - return 0; - - command_line = fdt_getprop(fdt, chosen, "bootargs", &len); - - /* check the command line for the presence of 'nokaslr' */ - p = get_cmdline_param(command_line, "nokaslr", sizeof("nokaslr") - 1); - if (p != NULL) - return 0; - - /* check the command line for the presence of 'vmalloc=' */ - p = get_cmdline_param(command_line, "vmalloc=", sizeof("vmalloc=") - 1); - if (p != NULL) - lowmem_top = VMALLOC_END - __memparse(p + 8, NULL) - - VMALLOC_OFFSET; - else - lowmem_top = VMALLOC_DEFAULT_BASE; - - regions.image_size = image_base % SZ_128M + round_up(image_size, SZ_2M); - regions.pa_start = round_down(image_base, SZ_128M); - regions.pa_end = lowmem_top - PAGE_OFFSET + regions.pa_start; - regions.zimage_start = zimage_start; - regions.zimage_size = zimage_end - zimage_start; - regions.dtb_start = (u32)fdt; - regions.dtb_size = fdt_totalsize(fdt); - - /* - * Stir up the seed a bit by taking the CRC of the DTB: - * hopefully there's a /chosen/kaslr-seed in there. - */ - seed = __crc16(seed, fdt, regions.dtb_size); - - /* stir a bit more using data that changes between builds */ - seed = __crc16(seed, (u32 *)build_id, sizeof(build_id)); - - /* check for initrd on the command line */ - regions.initrd_start = regions.initrd_size = 0; - p = get_cmdline_param(command_line, "initrd=", sizeof("initrd=") - 1); - if (p != NULL) { - regions.initrd_start = __memparse(p + 7, &p); - if (*p++ == ',') - regions.initrd_size = __memparse(p, NULL); - if (regions.initrd_size == 0) - regions.initrd_start = 0; - } - - /* ... or in /chosen */ - if (regions.initrd_size == 0) { - const fdt32_t *prop; - u64 start = 0, end = 0; - - prop = fdt_getprop(fdt, chosen, "linux,initrd-start", &len); - if (prop) { - start = fdt32_to_cpu(prop[0]); - if (len == 8) - start = (start << 32) | fdt32_to_cpu(prop[1]); - } - - prop = fdt_getprop(fdt, chosen, "linux,initrd-end", &len); - if (prop) { - end = fdt32_to_cpu(prop[0]); - if (len == 8) - end = (end << 32) | fdt32_to_cpu(prop[1]); - } - if (start != 0 && end != 0 && start < U32_MAX) { - regions.initrd_start = start; - regions.initrd_size = min_t(u64, end, U32_MAX) - start; - } - } - - /* - * check the memory nodes for the size of the lowmem region, traverse - * all memory nodes to find the node in which zImage exists, we - * randomize kernel only in the one zImage exists. - */ - mem_fdt = get_memory_end(fdt, zimage_start); - if (mem_fdt) - regions.pa_end = min(regions.pa_end, mem_fdt) - regions.image_size; - else - regions.pa_end = regions.pa_end - regions.image_size; - - /* check for a reserved-memory node and record its cell sizes */ - regions.reserved_mem = fdt_path_offset(fdt, "/reserved-memory"); - if (regions.reserved_mem >= 0) - get_cell_sizes(fdt, regions.reserved_mem, - &regions.reserved_mem_addr_cells, - &regions.reserved_mem_size_cells); - - /* - * Iterate over the physical memory range covered by the lowmem region - * in 2 MB increments, and count each offset at which we don't overlap - * with any of the reserved regions for the zImage itself, the DTB, - * the initrd and any regions described as reserved in the device tree. - * If the region does overlap, set the respective bit in the bitmap[]. - * Using this random value, we go over the bitmap and count zero bits - * until we counted enough iterations, and return the offset we ended - * up at. - */ - count = count_suitable_regions(fdt, &regions, bitmap); - - num = ((u16)seed * count) >> 16; - - *kaslr_offset = get_region_number(num, bitmap, sizeof(bitmap) / sizeof(u32)) * SZ_2M; - - return *kaslr_offset; -} diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h index dcc319b10a09..e291fef3213f 100644 --- a/arch/arm/include/asm/vmlinux.lds.h +++ b/arch/arm/include/asm/vmlinux.lds.h @@ -75,7 +75,7 @@ */ #define ARM_ASSERTS \ .plt : { \ - *(.iplt) * (.rel.iplt) * (.iplt) * (.igot.plt) * (.plt) \ + *(.iplt) *(.rel.iplt) *(.iplt) *(.igot.plt) \ } \ ASSERT(SIZEOF(.plt) == 0, \ "Unexpected run-time procedure linkages detected!") @@ -105,7 +105,6 @@ ARM_STUBS_TEXT \ . = ALIGN(4); \ *(.got) /* Global offset table */ \ - *(.got.plt) \ ARM_CPU_KEEP(PROC_INFO)

/* Stack unwinding tables */ diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index b659b4b69e01..d6ccf647eef7 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -69,10 +69,6 @@ SECTIONS #endif _etext = .; /* End of text section */

- .gnu.hash : { - *(.gnu.hash) - } - RO_DATA(PAGE_SIZE)

. = ALIGN(4); @@ -120,7 +116,7 @@ SECTIONS #endif .rel.dyn : ALIGN(8) { __rel_begin = .; - *(.rel .rel.* .rel.dyn .rel*) + *(.rel .rel.* .rel.dyn) } __rel_end = ADDR(.rel.dyn) + SIZEOF(.rel.dyn);

@@ -153,15 +149,6 @@ SECTIONS

_sdata = .; RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN) - - .data.rel.local : { - *(.data.rel.local) - } - - .data.rel.ro : { - *(.data.rel.ro) - } - _edata = .;

BSS_SECTION(0, 0, 0)

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 08c92891c43701e0e68ace8ebf95eaeebb61142a.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/Kconfig | 12 ----- arch/arm/kernel/head.S | 102 ++++------------------------------------- 2 files changed, 9 insertions(+), 105 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2483ce304375..a82bef783210 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1458,18 +1458,6 @@ config RELOCATABLE depends on !XIP_KERNEL && !JUMP_LABEL select HAVE_ARCH_PREL32_RELOCATIONS

-config RANDOMIZE_BASE - bool "Randomize the address of the kernel image" - depends on MMU && AUTO_ZRELADDR - depends on !XIP_KERNEL && !ZBOOT_ROM && !JUMP_LABEL - select RELOCATABLE - select ARM_MODULE_PLTS if MODULES - select MODULE_REL_CRCS if MODVERSIONS - help - Randomizes the virtual and physical address at which the kernel - image is loaded, as a security feature that deters exploit attempts - relying on knowledge of the location of kernel internals. - endmenu

menu "Boot options" diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 13a84864d771..d3a1d1dff637 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -61,28 +61,6 @@ kernel_sec_end: .long 0 .popsection

- .macro get_kaslr_offset, reg -#ifdef CONFIG_RANDOMIZE_BASE - ldr_l \reg, __kaslr_offset -#else - mov \reg, #0 -#endif - .endm - - .macro add_kaslr_offset, reg, tmp -#ifdef CONFIG_RANDOMIZE_BASE - get_kaslr_offset \tmp - add \reg, \reg, \tmp -#endif - .endm - - .macro sub_kaslr_offset, reg, tmp -#ifdef CONFIG_RANDOMIZE_BASE - get_kaslr_offset \tmp - sub \reg, \reg, \tmp -#endif - .endm - /* * Kernel startup entry point. * --------------------------- @@ -108,7 +86,6 @@ kernel_sec_end: .equ swapper_pg_dir, . - PG_DIR_SIZE

ENTRY(stext) - mov r3, #0 @ normal entry point - clear r3 ARM_BE8(setend be ) @ ensure we are in BE8 mode

THUMB( badr r9, 1f ) @ Kernel is always entered in ARM. @@ -116,16 +93,6 @@ ENTRY(stext) THUMB( .thumb ) @ switch to Thumb now. THUMB(1: )

-#ifdef CONFIG_RANDOMIZE_BASE - str_l r3, __kaslr_offset, r9 @ offset in r3 if entered via kaslr ep - - .section ".bss", "aw", %nobits - .align 2 -__kaslr_offset: - .long 0 @ will be wiped before entering C code - .previous -#endif - #ifdef CONFIG_ARM_VIRT_EXT bl __hyp_stub_install #endif @@ -149,7 +116,6 @@ __kaslr_offset: #ifndef CONFIG_XIP_KERNEL adr_l r8, _text @ __pa(_text) sub r8, r8, #TEXT_OFFSET @ PHYS_OFFSET - sub_kaslr_offset r8, r12 #else ldr r8, =PLAT_PHYS_OFFSET @ always constant in this case #endif @@ -186,8 +152,8 @@ __kaslr_offset: * r0 will hold the CPU control register value, r1, r2, r4, and * r9 will be preserved. r5 will also be preserved if LPAE. */ - adr_l lr, __primary_switch @ address to jump to after - mov r13, lr @ mmu has been enabled + ldr r13, =__mmap_switched @ address to jump to after + @ mmu has been enabled badr lr, 1f @ return (PIC) address #ifdef CONFIG_ARM_LPAE mov r5, #0 @ high TTBR0 @@ -198,8 +164,7 @@ __kaslr_offset: ldr r12, [r10, #PROCINFO_INITFUNC] add r12, r12, r10 ret r12 -1: get_kaslr_offset r12 @ get before turning MMU on - b __enable_mmu +1: b __enable_mmu ENDPROC(stext) .ltorg

@@ -280,20 +245,15 @@ __create_page_tables: * set two variables to indicate the physical start and end of the * kernel. */ - get_kaslr_offset r3 - add r0, r3, #PAGE_OFFSET - add r0, r4, r0, lsr #(SECTION_SHIFT - PMD_ENTRY_ORDER) - adr_l r6, _end - 1 - sub r6, r6, r8 - add r6, r6, #PAGE_OFFSET - add r3, r3, r8 + add r0, r4, #KERNEL_OFFSET >> (SECTION_SHIFT - PMD_ENTRY_ORDER) + ldr r6, =(_end - 1) adr_l r5, kernel_sec_start @ _pa(kernel_sec_start) #if defined CONFIG_CPU_ENDIAN_BE8 || defined CONFIG_CPU_ENDIAN_BE32 str r8, [r5, #4] @ Save physical start of kernel (BE) #else str r8, [r5] @ Save physical start of kernel (LE) #endif - orr r3, r3, r7 + orr r3, r8, r7 @ Add the MMU flags add r6, r4, r6, lsr #(SECTION_SHIFT - PMD_ENTRY_ORDER) 1: str r3, [r0], #1 << PMD_ENTRY_ORDER add r3, r3, #1 << SECTION_SHIFT @@ -443,7 +403,7 @@ ENTRY(secondary_startup) * Use the page tables supplied from __cpu_up. */ adr_l r3, secondary_data - mov_l r12, __secondary_switch + mov_l r12, __secondary_switched ldrd r4, r5, [r3, #0] @ get secondary_data.pgdir ARM_BE8(eor r4, r4, r5) @ Swap r5 and r4 in BE: ARM_BE8(eor r5, r4, r5) @ it can be done in 3 steps @@ -489,7 +449,6 @@ ENDPROC(__secondary_switched) * r4 = TTBR pointer (low word) * r5 = TTBR pointer (high word if LPAE) * r9 = processor ID - * r12 = KASLR offset * r13 = *virtual* address to jump to upon completion */ __enable_mmu: @@ -527,7 +486,6 @@ ENDPROC(__enable_mmu) * r1 = machine ID * r2 = atags or dtb pointer * r9 = processor ID - * r12 = KASLR offset * r13 = *virtual* address to jump to upon completion * * other registers depend on the function called upon completion @@ -543,53 +501,11 @@ ENTRY(__turn_mmu_on) mov r3, r3 mov r3, r13 ret r3 -ENDPROC(__turn_mmu_on) - -__primary_switch: -#ifdef CONFIG_RELOCATABLE - adr_l r7, _text @ r7 := __pa(_text) - sub r7, r7, #TEXT_OFFSET @ r7 := PHYS_OFFSET - - adr_l r5, __rel_begin - adr_l r6, __rel_end - sub r5, r5, r7 - sub r6, r6, r7 - - add r5, r5, #PAGE_OFFSET - add r6, r6, #PAGE_OFFSET - add r5, r5, r12 - add r6, r6, r12 - - adr_l r3, __stubs_start @ __pa(__stubs_start) - sub r3, r3, r7 @ offset of __stubs_start - add r3, r3, #PAGE_OFFSET @ __va(__stubs_start) - sub r3, r3, #0xffff1000 @ subtract VA of stubs section - -0: cmp r5, r6 - bge 1f - ldm r5!, {r7, r8} @ load next relocation entry - cmp r8, #23 @ R_ARM_RELATIVE - bne 0b - cmp r7, #0xff000000 @ vector page? - addgt r7, r7, r3 @ fix up VA offset - ldr r8, [r7, r12] - add r8, r8, r12 - str r8, [r7, r12] - b 0b -1: -#endif - ldr pc, =__mmap_switched -ENDPROC(__primary_switch) - -#ifdef CONFIG_SMP -__secondary_switch: - ldr pc, =__secondary_switched -ENDPROC(__secondary_switch) -#endif - .ltorg __turn_mmu_on_end: +ENDPROC(__turn_mmu_on) .popsection

+ #ifdef CONFIG_SMP_ON_UP __HEAD __fixup_smp:

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 881766078bf9bacd38625b153ae1b3e20a7c4713.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/kernel/head.S | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index d3a1d1dff637..1ec35f065617 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -44,6 +44,9 @@ #define PMD_ENTRY_ORDER 2 #endif

+ .globl swapper_pg_dir + .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE + /* * This needs to be assigned at runtime when the linker symbols are * resolved. These are unsigned 64bit really, but in this assembly code @@ -61,6 +64,11 @@ kernel_sec_end: .long 0 .popsection

+ .macro pgtbl, rd, phys + add \rd, \phys, #TEXT_OFFSET + sub \rd, \rd, #PG_DIR_SIZE + .endm + /* * Kernel startup entry point. * --------------------------- @@ -82,9 +90,6 @@ kernel_sec_end: .arm

__HEAD - .globl swapper_pg_dir - .equ swapper_pg_dir, . - PG_DIR_SIZE - ENTRY(stext) ARM_BE8(setend be ) @ ensure we are in BE8 mode

@@ -180,7 +185,7 @@ ENDPROC(stext) * r4 = physical page table address */ __create_page_tables: - adr_l r4, swapper_pg_dir @ page table address + pgtbl r4, r8 @ page table address

/* * Clear the swapper page table

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 03888731c102d782ff3b24932583db25933f7fe1.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/kernel/sleep.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 99d59590ddf0..93afd1005b43 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -61,9 +61,10 @@ ENTRY(__cpu_suspend) stmfd sp!, {r4 - r11, lr} #ifdef MULTI_CPU - ldr_l r4, processor + CPU_SLEEP_SIZE @ size of CPU sleep state + ldr r10, =processor + ldr r4, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state #else - adr_l r4, cpu_suspend_size + ldr r4, =cpu_suspend_size #endif mov r5, sp @ current virtual SP #ifdef CONFIG_VMAP_STACK @@ -74,7 +75,7 @@ ENTRY(__cpu_suspend) #endif add r4, r4, #12 @ Space for pgd, virt sp, phys resume fn sub sp, sp, r4 @ allocate CPU state on stack - adr_l r3, sleep_save_sp + ldr r3, =sleep_save_sp stmfd sp!, {r0, r1} @ save suspend func arg and pointer ldr r3, [r3, #SLEEP_SAVE_SP_VIRT] ALT_SMP(W(nop)) @ don't use adr_l inside ALT_SMP()

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 948402ac58d7d852a03dd5964b56310a0f75019d.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/Kconfig | 5 ----- arch/arm/Makefile | 7 ------- arch/arm/include/asm/assembler.h | 6 +++--- arch/arm/include/asm/vmlinux.lds.h | 6 +----- arch/arm/kernel/vmlinux.lds.S | 6 ------ scripts/module.lds.S | 1 - 6 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a82bef783210..749935e2e3b7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1453,11 +1453,6 @@ config STACKPROTECTOR_PER_TASK Enable this option to switch to a different method that uses a different canary value for each task.

-config RELOCATABLE - bool - depends on !XIP_KERNEL && !JUMP_LABEL - select HAVE_ARCH_PREL32_RELOCATIONS - endmenu

menu "Boot options" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f3236584b12e..547e5856eaa0 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -51,13 +51,6 @@ CHECKFLAGS += -D__ARMEL__ KBUILD_LDFLAGS += -EL endif

-ifeq ($(CONFIG_RELOCATABLE),y) -KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h -CFLAGS_KERNEL += -fpic -CFLAGS_MODULE += -fno-pic -LDFLAGS_vmlinux += -pie -shared -Bsymbolic -endif - # # The Scalar Replacement of Aggregates (SRA) optimization pass in GCC 4.9 and # later may result in code being generated that handles signed short and signed diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 3b4d68187232..7db72fba1540 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -625,12 +625,12 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) * mov_l - move a constant value or [relocated] address into a register */ .macro mov_l, dst:req, imm:req, cond -#if defined(CONFIG_RELOCATABLE) || __LINUX_ARM_ARCH__ < 7 + .if __LINUX_ARM_ARCH__ < 7 ldr\cond \dst, =\imm -#else + .else movw\cond \dst, #:lower16:\imm movt\cond \dst, #:upper16:\imm -#endif + .endif .endm

/* diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h index 579becda9453..4c8632d5c432 100644 --- a/arch/arm/include/asm/vmlinux.lds.h +++ b/arch/arm/include/asm/vmlinux.lds.h @@ -63,11 +63,7 @@ EXIT_CALL \ ARM_MMU_DISCARD(*(.text.fixup)) \ ARM_MMU_DISCARD(*(__ex_table)) \ - COMMON_DISCARDS \ - *(.ARM.exidx.discard.text) \ - *(.interp .dynamic) \ - *(.dynsym .dynstr .hash) - + COMMON_DISCARDS

/* * Sections that should stay zero sized, which is safer to explicitly diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index d6ccf647eef7..bd9127c4b451 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -114,12 +114,6 @@ SECTIONS __smpalt_end = .; } #endif - .rel.dyn : ALIGN(8) { - __rel_begin = .; - *(.rel .rel.* .rel.dyn) - } - __rel_end = ADDR(.rel.dyn) + SIZEOF(.rel.dyn); - .init.pv_table : { __pv_table_begin = .; *(.pv_table) diff --git a/scripts/module.lds.S b/scripts/module.lds.S index 25a85dbae205..bf5bcf2836d8 100644 --- a/scripts/module.lds.S +++ b/scripts/module.lds.S @@ -13,7 +13,6 @@ SECTIONS { /DISCARD/ : { *(.discard) *(.discard.*) - *(*.discard.*) }

__ksymtab 0 : { *(SORT(___ksymtab+*)) }

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 566438a9042ff74e7e0aea862445084615057632.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/mach-spear/headsmp.S | 11 ++++++++--- arch/arm/mach-versatile/headsmp.S | 9 ++++++++- 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-spear/headsmp.S b/arch/arm/mach-spear/headsmp.S index 32ffc75ff332..96f89436ccf6 100644 --- a/arch/arm/mach-spear/headsmp.S +++ b/arch/arm/mach-spear/headsmp.S @@ -10,8 +10,6 @@ #include <linux/linkage.h> #include <linux/init.h>

-#include <asm/assembler.h> - __INIT

/* @@ -22,7 +20,10 @@ ENTRY(spear13xx_secondary_startup) mrc p15, 0, r0, c0, c0, 5 and r0, r0, #15 - adr_l r6, spear_pen_release + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 pen: ldr r7, [r6] cmp r7, r0 bne pen @@ -36,4 +37,8 @@ pen: ldr r7, [r6] * should now contain the SVC stack for this core */ b secondary_startup + + .align +1: .long . + .long spear_pen_release ENDPROC(spear13xx_secondary_startup) diff --git a/arch/arm/mach-versatile/headsmp.S b/arch/arm/mach-versatile/headsmp.S index ce925e9059c5..99c32db412ae 100644 --- a/arch/arm/mach-versatile/headsmp.S +++ b/arch/arm/mach-versatile/headsmp.S @@ -16,7 +16,10 @@ ENTRY(versatile_secondary_startup) ARM_BE8(setend be) mrc p15, 0, r0, c0, c0, 5 bic r0, #0xff000000 - adr_l r6, versatile_cpu_release + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 pen: ldr r7, [r6] cmp r7, r0 bne pen @@ -26,4 +29,8 @@ pen: ldr r7, [r6] * should now contain the SVC stack for this core */ b secondary_startup + + .align +1: .long . + .long versatile_cpu_release ENDPROC(versatile_secondary_startup)

From: Felix Fu fuzhen5@huawei.com

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881

-----------------------------------------

This reverts commit 00c2a432a874b5f403cf641e3c63ad35e009baba.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/mach-exynos/headsmp.S | 9 ++++++++- arch/arm/mach-exynos/sleep.S | 26 +++++++++++++++++++++----- 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S index be7cd0eebe1d..0ac2cb9a7355 100644 --- a/arch/arm/mach-exynos/headsmp.S +++ b/arch/arm/mach-exynos/headsmp.S @@ -19,7 +19,10 @@ ENTRY(exynos4_secondary_startup) ARM_BE8(setend be) mrc p15, 0, r0, c0, c0, 5 and r0, r0, #15 - adr_l r6, exynos_pen_release + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 pen: ldr r7, [r6] cmp r7, r0 bne pen @@ -30,3 +33,7 @@ pen: ldr r7, [r6] */ b secondary_startup ENDPROC(exynos4_secondary_startup) + + .align 2 +1: .long . + .long exynos_pen_release diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S index ed27515a4458..ed93f91853b8 100644 --- a/arch/arm/mach-exynos/sleep.S +++ b/arch/arm/mach-exynos/sleep.S @@ -8,7 +8,6 @@

#include <linux/linkage.h> #include <asm/asm-offsets.h> -#include <asm/assembler.h> #include <asm/hardware/cache-l2x0.h> #include "smc.h"

@@ -55,13 +54,19 @@ ENTRY(exynos_cpu_resume_ns) cmp r0, r1 bne skip_cp15

- ldr_l r1, cp15_save_power - ldr_l r2, cp15_save_diag + adr r0, _cp15_save_power + ldr r1, [r0] + ldr r1, [r0, r1] + adr r0, _cp15_save_diag + ldr r2, [r0] + ldr r2, [r0, r2] mov r0, #SMC_CMD_C15RESUME dsb smc #0 #ifdef CONFIG_CACHE_L2X0 - adr_l r0, l2x0_saved_regs + adr r0, 1f + ldr r2, [r0] + add r0, r2, r0

/* Check that the address has been initialised. */ ldr r1, [r0, #L2X0_R_PHY_BASE] @@ -80,7 +85,9 @@ ENTRY(exynos_cpu_resume_ns) smc #0

/* Reload saved regs pointer because smc corrupts registers. */ - adr_l r0, l2x0_saved_regs + adr r0, 1f + ldr r2, [r0] + add r0, r2, r0

ldr r1, [r0, #L2X0_R_PWR_CTRL] ldr r2, [r0, #L2X0_R_AUX_CTRL] @@ -99,6 +106,15 @@ skip_cp15: b cpu_resume ENDPROC(exynos_cpu_resume_ns)

+ .align +_cp15_save_power: + .long cp15_save_power - . +_cp15_save_diag: + .long cp15_save_diag - . +#ifdef CONFIG_CACHE_L2X0 +1: .long l2x0_saved_regs - . +#endif /* CONFIG_CACHE_L2X0 */ + .data .align 2 .globl cp15_save_diag