From patchwork Wed Sep 1 15:43:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faisal Latif X-Patchwork-Id: 147131 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o81FhERb002818 for ; Wed, 1 Sep 2010 15:43:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754961Ab0IAPnO (ORCPT ); Wed, 1 Sep 2010 11:43:14 -0400 Received: from mga11.intel.com ([192.55.52.93]:61938 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752779Ab0IAPnO (ORCPT ); Wed, 1 Sep 2010 11:43:14 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 01 Sep 2010 08:43:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,304,1280732400"; d="scan'208";a="602654069" Received: from flatif-mobl3.amr.corp.intel.com (HELO flatif-MOBL.intel.com) ([10.232.236.15]) by fmsmga002.fm.intel.com with SMTP; 01 Sep 2010 08:43:12 -0700 Received: by flatif-MOBL.intel.com (sSMTP sendmail emulation); Wed, 01 Sep 2010 10:43:11 -0500 Date: Wed, 1 Sep 2010 10:43:11 -0500 From: Faisal Latif To: Roland Dreier Cc: linux-rdma@vger.kernel.org Subject: [PATCH] RDMA/nes: Modified FIN handling causes hang in A0 cards Message-ID: <20100901154311.GA7040@FLATIF-MOBL3> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 01 Sep 2010 15:43:15 +0000 (UTC) diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index bfdad33..57fc45a 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c @@ -3468,7 +3468,8 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev, return; /* Ignore it, wait for close complete */ if (atomic_inc_return(&nesqp->close_timer_started) == 1) { if ((tcp_state == NES_AEQE_TCP_STATE_CLOSE_WAIT) && - (nesqp->ibqp_state == IB_QPS_RTS)) { + (nesqp->ibqp_state == IB_QPS_RTS) && + ((nesadapter->eeprom_version >> 16) != NES_A0)) { spin_lock_irqsave(&nesqp->lock, flags); nesqp->hw_iwarp_state = iwarp_state; nesqp->hw_tcp_state = tcp_state; diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h index aa9183d..1204c34 100644 --- a/drivers/infiniband/hw/nes/nes_hw.h +++ b/drivers/infiniband/hw/nes/nes_hw.h @@ -45,6 +45,7 @@ #define NES_PHY_TYPE_KR 9 #define NES_MULTICAST_PF_MAX 8 +#define NES_A0 3 enum pci_regs { NES_INT_STAT = 0x0000,