From owner-freebsd-current@FreeBSD.ORG Thu Nov 22 09:04:47 2007 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3324116A418 for ; Thu, 22 Nov 2007 09:04:47 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (neo.vx.sk [213.239.219.9]) by mx1.freebsd.org (Postfix) with ESMTP id D962C13C458 for ; Thu, 22 Nov 2007 09:04:46 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id D693139855 for ; Thu, 22 Nov 2007 10:04:36 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id LF8vwnzVCii7 for ; Thu, 22 Nov 2007 10:04:34 +0100 (CET) Received: from [10.2.0.1] (gw.radiolan.sk [193.93.72.6]) by mail.vx.sk (Postfix) with ESMTP id 7BFE739832 for ; Thu, 22 Nov 2007 10:04:34 +0100 (CET) Message-ID: <4745462F.7090506@FreeBSD.org> Date: Thu, 22 Nov 2007 10:04:47 +0100 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; sk; rv:1.8.1.9) Gecko/20071031 Thunderbird/2.0.0.9 Mnenhy/0.7.5.0 MIME-Version: 1.0 To: freebsd-current@FreeBSD.org X-Enigmail-Version: 0.95.3 Content-Type: multipart/mixed; boundary="------------030101000705020600060409" Cc: Subject: Updated ata(4) patch for SB600 and SB700 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2007 09:04:47 -0000 This is a multi-part message in MIME format. --------------030101000705020600060409 Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: 7bit An updated patch against recent changes in ata(4) for users with IXP600 and IXP700 chipsets is attached. The patch enables SATA300 (via AHCI) e.g on mainboards with AMD690G chipsets. Patch applies against recent -CURRENT, 7-STABLE and 6-STABLE. ata(4) commiters please review, others please report any issues here. I have submitted a PR as well, but the mail server seems to have problems right now. --------------030101000705020600060409 Content-Type: text/plain; name="ata.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ata.diff" Index: src/sys/dev/ata/ata-chipset.c =================================================================== RCS file: /home/ncvs/src/sys/dev/ata/ata-chipset.c,v retrieving revision 1.207 diff -a -u -r1.207 ata-chipset.c --- src/sys/dev/ata/ata-chipset.c 20 Nov 2007 04:52:19 -0000 1.207 +++ src/sys/dev/ata/ata-chipset.c 22 Nov 2007 00:01:14 -0000 @@ -1345,7 +1345,9 @@ { ATA_ATI_IXP400_S1, 0x00, SIIMEMIO, 0, ATA_SA150, "IXP400" }, { ATA_ATI_IXP400_S2, 0x00, SIIMEMIO, 0, ATA_SA150, "IXP400" }, { ATA_ATI_IXP600, 0x00, 0, 0, ATA_UDMA6, "IXP600" }, + { ATA_ATI_IXP600_S1, 0x00, 0, AHCI, ATA_SA300, "IXP600" }, { ATA_ATI_IXP700, 0x00, 0, 0, ATA_UDMA6, "IXP700" }, + { ATA_ATI_IXP700_S1, 0x00, 0, AHCI, ATA_SA300, "IXP700" }, { 0, 0, 0, 0, 0, 0}}; if (!(ctlr->chip = ata_match_chip(dev, ids))) @@ -1366,6 +1368,9 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); + if ((ctlr->chip->cfg2 == AHCI) && ata_ahci_chipinit(dev) != ENXIO) + return 0; + if (ata_setup_interrupt(dev)) return ENXIO; Index: src/sys/dev/ata/ata-pci.h =================================================================== RCS file: /home/ncvs/src/sys/dev/ata/ata-pci.h,v retrieving revision 1.82 diff -a -u -r1.82 ata-pci.h --- src/sys/dev/ata/ata-pci.h 18 Nov 2007 14:44:52 -0000 1.82 +++ src/sys/dev/ata/ata-pci.h 22 Nov 2007 00:01:14 -0000 @@ -104,7 +104,9 @@ #define ATA_ATI_IXP400_S1 0x43791002 #define ATA_ATI_IXP400_S2 0x437a1002 #define ATA_ATI_IXP600 0x438c1002 +#define ATA_ATI_IXP600_S1 0x43801002 #define ATA_ATI_IXP700 0x439c1002 +#define ATA_ATI_IXP700_S1 0x43901002 #define ATA_CENATEK_ID 0x16ca #define ATA_CENATEK_ROCKET 0x000116ca --------------030101000705020600060409--