[tip:irq/core] irqchip/mvebu-gicp: Use level-triggered MSIs between ICU and GICP

[tip-bot for Marc Zyngier]

Commit-ID:  25eaaabb51c9925dc65f5b54fd9a362bf118e70a
Gitweb: https://git.kernel.org/tip/25eaaabb51c9925dc65f5b54fd9a362bf118e70a
Author: Marc Zyngier 
AuthorDate: Tue, 8 May 2018 13:14:32 +0100
Committer:  Thomas Gleixner 
CommitDate: Sun, 13 May 2018 15:59:00 +0200

irqchip/mvebu-gicp: Use level-triggered MSIs between ICU and GICP

The ICU and GICP drivers are using an ugly side-band mechanism to
find out about the "clear" doorbell when using level interrupts.

Let's convert it to level-triggered MSIs, which result in a nice
cleanup.

Signed-off-by: Marc Zyngier 
Signed-off-by: Thomas Gleixner 
Tested-by: Miquel Raynal 
Cc: Rob Herring 
Cc: Jason Cooper 
Cc: Ard Biesheuvel 
Cc: Srinivas Kandagatla 
Cc: Thomas Petazzoni 
Link: https://lkml.kernel.org/r/20180508121438.11301-4-marc.zyng...@arm.com

---
 drivers/irqchip/irq-mvebu-gicp.c | 38 +++---
 drivers/irqchip/irq-mvebu-gicp.h | 12 
 drivers/irqchip/irq-mvebu-icu.c  | 33 +
 3 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/drivers/irqchip/irq-mvebu-gicp.c b/drivers/irqchip/irq-mvebu-gicp.c
index 17a4a7b6cdbb..4e17f7081efc 100644
--- a/drivers/irqchip/irq-mvebu-gicp.c
+++ b/drivers/irqchip/irq-mvebu-gicp.c
@@ -19,8 +19,6 @@
 
 #include 
 
-#include "irq-mvebu-gicp.h"
-
 #define GICP_SETSPI_NSR_OFFSET 0x0
 #define GICP_CLRSPI_NSR_OFFSET 0x8
 
@@ -55,34 +53,18 @@ static int gicp_idx_to_spi(struct mvebu_gicp *gicp, int idx)
return -EINVAL;
 }
 
