merge

[netwatch.git] / ich2 / smram-ich2.c

diff --git a/ich2/smram-ich2.c b/ich2/smram-ich2.c
index 1052f3b23f1b2f267bdf26dfb5e13327a5c19dea..d274c852028c497e932e91d4aa2df572bcbae605 100644 (file)
--- a/ich2/smram-ich2.c
+++ b/ich2/smram-ich2.c
@@ -1,6 +1,10 @@
 #include "reg-82815.h"
 #include "reg-82815.h"

+#include <pci.h>
+#include <smram.h>

 
 

-unsigned long memsz[] = {
+#ifndef __RAW__
+
+static unsigned long memsz[] = {

        0,                      // 0
        32*1024*1024,           // 1
        32*1024*1024,           // 2
        0,                      // 0
        32*1024*1024,           // 1
        32*1024*1024,           // 2


@@ -19,8 +23,6 @@ unsigned long memsz[] = {
        512*1024*1024           // F
 };
 
        512*1024*1024           // F
 };
 

-#ifdef __linux__
-

 void smram_aseg_dump(void) {
 
        unsigned char smramc, drp, drp2;
 void smram_aseg_dump(void) {
 
        unsigned char smramc, drp, drp2;


@@ -78,25 +80,50 @@ void smram_aseg_dump(void) {
 }
 #endif
 
 }
 #endif
 

+int smram_locked()
+{
+       unsigned char smramc = pci_read8(0, 0, 0, SMRAMC);
+       
+       return (smramc & SMRAMC_LOCK) ? 1 : 0;
+}
+
+smram_state_t smram_save_state()
+{
+       return pci_read8(0, 0, 0, SMRAMC);
+}
+
+void smram_restore_state(smram_state_t state)
+{
+       pci_write8(0, 0, 0, SMRAMC, state); 
+}
+

 int smram_aseg_set_state (int open) {
        unsigned char smramc;
 int smram_aseg_set_state (int open) {
        unsigned char smramc;

+
+       if (smram_locked())
+               return -1;
+               

        smramc = pci_read8(0, 0, 0, SMRAMC);
 
        smramc = pci_read8(0, 0, 0, SMRAMC);
 

-       if (smramc & SMRAMC_LOCK)
+       switch (open)

        {
        {

-               /* SMRAM is locked; can't load anything. */
-               return 1;
-       }
-
-       if (open) {
-               /* Set LSMM to 01 (ABseg = system RAM) */
+       case SMRAM_ASEG_CLOSED:
+               smramc = (smramc & 0xF0) | 0x00;
+               break;
+       case SMRAM_ASEG_OPEN:

                smramc = (smramc & 0xF0) | 0x04;
                smramc = (smramc & 0xF0) | 0x04;

-       } else {
-               /* Set LSMM to 11 (ABseg = SMM RAM) */
+               break;
+       case SMRAM_ASEG_SMMCODE:
+               smramc = (smramc & 0xF0) | 0x08;
+               break;
+       case SMRAM_ASEG_SMMONLY:

                smramc = (smramc & 0xF0) | 0x0C;
                smramc = (smramc & 0xF0) | 0x0C;

+               break;
+       default:
+               return -1;

        }
 
        }
 

-       pci_write8(0, 0, 0, SMRAMC);
+       pci_write8(0, 0, 0, SMRAMC, smramc);

 
        return 0;
 }
 
        return 0;
 }