forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/drivers/net/ethernet/neterion/s2io.h
....@@ -10,6 +10,7 @@
1010 * system is licensed under the GPL.
1111 * See the file COPYING in this distribution for more information.
1212 ************************************************************************/
13
+#include <linux/io-64-nonatomic-lo-hi.h>
1314 #ifndef _S2IO_H
1415 #define _S2IO_H
1516
....@@ -970,27 +971,6 @@
970971 #define RESET_ERROR 1
971972 #define CMD_ERROR 2
972973
973
-/* OS related system calls */
974
-#ifndef readq
975
-static inline u64 readq(void __iomem *addr)
976
-{
977
- u64 ret = 0;
978
- ret = readl(addr + 4);
979
- ret <<= 32;
980
- ret |= readl(addr);
981
-
982
- return ret;
983
-}
984
-#endif
985
-
986
-#ifndef writeq
987
-static inline void writeq(u64 val, void __iomem *addr)
988
-{
989
- writel((u32) (val), addr);
990
- writel((u32) (val >> 32), (addr + 4));
991
-}
992
-#endif
993
-
994974 /*
995975 * Some registers have to be written in a particular order to
996976 * expect correct hardware operation. The macro SPECIAL_REG_WRITE
....@@ -1085,7 +1065,7 @@
10851065 static void tx_intr_handler(struct fifo_info *fifo_data);
10861066 static void s2io_handle_errors(void * dev_id);
10871067
1088
-static void s2io_tx_watchdog(struct net_device *dev);
1068
+static void s2io_tx_watchdog(struct net_device *dev, unsigned int txqueue);
10891069 static void s2io_set_multicast(struct net_device *dev);
10901070 static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp);
10911071 static void s2io_link(struct s2io_nic * sp, int link);