| Submitter | Lino Sanfilippo |
|---|---|
| Date | March 30, 2012, 5:28 p.m. |
| Message ID | <20120330172859.GB2703@Neptun> |
| Download | mbox | patch |
| Permalink | /patch/149698/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Lino Sanfilippo <LinoSanfilippo@gmx.de> Date: Fri, 30 Mar 2012 19:28:59 +0200 > This patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver > in which the settings for PHY quick link are overwritten. > > Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Stephen, ping? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 30 Mar 2012 19:28:59 +0200 Lino Sanfilippo <LinoSanfilippo@gmx.de> wrote: > This patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver > in which the settings for PHY quick link are overwritten. > > Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> > --- > This applies against 3.3 > > drivers/net/ethernet/marvell/sky2.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c > index 760c2b1..d0132d8 100644 > --- a/drivers/net/ethernet/marvell/sky2.c > +++ b/drivers/net/ethernet/marvell/sky2.c > @@ -1756,13 +1756,14 @@ static int sky2_open(struct net_device *dev) > > sky2_hw_up(sky2); > > + /* Enable interrupts from phy/mac for port */ > + imask = sky2_read32(hw, B0_IMSK); > + > if (hw->chip_id == CHIP_ID_YUKON_OPT || > hw->chip_id == CHIP_ID_YUKON_PRM || > hw->chip_id == CHIP_ID_YUKON_OP_2) > imask |= Y2_IS_PHY_QLNK; /* enable PHY Quick Link */ > > - /* Enable interrupts from phy/mac for port */ > - imask = sky2_read32(hw, B0_IMSK); > imask |= portirq_msk[port]; > sky2_write32(hw, B0_IMSK, imask); > sky2_read32(hw, B0_IMSK); Acked-by: Stephen Hemminger <shemminger@vyattta.com> This should go to stable as well. Surprised that gcc did not detect the "or" of uninitialized value. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stephen Hemminger <shemminger@vyatta.com> Date: Mon, 2 Apr 2012 15:38:18 -0700 > On Fri, 30 Mar 2012 19:28:59 +0200 > Lino Sanfilippo <LinoSanfilippo@gmx.de> wrote: > >> This patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver >> in which the settings for PHY quick link are overwritten. >> >> Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> ... > Acked-by: Stephen Hemminger <shemminger@vyattta.com> Applied and queued up for -stable. > Surprised that gcc did not detect the "or" of uninitialized value. Especially since it warns for so much crap it shouldn't :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 760c2b1..d0132d8 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -1756,13 +1756,14 @@ static int sky2_open(struct net_device *dev) sky2_hw_up(sky2); + /* Enable interrupts from phy/mac for port */ + imask = sky2_read32(hw, B0_IMSK); + if (hw->chip_id == CHIP_ID_YUKON_OPT || hw->chip_id == CHIP_ID_YUKON_PRM || hw->chip_id == CHIP_ID_YUKON_OP_2) imask |= Y2_IS_PHY_QLNK; /* enable PHY Quick Link */ - /* Enable interrupts from phy/mac for port */ - imask = sky2_read32(hw, B0_IMSK); imask |= portirq_msk[port]; sky2_write32(hw, B0_IMSK, imask); sky2_read32(hw, B0_IMSK);
This patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver in which the settings for PHY quick link are overwritten. Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> --- This applies against 3.3 drivers/net/ethernet/marvell/sky2.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)