All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sricharan R <r.sricharan@ti.com>
To: <linux-omap@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <tony@atomide.com>, <santosh.shilimkar@ti.com>, <nm@ti.com>,
	<rnayak@ti.com>, <linux@arm.linux.org.uk>, <r.sricharan@ti.com>,
	<tglx@linutronix.de>, <jason@lakedaemon.net>, <joe@perches.com>
Subject: [PATCH V4 09/16] irqchip: crossbar: Return proper error value
Date: Thu, 26 Jun 2014 12:40:27 +0530	[thread overview]
Message-ID: <1403766634-18543-10-git-send-email-r.sricharan@ti.com> (raw)
In-Reply-To: <1403766634-18543-1-git-send-email-r.sricharan@ti.com>

From: Nishanth Menon <nm@ti.com>

crossbar_of_init always returns -ENOMEM in case of errors.
There can be other causes of failure like invalid data from
DT. So return a appropriate error value for that case.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 drivers/irqchip/irq-crossbar.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index cee556b..10d723d 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -129,19 +129,25 @@ static const struct irq_domain_ops routable_irq_domain_ops = {
 
 static int __init crossbar_of_init(struct device_node *node)
 {
-	int i, size, max, reserved = 0, entry;
+	int i, size, max = 0, reserved = 0, entry;
 	const __be32 *irqsr;
+	int ret = -ENOMEM;
 
 	cb = kzalloc(sizeof(*cb), GFP_KERNEL);
 
 	if (!cb)
-		return -ENOMEM;
+		return ret;
 
 	cb->crossbar_base = of_iomap(node, 0);
 	if (!cb->crossbar_base)
 		goto err1;
 
 	of_property_read_u32(node, "ti,max-irqs", &max);
+	if (!max) {
+		pr_err("missing 'ti,max-irqs' property\n");
+		ret = -EINVAL;
+		goto err2;
+	}
 	cb->irq_map = kcalloc(max, sizeof(int), GFP_KERNEL);
 	if (!cb->irq_map)
 		goto err2;
@@ -162,6 +168,7 @@ static int __init crossbar_of_init(struct device_node *node)
 						   i, &entry);
 			if (entry > max) {
 				pr_err("Invalid reserved entry\n");
+				ret = -EINVAL;
 				goto err3;
 			}
 			cb->irq_map[entry] = IRQ_RESERVED;
@@ -205,6 +212,7 @@ static int __init crossbar_of_init(struct device_node *node)
 		break;
 	default:
 		pr_err("Invalid reg-size property\n");
+		ret = -EINVAL;
 		goto err4;
 		break;
 	}
@@ -243,7 +251,7 @@ err2:
 	iounmap(cb->crossbar_base);
 err1:
 	kfree(cb);
