git: 63a7bd998c8e - stable/13 - mlx5: normalize use of the opt_*.h files

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Tue, 08 Feb 2022 06:55:49 UTC
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=63a7bd998c8e32a2e8b95b6ae2796d0c4e7fde8e

commit 63a7bd998c8e32a2e8b95b6ae2796d0c4e7fde8e
Author:     Konstantin Belousov <konstantinb@nvidia.com>
AuthorDate: 2021-06-14 10:26:03 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-02-08 06:42:06 +0000

    mlx5: normalize use of the opt_*.h files
    
    (cherry picked from commit ee9d634bd3b985bca49946e5d5697d7e65589711)
---
 sys/dev/mlx5/mlx5_core/mlx5_alloc.c       | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_cmd.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_cq.c          | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_eq.c          | 5 +++--
 sys/dev/mlx5/mlx5_core/mlx5_eswitch.c     | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c      | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c     | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_fw.c          | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_fwdump.c      | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_health.c      | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_mad.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_main.c        | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_mcg.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_mpfs.c        | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_mr.c          | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c   | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_pd.c          | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_port.c        | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_qp.c          | 2 ++
 sys/dev/mlx5/mlx5_core/mlx5_rl.c          | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_srq.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_tls.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_transobj.c    | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_uar.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_vport.c       | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_vsc.c         | 3 +++
 sys/dev/mlx5/mlx5_core/mlx5_wq.c          | 3 +++
 28 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_core/mlx5_alloc.c b/sys/dev/mlx5/mlx5_core/mlx5_alloc.c
index 99e39b80a4ec..097e1c90207c 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_alloc.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_alloc.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
index c4e8b32ffcd5..2eaca4d83c6a 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_cq.c b/sys/dev/mlx5/mlx5_core/mlx5_cq.c
index 248d8c9d75c8..50da5ec0ae3f 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_cq.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_cq.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/hardirq.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c b/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c
index 00740095b3e1..17aa2ca4c91b 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <dev/mlx5/driver.h>
 #include <dev/mlx5/port.h>
 #include <dev/mlx5/diagnostics.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_eq.c b/sys/dev/mlx5/mlx5_core/mlx5_eq.c
index 2dc134d0f9c4..b6165cdddec1 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_eq.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_eq.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <dev/mlx5/port.h>
@@ -33,8 +36,6 @@
 #include "mlx5_core.h"
 #include "eswitch.h"
 
-#include "opt_rss.h"
-
 #ifdef  RSS
 #include <net/rss_config.h>
 #include <netinet/in_rss.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c b/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c
index ccf05b038435..eff46501089a 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/etherdevice.h>
 #include <dev/mlx5/driver.h>
 #include <dev/mlx5/mlx5_ifc.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
index 43c35c137c2b..e44feacf687e 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/types.h>
 #include <linux/module.h>
 #include <dev/mlx5/mlx5_ifc.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
index 320831b6e153..f01b96fcb5aa 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
 #include "mlx5_core.h"
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fw.c b/sys/dev/mlx5/mlx5_core/mlx5_fw.c
index 1f8165c0ed89..f4ca1b754479 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_fw.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_fw.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <dev/mlx5/driver.h>
 #include <linux/module.h>
 #include "mlx5_core.h"
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c b/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
index a23de943f4aa..c752d87af810 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
@@ -23,6 +23,9 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_health.c b/sys/dev/mlx5/mlx5_core/mlx5_health.c
index 7df7870d006f..13cdd1396528 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_health.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_health.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/random.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mad.c b/sys/dev/mlx5/mlx5_core/mlx5_mad.c
index 095b0abedac0..18b2b902e2bc 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_mad.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_mad.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c
index 5830d4510d7b..57ef629223d4 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_main.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kmod.h>
 #include <linux/module.h>
 #include <linux/errno.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mcg.c b/sys/dev/mlx5/mlx5_core/mlx5_mcg.c
index 0e214c57798a..2b791978e7fd 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_mcg.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_mcg.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c b/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c
index 6835aa8f853b..b18ae211d37a 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/types.h>
 #include <linux/etherdevice.h>
 
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mr.c b/sys/dev/mlx5/mlx5_core/mlx5_mr.c
index d915e15c4f36..b9928b4fc032 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_mr.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_mr.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
index 0fac6e9d304c..5f649ff16ce3 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_pd.c b/sys/dev/mlx5/mlx5_core/mlx5_pd.c
index bf8f0269f0f5..b185787217cd 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_pd.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_pd.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_port.c b/sys/dev/mlx5/mlx5_core/mlx5_port.c
index b303c7b07c7d..173990843eec 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_port.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_port.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/module.h>
 #include <dev/mlx5/port.h>
 #include "mlx5_core.h"
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_qp.c b/sys/dev/mlx5/mlx5_core/mlx5_qp.c
index 441c005b9920..4b5055a78836 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_qp.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_qp.c
@@ -25,6 +25,8 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
 
 #include <linux/gfp.h>
 #include <dev/mlx5/qp.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_rl.c b/sys/dev/mlx5/mlx5_core/mlx5_rl.c
index c1b5a8e83b2a..2f66ab4748ed 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_rl.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_rl.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_srq.c b/sys/dev/mlx5/mlx5_core/mlx5_srq.c
index aa24c824aa39..6deae4e0feeb 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_srq.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_srq.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_tls.c b/sys/dev/mlx5/mlx5_core/mlx5_tls.c
index 7f7d93da72a1..519c006c917a 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_tls.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_tls.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <dev/mlx5/driver.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_transobj.c b/sys/dev/mlx5/mlx5_core/mlx5_transobj.c
index 10c57107230e..a0c8175df443 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_transobj.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_transobj.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <dev/mlx5/driver.h>
 
 #include "mlx5_core.h"
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_uar.c b/sys/dev/mlx5/mlx5_core/mlx5_uar.c
index 1a662ade0aee..eb67c3c98f57 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_uar.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_uar.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/io-mapping.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_vport.c b/sys/dev/mlx5/mlx5_core/mlx5_vport.c
index f9e70c8939f4..d3d4b8052474 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_vport.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_vport.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <linux/etherdevice.h>
 #include <dev/mlx5/driver.h>
 #include <dev/mlx5/vport.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_vsc.c b/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
index 81574c14ec3f..320505f8ca80 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <dev/mlx5/driver.h>
 #include <dev/mlx5/device.h>
 #include <dev/mlx5/mlx5_core/mlx5_core.h>
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_wq.c b/sys/dev/mlx5/mlx5_core/mlx5_wq.c
index 131ed9bfce2a..41cb05366cae 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_wq.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_wq.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include <dev/mlx5/driver.h>
 #include "wq.h"
 #include "mlx5_core.h"