diff options
| author | Rudolf Marek <r.marek@assembler.cz> | 2010-02-23 21:43:42 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-02-23 21:43:42 +0000 |
| commit | d1fc066697ea3d06cc2cb77de5d653b9b79e932d (patch) | |
| tree | bbb3c611aec8bdb429e623de3fc00694966aa47b /src/cpu/amd/car/post_cache_as_ram.c | |
| parent | 740b587baa749f89361e53e05e2f629e6941e378 (diff) | |
| download | coreboot-staging-d1fc066697ea3d06cc2cb77de5d653b9b79e932d.zip coreboot-staging-d1fc066697ea3d06cc2cb77de5d653b9b79e932d.tar.gz | |
Clobber registers as appropriate in AMD CAR code, and
build a better barrier for gcc to reflush all registers
when moving the stack. memcpy was taken from Linux.
Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5153 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd/car/post_cache_as_ram.c')
| -rw-r--r-- | src/cpu/amd/car/post_cache_as_ram.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c index 5b37371..5c085cd 100644 --- a/src/cpu/amd/car/post_cache_as_ram.c +++ b/src/cpu/amd/car/post_cache_as_ram.c @@ -10,14 +10,20 @@ static inline void print_debug_pcar(const char *strval, uint32_t val) printk_debug("%s%08x\r\n", strval, val); } +/* from linux kernel 2.6.32 asm/string_32.h */ + static void inline __attribute__((always_inline)) memcopy(void *dest, const void *src, unsigned long bytes) { - __asm__ volatile( - "cld\n\t" - "rep; movsl\n\t" - : /* No outputs */ - : "S" (src), "D" (dest), "c" ((bytes)>>2) - ); + int d0, d1, d2; + asm volatile("cld ; rep ; movsl\n\t" + "movl %4,%%ecx\n\t" + "andl $3,%%ecx\n\t" + "jz 1f\n\t" + "rep ; movsb\n\t" + "1:" + : "=&c" (d0), "=&D" (d1), "=&S" (d2) + : "0" (bytes / 4), "g" (bytes), "1" ((long)dest), "2" ((long)src) + : "memory", "cc"); } /* Disable Erratum 343 Workaround, see RevGuide for Fam10h, Pub#41322 Rev 3.33 */ @@ -66,27 +72,17 @@ static void post_cache_as_ram(void) /* from here don't store more data in CAR */ vErrata343(); -#if 0 - __asm__ volatile ( - "pushl %eax\n\t" - ); -#endif - memcopy((void *)((CONFIG_RAMTOP)-CONFIG_DCACHE_RAM_SIZE), (void *)CONFIG_DCACHE_RAM_BASE, CONFIG_DCACHE_RAM_SIZE); //inline // dump_mem((CONFIG_RAMTOP) - 0x8000, (CONFIG_RAMTOP) - 0x7c00); __asm__ volatile ( /* set new esp */ /* before CONFIG_RAMBASE */ - "subl %0, %%ebp\n\t" "subl %0, %%esp\n\t" ::"a"( (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE)- (CONFIG_RAMTOP) ) - ); // We need to push %eax to the stack (CAR) before copy stack and pop it later after copy stack and change esp -#if 0 - __asm__ volatile ( - "popl %eax\n\t" + /* discard all registers (eax is used for %0), so gcc redo everything + after the stack is moved */ + : "cc", "memory", "%ebx", "%ecx", "%edx", "%esi", "%edi", "%ebp" ); -#endif - /* We can put data to stack again */ |
