Skip to contentSkip to conversation

Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o]

PATCH RESEND In review Subrata Modak 4 participants 9 messages Jun 11, 2009 – Jun 17, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 4/4 Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o]

Hi Nathan,

Quoted 18 lines · Nathan Lynch
Quoted 15 lines · Subrata Modak
Quoted 9 lines · Stephen Rothwell

Hi Subrata,

Review

Quoted 4 lines · On Wed, 10 Jun 2009 23:13:23 +0530 Subrata Modak <[email protected]>…
(quoted diff) +1 -1
 	/* Find the TBI PHY.  If it's not there, we don't support SGMII */
-	ph = of_get_property(np, "tbi-handle", NULL);
+	ph = (phandle *)of_get_property(np, "tbi-handle", NULL);

You don't need this cast because of_get_property() returns "void *".

Stephen,

True. But without this gcc complains:

Quoted 8 lines
Quoted 4 lines

CC [M] drivers/net/ucc_geth.o
drivers/net/ucc_geth.c: In function ‘ucc_geth_probe’:
drivers/net/ucc_geth.c:3824: warning: assignment discards qualifiers from pointer target type

ph should be declared const phandle *. Look at other uses of of_get_property.

Ok fine. Here is a revised patch again.

Subject: [PATCH][Resend 2][BUILD FAILURE 04/04] Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o] Reference(s):
http://lkml.org/lkml/2009/6/4/241,
http://lkml.org/lkml/2009/6/10/338,

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

---

drivers/net/ucc_geth.c renamed from drivers/net/ucc_geth.c.orig +2 -0
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
+	struct device_node *mdio;
+	const phandle *ph;
 	struct device *device = &ofdev->dev;
 	struct device_node *np = ofdev->node;
 	struct net_device *dev = NULL;

---
Regards--
Subrata

#1 lore raw

Hi Li/Nathan,

Quoted 45 lines · Subrata Modak

Hi Nathan,

Quoted 18 lines · Nathan Lynch
Quoted 15 lines · Subrata Modak
Quoted 9 lines · Stephen Rothwell

Hi Subrata,

Review

Quoted 4 lines · On Wed, 10 Jun 2009 23:13:23 +0530 Subrata Modak <[email protected]>…
(quoted diff) +1 -1
 	/* Find the TBI PHY.  If it's not there, we don't support SGMII */
-	ph = of_get_property(np, "tbi-handle", NULL);
+	ph = (phandle *)of_get_property(np, "tbi-handle", NULL);

You don't need this cast because of_get_property() returns "void *".

Stephen,

True. But without this gcc complains:

Quoted 8 lines
Quoted 4 lines

CC [M] drivers/net/ucc_geth.o
drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3824: warning: assignment discards qualifiers from pointer target type

ph should be declared const phandle *. Look at other uses of of_get_property.

Ok fine. Here is a revised patch again.

Subject: [PATCH][Resend 2][BUILD FAILURE 04/04] Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o] Reference(s):
http://lkml.org/lkml/2009/6/4/241,
http://lkml.org/lkml/2009/6/10/338,

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

Quoted 2 lines

---

Is there anything else to be done in this patch. If this is OK, can this be applied. I am not sure, but, i find Li Yang as the maintainer for this in linux*/MAINTAINERS file. Kindly let me know if this patch needs to be revisited for some other issue(s).

Regards--
Subrata

Quoted 17 lines
drivers/net/ucc_geth.c renamed from drivers/net/ucc_geth.c.orig +2 -1
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
+	struct device_node *mdio;
+	const phandle *ph;
 	struct device *device = &ofdev->dev;
 	struct device_node *np = ofdev->node;
 	struct net_device *dev = NULL;
 
---

Regards--
Subrata

#2 lore raw

PATCH RESEND 4/4 Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o]

Quoted 48 lines · Subrata Modak

Hi Li/Nathan,

Quoted 45 lines · Subrata Modak

Hi Nathan,

Quoted 18 lines · Nathan Lynch
Quoted 15 lines · Subrata Modak
Quoted 9 lines · Stephen Rothwell

Hi Subrata,

Review

