From nobody Wed May 29 15:50:31 2024 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 4VqDP40jfVz5Ml0Y; Wed, 29 May 2024 15:50:32 +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 4VqDP40CKmz4byq; Wed, 29 May 2024 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716997832; 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=eM/dvJK7E2Ir2ZQvdu4RMYh84Ps5ZHudtcPz6ayk+e8=; b=SFAZVa7KthFAcQs+N87KZMuHU6nt9S7Mz0GRCbUsrOqVWxaO8GN/M7OQZWe7d0TBiEeOG/ f9NCRkzLtg8K9BZ0vkuy5ezqiYNX+MBnKrM+6a8qPmflwYnnuS6nMeGeXgzUQYmPYx5VX/ fayJ3vRVN6u3qRHG+/uudnxO4i71Ngx2xESOmFQL58yczJLMq30CIHWCx/kAawfw9de1fJ tSnuiN2tnawLA13efYo0lWI4fr9Qntiiv5h0qqNpbTtcWsL8UGwuAkFpCZok844fmDhFkL Aeo4/Fatmk+j6XXgrsY3/01oDv6PCjbFPfDuzVUCduFZ0pB5X45TCXXfh1vUwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716997832; a=rsa-sha256; cv=none; b=ns2gObo8IH7kJtdhd7f12hbe3iDYpIPVHEJhviyL7nQmalyA5wA/ogEN7N3yfEBluDpjrY EHxUJVUtIgfdHH22TsQKF9NU51rTlcuONU/PgYZynYZZbWR/ezWfH0tZlg9QiD9PM5W1Li T7D5rnGM+Tly/anHjcyL5C3a7p8dltQ/oqk+yAwhM0G32cArz33C1vSS0xVtAmaDLFQif7 1KosD/uq0Gz4rkk9OFhcDG5L9eImGliwJvrR8z2V82ql21gs/3bCAsO1Sk6Z1c/UxGJzYx DuClxve22Hhyz6y3fCONeaAMUspLXT+oN0rhKPRagANmgV+fUtox7+nutUWcnA== 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=1716997832; 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=eM/dvJK7E2Ir2ZQvdu4RMYh84Ps5ZHudtcPz6ayk+e8=; b=qHdnaUb0acWyBWzW4DOwV5+kW4L0nNcUd3AavlUWyvxsUUzUeyvqDsb3MkIs1Kb1qOwSGl wuTaqBKn63L2xGsyjN/f4mXcsgd2YKCjJnQW4rT6DpYLI6lic7FxRTsUQaZmJrme2C0Y4+ xeLY1yygCw42csAcKSv52etNYCH8urZy7R1uKexKvM5qjc9T8OlMHeEOj6xuLDreDT1XYA HeVYS1Lt5ZfidzgH2fKnWU1syhclnuZ31YWWqMIFWjkPcok5wBtbBLtaGRnAhqLYyFqeA4 ALCzGYR0IR+BSY7fed+ha/9ZRuK9/kvAGRdjvrOViRsLKZ6tsxx2UDNJb/zfYQ== 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 4VqDP36wf7z12S0; Wed, 29 May 2024 15:50:31 +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 44TFoV08024937; Wed, 29 May 2024 15:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TFoVkO024934; Wed, 29 May 2024 15:50:31 GMT (envelope-from git) Date: Wed, 29 May 2024 15:50:31 GMT Message-Id: <202405291550.44TFoVkO024934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 175b2c00a6bc - main - Fix bnxt build in LINT 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e commit 175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e Author: Warner Losh AuthorDate: 2024-05-29 15:45:47 +0000 Commit: Warner Losh CommitDate: 2024-05-29 15:49:53 +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") --- sys/conf/files | 13 ++++++++----- sys/conf/kern.pre.mk | 4 ++++ sys/modules/bnxt/bnxt_re/Makefile | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 56c92f51947f..fec92518c498 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1327,11 +1327,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 diff --git a/sys/modules/bnxt/bnxt_re/Makefile b/sys/modules/bnxt/bnxt_re/Makefile index 2e1dbc048dfb..d6aa701dbae6 100644 --- a/sys/modules/bnxt/bnxt_re/Makefile +++ b/sys/modules/bnxt/bnxt_re/Makefile @@ -8,7 +8,7 @@ SRCS += qplib_res.c qplib_res.h SRCS += qplib_rcfw.c qplib_rcfw.h SRCS += stats.c stats.h SRCS += main.c bnxt_re.h -SRCS += opt_inet.h opt_inet6.h +SRCS += opt_inet.h opt_inet6.h opt_ratelimit.h SRCS += ${LINUXKPI_GENSRCS} CFLAGS+= -I${SRCTOP}/sys/dev/bnxt/bnxt_en