Changeset 927 in vbox

Timestamp:

Feb 15, 2007 3:52:58 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18660

Message:

Workaround for Windows NT4 pcnet problems. Also tighten packet
size overflow check.

File:

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

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

@@ -130 +130 @@
 #if HC_ARCH_BITS == 64
     uint32_t Alignment;
-#endif 
+#endif
     /** The virtual address of the frame (copied or direct pointer) */
     RTR3PTR  pvBuf;
@@ -219 +219 @@
 #if HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64
     RTUINT                              Alignment;
-#endif 
+#endif
     /** The configured MAC address. */
     PDMMAC                              MacConfigured;
@@ -2082 +2082 @@
                     }
                 }
+                else if (cb == 4096)
+                {
+                    /* The Windows NT4 pcnet driver sometimes marks the first
+                     * unused descriptor as owned by us. Ignore that (by
+                     * passing it back). Do not update the ring counter in this
+                     * case (otherwise that driver becomes even more confused,
+                     * which causes transmit to stall for about 10 seconds).
+                     * This is just a workaround, not a final solution. */
+                    LogRel(("PCNET: pcnetAsyncTransmit: illegal 4kb frame -> ignoring\n"));
+                    pcnetTmdStorePassHost(pData, &tmd, PHYSADDR(pData, CSR_CXDA(pData)));
+                    break;
+                }
                 else
                 {
@@ -2107 +2119 @@
              * Read TMDs until end-of-packet or tdte poll fails (underflow).
              */
-            const unsigned cbMaxFrame = 4096;
+            const unsigned cbMaxFrame = 1536;
             bool fDropFrame = false;
             unsigned cb = 4096 - tmd.tmd1.bcnt;
@@ -2219 +2231 @@
     } while (CSR_TXON(pData));          /* transfer on */
 
-    if (cFlushIrq) 
+    if (cFlushIrq)
     {
         STAM_COUNTER_INC(&pData->aStatXmitFlush[RT_MIN(cFlushIrq, ELEMENTS(pData->aStatXmitFlush)) - 1]);
@@ -4260 +4272 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatTmdStoreGC,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet TmdStore in GC",     "/Devices/PCNet%d/TmdStoreGC", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatTmdStoreHC,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet TmdStore in HC",     "/Devices/PCNet%d/TmdStoreHC", iInstance);
-    
+
     unsigned i;
     for (i = 0; i < ELEMENTS(pData->aStatXmitFlush) - 1; i++)
@@ -4271 +4283 @@
 
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitSkipCurrent,    STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,    "",                                    "/Devices/PCNet%d/Xmit/Skipped", iInstance, i + 1);
-    
+
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatInterrupt,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet interrupt checks",   "/Devices/PCNet%d/Interrupt", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatPollTimer,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet poll timer",         "/Devices/PCNet%d/PollTimer", iInstance);