Djam/kernel-5.15
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.15.git synced 2025-02-23 18:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pick fix adapting code for new minor release of kernel 5.10.x

Browse source 
http://git.altlinux.org/gears/k/kernel-image-std-def.git?p=kernel-image-std-def.git;a=commitdiff;h=61a50e6f47fabdea107f9e94c43104347359e7d8
This commit is contained in:
Mikhail Novosyolov 2021-09-14 23:34:20 +03:00
parent f79d9880f3
commit 5e3723ad39
2 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
0633-BE-M1000-secondary-CPUs-boot-fix.patch Normal file
View file

@ -0,0 +1,55 @@
From 92b5312314e5eb9f4d153c4f54ad6876c3bafc86 Mon Sep 17 00:00:00 2001
From: Alexey Sheplyakov <asheplyakov@altlinux.org>
Date: Wed, 25 Aug 2021 20:48:10 +0400
Subject: [PATCH] BE-M1000 secondary CPUs boot fix
(adaptation for changes in newer minor release of kernel 5.10.x)
---
drivers/firmware/efi/libstub/arm64-stub.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
index 411f1546d171..d21f21b105d7 100644
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -127,13 +127,6 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
efi_status_t status;
unsigned long kernel_size, kernel_memsize = 0;
u32 phys_seed = 0;
- bool force_low_reloc = need_low_alloc();
- if (force_low_reloc) {
- if (!efi_nokaslr) {
- efi_info("booting on a broken firmware, KASLR will be disabled\n");
- efi_nokaslr = true;
- }
- }
/*
* Although relocatable kernels can fix up the misalignment with
@@ -145,6 +138,14 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
*/
u64 min_kimg_align = efi_nokaslr ? MIN_KIMG_ALIGN : EFI_KIMG_ALIGN;
+ bool force_low_reloc = need_low_alloc();
+ if (force_low_reloc) {
+ if (!efi_nokaslr) {
+ efi_info("booting on a broken firmware, KASLR will be disabled\n");
+ efi_nokaslr = true;
+ }
+ }
+
if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
if (!efi_nokaslr) {
status = efi_get_random_bytes(sizeof(phys_seed),
@@ -187,7 +188,7 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
if (force_low_reloc) {
status = efi_low_alloc(*reserve_size,
- min_kimg_align(),
+ min_kimg_align,
reserve_addr);
if (status != EFI_SUCCESS) {
efi_err("Failed to relocate kernel, expect secondary CPUs boot failure\n");
--
2.31.1

3
kernel.spec
View file

@ -377,7 +377,8 @@ Patch0628: 0628-drm-panfrost-Trim-affinity-for-Mali-T620.patch
Patch0629: 0629-baikal_vdu_drm-_plane_atomic_check-actually-re-enabl.patch
Patch0630: 0630-baikal_vdu-figure-out-LVDS-endpoint-count.patch
Patch0631: 0631-panfrost-disable-devfreq-on-BE-M1000-SoC.patch
Patch0633: 0632-pm-disable-all-sleep-states-on-BE-M1000-based-boards.patch
Patch0632: 0632-pm-disable-all-sleep-states-on-BE-M1000-based-boards.patch
Patch0633: 0633-BE-M1000-secondary-CPUs-boot-fix.patch
# Disable AutoReq
AutoReq: 0