From owner-svn-src-head@FreeBSD.ORG Thu Dec 18 21:45:35 2008 Return-Path: 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 01112106567A; Thu, 18 Dec 2008 21:45:35 +0000 (UTC) (envelope-from niclas.zeising@gmail.com) Received: from mx6.bahnhof.se (mx6.bahnhof.se [213.80.101.16]) by mx1.freebsd.org (Postfix) with ESMTP id A65758FC16; Thu, 18 Dec 2008 21:45:34 +0000 (UTC) (envelope-from niclas.zeising@gmail.com) Received: from localhost (mx6.local [127.0.0.1]) by mx6-reinject (Postfix) with ESMTP id 5301821109A; Thu, 18 Dec 2008 22:45:33 +0100 (CET) Received: from mx6.bahnhof.se ([127.0.0.1]) by localhost (mx6.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19682-01; Thu, 18 Dec 2008 22:45:29 +0100 (CET) Received: from [10.0.0.3] (h-85-24-219-30.NA.cust.bahnhof.se [85.24.219.30]) by mx6.bahnhof.se (Postfix) with ESMTP id D6FD021102D; Thu, 18 Dec 2008 22:45:29 +0100 (CET) Received: from 127.0.0.1 (AVG SMTP 8.0.176 [270.9.19/1855]); Thu, 18 Dec 2008 22:45:25 +0100 Message-ID: <494AC475.20808@gmail.com> Date: Thu, 18 Dec 2008 22:45:25 +0100 From: Niclas Zeising User-Agent: Thunderbird 2.0.0.18 (Windows/20081105) MIME-Version: 1.0 To: Alexander Motin References: <200812182113.mBILDkwt052441@svn.freebsd.org> In-Reply-To: <200812182113.mBILDkwt052441@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MX6) X-Spam-Status: No, score=1.708 tagged_above=-99 required=5 tests=[DNS_FROM_RFC_POST=1.708] X-Spam-Score: 1.708 X-Spam-Level: * Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186296 - head/sys/dev/ata/chipsets 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2008 21:45:35 -0000 Alexander Motin wrote: > Author: mav > Date: Thu Dec 18 21:13:46 2008 > New Revision: 186296 > URL: http://svn.freebsd.org/changeset/base/186296 > > Log: > Before modularization commit, atapci driver was attaching only to devices of > storage class. This check was lost. It is not important for the most cases, > but as it was reported on current@, it does important for sis driver and > surely inportant for AHCI driver. So restore it there. > > Submitted by: Toshikazu ICHINOSEKI, Andrey V. Elsukov > Discussed on: current@ > > Modified: > head/sys/dev/ata/chipsets/ata-ahci.c > head/sys/dev/ata/chipsets/ata-sis.c > > Modified: head/sys/dev/ata/chipsets/ata-ahci.c > ============================================================================== > --- head/sys/dev/ata/chipsets/ata-ahci.c Thu Dec 18 21:04:50 2008 (r186295) > +++ head/sys/dev/ata/chipsets/ata-ahci.c Thu Dec 18 21:13:46 2008 (r186296) > @@ -73,8 +73,9 @@ ata_ahci_probe(device_t dev) > char buffer[64]; > > /* is this a possible AHCI candidate ? */ > - if (pci_get_subclass(dev) != PCIS_STORAGE_SATA) > - return ENXIO; > + if (pci_get_class(dev) != PCIC_STORAGE || > + pci_get_subclass(dev) != PCIS_STORAGE_SATA) > + return (ENXIO); > > /* is this PCI device flagged as an AHCI compliant chip ? */ > if (pci_read_config(dev, PCIR_PROGIF, 1) != PCIP_STORAGE_SATA_AHCI_1_0) > > Modified: head/sys/dev/ata/chipsets/ata-sis.c > ============================================================================== > --- head/sys/dev/ata/chipsets/ata-sis.c Thu Dec 18 21:04:50 2008 (r186295) > +++ head/sys/dev/ata/chipsets/ata-sis.c Thu Dec 18 21:13:46 2008 (r186296) > @@ -105,6 +105,9 @@ ata_sis_probe(device_t dev) > char buffer[64]; > int found = 0; > > + if (pci_get_class(dev) != PCIC_STORAGE) > + return (ENXIO); > + > if (pci_get_vendor(dev) != ATA_SIS_ID) > return ENXIO; > With this change, am I able to boot from a harddrive located on a SiS-controller again? Or is that more likely a different issue? I have't investigated my issue properly due to lack of time, so I don't know exactly what's wrong, only that it can't find the hard drive properly. Regards! //Niclas