|
@@ -21,6 +21,7 @@
|
|
|
*
|
|
|
*/
|
|
|
|
|
|
+#include <linux/io-64-nonatomic-lo-hi.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include "netxen_nic.h"
|
|
|
#include "netxen_nic_hw.h"
|
|
@@ -44,20 +45,6 @@ static void netxen_nic_io_write_128M(struct netxen_adapter *adapter,
|
|
|
void __iomem *addr, u32 data);
|
|
|
static u32 netxen_nic_io_read_128M(struct netxen_adapter *adapter,
|
|
|
void __iomem *addr);
|
|
|
-#ifndef readq
|
|
|
-static inline u64 readq(void __iomem *addr)
|
|
|
-{
|
|
|
- return readl(addr) | (((u64) readl(addr + 4)) << 32LL);
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifndef writeq
|
|
|
-static inline void writeq(u64 val, void __iomem *addr)
|
|
|
-{
|
|
|
- writel(((u32) (val)), (addr));
|
|
|
- writel(((u32) (val >> 32)), (addr + 4));
|
|
|
-}
|
|
|
-#endif
|
|
|
|
|
|
#define PCI_OFFSET_FIRST_RANGE(adapter, off) \
|
|
|
((adapter)->ahw.pci_base0 + (off))
|