Author: marius
Date: Sun Jun 17 11:16:14 2012
New Revision: 237191
URL: http://svn.freebsd.org/changeset/base/237191
Log:
MFC: r237107
- 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.
Modified:
stable/9/sys/dev/ata/chipsets/ata-ite.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/dev/ata/chipsets/ata-ite.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-ite.c Sun Jun 17 11:04:38 2012
(r237190)
+++ stable/9/sys/dev/ata/chipsets/ata-ite.c Sun Jun 17 11:16:14 2012
(r237191)
@@ -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-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
