lkml.org 
[lkml]   [2018]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 093/161] staging: fsl-dpaa2/eth: Fix incorrect casts
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ioana Radulescu <ruxandra.radulescu@nxp.com>

    [ Upstream commit 75c583ab9709692a60871d4719006391cde8dc1d ]

    The DPAA2 Ethernet 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: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
    +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
    @@ -324,7 +324,7 @@ static int consume_frames(struct dpaa2_e
    }

    fd = dpaa2_dq_fd(dq);
    - fq = (struct dpaa2_eth_fq *)dpaa2_dq_fqd_ctx(dq);
    + fq = (struct dpaa2_eth_fq *)(uintptr_t)dpaa2_dq_fqd_ctx(dq);
    fq->stats.frames++;

    fq->consume(priv, ch, fd, &ch->napi, fq->flowid);
    @@ -1908,7 +1908,7 @@ static int setup_rx_flow(struct dpaa2_et
    queue.destination.id = fq->channel->dpcon_id;
    queue.destination.type = DPNI_DEST_DPCON;
    queue.destination.priority = 1;
    - queue.user_context = (u64)fq;
    + queue.user_context = (u64)(uintptr_t)fq;
    err = dpni_set_queue(priv->mc_io, 0, priv->mc_token,
    DPNI_QUEUE_RX, 0, fq->flowid,
    DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST,
    @@ -1960,7 +1960,7 @@ static int setup_tx_flow(struct dpaa2_et
    queue.destination.id = fq->channel->dpcon_id;
    queue.destination.type = DPNI_DEST_DPCON;
    queue.destination.priority = 0;
    - queue.user_context = (u64)fq;
    + queue.user_context = (u64)(uintptr_t)fq;
    err = dpni_set_queue(priv->mc_io, 0, priv->mc_token,
    DPNI_QUEUE_TX_CONFIRM, 0, fq->flowid,
    DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST,

    \
     
     \ /
      Last update: 2018-05-24 12:21    [W:5.881 / U:2.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site