Thanks.
As the patchset is accepted.
Will commit another one to fix them.

 

-----Original Message-----
From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On 
Behalf Of Grant Likely
Sent: Tuesday, February 02, 2010 5:58 AM
To: Liu Yu-B13201
Cc: galak@kernel.crashing.org; davem@davemloft.net; 
netdev@vger.kernel.org; linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 2/4] mpc8569mds: Add bscr setting for rtbi mode

On Thu, Jan 14, 2010 at 1:13 AM, Liu Yu [off-list ref] wrote:

quoted

Signed-off-by: Liu Yu <redacted>
---
 arch/powerpc/platforms/85xx/mpc85xx_mds.c |   24 

++++++++++++++++++++++++

quoted

 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c 

b/arch/powerpc/platforms/85xx/mpc85xx_mds.c

quoted

index c5028a2..0872e4a 100644

--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c

@@ -237,6 +237,8 @@ static void __init mpc85xx_mds_setup_arch(void)

               } else if (machine_is(mpc8569_mds)) {
 #define BCSR7_UCC12_GETHnRST   (0x1 << 2)
 #define BCSR8_UEM_MARVELL_RST  (0x1 << 1)
+#define BCSR_UCC_RGMII         (0x1 << 6)
+#define BCSR_UCC_RTBI          (0x1 << 5)
                       /*
                        * U-Boot mangles interrupt polarity 

for Marvell PHYs,

quoted

                        * so reset built-in and UEM Marvell 

PHYs, this puts

quoted

@@ -247,6 +249,28 @@ static void __init mpc85xx_mds_setup_arch(void)

                       setbits8(&bcsr_regs[7], 

BCSR7_UCC12_GETHnRST);

quoted

                       clrbits8(&bcsr_regs[8], 

BCSR8_UEM_MARVELL_RST);

quoted

+
+                       for (np = NULL; (np = 

of_find_compatible_node(np,

quoted

+                                                       "network",

Don't match on the 'type' field.  Replace "network" with NULL and just
rely on "ucc_geth" for matching.

quoted

+                                                       

"ucc_geth")) != NULL;) {

quoted

+                               const unsigned int *prop;

u32 please.

Also, rather than reusing 'prop' for both char* and u32 values, which
forces you to use ugly casts, use 2 local variables here.

quoted

+                               int ucc_num;
+
+                               prop = of_get_property(np, 

"cell-index", NULL);

quoted

+                               if (prop == NULL)
+                                       continue;
+
+                               ucc_num = *prop - 1;

Ugh.  No bounds checking...

quoted

+
+                               prop = of_get_property(np, 

"phy-connection-type", NULL);

quoted

+                               if (prop == NULL)
+                                       continue;
+
+                               if (strcmp("rtbi", (const 

char *)prop) == 0)

(This is the ugly cast I was talking about.)

quoted

+                                       

clrsetbits_8(&bcsr_regs[7 + ucc_num],

...not having bounds checking could result in badness in this 
array index.

This patch is dangerous as written.

Finally, while using cell-index seems convenient, I think it would be
better to have a lookup table of the index into the BCSR register
block from the UCC base address, which also gives you implicit bounds
checking.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.