Author: imp
Date: Thu Sep 26 12:54:52 2019
New Revision: 352741
URL: https://svnweb.freebsd.org/changeset/base/352741
Log:
mpr/mps crash badly. Part of the stability added use of atomic64 functions not
present on 32-bit powerpc. Merge the part that removes mps from the build
on this tier 2 platform. Working mpr/mps in 12 and 12.1 on our tier 1
platforms
is more important.
MFC r341754:
Remove the mps driver from powerpc 32bit GENERIC, and don't build it and mpr
as a module for powerpc or mips. An upcoming commit will cause these
drivers
to rely on the presence of 64bit atomic operations. Discussed with
jhibbits.
Relnotes: YES
Modified:
stable/12/sys/modules/Makefile
stable/12/sys/powerpc/conf/GENERIC
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/modules/Makefile
==============================================================================
--- stable/12/sys/modules/Makefile Thu Sep 26 07:19:26 2019
(r352740)
+++ stable/12/sys/modules/Makefile Thu Sep 26 12:54:52 2019
(r352741)
@@ -256,8 +256,8 @@ SUBDIR= \
${_mly} \
mmc \
mmcsd \
- mpr \
- mps \
+ ${_mpr} \
+ ${_mps} \
mpt \
mqueue \
mrsas \
@@ -557,6 +557,12 @@ _rtwnfw= rtwnfw
${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \
${MACHINE_CPUARCH} != "riscv"
_cxgbe= cxgbe
+.endif
+
+# These rely on 64bit atomics
+.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "mips"
+_mps= mps
+_mpr= mpr
.endif
.if ${MK_TESTS} != "no" || defined(ALL_MODULES)
Modified: stable/12/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/12/sys/powerpc/conf/GENERIC Thu Sep 26 07:19:26 2019
(r352740)
+++ stable/12/sys/powerpc/conf/GENERIC Thu Sep 26 12:54:52 2019
(r352741)
@@ -120,7 +120,6 @@ options AHC_ALLOW_MEMIO # Attempt to use memory mappe
device isp # Qlogic family
device ispfw # Firmware module for Qlogic host adapters
device mpt # LSI-Logic MPT-Fusion
-device mps # LSI-Logic MPT-Fusion 2
device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
# ATA/SCSI peripherals
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
