From nobody Tue Feb 01 14:46:17 2022 X-Original-To: dev-commits-src-main@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 0676219A5CD3; Tue, 1 Feb 2022 14:46:18 +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 4Jp76K5FKrz4j3D; Tue, 1 Feb 2022 14:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726777; 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=q70tC/h133D6F7LcuuFOdgKg97j4buApt4+s+VQ10t4=; b=DK2AFby2wsjWQUnRB4VPQQ8LL9Max7N7JLdcv2D1/o5NVLZg5UMs2cZJOM9ytmsoePwLX/ V30pxRYCkiFV+qEErwmIaWiWcRfKXIZoA6RH6hLMiGNGizothbf9tZDy/BvCvCHG5OpZzz vC+I8WEiT9mEs1YRrSNiTYhWGOrLVnAl/QChLJ0Khultecnx7ZpGt3crz5LtuKheh1/mk2 xKXqh3IdOjw7Nkjzx079i+g+wl8q7FxjzfmTkcgLwE7/L5FWFbgZI+5bFdzTPaUyF39AwQ vxxGSbsYXlMUkc3kKIQsWiHvOxTTJYN8tkyfZS64y5/rDq3+95sGlVhTPJc8Ig== 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 8F5C512D80; Tue, 1 Feb 2022 14:46:17 +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 211EkHr6096685; Tue, 1 Feb 2022 14:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211EkHFR096684; Tue, 1 Feb 2022 14:46:17 GMT (envelope-from git) Date: Tue, 1 Feb 2022 14:46:17 GMT Message-Id: <202202011446.211EkHFR096684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 12c56d7dc488 - main - mlx5: idiomatic use of preprocessor, in particular paths List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 12c56d7dc48821d84cc29e66f5d7f45e2ed8fd11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726777; 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=q70tC/h133D6F7LcuuFOdgKg97j4buApt4+s+VQ10t4=; b=DbcuKFUkBFZLW371wPcnHSIMU3e9vktIsKEnGnxEU2Ri2L337i3BHM63ewUZkNDc6ktU3A YkysA4MedV0NIKBXB1dEnYceIgu8AUL2iJOSXB4INw9W9C5UI3K6bO6aTIOsbQ9GeefFNL 807rzwvs278OPoQA99aGkiKX54q2loBejbRkxWAxISu7NLpIj9Qm8naZtz2zQTNGY3rcdb +Xq9a40GQIQtuA/UToWIuk1oPX7cNcr21zpU2y4m6xYpUh3K1ULDNMajCnOJq+jld2oQtm N1MvuUjWZyT4HLBhzV8K/bHUdo7ZSW3JCXfYgpgRJ//CQJkFIjPsRSF35JY1XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643726777; a=rsa-sha256; cv=none; b=p7lC+7y1T0Ee+eUa9tDsN39G1ysFDalu8OS2LooyCsK4U2lGX2cpXyVHqFAkvh5XfPW8Wx cublNHPSKzicZOipBKl+20zEbG1ZfZh9yGz9F/VBBTqmaYfnFwcdu/v9eQvgGUk/VaiIfy FcAnfIw3BZ1xoIu10V6NiHNORog4PpLg/QGT37tFjdXsvGaRIp9pqT689syP4MAQIU6UHx is4NDufT5x88WD7GYLT2LOQ4Ql8lPg7o7Lm4kTBZr1uH1/pj4eJYgnbX4ZyugxGRh2s892 G4MeUukG+ldq1bbgXs80XhjfpUwUMVJ2EZ8vB0CupTsyrIcoL1SUXA0nlgreNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=12c56d7dc48821d84cc29e66f5d7f45e2ed8fd11 commit 12c56d7dc48821d84cc29e66f5d7f45e2ed8fd11 Author: Hans Petter Selasky AuthorDate: 2022-02-01 10:49:42 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-01 12:45:57 +0000 mlx5: idiomatic use of preprocessor, in particular paths MFC after: 1 week Sponsored by: NVIDIA Networking --- 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 | 2 +- sys/dev/mlx5/mlx5_core/mlx5_eq.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_eswitch.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_fw.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_health.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_mad.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_main.c | 6 +++--- sys/dev/mlx5/mlx5_core/mlx5_mcg.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_mpfs.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_mr.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_pd.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_port.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_qp.c | 6 ++---- sys/dev/mlx5/mlx5_core/mlx5_rl.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_srq.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_tls.c | 5 ++--- sys/dev/mlx5/mlx5_core/mlx5_transobj.c | 5 ++--- sys/dev/mlx5/mlx5_core/mlx5_uar.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_vport.c | 2 +- sys/dev/mlx5/mlx5_core/mlx5_wq.c | 4 ++-- 25 files changed, 36 insertions(+), 42 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_alloc.c b/sys/dev/mlx5/mlx5_core/mlx5_alloc.c index 097e1c90207c..79aecb8aa252 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_alloc.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_alloc.c @@ -34,8 +34,7 @@ #include #include #include - -#include "mlx5_core.h" +#include /* Handling for queue buffers -- we allocate a bunch of memory and * register it in a memory region at HCA virtual address 0. If the diff --git a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c index 2eaca4d83c6a..b2aec33e55c7 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c @@ -40,8 +40,7 @@ #include #include #include - -#include "mlx5_core.h" +#include static int mlx5_copy_from_msg(void *to, struct mlx5_cmd_msg *from, int size); static void mlx5_free_cmd_msg(struct mlx5_core_dev *dev, diff --git a/sys/dev/mlx5/mlx5_core/mlx5_cq.c b/sys/dev/mlx5/mlx5_core/mlx5_cq.c index 50da5ec0ae3f..8f873bde6073 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_cq.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_cq.c @@ -34,7 +34,7 @@ #include #include #include -#include "mlx5_core.h" +#include #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_eq.c b/sys/dev/mlx5/mlx5_core/mlx5_eq.c index 9339b4cb8ecb..d51e97cd3e90 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_eq.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_eq.c @@ -33,8 +33,8 @@ #include #include #include -#include "mlx5_core.h" -#include "eswitch.h" +#include +#include #ifdef RSS #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c b/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c index eff46501089a..6d3be72427c9 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c @@ -34,8 +34,8 @@ #include #include #include -#include "mlx5_core.h" -#include "eswitch.h" +#include +#include #define UPLINK_VPORT 0xFFFF diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c index e44feacf687e..1985bc97ce98 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c @@ -34,8 +34,8 @@ #include #include -#include "fs_core.h" -#include "mlx5_core.h" +#include +#include int mlx5_cmd_update_root_ft(struct mlx5_core_dev *dev, enum fs_ft_type type, diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c index f01b96fcb5aa..860c2331f03a 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c @@ -30,8 +30,8 @@ #include #include -#include "mlx5_core.h" -#include "fs_core.h" +#include +#include #include #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fw.c b/sys/dev/mlx5/mlx5_core/mlx5_fw.c index 3980c0a76402..c6118a6dbb21 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fw.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fw.c @@ -30,7 +30,7 @@ #include #include -#include "mlx5_core.h" +#include static int mlx5_cmd_query_adapter(struct mlx5_core_dev *dev, u32 *out, int outlen) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_health.c b/sys/dev/mlx5/mlx5_core/mlx5_health.c index 8f0565b2ed01..f75093b1d9db 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_health.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_health.c @@ -36,7 +36,7 @@ #include #include #include -#include "mlx5_core.h" +#include #define MLX5_HEALTH_POLL_INTERVAL (2 * HZ) #define MAX_MISSES 3 diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mad.c b/sys/dev/mlx5/mlx5_core/mlx5_mad.c index 18b2b902e2bc..e4bb111d5654 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_mad.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_mad.c @@ -31,7 +31,7 @@ #include #include #include -#include "mlx5_core.h" +#include int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb, u16 opmod, u8 port) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 57ef629223d4..0745d19b2725 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -47,9 +47,9 @@ #include #include #include -#include "mlx5_core.h" -#include "eswitch.h" -#include "fs_core.h" +#include +#include +#include #ifdef PCI_IOV #include #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mcg.c b/sys/dev/mlx5/mlx5_core/mlx5_mcg.c index 2b791978e7fd..aa9c94a843b7 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_mcg.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_mcg.c @@ -32,7 +32,7 @@ #include #include #include -#include "mlx5_core.h" +#include int mlx5_core_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn) { diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c b/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c index b18ae211d37a..4d59c739105e 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_mpfs.c @@ -36,7 +36,7 @@ #include #include -#include "mlx5_core.h" +#include #define MPFS_LOCK(dev) spin_lock(&(dev)->mpfs.spinlock) #define MPFS_UNLOCK(dev) spin_unlock(&(dev)->mpfs.spinlock) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_mr.c b/sys/dev/mlx5/mlx5_core/mlx5_mr.c index 21a982f6b553..e9534db24dc0 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_mr.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_mr.c @@ -31,7 +31,7 @@ #include #include #include -#include "mlx5_core.h" +#include static int mlx5_relaxed_ordering_write; SYSCTL_INT(_hw_mlx5, OID_AUTO, relaxed_ordering_write, CTLFLAG_RWTUN, diff --git a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c index 5f649ff16ce3..d298da67057a 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c @@ -32,7 +32,7 @@ #include #include #include -#include "mlx5_core.h" +#include CTASSERT((uintptr_t)PAGE_MASK > (uintptr_t)PAGE_SIZE); diff --git a/sys/dev/mlx5/mlx5_core/mlx5_pd.c b/sys/dev/mlx5/mlx5_core/mlx5_pd.c index 5628aa64d5a4..9ee8ccf84061 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_pd.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_pd.c @@ -31,7 +31,7 @@ #include #include #include -#include "mlx5_core.h" +#include int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn, u16 uid) { diff --git a/sys/dev/mlx5/mlx5_core/mlx5_port.c b/sys/dev/mlx5/mlx5_core/mlx5_port.c index 173990843eec..2ee6dffd6434 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_port.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_port.c @@ -30,7 +30,7 @@ #include #include -#include "mlx5_core.h" +#include int mlx5_core_access_reg(struct mlx5_core_dev *dev, void *data_in, int size_in, void *data_out, int size_out, diff --git a/sys/dev/mlx5/mlx5_core/mlx5_qp.c b/sys/dev/mlx5/mlx5_core/mlx5_qp.c index 4b5055a78836..c284efedbe46 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_qp.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_qp.c @@ -31,10 +31,8 @@ #include #include #include - -#include "mlx5_core.h" - -#include "transobj.h" +#include +#include static struct mlx5_core_rsc_common *mlx5_get_rsc(struct mlx5_core_dev *dev, u32 rsn) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_rl.c b/sys/dev/mlx5/mlx5_core/mlx5_rl.c index 2f66ab4748ed..aa8f351e0fc6 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_rl.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_rl.c @@ -31,7 +31,7 @@ #include #include #include -#include "mlx5_core.h" +#include #ifdef RATELIMIT diff --git a/sys/dev/mlx5/mlx5_core/mlx5_srq.c b/sys/dev/mlx5/mlx5_core/mlx5_srq.c index 6deae4e0feeb..c59544f38b0c 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_srq.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_srq.c @@ -33,8 +33,8 @@ #include #include #include -#include "mlx5_core.h" -#include "transobj.h" +#include +#include void mlx5_srq_event(struct mlx5_core_dev *dev, u32 srqn, int event_type) { diff --git a/sys/dev/mlx5/mlx5_core/mlx5_tls.c b/sys/dev/mlx5/mlx5_core/mlx5_tls.c index 9fbcaa9aebb1..b8de7acd9277 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_tls.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_tls.c @@ -32,9 +32,8 @@ #include #include #include - -#include "mlx5_core.h" -#include "transobj.h" +#include +#include int mlx5_encryption_key_create(struct mlx5_core_dev *mdev, u32 pdn, const void *p_key, u32 key_len, u32 *p_obj_id) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_transobj.c b/sys/dev/mlx5/mlx5_core/mlx5_transobj.c index 1586223adcfe..27e56b8acb81 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_transobj.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_transobj.c @@ -29,9 +29,8 @@ #include "opt_ratelimit.h" #include - -#include "mlx5_core.h" -#include "transobj.h" +#include +#include int mlx5_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn, u32 uid) { diff --git a/sys/dev/mlx5/mlx5_core/mlx5_uar.c b/sys/dev/mlx5/mlx5_core/mlx5_uar.c index eb67c3c98f57..ef92e58064f4 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_uar.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_uar.c @@ -32,7 +32,7 @@ #include #include #include -#include "mlx5_core.h" +#include int mlx5_cmd_alloc_uar(struct mlx5_core_dev *dev, u32 *uarn) { diff --git a/sys/dev/mlx5/mlx5_core/mlx5_vport.c b/sys/dev/mlx5/mlx5_core/mlx5_vport.c index d3d4b8052474..4c90c3ddf4b6 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_vport.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_vport.c @@ -31,7 +31,7 @@ #include #include #include -#include "mlx5_core.h" +#include static int mlx5_modify_nic_vport_context(struct mlx5_core_dev *mdev, void *in, int inlen); diff --git a/sys/dev/mlx5/mlx5_core/mlx5_wq.c b/sys/dev/mlx5/mlx5_core/mlx5_wq.c index 41cb05366cae..87334f171938 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_wq.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_wq.c @@ -29,8 +29,8 @@ #include "opt_ratelimit.h" #include -#include "wq.h" -#include "mlx5_core.h" +#include +#include u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq) {