add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
..
..
@@ -32,8 +32,14 @@
32
32
  * (you will need to reboot afterwards) */
33
33
 /* #define BNX2X_STOP_ON_ERROR */
34
34
 
35
-#define DRV_MODULE_VERSION      "1.712.30-0"
36
-#define DRV_MODULE_RELDATE      "2014/02/10"
35
+/* FIXME: Delete the DRV_MODULE_VERSION below, but please be warned
36
+ * that it is not an easy task because such change has all chances
37
+ * to break this driver due to amount of abuse of in-kernel interfaces
38
+ * between modules and FW.
39
+ *
40
+ * DO NOT UPDATE DRV_MODULE_VERSION below.
41
+ */
42
+#define DRV_MODULE_VERSION      "1.713.36-0"
37
43
 #define BNX2X_BC_VER            0x040200
38
44
 
39
45
 #if defined(CONFIG_DCB)
..
..
@@ -1281,7 +1287,6 @@
1281
1287
 	BNX2X_SP_RTNL_HYPERVISOR_VLAN,
1282
1288
 	BNX2X_SP_RTNL_TX_STOP,
1283
1289
 	BNX2X_SP_RTNL_GET_DRV_VERSION,
1284
-	BNX2X_SP_RTNL_CHANGE_UDP_PORT,
1285
1290
 	BNX2X_SP_RTNL_UPDATE_SVID,
1286
1291
 };
1287
1292
 
..
..
@@ -1335,11 +1340,6 @@
1335
1340
 	BNX2X_UDP_PORT_VXLAN,
1336
1341
 	BNX2X_UDP_PORT_GENEVE,
1337
1342
 	BNX2X_UDP_PORT_MAX,
1338
-};
1339
-
1340
-struct bnx2x_udp_tunnel {
1341
-	u16 dst_port;
1342
-	u8 count;
1343
1343
 };
1344
1344
 
1345
1345
 struct bnx2x {
..
..
@@ -1849,7 +1849,15 @@
1849
1849
 	bool accept_any_vlan;
1850
1850
 
1851
1851
 	/* Vxlan/Geneve related information */
1852
-	struct bnx2x_udp_tunnel udp_tunnel_ports[BNX2X_UDP_PORT_MAX];
1852
+	u16 udp_tunnel_ports[BNX2X_UDP_PORT_MAX];
1853
+
1854
+#define FW_CAP_INVALIDATE_VF_FP_HSI	BIT(0)
1855
+	u32 fw_cap;
1856
+
1857
+	u32 fw_major;
1858
+	u32 fw_minor;
1859
+	u32 fw_rev;
1860
+	u32 fw_eng;
1853
1861
 };
1854
1862
 
1855
1863
 /* Tx queues may be less or equal to Rx queues */
..
..
@@ -1973,6 +1981,9 @@
1973
1981
 
1974
1982
 #define skip_queue(bp, idx)	(NO_FCOE(bp) && IS_FCOE_IDX(idx))
1975
1983
 
1984
+/*self test*/
1985
+int bnx2x_idle_chk(struct bnx2x *bp);
1986
+
1976
1987
 /**
1977
1988
  * bnx2x_set_mac_one - configure a single MAC address
1978
1989
  *
..
..
@@ -2081,7 +2092,7 @@
2081
2092
 			    bool is_pf);
2082
2093
 
2083
2094
 #define BNX2X_ILT_ZALLOC(x, y, size)					\
2084
-	x = dma_zalloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL)
2095
+	x = dma_alloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL)
2085
2096
 
2086
2097
 #define BNX2X_ILT_FREE(x, y, size) \
2087
2098
 	do { \
..
..
@@ -2424,13 +2435,6 @@
2424
2435
 #define HC_SEG_ACCESS_ATTN		4
2425
2436
 #define HC_SEG_ACCESS_NORM		0   /*Driver decision 0-1*/
2426
2437
 
2427
-static const u32 dmae_reg_go_c[] = {
2428
-	DMAE_REG_GO_C0, DMAE_REG_GO_C1, DMAE_REG_GO_C2, DMAE_REG_GO_C3,
2429
-	DMAE_REG_GO_C4, DMAE_REG_GO_C5, DMAE_REG_GO_C6, DMAE_REG_GO_C7,
2430
-	DMAE_REG_GO_C8, DMAE_REG_GO_C9, DMAE_REG_GO_C10, DMAE_REG_GO_C11,
2431
-	DMAE_REG_GO_C12, DMAE_REG_GO_C13, DMAE_REG_GO_C14, DMAE_REG_GO_C15
2432
-};
2433
-
2434
2438
 void bnx2x_set_ethtool_ops(struct bnx2x *bp, struct net_device *netdev);
2435
2439
 void bnx2x_notify_link_changed(struct bnx2x *bp);
2436
2440
 
..
..
@@ -2521,6 +2525,7 @@
2521
2525
 void bnx2x_init_ptp(struct bnx2x *bp);
2522
2526
 int bnx2x_configure_ptp_filters(struct bnx2x *bp);
2523
2527
 void bnx2x_set_rx_ts(struct bnx2x *bp, struct sk_buff *skb);
2528
+void bnx2x_register_phc(struct bnx2x *bp);
2524
2529
 
2525
2530
 #define BNX2X_MAX_PHC_DRIFT 31000000
2526
2531
 #define BNX2X_PTP_TX_TIMEOUT
..
..
@@ -2529,5 +2534,4 @@
2529
2534
  * Meant for implicit re-load flows.
2530
2535
  */
2531
2536
 int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp);
2532
-
2533
2537
 #endif /* bnx2x.h */