From patchwork Thu Apr 25 10:20:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 162839 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1741876jan; Thu, 25 Apr 2019 03:20:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqweOW39CrqHvsdmdYhp/z7RlIVQzfRHdH0AiX0wZZlT9dUzh+JloEmFkefTJUT81AZ1CvpM X-Received: by 2002:aa7:8b83:: with SMTP id r3mr8289449pfd.248.1556187627345; Thu, 25 Apr 2019 03:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556187627; cv=none; d=google.com; s=arc-20160816; b=MH5xpcO0rDeavzqFNCa64Io7qs6rUc1ONPgLRR1Wj6YgbraDizGlTU9bJrhfonxzwV lpmffto3QNwSqQF71YginJDG0f7WsSF68JvkycEuIk1g/xCqTwqfc9IyCRUp1G8WPc4D 5UC/iZnGnBSy7foPuICDicUI7YajtuXuwBgkFq0Y9hFeK8VcZPBsFemqcsdzS1xdQ1dZ VdzzJFqCi8mgLPq7EtR3k7+Gju5hYhefyWJtY300+WDO9Yj8RKe9noyzi+MBeCyZ0SIY SzSjhDg00b5XYU4CaQqaHY+QUjYNOrfJaeN2kKqzxoK7ErL+3HrBGcLrNFa6qLJ+N8tV JH3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dwxUX4ZrYJxHMDOfE3iUSJEsHb3GI7l9s+2/3rnu8fQ=; b=y/XPSSI7G/itaEmxjWp5zAII7h6g3E9BY5Lqn8oxw5MtkSevg+g8P2Xq1skRVDZ3el W1LRGoZ2Esi2krRCvlWAC6omzEXB3GfJ/Z70wMAOvtIJjEXYjD7RXpF/atUooOsFF5h0 o7vZj3JbAy5Dgf1JMeAEmNWSh/GDwEIVIAyQZvIBIe7RHSHSMBhaWIuu6ZNXjtRyqHU7 WrmShgjHCdhWrngdKGTvx7s6xbNuTN5TLA7EMNUbSQUn6CW5x33cQzqZ8V77SEUOCYC7 03Giv4Xzxa3PlW34evkPgV8o/GkzFuAfhU7tLU2RHsX4KPpGVQY7YMFxXbGU50kTgA55 3JmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ApAtigqE; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w3si22229688plp.260.2019.04.25.03.20.27; Thu, 25 Apr 2019 03:20:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ApAtigqE; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbfDYKU0 (ORCPT + 5 others); Thu, 25 Apr 2019 06:20:26 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41481 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726328AbfDYKU0 (ORCPT ); Thu, 25 Apr 2019 06:20:26 -0400 Received: by mail-wr1-f65.google.com with SMTP id c12so23341565wrt.8 for ; Thu, 25 Apr 2019 03:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dwxUX4ZrYJxHMDOfE3iUSJEsHb3GI7l9s+2/3rnu8fQ=; b=ApAtigqEc5FJzQDBggGDh4RZWVp7mPonV6ELb9WhOv/RfOXH4daHVpOF9Cf7213nmN sYgvlPjFfB077E198Qppx22/8v8oPV+bSNF0UMalrUK7oKg6i1V3V+q7rPJsMiBXMBHg zDaSLtXPnYP/5mhZZY/SUP+iT+iSDFlxpAW8E9RCSCvdIzL/2hSALvFIG9f4i62pq4Fv iL5eVD8SLoEyfm8+BMD6z0h1mOhGIuQb60nRzbihsrCmBSidjP95dt47mel29VtEgcFP TIJDRRtSrGfSh8w2Xq4NGleFDk2RR0h9XvCb9f+3KqFLPbQmPYavmHwlqjhTqUeCxff5 mCcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dwxUX4ZrYJxHMDOfE3iUSJEsHb3GI7l9s+2/3rnu8fQ=; b=ePfIHV7qWrVEhai7DbiHTttDuzP4coN87LEBkbMz6/SrihVNQkHkKW3hKB70tzk43o 8CRtjuycaSitFnBedX8q0QZEGOaG8hYzg5lHk9Sa8xsSagtLGfJtkeduatmeyRbeNDHj k4gatk8XHG1H6dZznEWbjWA5JMtRWDGfJmZ7orKY+kFOfEO6FQC3oOSlIhmzAlXEAQpI w1+4xlDqGXKSuhDfGqvXUrDV3pJPo6vm867568f0jnxhrJHEET8XfAzVyU2HEnfLSBkI E+aN3Mgyz7velPyjVw7ublReGUHSzPsZHHyabBXzS26XAI8sOwm9YhC2+KSTMuY4z6Dg KGFw== X-Gm-Message-State: APjAAAXVnsPK2iCMh6whrMXiweZKyqmx5KBvRLS3gTfjn0ibRb5+d7rn yzioJ2WKuHbcuCMDZzaWyXelTUok7ReMEw== X-Received: by 2002:a5d:4087:: with SMTP id o7mr26597083wrp.9.1556187624228; Thu, 25 Apr 2019 03:20:24 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:95f:9014:5be9:5288]) by smtp.gmail.com with ESMTPSA id p18sm5611364wrp.38.2019.04.25.03.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 03:20:23 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Ard Biesheuvel , Masahisa Kojima , Linus Walleij , Marc Zyngier , Graeme Gregory Subject: [RFC PATCH 1/3] irqchip/exiu: preparatory refactor for ACPI support Date: Thu, 25 Apr 2019 12:20:18 +0200 Message-Id: <20190425102020.21533-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425102020.21533-1-ard.biesheuvel@linaro.org> References: <20190425102020.21533-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org In preparation of exposing the EXIU controller as the irqchip part of the GPIO controller, split the DT init function in a DT specific and a generic part, where the latter will be reused for ACPI support later. Signed-off-by: Ard Biesheuvel --- drivers/irqchip/irq-sni-exiu.c | 77 ++++++++++++-------- 1 file changed, 48 insertions(+), 29 deletions(-) -- 2.20.1 diff --git a/drivers/irqchip/irq-sni-exiu.c b/drivers/irqchip/irq-sni-exiu.c index 1927b2f36ff6..52ce662334d4 100644 --- a/drivers/irqchip/irq-sni-exiu.c +++ b/drivers/irqchip/irq-sni-exiu.c @@ -1,7 +1,7 @@ /* * Driver for Socionext External Interrupt Unit (EXIU) * - * Copyright (c) 2017 Linaro, Ltd. + * Copyright (c) 2017-2019 Linaro, Ltd. * * Based on irq-tegra.c: * Copyright (C) 2011 Google, Inc. @@ -167,35 +167,25 @@ static const struct irq_domain_ops exiu_domain_ops = { .free = irq_domain_free_irqs_common, }; -static int __init exiu_init(struct device_node *node, - struct device_node *parent) +static struct irq_domain *exiu_init(struct irq_domain *parent_domain, + struct fwnode_handle *fwnode, + struct resource *res) { - struct irq_domain *parent_domain, *domain; + struct irq_domain *domain; struct exiu_irq_data *data; int err; - if (!parent) { - pr_err("%pOF: no parent, giving up\n", node); - return -ENODEV; - } - - parent_domain = irq_find_host(parent); - if (!parent_domain) { - pr_err("%pOF: unable to obtain parent domain\n", node); - return -ENXIO; - } - data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) - return -ENOMEM; + return ERR_PTR(-ENOMEM); - if (of_property_read_u32(node, "socionext,spi-base", &data->spi_base)) { - pr_err("%pOF: failed to parse 'spi-base' property\n", node); + if (fwnode_property_read_u32_array(fwnode, "socionext,spi-base", + &data->spi_base, 1)) { err = -ENODEV; goto out_free; } - data->base = of_iomap(node, 0); + data->base = ioremap(res->start, resource_size(res)); if (!data->base) { err = -ENODEV; goto out_free; @@ -205,23 +195,52 @@ static int __init exiu_init(struct device_node *node, writel_relaxed(0xFFFFFFFF, data->base + EIREQCLR); writel_relaxed(0xFFFFFFFF, data->base + EIMASK); - domain = irq_domain_add_hierarchy(parent_domain, 0, NUM_IRQS, node, - &exiu_domain_ops, data); + domain = irq_domain_create_hierarchy(parent_domain, 0, NUM_IRQS, + fwnode, &exiu_domain_ops, data); if (!domain) { - pr_err("%pOF: failed to allocate domain\n", node); err = -ENOMEM; goto out_unmap; } + return domain; +out_unmap: + iounmap(data->base); +out_free: + kfree(data); + return ERR_PTR(err); +} + +static int __init exiu_dt_init(struct device_node *node, + struct device_node *parent) +{ + struct irq_domain *parent_domain, *domain; + struct resource res; + + if (!parent) { + pr_err("%pOF: no parent, giving up\n", node); + return -ENODEV; + } + + parent_domain = irq_find_host(parent); + if (!parent_domain) { + pr_err("%pOF: unable to obtain parent domain\n", node); + return -ENXIO; + } + + if (of_address_to_resource(node, 0, &res)) { + pr_err("%pOF: failed to parse memory resource\n", node); + return -ENXIO; + } + + domain = exiu_init(parent_domain, of_node_to_fwnode(node), &res); + if (IS_ERR(domain)) { + pr_err("%pOF: failed to create IRQ domain (%ld)\n", node, + PTR_ERR(domain)); + return PTR_ERR(domain); + } pr_info("%pOF: %d interrupts forwarded to %pOF\n", node, NUM_IRQS, parent); return 0; - -out_unmap: - iounmap(data->base); -out_free: - kfree(data); - return err; } -IRQCHIP_DECLARE(exiu, "socionext,synquacer-exiu", exiu_init); +IRQCHIP_DECLARE(exiu, "socionext,synquacer-exiu", exiu_dt_init);