linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Burton <paul.burton@imgtec.com>
To: <linux-mips@linux-mips.org>
Cc: "Bharat Kumar Gogada" <bharatku@xilinx.com>,
	"Michal Simek" <michal.simek@xilinx.com>,
	"Ravikiran Gummaluri" <rgummal@xilinx.com>,
	"Paul Burton" <paul.burton@imgtec.com>,
	"Sören Brinkmann" <soren.brinkmann@xilinx.com>,
	"Jiang Liu" <jiang.liu@linux.intel.com>,
	"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
	"Grygorii Strashko" <grygorii.strashko@ti.com>,
	"Russell Joyce" <russell.joyce@york.ac.uk>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Jingoo Han" <jingoohan1@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 5/6] PCI: xilinx: Fix INTX irq dispatch
Date: Thu, 4 Feb 2016 16:10:12 +0000	[thread overview]
Message-ID: <1454602213-967-6-git-send-email-paul.burton@imgtec.com> (raw)
In-Reply-To: <1454602213-967-1-git-send-email-paul.burton@imgtec.com>

The IRQ domain for INTX interrupts has 4 entries, numbered 0 to 3. This
matches what the hardware reports from the interrupt FIFO exactly, but
xilinx_pcie_intr_handler was adding 1 to that value to convert to the
range 1 to 4. Stop adding 1, such that all of INTA through to INTD fall
within the range of the IRQ domain.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 8961def56845 ("PCI: xilinx: Add Xilinx AXI PCIe Host Bridge IP driver")

---

Changes in v3:
- Split out from Boston patchset.

Changes in v2:
- Add Fixes tag.

 drivers/pci/host/pcie-xilinx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 6c5a503..8013e83 100644
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -451,8 +451,8 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data)
 			irq = pcie_read(port, XILINX_PCIE_REG_RPIFR2) &
 				XILINX_PCIE_RPIFR2_MSG_DATA;
 		} else {
-			val = ((val & XILINX_PCIE_RPIFR1_INTR_MASK) >>
-				XILINX_PCIE_RPIFR1_INTR_SHIFT) + 1;
+			val = (val & XILINX_PCIE_RPIFR1_INTR_MASK) >>
+				XILINX_PCIE_RPIFR1_INTR_SHIFT;
 			irq = irq_find_mapping(port->irq_domain, val);
 		}
 
-- 
2.7.0


  parent reply	other threads:[~2016-02-04 16:12 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-04 16:10 [PATCH v3 0/6] Xilinx AXI PCIe Host Bridge driver fixes Paul Burton
2016-02-04 16:10 ` [PATCH v3 1/6] PCI: xilinx: Keep references to both IRQ domains Paul Burton
2016-02-04 16:10 ` [PATCH v3 2/6] PCI: xilinx: Unify INTx & MSI interrupt FIFO decode Paul Burton
2016-02-11  5:42   ` Bharat Kumar Gogada
2016-02-11  5:50     ` Bharat Kumar Gogada
2016-02-04 16:10 ` [PATCH v3 3/6] PCI: xilinx: Always clear interrupt decode register Paul Burton
2016-02-04 16:10 ` [PATCH v3 4/6] PCI: xilinx: Clear interrupt FIFO during probe Paul Burton
2016-02-11  6:20   ` Bharat Kumar Gogada
2016-02-04 16:10 ` Paul Burton [this message]
2016-02-04 16:10 ` [PATCH v3 6/6] PCI: xilinx: Allow build on MIPS platforms Paul Burton
2016-02-04 17:46   ` Rob Herring
2016-02-04 17:53     ` Paul Burton
2016-02-25 15:43       ` Bjorn Helgaas
2016-02-26  7:49         ` Michal Simek
2016-02-25 15:59 ` [PATCH v3 0/6] Xilinx AXI PCIe Host Bridge driver fixes Bjorn Helgaas

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=1454602213-967-6-git-send-email-paul.burton@imgtec.com \
    --to=paul.burton@imgtec.com \
    --cc=bharatku@xilinx.com \
    --cc=bhelgaas@google.com \
    --cc=grygorii.strashko@ti.com \
    --cc=jiang.liu@linux.intel.com \
    --cc=jingoohan1@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=michal.simek@xilinx.com \
    --cc=rgummal@xilinx.com \
    --cc=russell.joyce@york.ac.uk \
    --cc=soren.brinkmann@xilinx.com \
    --cc=tglx@linutronix.de \
    /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).