Changeset 7065 in vbox

Timestamp:

Feb 20, 2008 9:50:40 PM (17 years ago)

Author:

vboxsync

Message:

pcnet: implemented the software timer interrupt (fixes nexenta and probably *BSD guests)

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (20 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -97 +97 @@
 #define PCNET_PNPMMIO_SIZE              0x20
 
-#define PCNET_SAVEDSTATE_VERSION        7
+#define PCNET_SAVEDSTATE_VERSION        8
 
 #define BCR_MAX_RAP                     50
@@ -131 +131 @@
     GCPTRTYPE(PTMTIMER)                 pTimerPollGC;
 #endif
+    /** Software Interrupt timer (address for host context) */
+    R3R0PTRTYPE(PTMTIMER)               pTimerSoftIntHC;
+    /** Software Interrupt timer (address for guest context) */
+    GCPTRTYPE(PTMTIMER)                 pTimerSoftIntGC;
     /** Register Address Pointer */
     uint32_t                            u32RAP;
@@ -348 +352 @@
 #define CSR_STRT(S)      !!((S)->aCSR[0] & 0x0002)  /**< Start assertion */
 #define CSR_STOP(S)      !!((S)->aCSR[0] & 0x0004)  /**< Stop assertion */
-#define CSR_TDMD(S)      !!((S)->aCSR[0] & 0x0008)  /**< Transmit demand. (perform xmit poll now
-                                                         (readable, settable, not clearable) */
+#define CSR_TDMD(S)      !!((S)->aCSR[0] & 0x0008)  /**< Transmit demand. (perform xmit poll now (readable, settable, not clearable) */
 #define CSR_TXON(S)      !!((S)->aCSR[0] & 0x0010)  /**< Transmit on (readonly) */
 #define CSR_RXON(S)      !!((S)->aCSR[0] & 0x0020)  /**< Receive On */
 #define CSR_INEA(S)      !!((S)->aCSR[0] & 0x0040)  /**< Interrupt Enable */
 #define CSR_LAPPEN(S)    !!((S)->aCSR[3] & 0x0020)  /**< Look Ahead Packet Processing Enable */
-#define CSR_DXSUFLO(S)   !!((S)->aCSR[3] & 0x0040)  /**< Disable Transmit Stop on
-                                                           Underflow error */
+#define CSR_DXSUFLO(S)   !!((S)->aCSR[3] & 0x0040)  /**< Disable Transmit Stop on Underflow error */
 #define CSR_ASTRP_RCV(S) !!((S)->aCSR[4] & 0x0400)  /**< Auto Strip Receive */
 #define CSR_DPOLL(S)     !!((S)->aCSR[4] & 0x1000)  /**< Disable Transmit Polling */
@@ -361 +363 @@
 #define CSR_LTINTEN(S)   !!((S)->aCSR[5] & 0x4000)  /**< Last Transmit Interrupt Enable */
 #define CSR_TOKINTD(S)   !!((S)->aCSR[5] & 0x8000)  /**< Transmit OK Interrupt Disable */
+
+#define CSR_STINT        !!((S)->aCSR[7] & 0x0800)  /**< Software Timer Interrupt */
+#define CSR_STINTE       !!((S)->aCSR[7] & 0x0400)  /**< Software Timer Interrupt Enable */
+
 #define CSR_DRX(S)       !!((S)->aCSR[15] & 0x0001) /**< Disable Receiver */
 #define CSR_DTX(S)       !!((S)->aCSR[15] & 0x0002) /**< Disable Transmit */
@@ -1238 +1244 @@
     }
 
+    if ((pData->aCSR[7] & 0x0C00) == 0x0C00)
+        iISR = 1;
+
     pData->aCSR[0] = csr0;
 
@@ -2425 +2434 @@
                     pcnetTransmit(pData);
 
+                return rc;
+            }
+        case 7:
+            {
+                uint16_t csr7 = pData->aCSR[7];
+                csr7 &=        ~0x0400 ;
+                csr7 &= ~(val & 0x0800);
+                csr7 |=  (val & 0x0400);
+                pData->aCSR[7] = csr7;
                 return rc;
             }
@@ -2626 +2644 @@
     }
 #ifdef PCNET_DEBUG_CSR
