[PATCH v3 3/8] irqchip/gic-v3-its: Split probing from its node initialization

[Robert Richter]

To initialize the its nodes at a later point during boot, we need to
split probing from initialization. Collect all information required
for initialization in struct its_node. We can then use the its node
list for initialization.

Signed-off-by: Robert Richter 
---
 drivers/irqchip/irq-gic-v3-its.c   | 95 ++
 drivers/irqchip/irq-gic-v3.c   |  2 +-
 include/linux/irqchip/arm-gic-v3.h |  4 +-
 3 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 92c66c86a63f..b51a1208588b 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -75,10 +75,12 @@ struct its_baser {
  * list of devices writing to it.
  */
 struct its_node {
+   struct fwnode_handle*fwnode;
raw_spinlock_t  lock;
struct list_headentry;
void __iomem*base;
phys_addr_t phys_base;
+   phys_addr_t phys_size;
struct its_cmd_block*cmd_base;
struct its_cmd_block*cmd_write;
struct its_basertables[GITS_BASER_NR_REGS];
@@ -1647,7 +1649,7 @@ static void its_enable_quirks(struct its_node *its)
gic_enable_quirks(iidr, its_quirks, its);
 }
 
-static int its_init_domain(struct fwnode_handle *handle, struct its_node *its)
+static int its_init_domain(struct its_node *its)
 {
struct irq_domain *inner_domain;
struct msi_domain_info *info;
@@ -1656,7 +1658,7 @@ static int its_init_domain(struct fwnode_handle *handle, 
struct its_node *its)
if (!info)
return -ENOMEM;
 
-   inner_domain = irq_domain_create_tree(handle, _domain_ops, its);
+   inner_domain = irq_domain_create_tree(its->fwnode, _domain_ops, 
its);
if (!inner_domain) {
kfree(info);
return -ENOMEM;
@@ -1672,55 +1674,83 @@ static int its_init_domain(struct fwnode_handle 
*handle, struct its_node *its)
return 0;
 }
 
+static void its_free(struct its_node *its)
+{
+   spin_lock(_lock);
+   list_del(>entry);
+   spin_unlock(_lock);
+
+   kfree(its);
+}
+
+static int __init its_init_one(struct its_node *its);
+
 static int __init its_probe_one(struct resource *res,
struct fwnode_handle *handle, int numa_node)
 {
struct its_node *its;
+   int err;
+
+   its = kzalloc(sizeof(*its), GFP_KERNEL);
+   if (!its)
+   return -ENOMEM;
+
+   raw_spin_lock_init(>lock);
+   INIT_LIST_HEAD(>entry);
+   INIT_LIST_HEAD(>its_device_list);
+   its->fwnode = handle;
+   its->phys_base = res->start;
+   its->phys_size = resource_size(res);
+   its->numa_node = numa_node;
+
+   spin_lock(_lock);
+   list_add_tail(>entry, _nodes);
+   spin_unlock(_lock);
+
+   pr_info("ITS %pR\n", res);
+
+   err = its_init_one(its);
+   if (err)
+   its_free(its);
+
+   return err;
+}
+
+static int __init its_init_one(struct its_node *its)
+{
void __iomem *its_base;
u32 val;
u64 baser, tmp;
int err;
 
-   its_base = ioremap(res->start, resource_size(res));
+   its_base = ioremap(its->phys_base, its->phys_size);
if (!its_base) {
-   pr_warn("ITS@%pa: Unable to map ITS registers\n", >start);
-   return -ENOMEM;
+   pr_warn("ITS@%pa: Unable to map ITS registers\n", 
>phys_base);
+   err = -ENOMEM;
+   goto fail;
}
 
val = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;
if (val != 0x30 && val != 0x40) {
-   pr_warn("ITS@%pa: No ITS detected, giving up\n", >start);
+   pr_warn("ITS@%pa: No ITS detected, giving up\n", 
>phys_base);
err = -ENODEV;
goto out_unmap;
}
 
err = its_force_quiescent(its_base);
if (err) {
-   pr_warn("ITS@%pa: Failed to quiesce, giving up\n", >start);
-   goto out_unmap;
-   }
-
-   pr_info("ITS %pR\n", res);
-
-   its = kzalloc(sizeof(*its), GFP_KERNEL);
-   if (!its) {
-   err = -ENOMEM;
+   pr_warn("ITS@%pa: Failed to quiesce, giving up\n", 
>phys_base);
goto out_unmap;
}
 
-   raw_spin_lock_init(>lock);
-   INIT_LIST_HEAD(>entry);
-   INIT_LIST_HEAD(>its_device_list);
its->base = its_base;
-   its->phys_base = res->start;
its->ite_size = ((gic_read_typer(its_base + GITS_TYPER) >> 4) & 0xf) + 
1;
-   its->numa_node = numa_node;
 
its->cmd_base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
get_order(ITS_CMD_QUEUE_SZ));
if (!its->cmd_base) {
err = -ENOMEM;
-   goto out_free_its;
+   goto out_unmap;
}

[PATCH v3 3/8] irqchip/gic-v3-its: Split probing from its node initialization

[Robert Richter]

To initialize the its nodes at a later point during boot, we need to
split probing from initialization. Collect all information required
for initialization in struct its_node. We can then use the its node
list for initialization.

Signed-off-by: Robert Richter 
---
 drivers/irqchip/irq-gic-v3-its.c   | 95 ++
 drivers/irqchip/irq-gic-v3.c   |  2 +-
 include/linux/irqchip/arm-gic-v3.h |  4 +-
 3 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 92c66c86a63f..b51a1208588b 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -75,10 +75,12 @@ struct its_baser {
  * list of devices writing to it.
  */
 struct its_node {
+   struct fwnode_handle*fwnode;
raw_spinlock_t  lock;
struct list_headentry;
void __iomem*base;
phys_addr_t phys_base;
+   phys_addr_t phys_size;
struct its_cmd_block*cmd_base;
struct its_cmd_block*cmd_write;
struct its_basertables[GITS_BASER_NR_REGS];
@@ -1647,7 +1649,7 @@ static void its_enable_quirks(struct its_node *its)
gic_enable_quirks(iidr, its_quirks, its);
 }
 
-static int its_init_domain(struct fwnode_handle *handle, struct its_node *its)
+static int its_init_domain(struct its_node *its)
 {
struct irq_domain *inner_domain;
struct msi_domain_info *info;
@@ -1656,7 +1658,7 @@ static int its_init_domain(struct fwnode_handle *handle, 
struct its_node *its)
if (!info)
return -ENOMEM;
 
-   inner_domain = irq_domain_create_tree(handle, _domain_ops, its);
+   inner_domain = irq_domain_create_tree(its->fwnode, _domain_ops, 
its);
if (!inner_domain) {
kfree(info);
return -ENOMEM;
@@ -1672,55 +1674,83 @@ static int its_init_domain(struct fwnode_handle 
*handle, struct its_node *its)
return 0;
 }
 
+static void its_free(struct its_node *its)
+{
+   spin_lock(_lock);
+   list_del(>entry);
+   spin_unlock(_lock);
+
+   kfree(its);
+}
+
+static int __init its_init_one(struct its_node *its);
+
 static int __init its_probe_one(struct resource *res,
struct fwnode_handle *handle, int numa_node)
 {
struct its_node *its;
+   int err;
+
+   its = kzalloc(sizeof(*its), GFP_KERNEL);
+   if (!its)
+   return -ENOMEM;
+
+   raw_spin_lock_init(>lock);
+   INIT_LIST_HEAD(>entry);
+   INIT_LIST_HEAD(>its_device_list);
+   its->fwnode = handle;
+   its->phys_base = res->start;
+   its->phys_size = resource_size(res);
+   its->numa_node = numa_node;
+
+   spin_lock(_lock);
+   list_add_tail(>entry, _nodes);
+   spin_unlock(_lock);
+
+   pr_info("ITS %pR\n", res);
+
+   err = its_init_one(its);
+   if (err)
+   its_free(its);
+
+   return err;
+}
+
+static int __init its_init_one(struct its_node *its)
+{
void __iomem *its_base;
u32 val;
u64 baser, tmp;
int err;
 
-   its_base = ioremap(res->start, resource_size(res));
+   its_base = ioremap(its->phys_base, its->phys_size);
if (!its_base) {
-   pr_warn("ITS@%pa: Unable to map ITS registers\n", >start);
-   return -ENOMEM;
+   pr_warn("ITS@%pa: Unable to map ITS registers\n", 
>phys_base);
+   err = -ENOMEM;
+   goto fail;
}
 
val = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;
if (val != 0x30 && val != 0x40) {
-   pr_warn("ITS@%pa: No ITS detected, giving up\n", >start);
+   pr_warn("ITS@%pa: No ITS detected, giving up\n", 
>phys_base);
err = -ENODEV;
goto out_unmap;
}
 
err = its_force_quiescent(its_base);
if (err) {
-   pr_warn("ITS@%pa: Failed to quiesce, giving up\n", >start);
-   goto out_unmap;
-   }
-
-   pr_info("ITS %pR\n", res);
-
-   its = kzalloc(sizeof(*its), GFP_KERNEL);
-   if (!its) {
-   err = -ENOMEM;
+   pr_warn("ITS@%pa: Failed to quiesce, giving up\n", 
>phys_base);
goto out_unmap;
}
 
-   raw_spin_lock_init(>lock);
-   INIT_LIST_HEAD(>entry);
-   INIT_LIST_HEAD(>its_device_list);
its->base = its_base;
-   its->phys_base = res->start;
its->ite_size = ((gic_read_typer(its_base + GITS_TYPER) >> 4) & 0xf) + 
1;
-   its->numa_node = numa_node;
 
its->cmd_base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
get_order(ITS_CMD_QUEUE_SZ));
if (!its->cmd_base) {
err = -ENOMEM;
-   goto out_free_its;
+   goto out_unmap;
}
its->cmd_write =