From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00, 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 032F4C43461 for ; Wed, 9 Sep 2020 04:13:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB8F621D42 for ; Wed, 9 Sep 2020 04:13:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725821AbgIIENM (ORCPT ); Wed, 9 Sep 2020 00:13:12 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:11286 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725767AbgIIENL (ORCPT ); Wed, 9 Sep 2020 00:13:11 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 861915EBC3146D599CB2; Wed, 9 Sep 2020 12:13:09 +0800 (CST) Received: from SWX921481.china.huawei.com (10.126.200.172) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 12:12:58 +0800 From: Barry Song To: , , CC: , Barry Song , "Gregory CLEMENT" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Manivannan Sadhasivam , Akash Asthana , Mukesh Savaliya , Andy Gross , Bjorn Andersson Subject: [PATCH] i2c: busses: replace spin_lock_irqsave by spin_lock in hard IRQ Date: Wed, 9 Sep 2020 16:10:01 +1200 Message-ID: <20200909041001.5612-1-song.bao.hua@hisilicon.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.200.172] X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The code has been in a irq-disabled context since it is hard IRQ. There is no necessity to do it again. Cc: Gregory CLEMENT Cc: "Andreas Färber" Cc: Manivannan Sadhasivam Cc: Akash Asthana Cc: Mukesh Savaliya Cc: Andy Gross Cc: Bjorn Andersson Signed-off-by: Barry Song --- drivers/i2c/busses/i2c-mv64xxx.c | 5 ++--- drivers/i2c/busses/i2c-owl.c | 5 ++--- drivers/i2c/busses/i2c-qcom-geni.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 8d9d4ffdcd24..e0e45fc19b8f 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -496,11 +496,10 @@ static irqreturn_t mv64xxx_i2c_intr(int irq, void *dev_id) { struct mv64xxx_i2c_data *drv_data = dev_id; - unsigned long flags; u32 status; irqreturn_t rc = IRQ_NONE; - spin_lock_irqsave(&drv_data->lock, flags); + spin_lock(&drv_data->lock); if (drv_data->offload_enabled) rc = mv64xxx_i2c_intr_offload(drv_data); @@ -517,7 +516,7 @@ mv64xxx_i2c_intr(int irq, void *dev_id) rc = IRQ_HANDLED; } - spin_unlock_irqrestore(&drv_data->lock, flags); + spin_unlock(&drv_data->lock); return rc; } diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c index 672f1f239bd6..618d3013d0b6 100644 --- a/drivers/i2c/busses/i2c-owl.c +++ b/drivers/i2c/busses/i2c-owl.c @@ -165,10 +165,9 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) { struct owl_i2c_dev *i2c_dev = _dev; struct i2c_msg *msg = i2c_dev->msg; - unsigned long flags; unsigned int stat, fifostat; - spin_lock_irqsave(&i2c_dev->lock, flags); + spin_lock(&i2c_dev->lock); i2c_dev->err = 0; @@ -208,7 +207,7 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) OWL_I2C_STAT_IRQP, true); complete_all(&i2c_dev->msg_complete); - spin_unlock_irqrestore(&i2c_dev->lock, flags); + spin_unlock(&i2c_dev->lock); return IRQ_HANDLED; } diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index dead5db3315a..8b4c35f47a70 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -210,9 +210,8 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev) u32 dma; u32 val; struct i2c_msg *cur; - unsigned long flags; - spin_lock_irqsave(&gi2c->lock, flags); + spin_lock(&gi2c->lock); m_stat = readl_relaxed(base + SE_GENI_M_IRQ_STATUS); rx_st = readl_relaxed(base + SE_GENI_RX_FIFO_STATUS); dm_tx_st = readl_relaxed(base + SE_DMA_TX_IRQ_STAT); @@ -294,7 +293,7 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev) dm_rx_st & RX_DMA_DONE || dm_rx_st & RX_RESET_DONE) complete(&gi2c->done); - spin_unlock_irqrestore(&gi2c->lock, flags); + spin_unlock(&gi2c->lock); return IRQ_HANDLED; } -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-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 566C6C433E2 for ; Wed, 9 Sep 2020 04:15:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CCC6521D40 for ; Wed, 9 Sep 2020 04:15:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CLO6EvMj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCC6521D40 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ExEb+bSgdl0/e95DwQCZU1KrsxarTPLYxFYi/dSdBJU=; b=CLO6EvMjqIXy2SU6UImKqHfSA/ Z6ari4RvuNdo8yF5VaNzAEhNiBWCYcHGuQPjgm538ygJz2IcMBDT3n5JDsjMDTXCtZbsH/u/YJA6P psDeB7I3gDK1JqiugIKlNitS+P4/TNOEKVbH8bPxBbqZmkYks8GxuE1gHP16Z4ArfxclUsCu0wWP/ +J2WGmNHpWNxSycztIamIJeyzTjWEP4JHEAYbREy9J7tC6VZPSUggUrNsQGBQlnaZOC1iNzUTQJB+ AS8KRyqY4kYN6FSTGK3P4QBE5O/tufWfB2Haqnk53YFXHr4ZuI1T4JSaL+Pks8BsuRtbEja8nMZpE 725uNRLQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFrU5-0005oA-22; Wed, 09 Sep 2020 04:13:25 +0000 Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFrTx-0005ng-Pi for linux-arm-kernel@lists.infradead.org; Wed, 09 Sep 2020 04:13:23 +0000 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 861915EBC3146D599CB2; Wed, 9 Sep 2020 12:13:09 +0800 (CST) Received: from SWX921481.china.huawei.com (10.126.200.172) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 12:12:58 +0800 From: Barry Song To: , , Subject: [PATCH] i2c: busses: replace spin_lock_irqsave by spin_lock in hard IRQ Date: Wed, 9 Sep 2020 16:10:01 +1200 Message-ID: <20200909041001.5612-1-song.bao.hua@hisilicon.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.126.200.172] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_001322_258439_B7AF8B3E X-CRM114-Status: UNSURE ( 8.43 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Barry Song , Gregory CLEMENT , linuxarm@huawei.com, Bjorn Andersson , Akash Asthana , Andy Gross , Manivannan Sadhasivam , Mukesh Savaliya , =?UTF-8?q?Andreas=20F=C3=A4rber?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlIGNvZGUgaGFzIGJlZW4gaW4gYSBpcnEtZGlzYWJsZWQgY29udGV4dCBzaW5jZSBpdCBpcyBo YXJkIElSUS4gVGhlcmUKaXMgbm8gbmVjZXNzaXR5IHRvIGRvIGl0IGFnYWluLgoKQ2M6IEdyZWdv cnkgQ0xFTUVOVCA8Z3JlZ29yeS5jbGVtZW50QGJvb3RsaW4uY29tPgpDYzogIkFuZHJlYXMgRsOk cmJlciIgPGFmYWVyYmVyQHN1c2UuZGU+CkNjOiBNYW5pdmFubmFuIFNhZGhhc2l2YW0gPG1hbml2 YW5uYW4uc2FkaGFzaXZhbUBsaW5hcm8ub3JnPgpDYzogQWthc2ggQXN0aGFuYSA8YWthc2hhc3RA Y29kZWF1cm9yYS5vcmc+CkNjOiBNdWtlc2ggU2F2YWxpeWEgPG1zYXZhbGl5QGNvZGVhdXJvcmEu b3JnPgpDYzogQW5keSBHcm9zcyA8YWdyb3NzQGtlcm5lbC5vcmc+CkNjOiBCam9ybiBBbmRlcnNz b24gPGJqb3JuLmFuZGVyc3NvbkBsaW5hcm8ub3JnPgpTaWduZWQtb2ZmLWJ5OiBCYXJyeSBTb25n IDxzb25nLmJhby5odWFAaGlzaWxpY29uLmNvbT4KLS0tCiBkcml2ZXJzL2kyYy9idXNzZXMvaTJj LW12NjR4eHguYyAgIHwgNSArKy0tLQogZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1vd2wuYyAgICAg ICB8IDUgKystLS0KIGRyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtcWNvbS1nZW5pLmMgfCA1ICsrLS0t CiAzIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2kyYy9idXNzZXMvaTJjLW12NjR4eHguYyBiL2RyaXZlcnMvaTJjL2J1 c3Nlcy9pMmMtbXY2NHh4eC5jCmluZGV4IDhkOWQ0ZmZkY2QyNC4uZTBlNDVmYzE5YjhmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2kyYy9idXNzZXMvaTJjLW12NjR4eHguYworKysgYi9kcml2ZXJzL2ky Yy9idXNzZXMvaTJjLW12NjR4eHguYwpAQCAtNDk2LDExICs0OTYsMTAgQEAgc3RhdGljIGlycXJl dHVybl90CiBtdjY0eHh4X2kyY19pbnRyKGludCBpcnEsIHZvaWQgKmRldl9pZCkKIHsKIAlzdHJ1 Y3QgbXY2NHh4eF9pMmNfZGF0YQkqZHJ2X2RhdGEgPSBkZXZfaWQ7Ci0JdW5zaWduZWQgbG9uZwlm bGFnczsKIAl1MzIJCXN0YXR1czsKIAlpcnFyZXR1cm5fdAlyYyA9IElSUV9OT05FOwogCi0Jc3Bp bl9sb2NrX2lycXNhdmUoJmRydl9kYXRhLT5sb2NrLCBmbGFncyk7CisJc3Bpbl9sb2NrKCZkcnZf ZGF0YS0+bG9jayk7CiAKIAlpZiAoZHJ2X2RhdGEtPm9mZmxvYWRfZW5hYmxlZCkKIAkJcmMgPSBt djY0eHh4X2kyY19pbnRyX29mZmxvYWQoZHJ2X2RhdGEpOwpAQCAtNTE3LDcgKzUxNiw3IEBAIG12 NjR4eHhfaTJjX2ludHIoaW50IGlycSwgdm9pZCAqZGV2X2lkKQogCiAJCXJjID0gSVJRX0hBTkRM RUQ7CiAJfQotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRydl9kYXRhLT5sb2NrLCBmbGFncyk7 CisJc3Bpbl91bmxvY2soJmRydl9kYXRhLT5sb2NrKTsKIAogCXJldHVybiByYzsKIH0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtb3dsLmMgYi9kcml2ZXJzL2kyYy9idXNzZXMv aTJjLW93bC5jCmluZGV4IDY3MmYxZjIzOWJkNi4uNjE4ZDMwMTNkMGI2IDEwMDY0NAotLS0gYS9k cml2ZXJzL2kyYy9idXNzZXMvaTJjLW93bC5jCisrKyBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMt b3dsLmMKQEAgLTE2NSwxMCArMTY1LDkgQEAgc3RhdGljIGlycXJldHVybl90IG93bF9pMmNfaW50 ZXJydXB0KGludCBpcnEsIHZvaWQgKl9kZXYpCiB7CiAJc3RydWN0IG93bF9pMmNfZGV2ICppMmNf ZGV2ID0gX2RldjsKIAlzdHJ1Y3QgaTJjX21zZyAqbXNnID0gaTJjX2Rldi0+bXNnOwotCXVuc2ln bmVkIGxvbmcgZmxhZ3M7CiAJdW5zaWduZWQgaW50IHN0YXQsIGZpZm9zdGF0OwogCi0Jc3Bpbl9s b2NrX2lycXNhdmUoJmkyY19kZXYtPmxvY2ssIGZsYWdzKTsKKwlzcGluX2xvY2soJmkyY19kZXYt PmxvY2spOwogCiAJaTJjX2Rldi0+ZXJyID0gMDsKIApAQCAtMjA4LDcgKzIwNyw3IEBAIHN0YXRp YyBpcnFyZXR1cm5fdCBvd2xfaTJjX2ludGVycnVwdChpbnQgaXJxLCB2b2lkICpfZGV2KQogCQkJ ICAgT1dMX0kyQ19TVEFUX0lSUVAsIHRydWUpOwogCiAJY29tcGxldGVfYWxsKCZpMmNfZGV2LT5t c2dfY29tcGxldGUpOwotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmkyY19kZXYtPmxvY2ssIGZs YWdzKTsKKwlzcGluX3VubG9jaygmaTJjX2Rldi0+bG9jayk7CiAKIAlyZXR1cm4gSVJRX0hBTkRM RUQ7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2kyYy9idXNzZXMvaTJjLXFjb20tZ2VuaS5jIGIv ZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1xY29tLWdlbmkuYwppbmRleCBkZWFkNWRiMzMxNWEuLjhi NGMzNWY0N2E3MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1xY29tLWdlbmku YworKysgYi9kcml2ZXJzL2kyYy9idXNzZXMvaTJjLXFjb20tZ2VuaS5jCkBAIC0yMTAsOSArMjEw LDggQEAgc3RhdGljIGlycXJldHVybl90IGdlbmlfaTJjX2lycShpbnQgaXJxLCB2b2lkICpkZXYp CiAJdTMyIGRtYTsKIAl1MzIgdmFsOwogCXN0cnVjdCBpMmNfbXNnICpjdXI7Ci0JdW5zaWduZWQg bG9uZyBmbGFnczsKIAotCXNwaW5fbG9ja19pcnFzYXZlKCZnaTJjLT5sb2NrLCBmbGFncyk7CisJ c3Bpbl9sb2NrKCZnaTJjLT5sb2NrKTsKIAltX3N0YXQgPSByZWFkbF9yZWxheGVkKGJhc2UgKyBT RV9HRU5JX01fSVJRX1NUQVRVUyk7CiAJcnhfc3QgPSByZWFkbF9yZWxheGVkKGJhc2UgKyBTRV9H RU5JX1JYX0ZJRk9fU1RBVFVTKTsKIAlkbV90eF9zdCA9IHJlYWRsX3JlbGF4ZWQoYmFzZSArIFNF X0RNQV9UWF9JUlFfU1RBVCk7CkBAIC0yOTQsNyArMjkzLDcgQEAgc3RhdGljIGlycXJldHVybl90 IGdlbmlfaTJjX2lycShpbnQgaXJxLCB2b2lkICpkZXYpCiAJICAgIGRtX3J4X3N0ICYgUlhfRE1B X0RPTkUgfHwgZG1fcnhfc3QgJiBSWF9SRVNFVF9ET05FKQogCQljb21wbGV0ZSgmZ2kyYy0+ZG9u ZSk7CiAKLQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZnaTJjLT5sb2NrLCBmbGFncyk7CisJc3Bp bl91bmxvY2soJmdpMmMtPmxvY2spOwogCiAJcmV0dXJuIElSUV9IQU5ETEVEOwogfQotLSAKMi4y NS4xCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxp bnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFk ZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4 LWFybS1rZXJuZWwK