From patchwork Tue Jul 19 13:31:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 650534 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rvM576MKSz9stY for ; Wed, 20 Jul 2016 12:56:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbcGTC45 (ORCPT ); Tue, 19 Jul 2016 22:56:57 -0400 Received: from [123.119.179.77] ([123.119.179.77]:37236 "EHLO mail.zhuyj.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752651AbcGTC4z (ORCPT ); Tue, 19 Jul 2016 22:56:55 -0400 Received: from mail.zhuyj.com (unknown [192.168.2.101]) by mail.zhuyj.com (Postfix) with ESMTPA id 088555C32B6; Tue, 19 Jul 2016 21:31:56 +0800 (CST) From: zyjzyj2000@gmail.com To: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, jeffrey.t.kirsher@intel.com, donald.c.skidmore@intel.com Cc: Zhu Yanjun Subject: [PATCH 1/1] ixgbevf: avoid checking hang when performing hardware reset Date: Tue, 19 Jul 2016 21:31:53 +0800 Message-Id: <1468935113-3051-2-git-send-email-zyjzyj2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468935113-3051-1-git-send-email-zyjzyj2000@gmail.com> References: <1468935113-3051-1-git-send-email-zyjzyj2000@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhu Yanjun When performing hardware reset, it is not necessary to check hang. Or else, the call trace will appear. Signed-off-by: Zhu Yanjun --- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 +++-- drivers/net/ethernet/intel/ixgbevf/vf.c | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h index d5944c3..60fc63b 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h @@ -446,6 +446,7 @@ enum ixbgevf_state_t { __IXGBEVF_SERVICE_INITED, __IXGBEVF_RESET_REQUESTED, __IXGBEVF_QUEUE_RESET_REQUESTED, + __IXGBEVF_HW_RESETTING, }; enum ixgbevf_boards { diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index acc2401..530005b 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -2795,9 +2795,10 @@ static void ixgbevf_check_hang_subtask(struct ixgbevf_adapter *adapter) u32 eics = 0; int i; - /* If we're down or resetting, just bail */ + /* If we're down, resetting or hw resetting, just bail */ if (test_bit(__IXGBEVF_DOWN, &adapter->state) || - test_bit(__IXGBEVF_RESETTING, &adapter->state)) + test_bit(__IXGBEVF_RESETTING, &adapter->state) || + test_bit(__IXGBEVF_HW_RESETTING, &adapter->state)) return; /* Force detection of hung controller */ diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c index e670d3b..4ec4484 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -80,6 +80,9 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) s32 ret_val = IXGBE_ERR_INVALID_MAC_ADDR; u32 msgbuf[IXGBE_VF_PERMADDR_MSG_LEN]; u8 *addr = (u8 *)(&msgbuf[1]); + struct ixgbevf_adapter *adapter = hw->back; + + set_bit(__IXGBEVF_HW_RESETTING, &adapter->state); /* Call adapter stop to disable tx/rx and clear interrupts */ hw->mac.ops.stop_adapter(hw); @@ -128,6 +131,8 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) hw->mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD]; + clear_bit(__IXGBEVF_HW_RESETTING, &adapter->state); + return 0; }