-	return -ENOMEM;
+	return ret;
 }
 
 static const struct of_device_id crossbar_match[] __initconst = {
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: Sricharan R <r.sricharan@ti.com>
To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: nm@ti.com, linux@arm.linux.org.uk, jason@lakedaemon.net,
	tony@atomide.com, rnayak@ti.com, r.sricharan@ti.com,
	santosh.shilimkar@ti.com, joe@perches.com, tglx@linutronix.de
Subject: [PATCH V4 09/16] irqchip: crossbar: Return proper error value
Date: Thu, 26 Jun 2014 12:40:27 +0530	[thread overview]
Message-ID: <1403766634-18543-10-git-send-email-r.sricharan@ti.com> (raw)
In-Reply-To: <1403766634-18543-1-git-send-email-r.sricharan@ti.com>

From: Nishanth Menon <nm@ti.com>

crossbar_of_init always returns -ENOMEM in case of errors.
There can be other causes of failure like invalid data from
DT. So return a appropriate error value for that case.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 drivers/irqchip/irq-crossbar.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index cee556b..10d723d 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -129,19 +129,25 @@ static const struct irq_domain_ops routable_irq_domain_ops = {
 
 static int __init crossbar_of_init(struct device_node *node)
 {
-	int i, size, max, reserved = 0, entry;
+	int i, size, max = 0, reserved = 0, entry;
 	const __be32 *irqsr;
+	int ret = -ENOMEM;
 
 	cb = kzalloc(sizeof(*cb), GFP_KERNEL);
 
 	if (!cb)
-		return -ENOMEM;
+		return ret;
 
 	cb->crossbar_base = of_iomap(node, 0);
 	if (!cb->crossbar_base)
 		goto err1;
 
 	of_property_read_u32(node, "ti,max-irqs", &max);
+	if (!max) {
+		pr_err("missing 'ti,max-irqs' property\n");
+		ret = -EINVAL;
+		goto err2;
+	}
 	cb->irq_map = kcalloc(max, sizeof(int), GFP_KERNEL);
 	if (!cb->irq_map)
 		goto err2;
@@ -162,6 +168,7 @@ static int __init crossbar_of_init(struct device_node *node)
 						   i, &entry);
 			if (entry > max) {
 				pr_err("Invalid reserved entry\n");
+				ret = -EINVAL;
 				goto err3;
 			}
 			cb->irq_map[entry] = IRQ_RESERVED;
@@ -205,6 +212,7 @@ static int __init crossbar_of_init(struct device_node *node)
 		break;
 	default:
 		pr_err("Invalid reg-size property\n");
+		ret = -EINVAL;
 		goto err4;
 		break;
 	}
@@ -243,7 +251,7 @@ err2:
 	iounmap(cb->crossbar_base);
 err1:
 	kfree(cb);
-	return -ENOMEM;
+	return ret;
 }
 
 static const struct of_device_id crossbar_match[] __initconst = {
-- 
1.7.9.5

WARNING: multiple messages have this Message-ID (diff)
From: r.sricharan@ti.com (Sricharan R)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V4 09/16] irqchip: crossbar: Return proper error value
Date: Thu, 26 Jun 2014 12:40:27 +0530	[thread overview]
Message-ID: <1403766634-18543-10-git-send-email-r.sricharan@ti.com> (raw)
In-Reply-To: <1403766634-18543-1-git-send-email-r.sricharan@ti.com>

From: Nishanth Menon <nm@ti.com>

crossbar_of_init always returns -ENOMEM in case of errors.
There can be other causes of failure like invalid data from
DT. So return a appropriate error value for that case.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 drivers/irqchip/irq-crossbar.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index cee556b..10d723d 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -129,19 +129,25 @@ static const struct irq_domain_ops routable_irq_domain_ops = {
 
 static int __init crossbar_of_init(struct device_node *node)
 {
-	int i, size, max, reserved = 0, entry;
+	int i, size, max = 0, reserved = 0, entry;
 	const __be32 *irqsr;
+	int ret = -ENOMEM;
 
 	cb = kzalloc(sizeof(*cb), GFP_KERNEL);
 
 	if (!cb)
-		return -ENOMEM;
+		return ret;
 
 	cb->crossbar_base = of_iomap(node, 0);
 	if (!cb->crossbar_base)
 		goto err1;
 
 	of_property_read_u32(node, "ti,max-irqs", &max);
+	if (!max) {
+		pr_err("missing 'ti,max-irqs' property\n");
+		ret = -EINVAL;
+		goto err2;
+	}
 	cb->irq_map = kcalloc(max, sizeof(int), GFP_KERNEL);
 	if (!cb->irq_map)
 		goto err2;
@@ -162,6 +168,7 @@ static int __init crossbar_of_init(struct device_node *node)
 						   i, &entry);
 			if (entry > max) {
 				pr_err("Invalid reserved entry\n");
+				ret = -EINVAL;
 				goto err3;
 			}
 			cb->irq_map[entry] = IRQ_RESERVED;
@@ -205,6 +212,7 @@ static int __init crossbar_of_init(struct device_node *node)
 		break;
 	default:
 		pr_err("Invalid reg-size property\n");
+		ret = -EINVAL;
 		goto err4;
 		break;
 	}
@@ -243,7 +251,7 @@ err2:
 	iounmap(cb->crossbar_base);
 err1:
 	kfree(cb);