-    Log(("#%d pcnetCSRReadU16: u32RAP=%d val=%#06x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
+    Log(("#%d pcnetCSRReadU16: rap=%d val=%#06x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
          u32RAP, val));
 #endif
@@ -2637 +2655 @@
     u32RAP &= 0x7f;
 #ifdef PCNET_DEBUG_BCR
-    Log2(("#%d pcnetBCRWriteU16: u32RAP=%d val=%#06x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
+    Log2(("#%d pcnetBCRWriteU16: rap=%d val=%#06x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
          u32RAP, val));
 #endif
@@ -2689 +2707 @@
             break;
 
+        case BCR_STVAL:
+            val &= 0xffff;
+            pData->aBCR[BCR_STVAL] = val;
+            if (pData->fAm79C973)
+                TMTimerSet(pData->CTXSUFF(pTimerSoftInt), (uint64_t)12800 * val);
+            break;
+
         case BCR_MIIMDR:
             LOG_REGISTER(("PCNet#%d: WRITE MII%d, %#06x\n",
                          PCNETSTATE_2_DEVINS(pData)->iInstance, u32RAP, val));
             pData->aMII[pData->aBCR[BCR_MIIADDR] & 0x1f] = val;
+#ifdef PCNET_DEBUG_MII
+            Log(("#%d pcnet: mii write %d <- %#x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
+                   pData->aBCR[BCR_MIIADDR] & 0x1f, val));
+#endif
             break;
 
@@ -2707 +2736 @@
     STAM_COUNTER_INC(&pData->StatMIIReads);
 
-    autoneg = (pData->aBCR[BCR_MIICAS] & 0x20) != 0;
+    autoneg = (pData->aBCR[BCR_MIICAS] & 0x20) != 0 /*|| (pData->aMII[0] & 0x1000)*/;
     duplex  = (pData->aBCR[BCR_MIICAS] & 0x10) != 0;
     fast    = (pData->aBCR[BCR_MIICAS] & 0x08) != 0;
@@ -2721 +2750 @@
                 val |= 0x2000;  /* 100 Mbps */
             if (duplex) /* Full duplex forced */
-                val |= 0x0010;  /* Full duplex */
+                val |= 0x0100;  /* Full duplex */
             break;
 
@@ -2852 +2881 @@
     }
 #ifdef PCNET_DEBUG_BCR
-    Log2(("#%d pcnetBCRReadU16: u32RAP=%d val=%#06x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
+    Log2(("#%d pcnetBCRReadU16: rap=%d val=%#06x\n", PCNETSTATE_2_DEVINS(pData)->iInstance,
          u32RAP, val));
 #endif
@@ -2886 +2915 @@
     pData->aBCR[BCR_BSBC ] = 0x9001;
     pData->aBCR[BCR_EECAS] = 0x0002;
+    pData->aBCR[BCR_STVAL] = 0xffff;
     pData->aCSR[58       ] = /* CSR58 is an alias for BCR20 */
     pData->aBCR[BCR_SWS  ] = 0x0200;
@@ -3457 +3487 @@
     PDMCritSectLeave(&pData->CritSect);
     STAM_PROFILE_ADV_STOP(&pData->StatTimer, a);
+}
+
+/**
+ * Software interrupt timer callback function.
+ *
+ * @param   pDevIns         Device instance of the device which registered the timer.
+ * @param   pTimer          The timer handle.
+ * @thread  EMT
+ */
+static DECLCALLBACK(void) pcnetTimerSoftInt(PPDMDEVINS pDevIns, PTMTIMER pTimer)
+{
+    PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
+
+    pData->aCSR[7] |= 0x0800;
+    pcnetUpdateIrq(pData);
+    TMTimerSet(pData->CTXSUFF(pTimerSoftInt), (uint64_t)12800 * (pData->aBCR[BCR_STVAL] & 0xffff));
 }
 
@@ -3851 +3897 @@
 {
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
+    int rc = VINF_SUCCESS;
 
     SSMR3PutBool(pSSMHandle, pData->fLinkUp);
@@ -3870 +3917 @@
     return VINF_SUCCESS;
 #else
-    return TMR3TimerSave(pData->CTXSUFF(pTimerPoll), pSSMHandle);
-#endif
+    rc = TMR3TimerSave(pData->CTXSUFF(pTimerPoll), pSSMHandle);
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
+    if (pData->fAm79C973)
+        rc = TMR3TimerSave(pData->CTXSUFF(pTimerSoftInt), pSSMHandle);
+    return rc;
 }
 
@@ -3905 +3957 @@
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
     PDMMAC      Mac;
-    if (u32Version != PCNET_SAVEDSTATE_VERSION)
+    if (SSM_VERSION_MAJOR_CHANGED(u32Version, PCNET_SAVEDSTATE_VERSION))
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 
@@ -3929 +3981 @@
     TMR3TimerLoad(pData->CTXSUFF(pTimerPoll), pSSMHandle);
 #endif
+    if (pData->fAm79C973)
+    {
+        if (   SSM_VERSION_MAJOR(u32Version) >  0
+            || SSM_VERSION_MINOR(u32Version) >= 8)
+            TMR3TimerLoad(pData->CTXSUFF(pTimerSoftInt), pSSMHandle);
+    }
 
     pData->iLog2DescSize = BCR_SWSTYLE(pData)
@@ -4184 +4242 @@
     pData->pTimerPollGC  = TMTimerGCPtr(pData->pTimerPollHC);
 #endif
+    pData->pTimerSoftIntGC = TMTimerGCPtr(pData->pTimerSoftIntHC);
 }
 
@@ -4382 +4441 @@
     if (VBOX_FAILURE(rc))
     {
-        AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
+        AssertMsgFailed(("pfnTMTimerCreate pcnetTimer -> %Vrc\n", rc));
         return rc;
     }
 #endif
+    if (pData->fAm79C973)
+    {
+        /* Software Interrupt timer */
+        rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, pcnetTimerSoftInt,
+                                   "PCNet SoftInt Timer", &pData->pTimerSoftIntHC);
+        if (VBOX_FAILURE(rc))
+        {
+            AssertMsgFailed(("pfnTMTimerCreate pcnetTimerSoftInt -> %Vrc\n", rc));
+            return rc;
+        }
+    }
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, pcnetTimerRestore,
                                 "PCNet Restore Timer", &pData->pTimerRestore);
     if (VBOX_FAILURE(rc))
     {
-        AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
+        AssertMsgFailed(("pfnTMTimerCreate pcnetTimerRestore -> %Vrc\n", rc));
         return rc;
     }