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=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, 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 0CA7CC4320A for ; Mon, 23 Aug 2021 11:18:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2B15610D1 for ; Mon, 23 Aug 2021 11:18:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236563AbhHWLTR (ORCPT ); Mon, 23 Aug 2021 07:19:17 -0400 Received: from mx.socionext.com ([202.248.49.38]:14887 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235083AbhHWLTQ (ORCPT ); Mon, 23 Aug 2021 07:19:16 -0400 Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 23 Aug 2021 20:18:32 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id BD4702059036; Mon, 23 Aug 2021 20:18:32 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Mon, 23 Aug 2021 20:18:32 +0900 Received: from plum.e01.socionext.com (unknown [10.212.243.119]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 83B8FB62B7; Mon, 23 Aug 2021 20:18:32 +0900 (JST) From: Kunihiko Hayashi To: Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Masami Hiramatsu , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH] PCI: uniphier: Serialize INTx masking/unmasking Date: Mon, 23 Aug 2021 20:18:20 +0900 Message-Id: <1629717500-19396-1-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 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(), irq_unmask() and irq_ack() 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 --- drivers/pci/controller/dwc/pcie-uniphier.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) The previous patch is as follows: https://lore.kernel.org/linux-pci/1629370566-29984-1-git-send-email-hayashi.kunihiko@socionext.com/ Changes in the previous patch: - Change the subject and commit message diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c index ebe43e9..5075714 100644 --- a/drivers/pci/controller/dwc/pcie-uniphier.c +++ b/drivers/pci/controller/dwc/pcie-uniphier.c @@ -186,12 +186,17 @@ static void uniphier_pcie_irq_ack(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 &= ~PCL_RCV_INTX_ALL_STATUS; val |= BIT(irqd_to_hwirq(d) + PCL_RCV_INTX_STATUS_SHIFT); writel(val, priv->base + PCL_RCV_INTX); + + raw_spin_unlock_irqrestore(&pp->lock, flags); } static void uniphier_pcie_irq_mask(struct irq_data *d) @@ -199,12 +204,17 @@ 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 &= ~PCL_RCV_INTX_ALL_MASK; 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) @@ -212,12 +222,17 @@ 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 &= ~PCL_RCV_INTX_ALL_MASK; 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=-14.7 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, UNWANTED_LANGUAGE_BODY,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 11656C4338F for ; Mon, 23 Aug 2021 11:21:23 +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 CC4C16136F for ; Mon, 23 Aug 2021 11:21:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CC4C16136F 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: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:In-Reply-To:References: List-Owner; bh=I/Rj2bdt/na6gvXV/1k5YYki3te6Mmwrw95TWH07+KQ=; b=anHVD6et8RGjkb hJycWVDYfEqG/EPgmiOIT2xFY5U6ZyYrTVdUTVQJ6gbZDYWgkIVmagg0OaYTJZJgJv4G/444SMAHD uDzg7gCuu1nd053W8E3natyOd2ihW0Jk0GUA5Ny0ijs8cSZ/LFlWqhqJ86keCZSd1GixhM3SRKxUj JHygZD7Ufke1ysVGf6ql4eGDcl5dzJVXE12YC9MS4xuTn+B+ZxWjgVZhSVhGWWPnSZrlM2egRdWYh HxgAC9ah1FB6aeg1LFBMiQXJNXJPb2yTo7OluvnxKrYVZSL5Ky4E9zdSxScfUa+VUedv2xZ2fjK2A oFGp3xVjKDIfZiwC1csg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mI7yg-00GXKu-AY; Mon, 23 Aug 2021 11:18:54 +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 1mI7yY-00GXHW-Sa for linux-arm-kernel@lists.infradead.org; Mon, 23 Aug 2021 11:18:51 +0000 Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 23 Aug 2021 20:18:32 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id BD4702059036; Mon, 23 Aug 2021 20:18:32 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Mon, 23 Aug 2021 20:18:32 +0900 Received: from plum.e01.socionext.com (unknown [10.212.243.119]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 83B8FB62B7; Mon, 23 Aug 2021 20:18:32 +0900 (JST) From: Kunihiko Hayashi To: Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Masami Hiramatsu , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH] PCI: uniphier: Serialize INTx masking/unmasking Date: Mon, 23 Aug 2021 20:18:20 +0900 Message-Id: <1629717500-19396-1-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210823_041847_079432_4A469780 X-CRM114-Status: GOOD ( 13.08 ) 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 LCBpcnFfdW5tYXNrKCkKYW5kIGlycV9hY2soKSBjYWxsYmFja3MuIEFjY2Vzc2VzIHRvIHJlZ2lz dGVyIGNhbiBvY2N1ciBhdCB0aGUgc2FtZSB0aW1lCndpdGhvdXQgYSBsb2NrLgpBZGQgYSBsb2Nr IGludG8gZWFjaCBjYWxsYmFjayB0byBwcmV2ZW50IHRoZSBpc3N1ZS4KCkZpeGVzOiA3ZTZkNWNk ODhhNmYgKCJQQ0k6IHVuaXBoaWVyOiBBZGQgVW5pUGhpZXIgUENJZSBob3N0IGNvbnRyb2xsZXIg c3VwcG9ydCIpClN1Z2dlc3RlZC1ieTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KU2ln bmVkLW9mZi1ieTogS3VuaWhpa28gSGF5YXNoaSA8aGF5YXNoaS5rdW5paGlrb0Bzb2Npb25leHQu Y29tPgotLS0KIGRyaXZlcnMvcGNpL2NvbnRyb2xsZXIvZHdjL3BjaWUtdW5pcGhpZXIuYyB8IDE1 ICsrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKykKClRoZSBw cmV2aW91cyBwYXRjaCBpcyBhcyBmb2xsb3dzOgpodHRwczovL2xvcmUua2VybmVsLm9yZy9saW51 eC1wY2kvMTYyOTM3MDU2Ni0yOTk4NC0xLWdpdC1zZW5kLWVtYWlsLWhheWFzaGkua3VuaWhpa29A c29jaW9uZXh0LmNvbS8KCkNoYW5nZXMgaW4gdGhlIHByZXZpb3VzIHBhdGNoOgotIENoYW5nZSB0 aGUgc3ViamVjdCBhbmQgY29tbWl0IG1lc3NhZ2UKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9j b250cm9sbGVyL2R3Yy9wY2llLXVuaXBoaWVyLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3 Yy9wY2llLXVuaXBoaWVyLmMKaW5kZXggZWJlNDNlOS4uNTA3NTcxNCAxMDA2NDQKLS0tIGEvZHJp dmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS11bmlwaGllci5jCisrKyBiL2RyaXZlcnMvcGNp L2NvbnRyb2xsZXIvZHdjL3BjaWUtdW5pcGhpZXIuYwpAQCAtMTg2LDEyICsxODYsMTcgQEAgc3Rh dGljIHZvaWQgdW5pcGhpZXJfcGNpZV9pcnFfYWNrKHN0cnVjdCBpcnFfZGF0YSAqZCkKIAlzdHJ1 Y3QgcGNpZV9wb3J0ICpwcCA9IGlycV9kYXRhX2dldF9pcnFfY2hpcF9kYXRhKGQpOwogCXN0cnVj dCBkd19wY2llICpwY2kgPSB0b19kd19wY2llX2Zyb21fcHAocHApOwogCXN0cnVjdCB1bmlwaGll cl9wY2llX3ByaXYgKnByaXYgPSB0b191bmlwaGllcl9wY2llKHBjaSk7CisJdW5zaWduZWQgbG9u ZyBmbGFnczsKIAl1MzIgdmFsOwogCisJcmF3X3NwaW5fbG9ja19pcnFzYXZlKCZwcC0+bG9jaywg ZmxhZ3MpOworCiAJdmFsID0gcmVhZGwocHJpdi0+YmFzZSArIFBDTF9SQ1ZfSU5UWCk7CiAJdmFs ICY9IH5QQ0xfUkNWX0lOVFhfQUxMX1NUQVRVUzsKIAl2YWwgfD0gQklUKGlycWRfdG9faHdpcnEo ZCkgKyBQQ0xfUkNWX0lOVFhfU1RBVFVTX1NISUZUKTsKIAl3cml0ZWwodmFsLCBwcml2LT5iYXNl ICsgUENMX1JDVl9JTlRYKTsKKworCXJhd19zcGluX3VubG9ja19pcnFyZXN0b3JlKCZwcC0+bG9j aywgZmxhZ3MpOwogfQogCiBzdGF0aWMgdm9pZCB1bmlwaGllcl9wY2llX2lycV9tYXNrKHN0cnVj dCBpcnFfZGF0YSAqZCkKQEAgLTE5OSwxMiArMjA0LDE3IEBAIHN0YXRpYyB2b2lkIHVuaXBoaWVy X3BjaWVfaXJxX21hc2soc3RydWN0IGlycV9kYXRhICpkKQogCXN0cnVjdCBwY2llX3BvcnQgKnBw ID0gaXJxX2RhdGFfZ2V0X2lycV9jaGlwX2RhdGEoZCk7CiAJc3RydWN0IGR3X3BjaWUgKnBjaSA9 IHRvX2R3X3BjaWVfZnJvbV9wcChwcCk7CiAJc3RydWN0IHVuaXBoaWVyX3BjaWVfcHJpdiAqcHJp diA9IHRvX3VuaXBoaWVyX3BjaWUocGNpKTsKKwl1bnNpZ25lZCBsb25nIGZsYWdzOwogCXUzMiB2 YWw7CiAKKwlyYXdfc3Bpbl9sb2NrX2lycXNhdmUoJnBwLT5sb2NrLCBmbGFncyk7CisKIAl2YWwg PSByZWFkbChwcml2LT5iYXNlICsgUENMX1JDVl9JTlRYKTsKIAl2YWwgJj0gflBDTF9SQ1ZfSU5U WF9BTExfTUFTSzsKIAl2YWwgfD0gQklUKGlycWRfdG9faHdpcnEoZCkgKyBQQ0xfUkNWX0lOVFhf TUFTS19TSElGVCk7CiAJd3JpdGVsKHZhbCwgcHJpdi0+YmFzZSArIFBDTF9SQ1ZfSU5UWCk7CisK KwlyYXdfc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcHAtPmxvY2ssIGZsYWdzKTsKIH0KIAogc3Rh dGljIHZvaWQgdW5pcGhpZXJfcGNpZV9pcnFfdW5tYXNrKHN0cnVjdCBpcnFfZGF0YSAqZCkKQEAg LTIxMiwxMiArMjIyLDE3IEBAIHN0YXRpYyB2b2lkIHVuaXBoaWVyX3BjaWVfaXJxX3VubWFzayhz dHJ1Y3QgaXJxX2RhdGEgKmQpCiAJc3RydWN0IHBjaWVfcG9ydCAqcHAgPSBpcnFfZGF0YV9nZXRf aXJxX2NoaXBfZGF0YShkKTsKIAlzdHJ1Y3QgZHdfcGNpZSAqcGNpID0gdG9fZHdfcGNpZV9mcm9t X3BwKHBwKTsKIAlzdHJ1Y3QgdW5pcGhpZXJfcGNpZV9wcml2ICpwcml2ID0gdG9fdW5pcGhpZXJf cGNpZShwY2kpOworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJdTMyIHZhbDsKIAorCXJhd19zcGlu X2xvY2tfaXJxc2F2ZSgmcHAtPmxvY2ssIGZsYWdzKTsKKwogCXZhbCA9IHJlYWRsKHByaXYtPmJh c2UgKyBQQ0xfUkNWX0lOVFgpOwogCXZhbCAmPSB+UENMX1JDVl9JTlRYX0FMTF9NQVNLOwogCXZh bCAmPSB+QklUKGlycWRfdG9faHdpcnEoZCkgKyBQQ0xfUkNWX0lOVFhfTUFTS19TSElGVCk7CiAJ d3JpdGVsKHZhbCwgcHJpdi0+YmFzZSArIFBDTF9SQ1ZfSU5UWCk7CisKKwlyYXdfc3Bpbl91bmxv Y2tfaXJxcmVzdG9yZSgmcHAtPmxvY2ssIGZsYWdzKTsKIH0KIAogc3RhdGljIHN0cnVjdCBpcnFf Y2hpcCB1bmlwaGllcl9wY2llX2lycV9jaGlwID0gewotLSAKMi43LjQKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==