From owner-svn-src-head@freebsd.org Sat Apr 13 06:30:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30CCB156E4BE; Sat, 13 Apr 2019 06:30:47 +0000 (UTC) (envelope-from imp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CC6FB6FB40; Sat, 13 Apr 2019 06:30:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 641CE5122; Sat, 13 Apr 2019 06:30:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3D6Uk8S095354; Sat, 13 Apr 2019 06:30:46 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D6UjBi095349; Sat, 13 Apr 2019 06:30:45 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201904130630.x3D6UjBi095349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 13 Apr 2019 06:30:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346177 - in head/sys: amd64/conf arm/conf conf i386/conf powerpc/conf sparc64/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: amd64/conf arm/conf conf i386/conf powerpc/conf sparc64/conf X-SVN-Commit-Revision: 346177 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CC6FB6FB40 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 06:30:47 -0000 Author: imp Date: Sat Apr 13 06:30:45 2019 New Revision: 346177 URL: https://svnweb.freebsd.org/changeset/base/346177 Log: 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. Modified: head/sys/amd64/conf/NOTES head/sys/arm/conf/NOTES head/sys/conf/NOTES head/sys/i386/conf/NOTES head/sys/powerpc/conf/NOTES head/sys/sparc64/conf/NOTES Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/amd64/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -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 Modified: head/sys/arm/conf/NOTES ============================================================================== --- head/sys/arm/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/arm/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -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 Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -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 Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/i386/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -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 Modified: head/sys/powerpc/conf/NOTES ============================================================================== --- head/sys/powerpc/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/powerpc/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -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 Modified: head/sys/sparc64/conf/NOTES ============================================================================== --- head/sys/sparc64/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/sparc64/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -85,11 +85,6 @@ options SUNKBD_EMULATE_ATKBD # allows to use the AT k 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