Small glitch in neptune ethernet driver
Subsystems (2)
Hi Dave,
consider this piece of code in net/ethernet/sun/niu.c:
static int __devinit phy_record(struct niu_parent *parent,
struct phy_probe_info *p,
int dev_id_1, int dev_id_2, u8 phy_port,
int type)
{
...
if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) {
if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) &&
((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011) &&
((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8706))
return 0;
}...
}
Here are the defines from sun/niu.h:
#define NIU_PHY_ID_MASK 0xfffff0f0 #define NIU_PHY_ID_BCM8704 0x00206030 #define NIU_PHY_ID_BCM8706 0x00206035
There's a zero at the end of the ID_MASK,
so the NIU_PHY_ID_BCM8706 will never match (ends on 5).
Report from cppcheck:
[sun/niu.c:8594]: (style) Mismatching comparison, the result is always true
The code will probably still work as the id for BCM8706 should match on NIU_PHY_ID_BCM8704, too.
Keep it or leave it?
Cheers,
Thomas
David Miller
maintainerFrom: Thomas Jarosch <[email protected]>
Date: Wed, 26 Oct 2011 19:39:27 +0200
Quoted 15 lines
if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) { if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) && ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011) && ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8706)) return 0; }...
}Here are the defines from
sun/niu.h:#define NIU_PHY_ID_MASK 0xfffff0f0 #define NIU_PHY_ID_BCM8704 0x00206030 #define NIU_PHY_ID_BCM8706 0x00206035
Quoted 8 lines
There's a zero at the end of the
ID_MASK,
so theNIU_PHY_ID_BCM8706will never match (ends on 5).Report from cppcheck:
[sun/niu.c:8594]: (style) Mismatching comparison, the result is always trueThe code will probably still work as the id for BCM8706 should match on
NIU_PHY_ID_BCM8704, too.
Thanks for pointing this out, I'll remove the extra test but add a comment explaining the situation nearby, as follows:
--------------------
niu: Remove redundant PHY ID test.
--- drivers/net/ethernet/sun/niu.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/sun/niu.c +4 -2
@@ -8579,9 +8579,11 @@ static int __devinit phy_record(struct niu_parent *parent,if (dev_id_1 <0 || dev_id_2 <0 )return 0 ;if (type ==PHY_TYPE_PMA_PMD || type ==PHY_TYPE_PCS ) { +/* Becuase of the NIU_PHY_ID_MASK being applied, the 8704 +* test covers the 8706 as well. +*/ if (((id &NIU_PHY_ID_MASK ) !=NIU_PHY_ID_BCM8704 ) && - ((id &NIU_PHY_ID_MASK ) !=NIU_PHY_ID_MRVL88X2011 ) && - ((id &NIU_PHY_ID_MASK ) !=NIU_PHY_ID_BCM8706 )) + ((id &NIU_PHY_ID_MASK ) !=NIU_PHY_ID_MRVL88X2011 ))return 0 ; }else {if ((id &NIU_PHY_ID_MASK ) !=NIU_PHY_ID_BCM5464R )
Signature · 1 line
1.7.7.3
drivers/net/ethernet/sun/niu.c static int __devinit phy_record(struct niu_parent · line 8582
Quoted 9 lines · On Friday, 2. December 2011 04:00:03 David Miller wrote:
(quoted diff) +0
-0
b/drivers/net/ethernet/sun/niu.cindex 680b107..56d106e 100644drivers/net/ethernet/sun/niu.c +1
-0@@ -8579,9 +8579,11 @@ static int __devinit phy_record(struct niu_parent *parent, if (dev_id_1 < 0 || dev_id_2 < 0)return 0 ;if (type ==PHY_TYPE_PMA_PMD || type ==PHY_TYPE_PCS ) { +/* Becuase of the NIU_PHY_ID_MASK being applied, the 8704
The change looks good to me, just fix the typo in "Becuase".
Thanks,
Thomas
David Miller
maintainerFrom: Thomas Jarosch <[email protected]>
Date: Fri, 2 Dec 2011 09:49:32 +0100
Quoted 12 lines · On Friday, 2. December 2011 04:00:03 David Miller wrote:
drivers/net/ethernet/sun/niu.c static int __devinit phy_record(struct niu_parent · line 8582
Quoted 9 lines
(quoted diff) +0
-0
b/drivers/net/ethernet/sun/niu.cindex 680b107..56d106e 100644drivers/net/ethernet/sun/niu.c +1
-0@@ -8579,9 +8579,11 @@ static int __devinit phy_record(struct niu_parent *parent, if (dev_id_1 < 0 || dev_id_2 < 0)return 0 ;if (type ==PHY_TYPE_PMA_PMD || type ==PHY_TYPE_PCS ) { +/* Becuase of the NIU_PHY_ID_MASK being applied, the 8704 The change looks good to me, just fix the typo in "Becuase".
Fixed, thanks.