8 files changed, 106 insertions, 51 deletions
diff --git a/src/mainboard/google/oak/romstage.c b/src/mainboard/google/oak/romstage.c
index 1f5654748b..9f5ce5f2df 100644
--- a/src/mainboard/google/oak/romstage.c
+++ b/src/mainboard/google/oak/romstage.c
@@ -63,7 +63,7 @@ void main(void)
 	else
 		mt_pll_raise_ca53_freq(1700 * MHz);
 
-	mt8173_mmu_after_dram();
+	mtk_mmu_after_dram();
 
 	/* should be called after memory init */
 	cbmem_initialize_empty();
diff --git a/src/soc/mediatek/mt8173/include/soc/mmu_operations.h b/src/soc/mediatek/common/include/soc/mmu_operations.h
index 2428c4280c..b081690451 100644
--- a/src/soc/mediatek/mt8173/include/soc/mmu_operations.h
+++ b/src/soc/mediatek/common/include/soc/mmu_operations.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright 2015 MediaTek Inc.
+ * Copyright 2018 MediaTek Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __SOC_MEDIATEK_MT8173_MMU_OPERATIONS_H__
-#define __SOC_MEDIATEK_MT8173_MMU_OPERATIONS_H__
+#ifndef __SOC_MEDIATEK_COMMON_MMU_OPERATIONS_H__
+#define __SOC_MEDIATEK_COMMON_MMU_OPERATIONS_H__
 
 #include <arch/mmu.h>
 
@@ -29,11 +29,11 @@ extern unsigned char _sram_l2c[];
 extern unsigned char _esram_l2c[];
 #define _sram_l2c_size (_esram_l2c - _sram_l2c)
 
-extern unsigned char _dram_dma[];
-extern unsigned char _edram_dma[];
-#define _dram_dma_size (_edram_dma - _dram_dma)
+void mtk_soc_after_dram(void);
+void mtk_soc_disable_l2c_sram(void);
 
-void mt8173_mmu_init(void);
-void mt8173_mmu_after_dram(void);
+void mtk_mmu_init(void);
+void mtk_mmu_after_dram(void);
+void mtk_mmu_disable_l2c_sram(void);
 
-#endif //__SOC_MEDIATEK_MT8173_MMU_OPERATIONS_H__
+#endif
diff --git a/src/soc/mediatek/common/mmu_operations.c b/src/soc/mediatek/common/mmu_operations.c
new file mode 100644
index 0000000000..b9910845c1
--- /dev/null
+++ b/src/soc/mediatek/common/mmu_operations.c
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 MediaTek Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <arch/mmu.h>
+#include <compiler.h>
+#include <symbols.h>
+#include <soc/emi.h>
+#include <soc/mmu_operations.h>
+
+__weak void mtk_soc_after_dram(void) { /* do nothing */ }
+
+void mtk_mmu_init(void)
+{
+	mmu_init();
+
+	/* Set 0x0 to the end of 2GB dram address as device memory */
+	mmu_config_range((void *)0, (uintptr_t)_dram + 2U * GiB, DEV_MEM);
+
+	/* SRAM is cached */
+	mmu_config_range(_sram, _sram_size, CACHED_MEM);
+
+	/* L2C SRAM is cached */
+	mmu_config_range(_sram_l2c, _sram_l2c_size, CACHED_MEM);
+
+	/* DMA is non-cached and is reserved for TPM & da9212 I2C DMA */
+	mmu_config_range(_dma_coherent, _dma_coherent_size, UNCACHED_MEM);
+
+	mmu_enable();
+}
+
+void mtk_mmu_after_dram(void)
+{
+	/* Map DRAM as cached now that it's up and running */
+	mmu_config_range(_dram, (uintptr_t)sdram_size(), CACHED_MEM);
+
+	mtk_soc_after_dram();
+}
+
+void mtk_mmu_disable_l2c_sram(void)
+{
+	/* Unmap L2C SRAM so it can be reclaimed by L2 cache */
+	/* TODO: Implement true unmapping, and also use it for the zero-page! */
+	mmu_config_range(_sram_l2c, _sram_l2c_size, DEV_MEM);
+
+	/* Careful: changing cache geometry while it's active is a bad idea! */
+	mmu_disable();
+
+	mtk_soc_disable_l2c_sram();
+
+	/* Reenable MMU with now enlarged L2 cache. Page tables still valid. */
+	mmu_enable();
+}
diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc
index 56c966ae75..d66183250e 100644
--- a/src/soc/mediatek/mt8173/Makefile.inc
+++ b/src/soc/mediatek/mt8173/Makefile.inc
@@ -29,7 +29,7 @@ endif
 
 bootblock-y += gpio.c gpio_init.c pmic_wrap.c mt6391.c
 bootblock-y += ../common/wdt.c
-bootblock-y += mmu_operations.c
+bootblock-y += ../common/mmu_operations.c mmu_operations.c
 
 ################################################################################
 
@@ -58,7 +58,7 @@ romstage-y += gpio.c
 romstage-y += pmic_wrap.c mt6391.c
 romstage-y += memory.c
 romstage-y += emi.c dramc_pi_basic_api.c dramc_pi_calibration_api.c
