From: Robert Richter <rrichter@cavium.com> To: Marc Zyngier <marc.zyngier@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, <linux-arm-kernel@lists.infradead.org>, Robert Richter <rrichter@cavium.com>, <linux-kernel@vger.kernel.org> Subject: [PATCH 6/9] irqchip/gic-v3-its: Prevent its init ordering dependencies Date: Wed, 1 Feb 2017 18:38:30 +0100 [thread overview] Message-ID: <20170201173833.12630-7-rrichter@cavium.com> (raw) In-Reply-To: <20170201173833.12630-1-rrichter@cavium.com> Right now its_init() must be called before pci and platform init. Remove ordering dependencies to allow all initialization functions being called with the same initcall type. Signed-off-by: Robert Richter <rrichter@cavium.com> --- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 4 +++- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c index dace9bc4ef8d..afe78f224181 100644 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c @@ -77,6 +77,8 @@ static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev, return -EINVAL; msi_info = msi_get_domain_info(domain->parent); + if (!msi_info) + return -ENODEV; pdev = to_pci_dev(dev); dev_alias.pdev = pdev; @@ -113,7 +115,7 @@ static int __init its_pci_msi_init_one(struct fwnode_handle *handle, struct irq_domain *parent; parent = irq_find_matching_fwnode(handle, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { + if (!parent) { pr_err("%s: Unable to locate ITS domain\n", name); return -ENXIO; } diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c index 7d8c19973766..22ba1dfed8ba 100644 --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c @@ -32,6 +32,8 @@ static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, int ret, index = 0; msi_info = msi_get_domain_info(domain->parent); + if (!msi_info) + return -ENODEV; /* Suck the DeviceID out of the msi-parent property */ do { @@ -84,7 +86,7 @@ static int __init its_pmsi_init(void) continue; parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { + if (!parent) { pr_err("%s: unable to locate ITS domain\n", np->full_name); continue; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: rrichter@cavium.com (Robert Richter) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/9] irqchip/gic-v3-its: Prevent its init ordering dependencies Date: Wed, 1 Feb 2017 18:38:30 +0100 [thread overview] Message-ID: <20170201173833.12630-7-rrichter@cavium.com> (raw) In-Reply-To: <20170201173833.12630-1-rrichter@cavium.com> Right now its_init() must be called before pci and platform init. Remove ordering dependencies to allow all initialization functions being called with the same initcall type. Signed-off-by: Robert Richter <rrichter@cavium.com> --- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 4 +++- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c index dace9bc4ef8d..afe78f224181 100644 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c @@ -77,6 +77,8 @@ static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev, return -EINVAL; msi_info = msi_get_domain_info(domain->parent); + if (!msi_info) + return -ENODEV; pdev = to_pci_dev(dev); dev_alias.pdev = pdev; @@ -113,7 +115,7 @@ static int __init its_pci_msi_init_one(struct fwnode_handle *handle, struct irq_domain *parent; parent = irq_find_matching_fwnode(handle, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { + if (!parent) { pr_err("%s: Unable to locate ITS domain\n", name); return -ENXIO; } diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c index 7d8c19973766..22ba1dfed8ba 100644 --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c @@ -32,6 +32,8 @@ static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, int ret, index = 0; msi_info = msi_get_domain_info(domain->parent); + if (!msi_info) + return -ENODEV; /* Suck the DeviceID out of the msi-parent property */ do { @@ -84,7 +86,7 @@ static int __init its_pmsi_init(void) continue; parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { + if (!parent) { pr_err("%s: unable to locate ITS domain\n", np->full_name); continue; -- 2.11.0
next prev parent reply other threads:[~2017-02-01 17:40 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-01 17:38 [PATCH 0/9] irqchip/gic-v3-its: Implement ITS nodes as kernel devices and use CMA Robert Richter 2017-02-01 17:38 ` [PATCH 1/9] irqchip/gic-v3-its: Fix command buffer allocation Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-08 14:41 ` Marc Zyngier 2017-02-08 14:41 ` Marc Zyngier 2017-02-08 14:43 ` Robert Richter 2017-02-08 14:43 ` Robert Richter 2017-02-08 15:31 ` Shanker Donthineni 2017-02-08 15:31 ` Shanker Donthineni 2017-02-08 15:36 ` Robert Richter 2017-02-08 15:36 ` Robert Richter 2017-02-08 16:00 ` Marc Zyngier 2017-02-08 16:00 ` Marc Zyngier 2017-02-08 15:45 ` Marc Zyngier 2017-02-08 15:45 ` Marc Zyngier 2017-02-01 17:38 ` [PATCH 2/9] irqchip/gic-v3-its: Initialize its nodes in probe order Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-01 17:38 ` [PATCH 3/9] irqchip/gic-v3-its: Initialize MSIs with subsys_initcalls Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-01 17:38 ` [PATCH 4/9] irqchip/gic-v3-its: Split probing from its node initialization Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-01 17:38 ` [PATCH 5/9] irqchip/gic-v3-its: Decouple its initialization from gic Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-01 17:38 ` Robert Richter [this message] 2017-02-01 17:38 ` [PATCH 6/9] irqchip/gic-v3-its: Prevent its init ordering dependencies Robert Richter 2017-02-01 17:38 ` [PATCH 7/9] irqchip/gic-v3-its: Initialize its nodes later Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-01 17:38 ` [PATCH 8/9] irqchip/gic-v3-its: Handle its nodes as kernel devices Robert Richter 2017-02-01 17:38 ` Robert Richter 2017-02-01 17:38 ` [PATCH 9/9] irqchip, gicv3-its, cma: Use CMA for allocation of large device tables Robert Richter 2017-02-01 17:38 ` Robert Richter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170201173833.12630-7-rrichter@cavium.com \ --to=rrichter@cavium.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.