Quoted 4 lines · On Wed, 10 Jun 2009 23:13:23 +0530 Subrata Modak <[email protected]>…
(quoted diff) +1 -1
 	/* Find the TBI PHY.  If it's not there, we don't support SGMII */
-	ph = of_get_property(np, "tbi-handle", NULL);
+	ph = (phandle *)of_get_property(np, "tbi-handle", NULL);

You don't need this cast because of_get_property() returns "void *".

Stephen,

True. But without this gcc complains:

Quoted 8 lines
Quoted 4 lines

CC [M] drivers/net/ucc_geth.o
drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3824: warning: assignment discards qualifiers from pointer target type

ph should be declared const phandle *. Look at other uses of of_get_property.

Ok fine. Here is a revised patch again.

Subject: [PATCH][Resend 2][BUILD FAILURE 04/04] Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o] Reference(s):
http://lkml.org/lkml/2009/6/4/241,
http://lkml.org/lkml/2009/6/10/338,

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

Quoted 7 lines
Quoted 2 lines

---

Is there anything else to be done in this patch. If this is OK, can this be applied. I am not sure, but, i find Li Yang as the maintainer for this in linux*/MAINTAINERS file. Kindly let me know if this patch needs to be revisited for some other issue(s).

Li,

Any thoughts on this patch ?

Regards--
Subrata

Quoted 21 lines

Regards--
Subrata

Quoted 17 lines
drivers/net/ucc_geth.c renamed from drivers/net/ucc_geth.c.orig +2 -1
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
+	struct device_node *mdio;
+	const phandle *ph;
 	struct device *device = &ofdev->dev;
 	struct device_node *np = ofdev->node;
 	struct net_device *dev = NULL;
 
---

Regards--
Subrata

#3 lore raw
Quoted 86 lines · Subrata Modak
Quoted 50 lines · Subrata Modak

Hi Li/Nathan,

Quoted 47 lines · Subrata Modak

Hi Nathan,

Quoted 20 lines · Nathan Lynch
Quoted 17 lines · Subrata Modak
Quoted 11 lines · Stephen Rothwell

Hi Subrata,

On Wed, 10 Jun 2009 23:13:23 +0530 Subrata Modak <[email protected]

Review

Quoted 6 lines

wrote:

	/* Find the TBI PHY.  If it's not there, we don't support  

SGMII */

(quoted diff) +1 -1
-	ph = of_get_property(np, "tbi-handle", NULL);
+	ph = (phandle *)of_get_property(np, "tbi-handle", NULL);

You don't need this cast because of_get_property() returns "void *".

Stephen,

True. But without this gcc complains:

Quoted 8 lines
Quoted 4 lines

CC [M] drivers/net/ucc_geth.o
drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3824: warning: assignment discards qualifiers from pointer target type

ph should be declared const phandle *. Look at other uses of of_get_property.

Ok fine. Here is a revised patch again.

Subject: [PATCH][Resend 2][BUILD FAILURE 04/04] Next June 04:PPC64 randconfig [drivers/net/ucc_geth.o] Reference(s):
http://lkml.org/lkml/2009/6/4/241,
http://lkml.org/lkml/2009/6/10/338,

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

Quoted 7 lines
Quoted 2 lines

---

Is there anything else to be done in this patch. If this is OK, can this be applied. I am not sure, but, i find Li Yang as the maintainer for this in linux*/MAINTAINERS file. Kindly let me know if this patch needs to be revisited for some other issue(s).

Li,

Any thoughts on this patch ?

Regards--
Subrata

Quoted 19 lines

Regards--
Subrata

Quoted 15 lines

--- linux-2.6.30-rc8/drivers/net/ucc_geth.c.orig 2009-06-10
11:58:39.000000000 -0500
+++ linux-2.6.30-rc8/drivers/net/ucc_geth.c 2009-06-10
22:28:13.000000000 -0500

drivers/net/ucc_geth.c renamed from drivers/net/ucc_geth.c.orig +2 -0
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
+	struct device_node *mdio;
+	const phandle *ph;
 	struct device *device = &ofdev->dev;
 	struct device_node *np = ofdev->node;
 	struct net_device *dev = NULL;
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

---
Regards--
Subrata

I'm confused by the proposed fix as we already have *mdio & *ph defined in this function:

