haswell: use asmlinkage for assembly-called funcs

When the haswell MP/SMM code was developed it was using a coreboot
repository that did not contain the asmlinkage macro. Now that the
asmlinkage macro exists use it.

BUG=None
BRANCH=None
TEST=Built and booted.

Change-Id: I662f1b16d1777263b96a427334fff8f98a407755
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/3203
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Aaron Durbin
2013-05-02 09:42:13 -05:00
committed by Stefan Reinauer
parent d39c650e06
commit 39ecc65158
4 changed files with 6 additions and 5 deletions

View File

@ -22,6 +22,8 @@
#ifndef _CPU_INTEL_HASWELL_H
#define _CPU_INTEL_HASWELL_H
#include <arch/cpu.h>
/* Haswell bus clock is fixed at 100MHz */
#define HASWELL_BCLK 100
@ -148,7 +150,7 @@ void romstage_common(const struct romstage_params *params);
* +32: MTTR mask 1 63:32
* ...
*/
void * __attribute__((regparm(0))) romstage_main(unsigned long bist);
void * asmlinkage romstage_main(unsigned long bist);
/* romstage_after_car() is the C function called after cache-as-ram has
* been torn down. It is responsible for loading the ramstage. */
void romstage_after_car(void);

View File

@ -150,8 +150,7 @@ static void cleanup_rom_caching(void)
/* By the time APs call ap_init() caching has been setup, and microcode has
* been loaded. */
static void __attribute__((cdecl))
ap_init(unsigned int cpu, void *microcode_ptr)
static void asmlinkage ap_init(unsigned int cpu, void *microcode_ptr)
{
struct cpu_info *info;

View File

@ -162,7 +162,7 @@ static void *setup_romstage_stack_after_car(void)
return slot;
}
void * __attribute__((regparm(0))) romstage_main(unsigned long bist)
void * asmlinkage romstage_main(unsigned long bist)
{
int i;
void *romstage_stack_after_car;

View File

@ -164,7 +164,7 @@ static int bsp_setup_msr_save_state(struct smm_relocation_params *relo_params)
/* The relocation work is actually performed in SMM context, but the code
* resides in the ramstage module. This occurs by trampolining from the default
* SMRAM entry point to here. */
static void __attribute__((cdecl))
static void asmlinkage
cpu_smm_do_relocation(void *arg, int cpu, const struct smm_runtime *runtime)
{
msr_t mtrr_cap;