arch/x86/postcar: Set up postcar MTRR in C code

Setting up postcar MTRRs is done when invd is already called so there
is no reason to do this in assembly anymore.

This also drops the custom code for Quark to set up MTRRs.

TESTED on foxconn/g41m and hermes/prodrive that MTRR are properly set
in postcar & ramstage.

Change-Id: I5ec10e84118197a04de0a5194336ef8bb049bba4
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54299
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

2 files changed, 0 insertions, 84 deletions

diff --git a/src/soc/intel/quark/romstage/Makefile.inc b/src/soc/intel/quark/romstage/Makefile.inc
index 8630acb4dd..ff9b2b6743 100644
--- a/src/soc/intel/quark/romstage/Makefile.inc
+++ b/src/soc/intel/quark/romstage/Makefile.inc
@@ -3,10 +3,7 @@
 romstage-y += car.c
 romstage-$(CONFIG_DISPLAY_UPD_DATA) += debug.c
 romstage-y += fsp_params.c
-romstage-y += mtrr.c
 romstage-y += pcie.c
 romstage-y += report_platform.c
 romstage-y += romstage.c
 romstage-y += ../../../../cpu/intel/car/romstage.c
-
-postcar-y += mtrr.c
diff --git a/src/soc/intel/quark/romstage/mtrr.c b/src/soc/intel/quark/romstage/mtrr.c
deleted file mode 100644
index e72ce335d7..0000000000
--- a/src/soc/intel/quark/romstage/mtrr.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
-#include <soc/pci_devs.h>
-#include <soc/reg_access.h>
-
-asmlinkage void *soc_set_mtrrs(void *top_of_stack)
-{
-	union {
-		uint32_t u32[2];
-		uint64_t u64;
-		msr_t msr;
-	} data;
-	uint32_t mtrr_count;
-	uint32_t *mtrr_data;
-	uint32_t mtrr_reg;
-
-	/*
-	 * The stack contents are initialized in src/soc/intel/common/stack.c
-	 * to be the following:
-	 *
-	 *				*
-	 *				*
-	 *				*
-	 *		   +36: MTRR mask 1 63:32
-	 *		   +32: MTRR mask 1 31:0
-	 *		   +28: MTRR base 1 63:32
-	 *		   +24: MTRR base 1 31:0
-	 *		   +20: MTRR mask 0 63:32
-	 *		   +16: MTRR mask 0 31:0
-	 *		   +12: MTRR base 0 63:32
-	 *		    +8: MTRR base 0 31:0
-	 *		    +4: Number of MTRRs to setup (described above)
-	 * top_of_stack --> +0: Number of variable MTRRs to clear
-	 *
-	 * This routine:
-	 *	* Clears all of the variable MTRRs
-	 *	* Initializes the variable MTRRs with the data passed in
-	 *	* Returns the new top of stack after removing all of the
-	 *	  data passed in.
-	 */
-
-	/* Clear all of the variable MTRRs (base and mask). */
-	mtrr_reg = MTRR_PHYS_BASE(0);
-	mtrr_data = top_of_stack;
-	mtrr_count = (*mtrr_data++) * 2;
-	data.u64 = 0;
-	while (mtrr_count-- > 0)
-		soc_msr_write(mtrr_reg++, data.msr);
-
-	/* Setup the specified variable MTRRs */
-	mtrr_reg = MTRR_PHYS_BASE(0);
-	mtrr_count = *mtrr_data++;
-	while (mtrr_count-- > 0) {
-		data.u32[0] = *mtrr_data++;
-		data.u32[1] = *mtrr_data++;
-		soc_msr_write(mtrr_reg++, data.msr); /* Base */
-		data.u32[0] = *mtrr_data++;
-		data.u32[1] = *mtrr_data++;
-		soc_msr_write(mtrr_reg++, data.msr); /* Mask */
-	}
-
-	/* Remove setup_stack_and_mtrrs data and return the new top_of_stack */
-	top_of_stack = mtrr_data;
-	return top_of_stack;
-}
-
-asmlinkage void soc_enable_mtrrs(void)
-{
-	union {
-		uint32_t u32[2];
-		uint64_t u64;
-		msr_t msr;
-	} data;
-
-	/* Enable MTRR. */
-	data.msr = soc_msr_read(MTRR_DEF_TYPE_MSR);
-	data.u32[0] |= MTRR_DEF_TYPE_EN;
-	soc_msr_write(MTRR_DEF_TYPE_MSR, data.msr);
-}