soc/amd: move bootblock inside main SoC directories

There's no need to have the bootblock in its own sub-directory, so move
it to each SoC's main directory to avoid clutter. This makes soc/amd
more consistent with the coreboot code base in src/northbridge,
src/southbridge and src/soc with the exception of src/soc/intel.

Change-Id: I78a9ce1cd0d790250a66c82bb1d8aa6c3b4f7162
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47982
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 0 insertions, 149 deletions

diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock/bootblock.c
deleted file mode 100644
index 0b52a17307..0000000000
--- a/src/soc/amd/picasso/bootblock/bootblock.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <stdint.h>
-#include <symbols.h>
-#include <amdblocks/reset.h>
-#include <bootblock_common.h>
-#include <console/console.h>
-#include <cpu/x86/cache.h>
-#include <cpu/x86/msr.h>
-#include <cpu/amd/msr.h>
-#include <cpu/x86/mtrr.h>
-#include <cpu/amd/mtrr.h>
-#include <cpu/x86/tsc.h>
-#include <pc80/mc146818rtc.h>
-#include <soc/psp_transfer.h>
-#include <soc/southbridge.h>
-#include <soc/i2c.h>
-#include <amdblocks/amd_pci_mmconf.h>
-#include <acpi/acpi.h>
-
-asmlinkage void bootblock_resume_entry(void);
-
-/* PSP performs the memory training and setting up DRAM map prior to x86 cores
-   being released. Honor TOP_MEM and set up caching from 0 til TOP_MEM. Likewise,
-   route lower memory addresses covered by fixed MTRRs to DRAM except for
-   0xa0000-0xc0000 . */
-static void set_caching(void)
-{
-	msr_t top_mem;
-	msr_t sys_cfg;
-	msr_t mtrr_def_type;
-	msr_t fixed_mtrr_ram;
-	msr_t fixed_mtrr_mmio;
-	struct var_mtrr_context mtrr_ctx;
-
-	var_mtrr_context_init(&mtrr_ctx, NULL);
-	top_mem = rdmsr(TOP_MEM);
-	/* Enable RdDram and WrDram attributes in fixed MTRRs. */
-	sys_cfg = rdmsr(SYSCFG_MSR);
-	sys_cfg.lo |= SYSCFG_MSR_MtrrFixDramModEn;
-
-	/* Fixed MTRR constants. */
-	fixed_mtrr_ram.lo = fixed_mtrr_ram.hi =
-		((MTRR_TYPE_WRBACK | MTRR_READ_MEM | MTRR_WRITE_MEM) <<  0) |
-		((MTRR_TYPE_WRBACK | MTRR_READ_MEM | MTRR_WRITE_MEM) <<  8) |
-		((MTRR_TYPE_WRBACK | MTRR_READ_MEM | MTRR_WRITE_MEM) << 16) |
-		((MTRR_TYPE_WRBACK | MTRR_READ_MEM | MTRR_WRITE_MEM) << 24);
-	fixed_mtrr_mmio.lo = fixed_mtrr_mmio.hi =
-		((MTRR_TYPE_UNCACHEABLE) <<  0) |
-		((MTRR_TYPE_UNCACHEABLE) <<  8) |
-		((MTRR_TYPE_UNCACHEABLE) << 16) |
-		((MTRR_TYPE_UNCACHEABLE) << 24);
-
-	/* Prep default MTRR type. */
-	mtrr_def_type = rdmsr(MTRR_DEF_TYPE_MSR);
-	mtrr_def_type.lo &= ~MTRR_DEF_TYPE_MASK;
-	mtrr_def_type.lo |= MTRR_TYPE_UNCACHEABLE;
-	mtrr_def_type.lo |= MTRR_DEF_TYPE_EN | MTRR_DEF_TYPE_FIX_EN;
-
-	disable_cache();
-
-	wrmsr(SYSCFG_MSR, sys_cfg);
-
-	clear_all_var_mtrr();
-
-	var_mtrr_set(&mtrr_ctx, 0, ALIGN_DOWN(top_mem.lo, 8*MiB), MTRR_TYPE_WRBACK);
-	var_mtrr_set(&mtrr_ctx, FLASH_BASE_ADDR, CONFIG_ROM_SIZE, MTRR_TYPE_WRPROT);
-
-	/* Set up RAM caching for everything below 1MiB except for 0xa0000-0xc0000 . */
-	wrmsr(MTRR_FIX_64K_00000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_16K_80000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_16K_A0000, fixed_mtrr_mmio);
-	wrmsr(MTRR_FIX_4K_C0000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_C8000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_D0000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_D8000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_E0000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_E8000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_F0000, fixed_mtrr_ram);
-	wrmsr(MTRR_FIX_4K_F8000, fixed_mtrr_ram);
-
-	wrmsr(MTRR_DEF_TYPE_MSR, mtrr_def_type);
-
-	/* Enable Fixed and Variable MTRRs. */
-	sys_cfg.lo |= SYSCFG_MSR_MtrrFixDramEn | SYSCFG_MSR_MtrrVarDramEn;
-	sys_cfg.lo |= SYSCFG_MSR_TOM2En | SYSCFG_MSR_TOM2WB;
-	/* AGESA currently expects SYSCFG_MSR_MtrrFixDramModEn to be set. Once
-	   MP init happens in coreboot proper it can be knocked down. */
-	wrmsr(SYSCFG_MSR, sys_cfg);
-
-	enable_cache();
-}
-
-static void write_resume_eip(void)
-{
-	msr_t s3_resume_entry = {
-		.hi = (uint64_t)(uintptr_t)bootblock_resume_entry >> 32,
-		.lo = (uintptr_t)bootblock_resume_entry & 0xffffffff,
-	};
-
-	/*
-	 * Writing to the EIP register can only be done once, otherwise a fault is triggered.
-	 * When this register is written, it will trigger the microcode to stash the CPU state
-	 * (crX , mtrrs, registers, etc) into the CC6 save area. On resume, the state will be
-	 * restored and execution will continue at the EIP.
-	 */
-	if (!acpi_is_wakeup_s3())
-		wrmsr(S3_RESUME_EIP_MSR, s3_resume_entry);
-}
-
-asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
-{
-	set_caching();
-	write_resume_eip();
-	enable_pci_mmconf();
-
-	/*
-	 * base_timestamp is raw tsc value. We need to divide by tsc_freq_mhz
-	 * when we use micro-seconds granularity for Zork
-	 */
-	base_timestamp /= tsc_freq_mhz();
-
-	if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK))
-		boot_with_psp_timestamp(base_timestamp);
-
-	/*
-	 * if VBOOT_STARTS_BEFORE_BOOTBLOCK is not selected or
-	 * previous step did nothing, proceed with normal bootblock main.
-	 */
-	bootblock_main_with_basetime(base_timestamp);
-}
-
-void bootblock_soc_early_init(void)
-{
-	fch_pre_init();
-}
-
-void bootblock_soc_init(void)
-{
-	u32 val = cpuid_eax(1);
-	printk(BIOS_DEBUG, "Family_Model: %08x\n", val);
-
-	if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) {
-		verify_psp_transfer_buf();
-		show_psp_transfer_info();
-	}
-
-	fch_early_init();
-}