From owner-freebsd-stable@FreeBSD.ORG Sun Oct 5 09:06:31 2008 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39D93106569D; Sun, 5 Oct 2008 09:06:31 +0000 (UTC) (envelope-from glz@hidden-powers.com) Received: from mail.hidden-powers.com (mail.hidden-powers.com [213.242.135.162]) by mx1.freebsd.org (Postfix) with ESMTP id 7530F8FC1D; Sun, 5 Oct 2008 09:06:30 +0000 (UTC) (envelope-from glz@hidden-powers.com) Received: from mail.hidden-powers.com (localhost [127.0.0.1]) by dkim.hidden-powers.com (Postfix) with ESMTP id E7B026D4DE; Sun, 5 Oct 2008 10:50:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=hidden-powers.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type; s=selector1; bh=sRuG+ev6gopqLEDVrIMX Sly7D70=; b=b7z8knQJSR4ox9XMVq5LV83F4hfpbN8KCOyrDrxzsgIcWNc5wHKx dB7iwnwH9R7iC8PgJ2JcoEhkus3szzhrPn1RkdRWmIZpw2Onp3wj0owWs/AsjK9d 5vdMXspvWze6EJ/rs9PfoaL0xDzTslHpUgvqLw5URYA4fZrE1MSRxU4= Received: from [10.255.253.2] (tor.glz.hidden-powers.com [10.255.253.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.hidden-powers.com (Postfix) with ESMTPSA id 7C4596D4DD; Sun, 5 Oct 2008 10:50:26 +0200 (CEST) Date: Sun, 05 Oct 2008 10:50:26 +0200 From: Goran Lowkrantz To: "Andrey V. Elsukov" , freebsd-stable@freebsd.org Message-ID: In-Reply-To: <676151223134689@webmail38.yandex.ru> References: <676151223134689@webmail38.yandex.ru> X-Mailer: Mulberry/4.0.8 (Win32) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="==========7B9F4D4CA8217A03A6CC==========" Cc: kib@freebsd.org, sos@freebsd.org Subject: Re: Request for testing: ata(4) MFC X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Oct 2008 09:06:31 -0000 --==========7B9F4D4CA8217A03A6CC========== Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline --On Saturday, October 04, 2008 19:38 +0400 "Andrey V. Elsukov" wrote: > Hi, All. > > I prepared patch to make MFC of ata(4) driver into RELENG_7 > before 7.1-RELEASE. Depending on results of the testing patch > will be commited or not (if some regressions will be detected). > So if you want or just can test it, please try and report here. > Installed and tested with no ill effects on an ASUS M2N-VM DVI board. Still need to manually apply the attached patch, picked up on the list a while ago, to have the built-in SATA controller detected and recognized as AHCI capable. Cheers, Goran Attachments: lspci output of controller under test. original patch for controller. updated patch against tested patchset. --- "There is hopeful symbolism in the fact that flags do not wave in a vacuum." -- Arthur C. Clarke --==========7B9F4D4CA8217A03A6CC========== Content-Type: text/plain; charset=utf-8; name="MCP67-AHCI.txt" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="MCP67-AHCI.txt"; size=994 00:09.0 SATA controller [0106]: nVidia Corporation MCP67 AHCI Controller = [10de:0554] (rev a2) (prog-if 01 [AHCI 1.0]) Subsystem: ASUSTeK Computer Inc. Unknown device [1043:82b3] Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- = Stepping- SERR+ FastB2B- DisINTx- Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=3Dfast >TAbort- = SERR- --==========7B9F4D4CA8217A03A6CC========== Content-Type: text/plain; charset=utf-8; name="ata_nvidia_ahci.txt" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ata_nvidia_ahci.txt"; size=2364 Index: src/sys/dev/ata/ata-chipset.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /ncvs/src/sys/dev/ata/ata-chipset.c,v retrieving revision 1.225 diff -u -p -r1.225 ata-chipset.c --- src/sys/dev/ata/ata-chipset.c 15 Aug 2008 10:55:11 -0000 1.225 +++ src/sys/dev/ata/ata-chipset.c 23 Sep 2008 05:06:28 -0000 @@ -3372,7 +3372,9 @@ ata_nvidia_ident(device_t dev) { ATA_NFORCE_MCP61_S3, 0, 0, NV4|NVQ, ATA_SA300, "nForce = MCP61" }, { ATA_NFORCE_MCP65, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce = MCP65" }, { ATA_NFORCE_MCP67, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce = MCP67" }, + { ATA_NFORCE_MCP67_A1, 0, 0, NVAHCI, ATA_SA300, "nForce = MCP67" }, { ATA_NFORCE_MCP73, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce = MCP73" }, + { ATA_NFORCE_MCP73_A1, 0, 0, NVAHCI, ATA_SA300, "nForce = MCP73" }, { ATA_NFORCE_MCP77, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce = MCP77" }, { 0, 0, 0, 0, 0, 0}} ; =20 @@ -3380,7 +3382,12 @@ ata_nvidia_ident(device_t dev) return ENXIO; =20 ata_set_desc(dev); - ctlr->chipinit =3D ata_nvidia_chipinit; + + if (ctlr->chip->cfg2 =3D=3D NVAHCI) + ctlr->chipinit =3D ata_ahci_chipinit; + else + ctlr->chipinit =3D ata_nvidia_chipinit; + return 0; } =20 Index: src/sys/dev/ata/ata-pci.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /ncvs/src/sys/dev/ata/ata-pci.h,v retrieving revision 1.89 diff -u -p -r1.89 ata-pci.h --- src/sys/dev/ata/ata-pci.h 10 Jul 2008 21:36:53 -0000 1.89 +++ src/sys/dev/ata/ata-pci.h 23 Sep 2008 05:06:28 -0000 @@ -243,8 +243,10 @@ struct ata_connect_task { #define ATA_NFORCE_MCP61_S2 0x03f610de #define ATA_NFORCE_MCP61_S3 0x03f710de #define ATA_NFORCE_MCP65 0x044810de +#define ATA_NFORCE_MCP67_A1 0x055010de #define ATA_NFORCE_MCP67 0x056010de #define ATA_NFORCE_MCP73 0x056c10de +#define ATA_NFORCE_MCP73_A1 0x07f810de #define ATA_NFORCE_MCP77 0x075910de =20 #define ATA_PROMISE_ID 0x105a @@ -450,6 +452,7 @@ struct ata_connect_task { #define NVIDIA 0x0004 #define NV4 0x0010 #define NVQ 0x0020 +#define NVAHCI 0x0040 #define VIACLK 0x0100 #define VIABUG 0x0200 #define VIABAR 0x0400 --==========7B9F4D4CA8217A03A6CC========== Content-Type: application/octet-stream; name="ata_nvidia_ahci-20081004.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ata_nvidia_ahci-20081004.diff"; size=1800 LS0tIHNyYy9zeXMvZGV2L2F0YS9hdGEtY2hpcHNldC5jLm9yaWcJMjAwOC0xMC0wNSAxMDo0Mzoz Ny43MDQ1NzI4ODMgKzAyMDAKKysrIHNyYy9zeXMvZGV2L2F0YS9hdGEtY2hpcHNldC5jCTIwMDgt MTAtMDUgMTA6NDQ6MTQuMTkzMDY2NjU0ICswMjAwCkBAIC0zNDk1LDcgKzM0OTUsOSBAQAogICAg ICB7IEFUQV9ORk9SQ0VfTUNQNjFfUzMsIDAsIDAsICAgICAgICAgTlY0fE5WUSwgQVRBX1NBMzAw LCAibkZvcmNlIE1DUDYxIiB9LAogICAgICB7IEFUQV9ORk9SQ0VfTUNQNjUsICAgIDAsIEFNRE5W SURJQSwgTlZJRElBLCAgQVRBX1VETUE2LCAibkZvcmNlIE1DUDY1IiB9LAogICAgICB7IEFUQV9O Rk9SQ0VfTUNQNjcsICAgIDAsIEFNRE5WSURJQSwgTlZJRElBLCAgQVRBX1VETUE2LCAibkZvcmNl IE1DUDY3IiB9LAorICAgICB7IEFUQV9ORk9SQ0VfTUNQNjdfQTIsIDAsIDAsICAgICAgICAgTlZB SENJLCAgQVRBX1NBMzAwLCAibkZvcmNlIE1DUDY3IiB9LAogICAgICB7IEFUQV9ORk9SQ0VfTUNQ NzMsICAgIDAsIEFNRE5WSURJQSwgTlZJRElBLCAgQVRBX1VETUE2LCAibkZvcmNlIE1DUDczIiB9 LAorICAgICB7IEFUQV9ORk9SQ0VfTUNQNzNfQTEsIDAsIDAsICAgICAgICAgTlZBSENJLCAgQVRB X1NBMzAwLCAibkZvcmNlIE1DUDczIiB9LAogICAgICB7IEFUQV9ORk9SQ0VfTUNQNzcsICAgIDAs IEFNRE5WSURJQSwgTlZJRElBLCAgQVRBX1VETUE2LCAibkZvcmNlIE1DUDc3IiB9LAogICAgICB7 IDAsIDAsIDAsIDAsIDAsIDB9fSA7CiAKQEAgLTM1MDQsNyArMzUwNiwxMCBAQAogCiAgICAgYXRh X3NldF9kZXNjKGRldik7CiAKLSAgICBjdGxyLT5jaGlwaW5pdCA9IGF0YV9udmlkaWFfY2hpcGlu aXQ7CisgICAgaWYgKGN0bHItPmNoaXAtPmNmZzIgPT0gTlZBSENJKQorCWN0bHItPmNoaXBpbml0 ID0gYXRhX2FoY2lfY2hpcGluaXQ7CisgICAgZWxzZQorCWN0bHItPmNoaXBpbml0ID0gYXRhX252 aWRpYV9jaGlwaW5pdDsKIAogICAgIHJldHVybiAwOwogfQotLS0gc3JjL3N5cy9kZXYvYXRhL2F0 YS1wY2kuaC5vcmlnCTIwMDgtMTAtMDUgMTA6NDA6NTEuMzk4MzIzOTc2ICswMjAwCisrKyBzcmMv c3lzL2Rldi9hdGEvYXRhLXBjaS5oCTIwMDgtMTAtMDUgMTA6NDU6MjUuNjQ3MDMyOTY3ICswMjAw CkBAIC0yNDYsOCArMjQ2LDEwIEBACiAjZGVmaW5lIEFUQV9ORk9SQ0VfTUNQNjFfUzIgICAgIDB4 MDNmNjEwZGUKICNkZWZpbmUgQVRBX05GT1JDRV9NQ1A2MV9TMyAgICAgMHgwM2Y3MTBkZQogI2Rl ZmluZSBBVEFfTkZPUkNFX01DUDY1ICAgICAgICAweDA0NDgxMGRlCisjZGVmaW5lIEFUQV9ORk9S Q0VfTUNQNjdfQTIgICAgIDB4MDU1MDEwZGUKICNkZWZpbmUgQVRBX05GT1JDRV9NQ1A2NyAgICAg ICAgMHgwNTYwMTBkZQogI2RlZmluZSBBVEFfTkZPUkNFX01DUDczICAgICAgICAweDA1NmMxMGRl CisjZGVmaW5lIEFUQV9ORk9SQ0VfTUNQNzNfQTEgICAgIDB4MDdmODEwZGUKICNkZWZpbmUgQVRB X05GT1JDRV9NQ1A3NyAgICAgICAgMHgwNzU5MTBkZQogCiAjZGVmaW5lIEFUQV9QUk9NSVNFX0lE ICAgICAgICAgIDB4MTA1YQpAQCAtNDU0LDYgKzQ1Niw3IEBACiAjZGVmaW5lIE5WSURJQSAgICAg ICAgICAweDAwMDQKICNkZWZpbmUgTlY0ICAgICAgICAgICAgIDB4MDAxMAogI2RlZmluZSBOVlEg ICAgICAgICAgICAgMHgwMDIwCisjZGVmaW5lIE5WQUhDSSAgICAgICAgICAweDAwNDAKICNkZWZp bmUgVklBQ0xLICAgICAgICAgIDB4MDEwMAogI2RlZmluZSBWSUFCVUcgICAgICAgICAgMHgwMjAw CiAjZGVmaW5lIFZJQUJBUiAgICAgICAgICAweDA0MDAK --==========7B9F4D4CA8217A03A6CC==========--