Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7294151d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

uio: provide vm access to UIO_MEM_PHYS maps 



This makes it possible to let gdb access mappings of the process that is
being debugged.

uio_mmap_logical was moved and uio_vm_ops renamed to group related code
and differentiate to new stuff.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a73633e

drivers/uio/uio.c

+17 −9
Original line number Original line Diff line number Diff line
@@ -630,12 +630,26 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	return 0;

	return 0;

}

}





static const struct vm_operations_struct uio_vm_ops = {

static const struct vm_operations_struct uio_logical_vm_ops = {

	.open = uio_vma_open,

	.open = uio_vma_open,

	.close = uio_vma_close,

	.close = uio_vma_close,

	.fault = uio_vma_fault,

	.fault = uio_vma_fault,

};

};





static int uio_mmap_logical(struct vm_area_struct *vma)

{

	vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;

	vma->vm_ops = &uio_logical_vm_ops;

	uio_vma_open(vma);

	return 0;

}



static const struct vm_operations_struct uio_physical_vm_ops = {

#ifdef CONFIG_HAVE_IOREMAP_PROT

	.access = generic_access_phys,

#endif

};



static int uio_mmap_physical(struct vm_area_struct *vma)

static int uio_mmap_physical(struct vm_area_struct *vma)

{

{

	struct uio_device *idev = vma->vm_private_data;

	struct uio_device *idev = vma->vm_private_data;
@@ -643,6 +657,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma) 
	if (mi < 0)

	if (mi < 0)

		return -EINVAL;

		return -EINVAL;





	vma->vm_ops = &uio_physical_vm_ops;



	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);





	return remap_pfn_range(vma,

	return remap_pfn_range(vma,
@@ -652,14 +668,6 @@ static int uio_mmap_physical(struct vm_area_struct *vma) 
			       vma->vm_page_prot);

			       vma->vm_page_prot);

}

}





static int uio_mmap_logical(struct vm_area_struct *vma)

{

	vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;

	vma->vm_ops = &uio_vm_ops;

	uio_vma_open(vma);

	return 0;

}



static int uio_mmap(struct file *filep, struct vm_area_struct *vma)

static int uio_mmap(struct file *filep, struct vm_area_struct *vma)

{

{

	struct uio_listener *listener = filep->private_data;

	struct uio_listener *listener = filep->private_data;