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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E120C4332F for ; Tue, 22 Feb 2022 15:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232915AbiBVPwP (ORCPT ); Tue, 22 Feb 2022 10:52:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233720AbiBVPwM (ORCPT ); Tue, 22 Feb 2022 10:52:12 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C5B32B1BB; Tue, 22 Feb 2022 07:51:46 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 903A7616B6; Tue, 22 Feb 2022 15:51:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2386C340E8; Tue, 22 Feb 2022 15:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645545105; bh=2yNYEnZCgBavjfW97i1QUKvNIEwKyUeadW4FlPCriWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qTFF1a6CVlU/nY8wz6fUc6HGik2xEJE4XbtlKy1C98lU48+veKcB5ucf50xyyViLM hCYry6Gb7dQYc24YWg7M3FOvXMZs6MrPt2M197557t9sK1vvrW9Teqsnrzv+EIp3T2 FyG60xEutMClmx/VH9GMn9fLFth4MChpRJHlUqnYRrdcAqXPDs//2Wci/Ebadu1hjK CSCn8BUFNaJNKslA0EkHxS7/HCkmFhR+/XaF4w11vkdNGsLPbjQHD52wHUhurBGIXT 8RPt28VUKS3f+91Q8BJJthsIZFoVAsCCDQglOY9L0wi/bn9lzjgb11ZSZdtqBVJfEI qCvKUmYBhS9Tw== Received: by pali.im (Postfix) id 8741DFDB; Tue, 22 Feb 2022 16:51:44 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 10/12] PCI: mvebu: Fix macro names and comments about legacy interrupts Date: Tue, 22 Feb 2022 16:50:28 +0100 Message-Id: <20220222155030.988-11-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220222155030.988-1-pali@kernel.org> References: <20220222155030.988-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Register 0x1910 unmasks interrupts and legacy INTx interrupts are unmasked because driver does not support individual masking yet. Signed-off-by: Pali Rohár --- drivers/pci/controller/pci-mvebu.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index 1ae7718a2e3e..d096289035bc 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -54,9 +54,10 @@ PCIE_CONF_ADDR_EN) #define PCIE_CONF_DATA_OFF 0x18fc #define PCIE_INT_CAUSE_OFF 0x1900 +#define PCIE_INT_UNMASK_OFF 0x1910 +#define PCIE_INT_INTX(i) BIT(24+i) #define PCIE_INT_PM_PME BIT(28) -#define PCIE_MASK_OFF 0x1910 -#define PCIE_MASK_ENABLE_INTS 0x0f000000 +#define PCIE_INT_ALL_MASK GENMASK(31, 0) #define PCIE_CTRL_OFF 0x1a00 #define PCIE_CTRL_X1_MODE 0x0001 #define PCIE_CTRL_RC_MODE BIT(1) @@ -235,7 +236,7 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) { - u32 ctrl, lnkcap, cmd, dev_rev, mask; + u32 ctrl, lnkcap, cmd, dev_rev, unmask; /* Setup PCIe controller to Root Complex mode. */ ctrl = mvebu_readl(port, PCIE_CTRL_OFF); @@ -288,10 +289,19 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) /* Point PCIe unit MBUS decode windows to DRAM space. */ mvebu_pcie_setup_wins(port); - /* Enable interrupt lines A-D. */ - mask = mvebu_readl(port, PCIE_MASK_OFF); - mask |= PCIE_MASK_ENABLE_INTS; - mvebu_writel(port, mask, PCIE_MASK_OFF); + /* + * Unmask all legacy INTx interrupts as driver does not provide a way + * for masking and unmasking of individual legacy INTx interrupts. + * Legacy INTx are reported via one shared GIC source and therefore + * kernel cannot distinguish which individual legacy INTx was triggered. + * These interrupts are shared, so it should not cause any issue. Just + * performance penalty as every PCIe interrupt handler needs to be + * called when some interrupt is triggered. + */ + unmask = mvebu_readl(port, PCIE_INT_UNMASK_OFF); + unmask |= PCIE_INT_INTX(0) | PCIE_INT_INTX(1) | + PCIE_INT_INTX(2) | PCIE_INT_INTX(3); + mvebu_writel(port, unmask, PCIE_INT_UNMASK_OFF); } static struct mvebu_pcie_port *mvebu_pcie_find_port(struct mvebu_pcie *pcie, @@ -1450,7 +1460,7 @@ static int mvebu_pcie_remove(struct platform_device *pdev) mvebu_writel(port, cmd, PCIE_CMD_OFF); /* Mask all interrupt sources. */ - mvebu_writel(port, 0, PCIE_MASK_OFF); + mvebu_writel(port, ~PCIE_INT_ALL_MASK, PCIE_INT_UNMASK_OFF); /* Free config space for emulated root bridge. */ pci_bridge_emul_cleanup(&port->bridge); -- 2.20.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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2F638C433F5 for ; Tue, 22 Feb 2022 15:56:58 +0000 (UTC) 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=CJNPyArYvndsCIV3FR9ZBAPSj33WHneC7awLqIE1P7c=; b=UoOoIbI8cgR/sn dG46ubfrO7zGNVbVJz1qdDCGzGHwr2/B2MI1gAe7pnXtiWW6pYlM7AoAhpaaDFE/xNCCIIGkpBWOY K9PLnZYL5lRXrDqt68D2rcoXU3nXmXB9Tc++y079n9UIVOVCrrEfd9ilva13YOp3iU/UVxC1YKN92 zTFrN9pixgkQn+WPpX/KnpZ+fyHtWKe8HAvBN2QphKRXjPXSaa2v6xupfCz3e28GMM2a+OMpXF8zE LMM93CvpR9QrRY+qQye+La1e7jo3dzDGc6qhtPfbQNdeYVxGS/GL8+OaOPXViybKZ8pzyjCz7daZo LeCvS08MYBNA6cr6zYAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMXVn-00ARe2-L1; Tue, 22 Feb 2022 15:55:35 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMXS6-00APhn-3e for linux-arm-kernel@lists.infradead.org; Tue, 22 Feb 2022 15:51:48 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 905F5616B7; Tue, 22 Feb 2022 15:51:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2386C340E8; Tue, 22 Feb 2022 15:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645545105; bh=2yNYEnZCgBavjfW97i1QUKvNIEwKyUeadW4FlPCriWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qTFF1a6CVlU/nY8wz6fUc6HGik2xEJE4XbtlKy1C98lU48+veKcB5ucf50xyyViLM hCYry6Gb7dQYc24YWg7M3FOvXMZs6MrPt2M197557t9sK1vvrW9Teqsnrzv+EIp3T2 FyG60xEutMClmx/VH9GMn9fLFth4MChpRJHlUqnYRrdcAqXPDs//2Wci/Ebadu1hjK CSCn8BUFNaJNKslA0EkHxS7/HCkmFhR+/XaF4w11vkdNGsLPbjQHD52wHUhurBGIXT 8RPt28VUKS3f+91Q8BJJthsIZFoVAsCCDQglOY9L0wi/bn9lzjgb11ZSZdtqBVJfEI qCvKUmYBhS9Tw== Received: by pali.im (Postfix) id 8741DFDB; Tue, 22 Feb 2022 16:51:44 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 10/12] PCI: mvebu: Fix macro names and comments about legacy interrupts Date: Tue, 22 Feb 2022 16:50:28 +0100 Message-Id: <20220222155030.988-11-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220222155030.988-1-pali@kernel.org> References: <20220222155030.988-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220222_075146_296390_53DCA6DA X-CRM114-Status: GOOD ( 16.19 ) 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 UmVnaXN0ZXIgMHgxOTEwIHVubWFza3MgaW50ZXJydXB0cyBhbmQgbGVnYWN5IElOVHggaW50ZXJy dXB0cyBhcmUgdW5tYXNrZWQKYmVjYXVzZSBkcml2ZXIgZG9lcyBub3Qgc3VwcG9ydCBpbmRpdmlk dWFsIG1hc2tpbmcgeWV0LgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVs Lm9yZz4KLS0tCiBkcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jIHwgMjYgKysrKysr KysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA4 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12 ZWJ1LmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jCmluZGV4IDFhZTc3MThh MmUzZS4uZDA5NjI4OTAzNWJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3Bj aS1tdmVidS5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMKQEAgLTU0 LDkgKzU0LDEwIEBACiAJIFBDSUVfQ09ORl9BRERSX0VOKQogI2RlZmluZSBQQ0lFX0NPTkZfREFU QV9PRkYJMHgxOGZjCiAjZGVmaW5lIFBDSUVfSU5UX0NBVVNFX09GRgkweDE5MDAKKyNkZWZpbmUg UENJRV9JTlRfVU5NQVNLX09GRgkweDE5MTAKKyNkZWZpbmUgIFBDSUVfSU5UX0lOVFgoaSkJCUJJ VCgyNCtpKQogI2RlZmluZSAgUENJRV9JTlRfUE1fUE1FCQlCSVQoMjgpCi0jZGVmaW5lIFBDSUVf TUFTS19PRkYJCTB4MTkxMAotI2RlZmluZSAgUENJRV9NQVNLX0VOQUJMRV9JTlRTICAgICAgICAg IDB4MGYwMDAwMDAKKyNkZWZpbmUgIFBDSUVfSU5UX0FMTF9NQVNLCQlHRU5NQVNLKDMxLCAwKQog I2RlZmluZSBQQ0lFX0NUUkxfT0ZGCQkweDFhMDAKICNkZWZpbmUgIFBDSUVfQ1RSTF9YMV9NT0RF CQkweDAwMDEKICNkZWZpbmUgIFBDSUVfQ1RSTF9SQ19NT0RFCQlCSVQoMSkKQEAgLTIzNSw3ICsy MzYsNyBAQCBzdGF0aWMgdm9pZCBtdmVidV9wY2llX3NldHVwX3dpbnMoc3RydWN0IG12ZWJ1X3Bj aWVfcG9ydCAqcG9ydCkKIAogc3RhdGljIHZvaWQgbXZlYnVfcGNpZV9zZXR1cF9odyhzdHJ1Y3Qg bXZlYnVfcGNpZV9wb3J0ICpwb3J0KQogewotCXUzMiBjdHJsLCBsbmtjYXAsIGNtZCwgZGV2X3Jl diwgbWFzazsKKwl1MzIgY3RybCwgbG5rY2FwLCBjbWQsIGRldl9yZXYsIHVubWFzazsKIAogCS8q IFNldHVwIFBDSWUgY29udHJvbGxlciB0byBSb290IENvbXBsZXggbW9kZS4gKi8KIAljdHJsID0g bXZlYnVfcmVhZGwocG9ydCwgUENJRV9DVFJMX09GRik7CkBAIC0yODgsMTAgKzI4OSwxOSBAQCBz dGF0aWMgdm9pZCBtdmVidV9wY2llX3NldHVwX2h3KHN0cnVjdCBtdmVidV9wY2llX3BvcnQgKnBv cnQpCiAJLyogUG9pbnQgUENJZSB1bml0IE1CVVMgZGVjb2RlIHdpbmRvd3MgdG8gRFJBTSBzcGFj ZS4gKi8KIAltdmVidV9wY2llX3NldHVwX3dpbnMocG9ydCk7CiAKLQkvKiBFbmFibGUgaW50ZXJy dXB0IGxpbmVzIEEtRC4gKi8KLQltYXNrID0gbXZlYnVfcmVhZGwocG9ydCwgUENJRV9NQVNLX09G Rik7Ci0JbWFzayB8PSBQQ0lFX01BU0tfRU5BQkxFX0lOVFM7Ci0JbXZlYnVfd3JpdGVsKHBvcnQs IG1hc2ssIFBDSUVfTUFTS19PRkYpOworCS8qCisJICogVW5tYXNrIGFsbCBsZWdhY3kgSU5UeCBp bnRlcnJ1cHRzIGFzIGRyaXZlciBkb2VzIG5vdCBwcm92aWRlIGEgd2F5CisJICogZm9yIG1hc2tp bmcgYW5kIHVubWFza2luZyBvZiBpbmRpdmlkdWFsIGxlZ2FjeSBJTlR4IGludGVycnVwdHMuCisJ ICogTGVnYWN5IElOVHggYXJlIHJlcG9ydGVkIHZpYSBvbmUgc2hhcmVkIEdJQyBzb3VyY2UgYW5k IHRoZXJlZm9yZQorCSAqIGtlcm5lbCBjYW5ub3QgZGlzdGluZ3Vpc2ggd2hpY2ggaW5kaXZpZHVh bCBsZWdhY3kgSU5UeCB3YXMgdHJpZ2dlcmVkLgorCSAqIFRoZXNlIGludGVycnVwdHMgYXJlIHNo YXJlZCwgc28gaXQgc2hvdWxkIG5vdCBjYXVzZSBhbnkgaXNzdWUuIEp1c3QKKwkgKiBwZXJmb3Jt YW5jZSBwZW5hbHR5IGFzIGV2ZXJ5IFBDSWUgaW50ZXJydXB0IGhhbmRsZXIgbmVlZHMgdG8gYmUK KwkgKiBjYWxsZWQgd2hlbiBzb21lIGludGVycnVwdCBpcyB0cmlnZ2VyZWQuCisJICovCisJdW5t YXNrID0gbXZlYnVfcmVhZGwocG9ydCwgUENJRV9JTlRfVU5NQVNLX09GRik7CisJdW5tYXNrIHw9 IFBDSUVfSU5UX0lOVFgoMCkgfCBQQ0lFX0lOVF9JTlRYKDEpIHwKKwkJICBQQ0lFX0lOVF9JTlRY KDIpIHwgUENJRV9JTlRfSU5UWCgzKTsKKwltdmVidV93cml0ZWwocG9ydCwgdW5tYXNrLCBQQ0lF X0lOVF9VTk1BU0tfT0ZGKTsKIH0KIAogc3RhdGljIHN0cnVjdCBtdmVidV9wY2llX3BvcnQgKm12 ZWJ1X3BjaWVfZmluZF9wb3J0KHN0cnVjdCBtdmVidV9wY2llICpwY2llLApAQCAtMTQ1MCw3ICsx NDYwLDcgQEAgc3RhdGljIGludCBtdmVidV9wY2llX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlICpwZGV2KQogCQltdmVidV93cml0ZWwocG9ydCwgY21kLCBQQ0lFX0NNRF9PRkYpOwogCiAJ CS8qIE1hc2sgYWxsIGludGVycnVwdCBzb3VyY2VzLiAqLwotCQltdmVidV93cml0ZWwocG9ydCwg MCwgUENJRV9NQVNLX09GRik7CisJCW12ZWJ1X3dyaXRlbChwb3J0LCB+UENJRV9JTlRfQUxMX01B U0ssIFBDSUVfSU5UX1VOTUFTS19PRkYpOwogCiAJCS8qIEZyZWUgY29uZmlnIHNwYWNlIGZvciBl bXVsYXRlZCByb290IGJyaWRnZS4gKi8KIAkJcGNpX2JyaWRnZV9lbXVsX2NsZWFudXAoJnBvcnQt PmJyaWRnZSk7Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2Vy bmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1h bi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==