diff options
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/uts/common/os/sunddi.c | 5 | ||||
-rw-r--r-- | usr/src/uts/common/sys/ddi_implfuncs.h | 3 | ||||
-rw-r--r-- | usr/src/uts/common/vm/seg_dev.c | 10 | ||||
-rw-r--r-- | usr/src/uts/i86pc/os/ddi_impl.c | 33 | ||||
-rw-r--r-- | usr/src/uts/sun4/os/ddi_impl.c | 16 |
5 files changed, 7 insertions, 60 deletions
diff --git a/usr/src/uts/common/os/sunddi.c b/usr/src/uts/common/os/sunddi.c index c2c45b21b1..0591ad1ef9 100644 --- a/usr/src/uts/common/os/sunddi.c +++ b/usr/src/uts/common/os/sunddi.c @@ -6645,9 +6645,8 @@ ddi_dma_mem_alloc(ddi_dma_handle_t handle, size_t length, if (*handlep == NULL) return (DDI_FAILURE); - /* check if the cache and endian attributes are supported */ - if (i_ddi_check_cache_attr(flags) == B_FALSE || - i_ddi_check_endian_attr(accattrp) == B_FALSE) + /* check if the cache attributes are supported */ + if (i_ddi_check_cache_attr(flags) == B_FALSE) return (DDI_FAILURE); /* diff --git a/usr/src/uts/common/sys/ddi_implfuncs.h b/usr/src/uts/common/sys/ddi_implfuncs.h index cf341ad3ec..e4ef2f0e3e 100644 --- a/usr/src/uts/common/sys/ddi_implfuncs.h +++ b/usr/src/uts/common/sys/ddi_implfuncs.h @@ -91,9 +91,6 @@ i_ddi_devi_get_ppa(dev_info_t *dip); void i_ddi_devi_set_ppa(dev_info_t *dip, int ppa); -boolean_t -i_ddi_check_endian_attr(ddi_device_acc_attr_t *devaccp); - void i_ddi_devacc_to_hatacc(ddi_device_acc_attr_t *devaccp, uint_t *hataccp); diff --git a/usr/src/uts/common/vm/seg_dev.c b/usr/src/uts/common/vm/seg_dev.c index daa079e218..f24a1d46ed 100644 --- a/usr/src/uts/common/vm/seg_dev.c +++ b/usr/src/uts/common/vm/seg_dev.c @@ -3614,9 +3614,8 @@ devmap_umem_setup(devmap_cookie_t dhc, dev_info_t *dip, if ((off + len) > cp->size) return (DDI_FAILURE); - /* check if the cache and endian attributes are supported */ - if (i_ddi_check_cache_attr(flags) == B_FALSE || - i_ddi_check_endian_attr(accattrp) == B_FALSE) + /* check if the cache attributes are supported */ + if (i_ddi_check_cache_attr(flags) == B_FALSE) return (DDI_FAILURE); /* @@ -3720,9 +3719,8 @@ devmap_umem_remap(devmap_cookie_t dhc, dev_info_t *dip, if (flags != 0) return (DDI_FAILURE); - /* check if the cache and endian attributes are supported */ - if (i_ddi_check_cache_attr(flags) == B_FALSE || - i_ddi_check_endian_attr(accattrp) == B_FALSE) + /* check if the cache attributes are supported */ + if (i_ddi_check_cache_attr(flags) == B_FALSE) return (DDI_FAILURE); if ((dhp->dh_prot & dhp->dh_orig_maxprot & maxprot) != dhp->dh_prot) diff --git a/usr/src/uts/i86pc/os/ddi_impl.c b/usr/src/uts/i86pc/os/ddi_impl.c index f73e6c4911..04ec2dc609 100644 --- a/usr/src/uts/i86pc/os/ddi_impl.c +++ b/usr/src/uts/i86pc/os/ddi_impl.c @@ -1455,41 +1455,10 @@ kfreea(void *addr) } } -/* - * Check if the endianess attribute is supported on the platform. - * This function must be called before i_ddi_devacc_to_hatacc(). - */ -boolean_t -i_ddi_check_endian_attr(ddi_device_acc_attr_t *devaccp) -{ - /* - * Big endianess is not supported on X86. - */ - if (devaccp != NULL && - devaccp->devacc_attr_endian_flags == DDI_STRUCTURE_BE_ACC) - return (B_FALSE); - - return (B_TRUE); -} - -/* set HAT endianess attributes from ddi_device_acc_attr */ +/*ARGSUSED*/ void i_ddi_devacc_to_hatacc(ddi_device_acc_attr_t *devaccp, uint_t *hataccp) { - static char *fname = "i_ddi_devacc_to_hatacc"; -#if defined(lint) - *hataccp = *hataccp; -#endif - /* - * This case must not occur because the endianess is examined - * before this function is called. - */ - if (devaccp != NULL && - devaccp->devacc_attr_endian_flags == DDI_STRUCTURE_BE_ACC) { - cmn_err(CE_WARN, - "%s: devacc_attr_endian_flags=0x%x is ignored.", - fname, devaccp->devacc_attr_endian_flags); - } } /* diff --git a/usr/src/uts/sun4/os/ddi_impl.c b/usr/src/uts/sun4/os/ddi_impl.c index 3856827327..517f109fed 100644 --- a/usr/src/uts/sun4/os/ddi_impl.c +++ b/usr/src/uts/sun4/os/ddi_impl.c @@ -990,22 +990,6 @@ i_ddi_free_intr_phdl(ddi_intr_handle_impl_t *hdlp) * SECTION: DDI Memory/DMA */ -/* - * Check if the endianess attribute is supported on the platform. - * This function must be called before i_ddi_devacc_to_hatacc(). - */ -boolean_t -i_ddi_check_endian_attr(ddi_device_acc_attr_t *devaccp) -{ -#if defined(lint) - *devaccp = *devaccp; -#endif - /* - * All kinds of endianess is supported on SPARC. - */ - return (B_TRUE); -} - /* set HAT endianess attributes from ddi_device_acc_attr */ void i_ddi_devacc_to_hatacc(ddi_device_acc_attr_t *devaccp, uint_t *hataccp) |