From nobody Wed Mar 08 23:12:41 2023 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 4PX7Q16Gpdz3x1fm; Wed, 8 Mar 2023 23:12:41 +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 4PX7Q15KcYz3C56; Wed, 8 Mar 2023 23:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678317161; 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=H1bjD0A2ti8DP2BUvR/16+oBjST1AoeQMeNe+H3SHRU=; b=GDhLwLFkuRo5gufYcoh7pWFrLsxeevxNkkpLzZIvnUaLAsS+9cC578xtqamp2tCFFCjHC8 fAE1gESe5TqkNF4fBev2RETipYY3ewGUC0pCJhSzTouZ1rplqOo+lpajPUBM8ve+lye/09 WRcT6OFLEV9fQ1+oLxd8aqta/AqR55uXYICylBIzJr92sP2YVoVrX7Fytz58YgRz00tShR tsNuQBRw4Fsr6+kKmpWL4xyNrpEXhI53IomuNvFnkHRuqc8hw37RgNqUvxLbMvaX1M+Hm6 ZUzVmiRU+JxPp30yH2+2TqLOVdPKWDx/y/0S2f8Ac1w0XrGkEEyWi1TqERtmLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678317161; 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=H1bjD0A2ti8DP2BUvR/16+oBjST1AoeQMeNe+H3SHRU=; b=W7wLxuxvi3988h5mshqxZ9CzeeyUUNWLxuY7M7+KOUE60iLR+OCLbhCbsehwIKxd2tI7CB ACiSlF+iP7jeoPsrvgEg0LDUQaAZvmFD+z9PgpkjXvLVYbbjAoz0J11/T3VZRekf/elCYv RJmLa7SfasGxA6JLVGTEBlerMKARJBYYXnkzkQ8dkUxzdQkYfezWHMUxTOxxrhN59eFld6 zlKBtTpkJ8B9WjK+uBaXB06Vbq424WuhtRH9FRUnFdheVVBD4Er0xV+AymxXOu6QyXApke NclIxf1t4dJLQoSOwnlNm5MVJOSjS5uq2LMletwS/ij1fi5GViKH+N3W1JeBlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678317161; a=rsa-sha256; cv=none; b=sEhDlzqHioalqAklFK1+dG/IXW6CU1hJNRG3uilr2jZ+t8rLARcflorK/l4z+Q7uWWmOwE iE1R5uHRp/unCVlNADJxVwm+z6sr1VOyMOzSkxLj3Ci3T/yQfh1PuDeKM2SNbZLunAIJM0 IhO81Jt0ZMgdfXCH4GOPcPktrYqNdPREV49Gpc66dAlsKjvKbTSq7XyCHfzgjNz9AoSqld BaA+uTSFdAICY7KNYaIL769RKxupbpVP3hjsFwSUJ32Yzcg/wXmTh14r/JrbJKHwsvec07 mbT5CJvdAHKjVzNpjdEdSqedjXa/ScUB8S8+Y1au8+S9VJSUtTort/R9T34Zsg== 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 4PX7Q14DCGzl4L; Wed, 8 Mar 2023 23:12:41 +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 328NCfAj018938; Wed, 8 Mar 2023 23:12:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328NCf70018937; Wed, 8 Mar 2023 23:12:41 GMT (envelope-from git) Date: Wed, 8 Mar 2023 23:12:41 GMT Message-Id: <202303082312.328NCf70018937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fe0f6950391c - main - Enable OFED on all platforms except for 32-bit arm. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe0f6950391cf10bbfcd1672d8e111a41063a4c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fe0f6950391cf10bbfcd1672d8e111a41063a4c8 commit fe0f6950391cf10bbfcd1672d8e111a41063a4c8 Author: John Baldwin AuthorDate: 2023-03-08 23:07:11 +0000 Commit: John Baldwin CommitDate: 2023-03-08 23:12:00 +0000 Enable OFED on all platforms except for 32-bit arm. 32-bit arm triggers multiple -Wunaligned-access errors due to structure packing. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38972 --- share/man/man5/src.conf.5 | 2 +- share/mk/src.opts.mk | 3 +-- sys/conf/kern.opts.mk | 5 +---- sys/modules/Makefile | 19 ++++++++----------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 8930c9a6238c..d298f38ff0b5 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1259,7 +1259,7 @@ Disable the build of the Infiniband software stack, including kernel modules and userspace libraries. .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. +arm/armv6 and arm/armv7. When set, it enforces these options: .Pp .Bl -item -compact diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 057a0f7a9be9..d8cadd43a88b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -352,8 +352,7 @@ __DEFAULT_YES_OPTIONS+=OPENMP __DEFAULT_NO_OPTIONS+=OPENMP .endif -.if ${__T} != "i386" && ${__T} != "amd64" && \ - ${__T:Mpowerpc64*} == "" +.if ${__T:Marm*} != "" BROKEN_OPTIONS+= OFED .endif diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 93edc1b6e63f..c7587b7728d7 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -82,10 +82,7 @@ BROKEN_OPTIONS+= INIT_ALL_ZERO BROKEN_OPTIONS+= ZFS .endif -# Things that don't work because the kernel doesn't have the support -# for them. -.if ${MACHINE} != "i386" && ${MACHINE} != "amd64" && \ - ${MACHINE_ARCH:Mpowerpc64*} == "" +.if ${MACHINE_CPUARCH} == "arm" BROKEN_OPTIONS+= OFED .endif diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 4aa4a26e6d17..0bce649ac978 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -522,14 +522,19 @@ SUBDIR+= linux64 SUBDIR+= linux_common .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "i386" -_ena= ena +.if ${MACHINE_CPUARCH} != "arm" .if ${MK_OFED} != "no" || defined(ALL_MODULES) _ibcore= ibcore _ipoib= ipoib _iser= iser +_mthca= mthca +_rdma= rdma .endif +.endif + +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "i386" +_ena= ena _ipmi= ipmi _iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" @@ -543,7 +548,6 @@ _mlx4en= mlx4en _mlx5en= mlx5en .endif .if ${MK_OFED} != "no" || defined(ALL_MODULES) -_mthca= mthca _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif @@ -703,9 +707,6 @@ _qat= qat _qatfw= qatfw _qat_c2xxx= qat_c2xxx _qat_c2xxxfw= qat_c2xxxfw -.if ${MK_OFED} != "no" || defined(ALL_MODULES) -_rdma= rdma -.endif _safe= safe _speaker= speaker _splash= splash @@ -848,11 +849,7 @@ _ixl= ixl _mlx5= mlx5 _nvram= opal_nvram .if ${MK_OFED} != "no" || defined(ALL_MODULES) -_ibcore= ibcore -_ipoib= ipoib -_iser= iser _mlx5ib= mlx5ib -_rdma= rdma .endif .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES)