Author: marius
Date: Thu Jun 14 22:19:23 2012
New Revision: 237107
URL: http://svn.freebsd.org/changeset/base/237107
Log:
- As a baind-aid, disable ATAPI DMA when using ATA_CAM for these controllers
as well as it causes the kernel to hang during boot.
Reported and tested by: Kevin Oberman
- Use NULL instead of 0 for a pointer.
MFC after: 3 days
Modified:
head/sys/dev/ata/chipsets/ata-ite.c
Modified: head/sys/dev/ata/chipsets/ata-ite.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ite.c Thu Jun 14 21:48:14 2012
(r237106)
+++ head/sys/dev/ata/chipsets/ata-ite.c Thu Jun 14 22:19:23 2012
(r237107)
@@ -105,10 +105,10 @@ ata_ite_chipinit(device_t dev)
ctlr->setmode = ata_ite_821x_setmode;
/* No timing restrictions initally. */
- ctlr->chipset_data = (void *)0;
+ ctlr->chipset_data = NULL;
}
ctlr->ch_attach = ata_ite_ch_attach;
- return 0;
+ return (0);
}
static int
@@ -119,6 +119,9 @@ ata_ite_ch_attach(device_t dev)
error = ata_pci_ch_attach(dev);
ch->flags |= ATA_CHECKS_CABLE;
+#ifdef ATA_CAM
+ ch->flags |= ATA_NO_ATAPI_DMA;
+#endif
return (error);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
