Merge branch 'onload-8.1' into onload-9.0

Xilinx-CNS · Dec 6, 2024 · d3e9921 · d3e9921
2 parents fce6871 + add0d33
commit d3e9921
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/src/include/ci/efhw/debug_linux.h b/src/include/ci/efhw/debug_linux.h
@@ -80,8 +80,8 @@
 #define EFHW_ASSERT(cond)  BUG_ON((cond) == 0)
 #define EFHW_DO_DEBUG(expr) expr
 #else
-#define EFHW_ASSERT(cond)
-#define EFHW_DO_DEBUG(expr)
+#define EFHW_ASSERT(cond) do {} while(0)
+#define EFHW_DO_DEBUG(expr) do {} while(0)
 #endif
 
 #define EFHW_TEST(expr)			\

diff --git a/src/include/ci/efrm/debug_linux.h b/src/include/ci/efrm/debug_linux.h
@@ -78,7 +78,7 @@
 #if !defined(NDEBUG)
 #define EFRM_TRACE(fmt, ...) EFRM_PRINTK(KERN_DEBUG, fmt, __VA_ARGS__)
 #else
-#define EFRM_TRACE(fmt, ...)
+#define EFRM_TRACE(fmt, ...) do {} while(0)
 #endif
 
 #define EFRM_WARN_ONCE(fmt, ...) do {                        \
@@ -107,8 +107,8 @@
 #define EFRM_DO_DEBUG(expr) expr
 #define EFRM_VERIFY_EQ(expr, val) EFRM_ASSERT((expr) == (val))
 #else
-#define EFRM_ASSERT(cond)
-#define EFRM_DO_DEBUG(expr)
+#define EFRM_ASSERT(cond) do {} while(0)
+#define EFRM_DO_DEBUG(expr) do {} while(0)
 #define EFRM_VERIFY_EQ(expr, val) expr
 #endif
 

diff --git a/src/include/onload/debug.h b/src/include/onload/debug.h
@@ -65,7 +65,7 @@ extern int oo_debug_bits;
   do{ if( oo_debug_bits & (bits) )  { foo; } }while(0)
 
 #ifdef NDEBUG
-# define OO_DYNAMIC_DEBUG(bits, foo)
+# define OO_DYNAMIC_DEBUG(bits, foo) do {} while(0)
 #else
 # define OO_DYNAMIC_DEBUG(bits, foo)  OO_DYNAMIC_LOG((bits), foo)
 #endif

diff --git a/src/lib/efrm/bt_manager.c b/src/lib/efrm/bt_manager.c
@@ -239,7 +239,7 @@ efrm_bt_manager_realloc(struct efhw_nic *nic,
 		else
 			EFRM_ASSERT(a->bta_first_entry_offset + a->bta_size
 				    <= EFHW_BUFFER_TABLE_BLOCK_SIZE);
-	)
+	);
 
 	spin_lock_bh(&manager->btm_lock);
 	if (manager->btm_block != NULL)
@@ -317,7 +317,7 @@ efrm_bt_nic_set(struct efhw_nic *nic, struct efrm_buffer_table_allocation *a,
 		else
 			EFRM_ASSERT(a->bta_first_entry_offset + a->bta_size
 				    <= EFHW_BUFFER_TABLE_BLOCK_SIZE);
-	)
+	);
 
 	do {
 		rc = efhw_nic_buffer_table_set(nic, block,

diff --git a/src/lib/efrm/efrm_efct_rxq.c b/src/lib/efrm/efrm_efct_rxq.c
@@ -338,8 +338,7 @@ int efrm_rxq_refresh(struct efrm_efct_rxq *rxq, unsigned long superbufs,
 		           n_hugepages * CI_EFCT_SUPERBUFS_PER_PAGE);
 	}
 
-	pages = kmalloc_array(sizeof(pages[0]), CI_EFCT_MAX_HUGEPAGES,
-	                      GFP_KERNEL);
+	pages = kmalloc_array(CI_EFCT_MAX_HUGEPAGES, sizeof(pages[0]), GFP_KERNEL);
 	if (!pages)
 		return -ENOMEM;
 
@@ -427,7 +426,7 @@ int efrm_rxq_refresh_kernel(struct efhw_nic *nic, int hwqid,
 	size_t i;
 	int rc = 0;
 
-	pages = kmalloc_array(sizeof(pages[0]), CI_EFCT_MAX_HUGEPAGES, GFP_KERNEL);
+	pages = kmalloc_array(CI_EFCT_MAX_HUGEPAGES, sizeof(pages[0]), GFP_KERNEL);
 	if (!pages)
 		return -ENOMEM;
 

diff --git a/src/lib/transport/unix/internal.h b/src/lib/transport/unix/internal.h
@@ -682,8 +682,8 @@ extern citp_fdinfo_p citp_fdtable_busy_wait(unsigned fd, int fdt_locked) CI_HF;
 #define CITP_FDTABLE_UNLOCK()	__CITP_UNLOCK(&citp_ul_lock)
 #define CITP_FDTABLE_UNLOCK_RD() __CITP_UNLOCK_RD(&citp_ul_lock)
 
-#define CITP_FDTABLE_ASSERT_LOCKED(fdt_locked)
-#define CITP_FDTABLE_ASSERT_LOCKED_RD
+#define CITP_FDTABLE_ASSERT_LOCKED(fdt_locked) do {} while(0)
+#define CITP_FDTABLE_ASSERT_LOCKED_RD do {} while(0)
 
 #else