Mercurial > illumos > illumos-gate

changeset 11697:46111b6bb577

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6906986 Boston's panic and will not boot after installing Opensolaris snv_128a - PCIe Fabric error
author Colin Zou - Sun Microsystems - Beijing China <Colin.Zou@Sun.COM>
date Fri, 19 Feb 2010 09:52:30 +0800
parents d5bf02b6c6d2
children 5f3c2d3ccd7b
files usr/src/uts/common/io/pciex/pcieb.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/pciex/pcieb.c	Thu Feb 18 15:48:33 2010 -0700
+++ b/usr/src/uts/common/io/pciex/pcieb.c	Fri Feb 19 09:52:30 2010 +0800
@@ -1360,7 +1360,7 @@
 	ddi_dma_handle_t *handlep)
 {
 	int		ret;
-#ifdef	BCM_SW_WORKAROUNDS
+#ifdef	PCIEB_BCM
 	uint64_t	lim;
 
 	/*
@@ -1373,7 +1373,7 @@
 	lim = attr_p->dma_attr_addr_hi;
 	attr_p->dma_attr_addr_hi = MIN(lim, PCIEB_ADDR_LIMIT_HI);
 
-#endif	/* BCM_SW_WORKAROUNDS */
+#endif	/* PCIEB_BCM */
 
 	/*
 	 * This is a software workaround to fix the Broadcom 5714/5715 PCIe-PCI
@@ -1386,9 +1386,9 @@
 	if ((ret = ddi_dma_allochdl(dip, rdip, attr_p, waitfp, arg,
 	    handlep)) == DDI_SUCCESS) {
 		ddi_dma_impl_t	*mp = (ddi_dma_impl_t *)*handlep;
-#ifdef	BCM_SW_WORKAROUNDS
+#ifdef	PCIEB_BCM
 		mp->dmai_inuse |= PX_DMAI_FLAGS_MAP_BUFZONE;
-#endif	/* BCM_SW_WORKAROUNDS */
+#endif	/* PCIEB_BCM */
 		/*
 		 * For a given rdip, update mp->dmai_bdf with the bdf value
 		 * of pcieb's immediate child or secondary bus-id of the
@@ -1413,10 +1413,10 @@
 {
 	int	ret;
 
-#ifdef	BCM_SW_WORKAROUNDS
+#ifdef	PCIEB_BCM
 	if (cmd == DDI_DMA_RESERVE)
 		return (DDI_FAILURE);
-#endif	/* BCM_SW_WORKAROUNDS */
+#endif	/* PCIEB_BCM */
 
 	if (((ret = ddi_dma_mctl(dip, rdip, handle, cmd, offp, lenp, objp,
 	    cache_flags)) == DDI_SUCCESS) && (cmd == DDI_DMA_RESERVE)) {