soc/intel/common: remove chipset specific calls

The report_platform_info() and set_max_freq() are not being
used similarly on skylake and braswell. With the addition
of other SoCs I suspect a similar pattern will emerge. Instead
of having weak functions to ensure things link with the hardcoded
policy push these calls into their respective SoC homes.

For parity, both skylake and braswell were updated to be consistent
with the same calls prior to this patch.

BUG=chrome-os-partner:44827
BRANCH=None
TEST=Built and booted glados. Built braswell.

Original-Change-Id: I3371d09aff0629503254296955fef28d35754a38
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/303334
Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org>

Change-Id: I2de33632ed127cac52d7075cbad95cd6387a1b46
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11815
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Aaron Durbin 2015-09-30 09:12:57 -05:00 committed by Aaron Durbin
parent 3c4053fa59
commit cc5ac17fab
6 changed files with 6 additions and 20 deletions
src/soc/intel
braswell
include/soc
romstage
common
skylake
include/soc
romstage

View File

@ -33,6 +33,7 @@ void tco_disable(void);
void punit_init(void); void punit_init(void);
int early_spi_read_wpsr(u8 *sr); int early_spi_read_wpsr(u8 *sr);
void mainboard_fill_spd_data(struct pei_data *pei_data); void mainboard_fill_spd_data(struct pei_data *pei_data);
void set_max_freq(void);
/* romstage_common.c functions */ /* romstage_common.c functions */
void program_base_addresses(void); void program_base_addresses(void);

View File

@ -181,6 +181,7 @@ void soc_pre_console_init(void)
void soc_romstage_init(struct romstage_params *params) void soc_romstage_init(struct romstage_params *params)
{ {
/* Continue chipset initialization */ /* Continue chipset initialization */
set_max_freq();
spi_init(); spi_init();
#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)

View File

@ -103,12 +103,6 @@ asmlinkage void *romstage_main(struct cache_as_ram_params *car_params)
/* Get power state */ /* Get power state */
params.power_state = fill_power_state(); params.power_state = fill_power_state();
/* Print useful platform information */
report_platform_info();
/* Set CPU frequency to maximum */
set_max_freq();
/* Perform SOC specific initialization. */ /* Perform SOC specific initialization. */
soc_romstage_init(&params); soc_romstage_init(&params);
@ -435,12 +429,6 @@ __attribute__((weak)) void report_memory_config(void)
printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__); printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__);
} }
/* Display the platform configuration */
__attribute__((weak)) void report_platform_info(void)
{
printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__);
}
/* Choose top of stack and setup MTRRs */ /* Choose top of stack and setup MTRRs */
__attribute__((weak)) void *setup_stack_and_mtrrs(void) __attribute__((weak)) void *setup_stack_and_mtrrs(void)
{ {
@ -449,12 +437,6 @@ __attribute__((weak)) void *setup_stack_and_mtrrs(void)
return NULL; return NULL;
} }
/* Speed up the CPU to the maximum frequency */
__attribute__((weak)) void set_max_freq(void)
{
printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__);
}
/* SOC initialization after RAM is enabled */ /* SOC initialization after RAM is enabled */
__attribute__((weak)) void soc_after_ram_init(struct romstage_params *params) __attribute__((weak)) void soc_after_ram_init(struct romstage_params *params)
{ {

View File

@ -88,12 +88,10 @@ void mainboard_add_dimm_info(struct romstage_params *params,
int channel, int dimm, int index); int channel, int dimm, int index);
void raminit(struct romstage_params *params); void raminit(struct romstage_params *params);
void report_memory_config(void); void report_memory_config(void);
void report_platform_info(void);
asmlinkage void romstage_after_car(void *chipset_context); asmlinkage void romstage_after_car(void *chipset_context);
void romstage_common(struct romstage_params *params); void romstage_common(struct romstage_params *params);
asmlinkage void *romstage_main(struct cache_as_ram_params *car_params); asmlinkage void *romstage_main(struct cache_as_ram_params *car_params);
void *setup_stack_and_mtrrs(void); void *setup_stack_and_mtrrs(void);
void set_max_freq(void);
void soc_after_ram_init(struct romstage_params *params); void soc_after_ram_init(struct romstage_params *params);
void soc_after_temp_ram_exit(void); void soc_after_temp_ram_exit(void);
void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, void soc_display_memory_init_params(const MEMORY_INIT_UPD *old,

View File

@ -29,6 +29,8 @@ void systemagent_early_init(void);
void pch_early_init(void); void pch_early_init(void);
void pch_uart_init(void); void pch_uart_init(void);
void intel_early_me_status(void); void intel_early_me_status(void);
void report_platform_info(void);
void set_max_freq(void);
void enable_smbus(void); void enable_smbus(void);
int smbus_read_byte(unsigned device, unsigned address); int smbus_read_byte(unsigned device, unsigned address);

View File

@ -65,6 +65,8 @@ void soc_pre_ram_init(struct romstage_params *params)
void soc_romstage_init(struct romstage_params *params) void soc_romstage_init(struct romstage_params *params)
{ {
report_platform_info();
set_max_freq();
pch_early_init(); pch_early_init();
} }