Move dolog to output

[netwatch.git] / ich2 / smi.c

diff --git a/ich2/smi.c b/ich2/smi.c
index 43759dc526e4b660738e1c0354fc4235eacf2e9e..adba74f4b285c2ef046761d9896d4d3eabbad714 100644 (file)
--- a/ich2/smi.c
+++ b/ich2/smi.c
@@ -4,10 +4,16 @@
 #include <stdint.h>
 #include <vga-overlay.h>
 #include <reg-82801b.h>
+#include <output.h>
 
 static uint16_t _get_PMBASE()
 {
-       return pci_read32(ICH2_LPC_BUS, ICH2_LPC_DEV, ICH2_LPC_FN, ICH2_LPC_PCI_PMBASE) & ICH2_PMBASE_MASK;
+       static long pmbase = -1;
+       
+       if (pmbase == -1)       /* Memoize it so that we don't have to hit PCI so often. */
+               pmbase = pci_read32(ICH2_LPC_BUS, ICH2_LPC_DEV, ICH2_LPC_FN, ICH2_LPC_PCI_PMBASE) & ICH2_PMBASE_MASK;
+       
+       return pmbase;
 }
 
 void smi_disable()
@@ -34,31 +40,31 @@ void smi_poll()
        
        if (sts & ICH2_SMI_STS_BIOS_STS)
        {
-               dolog("Unhandled: BIOS_STS");
+               output("Unhandled: BIOS_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_BIOS_STS);
        }
        
        if (sts & ICH2_SMI_STS_LEGACY_USB_STS)
        {
-               dolog("Unhandled: LEGACY_USB_STS");
+               output("Unhandled: LEGACY_USB_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_LEGACY_USB_STS);
        }
        
        if (sts & ICH2_SMI_STS_SLP_SMI_STS)
        {
-               dolog("Unhandled: SLP_SMI_STS");
+               output("Unhandled: SLP_SMI_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_SLP_SMI_STS);
        }
        
        if (sts & ICH2_SMI_STS_APM_STS)
        {
-               dolog("Unhandled: APM_STS");
-               outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_SLP_SMI_STS);
+               output("Unhandled: APM_STS");
+               outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_APM_STS);
        }
        
        if (sts & ICH2_SMI_STS_SWSMI_TMR_STS)   // Ack it, then request another.
        {
-               outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_SLP_SMI_STS);
+               outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_SWSMI_TMR_STS);
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_EN,
                        inl(_get_PMBASE() + ICH2_PMBASE_SMI_EN) & ~ICH2_SMI_EN_SWSMI_TMR_EN);
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_EN,
@@ -67,52 +73,92 @@ void smi_poll()
        
        if (sts & ICH2_SMI_STS_PM1_STS_REG)
        {
-               /* XXX -- trawl through PMBASE+00h to see what happened */
+               unsigned short pm1_sts = inw(_get_PMBASE() + ICH2_PMBASE_PM1_STS);
+               unsigned short pm1_en = inw(_get_PMBASE() + ICH2_PMBASE_PM1_EN);
+               
+               pm1_sts &= pm1_en;
+               if (pm1_sts & ICH2_PM1_STS_RTC_STS)
+               {
+                       output("Unhandled: PM1_STS: RTC_STS");
+                       outw(_get_PMBASE() + ICH2_PMBASE_PM1_STS, ICH2_PM1_STS_RTC_STS);
+               }
+               
+               if (pm1_sts & ICH2_PM1_STS_PWRBTN_STS)
+               {
+                       output("Unhandled: PM1_STS: PWRBTN_STS");
+                       outw(_get_PMBASE() + ICH2_PMBASE_PM1_STS, ICH2_PM1_STS_PWRBTN_STS);
+               }
+               
+               if (pm1_sts & ICH2_PM1_STS_GBL_STS)
+               {
+                       output("Unhandled: PM1_STS: GBL_STS");
+                       outw(_get_PMBASE() + ICH2_PMBASE_PM1_STS, ICH2_PM1_STS_GBL_STS);
+               }
+               
+               if (pm1_sts & ICH2_PM1_STS_TMROF_STS)
+               {
+                       output("Unhandled: PM1_STS: TMROF_STS");
+                       outw(_get_PMBASE() + ICH2_PMBASE_PM1_STS, ICH2_PM1_STS_TMROF_STS);
+               }
+               
+               outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_PM1_STS_REG);
        }
        
        if (sts & ICH2_SMI_STS_GPE0_STS)
        {
                /* XXX -- trawl through GPE0_STS to see what happened */
+               output("XXX Unhandled: GPE0_STS (expect lockup)");
+       }
+       
+       if (sts & ICH2_SMI_STS_GPE1_STS)
+       {
+               /* XXX -- trawl through GPE1_STS to see what happened */
+               output("XXX Unhandled: GPE1_STS (expect lockup)");
        }
        
        if (sts & ICH2_SMI_STS_MCSMI_STS)
        {
-               dolog("Unhandled: MCSMI_STS");
+               output("Unhandled: MCSMI_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_MCSMI_STS);
        }
        
        if (sts & ICH2_SMI_STS_DEVMON_STS)
        {
-               /* XXX -- trawl through DEVx_TRAP_STS to see what happened */
-               /* XXX -- trawl through DEVTRAP_STS to see what happened */
+               unsigned short mon_smi = inw(_get_PMBASE() + ICH2_PMBASE_MON_SMI);
+               unsigned long devact_sts = inl(_get_PMBASE() + ICH2_PMBASE_DEVACT_STS);
+               unsigned long devtrap_en = inl(_get_PMBASE() + ICH2_PMBASE_DEVTRAP_EN);
+               if (((mon_smi & 0x0F00) >> 8) & ((mon_smi & 0xF000) >> 12))
+                       outputf("Unhandled: MON_SMI (%04x)", mon_smi);
+               if (devact_sts & devtrap_en)
+                       outputf("Unhandled: DEVTRAP (%08x)", devact_sts & devtrap_en);
        }
        
        if (sts & ICH2_SMI_STS_TCO_STS)
        {
-               dolog("Unhandled: TCO_STS");
+               output("Unhandled: TCO_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_TCO_STS);
        }
        
        if (sts & ICH2_SMI_STS_PERIODIC_STS)
        {
-               dolog("Unhandled: PERIODIC_STS");
+               output("Unhandled: PERIODIC_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_PERIODIC_STS);
        }
        
        if (sts & ICH2_SMI_STS_SERIRQ_SMI_STS)
        {
-               dolog("Unhandled: SERIRQ_SMI_STS");
+               output("Unhandled: SERIRQ_SMI_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_SERIRQ_SMI_STS);
        }
        
        if (sts & ICH2_SMI_STS_SMBUS_SMI_STS)
        {
-               dolog("Unhandled: SMBUS_SMI_STS");
+               output("Unhandled: SMBUS_SMI_STS");
                outl(_get_PMBASE() + ICH2_PMBASE_SMI_STS, ICH2_SMI_STS_SMBUS_SMI_STS);
        }
        
-       if (smi_status())
-               dolog("WARNING: failed to clear SMI_STS!");
+       if (smi_status() & ~ICH2_SMI_STS_PM1_STS_REG)   /* Either the chipset is buggy, or we are. */
+               outputf("WARN: couldn't clear SMI_STS! (%08x)", smi_status());
        
        outl(_get_PMBASE() + ICH2_PMBASE_SMI_EN,
                inl(_get_PMBASE() + ICH2_PMBASE_SMI_EN) |