Update to version 2.5.3d1.

jpz4085 · Jun 1, 2021 · daa6e9e · daa6e9e
1 parent 45c5398
commit daa6e9e
Show file tree

Hide file tree

Showing 8 changed files with 444 additions and 374 deletions.
diff --git a/IntelMausiEthernet/IntelMausiEthernet-Info.plist b/IntelMausiEthernet/IntelMausiEthernet-Info.plist
@@ -32,9 +32,7 @@
 			<dict>
 				<key>enableCSO6</key>
 				<true/>
-				<key>enableTSO4</key>
-				<false/>
-				<key>enableTSO6</key>
+				<key>enableWakeOnAddrMatch</key>
 				<false/>
 				<key>maxIntrRate10</key>
 				<integer>3000</integer>

diff --git a/IntelMausiEthernet/IntelMausiEthernet.cpp b/IntelMausiEthernet/IntelMausiEthernet.cpp
diff --git a/IntelMausiEthernet/IntelMausiEthernet.h b/IntelMausiEthernet/IntelMausiEthernet.h
@@ -235,8 +235,7 @@ enum
 
 #define kParamName "Driver Parameters"
 #define kEnableCSO6Name "enableCSO6"
-#define kEnableTSO4Name "enableTSO4"
-#define kEnableTSO6Name "enableTSO6"
+#define kEnableWoMName "enableWakeOnAddrMatch"
 #define kIntrRate10Name "maxIntrRate10"
 #define kIntrRate100Name "maxIntrRate100"
 #define kIntrRate1000Name "maxIntrRate1000"
@@ -275,6 +274,27 @@ struct IntelRxDesc {
     UInt64 status;
 };
 
+/*
+ * Keep alive address data as supported by hardware with a
+ * maximum of:
+ *  3 IPv4 addresses
+ *  4 IPv6 addresses
+ */
+#define kMaxAddrV4 3
+#define kMaxAddrV6 4
+
+#define kLLAPrefix  0xfe800000
+#define kLLAMask    0xffc00000
+#define kULAPrefix  0xfc000000
+#define kULAMask    0xfe000000
+
+struct IntelAddrData {
+    UInt16 ipV6Count;
+    UInt16 ipV4Count;
+    struct in6_addr ipV6Addr[kMaxAddrV6];
+    UInt32 ipV4Addr[kMaxAddrV4];
+};
+
 class IntelMausi : public super
 {
 
@@ -389,7 +409,8 @@ class IntelMausi : public super
     void intelFlushRxRing(struct e1000_adapter *adapter);
     void intelFlushDescRings(struct e1000_adapter *adapter);
     void intelPhyReadStatus(struct e1000_adapter *adapter);
-    void intelInitPhyWakeup(UInt32 wufc);
+    void intelInitPhyWakeup(UInt32 wufc, struct IntelAddrData *addrData);
+    void intelInitMacWakeup(UInt32 wufc, struct IntelAddrData *addrData);
     void intelSetupAdvForMedium(const IONetworkMedium *medium);
     void intelFlushLPIC();
     void setMaxLatency(UInt32 linkSpeed);
@@ -399,6 +420,8 @@ class IntelMausi : public super
 
     inline void intelGetChecksumResult(mbuf_t m, UInt32 status);
 
+    void getAddressList(struct IntelAddrData *addr);
+
     /* timer action */
     void timerAction(IOTimerEventSource *timer);
 
@@ -481,7 +504,6 @@ class IntelMausi : public super
     UInt8 pcieCapOffset;
     UInt8 pciPMCtrlOffset;
 
-    UInt32 linkOpts;
     IONetworkPacketPollingParameters pollParams;
 
     /* flags */
@@ -496,9 +518,8 @@ class IntelMausi : public super
     bool wolCapable;
     bool wolActive;
     bool wolPwrOff;
-    bool enableTSO4;
-    bool enableTSO6;
     bool enableCSO6;
+    bool enableWoM;
 
     /* mbuf_t arrays */
     struct intelTxBufferInfo txBufArray[kNumTxDesc];