From nobody Wed Apr 30 17:22:02 2025 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 4ZnkWb2cSkz5tjNC; Wed, 30 Apr 2025 17:22:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnkWZ73qdz3MmY; Wed, 30 Apr 2025 17:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033723; 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=sbscoxYr1owb/934R5jFobDiupkIni/uKcF9QjAfD4U=; b=x1AsFJS3vILeFYr35dvIEhWj4hnWletJej3mwcm/85EOf2IcugSDB1S5yZBPwM5I3Q4ts8 Gsuw/ShVSWR7KgGdUskcxPDC7EDFNsbXVAKxvNw+Qm5nhWZaiHoVsyVp7djrtkUoM7hbGW 7bMGzaA1X+Z4GLPQfMSNSmC3lnzK8SemE1PpAKOI4zF+jnaMcR1gmEu4TESkqb1cvq6/C3 sFZlV3/Lvs87TZtpH32IAbQX1SnJ1KudQgWlG9sj+K2riNqX2nJlCrrwoqWfbV7N0mQb57 btONSo1hRBr2zfFUjTnO88bdyMO9OIuVPD1wI/+G9etJpRq0dkGYNosUjRHMTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033723; a=rsa-sha256; cv=none; b=La/U3O82X9jAuJ4hc32ipKyM0fSrhkvXkpRLYOWidF7kGNZlFlvQpC/0yCUURMoMsXnJKY 2lRGDp29drqAg+RuiCcINQxyFubVq6DAGFJBZ7VkpLknam6JsYDNLtxM5JWXeLzZU3VrVI aXVNDgojvrVhzxOetWNJCayx+Rw96hRgsxEYGbU0Ku2QORoaPcJ9xGFPAT6HJpG4cnNT+g GFEEQNSK/2Q2XcNnk1zcE4ZB/nF+6yuN4FNF240f6uScljhn1iTUSP+cOet1UcZjDAvEMW WKknP94VT31Poh3xCzpt7iC1UDI9CReDIa/D1Cm5G0K2jQ+4atCb+G/NzXC/KA== 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=1746033723; 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=sbscoxYr1owb/934R5jFobDiupkIni/uKcF9QjAfD4U=; b=qoYQnUprn7Be5Kg4ObYdVNXSHMNcNfwmsjkzXyNO4+2rCQUqniwUtalGIvSEPB4GNysEIO 5Ph5NX37Tkp/o7bm7YVVmjJIfhM5LHpsgs7s58iNWnQcQxcl9qoEepOCAoxJhrq96QCrns Fu7VSUzcmeKeZRwFqQLZP/FnO89qXlMgfb0GNJzW90hkhR43IS0XcbhSPz/4mMnRuQs2jj sGC15g4tNlLWz96tmHejdL1TDEKiAJKoEv2PbrnS2ugWWJIu8oh4manV7gNWTghh7FQRHc ELCrgCmcXQLUojCGx/BBtrLhK+irDxeEmVoWyMHSu7cfSze4dGzzrAWz7+GKyA== 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 4ZnkWZ66SYzl4; Wed, 30 Apr 2025 17:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53UHM2ST095671; Wed, 30 Apr 2025 17:22:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHM2bK095668; Wed, 30 Apr 2025 17:22:02 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:22:02 GMT Message-Id: <202504301722.53UHM2bK095668@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: 3abb5750c321 - stable/14 - mpi3mr: Broadcom's MPT-Fusion version 4 is amd64 and aarch64 only 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 3abb5750c32154a1ec1a8e9914c3657dc41271b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3abb5750c32154a1ec1a8e9914c3657dc41271b4 commit 3abb5750c32154a1ec1a8e9914c3657dc41271b4 Author: Warner Losh AuthorDate: 2025-04-28 14:27:18 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:06:54 +0000 mpi3mr: Broadcom's MPT-Fusion version 4 is amd64 and aarch64 only Broadcom's MPT-Fusion version 4 driver only works on 64-bit systems, and has only been tested in amd64 and aarch64, so move it's building to just those. I didn't notice this in the review and neglected to test those cases (since I knew it didn't work there, so was a blind spot). Pointy-hat: imp Fixes: 9cdd40759617 Sponsored-by: Netflix Sponsored by: Netflix (cherry picked from commit 2f721943bf20e53b0ba7b5032a2900d0beb67413) --- sys/amd64/conf/NOTES | 3 +++ sys/arm64/conf/NOTES | 4 ++++ sys/conf/NOTES | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index db93a47165d6..08d096cd800e 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -68,6 +68,9 @@ device tdfx # Enable 3Dfx Voodoo support # device smartpqi +# Broadcom MPT Fusion, version 4, is 64-bit only +device mpi3mr # LSI-Logic MPT-Fusion 4 + # # Network interfaces: # diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index add17c6bf0ea..3934bf47c9e7 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -94,6 +94,10 @@ device ice_ddp # Intel 800 Series DDP Package # Etherswitch devices device e6000sw # Marvell mv88e6085 based switches +# Storage +# Broadcom MPT Fusion, version 4, is 64-bit only +device mpi3mr # LSI-Logic MPT-Fusion 4 + # MMC/SD/SDIO Card slot support device sdhci_xenon # Marvell Xenon SD/MMC controller device aw_mmc # Allwinner SD/MMC controller diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 695bcb5f3ef6..6de8eab73027 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1588,7 +1588,8 @@ envvar hint.isp.0.topology="nport-only" envvar hint.isp.0.portwnn="w50000000aaaa0000" envvar hint.isp.0.nodewnn="w50000000aaaa0001" device ispfw -device mpi3mr # LSI-Logic MPT-Fusion 4 +# Only works on aarch64 and amd64 +#device mpi3mr # LSI-Logic MPT-Fusion 4 device mpr # LSI-Logic MPT-Fusion 3 device mps # LSI-Logic MPT-Fusion 2 device mpt # LSI-Logic MPT-Fusion