static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)

{
        struct device *device = &ofdev->dev;
        struct device_node *np = ofdev->node;
        struct device_node *mdio;
        struct net_device *dev = NULL;
        struct ucc_geth_private *ugeth = NULL;
        struct ucc_geth_info *ug_info;
        struct resource res;
        struct device_node *phy;
        int err, ucc_num, max_speed = 0;
        const phandle *ph;
        const u32 *fixed_link;
        const unsigned int *prop;
        const char *sprop;
        const void *mac_addr;

...

- k

#4 lore raw

Hi Kumar,

Quoted 4 lines · On Wed, 17 Jun 2009 08:07:47 -0500 Kumar Gala <[email protected]> wrote:

I'm confused by the proposed fix as we already have *mdio & *ph defined in this function:

Which tree are you looking at? Linus' tree, and linux-next, do not have those local variables ...

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#5 lore raw
Quoted 11 lines · On Wed, 17 Jun 2009 23:23:41 +1000 Stephen Rothwell <[email protected]>…

Hi Kumar,

Quoted 4 lines · On Wed, 17 Jun 2009 08:07:47 -0500 Kumar Gala <[email protected]> wrote:

I'm confused by the proposed fix as we already have *mdio & *ph defined in this function:

Which tree are you looking at? Linus' tree, and linux-next, do not have those local variables ...

Hmmm, commit 0b9da337dca972e7a4144e298ec3adb8f244d4a4 ("net: Rework ucc_geth driver to use of_mdio infrastructure") removed the locals along with their usages, then commit 047584ce94108012288554a5f84585d792cc7f8f ("net/ucc_geth: Add SGMII support for UEC GETH driver") added more uses without adding the variables back.

Here is the patch again:

From: Subrata Modak <[email protected]>
Subject: [PATCH] Fix build error in ucc_geth.c

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

drivers/net/ucc_geth.c renamed from drivers/net/ucc_geth.c.orig +2 -0
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
+	struct device_node *mdio;
+	const phandle *ph;
 	struct device *device = &ofdev->dev;
 	struct device_node *np = ofdev->node;
 	struct net_device *dev = NULL;
Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#6 lore raw
Quoted 42 lines · Stephen Rothwell

On Wed, 17 Jun 2009 23:23:41 +1000 Stephen Rothwell <[email protected]

Quoted 5 lines

wrote:

Hi Kumar,

On Wed, 17 Jun 2009 08:07:47 -0500 Kumar Gala <[email protected]

Quoted 8 lines
Quoted 5 lines

wrote:

I'm confused by the proposed fix as we already have *mdio & *ph defined in this function:

Which tree are you looking at? Linus' tree, and linux-next, do not have those local variables ...

Hmmm, commit 0b9da337dca972e7a4144e298ec3adb8f244d4a4 ("net: Rework ucc_geth driver to use of_mdio infrastructure") removed the locals along with their usages, then commit 047584ce94108012288554a5f84585d792cc7f8f ("net/ucc_geth: Add SGMII support for UEC GETH driver") added more uses without adding the variables back.

Here is the patch again:

From: Subrata Modak <[email protected]>
Subject: [PATCH] Fix build error in ucc_geth.c

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

--- linux-2.6.30-rc8/drivers/net/ucc_geth.c.orig 2009-06-10
11:58:39.000000000 -0500
+++ linux-2.6.30-rc8/drivers/net/ucc_geth.c 2009-06-10
22:28:13.000000000 -0500

drivers/net/ucc_geth.c static const struct net_device_ops ucc_g · line 3602

Quoted 8 lines
drivers/net/ucc_geth.c renamed from drivers/net/ucc_geth.c.orig +2 -0
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
+	struct device_node *mdio;
+	const phandle *ph;
 	struct device *device = &ofdev->dev;
 	struct device_node *np = ofdev->node;
 	struct net_device *dev = NULL;

ah... was looking at powerpc next which hasn't pulled in linus's latest tree w/netdev updates.

- k

#7 lore raw
In reply to Stephen Rothwell
Quoted 38 lines · Stephen Rothwell
Quoted 11 lines · On Wed, 17 Jun 2009 23:23:41 +1000 Stephen Rothwell <[email protected]>…

Hi Kumar,

Quoted 4 lines · On Wed, 17 Jun 2009 08:07:47 -0500 Kumar Gala <[email protected]> wrote:

I'm confused by the proposed fix as we already have *mdio & *ph defined in this function:

Which tree are you looking at?  Linus' tree, and linux-next, do not have those local variables ...

Hmmm, commit 0b9da337dca972e7a4144e298ec3adb8f244d4a4 ("net: Rework ucc_geth driver to use of_mdio infrastructure") removed the locals along with their usages, then commit 047584ce94108012288554a5f84585d792cc7f8f ("net/ucc_geth: Add SGMII support for UEC GETH driver") added more uses without adding the variables back.

Here is the patch again:

From: Subrata Modak <[email protected]>
Subject: [PATCH] Fix build error in ucc_geth.c

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

drivers/net/ucc_geth.c     2009-06-10 22:28:13.000000000 -0500 static const struct net_device_ops ucc_g · line 3602

Quoted 8 lines
drivers/net/ucc_geth.c     2009-06-10 22:28:13.000000000 -0500 renamed from drivers/net/ucc_geth.c.orig        2009-06-10 11:58:39.000000000 -0500 +2 -0
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
  static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
  {
+       struct device_node *mdio;
+       const phandle *ph;
        struct device *device = &ofdev->dev;
        struct device_node *np = ofdev->node;
        struct net_device *dev = NULL;

Ah, this might not be the right fix then. I'll look.

g.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
#8 lore raw
Quoted 40 lines · Grant Likely
Quoted 39 lines · Stephen Rothwell
Quoted 11 lines · On Wed, 17 Jun 2009 23:23:41 +1000 Stephen Rothwell <[email protected]>…

Hi Kumar,

Quoted 4 lines · On Wed, 17 Jun 2009 08:07:47 -0500 Kumar Gala <[email protected]> wrote:

I'm confused by the proposed fix as we already have *mdio & *ph defined in this function:

Which tree are you looking at?  Linus' tree, and linux-next, do not have those local variables ...

Hmmm, commit 0b9da337dca972e7a4144e298ec3adb8f244d4a4 ("net: Rework ucc_geth driver to use of_mdio infrastructure") removed the locals along with their usages, then commit 047584ce94108012288554a5f84585d792cc7f8f ("net/ucc_geth: Add SGMII support for UEC GETH driver") added more uses without adding the variables back.

Here is the patch again:

From: Subrata Modak <[email protected]>
Subject: [PATCH] Fix build error in ucc_geth.c

Fix the following build error:

drivers/net/ucc_geth.c: In function bucc_geth_probeb:
drivers/net/ucc_geth.c:3822: error: 'ph' undeclared (first use in this function) drivers/net/ucc_geth.c:3822: error: (Each undeclared identifier is reported only once drivers/net/ucc_geth.c:3822: error: for each function it appears in.) drivers/net/ucc_geth.c:3832: error: 'mdio' undeclared (first use in this function) make[2]: *** [drivers/net/ucc_geth.o] Error 1

drivers/net/ucc_geth.c     2009-06-10 22:28:13.000000000 -0500 renamed from drivers/net/ucc_geth.c.orig        2009-06-10 11:58:39.000000000 -0500 +0 -0
@@ -3595,6 +3595,8 @@ static const struct net_device_ops ucc_g
 
Quoted 9 lines

drivers/net/ucc_geth.c     2009-06-10 22:28:13.000000000 -0500 static const struct net_device_ops ucc_g · line 3602

Quoted 7 lines
drivers/net/ucc_geth.c     2009-06-10 22:28:13.000000000 -0500 renamed from drivers/net/ucc_geth.c.orig        2009-06-10 11:58:39.000000000 -0500 +2 -0
  static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
  {
+       struct device_node *mdio;
+       const phandle *ph;
        struct device *device = &ofdev->dev;
        struct device_node *np = ofdev->node;
        struct net_device *dev = NULL;

Ah, this might not be the right fix then.  I'll look.

Yeah, this is not the right fix. The SGMII change doesn't mesh well with the of_mdio changes and needed some rewriting. I'm about to post a patch (compile tested only) which should make things happy.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.