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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 1F284C43214 for ; Mon, 30 Aug 2021 02:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F240260F44 for ; Mon, 30 Aug 2021 02:23:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236243AbhH3CXz (ORCPT ); Sun, 29 Aug 2021 22:23:55 -0400 Received: from mx.socionext.com ([202.248.49.38]:31272 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236202AbhH3CXx (ORCPT ); Sun, 29 Aug 2021 22:23:53 -0400 Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 30 Aug 2021 11:23:00 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id F318B2021820; Mon, 30 Aug 2021 11:22:59 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Mon, 30 Aug 2021 11:22:59 +0900 Received: from plum.e01.socionext.com (unknown [10.212.243.119]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 24C7EB62B7; Mon, 30 Aug 2021 11:22:59 +0900 (JST) From: Kunihiko Hayashi To: Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Marc Zyngier Cc: Masami Hiramatsu , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH v2 2/2] PCI: uniphier: Serialize INTx masking/unmasking Date: Mon, 30 Aug 2021 11:22:38 +0900 Message-Id: <1630290158-31264-3-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1630290158-31264-1-git-send-email-hayashi.kunihiko@socionext.com> References: <1630290158-31264-1-git-send-email-hayashi.kunihiko@socionext.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The condition register PCI_RCV_INTX is used in irq_mask() and irq_unmask() callbacks. Accesses to register can occur at the same time without a lock. Add a lock into each callback to prevent the issue. Fixes: 7e6d5cd88a6f ("PCI: uniphier: Add UniPhier PCIe host controller support") Suggested-by: Pali Rohár Signed-off-by: Kunihiko Hayashi Acked-by: Pali Rohár --- drivers/pci/controller/dwc/pcie-uniphier.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c index 26f630c..0ddeec0 100644 --- a/drivers/pci/controller/dwc/pcie-uniphier.c +++ b/drivers/pci/controller/dwc/pcie-uniphier.c @@ -186,11 +186,16 @@ static void uniphier_pcie_irq_mask(struct irq_data *d) struct pcie_port *pp = irq_data_get_irq_chip_data(d); struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct uniphier_pcie_priv *priv = to_uniphier_pcie(pci); + unsigned long flags; u32 val; + raw_spin_lock_irqsave(&pp->lock, flags); + val = readl(priv->base + PCL_RCV_INTX); val |= BIT(irqd_to_hwirq(d) + PCL_RCV_INTX_MASK_SHIFT); writel(val, priv->base + PCL_RCV_INTX); + + raw_spin_unlock_irqrestore(&pp->lock, flags); } static void uniphier_pcie_irq_unmask(struct irq_data *d) @@ -198,11 +203,16 @@ static void uniphier_pcie_irq_unmask(struct irq_data *d) struct pcie_port *pp = irq_data_get_irq_chip_data(d); struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct uniphier_pcie_priv *priv = to_uniphier_pcie(pci); + unsigned long flags; u32 val; + raw_spin_lock_irqsave(&pp->lock, flags); + val = readl(priv->base + PCL_RCV_INTX); val &= ~BIT(irqd_to_hwirq(d) + PCL_RCV_INTX_MASK_SHIFT); writel(val, priv->base + PCL_RCV_INTX); + + raw_spin_unlock_irqrestore(&pp->lock, flags); } static struct irq_chip uniphier_pcie_irq_chip = { -- 2.7.4 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 A49C9C4320A for ; Mon, 30 Aug 2021 02:25:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 6508F60F57 for ; Mon, 30 Aug 2021 02:25:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6508F60F57 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oFRN8729NZHKx7p5vglPeh/KWdVn03RmKZ8abIV5RZg=; b=ufZD5nJF0JD6wZ JBmtuOvzz+DDGgWAKHfM6YONsgqGo4Epf9N6buzSyDm0E8JyyFCvCtqIJ+LmA8lFpRiidJBgE2L0m pYuCmr96H3Fl2guD8C/LWVcFHFjuGED7vdlc+spof7isULWDEp8Er2leBnstJAOFg3qIDbJCN4wrR 9WCF3mpw110JPL6NoHO5kqpvqifgTF0DPJDSYve27/F01DigAQriL8pQEw2mO9+S9rEwzP2OHFHhN c0gjCXJJYvwTFXYxNs426nqXADHQYqVD9oZ7S/BUoL4QDfNJvEs5BX04lM2nsAuiVal4l2sUadcAJ 9IR5wPaJAHWNHmKLNPaw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKWxE-00GHdT-3o; Mon, 30 Aug 2021 02:23:20 +0000 Received: from mx.socionext.com ([202.248.49.38]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKWwu-00GHbc-Nl for linux-arm-kernel@lists.infradead.org; Mon, 30 Aug 2021 02:23:02 +0000 Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 30 Aug 2021 11:23:00 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id F318B2021820; Mon, 30 Aug 2021 11:22:59 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Mon, 30 Aug 2021 11:22:59 +0900 Received: from plum.e01.socionext.com (unknown [10.212.243.119]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 24C7EB62B7; Mon, 30 Aug 2021 11:22:59 +0900 (JST) From: Kunihiko Hayashi To: Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Marc Zyngier Cc: Masami Hiramatsu , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH v2 2/2] PCI: uniphier: Serialize INTx masking/unmasking Date: Mon, 30 Aug 2021 11:22:38 +0900 Message-Id: <1630290158-31264-3-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1630290158-31264-1-git-send-email-hayashi.kunihiko@socionext.com> References: <1630290158-31264-1-git-send-email-hayashi.kunihiko@socionext.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210829_192300_941272_C77C1304 X-CRM114-Status: GOOD ( 13.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 VGhlIGNvbmRpdGlvbiByZWdpc3RlciBQQ0lfUkNWX0lOVFggaXMgdXNlZCBpbiBpcnFfbWFzaygp IGFuZCBpcnFfdW5tYXNrKCkKY2FsbGJhY2tzLiBBY2Nlc3NlcyB0byByZWdpc3RlciBjYW4gb2Nj dXIgYXQgdGhlIHNhbWUgdGltZSB3aXRob3V0IGEgbG9jay4KQWRkIGEgbG9jayBpbnRvIGVhY2gg Y2FsbGJhY2sgdG8gcHJldmVudCB0aGUgaXNzdWUuCgpGaXhlczogN2U2ZDVjZDg4YTZmICgiUENJ OiB1bmlwaGllcjogQWRkIFVuaVBoaWVyIFBDSWUgaG9zdCBjb250cm9sbGVyIHN1cHBvcnQiKQpT dWdnZXN0ZWQtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6 IEt1bmloaWtvIEhheWFzaGkgPGhheWFzaGkua3VuaWhpa29Ac29jaW9uZXh0LmNvbT4KQWNrZWQt Ynk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9wY2kvY29udHJv bGxlci9kd2MvcGNpZS11bmlwaGllci5jIHwgMTAgKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQs IDEwIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3 Yy9wY2llLXVuaXBoaWVyLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2llLXVuaXBo aWVyLmMKaW5kZXggMjZmNjMwYy4uMGRkZWVjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvY29u dHJvbGxlci9kd2MvcGNpZS11bmlwaGllci5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv ZHdjL3BjaWUtdW5pcGhpZXIuYwpAQCAtMTg2LDExICsxODYsMTYgQEAgc3RhdGljIHZvaWQgdW5p cGhpZXJfcGNpZV9pcnFfbWFzayhzdHJ1Y3QgaXJxX2RhdGEgKmQpCiAJc3RydWN0IHBjaWVfcG9y dCAqcHAgPSBpcnFfZGF0YV9nZXRfaXJxX2NoaXBfZGF0YShkKTsKIAlzdHJ1Y3QgZHdfcGNpZSAq cGNpID0gdG9fZHdfcGNpZV9mcm9tX3BwKHBwKTsKIAlzdHJ1Y3QgdW5pcGhpZXJfcGNpZV9wcml2 ICpwcml2ID0gdG9fdW5pcGhpZXJfcGNpZShwY2kpOworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJ dTMyIHZhbDsKIAorCXJhd19zcGluX2xvY2tfaXJxc2F2ZSgmcHAtPmxvY2ssIGZsYWdzKTsKKwog CXZhbCA9IHJlYWRsKHByaXYtPmJhc2UgKyBQQ0xfUkNWX0lOVFgpOwogCXZhbCB8PSBCSVQoaXJx ZF90b19od2lycShkKSArIFBDTF9SQ1ZfSU5UWF9NQVNLX1NISUZUKTsKIAl3cml0ZWwodmFsLCBw cml2LT5iYXNlICsgUENMX1JDVl9JTlRYKTsKKworCXJhd19zcGluX3VubG9ja19pcnFyZXN0b3Jl KCZwcC0+bG9jaywgZmxhZ3MpOwogfQogCiBzdGF0aWMgdm9pZCB1bmlwaGllcl9wY2llX2lycV91 bm1hc2soc3RydWN0IGlycV9kYXRhICpkKQpAQCAtMTk4LDExICsyMDMsMTYgQEAgc3RhdGljIHZv aWQgdW5pcGhpZXJfcGNpZV9pcnFfdW5tYXNrKHN0cnVjdCBpcnFfZGF0YSAqZCkKIAlzdHJ1Y3Qg cGNpZV9wb3J0ICpwcCA9IGlycV9kYXRhX2dldF9pcnFfY2hpcF9kYXRhKGQpOwogCXN0cnVjdCBk d19wY2llICpwY2kgPSB0b19kd19wY2llX2Zyb21fcHAocHApOwogCXN0cnVjdCB1bmlwaGllcl9w Y2llX3ByaXYgKnByaXYgPSB0b191bmlwaGllcl9wY2llKHBjaSk7CisJdW5zaWduZWQgbG9uZyBm bGFnczsKIAl1MzIgdmFsOwogCisJcmF3X3NwaW5fbG9ja19pcnFzYXZlKCZwcC0+bG9jaywgZmxh Z3MpOworCiAJdmFsID0gcmVhZGwocHJpdi0+YmFzZSArIFBDTF9SQ1ZfSU5UWCk7CiAJdmFsICY9 IH5CSVQoaXJxZF90b19od2lycShkKSArIFBDTF9SQ1ZfSU5UWF9NQVNLX1NISUZUKTsKIAl3cml0 ZWwodmFsLCBwcml2LT5iYXNlICsgUENMX1JDVl9JTlRYKTsKKworCXJhd19zcGluX3VubG9ja19p cnFyZXN0b3JlKCZwcC0+bG9jaywgZmxhZ3MpOwogfQogCiBzdGF0aWMgc3RydWN0IGlycV9jaGlw IHVuaXBoaWVyX3BjaWVfaXJxX2NoaXAgPSB7Ci0tIAoyLjcuNAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBs aXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5m cmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK