linux-stable.git/drivers/uio, branch linux-3.17.y

Merge 3.16-rc5 into char-misc-next

2014-07-13T22:26:47+00:00

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman

uio: uio_pruss: use struct device

2014-07-10T00:32:06+00:00

Get rid of the repeating &dev->dev constructs and prevent introducing
new ones.

Signed-off-by: Andre Heider 
Signed-off-by: Greg Kroah-Hartman

Revert "uio: fix vma io range check in mmap"

2014-06-17T23:07:08+00:00

This reverts commit ddb09754e6c7239e302c7b675df9bbd415f8de5d.

Linus objected to this originally, I can see why it might be needed, but
given that no one spoke up defending this patch, I'm going to revert it.

If you have hardware that requires this change, please speak up in the
future and defend the patch.

Reported-by: Linus Torvalds 
Cc: Bin Wang 
Cc: Nobuhiro Iwamatsu 
Cc: Norbert Ciosek 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

uio: fix vma io range check in mmap

2014-05-27T21:11:06+00:00

the vma range size is always page size aligned in mmap, while the
real io space range may not be page aligned, thus leading to range
check failure in the uio_mmap_physical().

for example, in a case of io range size "mem->size == 1KB", and we
have (vma->vm_end - vma->vm_start) == 4KB, due to "len" is aligned
to page size in do_mmap_pgoff().

now fix this issue by align mem->size to page size in the check.

Signed-off-by: Bin Wang 
Signed-off-by: Nobuhiro Iwamatsu 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

drivers: uio_dmem_genirq: Fix memory leak in uio_dmem_genirq_probe()

2014-05-27T21:11:06+00:00

When platform_get_irq() is failed after "priv" allocated,
it need to free "priv". But the label of bad0 doesn't try
to free about "priv". So this patch changes that lable to "bad1".
But "bad1" has pm_runtime_disable() call, this function should
be called when uio_register_device() is failed. So it is moved
into handling error for uio_register_device().

Signed-off-by: Daeseok Youn 
Signed-off-by: Hans J. Koch 
Signed-off-by: Greg Kroah-Hartman

uio: fix devm_request_irq usage

2013-12-20T16:49:17+00:00

Commit e6789cd3dfb553077606ccafeb05e0043f072481 (uio: Simplify uio error
path by using devres functions) converted uio to use devm_request_irq().
This introduced a change in behaviour since the IRQ is associated with
the parent device instead of the created UIO device. The IRQ will remain
active after uio_unregister_device() is called, and some drivers will
crash because of this. The patch fixes this.

Signed-off-by: Aaro Koskinen 
Cc: stable  # 3.13
Signed-off-by: Greg Kroah-Hartman

Merge 3.13-rc4 into char-misc-next

2013-12-17T00:11:28+00:00

We want these fixes in here.

uio: uio_mf624: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-09T06:41:48+00:00

Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.

Signed-off-by: Jingoo Han 
Signed-off-by: Greg Kroah-Hartman

uio: we cannot mmap unaligned page contents

2013-12-02T19:50:37+00:00

In commit 7314e613d5ff ("Fix a few incorrectly checked
[io_]remap_pfn_range() calls") the uio driver started more properly
checking the passed-in user mapping arguments against the size of the
actual uio driver data.

That in turn exposed that some driver authors apparently didn't realize
that mmap can only work on a page granularity, and had tried to use it
with smaller mappings, with the new size check catching that out.

So since it's not just the user mmap() arguments that can be confused,
make the uio mmap code also verify that the uio driver has the memory
allocated at page boundaries in order for mmap to work.  If the device
memory isn't properly aligned, we return

  [ENODEV]
    The fildes argument refers to a file whose type is not supported by mmap().

as per the open group documentation on mmap.

Reported-by: Holger Brunck 
Acked-by: Greg KH 
Signed-off-by: Linus Torvalds

drivers/uio/uio_pruss.c: use gen_pool_dma_alloc() to allocate sram memory

2013-11-13T03:09:23+00:00

Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.

Signed-off-by: Nicolin Chen 
Cc: "Hans J. Koch" 
Cc: Greg Kroah-Hartman 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds