From owner-cvs-src@FreeBSD.ORG  Fri Sep 26 08:24:15 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A449D16A4B3; Fri, 26 Sep 2003 08:24:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9C71843FE9; Fri, 26 Sep 2003 08:24:14 -0700 (PDT)
	(envelope-from scottl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8QFOEXJ020806;
	Fri, 26 Sep 2003 08:24:14 -0700 (PDT)
	(envelope-from scottl@repoman.freebsd.org)
Received: (from scottl@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8QFOEmG020805;
	Fri, 26 Sep 2003 08:24:14 -0700 (PDT)
	(envelope-from scottl)
Message-Id: <200309261524.h8QFOEmG020805@repoman.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Fri, 26 Sep 2003 08:24:14 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/sys/dev/aic7xxx aic79xx_pci.c aic7xxx_pci.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Sep 2003 15:24:15 -0000

scottl      2003/09/26 08:24:14 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    sys/dev/aic7xxx      aic79xx_pci.c aic7xxx_pci.c 
  Log:
  MFC:
  aic79xx_pci.c:
  aic7xxx_pci.c:
          When performing our register test, be careful
          to avoid resetting the chip when pausing the
          controller.  The test reads the HCNTRL register
          and then writes it back with the PAUSE bit
          explicitly set.  If the last write to the controller
          before our probe is to reset it, the CHIPRST
          bit will still be set, so we must mask it off
          before the PAUSE operation.  On some chip versions,
          we cannot access registers for a few 100us after
          a reset, so this inadvertant reset was causing PCI
          errors to occur on the read to check for paused
          status.
  
  Approved by: re (murray)
  
  Revision  Changes    Path
  1.3.2.6   +3 -1      src/sys/dev/aic7xxx/aic79xx_pci.c
  1.2.2.18  +3 -1      src/sys/dev/aic7xxx/aic7xxx_pci.c