[src/netbsd-3]: src Pull up following revision(s) (requested by jonathan in t...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0cd031c6fdac
branches:  netbsd-3
changeset: 578031:0cd031c6fdac
user:      tron <tron%NetBSD.org@localhost>
date:      Thu May 04 12:25:50 2006 +0000

description:
Pull up following revision(s) (requested by jonathan in ticket #1298):
        sys/dev/pci/svwsata.c: revision 1.2
        share/man/man4/svwsata.4: revision 1.2
Also support Serverwork Frodo4, Frodo8 and HT-1000 in svwsata.
>From OpenBSD.

diffstat:

 share/man/man4/svwsata.4 |  10 +++++-----
 sys/dev/pci/svwsata.c    |  26 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 7 deletions(-)

diffs (87 lines):

diff -r 73d8ef64711d -r 0cd031c6fdac share/man/man4/svwsata.4
--- a/share/man/man4/svwsata.4  Thu May 04 12:20:50 2006 +0000
+++ b/share/man/man4/svwsata.4  Thu May 04 12:25:50 2006 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: svwsata.4,v 1.2.2.2 2006/05/04 12:20:50 tron Exp $
+.\"    $NetBSD: svwsata.4,v 1.2.2.3 2006/05/04 12:25:50 tron Exp $
 .\"
 .\" Copyright (c) 2006 Manuel Bouyer.
 .\"
@@ -27,19 +27,19 @@
 .\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 6, 2006
+.Dd March 7, 2006
 .Dt SVWSATA 4
 .Os
 .Sh NAME
 .Nm svwsata
-.Nd Serverworks K2 Serial ATA disk controller driver
+.Nd Serverworks Serial ATA disk controller driver
 .Sh SYNOPSIS
 .Cd "svwsata* at pci? dev ? function ? flags 0x0000"
 .Sh DESCRIPTION
 The
 .Nm
-driver supports the Serverworks K2 Serial ATA and controllers,
-and provides the interface with the hardware for the
+driver supports the Serverworks K2, Frodo4, Frodo8 and HT-1000 Serial ATA
+controllers, and provides the interface with the hardware for the
 .Xr ata 4
 driver.
 .Pp
diff -r 73d8ef64711d -r 0cd031c6fdac sys/dev/pci/svwsata.c
--- a/sys/dev/pci/svwsata.c     Thu May 04 12:20:50 2006 +0000
+++ b/sys/dev/pci/svwsata.c     Thu May 04 12:25:50 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svwsata.c,v 1.3.4.2 2006/05/04 12:12:07 tron Exp $     */
+/*     $NetBSD: svwsata.c,v 1.3.4.3 2006/05/04 12:25:50 tron Exp $     */
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.3.4.2 2006/05/04 12:12:07 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.3.4.3 2006/05/04 12:25:50 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,6 +48,21 @@
          "ServerWorks K2 SATA Controller",
          svwsata_chip_map
        },
+       { PCI_PRODUCT_SERVERWORKS_FRODO4_SATA,
+         0,
+         "ServerWorks Frodo4 SATA Controller",
+         svwsata_chip_map
+       },
+       { PCI_PRODUCT_SERVERWORKS_FRODO8_SATA,
+         0,
+         "ServerWorks Frodo8 SATA Controller",
+         svwsata_chip_map
+       },
+       { PCI_PRODUCT_SERVERWORKS_HT1000_SATA,
+         0,
+         "ServerWorks HT-1000 SATA Controller",
+         svwsata_chip_map
+       },
        { 0,
          0,
          NULL,
@@ -90,6 +105,13 @@
        if (pciide_chipen(sc, pa) == 0)
                return;
 
+       /* The 4-port version has a dummy second function. */
+       if (pci_conf_read(sc->sc_pc, sc->sc_tag,
+           PCI_MAPREG_START + 0x14) == 0) {
+               aprint_normal("\n");
+               return;
+       }
+
        if (pci_mapreg_map(pa, PCI_MAPREG_START + 0x14,
                           PCI_MAPREG_TYPE_MEM |
                           PCI_MAPREG_MEM_TYPE_32BIT, 0,