From 2f721943bf20e53b0ba7b5032a2900d0beb67413 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 28 Apr 2025 08:27:18 -0600 Subject: [PATCH] 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 --- 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 a6f12aec7dc..e0a9e1b77d9 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 c3e1930836b..5f29112d535 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -97,6 +97,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 9afb04ce6ef..d85980e4e12 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1592,7 +1592,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