Index: usr/src/nv/nv.c =================================================================== --- usr/src/nv/nv.c +++ usr/src/nv/nv.c 2012-04-11 18:33:19.440356792 +0300 @@ -2153,6 +2153,11 @@ /* NV reg space */ if (IS_REG_OFFSET(nv, NV_VMA_OFFSET(vma), NV_VMA_SIZE(vma))) { + if (IS_BLACKLISTED_REG_OFFSET(nv, NV_VMA_OFFSET(vma), NV_VMA_SIZE(vma))) + { + return -EINVAL; + } + if (nv_encode_caching(&vma->vm_page_prot, NV_MEMORY_UNCACHED, NV_MEMORY_TYPE_REGISTERS)) Index: usr/src/nv/nv.h =================================================================== --- usr/src/nv/nv.h +++ usr/src/nv/nv.h 2012-04-11 17:49:24.903193430 +0300 @@ -351,6 +351,14 @@ ((offset) >= (nv)->agp.address) && \ (((offset) + ((length)-1)) <= (nv)->agp.address + ((nv)->agp.size-1))) +#define IS_REG_RANGE_WITHIN_MAPPING(nv, roffset, rlength, moffset, mlength) \ + (((moffset) <= ((nv)->regs->address + ((roffset) + (rlength)-1))) &&\ + (((moffset) + (mlength)-1) >= ((nv)->regs->address + (roffset)))) + +#define IS_BLACKLISTED_REG_OFFSET(nv, offset, length) \ + ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\ + (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length))) + /* duplicated from nvos.h for external builds */ #ifndef NVOS_AGP_CONFIG_DISABLE_AGP # define NVOS_AGP_CONFIG_DISABLE_AGP (0x00000000)