-	return -ENOMEM;
+	return ret;
 }
 
 static const struct of_device_id crossbar_match[] __initconst = {
-- 
1.7.9.5

  parent reply	other threads:[~2014-06-26  7:16 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-26  7:10 [PATCH V4 00/16] irqchip: crossbar: Driver fixes Sricharan R
2014-06-26  7:10 ` Sricharan R
2014-06-26  7:10 ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 01/16] irqchip: crossbar: Dont use '0' to mark reserved interrupts Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 02/16] irqchip: crossbar: Check for premapped crossbar before allocating Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 03/16] irqchip: crossbar: Introduce ti,irqs-skip to skip irqs that bypass crossbar Sricharan R
2014-06-26  7:10   ` [PATCH V4 03/16] irqchip: crossbar: Introduce ti, irqs-skip " Sricharan R
2014-06-26  7:10   ` [PATCH V4 03/16] irqchip: crossbar: Introduce ti,irqs-skip " Sricharan R
2014-06-26  7:10 ` [PATCH V4 04/16] irqchip: crossbar: Initialise the crossbar with a safe value Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 05/16] irqchip: crossbar: Change allocation logic by reversing search for free irqs Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 06/16] irqchip: crossbar: Remove IS_ERR_VALUE check Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 07/16] irqchip: crossbar: Fix sparse and checkpatch warnings Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 08/16] irqchip: crossbar: Fix kerneldoc warning Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` Sricharan R [this message]
2014-06-26  7:10   ` [PATCH V4 09/16] irqchip: crossbar: Return proper error value Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 10/16] irqchip: crossbar: Change the goto naming Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 11/16] irqchip: crossbar: Set cb pointer to null in case of error Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 12/16] irqchip: crossbar: Add kerneldoc for crossbar_domain_unmap callback Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 13/16] irqchip: crossbar: Introduce ti,max-crossbar-sources to identify valid crossbar mapping Sricharan R
2014-06-26  7:10   ` [PATCH V4 13/16] irqchip: crossbar: Introduce ti, max-crossbar-sources " Sricharan R
2014-06-26  7:10   ` [PATCH V4 13/16] irqchip: crossbar: Introduce ti,max-crossbar-sources " Sricharan R
2014-06-27 12:00   ` Jason Cooper
2014-06-27 12:00     ` Jason Cooper
2014-06-27 12:00     ` Jason Cooper
2014-06-30 19:30     ` Jason Cooper
2014-06-30 19:30       ` Jason Cooper
2014-06-26  7:10 ` [PATCH V4 14/16] irqchip: crossbar: Introduce centralized check for crossbar write Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10 ` [PATCH V4 15/16] documentation: dt: omap: crossbar: Add description for interrupt consumer Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-27 11:57   ` Jason Cooper
2014-06-27 11:57     ` Jason Cooper
2014-06-27 11:57     ` Jason Cooper
2014-06-26  7:10 ` [PATCH V4 16/16] irqchip: crossbar: Allow for quirky hardware with direct hardwiring of GIC Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:10   ` Sricharan R
2014-06-26  7:42 ` [PATCH V4 00/16] irqchip: crossbar: Driver fixes Tony Lindgren
2014-06-26  7:42   ` Tony Lindgren
2014-06-26  7:42   ` Tony Lindgren
2014-06-27 12:01   ` Jason Cooper
2014-06-27 12:01     ` Jason Cooper
2014-06-27 12:01     ` Jason Cooper
2014-06-30 19:29 ` Jason Cooper
2014-06-30 19:29   ` Jason Cooper
2014-07-01  7:59   ` Tony Lindgren
2014-07-01  7:59     ` Tony Lindgren
2014-07-01  9:36     ` Sricharan R
2014-07-01  9:36       ` Sricharan R
2014-07-01  9:36       ` Sricharan R
2014-07-01 12:23       ` Jason Cooper
2014-07-01 12:23         ` Jason Cooper

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=1403766634-18543-10-git-send-email-r.sricharan@ti.com \
    --to=r.sricharan@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jason@lakedaemon.net \
    --cc=joe@perches.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=nm@ti.com \
    --cc=rnayak@ti.com \
    --cc=santosh.shilimkar@ti.com \
    --cc=tglx@linutronix.de \
    --cc=tony@atomide.com \
    /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: link
Be 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.