From owner-freebsd-i386@FreeBSD.ORG  Sat Dec  5 10:40:05 2009
Return-Path: <owner-freebsd-i386@FreeBSD.ORG>
Delivered-To: freebsd-i386@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 026591065692
	for <freebsd-i386@hub.freebsd.org>;
	Sat,  5 Dec 2009 10:40:05 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id E61ED8FC16
	for <freebsd-i386@hub.freebsd.org>;
	Sat,  5 Dec 2009 10:40:04 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nB5Ae4Kr077169
	for <freebsd-i386@freefall.freebsd.org>; Sat, 5 Dec 2009 10:40:04 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nB5Ae4X8077168;
	Sat, 5 Dec 2009 10:40:04 GMT (envelope-from gnats)
Date: Sat, 5 Dec 2009 10:40:04 GMT
Message-Id: <200912051040.nB5Ae4X8077168@freefall.freebsd.org>
To: freebsd-i386@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: i386/138668: commit references a PR
X-BeenThere: freebsd-i386@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: I386-specific issues for FreeBSD <freebsd-i386.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-i386>,
	<mailto:freebsd-i386-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-i386>
List-Post: <mailto:freebsd-i386@freebsd.org>
List-Help: <mailto:freebsd-i386-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-i386>,
	<mailto:freebsd-i386-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Dec 2009 10:40:05 -0000

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: i386/138668: commit references a PR
Date: Sat,  5 Dec 2009 10:31:09 +0000 (UTC)

 Author: mav
 Date: Sat Dec  5 10:30:54 2009
 New Revision: 200117
 URL: http://svn.freebsd.org/changeset/base/200117
 
 Log:
   On Soft Reset, read device signature from FIS receive area, instead of
   PxSIG register. It works better for NVidia chipsets. ahci(4) does the same.
   
   PR:		kern/140472, i386/138668
 
 Modified:
   head/sys/dev/ata/chipsets/ata-ahci.c
 
 Modified: head/sys/dev/ata/chipsets/ata-ahci.c
 ==============================================================================
 --- head/sys/dev/ata/chipsets/ata-ahci.c	Sat Dec  5 09:13:06 2009	(r200116)
 +++ head/sys/dev/ata/chipsets/ata-ahci.c	Sat Dec  5 10:30:54 2009	(r200117)
 @@ -824,11 +824,10 @@ ata_ahci_hardreset(device_t dev, int por
  static u_int32_t
  ata_ahci_softreset(device_t dev, int port)
  {
 -    struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
      struct ata_channel *ch = device_get_softc(dev);
 -    int offset = ch->unit << 7;
      struct ata_ahci_cmd_tab *ctp =
  	(struct ata_ahci_cmd_tab *)(ch->dma.work + ATA_AHCI_CT_OFFSET);
 +    u_int8_t *fis = ch->dma.work + ATA_AHCI_FB_OFFSET + 0x40;
  
      if (bootverbose)
  	device_printf(dev, "software reset port %d...\n", port);
 @@ -865,7 +864,10 @@ ata_ahci_softreset(device_t dev, int por
  	return (-1);
      }
  
 -    return ATA_INL(ctlr->r_res2, ATA_AHCI_P_SIG + offset);
 +    return (((u_int32_t)fis[6] << 24) |
 +	    ((u_int32_t)fis[5] << 16) |
 +	    ((u_int32_t)fis[4] << 8) |
 +	     (u_int32_t)fis[12]);
  }
  
  static void
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"