From patchwork Fri Dec 12 05:20:26 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 13649 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id C3C57DE072 for ; Fri, 12 Dec 2008 16:20:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751133AbYLLFUs (ORCPT ); Fri, 12 Dec 2008 00:20:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750954AbYLLFUs (ORCPT ); Fri, 12 Dec 2008 00:20:48 -0500 Received: from qmta01.westchester.pa.mail.comcast.net ([76.96.62.16]:53054 "EHLO QMTA01.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804AbYLLFUr (ORCPT ); Fri, 12 Dec 2008 00:20:47 -0500 Received: from OMTA06.westchester.pa.mail.comcast.net ([76.96.62.51]) by QMTA01.westchester.pa.mail.comcast.net with comcast id poCH1a00316LCl0515LmMc; Fri, 12 Dec 2008 05:20:46 +0000 Received: from lost.foo-projects.org ([63.64.152.142]) by OMTA06.westchester.pa.mail.comcast.net with comcast id q5LS1a00L34bfcX3S5LX1v; Fri, 12 Dec 2008 05:20:44 +0000 From: Jeff Kirsher Subject: [PATCH] e1000e: fix double release of mutex To: davem@davemloft.net Cc: netdev@vger.kernel.org, stable@kernel.org, linux-kernel@vger.kernel.org, Jeff Kirsher Date: Thu, 11 Dec 2008 21:20:26 -0800 Message-ID: <20081212052025.3298.151.stgit@lost.foo-projects.org> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org During a reset, releasing the swflag after it failed to be acquired would cause a double unlock of the mutex. Instead, test whether acquisition of the swflag was successful and if not, do not release the swflag. The reset must still be done to bring the device to a quiescent state. This resolves [BUG 12200] BUG: bad unlock balance detected! e1000e http://bugzilla.kernel.org/show_bug.cgi?id=12200 Signed-off-by: Jeff Kirsher --- drivers/net/e1000e/ich8lan.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) -- 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 diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 523b971..d115a6d 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -1893,12 +1893,17 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) ctrl |= E1000_CTRL_PHY_RST; } ret_val = e1000_acquire_swflag_ich8lan(hw); + /* Whether or not the swflag was acquired, we need to reset the part */ hw_dbg(hw, "Issuing a global reset to ich8lan"); ew32(CTRL, (ctrl | E1000_CTRL_RST)); msleep(20); - /* release the swflag because it is not reset by hardware reset */ - e1000_release_swflag_ich8lan(hw); + if (!ret_val) { + /* release the swflag because it is not reset by + * hardware reset + */ + e1000_release_swflag_ich8lan(hw); + } ret_val = e1000e_get_auto_rd_done(hw); if (ret_val) {