From nobody Tue Feb 8 06:55:55 2022
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8463D19B709C;
Tue, 8 Feb 2022 06:55:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4JtDLM4YBlz4bXw;
Tue, 8 Feb 2022 06:55:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1644303356;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Uo8UNReXxf+NnoHUsTx8KzSwNevhlB1V60zw+IKTYAA=;
b=SjgqctlwuRyNIgW9zEvGcRS9LeGvzHnTgDyeMR02FtQ01oOu6ecbX+Jd0F9yTlfHWPnJWQ
BYGO7F7gnWJLM6Nq/KLUz2z6f6kAv8bJATixa8zGiB4lQ/CA5oomYJjCFATmomsGi+brGb
3B6gKDX9SVxP+bosuCsFUtkoBgq1gC/pJpyvI6SpXSsSKpHCG2m2Yb9evdJYc0jQxFh4tl
bvBxQG0MZdiSql/rKgRw2syzUB52tthAF0eER8l3ANhmIN2qODXXWucb6796LuQ+/3BIOs
tYIZpx9NckDca3/cRlrd1nJiJWMd51lupaKLi5oJVw+uFtTExbxM8VSoYek/eA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31C0A14ECA;
Tue, 8 Feb 2022 06:55:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2186ttXi053498;
Tue, 8 Feb 2022 06:55:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2186ttCO053497;
Tue, 8 Feb 2022 06:55:55 GMT
(envelope-from git)
Date: Tue, 8 Feb 2022 06:55:55 GMT
Message-Id: <202202080655.2186ttCO053497@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 19371d53348d - stable/13 - mlx5ib: idiomatic use of preprocessor, in particular paths
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 19371d53348d84d353486768a71a041c9de7bca5
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1644303356;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Uo8UNReXxf+NnoHUsTx8KzSwNevhlB1V60zw+IKTYAA=;
b=l9Khriv+cRcrZ1d/+GfFrZocAimpXggfo7x8+O3bKNTdtO93NLSLhpRXcB8TmA6Zrs+3J2
XZ2NH0iME8xLnbd4zx/vxf68TR6c2UmrDfz9pZ2fp1k/7CenpoxAr7xmNXh56ycoiFB8kv
sZjkpFwUyacF6nmUxal6ziV1IrNO+68iGf9Ntu3LJLJgc6Jj3vqo+8EHeH4tbOb+J8h3g1
wW9Q91f946ze9Yz/zWqQ6OIlX+ExpLNQ8+ZIUhzx/HsLmOan59QiVjrY6/7bh9gBoIBTl9
jQW2y6Y2JtlWpXI4cJMPF6620T/zYBmpCI52bvMvaKo1/+vXzSwM7lzW6BeejQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644303356; a=rsa-sha256; cv=none;
b=n9XfKEvlaeFMEHx6G4vYJbIhZnFMf8d0MOqfpvFrY2sUqCkiC9x+vLbM3YEDF7qIelK+Yz
Be8lL0Yu1v+eCzff23pMMpokQNvAWaOGCm6v/QVZJ45+nt1mEqgvI7cr1DWK4+7A0Ny15B
W06+LAy5EixGUABhEwjeMo/rYwRzKACz01P46sB7EU9q3Mht8EE1MEOzCvn+sffkldmu8Q
ST+LdxYxIllz0XfEkAXvbQ6OmdOD/raLKonWGVzikpH6Ogs6m5UtH7vjcpy4W8vq8Sa26m
Xaug+NJZy/9OMK3qYMJfi7+spt5mgCXB6B2DM0DnXGSCTWqyYnFI0yKUp6Kgeg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=19371d53348d84d353486768a71a041c9de7bca5
commit 19371d53348d84d353486768a71a041c9de7bca5
Author: Konstantin Belousov <konstantinb@nvidia.com>
AuthorDate: 2021-06-14 11:10:30 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-02-08 06:42:07 +0000
mlx5ib: idiomatic use of preprocessor, in particular paths
(cherry picked from commit 028130b8e466e96365efaa898adf4ff2d01a2ea9)
---
sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c | 3 +--
sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c | 2 +-
sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c | 2 +-
12 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
index ce3ef156147a..8371f2b808b2 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
@@ -28,7 +28,7 @@
#include "opt_rss.h"
#include "opt_ratelimit.h"
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
static struct ib_ah *create_ib_ah(struct mlx5_ib_dev *dev,
struct mlx5_ib_ah *ah,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
index afc2609919fb..da2fe114a35e 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
@@ -28,8 +28,7 @@
#include "opt_rss.h"
#include "opt_ratelimit.h"
-#include "mlx5_ib.h"
-
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
#include <dev/mlx5/cmd.h>
static const char *mlx5_ib_cong_params_desc[] = {
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
index 26bc8f70779f..9ce8941bbc6f 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
@@ -32,7 +32,7 @@
#include <rdma/ib_umem.h>
#include <rdma/ib_user_verbs.h>
#include <rdma/ib_cache.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe __unused)
{
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c
index 04579fbc2346..5e7c4d1e914b 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c
@@ -32,7 +32,7 @@
#include <linux/slab.h>
#include <rdma/ib_umem.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
struct mlx5_ib_user_db_page {
struct list_head list;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c
index cb9b5cfabf48..dc273bf5d179 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c
@@ -28,7 +28,7 @@
#include "opt_rss.h"
#include "opt_ratelimit.h"
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
struct mlx5_ib_gsi_wr {
struct ib_cqe cqe;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c
index 6abca62ebe47..155f6b88e675 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c
@@ -32,7 +32,7 @@
#include <rdma/ib_mad.h>
#include <rdma/ib_smi.h>
#include <rdma/ib_pma.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
enum {
MLX5_IB_VENDOR_CLASS1 = 0x9,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
index 23fc38424d02..f517dfc58fac 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
@@ -51,7 +51,7 @@
#include <linux/in.h>
#include <linux/etherdevice.h>
#include <dev/mlx5/fs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver");
MODULE_LICENSE("Dual BSD/GPL");
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c
index 91e48bce00f0..8316884c258f 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c
@@ -31,7 +31,7 @@
#include <linux/module.h>
#include <rdma/ib_umem.h>
#include <rdma/ib_umem_odp.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
/* @umem: umem object to scan
* @addr: ib virtual address requested by the user
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
index 0884ba3f4506..6e4122f57f4b 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
@@ -35,7 +35,7 @@
#include <rdma/ib_umem.h>
#include <rdma/ib_umem_odp.h>
#include <rdma/ib_verbs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
enum {
MAX_PENDING_REG_MR = 8,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
index 0ee66192a191..d930d08208c8 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
@@ -32,7 +32,7 @@
#include <rdma/ib_umem.h>
#include <rdma/ib_cache.h>
#include <rdma/ib_user_verbs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
/* not supported currently */
static int wq_signature;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
index 3d9165fd71d3..3a70331271dc 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
@@ -35,7 +35,7 @@
#include <rdma/ib_umem.h>
#include <rdma/ib_user_verbs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
/* not supported currently */
static int srq_signature;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c
index 5bd72e7475fc..d6d15fb2d27e 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c
@@ -30,7 +30,7 @@
#include <linux/module.h>
#include <dev/mlx5/vport.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
int mlx5_ib_get_vf_config(struct ib_device *device, int vf, u8 port,
struct ifla_vf_info *info)