From patchwork Fri Jan 24 09:28:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233226 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBE3FC2D0DB for ; Fri, 24 Jan 2020 09:50:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F2ED20718 for ; Fri, 24 Jan 2020 09:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859417; bh=yIv3zvrWLDMR4xueYpu26orbFeueFVTq0Dg0Uv4aIrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bclwFpEbyN4Tczt1UlLXRdKXP9x8Cy02CuMmZHfL8HNtWMW6uy3FOlCIJfnytJNci NTJuH+9+hn6xSfXcr40/ty8o0OuzNYVrectWW7Jxhhw2bdZja9J5hz3lzc3D0c+AQG fn7fDZfmMG+bzLrD2arOe7OtMREyCWNCv05gUpI0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387617AbgAXJuR (ORCPT ); Fri, 24 Jan 2020 04:50:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:50886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387908AbgAXJuN (ORCPT ); Fri, 24 Jan 2020 04:50:13 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 723EF20718; Fri, 24 Jan 2020 09:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859413; bh=yIv3zvrWLDMR4xueYpu26orbFeueFVTq0Dg0Uv4aIrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MYakQU9r2XVblPwJc9oKK80H0kXj+wUvCDqOu3B6r3tJAUgELRH5yUp+SxUJwnE2D /almIKXEm/N4OMkcVTVAKx5WuRCb1Gwbsn1rGoopEmThj9ZDMay2ZB9s9tH5VxbCWN O3g2GM5OL5zxNccPaKihSajzmHfbqohmA2B3jNjE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John David Anglin , Robin Murphy , Thomas Petazzoni , Vinod Koul , Sasha Levin Subject: [PATCH 4.14 112/343] dmaengine: mv_xor: Use correct device for DMA API Date: Fri, 24 Jan 2020 10:28:50 +0100 Message-Id: <20200124092934.764865076@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Robin Murphy [ Upstream commit 3e5daee5ecf314da33a890fabaa2404244cd2a36 ] Using dma_dev->dev for mappings before it's assigned with the correct device is unlikely to work as expected, and with future dma-direct changes, passing a NULL device may end up crashing entirely. I don't know enough about this hardware or the mv_xor_prep_dma_interrupt() operation to implement the appropriate error-handling logic that would have revealed those dma_map_single() calls failing on arm64 for as long as the driver has been enabled there, but moving the assignment earlier will at least make the current code operate as intended. Fixes: 22843545b200 ("dma: mv_xor: Add support for DMA_INTERRUPT") Reported-by: John David Anglin Tested-by: John David Anglin Signed-off-by: Robin Murphy Acked-by: Thomas Petazzoni Tested-by: Thomas Petazzoni Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/mv_xor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 1993889003fd1..1c57577f49fea 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -1059,6 +1059,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev, mv_chan->op_in_desc = XOR_MODE_IN_DESC; dma_dev = &mv_chan->dmadev; + dma_dev->dev = &pdev->dev; mv_chan->xordev = xordev; /* @@ -1091,7 +1092,6 @@ mv_xor_channel_add(struct mv_xor_device *xordev, dma_dev->device_free_chan_resources = mv_xor_free_chan_resources; dma_dev->device_tx_status = mv_xor_status; dma_dev->device_issue_pending = mv_xor_issue_pending; - dma_dev->dev = &pdev->dev; /* set prep routines based on capability */ if (dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask))