kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/net/ethernet/intel/e1000e/e1000.h
..
..
@@ -13,7 +13,6 @@
13
13
 #include <linux/io.h>
14
14
 #include <linux/netdevice.h>
15
15
 #include <linux/pci.h>
16
-#include <linux/pci-aspm.h>
17
16
 #include <linux/crc32.h>
18
17
 #include <linux/if_vlan.h>
19
18
 #include <linux/timecounter.h>
..
..
@@ -114,7 +113,8 @@
114
113
 	board_pch2lan,
115
114
 	board_pch_lpt,
116
115
 	board_pch_spt,
117
-	board_pch_cnp
116
+	board_pch_cnp,
117
+	board_pch_tgp
118
118
 };
119
119
 
120
120
 struct e1000_ps_page {
..
..
@@ -437,6 +437,7 @@
437
437
 #define FLAG2_DFLT_CRC_STRIPPING          BIT(12)
438
438
 #define FLAG2_CHECK_RX_HWTSTAMP           BIT(13)
439
439
 #define FLAG2_CHECK_SYSTIM_OVERFLOW       BIT(14)
440
+#define FLAG2_ENABLE_S0IX_FLOWS           BIT(15)
440
441
 
441
442
 #define E1000_RX_DESC_PS(R, i)	    \
442
443
 	(&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
..
..
@@ -461,7 +462,6 @@
461
462
 };
462
463
 
463
464
 extern char e1000e_driver_name[];
464
-extern const char e1000e_driver_version[];
465
465
 
466
466
 void e1000e_check_options(struct e1000_adapter *adapter);
467
467
 void e1000e_set_ethtool_ops(struct net_device *netdev);
..
..
@@ -500,11 +500,15 @@
500
500
 extern const struct e1000_info e1000_pch_lpt_info;
501
501
 extern const struct e1000_info e1000_pch_spt_info;
502
502
 extern const struct e1000_info e1000_pch_cnp_info;
503
+extern const struct e1000_info e1000_pch_tgp_info;
503
504
 extern const struct e1000_info e1000_es2_info;
504
505
 
505
506
 void e1000e_ptp_init(struct e1000_adapter *adapter);
506
507
 void e1000e_ptp_remove(struct e1000_adapter *adapter);
507
508
 
509
+u64 e1000e_read_systim(struct e1000_adapter *adapter,
510
+		       struct ptp_system_timestamp *sts);
511
+
508
512
 static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw)
509
513
 {
510
514
 	return hw->phy.ops.reset(hw);