Date: Thu, 29 Oct 2009 11:52:26 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r198580 - in releng/8.0/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/ata/chipsets dev/xen/xenpci Message-ID: <200910291152.n9TBqQu3095312@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Oct 29 11:52:26 2009 New Revision: 198580 URL: http://svn.freebsd.org/changeset/base/198580 Log: MFC rev. 198479: Fix SATA on nVidia MCP55 chipset. It needs some short time to allow BAR(5) memory access. PR: amd64/128686, amd64/132372, amd64/139156 Approved by: re (kib) Modified: releng/8.0/sys/ (props changed) releng/8.0/sys/amd64/include/xen/ (props changed) releng/8.0/sys/cddl/contrib/opensolaris/ (props changed) releng/8.0/sys/contrib/dev/acpica/ (props changed) releng/8.0/sys/contrib/pf/ (props changed) releng/8.0/sys/dev/ata/chipsets/ata-nvidia.c releng/8.0/sys/dev/xen/xenpci/ (props changed) Modified: releng/8.0/sys/dev/ata/chipsets/ata-nvidia.c ============================================================================== --- releng/8.0/sys/dev/ata/chipsets/ata-nvidia.c Thu Oct 29 11:00:39 2009 (r198579) +++ releng/8.0/sys/dev/ata/chipsets/ata-nvidia.c Thu Oct 29 11:52:26 2009 (r198580) @@ -165,7 +165,8 @@ ata_nvidia_chipinit(device_t dev) /* enable control access */ pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1); - + /* MCP55 seems to need some time to allow r_res2 read. */ + DELAY(10); if (ctlr->chip->cfg1 & NVQ) { /* clear interrupt status */ ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910291152.n9TBqQu3095312>