staging: fsl-mc/dpio: Fix incorrect casts

The DPIO driver incorrectly assumes virtual addresses are always
64b long, which causes compiler errors when building for a 32b
platform.

Fix this by using explicit casts to uintptr_t where necessary.

Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
index 1acff7ee7bb94e6fc18457e06c77606c58499a69..14ed2beb74323f1d73584f47cfee53ccd1af8b68 100644 (file)
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
+++ b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
@@ -192,7 +192,7 @@ irqreturn_t dpaa2_io_irq(struct dpaa2_io *obj)
                        u64 q64;
 
                        q64 = qbman_result_SCN_ctx(dq);
-                       ctx = (void *)q64;
+                       ctx = (void *)(uintptr_t)q64;
                        ctx->cb(ctx);
                } else {
                        pr_crit("fsl-mc-dpio: Unrecognised/ignored DQRR entry\n");
@@ -237,7 +237,7 @@ int dpaa2_io_service_register(struct dpaa2_io *d,
                return -ENODEV;
 
        ctx->dpio_id = d->dpio_desc.dpio_id;
-       ctx->qman64 = (u64)ctx;
+       ctx->qman64 = (u64)(uintptr_t)ctx;
        ctx->dpio_private = d;
        spin_lock_irqsave(&d->lock_notifications, irqflags);
        list_add(&ctx->node, &d->notifications);

diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c b/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
index 376e9ed0297adbe6f853df23bf63c3a6992ea299..f57c151cf1e870a44be4274102166fe0344d08ea 100644 (file)
--- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
+++ b/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
@@ -497,7 +497,7 @@ void qbman_pull_desc_set_storage(struct qbman_pull_desc *d,
                                 int stash)
 {
        /* save the virtual address */
-       d->rsp_addr_virt = (u64)storage;
+       d->rsp_addr_virt = (u64)(uintptr_t)storage;
 
        if (!storage) {
                d->verb &= ~(1 << QB_VDQCR_VERB_RLS_SHIFT);
@@ -590,7 +590,7 @@ int qbman_swp_pull(struct qbman_swp *s, struct qbman_pull_desc *d)
                atomic_inc(&s->vdq.available);
                return -EBUSY;
        }
-       s->vdq.storage = (void *)d->rsp_addr_virt;
+       s->vdq.storage = (void *)(uintptr_t)d->rsp_addr_virt;
        p = qbman_get_cmd(s, QBMAN_CENA_SWP_VDQCR);
        p->numf = d->numf;
        p->tok = QMAN_DQ_TOKEN_VALID;