Proposed prom parse fix + moving.
Subsystems (2)
Michal Simek
maintainerHi All,
I have got email from Ilpo about prom_parse file.
I take this file from powerpc. Who did write prom_parse file and take care about?
BTW: What about to move prom_parse file to any generic location as we discussed in past? Any volunteer?
Thanks,
Michal
-------- Original Message --------
Subject: [RFC!] [PATCH] microblaze: fix bug in error handling
Date: Thu, 16 Apr 2009 23:05:53 +0300 (EEST)
From: Ilpo Järvinen <[email protected]>
To: [email protected]
CC: [email protected]
While some version of the patches were on the lkml I read some part of the code briefly through but my feedback got stuck into postponed emails, so here's one correctness related issue I might have found (the rest were just cosmetic things).
I'm not sure if the latter return needs the of_node_put or not but it seems more likely than not.
Not even compile tested.
--- arch/microblaze/kernel/prom_parse.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
arch/microblaze/kernel/prom_parse.c +7 -4
@@ -927,20 +927,23 @@ int of_irq_map_one(struct device_node *device,/* Get size of interrupt specifier */ tmp =of_get_property (p,"#interrupt-cells" ,NULL );if (tmp ==NULL ) { -of_node_put (p); -return -EINVAL ; + res = -EINVAL ; + goto out; } intsize = *tmp;pr_debug (" intsize=%d intlen=%d\n" , intsize, intlen);/* Check index */ -if ((index +1 ) * intsize > intlen) -return -EINVAL ; +if ((index +1 ) * intsize > intlen) { + res = -EINVAL ; + goto out; + }/* Get new specifier and map it */ res =of_irq_map_raw (p, intspec + index * intsize, intsize, addr, out_irq); +out:of_node_put (p);return res; }
Signature · 6 lines
1.5.6.5 -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854
Quoted 4 lines · Michal Simek
Hi All,
I have got email from Ilpo about
prom_parsefile.
I take this file from powerpc. Who did writeprom_parsefile and take car=
e about?
Posting to the linuxppc-dev list is sufficient to start. There are several people who may be interested.
Quoted 1 line
BTW: What about to move
prom_parsefile to any generic location as we dis=
cussed in past?
Quoted 1 line
Any volunteer?
I'm kind of working on it. More specifically, I'm looking at factoring out fdt stuff into common code (drivers/of/of_fdt.c). But I haven't made a whole lot of progress yet.
Quoted 7 lines
-------- Original Message --------
Subject: [RFC!] [PATCH] microblaze: fix bug in error handling
Date: Thu, 16 Apr 2009 23:05:53 +0300 (EEST)
From: Ilpo J=E4rvinen <[email protected]>
To: [email protected]
CC: [email protected]
Quoted 8 lines
While some version of the patches were on the lkml I read some part of the code briefly through but my feedback got stuck into postponed emails, so here's one correctness related issue I might have found (the rest were just cosmetic things).
I'm not sure if the latter return needs the
of_node_putor not but it seems more likely than not.
Yes, it does. This change is applicable toarch/powerpc/kernel/prom_parse.c too.
arch/microblaze/kernel=
Quoted 9 lines
Not even compile tested.
Signed-off-by Ilpo J=E4rvinen <[email protected]>---
=A0arch/microblaze/kernel/prom_parse.c | =A0 11 +++++++---- =A01 files changed, 7 insertions(+), 4 deletions(-)arch/microblaze/kernel= renamed from arch/microblaze/kernel/prom_parse.c +0
-0
/prom_parse.c
Quoted 24 lines
index ae0352e..d1174bc 100644
arch/microblaze/kernel/prom_parse.c +0
-0@@ -927,20 +927,23 @@ int of_irq_map_one(struct device_node *device,=A0 =A0 =A0 =A0/* Get size of interrupt specifier */
=A0 =A0 =A0 =A0tmp =3Dof_get_property(p, "#interrupt-cells", NULL); =A0 =A0 =A0 =A0if (tmp =3D=3D NULL) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_put(p);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 res =3D-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;
=A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0intsize =3D *tmp;=A0 =A0 =A0 =A0pr_debug(" intsize=3D%d intlen=3D%d\n", intsize, intlen);
=A0 =A0 =A0 =A0/* Check index */
- =A0 =A0 =A0 if ((index + 1) * intsize > intlen)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
+ =A0 =A0 =A0 if ((index + 1) * intsize > intlen) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 res =3D-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 =A0 }
Quoted 2 lines
=A0 =A0 =A0 =A0/* Get new specifier and map it */
=A0 =A0 =A0 =A0res =3D of_irq_map_raw(p, intspec + index * intsize, intsi=
ze,
Quoted 1 line
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0addr, out_=
irq);
Quoted 8 lines
+out:
=A0 =A0 =A0 =A0of_node_put(p);
=A0 =A0 =A0 =A0return res;
=A0}
--
1.5.6.5
Quoted 4 lines
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
Michal Simek
maintainerQuoted 29 lines · Grant Likely
Quoted 4 lines · Michal Simek
Hi All,
I have got email from Ilpo about
prom_parsefile.
I take this file from powerpc. Who did writeprom_parsefile and take care about?Posting to the linuxppc-dev list is sufficient to start. There are several people who may be interested.
Quoted 2 lines
BTW: What about to move
prom_parsefile to any generic location as we discussed in past? Any volunteer?I'm kind of working on it. More specifically, I'm looking at factoring out fdt stuff into common code (
drivers/of/of_fdt.c). But I haven't made a whole lot of progress yet.Quoted 13 lines
-------- Original Message --------
Subject: [RFC!] [PATCH] microblaze: fix bug in error handling
Date: Thu, 16 Apr 2009 23:05:53 +0300 (EEST)
From: Ilpo Järvinen <[email protected]>
To: [email protected]
CC: [email protected]While some version of the patches were on the lkml I read some part of the code briefly through but my feedback got stuck into postponed emails, so here's one correctness related issue I might have found (the rest were just cosmetic things).
Quoted 5 lines
Quoted 2 lines
I'm not sure if the latter return needs the
of_node_putor not but it seems more likely than not.Yes, it does. This change is applicable to
arch/powerpc/kernel/prom_parse.ctoo.
ok.
Ilpo: Can you create patch for both architectures?
Thanks,
Michal
Quoted 51 lines
Quoted 48 lines
Not even compile tested.
Signed-off-by Ilpo Järvinen <[email protected]>--- arch/microblaze/kernel/prom_parse.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)arch/microblaze/kernel/prom_parse.c +7
-5@@ -927,20 +927,23 @@ int of_irq_map_one(struct device_node *device,/* Get size of interrupt specifier */ tmp =of_get_property (p,"#interrupt-cells" ,NULL );if (tmp ==NULL ) { -of_node_put (p); -return -EINVAL ; + res = -EINVAL ; + goto out; } intsize = *tmp;pr_debug (" intsize=%d intlen=%d\n" , intsize, intlen);/* Check index */ -if ((index +1 ) * intsize > intlen) -return -EINVAL ; +if ((index +1 ) * intsize > intlen) { + res = -EINVAL ; + goto out; + }/* Get new specifier and map it */ res =of_irq_map_raw (p, intspec + index * intsize, intsize, addr, out_irq); +out:of_node_put (p);return res; } --1.5.6.5
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Signature · 2 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854
Quoted 30 lines · Michal Simek
Quoted 29 lines · Grant Likely
Quoted 4 lines · Michal Simek
Hi All,
I have got email from Ilpo about
prom_parsefile.
I take this file from powerpc. Who did writeprom_parsefile and take care about?Posting to the linuxppc-dev list is sufficient to start. There are several people who may be interested.
Quoted 2 lines
BTW: What about to move
prom_parsefile to any generic location as we discussed in past? Any volunteer?I'm kind of working on it. More specifically, I'm looking at factoring out fdt stuff into common code (
drivers/of/of_fdt.c). But I haven't made a whole lot of progress yet.Quoted 13 lines
-------- Original Message --------
Subject: [RFC!] [PATCH] microblaze: fix bug in error handling
Date: Thu, 16 Apr 2009 23:05:53 +0300 (EEST)
From: Ilpo Järvinen <[email protected]>
To: [email protected]
CC: [email protected]While some version of the patches were on the lkml I read some part of the code briefly through but my feedback got stuck into postponed emails, so here's one correctness related issue I might have found (the rest were just cosmetic things).
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I'm not sure if the latter return needs the
of_node_putor not but it seems more likely than not.Yes, it does. This change is applicable to
arch/powerpc/kernel/prom_parse.ctoo.ok.
Ilpo: Can you create patch for both architectures?
Sure, but tomorrow as today is a deadline day :-).
Signature · 1 line
i.
Quoted 35 lines · Ilpo Järvinen
Quoted 33 lines · Michal Simek
Quoted 32 lines · Grant Likely
Quoted 4 lines · Michal Simek
Hi All,
I have got email from Ilpo about
prom_parsefile.
I take this file from powerpc. Who did writeprom_parsefile and take care about?Posting to the linuxppc-dev list is sufficient to start. There are several people who may be interested.
Quoted 2 lines
BTW: What about to move
prom_parsefile to any generic location as we discussed in past? Any volunteer?I'm kind of working on it. More specifically, I'm looking at factoring out fdt stuff into common code (
drivers/of/of_fdt.c). But I haven't made a whole lot of progress yet.Quoted 15 lines
-------- Original Message --------
Subject: [RFC!] [PATCH] microblaze: fix bug in error handling
Date: Thu, 16 Apr 2009 23:05:53 +0300 (EEST)
From: Ilpo Järvinen <[email protected]>
To: [email protected]
CC: [email protected]While some version of the patches were on the lkml I read some part of the code briefly through but my feedback got stuck into postponed emails, so here's one correctness related issue I might have found (the rest were just cosmetic things).
I'm not sure if the latter return needs the
of_node_putor not but it seems more likely than not.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Yes, it does. This change is applicable to
arch/powerpc/kernel/prom_parse.ctoo.ok.
Ilpo: Can you create patch for both architectures?Sure, but tomorrow as today is a deadline day :-).
Ok, here's combined patch for both. I came up with slightly shorter and (IMHO) nicer variant for -EINVAL assignment than in the first version.
--
[PATCH] powerpc & microblaze: add missing of_node_put to error handling
While reviewing some microblaze patches a while ago, I noticed a suspicious error handling in of_irq_map_one(), which turned out to be a copy from arch/powerpc. Grant Likely <[email protected]> confirmed that this is a real bug.
Merge error handling paths using goto with the normal return path.
Powerppc compile tested.
--- arch/microblaze/kernel/prom_parse.c | 11 +++++------ arch/powerpc/kernel/prom_parse.c | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-)
arch/microblaze/kernel/prom_parse.c +5 -6
@@ -903,7 +903,7 @@ int of_irq_map_one(struct device_node *device,struct device_node *p;const u32 *intspec, *tmp, *addr;u32 intsize, intlen; -int res; +int res = -EINVAL ;pr_debug ("of_irq_map_one: dev=%s, index=%d\n" , device->full_name, index);
@@ -926,21 +926,20 @@ int of_irq_map_one(struct device_node *device,/* Get size of interrupt specifier */ tmp =of_get_property (p,"#interrupt-cells" ,NULL ); -if (tmp ==NULL ) { -of_node_put (p); -return -EINVAL ; - } +if (tmp ==NULL ) + goto out; intsize = *tmp;pr_debug (" intsize=%d intlen=%d\n" , intsize, intlen);/* Check index */ if ((index +1 ) * intsize > intlen) -return -EINVAL ; + goto out;/* Get new specifier and map it */ res =of_irq_map_raw (p, intspec + index * intsize, intsize, addr, out_irq); +out:of_node_put (p);return res; }
arch/powerpc/kernel/prom_parse.c +5 -6
@@ -971,7 +971,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irqstruct device_node *p;const u32 *intspec, *tmp, *addr;u32 intsize, intlen; -int res; +int res = -EINVAL ;DBG ("of_irq_map_one: dev=%s, index=%d\n" , device->full_name, index);
@@ -995,21 +995,20 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq/* Get size of interrupt specifier */ tmp =of_get_property (p,"#interrupt-cells" ,NULL ); -if (tmp ==NULL ) { -of_node_put (p); -return -EINVAL ; - } +if (tmp ==NULL ) + goto out; intsize = *tmp;DBG (" intsize=%d intlen=%d\n" , intsize, intlen);/* Check index */ if ((index +1 ) * intsize > intlen) -return -EINVAL ; + goto out;/* Get new specifier and map it */ res =of_irq_map_raw (p, intspec + index * intsize, intsize, addr, out_irq); +out:of_node_put (p);return res; }
Signature · 1 line
1.5.6.5
Grant Likely
Acked-byQuoted 6 lines · On Fri, Apr 17, 2009 at 4:07 PM, Ilpo J=E4rvinen <[email protected]>…
Quoted 4 lines · On Fri, 17 Apr 2009, Ilpo J=E4rvinen wrote:
Quoted 2 lines · Michal Simek
Quoted 1 line · Grant Likely
On Fri, Apr 17, 2009 at 12:08 AM, Michal Simek <[email protected]> wr=
ote:
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Hi All,
I have got email from Ilpo about
prom_parsefile.
I take this file from powerpc. Who did writeprom_parsefile and ta=
ke care about?
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Posting to the linuxppc-dev list is sufficient to start. =A0There ar=
e
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
several people who may be interested.
Quoted 1 line
BTW: What about to move
prom_parsefile to any generic location as =
we discussed in past?
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
Any volunteer?
I'm kind of working on it. =A0More specifically, I'm looking at factoring out fdt stuff into common code (
drivers/of/of_fdt.c). But =
I
Quoted 38 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
haven't made a whole lot of progress yet.
Quoted 15 lines
-------- Original Message --------
Subject: [RFC!] [PATCH] microblaze: fix bug in error handling
Date: Thu, 16 Apr 2009 23:05:53 +0300 (EEST)
From: Ilpo J=E4rvinen <[email protected]>
To: [email protected]
CC: [email protected]While some version of the patches were on the lkml I read some part of the code briefly through but my feedback got stuck into postponed emails, so here's one correctness related issue I might have found (the rest were just cosmetic things).
I'm not sure if the latter return needs the
of_node_putor not but it seems more likely than not.Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Yes, it does. =A0This change is applicable to
arch/powerpc/kernel/prom_parse.ctoo.ok.
Ilpo: Can you create patch for both architectures?Sure, but tomorrow as today is a deadline day :-).
Ok, here's combined patch for both. I came up with slightly shorter and (IMHO) nicer variant for
-EINVALassignment than in the first version.--
[PATCH] powerpc & microblaze: add missingof_node_putto error handlingWhile reviewing some microblaze patches a while ago, I noticed a suspicious error handling in
of_irq_map_one(), which turned out to be a copy fromarch/powerpc. Grant Likely <[email protected]> confirmed that this is a real bug.
Quoted 6 lines
Merge error handling paths using goto with the normal return path.
Powerppc compile tested.
Signed-off-by Ilpo J=E4rvinen <[email protected]>
Looks right to me (but I haven't tested).
arch/microblaze/kernel=
Quoted 6 lines
---
=A0arch/microblaze/kernel/prom_parse.c | =A0 11 +++++------ =A0arch/powerpc/kernel/prom_parse.c =A0 =A0| =A0 11 +++++------ =A02 files changed, 10 insertions(+), 12 deletions(-)arch/microblaze/kernel= renamed from arch/microblaze/kernel/prom_parse.c +0
-0
/prom_parse.c
Quoted 26 lines
index ae0352e..d16c32f 100644
arch/microblaze/kernel/prom_parse.c +1
-1@@ -903,7 +903,7 @@ int of_irq_map_one(struct device_node *device, =A0 =A0 =A0 =A0struct device_node *p; =A0 =A0 =A0 =A0const u32 *intspec, *tmp, *addr; =A0 =A0 =A0 =A0u32 intsize, intlen; - =A0 =A0 =A0 int res; + =A0 =A0 =A0 int res =3D -EINVAL; =A0 =A0 =A0 =A0pr_debug("of_irq_map_one: dev=3D%s, index=3D%d\n", =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0device->full_name, index);@@ -926,21 +926,20 @@ int of_irq_map_one(struct device_node *device,=A0 =A0 =A0 =A0/* Get size of interrupt specifier */
=A0 =A0 =A0 =A0tmp =3Dof_get_property(p, "#interrupt-cells", NULL);
- =A0 =A0 =A0 if (tmp =3D=3D NULL) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_put(p);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
- =A0 =A0 =A0 }
+ =A0 =A0 =A0 if (tmp =3D=3D NULL)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;
=A0 =A0 =A0 =A0intsize =3D *tmp;=A0 =A0 =A0 =A0pr_debug(" intsize=3D%d intlen=3D%d\n", intsize, intlen);
Quoted 7 lines
=A0 =A0 =A0 =A0/* Check index */
=A0 =A0 =A0 =A0if ((index + 1) * intsize > intlen)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;=A0 =A0 =A0 =A0/* Get new specifier and map it */
=A0 =A0 =A0 =A0res =3D of_irq_map_raw(p, intspec + index * intsize, intsi=
ze,
Quoted 1 line
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0addr, out_=
irq);
arch/powerpc/kernel/prom_=
Quoted 5 lines
+out:
=A0 =A0 =A0 =A0of_node_put(p);
=A0 =A0 =A0 =A0return res;
=A0}arch/powerpc/kernel/prom_= renamed from arch/powerpc/kernel/prom_parse.c +0
-0
parse.c
arch/powerpc/kernel/prom_parse.c int of_irq_map_one(struct device_node *device, int in=
Quoted 4 lines
index 8f0856f..8362620 100644
arch/powerpc/kernel/prom_parse.c +0
-0@@ -971,7 +971,7 @@ int of_irq_map_one(struct device_node *device, int in=
dex, struct of_irq *out_irq
Quoted 7 lines
arch/powerpc/kernel/prom_parse.c +1
-1=A0 =A0 =A0 =A0struct device_node *p; =A0 =A0 =A0 =A0const u32 *intspec, *tmp, *addr; =A0 =A0 =A0 =A0u32 intsize, intlen; - =A0 =A0 =A0 int res; + =A0 =A0 =A0 int res =3D -EINVAL;=A0 =A0 =A0 =A0DBG("of_irq_map_one: dev=3D%s, index=3D%d\n", device->full=
_name, index);
arch/powerpc/kernel/prom_parse.c int of_irq_map_one(struct device_node *device, int =
Quoted 2 lines
arch/powerpc/kernel/prom_parse.c +0
-0@@ -995,21 +995,20 @@ int of_irq_map_one(struct device_node *device, int =
index, struct of_irq *out_irq
Quoted 13 lines
=A0 =A0 =A0 =A0/* Get size of interrupt specifier */
=A0 =A0 =A0 =A0tmp =3Dof_get_property(p, "#interrupt-cells", NULL);
- =A0 =A0 =A0 if (tmp =3D=3D NULL) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_put(p);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
- =A0 =A0 =A0 }
+ =A0 =A0 =A0 if (tmp =3D=3D NULL)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;
=A0 =A0 =A0 =A0intsize =3D *tmp;=A0 =A0 =A0 =A0DBG(" intsize=3D%d intlen=3D%d\n", intsize, intlen);
Quoted 7 lines
=A0 =A0 =A0 =A0/* Check index */
=A0 =A0 =A0 =A0if ((index + 1) * intsize > intlen)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;=A0 =A0 =A0 =A0/* Get new specifier and map it */
=A0 =A0 =A0 =A0res =3D of_irq_map_raw(p, intspec + index * intsize, intsi=
ze,
Quoted 8 lines
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 addr,
out_irq); +out:
=A0 =A0 =A0 =A0of_node_put(p);
=A0 =A0 =A0 =A0return res;
=A0}
--
1.5.6.5
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
Quoted 11 lines · Grant Likely
On Fri, Apr 17, 2009 at 4:07 PM, Ilpo J=E4rvinen
Quoted 10 lines
[PATCH] powerpc & microblaze: add missing
of_node_putto error handlingWhile reviewing some microblaze patches a while ago, I noticed a suspicious error handling in
of_irq_map_one(), which turned out to be a copy fromarch/powerpc. Grant Likely <[email protected]> confirmed that this is a real bug.Merge error handling paths using goto with the normal return path.
Quoted 7 lines
Quoted 3 lines
Powerppc compile tested.
Signed-off-by Ilpo J=E4rvinen <[email protected]>Looks right to me (but I haven't tested).
Acked-by Grant Likely <[email protected]>
I've picked up the powerpc half of this patch, tested it, and pushed it out to my -next tree and asked Ben or Paul to pull.
Michal, I leave it to you to pick up the Microblaze half.
Cheers,
g.
Quoted 7 lines
arch/microblaze/kerne=
Quoted 7 lines
---
=A0arch/microblaze/kernel/prom_parse.c | =A0 11 +++++------ =A0arch/powerpc/kernel/prom_parse.c =A0 =A0| =A0 11 +++++------ =A02 files changed, 10 insertions(+), 12 deletions(-)arch/microblaze/kerne= renamed from arch/microblaze/kernel/prom_parse.c +0
-0
l/prom_parse.c
Quoted 10 lines
Quoted 10 lines
index ae0352e..d16c32f 100644
arch/microblaze/kernel/prom_parse.c +1
-1@@ -903,7 +903,7 @@ int of_irq_map_one(struct device_node *device, =A0 =A0 =A0 =A0struct device_node *p; =A0 =A0 =A0 =A0const u32 *intspec, *tmp, *addr; =A0 =A0 =A0 =A0u32 intsize, intlen; - =A0 =A0 =A0 int res; + =A0 =A0 =A0 int res =3D -EINVAL;
Quoted 2 lines
Quoted 2 lines
arch/microblaze/kernel/prom_parse.c +0
-0=A0 =A0 =A0 =A0pr_debug("of_irq_map_one: dev=3D%s, index=3D%d\n",=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0device->full_name, index)=
;
Quoted 14 lines
Quoted 14 lines
arch/microblaze/kernel/prom_parse.c +0
-0@@ -926,21 +926,20 @@ int of_irq_map_one(struct device_node *device,=A0 =A0 =A0 =A0/* Get size of interrupt specifier */
=A0 =A0 =A0 =A0tmp =3Dof_get_property(p, "#interrupt-cells", NULL);
- =A0 =A0 =A0 if (tmp =3D=3D NULL) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_put(p);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
- =A0 =A0 =A0 }
+ =A0 =A0 =A0 if (tmp =3D=3D NULL)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;
=A0 =A0 =A0 =A0intsize =3D *tmp;=A0 =A0 =A0 =A0pr_debug(" intsize=3D%d intlen=3D%d\n", intsize, intlen);
Quoted 7 lines
Quoted 7 lines
=A0 =A0 =A0 =A0/* Check index */
=A0 =A0 =A0 =A0if ((index + 1) * intsize > intlen)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;=A0 =A0 =A0 =A0/* Get new specifier and map it */
=A0 =A0 =A0 =A0res =3D of_irq_map_raw(p, intspec + index * intsize, ints=
ize,
Quoted 1 line
Quoted 1 line
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0addr, out=
_irq);
Quoted 5 lines
arch/powerpc/kernel/prom=
Quoted 5 lines
+out:
=A0 =A0 =A0 =A0of_node_put(p);
=A0 =A0 =A0 =A0return res;
=A0}arch/powerpc/kernel/prom= renamed from arch/powerpc/kernel/prom_parse.c +0
-0
_parse.c
Quoted 4 lines
arch/powerpc/kernel/prom_parse.c int of_irq_map_one(struct device_node *device, int i=
Quoted 4 lines
index 8f0856f..8362620 100644
arch/powerpc/kernel/prom_parse.c +0
-0@@ -971,7 +971,7 @@ int of_irq_map_one(struct device_node *device, int i=
ndex, struct of_irq *out_irq
Quoted 7 lines
Quoted 7 lines
arch/powerpc/kernel/prom_parse.c +1
-1=A0 =A0 =A0 =A0struct device_node *p; =A0 =A0 =A0 =A0const u32 *intspec, *tmp, *addr; =A0 =A0 =A0 =A0u32 intsize, intlen; - =A0 =A0 =A0 int res; + =A0 =A0 =A0 int res =3D -EINVAL;=A0 =A0 =A0 =A0DBG("of_irq_map_one: dev=3D%s, index=3D%d\n", device->ful=
l_name, index);
Quoted 2 lines
arch/powerpc/kernel/prom_parse.c int of_irq_map_one(struct device_node *device, int=
Quoted 2 lines
arch/powerpc/kernel/prom_parse.c +0
-0@@ -995,21 +995,20 @@ int of_irq_map_one(struct device_node *device, int=
index, struct of_irq *out_irq
Quoted 13 lines
Quoted 13 lines
=A0 =A0 =A0 =A0/* Get size of interrupt specifier */
=A0 =A0 =A0 =A0tmp =3Dof_get_property(p, "#interrupt-cells", NULL);
- =A0 =A0 =A0 if (tmp =3D=3D NULL) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_put(p);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
- =A0 =A0 =A0 }
+ =A0 =A0 =A0 if (tmp =3D=3D NULL)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;
=A0 =A0 =A0 =A0intsize =3D *tmp;=A0 =A0 =A0 =A0DBG(" intsize=3D%d intlen=3D%d\n", intsize, intlen);
Quoted 7 lines
Quoted 7 lines
=A0 =A0 =A0 =A0/* Check index */
=A0 =A0 =A0 =A0if ((index + 1) * intsize > intlen)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return-EINVAL;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto out;=A0 =A0 =A0 =A0/* Get new specifier and map it */
=A0 =A0 =A0 =A0res =3D of_irq_map_raw(p, intspec + index * intsize, ints=
ize,
Quoted 11 lines
Quoted 8 lines
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 addr,
out_irq); +out:
=A0 =A0 =A0 =A0of_node_put(p);
=A0 =A0 =A0 =A0return res;
=A0}
--
1.5.6.5
Quoted 4 lines
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
Quoted 4 lines · Michal Simek
Hi All,
I have got email from Ilpo about
prom_parsefile.
I take this file from powerpc. Who did writeprom_parsefile and take care about?
I wrote it :-)
Quoted 2 lines
BTW: What about to move
prom_parsefile to any generic location as we discussed in past? Any volunteer?
Well.. it relies on some bits and pieces that are rather powerpc specific afaik such as our irq mapping scheme. I suppose we could split those bits and move them to a separate file though.
Off hand the patch looks ok but I'll have to look more closely when I get back from vacation.
Cheers,
Ben.