From patchwork Fri Dec 27 11:38:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 3411711 X-Patchwork-Delegate: dan.j.williams@gmail.com Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B858DC02DD for ; Fri, 27 Dec 2013 11:38:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B99702015D for ; Fri, 27 Dec 2013 11:38:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C356D20122 for ; Fri, 27 Dec 2013 11:38:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754445Ab3L0Lih (ORCPT ); Fri, 27 Dec 2013 06:38:37 -0500 Received: from top.free-electrons.com ([176.31.233.9]:59588 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754523Ab3L0Lig (ORCPT ); Fri, 27 Dec 2013 06:38:36 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 9B11C8A1; Fri, 27 Dec 2013 12:38:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (dam78-1-88-174-64-187.fbx.proxad.net [88.174.64.187]) by mail.free-electrons.com (Postfix) with ESMTPSA id 48928845; Fri, 27 Dec 2013 12:38:47 +0100 (CET) From: Thomas Petazzoni To: Vinod Koul , Dan Williams , dmaengine@vger.kernel.org Cc: Ezequiel Garcia , Gregory Clement , Lior Amsalem , linux-arm-kernel@lists.infradead.org, Andrew Lunn , Sebastian Hesselbarth , Jason Cooper Subject: [PATCH 1/3] dma: mv_xor: take channel spinlock in mv_xor_status() Date: Fri, 27 Dec 2013 12:38:32 +0100 Message-Id: <1388144314-1581-2-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1388144314-1581-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1388144314-1581-1-git-send-email-thomas.petazzoni@free-electrons.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mv_xor_status() function accesses the mv_xor_chan structure, but was not taking the corresponding spinlock. This patch fixes this problem. Signed-off-by: Thomas Petazzoni --- drivers/dma/mv_xor.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 53fb0c8..526ab27 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -701,14 +701,20 @@ static enum dma_status mv_xor_status(struct dma_chan *chan, struct mv_xor_chan *mv_chan = to_mv_xor_chan(chan); enum dma_status ret; + spin_lock_bh(&mv_chan->lock); + ret = dma_cookie_status(chan, cookie, txstate); if (ret == DMA_COMPLETE) { mv_xor_clean_completed_slots(mv_chan); + spin_unlock_bh(&mv_chan->lock); return ret; } - mv_xor_slot_cleanup(mv_chan); + __mv_xor_slot_cleanup(mv_chan); - return dma_cookie_status(chan, cookie, txstate); + ret = dma_cookie_status(chan, cookie, txstate); + spin_unlock_bh(&mv_chan->lock); + + return ret; } static void mv_dump_xor_regs(struct mv_xor_chan *chan)