stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Marek Behún" <kabel@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>
Cc: stable@vger.kernel.org, pali@kernel.org,
	"Marek Behún" <kabel@kernel.org>
Subject: [PATCH 5.15 04/30] PCI: aardvark: Clear all MSIs at setup
Date: Wed,  4 May 2022 18:57:29 +0200	[thread overview]
Message-ID: <20220504165755.30002-5-kabel@kernel.org> (raw)
In-Reply-To: <20220504165755.30002-1-kabel@kernel.org>

From: Pali Rohár <pali@kernel.org>

commit 7d8dc1f7cd007a7ce94c5b4c20d63a8b8d6d7751 upstream.

We already clear all the other interrupts (ISR0, ISR1, HOST_CTRL_INT).

Define a new macro PCIE_MSI_ALL_MASK and do the same clearing for MSIs,
to ensure that we don't start receiving spurious interrupts.

Use this new mask in advk_pcie_handle_msi();

Link: https://lore.kernel.org/r/20211130172913.9727-5-kabel@kernel.org
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
---
 drivers/pci/controller/pci-aardvark.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 708734afc254..0d02ae8bb4a6 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -115,6 +115,7 @@
 #define PCIE_MSI_ADDR_HIGH_REG			(CONTROL_BASE_ADDR + 0x54)
 #define PCIE_MSI_STATUS_REG			(CONTROL_BASE_ADDR + 0x58)
 #define PCIE_MSI_MASK_REG			(CONTROL_BASE_ADDR + 0x5C)
+#define     PCIE_MSI_ALL_MASK			GENMASK(31, 0)
 #define PCIE_MSI_PAYLOAD_REG			(CONTROL_BASE_ADDR + 0x9C)
 #define     PCIE_MSI_DATA_MASK			GENMASK(15, 0)
 
@@ -570,6 +571,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
 	advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
 
 	/* Clear all interrupts */
+	advk_writel(pcie, PCIE_MSI_ALL_MASK, PCIE_MSI_STATUS_REG);
 	advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_REG);
 	advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
 	advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
@@ -582,7 +584,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
 	advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_MASK_REG);
 
 	/* Unmask all MSIs */
-	advk_writel(pcie, 0, PCIE_MSI_MASK_REG);
+	advk_writel(pcie, ~(u32)PCIE_MSI_ALL_MASK, PCIE_MSI_MASK_REG);
 
 	/* Enable summary interrupt for GIC SPI source */
 	reg = PCIE_IRQ_ALL_MASK & (~PCIE_IRQ_ENABLE_INTS_MASK);
@@ -1389,7 +1391,7 @@ static void advk_pcie_handle_msi(struct advk_pcie *pcie)
 
 	msi_mask = advk_readl(pcie, PCIE_MSI_MASK_REG);
 	msi_val = advk_readl(pcie, PCIE_MSI_STATUS_REG);
-	msi_status = msi_val & ~msi_mask;
+	msi_status = msi_val & ((~msi_mask) & PCIE_MSI_ALL_MASK);
 
 	for (msi_idx = 0; msi_idx < MSI_IRQ_NUM; msi_idx++) {
 		if (!(BIT(msi_idx) & msi_status))
-- 
2.35.1


  parent reply	other threads:[~2022-05-04 17:18 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-04 16:57 [PATCH 5.15 00/30] PCIe Aardvark controller backports for 5.15 Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 01/30] PCI: pci-bridge-emul: Add description for class_revision field Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 02/30] PCI: pci-bridge-emul: Add definitions for missing capabilities registers Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 03/30] PCI: aardvark: Add support for DEVCAP2, DEVCTL2, LNKCAP2 and LNKCTL2 registers on emulated bridge Marek Behún
2022-05-04 16:57 ` Marek Behún [this message]
2022-05-04 16:57 ` [PATCH 5.15 05/30] PCI: aardvark: Comment actions in driver remove method Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 06/30] PCI: aardvark: Disable bus mastering when unbinding driver Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 07/30] PCI: aardvark: Mask all interrupts " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 08/30] PCI: aardvark: Fix memory leak in driver unbind Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 09/30] PCI: aardvark: Assert PERST# when unbinding driver Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 10/30] PCI: aardvark: Disable link training " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 11/30] PCI: aardvark: Disable common PHY " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 12/30] PCI: aardvark: Replace custom PCIE_CORE_INT_* macros with PCI_INTERRUPT_* Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 13/30] PCI: aardvark: Rewrite IRQ code to chained IRQ handler Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 14/30] PCI: aardvark: Check return value of generic_handle_domain_irq() when processing INTx IRQ Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 15/30] PCI: aardvark: Make MSI irq_chip structures static driver structures Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 16/30] PCI: aardvark: Make msi_domain_info structure a static driver structure Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 17/30] PCI: aardvark: Use dev_fwnode() instead of of_node_to_fwnode(dev->of_node) Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 18/30] PCI: aardvark: Refactor unmasking summary MSI interrupt Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 19/30] PCI: aardvark: Add support for masking MSI interrupts Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 20/30] PCI: aardvark: Fix setting MSI address Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 21/30] PCI: aardvark: Enable MSI-X support Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 22/30] PCI: aardvark: Add support for ERR interrupt on emulated bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 23/30] PCI: aardvark: Optimize writing PCI_EXP_RTCTL_PMEIE and PCI_EXP_RTSTA_PME " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 24/30] PCI: aardvark: Add support for PME interrupts Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 25/30] PCI: aardvark: Fix support for PME requester on emulated bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 26/30] PCI: aardvark: Use separate INTA interrupt for emulated root bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 27/30] PCI: aardvark: Remove irq_mask_ack() callback for INTx interrupts Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 28/30] PCI: aardvark: Don't mask irq when mapping Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 29/30] PCI: aardvark: Drop __maybe_unused from advk_pcie_disable_phy() Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 30/30] PCI: aardvark: Update comment about link going down after link-up Marek Behún
2022-05-10 12:06 ` [PATCH 5.15 00/30] PCIe Aardvark controller backports for 5.15 Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220504165755.30002-5-kabel@kernel.org \
    --to=kabel@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=pali@kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).