From owner-svn-src-head@FreeBSD.ORG  Sun Jun 17 02:46:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 77D36106564A;
	Sun, 17 Jun 2012 02:46:28 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 614858FC0A;
	Sun, 17 Jun 2012 02:46:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5H2kS4D079984;
	Sun, 17 Jun 2012 02:46:28 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5H2kSMT079981;
	Sun, 17 Jun 2012 02:46:28 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201206170246.q5H2kSMT079981@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 17 Jun 2012 02:46:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237178 - in head: share/man/man4 sys/dev/hptrr
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jun 2012 02:46:28 -0000

Author: eadler
Date: Sun Jun 17 02:46:27 2012
New Revision: 237178
URL: http://svn.freebsd.org/changeset/base/237178

Log:
  attach_generic causes missing devices in /dev when the driver
  interacts with some non-highpoint controollers. Change attach_generic to
  be off by default.
  
  PR:		kern/168910
  Submitted by:	Richard Yao <ryao@gentoo.org>
  Approved by:	cperciva
  No objections by:	-hackers
  Obtained from:	Gentoo FreeBSD
  MFC after:	2 weeks

Modified:
  head/share/man/man4/hptrr.4
  head/sys/dev/hptrr/hptrr_osm_bsd.c

Modified: head/share/man/man4/hptrr.4
==============================================================================
--- head/share/man/man4/hptrr.4	Sun Jun 17 00:28:57 2012	(r237177)
+++ head/share/man/man4/hptrr.4	Sun Jun 17 02:46:27 2012	(r237178)
@@ -50,8 +50,8 @@ hptrr_load="YES"
 The following tunables are settable from the loader:
 .Bl -ohang
 .It Va hw.hptrr.attach_generic
-set to 0 to deny driver attach to chips with generic Marvell (non-HighPoint)
-PCI identification. These chips are also supported by ata(4).
+set to 1 to permit driver attach to chips with generic Marvell (non-HighPoint)
+PCI identification. These chips are also supported by ata(4) and mvs(4).
 Some vendors are using same chips, but without providing RAID BIOS.
 .El
 .Sh DESCRIPTION
@@ -112,7 +112,8 @@ This driver supersedes the older rr232x 
 .Xr ata 4 ,
 .Xr cam 4 ,
 .Xr hptmv 4 ,
-.Xr loader 8
+.Xr loader 8 ,
+.Xr mvs 4
 .Sh HISTORY
 The
 .Nm

Modified: head/sys/dev/hptrr/hptrr_osm_bsd.c
==============================================================================
--- head/sys/dev/hptrr/hptrr_osm_bsd.c	Sun Jun 17 00:28:57 2012	(r237177)
+++ head/sys/dev/hptrr/hptrr_osm_bsd.c	Sun Jun 17 02:46:27 2012	(r237178)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hptrr/os_bsd.h>
 #include <dev/hptrr/hptintf.h>
 
-static int attach_generic = 1;
+static int attach_generic = 0;
 TUNABLE_INT("hw.hptrr.attach_generic", &attach_generic);
 
 static int hpt_probe(device_t dev)