From nobody Mon Jun 03 19:25:11 2024 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 4VtNwS0g8yz5JsBr; Mon, 03 Jun 2024 19:25:12 +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 4VtNwR439rz4Vpk; Mon, 3 Jun 2024 19:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717442711; 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=oGINzoh1TljyXgAWi7Gud6nvTqPzMstk1vpXCw1Mjxk=; b=RJaV+JJMhgANnmGvgJ6JCQb6s2djSctP13o3BlSeoFG0qYQPDtn97dsxja62IfKCqSI1ra jChOqf/R9AeeV4JPq2lByqh5Djg0zQq05nIdMCKw0F+3Evdho7X2KWwbtzPEI6UyG+MfE8 oqwrv4Y+T2e4rlk6yrt56jnKlt4YfKPmZUMmZ5EyA5w+C5ZHCVDTsMw9Qzz3hD6Jpjsq6j hOdvXFqimAqZxnswAuqtwSB1K827oHSBjc5q+4rOMhJkDuaXlUJw9reHCy6YJkwFS8HlBe sC6Y47Q1XnrkcAD6ekia903tEvQWdGjYqvdG43iZGTVXAoXBRh2+/KW2eAz/xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717442711; a=rsa-sha256; cv=none; b=atw5PpbO2qvS3sP3NgY/GmAUnJcpFUKYknt+q6yxFZZZVT7mc9LfOnRmOg+w5OaJGmgVsY RQ+8j37GfUh89MDZPf7WDDOiFMkPtq9wCgn7LR0uNATzmeVEp/hKvRwikId03GdSHDSiYv XJUqj4DUbE7b8bHGik3E5fOEaVkgdyrlKThS909o/3F9gecrtzYL2vX3php2MBjuznnsdx hMDmNRthIAoeCgMzLnXldczZha02OvG0f6UebZjlQIYV6hIbRug+0IBYdvh0IDrzUEASAS AW15CRUINRnOFl+TOnq6cbL7xqLUHljJWqfzteTPjSuChbAgZAwCHQtlPoYoSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717442711; 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=oGINzoh1TljyXgAWi7Gud6nvTqPzMstk1vpXCw1Mjxk=; b=JQwefVmDku1BKK0BCbsZTph1pk7g9d47AmuA49v77mPUzHSdGBTxGDcusyNLDUXYGQJvJX +kvOhRdzOyX/m/3wFmdyWRtsZCmep40aFjhd8ku6kLGfncIDjw+OPEbbqy/4G1k666efbR bFEdJ/z5QYjiYIWO1DEkLKnhQxo3qN50Xj+I2XM30KubSlnAdMHfO+FjHLS3Uh2q8Z9bCf ZwaQ6Bu89TE5es20sGf1AEym9/ZqH+52dZge+eFZ3JBo0cI3QoEa96XBHq1A7APfnmx4SC /tTCUNK6InKaUhF65HhakT5JQOOcFpR5tL1J9aBga7EBSGjTMD0SrUuZ+EHVdQ== 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 4VtNwR3dfZznRH; Mon, 3 Jun 2024 19:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 453JPBZC068280; Mon, 3 Jun 2024 19:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453JPBT4068277; Mon, 3 Jun 2024 19:25:11 GMT (envelope-from git) Date: Mon, 3 Jun 2024 19:25:11 GMT Message-Id: <202406031925.453JPBT4068277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 2e7991d03888 - stable/14 - Fix bnxt build in LINT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2e7991d038888bda9d8959d14f5963db29c41654 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e7991d038888bda9d8959d14f5963db29c41654 commit 2e7991d038888bda9d8959d14f5963db29c41654 Author: Warner Losh AuthorDate: 2024-05-29 15:45:47 +0000 Commit: Warner Losh CommitDate: 2024-06-03 19:23:15 +0000 Fix bnxt build in LINT LINT includes bnxt_re driver. Adjust the path in files, add missing files and add a new BNXT_C to build (which thinly wraps OFED version with bnxt specicif stuff). Sponsored by: Netflix Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") (cherry picked from commit 175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e) --- sys/conf/files | 13 ++++++++----- sys/conf/kern.pre.mk | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 7d3c44893e09..bf4d7d9cabfc 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1322,11 +1322,14 @@ dev/bhnd/siba/siba_bhndb.c optional siba bhnd bhndb dev/bhnd/siba/siba_erom.c optional siba bhnd dev/bhnd/siba/siba_subr.c optional siba bhnd # -dev/bnxt/bnxt_hwrm.c optional bnxt iflib pci -dev/bnxt/bnxt_mgmt.c optional bnxt iflib pci -dev/bnxt/bnxt_sysctl.c optional bnxt iflib pci -dev/bnxt/bnxt_txrx.c optional bnxt iflib pci -dev/bnxt/if_bnxt.c optional bnxt iflib pci +dev/bnxt/bnxt_en/bnxt_auxbus_compat.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_dcb.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_hwrm.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_mgmt.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_sysctl.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_txrx.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_ulp.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/if_bnxt.c optional bnxt iflib pci compile-with "${BNXT_C}" dev/bwi/bwimac.c optional bwi dev/bwi/bwiphy.c optional bwi dev/bwi/bwirf.c optional bwi diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 567c68e5887e..53b9862f2145 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -335,6 +335,10 @@ MLXFW_C= ${OFED_C_NOIMP} \ -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \ -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \ ${.IMPSRC} +# BNXT Driver +BNXT_CFLAGS= -I$S/dev/bnxt/bnxt_en ${OFEDCFLAGS} +BNXT_C_NOIMP= ${CC} -c -o ${.TARGET} ${BNXT_CFLAGS} ${WERROR} +BNXT_C= ${BNXT_C_NOIMP} ${.IMPSRC} GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} SYSTEM_CFILES= config.c env.c hints.c vnode_if.c