-romstage-y += mmu_operations.c
+romstage-y += ../common/mmu_operations.c mmu_operations.c
 romstage-y += rtc.c
 
 ################################################################################
diff --git a/src/soc/mediatek/mt8173/bootblock.c b/src/soc/mediatek/mt8173/bootblock.c
index 7fe879c4b9..efccc0bec8 100644
--- a/src/soc/mediatek/mt8173/bootblock.c
+++ b/src/soc/mediatek/mt8173/bootblock.c
@@ -29,7 +29,7 @@ void bootblock_soc_init(void)
 	/* post init pll */
 	mt_pll_post_init();
 
-	mt8173_mmu_init();
+	mtk_mmu_init();
 
 	/* init watch dog, will disable AP watch dog */
 	mtk_wdt_init();
diff --git a/src/soc/mediatek/mt8173/flash_controller.c b/src/soc/mediatek/mt8173/flash_controller.c
index f77688563a..0fe9bb4e57 100644
--- a/src/soc/mediatek/mt8173/flash_controller.c
+++ b/src/soc/mediatek/mt8173/flash_controller.c
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <symbols.h>
 #include <timer.h>
+#include <soc/symbols.h>
 #include <soc/flash_controller.h>
-#include <soc/mmu_operations.h>
 
 #define get_nth_byte(d, n)	((d >> (8 * n)) & 0xff)
 
diff --git a/src/soc/mediatek/mt8173/include/soc/symbols.h b/src/soc/mediatek/mt8173/include/soc/symbols.h
new file mode 100644
index 0000000000..8e2d0a4fb3
--- /dev/null
+++ b/src/soc/mediatek/mt8173/include/soc/symbols.h
@@ -0,0 +1,23 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 MediaTek Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __SOC_MEDIATEK_MT8173_DRAM_DMA_H__
+#define __SOC_MEDIATEK_MT8173_DRAM_DMA_H__
+
+extern unsigned char _dram_dma[];
+extern unsigned char _edram_dma[];
+#define _dram_dma_size (_edram_dma - _dram_dma)
+
+#endif
diff --git a/src/soc/mediatek/mt8173/mmu_operations.c b/src/soc/mediatek/mt8173/mmu_operations.c
index c744d65b8e..951873da0c 100644
--- a/src/soc/mediatek/mt8173/mmu_operations.c
+++ b/src/soc/mediatek/mt8173/mmu_operations.c
@@ -15,55 +15,23 @@
 
 #include <arch/io.h>
 #include <arch/mmu.h>
-#include <console/console.h>
 #include <symbols.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <soc/addressmap.h>
-#include <soc/emi.h>
+#include <soc/symbols.h>
 #include <soc/infracfg.h>
 #include <soc/mcucfg.h>
 #include <soc/mmu_operations.h>
 
-void mt8173_mmu_init(void)
+void mtk_soc_after_dram(void)
 {
-	mmu_init();
-
-	/* Set 0x0 to the end of 2GB dram address as device memory */
-	mmu_config_range((void *)0, (uintptr_t)_dram + 2U * GiB, DEV_MEM);
-
-	/* SRAM is cached */
-	mmu_config_range(_sram_l2c, _sram_l2c_size + _sram_size, CACHED_MEM);
-
-	/* DMA is non-cached and is reserved for TPM & da9212 I2C DMA */
-	mmu_config_range(_dma_coherent, _dma_coherent_size, UNCACHED_MEM);
-
-	/* set ttb as secure */
-	mmu_config_range(_ttb, _ttb_size, SECURE_MEM);
-
-	mmu_enable();
+	mmu_config_range(_dram_dma, _dram_dma_size, UNCACHED_MEM);
+	mtk_mmu_disable_l2c_sram();
 }
 
-void mt8173_mmu_after_dram(void)
+void mtk_soc_disable_l2c_sram(void)
 {
-	/* Map DRAM as cached now that it's up and running */
-	mmu_config_range(_dram, (uintptr_t)sdram_size(), CACHED_MEM);
-
-	/* Unmap L2C SRAM so it can be reclaimed by L2 cache */
-	/* TODO: Implement true unmapping, and also use it for the zero-page! */
-	mmu_config_range(_sram_l2c, _sram_l2c_size, DEV_MEM);
-
-	mmu_config_range(_dram_dma, _dram_dma_size, UNCACHED_MEM);
-
-	/* Careful: changing cache geometry while it's active is a bad idea! */
-	mmu_disable();
-
 	/* Return L2C SRAM back to L2 cache. Set it to 512KiB which is the max
 	 * available L2 cache for A53 in MT8173. */
 	write32(&mt8173_mcucfg->mp0_ca7l_cache_config, 3 << 8);
 	/* turn off the l2c sram clock */
 	write32(&mt8173_infracfg->infra_pdn0, L2C_SRAM_PDN);
-
-	/* Reenable MMU with now enlarged L2 cache. Page tables still valid. */
-	mmu_enable();
 }