Message ID | 20200820091541.220955447@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=nT5k=B6=vger.kernel.org=stable-owner@kernel.org> 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 EBFE4C433E1 for <stable@archiver.kernel.org>; Thu, 20 Aug 2020 12:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB8172078B for <stable@archiver.kernel.org>; Thu, 20 Aug 2020 12:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597926194; bh=z8abWbrQfvKrdo/2l/V5xVkWfRiUU1HPSskqPVkafqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NrLGmPWgqm/v+Wey0dtiKIPyanbvEzlGN2Qrb5vHPGHKFI7wHtk6LmQtB9z9KnFDH LBlO/7+38E9wt1vYj9HHESnT9oJ4cr+ilIour4+R+hp2OKDHhgqOMO52nLlxcjtEvG 7YV5YXuuvCXAnTZGg7JFW8/ZgZt6AXrkD/sFGc4Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729835AbgHTMXF (ORCPT <rfc822;stable@archiver.kernel.org>); Thu, 20 Aug 2020 08:23:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:37550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730157AbgHTJyq (ORCPT <rfc822;stable@vger.kernel.org>); Thu, 20 Aug 2020 05:54:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 DDB61207FB; Thu, 20 Aug 2020 09:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917286; bh=z8abWbrQfvKrdo/2l/V5xVkWfRiUU1HPSskqPVkafqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rP9jGJjkcfHAkUPFPWuaOFnJW2SlxTrqorPeDFSn7tqyRUKd2LWODRW9nMURmG3PG vnOQi43y4Pg5TMBs7QJIKBAWBbg2jn2PjrfXyrjaNHFJQWWD2+lNPM+JhzTt5Z/SSy efJTnU6CcHvQqH4Nk3HFykQWWZC1lSpVxWRUr5cs= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Wolfram Sang <wsa+renesas@sang-engineering.com>, =?utf-8?q?Niklas_S?= =?utf-8?b?w7ZkZXJsdW5k?= <niklas.soderlund+renesas@ragnatech.se>, Wolfram Sang <wsa@kernel.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.19 69/92] i2c: rcar: avoid race when unregistering slave Date: Thu, 20 Aug 2020 11:21:54 +0200 Message-Id: <20200820091541.220955447@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091537.490965042@linuxfoundation.org> References: <20200820091537.490965042@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 11d1977616858..dcdce18fc7062 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -861,12 +861,14 @@ static int rcar_unreg_slave(struct i2c_client *slave) WARN_ON(!priv->slave); - /* disable irqs and ensure none is running before clearing ptr */ + /* ensure no irq is running before clearing ptr */ + disable_irq(priv->irq); rcar_i2c_write(priv, ICSIER, 0); - rcar_i2c_write(priv, ICSCR, 0); + rcar_i2c_write(priv, ICSSR, 0); + enable_irq(priv->irq); + rcar_i2c_write(priv, ICSCR, SDBS); rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ - synchronize_irq(priv->irq); priv->slave = NULL; pm_runtime_put(rcar_i2c_priv_to_dev(priv));