svn commit: r223361 - stable/8/sys/dev/ata/chipsets

[Alexander Motin]

Author: mav
Date: Tue Jun 21 08:39:09 2011
New Revision: 223361
URL: http://svn.freebsd.org/changeset/base/223361

Log:
  MFC r223097:
  Skip BAR(5) usage for SATA registers access on ICH8M Apples, because for
  some reason it causes system lock up. Linux does the same.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-intel.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-intel.c	Tue Jun 21 08:37:55 2011	(r223360)
+++ stable/8/sys/dev/ata/chipsets/ata-intel.c	Tue Jun 21 08:39:09 2011	(r223361)
@@ -288,7 +288,9 @@ ata_intel_chipinit(device_t dev)
 			ATA_OUTL(ctlr->r_res2, 0x0C,
 			    ATA_INL(ctlr->r_res2, 0x0C) | 0xf);
 		}
-	} else {
+	/* Skip BAR(5) on ICH8M Apples, system locks up on access. */
+	} else if (ctlr->chip->chipid != ATA_I82801HBM_S1 ||
+	    pci_get_subvendor(dev) != 0x106b) {
 		ctlr->r_type2 = SYS_RES_IOPORT;
 		ctlr->r_rid2 = PCIR_BAR(5);
 		ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2,