Re: kern/38081: ahcisata does not attach for Intel 82801GB/GR

[Simon Burge <simonb%NetBSD.org@localhost>]

The following reply was made to PR kern/38081; it has been noted by GNATS.

From: Simon Burge <simonb%NetBSD.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: kern-bug-people%netbsd.org@localhost, gnats-admin%netbsd.org@localhost,
        netbsd-bugs%netbsd.org@localhost
Subject: Re: kern/38081: ahcisata does not attach for Intel 82801GB/GR
Date: Fri, 22 Feb 2008 23:51:51 +1100

 --NzB8fVQJ5HfG6fxh
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 [ ... ] The attached patch [ ... ]
 
 And of course, the atttachment :-)
 
 --NzB8fVQJ5HfG6fxh
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="ahcisata.patch"
 
 Index: ahcisata_pci.c
 ===================================================================
 RCS file: /cvsroot/src/sys/dev/pci/ahcisata_pci.c,v
 retrieving revision 1.5
 diff -d -p -u -r1.5 ahcisata_pci.c
 --- ahcisata_pci.c     19 Feb 2008 10:38:28 -0000      1.5
 +++ ahcisata_pci.c     22 Feb 2008 12:41:05 -0000
 @@ -83,7 +83,10 @@ ahci_pci_match(struct device *parent, st
                    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
                    &regt, &regh, NULL, &size) != 0)
                        return 0;
 -              if (bus_space_read_4(regt, regh, AHCI_GHC) & AHCI_GHC_AE)
 +              if (PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_MASS_STORAGE_SATA
 +                  && PCI_INTERFACE(pa->pa_class) == PCI_INTERFACE_SATA_AHCI)
 +                      ret = 3;
 +              else if (bus_space_read_4(regt, regh, AHCI_GHC) & AHCI_GHC_AE)
                        ret = 3;
                bus_space_unmap(regt, regh, size);
                return ret;
 
 --NzB8fVQJ5HfG6fxh--