* [PATCH next 1/2] PCI: keystone: add pci error irq handler
@ 2016-03-22 19:52 Murali Karicheri
2016-03-22 19:52 ` [PATCH next 2/2] PCI: keystone: remove unnecessary goto statement Murali Karicheri
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Murali Karicheri @ 2016-03-22 19:52 UTC (permalink / raw)
To: devicetree, linux-kernel, linux-pci, linux-arm-kernel, bhelgaas
Keystone PCI hardware generates error interrupts at RC using platform
irq instead of standard msi/legacy irq. Add a simple error handler that
logs the fatal interrupt status to the console.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
---
.../devicetree/bindings/pci/pci-keystone.txt | 1 +
drivers/pci/host/pci-keystone-dw.c | 46 ++++++++++++++++++++++
drivers/pci/host/pci-keystone.c | 32 +++++++++++++++
drivers/pci/host/pci-keystone.h | 6 +++
4 files changed, 85 insertions(+)
diff --git a/Documentation/devicetree/bindings/pci/pci-keystone.txt b/Documentation/devicetree/bindings/pci/pci-keystone.txt
index 54eae29..d08a4d5 100644
--- a/Documentation/devicetree/bindings/pci/pci-keystone.txt
+++ b/Documentation/devicetree/bindings/pci/pci-keystone.txt
@@ -56,6 +56,7 @@ Optional properties:-
phy-names: name of the Generic Keystine SerDes phy for PCI
- If boot loader already does PCI link establishment, then phys and
phy-names shouldn't be present.
+ interrupts: platform interrupt for error interrupts.
Designware DT Properties not applicable for Keystone PCI
diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
index ed34c95..524901d 100644
--- a/drivers/pci/host/pci-keystone-dw.c
+++ b/drivers/pci/host/pci-keystone-dw.c
@@ -53,6 +53,29 @@
#define IRQ_STATUS 0x184
#define MSI_IRQ_OFFSET 4
+/*
+ * error IRQ bits. Enable following errors
+ * - ERR_AER - ECRC error - BIT(5)
+ * - ERR_AXI - AXI tag lookup fatal error BIT(4)
+ * - ERR_CORR - Correctable error BIT(3)
+ * - ERR_NONFATAL - Non fatal error BIT(2)
+ * - ERR_FATAL - Fatal error BIT(1)
+ * - ERR_SYS - System error (fatal, nonfatal or correctable error)
+ */
+#define ERR_AER BIT(5)
+#define ERR_AXI BIT(4)
+#define ERR_CORR BIT(3)
+#define ERR_NONFATAL BIT(2)
+#define ERR_FATAL BIT(1)
+#define ERR_SYS BIT(0)
+#define ERR_IRQ_ALL (ERR_AER | ERR_AXI | ERR_CORR | \
+ ERR_NONFATAL | ERR_FATAL | ERR_SYS)
+#define ERR_FATAL_IRQ (ERR_FATAL | ERR_AXI)
+#define ERR_IRQ_STATUS_RAW 0x1c0
+#define ERR_IRQ_STATUS 0x1c4
+#define ERR_IRQ_ENABLE_SET 0x1c8
+#define ERR_IRQ_ENABLE_CLR 0x1cc
+
/* Config space registers */
#define DEBUG0 0x728
@@ -248,6 +271,29 @@ void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset)
writel(offset, ks_pcie->va_app_base + IRQ_EOI);
}
+void ks_dw_pcie_enable_error_irq(void __iomem *reg_base)
+{
+ writel(ERR_IRQ_ALL, reg_base + ERR_IRQ_ENABLE_SET);
+}
+
+bool ks_dw_pcie_handle_error_irq(struct device *dev, void __iomem *reg_base)
+{
+ u32 status;
+ bool ret = false;
+
+ status = readl(reg_base + ERR_IRQ_STATUS_RAW) & ERR_IRQ_ALL;
+ if (status) {
+ /* The PCIESS interrupt status buts are "write 1 to clear" */
+ if (status & ERR_FATAL_IRQ)
+ dev_err(dev, "PCIE fatal error detected\n");
+
+ /* ack the irq event. */
+ writel(status, reg_base + ERR_IRQ_STATUS);
+ ret = true;
+ }
+ return ret;
+}
+
static void ks_dw_pcie_ack_legacy_irq(struct irq_data *d)
{
}
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index b71f55b..299f2f0 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -15,6 +15,7 @@
#include <linux/irqchip/chained_irq.h>
#include <linux/clk.h>
#include <linux/delay.h>
+#include <linux/interrupt.h>
#include <linux/irqdomain.h>
#include <linux/module.h>
#include <linux/msi.h>
@@ -226,6 +227,10 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
ks_pcie);
}
}
+
+ /* enable error interrupt */
+ if (ks_pcie->error_irq > 0)
+ ks_dw_pcie_enable_error_irq(ks_pcie->va_app_base);
}
/*
@@ -289,6 +294,16 @@ static struct pcie_host_ops keystone_pcie_host_ops = {
.scan_bus = ks_dw_pcie_v3_65_scan_bus,
};
+static irqreturn_t pcie_err_irq_handler(int irq, void *priv)
+{
+ struct keystone_pcie *ks_pcie = priv;
+
+ if (ks_dw_pcie_handle_error_irq(ks_pcie->pp.dev, ks_pcie->va_app_base))
+ return IRQ_HANDLED;
+
+ return IRQ_NONE;
+}
+
static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
struct platform_device *pdev)
{
@@ -309,6 +324,22 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
return ret;
}
+ /*
+ * index 0 is the platform interrupt for error interrupt
+ * from RC. As this is optional to define this, we will
+ * just print a warning
+ */
+ ks_pcie->error_irq = irq_of_parse_and_map(ks_pcie->np, 0);
+ if (ks_pcie->error_irq <= 0)
+ dev_warn(&pdev->dev, "No error irq defined\n");
+ else {
+ if (request_irq(ks_pcie->error_irq, pcie_err_irq_handler,
+ IRQF_SHARED, "pcie-error-irq", ks_pcie) < 0) {
+ dev_err(&pdev->dev, "failed to request error irq\n");
+ return ret;
+ }
+ }
+
pp->root_bus_nr = -1;
pp->ops = &keystone_pcie_host_ops;
ret = ks_dw_pcie_host_init(ks_pcie, ks_pcie->msi_intc_np);
@@ -376,6 +407,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
devm_release_mem_region(dev, res->start, resource_size(res));
pp->dev = dev;
+ ks_pcie->np = node;
platform_set_drvdata(pdev, ks_pcie);
ks_pcie->clk = devm_clk_get(dev, "pcie");
if (IS_ERR(ks_pcie->clk)) {
diff --git a/drivers/pci/host/pci-keystone.h b/drivers/pci/host/pci-keystone.h
index f0944e8..2daa215 100644
--- a/drivers/pci/host/pci-keystone.h
+++ b/drivers/pci/host/pci-keystone.h
@@ -29,6 +29,10 @@ struct keystone_pcie {
int msi_host_irqs[MAX_MSI_HOST_IRQS];
struct device_node *msi_intc_np;
struct irq_domain *legacy_irq_domain;
+ struct device_node *np;
+
+ /* error interrupt */
+ int error_irq;
/* Application register space */
void __iomem *va_app_base;
@@ -42,6 +46,8 @@ phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp);
/* Keystone specific PCI controller APIs */
void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie);
void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset);
+void ks_dw_pcie_enable_error_irq(void __iomem *reg_base);
+bool ks_dw_pcie_handle_error_irq(struct device *dev, void __iomem *reg_base);
int ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
struct device_node *msi_intc_np);
int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH next 2/2] PCI: keystone: remove unnecessary goto statement
2016-03-22 19:52 [PATCH next 1/2] PCI: keystone: add pci error irq handler Murali Karicheri
@ 2016-03-22 19:52 ` Murali Karicheri
2016-03-22 22:23 ` [PATCH next 1/2] PCI: keystone: add pci error irq handler kbuild test robot
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Murali Karicheri @ 2016-03-22 19:52 UTC (permalink / raw)
To: devicetree, linux-kernel, linux-pci, linux-arm-kernel, bhelgaas
Fix the misuse of goto statement in ks_pcie_get_irq_controller_info()
as simple return is more appropriate for this function. While at
it add an error log for absence of interrupt controller node.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pci-keystone.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 299f2f0..3563b9c 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -181,11 +181,13 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
*np_temp = of_find_node_by_name(np_pcie, controller);
if (!(*np_temp)) {
dev_err(dev, "Node for %s is absent\n", controller);
- goto out;
+ return ret;
}
temp = of_irq_count(*np_temp);
- if (!temp)
- goto out;
+ if (!temp) {
+ dev_err(dev, "No entries in %s\n", controller);
+ return ret;
+ }
if (temp > max_host_irqs)
dev_warn(dev, "Too many %s interrupts defined %u\n",
(legacy ? "legacy" : "MSI"), temp);
@@ -203,7 +205,6 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
*num_irqs = temp;
ret = 0;
}
-out:
return ret;
}
@@ -231,6 +232,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
/* enable error interrupt */
if (ks_pcie->error_irq > 0)
ks_dw_pcie_enable_error_irq(ks_pcie->va_app_base);
+
}
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH next 1/2] PCI: keystone: add pci error irq handler
2016-03-22 19:52 [PATCH next 1/2] PCI: keystone: add pci error irq handler Murali Karicheri
2016-03-22 19:52 ` [PATCH next 2/2] PCI: keystone: remove unnecessary goto statement Murali Karicheri
@ 2016-03-22 22:23 ` kbuild test robot
2016-03-24 21:36 ` Murali Karicheri
2016-04-06 17:11 ` Murali Karicheri
2016-03-23 15:10 ` Rob Herring
2016-03-31 22:11 ` Murali Karicheri
3 siblings, 2 replies; 7+ messages in thread
From: kbuild test robot @ 2016-03-22 22:23 UTC (permalink / raw)
To: Murali Karicheri
Cc: kbuild-all, devicetree, linux-kernel, linux-pci,
linux-arm-kernel, bhelgaas
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
Hi Murali,
[auto build test ERROR on next-20160322]
url: https://github.com/0day-ci/linux/commits/Murali-Karicheri/PCI-keystone-add-pci-error-irq-handler/20160323-035516
config: arm-multi_v7_defconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
drivers/pci/host/pci-keystone.c: In function 'ks_pcie_probe':
>> drivers/pci/host/pci-keystone.c:410:16: error: 'node' undeclared (first use in this function)
ks_pcie->np = node;
^
drivers/pci/host/pci-keystone.c:410:16: note: each undeclared identifier is reported only once for each function it appears in
vim +/node +410 drivers/pci/host/pci-keystone.c
404 return PTR_ERR(reg_p);
405 ks_pcie->device_id = readl(reg_p) >> 16;
406 devm_iounmap(dev, reg_p);
407 devm_release_mem_region(dev, res->start, resource_size(res));
408
409 pp->dev = dev;
> 410 ks_pcie->np = node;
411 platform_set_drvdata(pdev, ks_pcie);
412 ks_pcie->clk = devm_clk_get(dev, "pcie");
413 if (IS_ERR(ks_pcie->clk)) {
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 37256 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH next 1/2] PCI: keystone: add pci error irq handler
2016-03-22 19:52 [PATCH next 1/2] PCI: keystone: add pci error irq handler Murali Karicheri
2016-03-22 19:52 ` [PATCH next 2/2] PCI: keystone: remove unnecessary goto statement Murali Karicheri
2016-03-22 22:23 ` [PATCH next 1/2] PCI: keystone: add pci error irq handler kbuild test robot
@ 2016-03-23 15:10 ` Rob Herring
2016-03-31 22:11 ` Murali Karicheri
3 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2016-03-23 15:10 UTC (permalink / raw)
To: Murali Karicheri
Cc: devicetree, linux-kernel, linux-pci, linux-arm-kernel, bhelgaas
On Tue, Mar 22, 2016 at 03:52:57PM -0400, Murali Karicheri wrote:
> Keystone PCI hardware generates error interrupts at RC using platform
> irq instead of standard msi/legacy irq. Add a simple error handler that
> logs the fatal interrupt status to the console.
>
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Pawel Moll <pawel.moll@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
> Cc: Kumar Gala <galak@codeaurora.org>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> ---
> .../devicetree/bindings/pci/pci-keystone.txt | 1 +
Acked-by: Rob Herring <robh@kernel.org>
> drivers/pci/host/pci-keystone-dw.c | 46 ++++++++++++++++++++++
> drivers/pci/host/pci-keystone.c | 32 +++++++++++++++
> drivers/pci/host/pci-keystone.h | 6 +++
> 4 files changed, 85 insertions(+)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH next 1/2] PCI: keystone: add pci error irq handler
2016-03-22 22:23 ` [PATCH next 1/2] PCI: keystone: add pci error irq handler kbuild test robot
@ 2016-03-24 21:36 ` Murali Karicheri
2016-04-06 17:11 ` Murali Karicheri
1 sibling, 0 replies; 7+ messages in thread
From: Murali Karicheri @ 2016-03-24 21:36 UTC (permalink / raw)
To: kbuild test robot
Cc: kbuild-all, devicetree, linux-kernel, linux-pci,
linux-arm-kernel, bhelgaas
On 03/22/2016 06:23 PM, kbuild test robot wrote:
> Hi Murali,
>
> [auto build test ERROR on next-20160322]
>
> url: https://github.com/0day-ci/linux/commits/Murali-Karicheri/PCI-keystone-add-pci-error-irq-handler/20160323-035516
> config: arm-multi_v7_defconfig (attached as .config)
> reproduce:
> wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # save the attached .config to linux build tree
> make.cross ARCH=arm
>
> All errors (new ones prefixed by >>):
>
> drivers/pci/host/pci-keystone.c: In function 'ks_pcie_probe':
>>> drivers/pci/host/pci-keystone.c:410:16: error: 'node' undeclared (first use in this function)
> ks_pcie->np = node;
> ^
> drivers/pci/host/pci-keystone.c:410:16: note: each undeclared identifier is reported only once for each function it appears in
>
> vim +/node +410 drivers/pci/host/pci-keystone.c
>
> 404 return PTR_ERR(reg_p);
> 405 ks_pcie->device_id = readl(reg_p) >> 16;
> 406 devm_iounmap(dev, reg_p);
> 407 devm_release_mem_region(dev, res->start, resource_size(res));
> 408
> 409 pp->dev = dev;
> > 410 ks_pcie->np = node;
> 411 platform_set_drvdata(pdev, ks_pcie);
> 412 ks_pcie->clk = devm_clk_get(dev, "pcie");
> 413 if (IS_ERR(ks_pcie->clk)) {
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
>
I don't anything obvious to cause this failure. It builds from arm-pci with these patches applied
and I have tried multi_v7_defconfig for arm as well. I will follow the instructions here and
check if I can reproduce this and post a updated a patch.
--
Murali Karicheri
Linux Kernel, Keystone
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH next 1/2] PCI: keystone: add pci error irq handler
2016-03-22 19:52 [PATCH next 1/2] PCI: keystone: add pci error irq handler Murali Karicheri
` (2 preceding siblings ...)
2016-03-23 15:10 ` Rob Herring
@ 2016-03-31 22:11 ` Murali Karicheri
3 siblings, 0 replies; 7+ messages in thread
From: Murali Karicheri @ 2016-03-31 22:11 UTC (permalink / raw)
To: devicetree, linux-kernel, linux-pci, linux-arm-kernel, bhelgaas
On 03/22/2016 03:52 PM, Murali Karicheri wrote:
> Keystone PCI hardware generates error interrupts at RC using platform
> irq instead of standard msi/legacy irq. Add a simple error handler that
> logs the fatal interrupt status to the console.
>
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Pawel Moll <pawel.moll@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
> Cc: Kumar Gala <galak@codeaurora.org>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> ---
> .../devicetree/bindings/pci/pci-keystone.txt | 1 +
> drivers/pci/host/pci-keystone-dw.c | 46 ++++++++++++++++++++++
> drivers/pci/host/pci-keystone.c | 32 +++++++++++++++
> drivers/pci/host/pci-keystone.h | 6 +++
> 4 files changed, 85 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/pci/pci-keystone.txt b/Documentation/devicetree/bindings/pci/pci-keystone.txt
> index 54eae29..d08a4d5 100644
> --- a/Documentation/devicetree/bindings/pci/pci-keystone.txt
> +++ b/Documentation/devicetree/bindings/pci/pci-keystone.txt
> @@ -56,6 +56,7 @@ Optional properties:-
> phy-names: name of the Generic Keystine SerDes phy for PCI
> - If boot loader already does PCI link establishment, then phys and
> phy-names shouldn't be present.
> + interrupts: platform interrupt for error interrupts.
>
> Designware DT Properties not applicable for Keystone PCI
>
> diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
> index ed34c95..524901d 100644
> --- a/drivers/pci/host/pci-keystone-dw.c
> +++ b/drivers/pci/host/pci-keystone-dw.c
> @@ -53,6 +53,29 @@
> #define IRQ_STATUS 0x184
> #define MSI_IRQ_OFFSET 4
>
> +/*
> + * error IRQ bits. Enable following errors
> + * - ERR_AER - ECRC error - BIT(5)
> + * - ERR_AXI - AXI tag lookup fatal error BIT(4)
> + * - ERR_CORR - Correctable error BIT(3)
> + * - ERR_NONFATAL - Non fatal error BIT(2)
> + * - ERR_FATAL - Fatal error BIT(1)
> + * - ERR_SYS - System error (fatal, nonfatal or correctable error)
> + */
> +#define ERR_AER BIT(5)
> +#define ERR_AXI BIT(4)
> +#define ERR_CORR BIT(3)
> +#define ERR_NONFATAL BIT(2)
> +#define ERR_FATAL BIT(1)
> +#define ERR_SYS BIT(0)
> +#define ERR_IRQ_ALL (ERR_AER | ERR_AXI | ERR_CORR | \
> + ERR_NONFATAL | ERR_FATAL | ERR_SYS)
> +#define ERR_FATAL_IRQ (ERR_FATAL | ERR_AXI)
> +#define ERR_IRQ_STATUS_RAW 0x1c0
> +#define ERR_IRQ_STATUS 0x1c4
> +#define ERR_IRQ_ENABLE_SET 0x1c8
> +#define ERR_IRQ_ENABLE_CLR 0x1cc
> +
> /* Config space registers */
> #define DEBUG0 0x728
>
> @@ -248,6 +271,29 @@ void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset)
> writel(offset, ks_pcie->va_app_base + IRQ_EOI);
> }
>
> +void ks_dw_pcie_enable_error_irq(void __iomem *reg_base)
> +{
> + writel(ERR_IRQ_ALL, reg_base + ERR_IRQ_ENABLE_SET);
> +}
> +
> +bool ks_dw_pcie_handle_error_irq(struct device *dev, void __iomem *reg_base)
> +{
> + u32 status;
> + bool ret = false;
> +
> + status = readl(reg_base + ERR_IRQ_STATUS_RAW) & ERR_IRQ_ALL;
> + if (status) {
> + /* The PCIESS interrupt status buts are "write 1 to clear" */
> + if (status & ERR_FATAL_IRQ)
> + dev_err(dev, "PCIE fatal error detected\n");
> +
> + /* ack the irq event. */
> + writel(status, reg_base + ERR_IRQ_STATUS);
> + ret = true;
> + }
> + return ret;
> +}
> +
> static void ks_dw_pcie_ack_legacy_irq(struct irq_data *d)
> {
> }
> diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
> index b71f55b..299f2f0 100644
> --- a/drivers/pci/host/pci-keystone.c
> +++ b/drivers/pci/host/pci-keystone.c
> @@ -15,6 +15,7 @@
> #include <linux/irqchip/chained_irq.h>
> #include <linux/clk.h>
> #include <linux/delay.h>
> +#include <linux/interrupt.h>
> #include <linux/irqdomain.h>
> #include <linux/module.h>
> #include <linux/msi.h>
> @@ -226,6 +227,10 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
> ks_pcie);
> }
> }
> +
> + /* enable error interrupt */
> + if (ks_pcie->error_irq > 0)
> + ks_dw_pcie_enable_error_irq(ks_pcie->va_app_base);
> }
>
> /*
> @@ -289,6 +294,16 @@ static struct pcie_host_ops keystone_pcie_host_ops = {
> .scan_bus = ks_dw_pcie_v3_65_scan_bus,
> };
>
> +static irqreturn_t pcie_err_irq_handler(int irq, void *priv)
> +{
> + struct keystone_pcie *ks_pcie = priv;
> +
> + if (ks_dw_pcie_handle_error_irq(ks_pcie->pp.dev, ks_pcie->va_app_base))
> + return IRQ_HANDLED;
> +
> + return IRQ_NONE;
> +}
> +
> static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
> struct platform_device *pdev)
> {
> @@ -309,6 +324,22 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
> return ret;
> }
>
> + /*
> + * index 0 is the platform interrupt for error interrupt
> + * from RC. As this is optional to define this, we will
> + * just print a warning
> + */
> + ks_pcie->error_irq = irq_of_parse_and_map(ks_pcie->np, 0);
> + if (ks_pcie->error_irq <= 0)
> + dev_warn(&pdev->dev, "No error irq defined\n");
> + else {
> + if (request_irq(ks_pcie->error_irq, pcie_err_irq_handler,
> + IRQF_SHARED, "pcie-error-irq", ks_pcie) < 0) {
> + dev_err(&pdev->dev, "failed to request error irq\n");
> + return ret;
> + }
> + }
> +
> pp->root_bus_nr = -1;
> pp->ops = &keystone_pcie_host_ops;
> ret = ks_dw_pcie_host_init(ks_pcie, ks_pcie->msi_intc_np);
> @@ -376,6 +407,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
> devm_release_mem_region(dev, res->start, resource_size(res));
>
> pp->dev = dev;
> + ks_pcie->np = node;
> platform_set_drvdata(pdev, ks_pcie);
> ks_pcie->clk = devm_clk_get(dev, "pcie");
> if (IS_ERR(ks_pcie->clk)) {
> diff --git a/drivers/pci/host/pci-keystone.h b/drivers/pci/host/pci-keystone.h
> index f0944e8..2daa215 100644
> --- a/drivers/pci/host/pci-keystone.h
> +++ b/drivers/pci/host/pci-keystone.h
> @@ -29,6 +29,10 @@ struct keystone_pcie {
> int msi_host_irqs[MAX_MSI_HOST_IRQS];
> struct device_node *msi_intc_np;
> struct irq_domain *legacy_irq_domain;
> + struct device_node *np;
> +
> + /* error interrupt */
> + int error_irq;
>
> /* Application register space */
> void __iomem *va_app_base;
> @@ -42,6 +46,8 @@ phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp);
> /* Keystone specific PCI controller APIs */
> void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie);
> void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset);
> +void ks_dw_pcie_enable_error_irq(void __iomem *reg_base);
> +bool ks_dw_pcie_handle_error_irq(struct device *dev, void __iomem *reg_base);
> int ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
> struct device_node *msi_intc_np);
> int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
>
Bjorn,
Will you be applying this to your PCI next branch?
--
Murali Karicheri
Linux Kernel, Keystone
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH next 1/2] PCI: keystone: add pci error irq handler
2016-03-22 22:23 ` [PATCH next 1/2] PCI: keystone: add pci error irq handler kbuild test robot
2016-03-24 21:36 ` Murali Karicheri
@ 2016-04-06 17:11 ` Murali Karicheri
1 sibling, 0 replies; 7+ messages in thread
From: Murali Karicheri @ 2016-04-06 17:11 UTC (permalink / raw)
To: kbuild test robot
Cc: kbuild-all, devicetree, linux-kernel, linux-pci,
linux-arm-kernel, bhelgaas
On 03/22/2016 06:23 PM, kbuild test robot wrote:
> Hi Murali,
>
> [auto build test ERROR on next-20160322]
>
> url: https://github.com/0day-ci/linux/commits/Murali-Karicheri/PCI-keystone-add-pci-error-irq-handler/20160323-035516
> config: arm-multi_v7_defconfig (attached as .config)
> reproduce:
> wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # save the attached .config to linux build tree
> make.cross ARCH=arm
>
> All errors (new ones prefixed by >>):
>
> drivers/pci/host/pci-keystone.c: In function 'ks_pcie_probe':
>>> drivers/pci/host/pci-keystone.c:410:16: error: 'node' undeclared (first use in this function)
> ks_pcie->np = node;
> ^
> drivers/pci/host/pci-keystone.c:410:16: note: each undeclared identifier is reported only once for each function it appears in
>
> vim +/node +410 drivers/pci/host/pci-keystone.c
>
> 404 return PTR_ERR(reg_p);
> 405 ks_pcie->device_id = readl(reg_p) >> 16;
> 406 devm_iounmap(dev, reg_p);
> 407 devm_release_mem_region(dev, res->start, resource_size(res));
> 408
> 409 pp->dev = dev;
> > 410 ks_pcie->np = node;
> 411 platform_set_drvdata(pdev, ks_pcie);
> 412 ks_pcie->clk = devm_clk_get(dev, "pcie");
> 413 if (IS_ERR(ks_pcie->clk)) {
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
>
I had posted v1 of this patch which is still waiting to be applied. Wondering
who is going to pick this up?
--
Murali Karicheri
Linux Kernel, Keystone
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-04-06 17:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-22 19:52 [PATCH next 1/2] PCI: keystone: add pci error irq handler Murali Karicheri
2016-03-22 19:52 ` [PATCH next 2/2] PCI: keystone: remove unnecessary goto statement Murali Karicheri
2016-03-22 22:23 ` [PATCH next 1/2] PCI: keystone: add pci error irq handler kbuild test robot
2016-03-24 21:36 ` Murali Karicheri
2016-04-06 17:11 ` Murali Karicheri
2016-03-23 15:10 ` Rob Herring
2016-03-31 22:11 ` Murali Karicheri
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).