diff options
Diffstat (limited to 'drivers/misc/ocxl/context.c')
| -rw-r--r-- | drivers/misc/ocxl/context.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index 95f74623113e..c10a940e3b38 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -86,7 +86,7 @@ out:  	return rc;  } -static int map_afu_irq(struct vm_area_struct *vma, unsigned long address, +static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address,  		u64 offset, struct ocxl_context *ctx)  {  	u64 trigger_addr; @@ -95,15 +95,15 @@ static int map_afu_irq(struct vm_area_struct *vma, unsigned long address,  	if (!trigger_addr)  		return VM_FAULT_SIGBUS; -	vm_insert_pfn(vma, address, trigger_addr >> PAGE_SHIFT); -	return VM_FAULT_NOPAGE; +	return vmf_insert_pfn(vma, address, trigger_addr >> PAGE_SHIFT);  } -static int map_pp_mmio(struct vm_area_struct *vma, unsigned long address, +static vm_fault_t map_pp_mmio(struct vm_area_struct *vma, unsigned long address,  		u64 offset, struct ocxl_context *ctx)  {  	u64 pp_mmio_addr;  	int pasid_off; +	vm_fault_t ret;  	if (offset >= ctx->afu->config.pp_mmio_stride)  		return VM_FAULT_SIGBUS; @@ -121,27 +121,27 @@ static int map_pp_mmio(struct vm_area_struct *vma, unsigned long address,  		pasid_off * ctx->afu->config.pp_mmio_stride +  		offset; -	vm_insert_pfn(vma, address, pp_mmio_addr >> PAGE_SHIFT); +	ret = vmf_insert_pfn(vma, address, pp_mmio_addr >> PAGE_SHIFT);  	mutex_unlock(&ctx->status_mutex); -	return VM_FAULT_NOPAGE; +	return ret;  } -static int ocxl_mmap_fault(struct vm_fault *vmf) +static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf)  {  	struct vm_area_struct *vma = vmf->vma;  	struct ocxl_context *ctx = vma->vm_file->private_data;  	u64 offset; -	int rc; +	vm_fault_t ret;  	offset = vmf->pgoff << PAGE_SHIFT;  	pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__,  		ctx->pasid, vmf->address, offset);  	if (offset < ctx->afu->irq_base_offset) -		rc = map_pp_mmio(vma, vmf->address, offset, ctx); +		ret = map_pp_mmio(vma, vmf->address, offset, ctx);  	else -		rc = map_afu_irq(vma, vmf->address, offset, ctx); -	return rc; +		ret = map_afu_irq(vma, vmf->address, offset, ctx); +	return ret;  }  static const struct vm_operations_struct ocxl_vmops = {  |