From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761244Ab2C3R3E (ORCPT ); Fri, 30 Mar 2012 13:29:04 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:42213 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1758518Ab2C3R25 (ORCPT ); Fri, 30 Mar 2012 13:28:57 -0400 X-Authenticated: #4630777 X-Provags-ID: V01U2FsdGVkX18rOww9Ytor04bEz/WCvLzwiEwFtDbJUqOT9ZiJoo DZCmUqYu9hdNB4 Date: Fri, 30 Mar 2012 19:28:59 +0200 From: Lino Sanfilippo To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] sky2: dont overwrite settings for PHY Quick link Message-ID: <20120330172859.GB2703@Neptun> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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); -- 1.5.6.5