From fe68f570d4ddcd9ab3b3e776e4fc90bbc7d44699 Mon Sep 17 00:00:00 2001
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 26 Jan 2016 15:26:35 +0000
Subject: [PATCH] Update and add various macros to the LinuxKPI and resolve a
 macro redefinition issue in the cxgb driver.

MFC after:	1 week
Sponsored by:	Mellanox Technologies
Reviewed by:	np @
---
 sys/compat/linuxkpi/common/include/asm/atomic.h        |  2 ++
 sys/compat/linuxkpi/common/include/linux/clocksource.h |  9 +++++----
 sys/compat/linuxkpi/common/include/linux/completion.h  |  4 +++-
 sys/compat/linuxkpi/common/include/linux/gfp.h         |  1 +
 sys/compat/linuxkpi/common/include/linux/kernel.h      | 10 ++++++----
 sys/dev/cxgb/cxgb_osdep.h                              |  4 +++-
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h
index ee85624fd92..70560f1f08f 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic.h
@@ -35,6 +35,8 @@
 #include <sys/types.h>
 #include <machine/atomic.h>
 
+#define	ATOMIC_INIT(x)	{ .counter = (x) }
+
 typedef struct {
 	volatile int counter;
 } atomic_t;
diff --git a/sys/compat/linuxkpi/common/include/linux/clocksource.h b/sys/compat/linuxkpi/common/include/linux/clocksource.h
index f4d17f18879..5e2cd5ee95e 100644
--- a/sys/compat/linuxkpi/common/include/linux/clocksource.h
+++ b/sys/compat/linuxkpi/common/include/linux/clocksource.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
- * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
+ * Copyright (c) 2013-2016 Mellanox Technologies, Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,12 +29,13 @@
  * $FreeBSD$
  */
 #ifndef _LINUX_CLOCKSOURCE_H
-#define _LINUX_CLOCKSOURCE_H
+#define	_LINUX_CLOCKSOURCE_H
 
 #include <asm/types.h>
 
+#define	CLOCKSOURCE_MASK(x) ((cycle_t)(-1ULL >> ((-(x)) & 63)))
+
 /* clocksource cycle base type */
 typedef u64 cycle_t;
 
-
-#endif /* _LINUX_CLOCKSOURCE_H */
+#endif					/* _LINUX_CLOCKSOURCE_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/completion.h b/sys/compat/linuxkpi/common/include/linux/completion.h
index 7cfb10db86b..92ccc61f38d 100644
--- a/sys/compat/linuxkpi/common/include/linux/completion.h
+++ b/sys/compat/linuxkpi/common/include/linux/completion.h
@@ -40,7 +40,9 @@ struct completion {
 #define	INIT_COMPLETION(c) \
 	((c).done = 0)
 #define	init_completion(c) \
-	((c)->done = 0)
+	do { (c)->done = 0; } while (0)
+#define	reinit_completion(c) \
+	do { (c)->done = 0; } while (0)
 #define	complete(c)				\
 	linux_complete_common((c), 0)
 #define	complete_all(c)				\
diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h
index 38a0222a8e8..d0fb0ac0d00 100644
--- a/sys/compat/linuxkpi/common/include/linux/gfp.h
+++ b/sys/compat/linuxkpi/common/include/linux/gfp.h
@@ -54,6 +54,7 @@
 #define	GFP_HIGHUSER	M_WAITOK
 #define	GFP_HIGHUSER_MOVABLE	M_WAITOK
 #define	GFP_IOFS	M_NOWAIT
+#define	GFP_NOIO	M_NOWAIT
 
 static inline void *
 page_address(struct page *page)
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
index bfc3b7d7b6b..6b6c0afa918 100644
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
- * Copyright (c) 2013-2015 Mellanox Technologies, Ltd.
+ * Copyright (c) 2013-2016 Mellanox Technologies, Ltd.
  * Copyright (c) 2014-2015 François Tigeot
  * All rights reserved.
  *
@@ -159,9 +159,10 @@
   
 #define	ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
 
-#define	simple_strtoul	strtoul
-#define	simple_strtol	strtol
-#define kstrtol(a,b,c) ({*(c) = strtol(a,0,b);})
+#define	simple_strtoul(...) strtoul(__VA_ARGS__)
+#define	simple_strtol(...) strtol(__VA_ARGS__)
+#define	kstrtol(a,b,c) ({*(c) = strtol(a,0,b); 0;})
+#define	kstrtoint(a,b,c) ({*(c) = strtol(a,0,b); 0;})
 
 #define min(x, y)	((x) < (y) ? (x) : (y))
 #define max(x, y)	((x) > (y) ? (x) : (y))
@@ -185,6 +186,7 @@
 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
 #define round_down(x, y) ((x) & ~__round_mask(x, y))
 
+#define	smp_processor_id()	PCPU_GET(cpuid)
 #define	num_possible_cpus()	mp_ncpus
 #define	num_online_cpus()	mp_ncpus
 
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h
index ddef730426a..b9ca32fe5ce 100644
--- a/sys/dev/cxgb/cxgb_osdep.h
+++ b/sys/dev/cxgb/cxgb_osdep.h
@@ -231,7 +231,9 @@ static const int debug_flags = DBG_RX;
 #define le16_to_cpu(x) le16toh(x)
 #define cpu_to_le32(x) htole32(x)
 #define swab32(x) bswap32(x)
-#define simple_strtoul strtoul
+#ifndef simple_strtoul
+#define simple_strtoul(...) strtoul(__VA_ARGS__)
+#endif
 
 
 #ifndef LINUX_TYPES_DEFINED