svn commit: r237178 - in head: share/man/man4 sys/dev/hptrr

[Eitan Adler]

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 at 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)