AMD K8 fam10-15: Tidy up CAR disable

Avoid conflicting disable_cache_as_ram() declaration and tidy
up include for inlined function.

Change-Id: Iba77c711f5eb023566b7d8ba148583948661bc99
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/20563
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

src/cpu/amd/car/disable_cache_as_ram.c

@@ -33,7 +33,7 @@ static inline __attribute__((always_inline)) uint32_t amd_fam1x_cpu_family(void)
 }
 
 static inline __attribute__((always_inline))
-void disable_cache_as_ram(uint8_t skip_sharedc_config)
+void disable_cache_as_ram_real(uint8_t skip_sharedc_config)
 {
 	msr_t msr;
 	uint32_t family;
@@ -45,15 +45,13 @@ void disable_cache_as_ram(uint8_t skip_sharedc_config)
 		msr.lo = 0;
 		msr.hi = 0;
 		wrmsr(MTRR_FIX_4K_C8000, msr);
-#if CONFIG_DCACHE_RAM_SIZE > 0x8000
+		if (CONFIG_DCACHE_RAM_SIZE > 0x8000)
-		wrmsr(MTRR_FIX_4K_C0000, msr);
+			wrmsr(MTRR_FIX_4K_C0000, msr);
-#endif
+		if (CONFIG_DCACHE_RAM_SIZE > 0x10000)
-#if CONFIG_DCACHE_RAM_SIZE > 0x10000
+			wrmsr(MTRR_FIX_4K_D0000, msr);
-		wrmsr(MTRR_FIX_4K_D0000, msr);
+		if (CONFIG_DCACHE_RAM_SIZE > 0x18000)
-#endif
+			wrmsr(MTRR_FIX_4K_D8000, msr);
-#if CONFIG_DCACHE_RAM_SIZE > 0x18000
+
-		wrmsr(MTRR_FIX_4K_D8000, msr);
-#endif
 		/* disable fixed mtrr from now on,
 		 * it will be enabled by ramstage again
 		 */
@@ -110,8 +108,3 @@ void disable_cache_as_ram(uint8_t skip_sharedc_config)
 	}
 #endif
 }
-
-static void disable_cache_as_ram_bsp(void)
-{
-	disable_cache_as_ram(0);
-}

src/cpu/amd/car/post_cache_as_ram.c

@@ -26,9 +26,17 @@
 #include <cpu/amd/msr.h>
 #include <arch/acpi.h>
 #include <romstage_handoff.h>
-#include "cbmem.h"
+#include <cbmem.h>
+
 #include "cpu/amd/car/disable_cache_as_ram.c"
 
+// For set_sysinfo_in_ram()
+#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8)
+#include "northbridge/amd/amdk8/raminit.h"
+#else
+#include "northbridge/amd/amdfam10/raminit.h"
+#endif
+
 #if CONFIG_RAMTOP <= 0x100000
 	#error "You need to set CONFIG_RAMTOP greater than 1M"
 #endif
@@ -171,7 +179,7 @@ void post_cache_as_ram(void)
 void cache_as_ram_new_stack(void)
 {
 	print_car_debug("Disabling cache as RAM now\n");
-	disable_cache_as_ram_bsp();
+	disable_cache_as_ram_real(0);	// inline
 
 	disable_cache();
 	/* Enable cached access to RAM in the range 0M to CACHE_TMP_RAMTOP */

src/cpu/amd/family_10h-family_15h/Makefile.inc

@@ -1,4 +1,5 @@
 romstage-y += ../../x86/mtrr/earlymtrr.c
+romstage-y += ../car/post_cache_as_ram.c
 
 romstage-y += init_cpus.c
 

src/cpu/amd/family_10h-family_15h/init_cpus.c

@@ -34,7 +34,7 @@
 #include <southbridge/amd/sb800/sb800.h>
 #endif
 
-#include "cpu/amd/car/post_cache_as_ram.c"
+#include "cpu/amd/car/disable_cache_as_ram.c"
 
 #if IS_ENABLED(CONFIG_PCI_IO_CFG_EXT)
 static void set_EnableCf8ExtCfg(void)
@@ -353,7 +353,7 @@ static void STOP_CAR_AND_CPU(uint8_t skip_sharedc_config, uint32_t apicid)
 		}
 	}
 
-	disable_cache_as_ram(skip_sharedc_config);	// inline
+	disable_cache_as_ram_real(skip_sharedc_config);	// inline
 
 	/* Mark the core as sleeping */
 	lapic_write(LAPIC_MSG_REG, (apicid << 24) | F10_APSTATE_ASLEEP);

src/cpu/amd/model_fxx/Makefile.inc

@@ -1,4 +1,5 @@
 romstage-y += ../../x86/mtrr/earlymtrr.c
+romstage-y += ../car/post_cache_as_ram.c
 
 # no conditionals here. If you include this file from a socket, then you get all the binaries.
 ramstage-y += model_fxx_init.c

src/cpu/amd/model_fxx/init_cpus.c

@@ -15,7 +15,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mtrr.h>
 #include <northbridge/amd/amdk8/amdk8.h>
-#include "cpu/amd/car/post_cache_as_ram.c"
+#include "cpu/amd/car/disable_cache_as_ram.c"
 
 #if IS_ENABLED(CONFIG_HAVE_OPTION_TABLE)
 #include "option_table.h"
@@ -220,7 +220,7 @@ static void enable_apic_ext_id(u32 node)
 
 static void STOP_CAR_AND_CPU(void)
 {
-	disable_cache_as_ram(0);	// inline
+	disable_cache_as_ram_real(0);	// inline
 	/* stop all cores except node0/core0 the bsp .... */
 	stop_this_cpu();
 }

src/include/cpu/amd/car.h

@@ -9,10 +9,7 @@ void post_cache_as_ram(void);
 void cache_as_ram_switch_stack(void *stacktop);
 void cache_as_ram_new_stack(void);
 
-#if IS_ENABLED(CONFIG_CPU_AMD_AGESA) || IS_ENABLED(CONFIG_CPU_AMD_PI) || \
-	IS_ENABLED(CONFIG_SOC_AMD_PI)
 void disable_cache_as_ram(void);
-#endif
 
 void asmlinkage early_all_cores(void);
 

src/northbridge/amd/amdfam10/amdfam10.h

@@ -1027,6 +1027,4 @@ unsigned long northbridge_write_acpi_tables(device_t device,
 void northbridge_acpi_write_vars(device_t device);
 #endif
 
-void set_sysinfo_in_ram(u32 val);
-
 #endif /* AMDFAM10_H */

src/northbridge/amd/amdfam10/raminit.h

@@ -27,6 +27,7 @@ struct MCTStatStruc;
 int mctRead_SPD(u32 smaddr, u32 reg);
 void mctSMBhub_Init(u32 node);
 void mctGet_DIMMAddr(struct DCTStatStruc *pDCTstat, u32 node);
+void set_sysinfo_in_ram(u32 val);
 void raminit_amdmct(struct sys_info *sysinfo);
 void amdmct_cbmem_store_info(struct sys_info *sysinfo);
 void fill_mem_ctrl(u32 controllers, struct mem_controller *ctrl_a, const u8 *spd_addr);

src/northbridge/amd/amdk8/raminit.h

@@ -1,6 +1,8 @@
 #ifndef RAMINIT_H
 #define RAMINIT_H
 
+#include <arch/io.h>
+
 #define NODE_ID		0x60
 #define HT_INIT_CONTROL	0x6c