Re: FAILED: patch "[PATCH] Revert "riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED"" failed to apply to 5.13-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Greg,

Le 9/08/2021 à 12:42, gregkh@xxxxxxxxxxxxxxxxxxx a écrit :

The patch below does not apply to the 5.13-stable tree.

The same for this one too, it can't be applied to 5.13 since it fixes a mistake introduced in 5.14-rc1.

Sorry again for the noise,

Thanks,

Alex

If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@xxxxxxxxxxxxxxx>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

 From 867432bec1c6e7df21a361d7f12022a8c5f54022 Mon Sep 17 00:00:00 2001
From: Alexandre Ghiti <alex@xxxxxxxx>
Date: Wed, 21 Jul 2021 09:59:36 +0200
Subject: [PATCH] Revert "riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED"

This reverts commit 9b79878ced8f7ab85c57623f8b1f6882e484a316.

The removal of this config exposes CONFIG_PHYS_RAM_BASE for all kernel
types: this value being implementation-specific, this breaks the
genericity of the RISC-V kernel so revert it.

Signed-off-by: Alexandre Ghiti <alex@xxxxxxxx>
Tested-by: Emil Renner Berthing <kernel@xxxxxxxx>
Reviewed-by: Jisheng Zhang <jszhang@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 31f9e92f1402..4f7b70ae7c31 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -495,8 +495,13 @@ config STACKPROTECTOR_PER_TASK
  	depends on !GCC_PLUGIN_RANDSTRUCT
  	depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_TLS
+config PHYS_RAM_BASE_FIXED
+	bool "Explicitly specified physical RAM address"
+	default n
+
  config PHYS_RAM_BASE
  	hex "Platform Physical RAM address"
+	depends on PHYS_RAM_BASE_FIXED
  	default "0x80000000"
  	help
  	  This is the physical address of RAM in the system. It has to be
@@ -509,6 +514,7 @@ config XIP_KERNEL
  	# This prevents XIP from being enabled by all{yes,mod}config, which
  	# fail to build since XIP doesn't support large kernels.
  	depends on !COMPILE_TEST
+	select PHYS_RAM_BASE_FIXED
  	help
  	  Execute-In-Place allows the kernel to run from non-volatile storage
  	  directly addressable by the CPU, such as NOR flash. This saves RAM




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux