uio_pdrv_genirq: Allow use with non-page-aligned memory resources

Similar to the changes made in 270579d95f82 ("uio_mf624: Align memory
regions to page size and set correct offsets"), this will allow
uio_pdrv_genirq devices to expose memory regions that is not page-aligned,
requiring the users to respect the offset sysfs attribute (as implemented
in libuio).

Signed-off-by: Esben Haabendal <esben@geanix.com>
Link: https://lore.kernel.org/r/20200701145659.3978-4-esben@geanix.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index ae319ef..11e11df 100644 (file)
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -187,8 +187,10 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
                }
 
                uiomem->memtype = UIO_MEM_PHYS;
-               uiomem->addr = r->start;
-               uiomem->size = resource_size(r);
+               uiomem->addr = r->start & PAGE_MASK;
+               uiomem->offs = r->start & ~PAGE_MASK;
+               uiomem->size = (uiomem->offs + resource_size(r)
+                               + PAGE_SIZE - 1) & PAGE_MASK;
                uiomem->name = r->name;
                ++uiomem;
        }