From owner-svn-src-all@FreeBSD.ORG Thu Jan 28 21:55:56 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B027106566C; Thu, 28 Jan 2010 21:55:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A0AB8FC16; Thu, 28 Jan 2010 21:55:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SLtuga064207; Thu, 28 Jan 2010 21:55:56 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0SLtus5064205; Thu, 28 Jan 2010 21:55:56 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201001282155.o0SLtus5064205@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 28 Jan 2010 21:55:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203132 - head/sys/mips/atheros X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 21:55:56 -0000 Author: gonzo Date: Thu Jan 28 21:55:56 2010 New Revision: 203132 URL: http://svn.freebsd.org/changeset/base/203132 Log: - Increase timeouts to 100 milliseconds, 1 millisecond is definitely not enough for PCI controller to get into shape Thanks to: adrian@ Modified: head/sys/mips/atheros/ar71xx_pci.c Modified: head/sys/mips/atheros/ar71xx_pci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_pci.c Thu Jan 28 21:14:12 2010 (r203131) +++ head/sys/mips/atheros/ar71xx_pci.c Thu Jan 28 21:55:56 2010 (r203132) @@ -297,12 +297,12 @@ ar71xx_pci_attach(device_t dev) reset |= (RST_RESET_PCI_CORE | RST_RESET_PCI_BUS); ATH_WRITE_REG(AR71XX_RST_RESET, reset); ATH_READ_REG(AR71XX_RST_RESET); - DELAY(1000); + DELAY(100000); reset &= ~(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS); ATH_WRITE_REG(AR71XX_RST_RESET, reset); ATH_READ_REG(AR71XX_RST_RESET); - DELAY(1000); + DELAY(100000); /* Init PCI windows */ ATH_WRITE_REG(AR71XX_PCI_WINDOW0, PCI_WINDOW0_ADDR); @@ -313,7 +313,7 @@ ar71xx_pci_attach(device_t dev) ATH_WRITE_REG(AR71XX_PCI_WINDOW5, PCI_WINDOW5_ADDR); ATH_WRITE_REG(AR71XX_PCI_WINDOW6, PCI_WINDOW6_ADDR); ATH_WRITE_REG(AR71XX_PCI_WINDOW7, PCI_WINDOW7_CONF_ADDR); - DELAY(1000); + DELAY(100000); ar71xx_pci_check_bus_error();