AMD Rev F support

[coreboot.git] / src / cpu / amd / model_gx2 / vsmsetup.c

diff --git a/src/cpu/amd/model_gx2/vsmsetup.c b/src/cpu/amd/model_gx2/vsmsetup.c
index cd734f6fdb6269c77d6651def0ca118f3d7c4710..add010b7907f306faf9f7f0a7c4ccbd733643983 100644 (file)
--- a/src/cpu/amd/model_gx2/vsmsetup.c
+++ b/src/cpu/amd/model_gx2/vsmsetup.c
@@ -5,96 +5,13 @@
 #undef __KERNEL__
 #include <arch/io.h>
 #include <string.h>
+#include <cpu/amd/gx2def.h>
 
 /* what a mess this uncompress thing is. I am not at all happy about how this 
  * was done, but can't fix it yet. RGM
  */
 #warning "Fix the uncompress once linuxbios knows how to do it"
-// This GETBIT is supposed to work on little endian 
-// 32bit systems. The algorithm will definitely need
-// some fixing on other systems, but it might not be
-// a problem since the nrv2b binary behaves the same..
-
-#ifndef ENDIAN
-#define ENDIAN   0
-#endif
-#ifndef BITSIZE
-#define BITSIZE 32
-#endif
-
-#define GETBIT_8(bb, src, ilen) \
-    (((bb = bb & 0x7f ? bb*2 : ((unsigned)src[ilen++]*2+1)) >> 8) & 1)
-
-#define GETBIT_LE16(bb, src, ilen) \
-    (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1))
-#define GETBIT_LE32(bb, src, ilen) \
-    (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\
-    bb=*(const uint32_t *)((src)+ilen),ilen+=4,(bb>>31)&1))
-
-#if ENDIAN == 0 && BITSIZE == 8
-#define GETBIT(bb, src, ilen) GETBIT_8(bb, src, ilen)
-#endif
-#if ENDIAN == 0 && BITSIZE == 16
-#define GETBIT(bb, src, ilen) GETBIT_LE16(bb, src, ilen)
-#endif
-#if ENDIAN == 0 && BITSIZE == 32
-#define GETBIT(bb, src, ilen) GETBIT_LE32(bb, src, ilen)
-#endif
-
-static unsigned long unrv2b(uint8_t * src, uint8_t * dst)
-{
-       unsigned long ilen = 0, olen = 0, last_m_off = 1;
-       uint32_t bb = 0;
-       unsigned bc = 0;
-       const uint8_t *m_pos;
-       unsigned long file_len = *(unsigned long *) src;
-
-       printk_debug("compressed file len is supposed to be %d bytes\n", file_len);
-       // skip length
-       src += 4;
-       /* FIXME: check olen with the length stored in first 4 bytes */ 
-
-       for (;;) {
-               unsigned int m_off, m_len;
-               while (GETBIT(bb, src, ilen)) {
-                       dst[olen++] = src[ilen++];
-               }
-
-               m_off = 1;
-               do {
-                       m_off = m_off * 2 + GETBIT(bb, src, ilen);
-               } while (!GETBIT(bb, src, ilen));
-               if (m_off == 2) {
-                       m_off = last_m_off;
-               } else {
-                       m_off = (m_off - 3) * 256 + src[ilen++];
-                       if (m_off == 0xffffffffU)
-                               break;
-                       last_m_off = ++m_off;
-               }
-
-               m_len = GETBIT(bb, src, ilen);
-               m_len = m_len * 2 + GETBIT(bb, src, ilen);
-               if (m_len == 0) {
-                       m_len++;
-                       do {
-                               m_len = m_len * 2 + GETBIT(bb, src, ilen);
-                       } while (!GETBIT(bb, src, ilen));
-                       m_len += 2;
-               }
-               m_len += (m_off > 0xd00);
-
-               m_pos = dst + olen - m_off;
-               dst[olen++] = *m_pos++;
-               do {
-                       dst[olen++] = *m_pos++;
-               } while (--m_len > 0);
-       }
-
-       printk_debug("computed len is %d, file len is %d\n", olen, file_len);
-       return olen;
-
-}
+#include "../lib/nrv2b.c"
 
 /* vsmsetup.c derived from vgabios.c. Derived from: */
 
@@ -335,8 +252,9 @@ void do_vsmbios(void)
        unsigned long busdevfn;
        unsigned int rom = 0;
        unsigned char *buf;
-       unsigned int size = 256*1024;
+       unsigned int size = SMM_SIZE*1024;
        int i;
+       unsigned long ilen, olen;
        
        printk_err("do_vsmbios\n");
        /* clear vsm bios data area */
@@ -353,12 +271,13 @@ void do_vsmbios(void)
        //rom = 0xfff80000;
        //rom = 0xfffc0000;
        /* the VSA starts at the base of rom - 64 */
-       rom = ((unsigned long) 0) - (ROM_SIZE  + 35*1024);
+       rom = ((unsigned long) 0) - (ROM_SIZE  + 64*1024);
 
        buf = (unsigned char *) 0x60000;
-       unrv2b((uint8_t *)rom, buf);
+       olen = unrv2b((uint8_t *)rom, buf, &ilen);
+       printk_debug("buf ilen %d olen%d\n", ilen, olen);
        printk_debug("buf %p *buf %d buf[256k] %d\n",
-                    buf, buf[0], buf[256*1024]);
+                    buf, buf[0], buf[SMM_SIZE*1024]);
        printk_debug("buf[0x20] signature is %x:%x:%x:%x\n",
                     buf[0x20] ,buf[0x21] ,buf[0x22],buf[0x23]);
        /* check for post code at start of vsainit.bin. If you don't see it,