lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 174/667] powerpc/powernv/vas: Assign real address to rx_fifo in vas_rx_win_attr
    Date
    From: Haren Myneni <haren@linux.ibm.com>

    [ Upstream commit c127d130f6d59fa81701f6b04023cf7cd1972fb3 ]

    In init_winctx_regs(), __pa() is called on winctx->rx_fifo and this
    function is called to initialize registers for receive and fault
    windows. But the real address is passed in winctx->rx_fifo for
    receive windows and the virtual address for fault windows which
    causes errors with DEBUG_VIRTUAL enabled. Fixes this issue by
    assigning only real address to rx_fifo in vas_rx_win_attr struct
    for both receive and fault windows.

    Reported-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Haren Myneni <haren@linux.ibm.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/338e958c7ab8f3b266fa794a1f80f99b9671829e.camel@linux.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/include/asm/vas.h | 2 +-
    arch/powerpc/platforms/powernv/vas-fault.c | 2 +-
    arch/powerpc/platforms/powernv/vas-window.c | 4 ++--
    arch/powerpc/platforms/powernv/vas.h | 2 +-
    drivers/crypto/nx/nx-common-powernv.c | 2 +-
    5 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/powerpc/include/asm/vas.h b/arch/powerpc/include/asm/vas.h
    index 57573d9c1e09..56834a8a1465 100644
    --- a/arch/powerpc/include/asm/vas.h
    +++ b/arch/powerpc/include/asm/vas.h
    @@ -112,7 +112,7 @@ static inline void vas_user_win_add_mm_context(struct vas_user_win_ref *ref)
    * Receive window attributes specified by the (in-kernel) owner of window.
    */
    struct vas_rx_win_attr {
    - void *rx_fifo;
    + u64 rx_fifo;
    int rx_fifo_size;
    int wcreds_max;

    diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c
    index a7aabc18039e..c1bfad56447d 100644
    --- a/arch/powerpc/platforms/powernv/vas-fault.c
    +++ b/arch/powerpc/platforms/powernv/vas-fault.c
    @@ -216,7 +216,7 @@ int vas_setup_fault_window(struct vas_instance *vinst)
    vas_init_rx_win_attr(&attr, VAS_COP_TYPE_FAULT);

    attr.rx_fifo_size = vinst->fault_fifo_size;
    - attr.rx_fifo = vinst->fault_fifo;
    + attr.rx_fifo = __pa(vinst->fault_fifo);

    /*
    * Max creds is based on number of CRBs can fit in the FIFO.
    diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c
    index 0f8d39fbf2b2..0072682531d8 100644
    --- a/arch/powerpc/platforms/powernv/vas-window.c
    +++ b/arch/powerpc/platforms/powernv/vas-window.c
    @@ -404,7 +404,7 @@ static void init_winctx_regs(struct pnv_vas_window *window,
    *
    * See also: Design note in function header.
    */
    - val = __pa(winctx->rx_fifo);
    + val = winctx->rx_fifo;
    val = SET_FIELD(VAS_PAGE_MIGRATION_SELECT, val, 0);
    write_hvwc_reg(window, VREG(LFIFO_BAR), val);

    @@ -739,7 +739,7 @@ static void init_winctx_for_rxwin(struct pnv_vas_window *rxwin,
    */
    winctx->fifo_disable = true;
    winctx->intr_disable = true;
    - winctx->rx_fifo = NULL;
    + winctx->rx_fifo = 0;
    }

    winctx->lnotify_lpid = rxattr->lnotify_lpid;
    diff --git a/arch/powerpc/platforms/powernv/vas.h b/arch/powerpc/platforms/powernv/vas.h
    index 8bb08e395de0..08d9d3d5a22b 100644
    --- a/arch/powerpc/platforms/powernv/vas.h
    +++ b/arch/powerpc/platforms/powernv/vas.h
    @@ -376,7 +376,7 @@ struct pnv_vas_window {
    * is a container for the register fields in the window context.
    */
    struct vas_winctx {
    - void *rx_fifo;
    + u64 rx_fifo;
    int rx_fifo_size;
    int wcreds_max;
    int rsvd_txbuf_count;
    diff --git a/drivers/crypto/nx/nx-common-powernv.c b/drivers/crypto/nx/nx-common-powernv.c
    index 32a036ada5d0..f418817c0f43 100644
    --- a/drivers/crypto/nx/nx-common-powernv.c
    +++ b/drivers/crypto/nx/nx-common-powernv.c
    @@ -827,7 +827,7 @@ static int __init vas_cfg_coproc_info(struct device_node *dn, int chip_id,
    goto err_out;

    vas_init_rx_win_attr(&rxattr, coproc->ct);
    - rxattr.rx_fifo = (void *)rx_fifo;
    + rxattr.rx_fifo = rx_fifo;
    rxattr.rx_fifo_size = fifo_size;
    rxattr.lnotify_lpid = lpid;
    rxattr.lnotify_pid = pid;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 20:40    [W:2.231 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site