Staging: b3dfg: Prepare b3dfg for submission upstream.
- Basically, update driver to run with 2.6.28
- Conversion from struct class_device to struct device.
- Conversion from .nopfn to .fault in vm_operations_struct.
- Update use of pci_resource_flags to check for IORESOURCE_SIZEALIGN.
- Update use of pci_dma_mapping_error.
- Minor code cleanup and integration with kernel build system.
Signed-off-by: Justin Bronder <jsbronder@brontes3d.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e1f4e19..c2accb8 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -101,5 +101,7 @@
source "drivers/staging/uc2322/Kconfig"
+source "drivers/staging/b3dfg/Kconfig"
+
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a7177d2..aa1c5c4 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -33,3 +33,4 @@
obj-$(CONFIG_POHMELFS) += pohmelfs/
obj-$(CONFIG_STLC45XX) += stlc45xx/
obj-$(CONFIG_USB_SERIAL_ATEN2011) += uc2322/
+obj-$(CONFIG_B3DFG) += b3dfg/
diff --git a/drivers/staging/b3dfg/Kconfig b/drivers/staging/b3dfg/Kconfig
new file mode 100644
index 0000000..5242310
--- /dev/null
+++ b/drivers/staging/b3dfg/Kconfig
@@ -0,0 +1,9 @@
+config B3DFG
+ tristate "Brontes 3d Frame Framegrabber"
+ default n
+ ---help---
+ This driver provides support for the Brontes 3d Framegrabber
+ PCI card.
+
+ To compile this driver as a module, choose M here. The module
+ will be called b3dfg.
diff --git a/drivers/staging/b3dfg/Makefile b/drivers/staging/b3dfg/Makefile
new file mode 100644
index 0000000..91f439f
--- /dev/null
+++ b/drivers/staging/b3dfg/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_B3DFG) += b3dfg.o
diff --git a/drivers/staging/b3dfg/TODO b/drivers/staging/b3dfg/TODO
new file mode 100644
index 0000000..f5a9298
--- /dev/null
+++ b/drivers/staging/b3dfg/TODO
@@ -0,0 +1,4 @@
+
+ - queue/wait buffer presents filltime results for each frame?
+ - counting of dropped frames
+ - review endianness
diff --git a/drivers/staging/b3dfg/b3dfg.c b/drivers/staging/b3dfg/b3dfg.c
index 9c16208..0348072 100644
--- a/drivers/staging/b3dfg/b3dfg.c
+++ b/drivers/staging/b3dfg/b3dfg.c
@@ -2,7 +2,9 @@
* Brontes PCI frame grabber driver
*
* Copyright (C) 2008 3M Company
- * Contact: Daniel Drake <ddrake@brontes3d.com>
+ * Contact: Justin Bronder <jsbronder@brontes3d.com>
+ * Original Authors: Daniel Drake <ddrake@brontes3d.com>
+ * Duane Griffin <duaneg@dghda.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,14 +36,7 @@
#include <linux/wait.h>
#include <linux/mm.h>
#include <linux/version.h>
-
-#include <asm/uaccess.h>
-
-/* TODO:
- * queue/wait buffer presents filltime results for each frame?
- * counting of dropped frames
- * review endianness
- */
+#include <linux/uaccess.h>
static unsigned int b3dfg_nbuf = 2;
@@ -119,7 +114,7 @@
/* no protection needed: all finalized at initialization time */
struct pci_dev *pdev;
struct cdev chardev;
- struct class_device *classdev;
+ struct device *dev;
void __iomem *regs;
unsigned int frame_size;
@@ -164,10 +159,6 @@
static const struct pci_device_id b3dfg_ids[] __devinitdata = {
{ PCI_DEVICE(0x0b3d, 0x0001) },
-
- /* FIXME: remove this ID once all boards have been moved to 0xb3d.
- * Eureka's vendor ID that we borrowed before we bought our own. */
- { PCI_DEVICE(0x1901, 0x0001) },
{ },
};
@@ -213,15 +204,17 @@
frm_addr = buf->frame[frame];
frm_addr_dma = pci_map_single(fgdev->pdev, frm_addr,
- frm_size, PCI_DMA_FROMDEVICE);
- if (pci_dma_mapping_error(frm_addr_dma))
+ frm_size, PCI_DMA_FROMDEVICE);
+ if (pci_dma_mapping_error(fgdev->pdev, frm_addr_dma))
return -ENOMEM;
fgdev->cur_dma_frame_addr = frm_addr_dma;
fgdev->cur_dma_frame_idx = frame;
- b3dfg_write32(fgdev, B3D_REG_EC220_DMA_ADDR, cpu_to_le32(frm_addr_dma));
- b3dfg_write32(fgdev, B3D_REG_EC220_TRF_SIZE, cpu_to_le32(frm_size >> 2));
+ b3dfg_write32(fgdev, B3D_REG_EC220_DMA_ADDR,
+ cpu_to_le32(frm_addr_dma));
+ b3dfg_write32(fgdev, B3D_REG_EC220_TRF_SIZE,
+ cpu_to_le32(frm_size >> 2));
b3dfg_write32(fgdev, B3D_REG_EC220_DMA_STS, 0xf);
return 0;
@@ -248,6 +241,7 @@
spin_lock_irqsave(&fgdev->buffer_lock, flags);
if (bufidx < 0 || bufidx >= b3dfg_nbuf) {
+ dev_dbg(dev, "Invalid buffer index, %d\n", bufidx);
r = -ENOENT;
goto out;
}
@@ -432,11 +426,11 @@
}
/* mmap page fault handler */
-static unsigned long b3dfg_vma_nopfn(struct vm_area_struct *vma,
- unsigned long address)
+static int b3dfg_vma_fault(struct vm_area_struct *vma,
+ struct vm_fault *vmf)
{
struct b3dfg_dev *fgdev = vma->vm_file->private_data;
- unsigned long off = address - vma->vm_start;
+ unsigned long off = vmf->pgoff << PAGE_SHIFT;
unsigned int frame_size = fgdev->frame_size;
unsigned int buf_size = frame_size * B3DFG_FRAMES_PER_BUFFER;
unsigned char *addr;
@@ -452,17 +446,17 @@
unsigned int frm_off = buf_off % frame_size;
if (unlikely(buf_idx >= b3dfg_nbuf))
- return NOPFN_SIGBUS;
+ return VM_FAULT_SIGBUS;
addr = fgdev->buffers[buf_idx].frame[frm_idx] + frm_off;
- vm_insert_pfn(vma, vma->vm_start + off,
- virt_to_phys(addr) >> PAGE_SHIFT);
+ vm_insert_pfn(vma, (unsigned long)vmf->virtual_address,
+ virt_to_phys(addr) >> PAGE_SHIFT);
- return NOPFN_REFAULT;
+ return VM_FAULT_NOPAGE;
}
static struct vm_operations_struct b3dfg_vm_ops = {
- .nopfn = b3dfg_vma_nopfn,
+ .fault = b3dfg_vma_fault,
};
static int get_wand_status(struct b3dfg_dev *fgdev, int __user *arg)
@@ -601,12 +595,12 @@
* broken wire and is momentarily losing contact.
*
* TODO: At the moment if you plug in the cable then enable transmission
- * the hardware will raise a couple of spurious interrupts, so
- * just ignore them for now.
+ * the hardware will raise a couple of spurious interrupts, so
+ * just ignore them for now.
*
- * Once the hardware is fixed we should complain and treat it as an
- * unplug. Or at least track how frequently it is happening and do
- * so if too many come in.
+ * Once the hardware is fixed we should complain and treat it as an
+ * unplug. Or at least track how frequently it is happening and do
+ * so if too many come in.
*/
if (cstate) {
dev_warn(dev, "ignoring unexpected plug event\n");
@@ -801,10 +795,6 @@
return __put_user(fgdev->frame_size, (int __user *) arg);
case B3DFG_IOCGWANDSTAT:
return get_wand_status(fgdev, (int __user *) arg);
- case B3DFG_IOCTNUMBUFS:
-
- /* TODO: Remove once userspace stops using this. */
- return 0;
case B3DFG_IOCTTRANS:
return set_transmission(fgdev, (int) arg);
case B3DFG_IOCTQUEUEBUF:
@@ -970,12 +960,16 @@
goto err_release_minor;
}
- fgdev->classdev = class_device_create(b3dfg_class, NULL, devno,
- &pdev->dev, DRIVER_NAME "%d",
- minor);
- if (IS_ERR(fgdev->classdev)) {
- dev_err(&pdev->dev, "cannot create class device\n");
- r = PTR_ERR(fgdev->classdev);
+ fgdev->dev = device_create(
+ b3dfg_class,
+ &pdev->dev,
+ devno,
+ dev_get_drvdata(&pdev->dev),
+ DRIVER_NAME "%d", minor);
+
+ if (IS_ERR(fgdev->dev)) {
+ dev_err(&pdev->dev, "cannot create device\n");
+ r = PTR_ERR(fgdev->dev);
goto err_del_cdev;
}
@@ -992,12 +986,12 @@
goto err_disable;
}
- if (pci_resource_flags(pdev, B3DFG_BAR_REGS) != IORESOURCE_MEM) {
+ if (pci_resource_flags(pdev, B3DFG_BAR_REGS)
+ != (IORESOURCE_MEM | IORESOURCE_SIZEALIGN)) {
dev_err(&pdev->dev, "invalid resource flags\n");
r = -EIO;
goto err_disable;
}
-
r = pci_request_regions(pdev, DRIVER_NAME);
if (r) {
dev_err(&pdev->dev, "cannot obtain PCI resources\n");
@@ -1045,7 +1039,7 @@
err_disable:
pci_disable_device(pdev);
err_dev_unreg:
- class_device_unregister(fgdev->classdev);
+ device_destroy(b3dfg_class, devno);
err_del_cdev:
cdev_del(&fgdev->chardev);
err_release_minor:
@@ -1066,7 +1060,7 @@
iounmap(fgdev->regs);
pci_release_regions(pdev);
pci_disable_device(pdev);
- class_device_unregister(fgdev->classdev);
+ device_destroy(b3dfg_class, MKDEV(MAJOR(b3dfg_devt), minor));
cdev_del(&fgdev->chardev);
free_all_frame_buffers(fgdev);
kfree(fgdev);
@@ -1086,7 +1080,7 @@
if (b3dfg_nbuf < 2) {
printk(KERN_ERR DRIVER_NAME
- ": buffer_count is out of range (must be >= 2)");
+ ": buffer_count is out of range (must be >= 2)");
return -EINVAL;
}