Skip to contentSkip to conversation

FAILED: patch "[PATCH] riscv: make t-head erratas depend on MMU" failed to apply to 5.19-stable tree

PATCH [email protected] 1 participant 1 message Sep 24, 2022

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.19-stable tree.
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 <[email protected]>.

Possible dependencies:

2a2018c3ac84 ("riscv: make t-head erratas depend on MMU")
d20ec7529236 ("riscv: implement cache-management errata for T-Head SoCs") 1631ba1259d6 ("riscv: Add support for non-coherent devices using zicbom extension") 1771c8c9e65a ("riscv: remove usage of function-pointers from cpufeatures and t-head errata")

thanks,

greg k-h

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

From 2a2018c3ac84c2dc7cfbad117ce9339ea0914622 Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <[email protected]>
Date: Wed, 7 Sep 2022 17:49:32 +0200
Subject: [PATCH] riscv: make t-head erratas depend on MMU

Both basic extensions of SVPBMT and ZICBOM depend on CONFIG_MMU. Make the T-Head errata implementations of the similar functionality also depend on it to prevent build errors.

Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")
Fixes d20ec7529236 ("riscv: implement cache-management errata for T-Head SoCs")
arch/riscv/Kconfig.erratas +2 -2
index 6850e9389930..f3623df23b5f 100644
@@ -46,7 +46,7 @@ config ERRATA_THEAD
 
 config ERRATA_THEAD_PBMT
 	bool "Apply T-Head memory type errata"
-	depends on ERRATA_THEAD && 64BIT
+	depends on ERRATA_THEAD && 64BIT && MMU
 	select RISCV_ALTERNATIVE_EARLY
 	default y
 	help
@@ -57,7 +57,7 @@ config ERRATA_THEAD_PBMT
 
 config ERRATA_THEAD_CMO
 	bool "Apply T-Head cache management errata"
-	depends on ERRATA_THEAD
+	depends on ERRATA_THEAD && MMU
 	select RISCV_DMA_NONCOHERENT
 	default y
 	help