cbfs: Increase mcache size defaults

The CBFS mcache size default was eyeballed to what should be "hopefully
enough" for most users, but some recent Chrome OS devices have already
hit the limit. Since most current (and probably all future) x86 chipsets
likely have the CAR space to spare, let's just double the size default
for all supporting chipsets right now so that we hopefully won't run
into these issues again any time soon.

The CBFS_MCACHE_RW_PERCENTAGE default for CHROMEOS was set to 25 under
the assumption that Chrome OS images have historically always had a lot
more files in their RO CBFS than the RW (because l10n assets were only
in RO). Unfortunately, this has recently changed with the introduction
of updateable assets. While hopefully not that many boards will need
these, the whole idea is that you won't know whether you need them yet
at the time the RO image is frozen, and mcache layout parameters cannot
be changed in an RW update. So better to use the normal 50/50 split on
Chrome OS devices going forward so we are prepared for the eventuality
of needing RW assets again.

The RW percentage should really also be menuconfig-controllable, because
this is something the user may want to change on the fly depending on
their payload requirements. Move the option to the vboot Kconfigs
because it also kinda belongs there anyway and this makes it fit in
better in menuconfig. (I haven't made the mcache size
menuconfig-controllable because if anyone needs to increase this, they
can just override the default in the chipset Kconfig for everyone using
that chipset, under the assumption that all boards of that chipset have
the same amount of available CAR space and there's no reason not to use
up the available space. This seems more in line with how this would work
on non-x86 platforms that define this directly in their memlayout.ld.)

Also add explicit warnings to both options that they mustn't be changed
in an RW update to an older RO image.

BUG=b:187561710

Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: I046ae18c9db9a5d682384edde303c07e0be9d790
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54146
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

4 files changed, 14 insertions, 21 deletions

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index bb03db2fbc..a488b55d0a 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -147,9 +147,10 @@ config PRERAM_CBMEM_CONSOLE_SIZE
 config CBFS_MCACHE_SIZE
 	hex
 	depends on !NO_CBFS_MCACHE
-	default 0x2000
+	default 0x4000
 	help
-	  Increase this value if you see CBFS mcache overflow warnings.
+	  Increase this value if you see CBFS mcache overflow warnings. Do NOT
+	  change this value for vboot RW updates!
 
 config PC80_SYSTEM
 	bool
diff --git a/src/lib/Kconfig b/src/lib/Kconfig
index e1d56fe26b..239f613470 100644
--- a/src/lib/Kconfig
+++ b/src/lib/Kconfig
@@ -98,14 +98,3 @@ config NO_CBFS_MCACHE
 	  the associated CAR/SRAM size. In that case every single CBFS file
 	  lookup must re-read the same CBFS directory entries from flash to find
 	  the respective file.
-
-config CBFS_MCACHE_RW_PERCENTAGE
-	int
-	depends on VBOOT && !NO_CBFS_MCACHE
-	default 25 if CHROMEOS	# Chrome OS stores many L10n files in RO only
-	default 50
-	help
-	  The amount of the CBFS_MCACHE area that's used for the RW CBFS, in
-	  percent from 0 to 100. The remaining area will be used for the RO
-	  CBFS. Default is an even 50/50 split. When VBOOT is disabled, this
-	  will automatically be 0 (meaning the whole MCACHE is used for RO).
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 2fec5becee..3112672119 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -161,12 +161,4 @@ config VARIANT_HAS_MIPI_CAMERA
 	bool
 	default n
 
-config CBFS_MCACHE_RW_PERCENTAGE
-	int
-	default 50
-
-config CBFS_MCACHE_SIZE
-	hex
-	default 0x4000
-
 endif # BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index a39680d164..515efc7bef 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -235,6 +235,17 @@ config RWB_REGION_ONLY
 	  Add a space-delimited list of filenames that should only be in the
 	  RW-B section.
 
+config CBFS_MCACHE_RW_PERCENTAGE
+	int "Percentage of CBFS metadata cache used for RW CBFS"
+	depends on !NO_CBFS_MCACHE
+	default 50
+	help
+	  The amount of the CBFS_MCACHE area that's used for the RW CBFS, in
+	  percent from 0 to 100. The remaining area will be used for the RO
+	  CBFS. Default is an even 50/50 split. When VBOOT is disabled, this
+	  will automatically be 0 (meaning the whole MCACHE is used for RO).
+	  Do NOT change this value for vboot RW updates!
+
 config VBOOT_ENABLE_CBFS_FALLBACK
 	bool
 	default n