From patchwork Mon Jun 9 05:22:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devesh@vger.kernel.org, Sharma@vger.kernel.org X-Patchwork-Id: 4317771 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2E800BEEAA for ; Mon, 9 Jun 2014 05:56:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70E23201BC for ; Mon, 9 Jun 2014 05:56:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB2A72018A for ; Mon, 9 Jun 2014 05:56:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753004AbaFIF4l (ORCPT ); Mon, 9 Jun 2014 01:56:41 -0400 Received: from cmexedge2.ext.emulex.com ([138.239.224.100]:51539 "EHLO CMEXEDGE2.ext.emulex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752960AbaFIF4i (ORCPT ); Mon, 9 Jun 2014 01:56:38 -0400 Received: from CMEXHTCAS2.ad.emulex.com (138.239.115.218) by CMEXEDGE2.ext.emulex.com (138.239.224.100) with Microsoft SMTP Server (TLS) id 14.3.174.1; Sun, 8 Jun 2014 22:57:29 -0700 Received: from neo01-el64.lab.bg.emulex.com (10.192.204.8) by smtp.emulex.com (138.239.115.208) with Microsoft SMTP Server id 14.3.174.1; Sun, 8 Jun 2014 22:56:33 -0700 From: Devesh@vger.kernel.org, Sharma@vger.kernel.org To: CC: Devesh Sharma , Selvin Xavier , Mitesh Ahuja Subject: [PATCH for-next 2/2] RDMA/ocrdma: do not skip setting deffered_arm Date: Mon, 9 Jun 2014 10:52:38 +0530 X-Mailer: git-send-email 1.7.1 In-Reply-To: <1402291358-24901-1-git-send-email-devesh.sharma@emulex.com> References: <1402291358-24901-1-git-send-email-devesh.sharma@emulex.com> MIME-Version: 1.0 Message-ID: Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Devesh Sharma ib_request_notify_cq() when called for the first time ocrdma tries to skip setting deffered_arm flag. This may lead CQ to an un-armed state thus, never generating CQ event and leaving consumer in hung state. This patch removes the part of code that skkips setting deffered_arm flag. Signed-off-by: Devesh Sharma Signed-off-by: Selvin Xavier Signed-off-by: Mitesh Ahuja --- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 55aad54..0ac7193 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -2846,11 +2846,9 @@ int ocrdma_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags cq_flags) if (cq->first_arm) { ocrdma_ring_cq_db(dev, cq_id, arm_needed, sol_needed, 0); cq->first_arm = false; - goto skip_defer; } - cq->deferred_arm = true; -skip_defer: + cq->deferred_arm = true; cq->deferred_sol = sol_needed; spin_unlock_irqrestore(&cq->cq_lock, flags);