From nobody Tue Feb 08 06:55:50 2022 X-Original-To: dev-commits-src-branches@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 A00EA19B6E8C; Tue, 8 Feb 2022 06:55:51 +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 4JtDLG719lz4bPL; Tue, 8 Feb 2022 06:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644303351; 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=8aCen69WdjgbQ945STIn6iQlvL8w+67pTPRYzJa2sGQ=; b=CmWuRYNbB9v9Ib+3Gn6sT8bDKlS4pkUBXrneeu4m1GjYgChahq61CtqfTElmwpSqag0XBH 0FkRKSkQli77eBzhFBi+902Z5B34HP9bKoH5mJPamqWTfBEzln43yUEMN+eqtWI9m7kppH heXMNGHDP1rcjw+WL0jIu7/yEcm2xLZi8jx8uY7C65kt0MN6LjWOKWTGdAB6Oej9PyWPFn tzSx2lhX8Fh5F90rgL97GNHdEaL72BbY8cyvS49cv+j7aWXtkLbeh/WYmqCAHfJeVnJtgw mQotxZZQouuxd9EN5eaaBdvseWmnb0koLDLwSWd7VtMSp84eMDTsvwPdi7jtsw== 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 AE05614AFD; Tue, 8 Feb 2022 06:55:50 +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 2186to3h053395; Tue, 8 Feb 2022 06:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2186toK6053394; Tue, 8 Feb 2022 06:55:50 GMT (envelope-from git) Date: Tue, 8 Feb 2022 06:55:50 GMT Message-Id: <202202080655.2186toK6053394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c91a6860a36b - stable/13 - mlx5: idiomatic use of preprocessor, in particular paths List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c91a6860a36b27a34159de28534838e29bf19c22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644303351; 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=8aCen69WdjgbQ945STIn6iQlvL8w+67pTPRYzJa2sGQ=; b=xexclDo7A85w2N99B/EliIdh8ts12yr2iE29Uzt6AVoIyWjmSTFIbN6lDj4sgA3V8OwqSS hSx15OHxepjTeAsyYsRw2fQXn9CEwAbJRgc1DnKsL7KvZaGeQiNrIKgkIHFDk6Bv+sMDnW r3GkiLb9pNUe1Y5H6RDz+SNmDzBOZN0Fr+tfAWD7cYi513242O2fbJovj3H2+xRs1IVGil MLB/c4uo5FNqhleqDHXuwa3eCFBzLXhujterQWhrQB0Ak8Lg1Ec6VOrdiU0SRZlDiK7A7a Hwh5rQBQSj0AL49Y45Lxq8lLM0n69+06Rnc2m1HVmsRGtucZ1icpaeK5luo+/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644303351; a=rsa-sha256; cv=none; b=fuQ1QqQcKwAB2e18JjDOFIlXENwjwG1ZKyqx2vJp0pWRnDjftO6CTFj3+I/W5wmbxsorhu t9KmTEBDPmXYnqPXOj+Lj3g87FArY/J1Me9usk/ogJ8fh0CRX29wWtaidcJ6Sn+msD08kH sRzDk/fQxR6olOU3joll8qzT/zCCDxOC10tqLwGPoo1qdTB510PLokthH4Y6Vcctunm6Nb TcbUe/WWCL7kNUqwS6dk8ttsl4WbFVF1uj2EYtgb+D44w1fni34sGmtGHHIIyI9ZkTdRz2 SGCIsGyfwgUGfszEwA7TDhHmZeH/5J1Q13K27c4acVw1BnjN1xUi5qmdascTiw== 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=c91a6860a36b27a34159de28534838e29bf19c22 commit c91a6860a36b27a34159de28534838e29bf19c22 Author: Hans Petter Selasky AuthorDate: 2022-02-01 10:49:42 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-08 06:42:07 +0000 mlx5: idiomatic use of preprocessor, in particular paths (cherry picked from commit 12c56d7dc48821d84cc29e66f5d7f45e2ed8fd11) --- 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 b6165cdddec1..c9467509620d 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 f4ca1b754479..ceafe49ac436 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 13cdd1396528..5cd4bd08e051 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 b9928b4fc032..d5b6ab5d0902 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 b185787217cd..115d2312cf91 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) { 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 519c006c917a..74cedb7feb38 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 a0c8175df443..61691ef62aaf 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) { 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) {