Skip to contentSkip to conversation

uio: Kconfig improvements

PATCH In review Denis Cheng 3 participants 6 messages Feb 2, 2008 – Feb 3, 2008 Userspace I/O (UIO)

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 uio: Kconfig improvements

---
 drivers/uio/Kconfig |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/uio/Kconfig +5 -5
index b778ed7..d8ab7e6 100644
@@ -1,8 +1,6 @@
-menu "Userspace I/O"
-	depends on !S390
-
-config UIO
+menuconfig UIO
 	tristate "Userspace I/O drivers"
+	depends on !S390
 	default n
 	help
 	  Enable this to allow the userspace driver core code to be
@@ -13,6 +11,8 @@ config UIO
 
 	  If you don't know what to do here, say N.
 
+if UIO
+
 config UIO_CIF
 	tristate "generic Hilscher CIF Card driver"
 	depends on UIO && PCI
@@ -26,4 +26,4 @@ config UIO_CIF
 	  To compile this driver as a module, choose M here: the module
 	  will be called uio_cif.
 
-endmenu
+endif
Signature · 1 line
1.5.3.8
#1 lore raw

PATCH 2/3 uio: mark pci_device_id hilscher_pci_ids[] __devinitdata

---
 drivers/uio/uio_cif.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/uio/uio_cif.c +1 -1
index 838bae4..4a5a97e 100644
@@ -116,7 +116,7 @@ static void hilscher_pci_remove(struct pci_dev *dev)
 	kfree (info);
 }
 
-static struct pci_device_id hilscher_pci_ids[] = {
+static struct pci_device_id hilscher_pci_ids[] __devinitdata = {
 	{
 		.vendor =	PCI_VENDOR_ID_PLX,
 		.device =	PCI_DEVICE_ID_PLX_9030,
Signature · 1 line
1.5.3.8
#2 lore raw

PATCH 3/3 uio: vm_operations_struct ->nopage to ->fault method conversion

---
 drivers/uio/uio.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
drivers/uio/uio.c +8 -11
index cc246fa..47e0c32 100644
@@ -417,30 +417,27 @@ static void uio_vma_close(struct vm_area_struct *vma)
 	idev->vma_count--;
 }
 
-static struct page *uio_vma_nopage(struct vm_area_struct *vma,
-				   unsigned long address, int *type)
+static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
 	struct uio_device *idev = vma->vm_private_data;
-	struct page* page = NOPAGE_SIGBUS;
 
 	int mi = uio_find_mem_index(vma);
 	if (mi < 0)
-		return page;
+		return VM_FAULT_SIGBUS;
 
 	if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
-		page = virt_to_page(idev->info->mem[mi].addr);
+		vmf->page = virt_to_page(idev->info->mem[mi].addr);
 	else
-		page = vmalloc_to_page((void*)idev->info->mem[mi].addr);
-	get_page(page);
-	if (type)
-		*type = VM_FAULT_MINOR;
-	return page;
+		vmf->page = vmalloc_to_page((void *)idev->info->mem[mi].addr);
+	get_page(vmf->page);
+
+	return 0;
 }
 
 static struct vm_operations_struct uio_vm_ops = {
 	.open = uio_vma_open,
 	.close = uio_vma_close,
-	.nopage = uio_vma_nopage,
+	.fault = uio_vma_fault,
 };
 
 static int uio_mmap_physical(struct vm_area_struct *vma)
Signature · 1 line
1.5.3.8
#3 lore raw

Re: [PATCH 3/3] uio: vm_operations_struct ->nopage to ->fault method conversion

Quoted 1 line · Denis Cheng

Thanks, but already patched in -mm.

Quoted 47 lines
---
 drivers/uio/uio.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
drivers/uio/uio.c +8 -11
index cc246fa..47e0c32 100644
@@ -417,30 +417,27 @@ static void uio_vma_close(struct vm_area_struct *vma)
 	idev->vma_count--;
 }
 
-static struct page *uio_vma_nopage(struct vm_area_struct *vma,
-				   unsigned long address, int *type)
+static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
 	struct uio_device *idev = vma->vm_private_data;
-	struct page* page = NOPAGE_SIGBUS;
 
 	int mi = uio_find_mem_index(vma);
 	if (mi < 0)
-		return page;
+		return VM_FAULT_SIGBUS;
 
 	if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
-		page = virt_to_page(idev->info->mem[mi].addr);
+		vmf->page = virt_to_page(idev->info->mem[mi].addr);
 	else
-		page = vmalloc_to_page((void*)idev->info->mem[mi].addr);
-	get_page(page);
-	if (type)
-		*type = VM_FAULT_MINOR;
-	return page;
+		vmf->page = vmalloc_to_page((void *)idev->info->mem[mi].addr);
+	get_page(vmf->page);
+
+	return 0;
 }
 
 static struct vm_operations_struct uio_vm_ops = {
 	.open = uio_vma_open,
 	.close = uio_vma_close,
-	.nopage = uio_vma_nopage,
+	.fault = uio_vma_fault,
 };
 
 static int uio_mmap_physical(struct vm_area_struct *vma)
#4 lore raw

Re: [PATCH 2/3] uio: mark pci_device_id hilscher_pci_ids[] __devinitdata

In reply to Denis Cheng

Am Sat, 2 Feb 2008 17:51:36 +0800
schrieb Denis Cheng <[email protected]>:

Makes sense.

Quoted 1 line
Quoted 17 lines
---
 drivers/uio/uio_cif.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/uio/uio_cif.c +1 -1
index 838bae4..4a5a97e 100644
@@ -116,7 +116,7 @@ static void hilscher_pci_remove(struct pci_dev
 *dev) kfree (info);
 }
 
-static struct pci_device_id hilscher_pci_ids[] = {
+static struct pci_device_id hilscher_pci_ids[] __devinitdata = {
 	{
 		.vendor =	PCI_VENDOR_ID_PLX,
 		.device =	PCI_DEVICE_ID_PLX_9030,
#5 lore raw
In reply to Denis Cheng

Am Sat, 2 Feb 2008 17:51:35 +0800
schrieb Denis Cheng <[email protected]>:

Agreed.

Quoted 1 line
Quoted 34 lines
---
 drivers/uio/Kconfig |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/uio/Kconfig +4 -4
index b778ed7..d8ab7e6 100644
@@ -1,8 +1,6 @@
-menu "Userspace I/O"
-	depends on !S390
-
-config UIO
+menuconfig UIO
 	tristate "Userspace I/O drivers"
+	depends on !S390
 	default n
 	help
 	  Enable this to allow the userspace driver core code to be
@@ -13,6 +11,8 @@ config UIO
 
 	  If you don't know what to do here, say N.
 
+if UIO
+
 config UIO_CIF
 	tristate "generic Hilscher CIF Card driver"
 	depends on UIO && PCI
@@ -26,4 +26,4 @@ config UIO_CIF
 	  To compile this driver as a module, choose M here: the

module will be called uio_cif.

drivers/uio/Kconfig +1 -1
-endmenu
+endif