Changeset 40791 in vbox

Timestamp:

Apr 6, 2012 1:46:37 PM (13 years ago)

Author:

vboxsync

Message:

e1000: added EthernetCRC CFGM parameter to make calculation of CRC optional (#6152)

File:

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

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

@@ -979 +979 @@
     /** EMT: */
     bool        fGCEnabled;
+    /** EMT: Compute Ethernet CRC for RX packets. */
+    bool        fEthernetCRC;
+#if HC_ARCH_BITS == 64
+    uint32_t                Alignment2;
+#endif
 
     /** All: Device register storage. */
@@ -1074 +1079 @@
     STAMCOUNTER                         StatIntsPrevented;
     STAMPROFILEADV                      StatReceive;
+    STAMPROFILEADV                      StatReceiveCRC;
     STAMPROFILEADV                      StatReceiveFilter;
     STAMPROFILEADV                      StatReceiveStore;
@@ -2039 +2045 @@
     if (!(RCTL & RCTL_SECRC))
     {
-        /* Add FCS if CRC stripping is not enabled */
-        *(uint32_t*)(rxPacket + cb) = RTCrc32(rxPacket, cb);
+        STAM_PROFILE_ADV_START(&pState->StatReceiveCRC, a);
+        /*
+         * Add FCS if CRC stripping is not enabled. Since the value of CRC
+         * is ignored by most of drivers we may as well save us the trouble
+         * of calculating it (see EthernetCRC CFGM parameter).
+         */
+        if (pState->fEthernetCRC)
+            *(uint32_t*)(rxPacket + cb) = RTCrc32(rxPacket, cb);
         cb += sizeof(uint32_t);
+        STAM_PROFILE_ADV_STOP(&pState->StatReceiveCRC, a);
     }
     /* Compute checksum of complete packet */
@@ -5896 +5909 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "MAC\0" "CableConnected\0" "AdapterType\0" "LineSpeed\0" "GCEnabled\0" "R0Enabled\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "MAC\0" "CableConnected\0" "AdapterType\0"
+                                    "LineSpeed\0" "GCEnabled\0" "R0Enabled\0"
+                                    "EthernetCRC\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Invalid configuration for E1000 device"));
@@ -5904 +5919 @@
     pState->fR0Enabled   = true;
     pState->fGCEnabled   = true;
+    pState->fEthernetCRC = true;
 
     /* Get config params */
@@ -5929 +5945 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'R0Enabled'"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "EthernetCRC", &pState->fEthernetCRC, true);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to get the value of 'EthernetCRC'"));
 
     E1kLog(("%s Chip=%s\n", INSTANCE(pState), g_Chips[pState->eChip].pcszName));
@@ -6180 +6201 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatIntsPrevented,      STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Number of prevented interrupts",     "/Devices/E1k%d/Interrupts/Prevented", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatReceive,            STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling receive",                  "/Devices/E1k%d/Receive/Total", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatReceiveCRC,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling receive checksumming",     "/Devices/E1k%d/Receive/CRC", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatReceiveFilter,      STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling receive filtering",        "/Devices/E1k%d/Receive/Filter", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatReceiveStore,       STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling receive storing",          "/Devices/E1k%d/Receive/Store", iInstance);