Re: [PATCH v6 06/14] irqchip: gicv3-its: platform-msi: refactor its_pmsi_init() to prepare for ACPI

[Tomasz Nowicki]

Hi,

Can we merge patch 4 & 6 into one patch so that we keep refactoring part 
as one piece ? I do not see a reason to keep them separate or have patch 
5 in between. You can refactor what needs to be refactored, add 
necessary functions to iort.c and then support ACPI for 
irq-gic-v3-its-platform-msi.c

Thanks,
Tomasz

On 02.01.2017 14:31, Hanjun Guo wrote:
Introduce its_pmsi_init_one() to refactor the code to isolate
ACPI&DT common code to prepare for ACPI later.

Signed-off-by: Hanjun Guo <hanjun....@linaro.org>
Tested-by: Sinan Kaya <ok...@codeaurora.org>
Tested-by: Majun <majun...@huawei.com>
Tested-by: Xinwei Kong <kong.kongxin...@hisilicon.com>
Cc: Marc Zyngier <marc.zyng...@arm.com>
Cc: Tomasz Nowicki <t...@semihalf.com>
Cc: Thomas Gleixner <t...@linutronix.de>
---
 drivers/irqchip/irq-gic-v3-its-platform-msi.c | 45 ++++++++++++++++-----------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c 
b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
index 16587a9..ff72704 100644
--- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c
+++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
@@ -84,34 +84,43 @@ static int its_pmsi_prepare(struct irq_domain *domain, 
struct device *dev,
        {},
 };

-static int __init its_pmsi_init(void)
+static int __init its_pmsi_init_one(struct fwnode_handle *fwnode,
+                               const char *name)
 {
-       struct device_node *np;
        struct irq_domain *parent;

+       parent = irq_find_matching_fwnode(fwnode, DOMAIN_BUS_NEXUS);
+       if (!parent || !msi_get_domain_info(parent)) {
+               pr_err("%s: unable to locate ITS domain\n", name);
+               return -ENXIO;
+       }
+
+       if (!platform_msi_create_irq_domain(fwnode, &its_pmsi_domain_info,
+                                           parent)) {
+               pr_err("%s: unable to create platform domain\n", name);
+               return -ENXIO;
+       }
+
+       pr_info("Platform MSI: %s domain created\n", name);
+       return 0;
+}
+
+static void __init its_pmsi_of_init(void)
+{
+       struct device_node *np;
+
        for (np = of_find_matching_node(NULL, its_device_id); np;
             np = of_find_matching_node(np, its_device_id)) {
                if (!of_property_read_bool(np, "msi-controller"))
                        continue;

-               parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS);
-               if (!parent || !msi_get_domain_info(parent)) {
-                       pr_err("%s: unable to locate ITS domain\n",
-                              np->full_name);
-                       continue;
-               }
-
-               if (!platform_msi_create_irq_domain(of_node_to_fwnode(np),
-                                                   &its_pmsi_domain_info,
-                                                   parent)) {
-                       pr_err("%s: unable to create platform domain\n",
-                              np->full_name);
-                       continue;
-               }
-
-               pr_info("Platform MSI: %s domain created\n", np->full_name);
+               its_pmsi_init_one(of_node_to_fwnode(np), np->full_name);
        }
+}

+static int __init its_pmsi_init(void)
+{
+       its_pmsi_of_init();
        return 0;
 }
 early_initcall(its_pmsi_init);