lkml.org 
[lkml]   [2019]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 078/209] rpmsg: glink: smem: Support rx peak for size less than 4 bytes
    Date
    From: Arun Kumar Neelakantam <aneela@codeaurora.org>

    [ Upstream commit 928002a5e9dab2ddc1a0fe3e00739e89be30dc6b ]

    The current rx peak function fails to read the data if size is
    less than 4bytes.

    Use memcpy_fromio to support data reads of size less than 4 bytes.

    Cc: stable@vger.kernel.org
    Fixes: f0beb4ba9b18 ("rpmsg: glink: Remove chunk size word align warning")
    Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/rpmsg/qcom_glink_smem.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c
    index 2b5cf27909540..7b6544348a3e0 100644
    --- a/drivers/rpmsg/qcom_glink_smem.c
    +++ b/drivers/rpmsg/qcom_glink_smem.c
    @@ -89,15 +89,11 @@ static void glink_smem_rx_peak(struct qcom_glink_pipe *np,
    tail -= pipe->native.length;

    len = min_t(size_t, count, pipe->native.length - tail);
    - if (len) {
    - __ioread32_copy(data, pipe->fifo + tail,
    - len / sizeof(u32));
    - }
    + if (len)
    + memcpy_fromio(data, pipe->fifo + tail, len);

    - if (len != count) {
    - __ioread32_copy(data + len, pipe->fifo,
    - (count - len) / sizeof(u32));
    - }
    + if (len != count)
    + memcpy_fromio(data + len, pipe->fifo, (count - len));
    }

    static void glink_smem_rx_advance(struct qcom_glink_pipe *np,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-13 03:24    [W:4.825 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site