From patchwork Wed May 23 09:56:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Esben Haabendal X-Patchwork-Id: 918916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZEBNru2s"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rSb40TThz9s0y for ; Wed, 23 May 2018 19:56:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932221AbeEWJ4b (ORCPT ); Wed, 23 May 2018 05:56:31 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35735 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932180AbeEWJ43 (ORCPT ); Wed, 23 May 2018 05:56:29 -0400 Received: by mail-wr0-f193.google.com with SMTP id i14-v6so25337104wre.2; Wed, 23 May 2018 02:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=15mYISuX5dOSefC6jChGApaI0uyBbxBWCwb15ZuQDLE=; b=ZEBNru2sFjNhXzAIUkvZyDaEyhT1HYr/oGNMq9SGAjq9Qr/ikTZjURwKurz7ajLpbQ zWmF8GHGFn7GPG6GA5qIvBBkVGQh9VDO2Rvimd30kb+AtLhHACe3s5FYTSJrUKOBhCrq nut4DqejzC8w3W1XxyH+2h3kN23CWSBEHWtXxMpDe/KQWSlLiuMuK9bLl+l7XdoQ/Qvs +BvZLWfPgx8BhPhgC7TMe7RwusF+C9isENRSlmtaCwD1YuqkehwCNjrt/7/tW7Hd11KQ Bd+BOZYDIEV38gJT9bVoyHyV5kRK0N/xwywwBn6UOf8IIf7kjnDbAcbzqInLXis8AdHt LaBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=15mYISuX5dOSefC6jChGApaI0uyBbxBWCwb15ZuQDLE=; b=bvQR5rnTCU7uSmKzw82L6M/CZZO/6fgrgJ7AlgIvgHo3S66UJ52D+FpT3GmQdlrlm0 /lUE5V5DYBoN5OMyv7WW2aQ7RCzKZt46G6eFaVqiAaszRYi5q6z+6lWdzj3GZBW2CfQR 21qZzlQVoKu6zqhS6+tW4TjoxiEAgTOqcgKiquWx+NlOgSy3NYeQju4oC6x9UO/a4TvC CZJgDlth/Li+GdCGueK4P12AKCd/kBHiEFFzzO/tyOT/060d4ASMas6AzJVieGdezUyc OO04TXcoJ23Co0sj6uoFvsJj/8S3oe9/T3xgV4pS4B9q0z7gkXrPX59ss4xxTc3w/WGJ 7tHw== X-Gm-Message-State: ALKqPwfObeuhG7gTkufHbW8Fku0KO8yogULUTLQYYBjn3qAOAmq3n686 NyFPBY5NpX9qFNXfeIcsD/x/dSCLhN0= X-Google-Smtp-Source: AB8JxZpUGvK3SvZ0A4m9iq3IihYe5oCwPXE7PYCvaSk5n5dad0EOJIHskM9i/oAxvNgZVVmjCkHcXA== X-Received: by 2002:a19:a692:: with SMTP id p140-v6mr1240749lfe.121.1527069388188; Wed, 23 May 2018 02:56:28 -0700 (PDT) Received: from localhost ([87.54.42.112]) by smtp.gmail.com with ESMTPSA id i9-v6sm3326204ljb.87.2018.05.23.02.56.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 02:56:27 -0700 (PDT) From: Esben Haabendal To: linux-i2c@vger.kernel.org Cc: Esben Haabendal , Wolfram Sang , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Phil Reid , Philipp Zabel , Lucas Stach , Clemens Gruber , Michail Georgios Etairidis , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] i2c: imx: Fix reinit_completion() use Date: Wed, 23 May 2018 11:56:20 +0200 Message-Id: <20180523095623.3347-2-esben.haabendal@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523095623.3347-1-esben.haabendal@gmail.com> References: <20180523095623.3347-1-esben.haabendal@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Esben Haabendal Make sure to call reinit_completion() before dma is started to avoid race condition where reinit_compleition() is called after complete() and before wait_for_completion_timeout(). Signed-off-by: Esben Haabendal Reviewed-by: Uwe Kleine-König --- drivers/i2c/busses/i2c-imx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index d7267dd9c7bf..6fca5e64cffb 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -377,6 +377,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx, goto err_desc; } + reinit_completion(&dma->cmd_complete); txdesc->callback = i2c_imx_dma_callback; txdesc->callback_param = i2c_imx; if (dma_submit_error(dmaengine_submit(txdesc))) { @@ -631,7 +632,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx, * The first byte must be transmitted by the CPU. */ imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR); - reinit_completion(&i2c_imx->dma->cmd_complete); time_left = wait_for_completion_timeout( &i2c_imx->dma->cmd_complete, msecs_to_jiffies(DMA_TIMEOUT)); @@ -690,7 +690,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, if (result) return result; - reinit_completion(&i2c_imx->dma->cmd_complete); time_left = wait_for_completion_timeout( &i2c_imx->dma->cmd_complete, msecs_to_jiffies(DMA_TIMEOUT));