-int mvebu_gicp_get_doorbells(struct device_node *dn, phys_addr_t *setspi,
-phys_addr_t *clrspi)
-{
-   struct platform_device *pdev;
-   struct mvebu_gicp *gicp;
-
-   pdev = of_find_device_by_node(dn);
-   if (!pdev)
-   return -ENODEV;
-
-   gicp = platform_get_drvdata(pdev);
-   if (!gicp)
-   return -ENODEV;
-
-   *setspi = gicp->res->start + GICP_SETSPI_NSR_OFFSET;
-   *clrspi = gicp->res->start + GICP_CLRSPI_NSR_OFFSET;
-
-   return 0;
-}
-
 static void gicp_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
 {
struct mvebu_gicp *gicp = data->chip_data;
phys_addr_t setspi = gicp->res->start + GICP_SETSPI_NSR_OFFSET;
-
-   msg->data = data->hwirq;
-   msg->address_lo = lower_32_bits(setspi);
-   msg->address_hi = upper_32_bits(setspi);
+   phys_addr_t clrspi = gicp->res->start + GICP_CLRSPI_NSR_OFFSET;
+
+   msg[0].data = data->hwirq;
+   msg[0].address_lo = lower_32_bits(setspi);
+   msg[0].address_hi = upper_32_bits(setspi);
+   msg[1].data = data->hwirq;
+   msg[1].address_lo = lower_32_bits(clrspi);
+   msg[1].address_hi = upper_32_bits(clrspi);
 }
 
 static struct irq_chip gicp_irq_chip = {
@@ -170,13 +152,15 @@ static const struct irq_domain_ops gicp_domain_ops = {
 static struct irq_chip gicp_msi_irq_chip = {
.name   = "GICP",
.irq_set_type   = irq_chip_set_type_parent,
+   .flags  = IRQCHIP_SUPPORTS_LEVEL_MSI,
 };
 
 static struct msi_domain_ops gicp_msi_ops = {
 };
 
 static struct msi_domain_info gicp_msi_domain_info = {
-   .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
+   .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
+  MSI_FLAG_LEVEL_CAPABLE),
.ops= _msi_ops,
.chip   = _msi_irq_chip,
 };
diff --git a/drivers/irqchip/irq-mvebu-gicp.h b/drivers/irqchip/irq-mvebu-gicp.h
deleted file mode 100644
index eaa12fb72102..
--- a/drivers/irqchip/irq-mvebu-gicp.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __MVEBU_GICP_H__
-#define __MVEBU_GICP_H__
-
-#include 
-
-struct device_node;
-
-int mvebu_gicp_get_doorbells(struct device_node *dn, phys_addr_t *setspi,
-phys_addr_t *clrspi);
-
-#endif /* __MVEBU_GICP_H__ */
diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c
index e18c48d3a92e..13063339b416 100644
--- a/drivers/irqchip/irq-mvebu-icu.c
+++ b/drivers/irqchip/irq-mvebu-icu.c
@@ -21,8 +21,6 @@
 
 #include 
 
-#include "irq-mvebu-gicp.h"
-
 /* ICU registers */
 #define ICU_SETSPI_NSR_AL  0x10
 #define ICU_SETSPI_NSR_AH  0x14
@@ -43,6 +41,7 @@ struct mvebu_icu {
void __iomem *base;
struct irq_domain *domain;
struct device *dev;
+   atomic_t initialized;
 };
 
 struct mvebu_icu_irq_data {
@@ -51,6 +50,18 @@ struct mvebu_icu_irq_data {
unsigned int type;
 };
 
+static void mvebu_icu_init(struct mvebu_icu *icu, struct msi_msg *msg)
+{
+   if (atomic_cmpxchg(>initialized, false, true))
+   return;
+
+   /* Set Clear/Set ICU SPI message address 

[tip:irq/core] irqchip/mvebu-gicp: Use level-triggered MSIs between ICU and GICP

[tip-bot for Marc Zyngier]

Commit-ID:  25eaaabb51c9925dc65f5b54fd9a362bf118e70a
Gitweb: https://git.kernel.org/tip/25eaaabb51c9925dc65f5b54fd9a362bf118e70a
Author: Marc Zyngier 
AuthorDate: Tue, 8 May 2018 13:14:32 +0100
Committer:  Thomas Gleixner 
CommitDate: Sun, 13 May 2018 15:59:00 +0200

irqchip/mvebu-gicp: Use level-triggered MSIs between ICU and GICP

The ICU and GICP drivers are using an ugly side-band mechanism to
find out about the "clear" doorbell when using level interrupts.

Let's convert it to level-triggered MSIs, which result in a nice
cleanup.

Signed-off-by: Marc Zyngier 
Signed-off-by: Thomas Gleixner 
Tested-by: Miquel Raynal 
Cc: Rob Herring 
Cc: Jason Cooper 
Cc: Ard Biesheuvel 
Cc: Srinivas Kandagatla 
Cc: Thomas Petazzoni 
Link: https://lkml.kernel.org/r/20180508121438.11301-4-marc.zyng...@arm.com

---
 drivers/irqchip/irq-mvebu-gicp.c | 38 +++---
 drivers/irqchip/irq-mvebu-gicp.h | 12 
 drivers/irqchip/irq-mvebu-icu.c  | 33 +
 3 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/drivers/irqchip/irq-mvebu-gicp.c b/drivers/irqchip/irq-mvebu-gicp.c
index 17a4a7b6cdbb..4e17f7081efc 100644
--- a/drivers/irqchip/irq-mvebu-gicp.c
+++ b/drivers/irqchip/irq-mvebu-gicp.c
@@ -19,8 +19,6 @@
 
 #include 
 
-#include "irq-mvebu-gicp.h"
-
 #define GICP_SETSPI_NSR_OFFSET 0x0
 #define GICP_CLRSPI_NSR_OFFSET 0x8
 
@@ -55,34 +53,18 @@ static int gicp_idx_to_spi(struct mvebu_gicp *gicp, int idx)
return -EINVAL;
 }
 
-int mvebu_gicp_get_doorbells(struct device_node *dn, phys_addr_t *setspi,
-phys_addr_t *clrspi)
-{
-   struct platform_device *pdev;
-   struct mvebu_gicp *gicp;
-
-   pdev = of_find_device_by_node(dn);
-   if (!pdev)
-   return -ENODEV;
-
-   gicp = platform_get_drvdata(pdev);
-   if (!gicp)
-   return -ENODEV;
-
-   *setspi = gicp->res->start + GICP_SETSPI_NSR_OFFSET;
-   *clrspi = gicp->res->start + GICP_CLRSPI_NSR_OFFSET;
-
-   return 0;
-}
-
 static void gicp_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
 {
struct mvebu_gicp *gicp = data->chip_data;
phys_addr_t setspi = gicp->res->start + GICP_SETSPI_NSR_OFFSET;
-
-   msg->data = data->hwirq;
-   msg->address_lo = lower_32_bits(setspi);
-   msg->address_hi = upper_32_bits(setspi);
+   phys_addr_t clrspi = gicp->res->start + GICP_CLRSPI_NSR_OFFSET;
+
+   msg[0].data = data->hwirq;
+   msg[0].address_lo = lower_32_bits(setspi);
+   msg[0].address_hi = upper_32_bits(setspi);
+   msg[1].data = data->hwirq;
+   msg[1].address_lo = lower_32_bits(clrspi);
+   msg[1].address_hi = upper_32_bits(clrspi);
 }
 
 static struct irq_chip gicp_irq_chip = {
@@ -170,13 +152,15 @@ static const struct irq_domain_ops gicp_domain_ops = {
 static struct irq_chip gicp_msi_irq_chip = {
.name   = "GICP",
.irq_set_type   = irq_chip_set_type_parent,
+   .flags  = IRQCHIP_SUPPORTS_LEVEL_MSI,
 };
 
 static struct msi_domain_ops gicp_msi_ops = {
 };
 
 static struct msi_domain_info gicp_msi_domain_info = {
-   .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
+   .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
+  MSI_FLAG_LEVEL_CAPABLE),
.ops= _msi_ops,
.chip   = _msi_irq_chip,
 };
diff --git a/drivers/irqchip/irq-mvebu-gicp.h b/drivers/irqchip/irq-mvebu-gicp.h
deleted file mode 100644
index eaa12fb72102..
--- a/drivers/irqchip/irq-mvebu-gicp.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __MVEBU_GICP_H__
-#define __MVEBU_GICP_H__
-
-#include 
-
-struct device_node;
-
-int mvebu_gicp_get_doorbells(struct device_node *dn, phys_addr_t *setspi,
-phys_addr_t *clrspi);
-
-#endif /* __MVEBU_GICP_H__ */
diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c
index e18c48d3a92e..13063339b416 100644
--- a/drivers/irqchip/irq-mvebu-icu.c
+++ b/drivers/irqchip/irq-mvebu-icu.c
@@ -21,8 +21,6 @@
 
 #include 
 
-#include "irq-mvebu-gicp.h"
-
 /* ICU registers */
 #define ICU_SETSPI_NSR_AL  0x10
 #define ICU_SETSPI_NSR_AH  0x14
@@ -43,6 +41,7 @@ struct mvebu_icu {
void __iomem *base;
struct irq_domain *domain;
struct device *dev;
+   atomic_t initialized;
 };
 
 struct mvebu_icu_irq_data {
@@ -51,6 +50,18 @@ struct mvebu_icu_irq_data {
unsigned int type;
 };
 
+static void mvebu_icu_init(struct mvebu_icu *icu, struct msi_msg *msg)
+{
+   if (atomic_cmpxchg(>initialized, false, true))
+   return;
+
+   /* Set Clear/Set ICU SPI message address in AP */
+   writel_relaxed(msg[0].address_hi, icu->base + ICU_SETSPI_NSR_AH);
+   writel_relaxed(msg[0].address_lo, icu->base + ICU_SETSPI_NSR_AL);
+   writel_relaxed(msg[1].address_hi, icu->base + ICU_CLRSPI_NSR_AH);
+