summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuc Dang <dhdang@apm.com>2014-10-16 15:35:22 -0600
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2015-01-27 09:55:00 +0000
commit09fb88fb5dacee3f594dd950080c64c694d91a80 (patch)
treee0a54bfc0156d41993aa5be5b59621ea9fcd0417
parent3f733eb9deca9311645bf6f80f25fbc111abbd10 (diff)
downloadlinux-09fb88fb5dacee3f594dd950080c64c694d91a80.tar.gz
UBUNTU: SAUCE: (no-up) [PCIE] APM X-Gene: Remove debug messages in MSI interrupt handler path.
BugLink: http://launchpad.net/bugs/1382244 If debug is enabled, on systems powered by X-Gene with serial port running at 9600 baud rate, the delay in message printing may cause PCIE command timeout issue that breaks the functionality of Mellanox ConnectX-3 card. This patch removes all debug messages in MSI interrupt handler path to address this issue. Signed-off-by: Duc Dang <dhdang@apm.com> (fix for non-upstream driver) Signed-off-by: dann frazier <dann.frazier@canonical.com> Conflicts: drivers/pci/host/pci-xgene-msi.c
-rw-r--r--drivers/pci/host/pci-xgene-msi.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c
index 9722d57af994..86fab1a56eee 100644
--- a/drivers/pci/host/pci-xgene-msi.c
+++ b/drivers/pci/host/pci-xgene-msi.c
@@ -110,7 +110,6 @@ static inline u32 xgene_msi_intr_read(phys_addr_t __iomem *base,
unsigned int reg)
{
u32 irq_reg = MSI1INT0 + (reg << 16);
- pr_debug("base = %p irq_reg = 0x%x , reg = 0x%x\n", base, irq_reg, reg);
return readl((void *)((phys_addr_t) base + irq_reg));
}
@@ -118,8 +117,6 @@ static inline u32 xgene_msi_read(phys_addr_t __iomem *base, unsigned int group,
unsigned int reg)
{
u32 irq_reg = MSI0IR0 + (group << 19) + (reg << 16);
- pr_debug("base %p irq_reg 0x%x, group 0x%x, reg 0x%x\n",
- base, irq_reg, group, reg);
return readl((void *)((phys_addr_t) base + irq_reg));
}
@@ -316,15 +313,11 @@ static void xgene_msi_cascade(unsigned int irq, struct irq_desc *desc)
u32 msi_intr_reg_value = 0;
u32 msi_intr_reg;
- pr_debug("\nENTER %s, irq=%u\n", __func__, irq);
-
chained_irq_enter(chip, desc);
cascade_data = irq_get_handler_data(irq);
msi_data = cascade_data->msi_data;
- pr_debug("xgene_msi : 0x%p, irq = %u\n", msi_data, irq);
msi_intr_reg = cascade_data->index;
- pr_debug("msi_intr_reg : %d\n", msi_intr_reg);
if (msi_intr_reg >= NR_MSI_REG)
cascade_irq = 0;
@@ -333,33 +326,26 @@ static void xgene_msi_cascade(unsigned int irq, struct irq_desc *desc)
case XGENE_PIC_IP_GIC:
msi_intr_reg_value = xgene_msi_intr_read(msi_data->msi_regs,
msi_intr_reg);
- pr_debug("msi_intr_reg_value : 0x%08x\n", msi_intr_reg_value);
break;
}
while (msi_intr_reg_value) {
msir_index = ffs(msi_intr_reg_value) - 1;
- pr_debug("msir_index : %d\n", msir_index);
msir_value = xgene_msi_read(msi_data->msi_regs, msi_intr_reg,
msir_index);
while (msir_value) {
intr_index = ffs(msir_value) - 1;
- pr_debug("intr_index : %d\n", intr_index);
cascade_irq = irq_linear_revmap(msi_data->irqhost,
msir_index * IRQS_PER_MSI_INDEX * NR_MSI_REG +
intr_index * NR_MSI_REG + msi_intr_reg);
- pr_debug("cascade_irq : %d\n", cascade_irq);
if (cascade_irq != 0)
generic_handle_irq(cascade_irq);
msir_value &= ~(1 << intr_index);
- pr_debug("msir_value : 0x%08x\n", msir_value);
}
msi_intr_reg_value &= ~(1 << msir_index);
- pr_debug("msi_intr_reg_value : 0x%08x\n", msi_intr_reg_value);
}
chained_irq_exit(chip, desc);
- pr_debug("EXIT\n");
}
static int xgene_msi_remove(struct platform_device *pdev)