From f7ab01581a369fce7e343e71ad30d7665fbc90e6 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 13 Apr 2019 06:30:45 +0000
Subject: [PATCH] Move mpr/mps drivers from per-arch NOTES files into the MI
 notes file. They are in more arches they they aren't. Add appropriate
 nodevice directives in powerpc and arm.

---
 sys/amd64/conf/NOTES   | 5 -----
 sys/arm/conf/NOTES     | 4 ++++
 sys/conf/NOTES         | 6 +++++-
 sys/i386/conf/NOTES    | 5 -----
 sys/powerpc/conf/NOTES | 2 ++
 sys/sparc64/conf/NOTES | 5 -----
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 625f7517b363..ee59ecd00b77 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -459,11 +459,6 @@ device		imcsmb
 device		isci
 options 	ISCI_LOGGING	# enable debugging in isci HAL
 
-# LSI-Logic MPT-Fusion drivers
-device		mpt			# LSI-Logic MPT-Fusion
-device		mps			# LSI-Logic MPT-Fusion 2
-device		mpr			# LSI-Logic MPT-Fusion 3
-
 #
 # NVM Express (NVMe) support
 device         nvme    # base NVMe driver
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 2cd3a215f376..559146b58014 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -79,3 +79,7 @@ options 	KDTRACE_HOOKS
 
 # Alternatively include all the DTrace modules
 #device		dtraceall
+
+# These aren't known to work on arm and/or don't compile
+nodevice	mpr
+nodevice	mps
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e475729e8ef3..265bb50e3332 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1565,6 +1565,8 @@ options		TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK)
 #      Qlogic ISP 2300 and ISP 2312 2Gb Fibre Channel host adapters.
 #      Qlogic ISP 2322 and ISP 6322 2Gb Fibre Channel host adapters.
 # ispfw: Firmware module for Qlogic host adapters
+# mpr: LSI-Logic MPT/Fusion Gen 3
+# mps: LSI-Logic MPT/Fusion Gen 2
 # mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4
 #      or FC9x9 Fibre Channel host adapters.
 # sym: Symbios/Logic 53C8XX family of PCI-SCSI I/O processors:
@@ -1594,7 +1596,9 @@ hint.isp.0.topology="nport-only"
 hint.isp.0.portwnn="w50000000aaaa0000"
 hint.isp.0.nodewnn="w50000000aaaa0001"
 device		ispfw
-device		mpt
+device		mpr			# LSI-Logic MPT-Fusion 3
+device		mps			# LSI-Logic MPT-Fusion 2
+device		mpt			# LSI-Logic MPT-Fusion
 device		sym
 device		trm
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 8d60831fd962..8d4e3a954c40 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -690,11 +690,6 @@ device		ips
 device		isci
 options 	ISCI_LOGGING	# enable debugging in isci HAL
 
-# LSI-Logic MPT-Fusion drivers
-device		mpt			# LSI-Logic MPT-Fusion
-device		mps			# LSI-Logic MPT-Fusion 2
-device		mpr			# LSI-Logic MPT-Fusion 3
-
 #
 # NVM Express (NVMe) support
 device         nvme    # base NVMe driver
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 86bc291d3668..30cfe91152b1 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -80,6 +80,8 @@ nodevice	ccr
 nodevice	cxgbe		# XXX: builds on powerpc64 only.
 nodevice	cxgbev
 nodevice	fdc
+nodevice	mpr		# no 64-bit atomics
+nodevice	mps		# no 64-bit atomics
 nodevice	ppc
 nodevice	splash
 # when splash works enable *_saver
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 52725f9efe22..eea0147dda49 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -85,11 +85,6 @@ options 	SUNKBD_EMULATE_ATKBD	# allows to use the AT keyboard maps
 options 	SUNKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	SUNKBD_DFLT_KEYMAP=fr.dvorak
 
-# LSI-Logic MPT-Fusion drivers
-device		mpt			# LSI-Logic MPT-Fusion
-device		mps			# LSI-Logic MPT-Fusion 2
-device		mpr			# LSI-Logic MPT-Fusion 3
-
 
 #####################################################################
 # Devices we don't want to deal with