Changeset 51150 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 28, 2014 7:38:24 AM (11 years ago)

Author:

vboxsync

Message:

e1000: Phar Lap ETS support (#7346)

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (2 diffs)

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

@@ -2816 +2816 @@
     else if (GET_BITS_V(value, MDIC, PHY) != 1)
     {
-        E1kLog(("%s ERROR! Access to invalid PHY detected, phy=%d.\n",
+        E1kLog(("%s WARNING! Access to invalid PHY detected, phy=%d.\n",
                 pThis->szPrf, GET_BITS_V(value, MDIC, PHY)));
+        /* 
+         * Some drivers scan the MDIO bus for a PHY. We can work with these
+         * drivers if we set MDIC_READY and MDIC_ERROR when there isn't a PHY
+         * at the requested address, see @bugref{7346}.
+         */
+        MDIC = MDIC_READY | MDIC_ERROR;
     }
     else
@@ -3091 +3097 @@
     {
         E1kLog(("%s e1kRegWriteRDT\n",  pThis->szPrf));
+        /*
+         * Some drivers advance RDT too far, so that it equals RDH. This
+         * somehow manages to work with real hardware but not with this
+         * emulated device. We can work with these drivers if we just
+         * write 1 less when we see a driver writing RDT equal to RDH,
+         * see @bugref{7346}.
+         */
+        if (value == RDH)
+        {
+            if (RDH == 0)
+                value = (RDLEN / sizeof(E1KRXDESC)) - 1;
+            else
+                value = RDH - 1;
+        }
         rc = e1kRegWriteDefault(pThis, offset, index, value);
 #ifdef E1K_WITH_RXD_CACHE