From 87feced195e70e37d7977a394b4b9779ccdfc064 Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Tue, 29 Sep 2020 19:23:36 -0700
Subject: sc7180: Enable bootblock compression

This patch enables bootblock compression on SC7180. In my tests, that
makes it boot roughly 10ms faster (which isn't much, but... might as
well take it).

Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: Ibbe06eeb05347cc77395681969e6eaf1598b4260
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45855
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/arch/arm64/Makefile.inc            | 1 +
 src/soc/qualcomm/sc7180/Kconfig        | 1 +
 src/soc/qualcomm/sc7180/Makefile.inc   | 4 ++++
 src/soc/qualcomm/sc7180/bootblock.c    | 2 --
 src/soc/qualcomm/sc7180/decompressor.c | 9 +++++++++
 src/soc/qualcomm/sc7180/memlayout.ld   | 2 +-
 6 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 src/soc/qualcomm/sc7180/decompressor.c

(limited to 'src')

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 920ff5db51..44517cb577 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -31,6 +31,7 @@ bootblock-y += id.S
 $(call src-to-obj,decompressor,$(dir)/id.S): $(obj)/build.h
 $(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h
 
+decompressor-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c
 bootblock-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c
 bootblock-y += transition.c transition_asm.S
 
diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig
index 570b68a119..c66dc92768 100644
--- a/src/soc/qualcomm/sc7180/Kconfig
+++ b/src/soc/qualcomm/sc7180/Kconfig
@@ -18,6 +18,7 @@ config SOC_QUALCOMM_SC7180
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
 	select HAVE_LINEAR_FRAMEBUFFER
 	select CACHE_MRC_SETTINGS
+	select COMPRESS_BOOTBLOCK
 
 if SOC_QUALCOMM_SC7180
 
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index a0d3bc6cda..7f52a9a178 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -1,6 +1,10 @@
 
 ifeq ($(CONFIG_SOC_QUALCOMM_SC7180),y)
 
+decompressor-y += decompressor.c
+decompressor-y += mmu.c
+decompressor-y += timer.c
+
 ################################################################################
 bootblock-y += bootblock.c
 bootblock-y += mmu.c
diff --git a/src/soc/qualcomm/sc7180/bootblock.c b/src/soc/qualcomm/sc7180/bootblock.c
index 7dbaeecdf7..cfeb6f94f2 100644
--- a/src/soc/qualcomm/sc7180/bootblock.c
+++ b/src/soc/qualcomm/sc7180/bootblock.c
@@ -2,13 +2,11 @@
 
 #include <bootblock_common.h>
 #include <soc/clock.h>
-#include <soc/mmu.h>
 #include <soc/qspi.h>
 #include <soc/qupv3_config.h>
 
 void bootblock_soc_init(void)
 {
-	sc7180_mmu_init();
 	clock_init();
 	quadspi_init(37500 * KHz);
 	qupv3_fw_init();
diff --git a/src/soc/qualcomm/sc7180/decompressor.c b/src/soc/qualcomm/sc7180/decompressor.c
new file mode 100644
index 0000000000..ac55150600
--- /dev/null
+++ b/src/soc/qualcomm/sc7180/decompressor.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <bootblock_common.h>
+#include <soc/mmu.h>
+
+void decompressor_soc_init(void)
+{
+	sc7180_mmu_init();
+}
diff --git a/src/soc/qualcomm/sc7180/memlayout.ld b/src/soc/qualcomm/sc7180/memlayout.ld
index 9b0adc4d5d..ce084780c6 100644
--- a/src/soc/qualcomm/sc7180/memlayout.ld
+++ b/src/soc/qualcomm/sc7180/memlayout.ld
@@ -22,7 +22,7 @@ SECTIONS
 	AOPSRAM_END(0x0B100000)
 
 	SSRAM_START(0x14680000)
-	OVERLAP_VERSTAGE_ROMSTAGE(0x14680000, 100K)
+	OVERLAP_DECOMPRESSOR_VERSTAGE_ROMSTAGE(0x14680000, 100K)
 	REGION(qcsdi, 0x14699000, 52K, 4K)
 	SSRAM_END(0x146AE000)
 
-- 
cgit v1.2.3