lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 143/252] dmaengine: idxd: fix mapping of portal size
    Date
    From: Dave Jiang <dave.jiang@intel.com>

    [ Upstream commit 8326be9f1c0bb498baf134878a8deb8a952e0135 ]

    Portal size is 4k. Current code is mapping all 4 portals in a single chunk.
    Restrict the mapped portal size to a single portal to ensure that submission
    only goes to the intended portal address.

    Fixes: c52ca478233c ("dmaengine: idxd: add configuration component of driver")
    Signed-off-by: Dave Jiang <dave.jiang@intel.com>
    Link: https://lore.kernel.org/r/160513342642.510187.16450549281618747065.stgit@djiang5-desk3.ch.intel.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/idxd/device.c | 2 +-
    drivers/dma/idxd/registers.h | 2 +-
    drivers/dma/idxd/submit.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c
    index c2beece445215..66e947627f569 100644
    --- a/drivers/dma/idxd/device.c
    +++ b/drivers/dma/idxd/device.c
    @@ -271,7 +271,7 @@ int idxd_wq_map_portal(struct idxd_wq *wq)
    resource_size_t start;

    start = pci_resource_start(pdev, IDXD_WQ_BAR);
    - start = start + wq->id * IDXD_PORTAL_SIZE;
    + start += idxd_get_wq_portal_full_offset(wq->id, IDXD_PORTAL_LIMITED);

    wq->dportal = devm_ioremap(dev, start, IDXD_PORTAL_SIZE);
    if (!wq->dportal)
    diff --git a/drivers/dma/idxd/registers.h b/drivers/dma/idxd/registers.h
    index aef5a902829ee..54390334c243a 100644
    --- a/drivers/dma/idxd/registers.h
    +++ b/drivers/dma/idxd/registers.h
    @@ -8,7 +8,7 @@

    #define IDXD_MMIO_BAR 0
    #define IDXD_WQ_BAR 2
    -#define IDXD_PORTAL_SIZE 0x4000
    +#define IDXD_PORTAL_SIZE PAGE_SIZE

    /* MMIO Device BAR0 Registers */
    #define IDXD_VER_OFFSET 0x00
    diff --git a/drivers/dma/idxd/submit.c b/drivers/dma/idxd/submit.c
    index 156a1ee233aa5..417048e3c42aa 100644
    --- a/drivers/dma/idxd/submit.c
    +++ b/drivers/dma/idxd/submit.c
    @@ -74,7 +74,7 @@ int idxd_submit_desc(struct idxd_wq *wq, struct idxd_desc *desc)
    if (idxd->state != IDXD_DEV_ENABLED)
    return -EIO;

    - portal = wq->dportal + idxd_get_wq_portal_offset(IDXD_PORTAL_UNLIMITED);
    + portal = wq->dportal;
    /*
    * The wmb() flushes writes to coherent DMA data before possibly
    * triggering a DMA read. The wmb() is necessary even on UP because
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-23 13:58    [W:4.636 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site