From patchwork Tue Oct 25 12:01:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 79156 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3072110qge; Tue, 25 Oct 2016 05:02:50 -0700 (PDT) X-Received: by 10.107.136.65 with SMTP id k62mr15153042iod.99.1477396970346; Tue, 25 Oct 2016 05:02:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u71si14105402pgd.117.2016.10.25.05.02.50; Tue, 25 Oct 2016 05:02:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758843AbcJYMCX (ORCPT + 27 others); Tue, 25 Oct 2016 08:02:23 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:36253 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758782AbcJYMCR (ORCPT ); Tue, 25 Oct 2016 08:02:17 -0400 Received: by mail-pf0-f180.google.com with SMTP id e6so118529190pfk.3 for ; Tue, 25 Oct 2016 05:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+8xhtruisabXnj/i9ZKHucXb7yixjM1uW6gz77mHnyY=; b=gUFiLRQ6CkTSPgnudbEVINz0gSUq0sCQ++/nxI7TuGQTe3u/0BjNo2SVT5ffwKKgNi DW/vO/0V20oVvdT0Alb9novSHRAIqY2aCJYAoXE2C9vMe3EAAwNnruzVldWIy8xq8GZi mHBC0PLBtVAr+W0GmclszoxbagbgyeROBH5PQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+8xhtruisabXnj/i9ZKHucXb7yixjM1uW6gz77mHnyY=; b=CO1y/ARTuqKd3FVAuJ8zwlG1h8iYMwjzgqBJx45NBv6FxNcEVTtiUNVpV/idjL4Gt6 4DfBxUC7NDrErjXmks782mPDjqMrN0j8MnyA6/1dWRw1sonURJXr4gfqne80ZkA+DUuQ a0WcNTePUnojmibzJxe6B+LgNoMq1wnGWbbL5qgOV+WhXWJFpzQBGoargJ90DaENo9Fo wxJjvk8sAD5hDBgiFnIV9GoOZixViB5qmpptUAPjHmyVLgGW5nntW8k1dSVIo01sUWwe SiajSp5pDrBAov+L8l9rVIXtInrcCPhIYxL792nBXRAy2bP93m0lLqQ+gtPLTyFRhiHd NCfA== X-Gm-Message-State: ABUngvfzyuYv+ou1ZJrVzD6pABn2ez0j5qukshHuI6YaOHBqstcPB+yi0wLqpkyYb8vdCZse X-Received: by 10.99.181.86 with SMTP id u22mr32614932pgo.174.1477396936845; Tue, 25 Oct 2016 05:02:16 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id ij5sm33051828pab.2.2016.10.25.05.02.13 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 05:02:16 -0700 (PDT) From: Binoy Jayan To: Doug Ledford , Sean Hefty , Hal Rosenstock Cc: Arnd Bergmann , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH v2 3/8] IB/hns: Replace semaphore poll_sem with mutex Date: Tue, 25 Oct 2016 17:31:54 +0530 Message-Id: <1477396919-27669-4-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1477396919-27669-1-git-send-email-binoy.jayan@linaro.org> References: <1477396919-27669-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The semaphore 'poll_sem' is a simple mutex, so it should be written as one. Semaphores are going away in the future. So replace the semaphore 'poll_sem' with a mutex. Also, remove mutex_[un]lock from mthca_cmd_use_events and mthca_cmd_use_polling respectively. Signed-off-by: Binoy Jayan --- drivers/infiniband/hw/hns/hns_roce_cmd.c | 11 ++++------- drivers/infiniband/hw/hns/hns_roce_device.h | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/infiniband/hw/hns/hns_roce_cmd.c b/drivers/infiniband/hw/hns/hns_roce_cmd.c index 2a0b6c0..51a0675 100644 --- a/drivers/infiniband/hw/hns/hns_roce_cmd.c +++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c @@ -119,7 +119,7 @@ static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev, u64 in_param, return ret; } -/* this should be called with "poll_sem" */ +/* this should be called with "poll_mutex" */ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, unsigned long in_modifier, u8 op_modifier, u16 op, @@ -167,10 +167,10 @@ static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param, { int ret; - down(&hr_dev->cmd.poll_sem); + mutex_lock(&hr_dev->cmd.poll_mutex); ret = __hns_roce_cmd_mbox_poll(hr_dev, in_param, out_param, in_modifier, op_modifier, op, timeout); - up(&hr_dev->cmd.poll_sem); + mutex_unlock(&hr_dev->cmd.poll_mutex); return ret; } @@ -275,7 +275,7 @@ int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) struct device *dev = &hr_dev->pdev->dev; mutex_init(&hr_dev->cmd.hcr_mutex); - sema_init(&hr_dev->cmd.poll_sem, 1); + mutex_init(&hr_dev->cmd.poll_mutex); hr_dev->cmd.use_events = 0; hr_dev->cmd.toggle = 1; hr_dev->cmd.max_cmds = CMD_MAX_NUM; @@ -319,8 +319,6 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev) hr_cmd->token_mask = CMD_TOKEN_MASK; hr_cmd->use_events = 1; - down(&hr_cmd->poll_sem); - return 0; } @@ -335,7 +333,6 @@ void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev) down(&hr_cmd->event_sem); kfree(hr_cmd->context); - up(&hr_cmd->poll_sem); } struct hns_roce_cmd_mailbox diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h index 3417315..2afe075 100644 --- a/drivers/infiniband/hw/hns/hns_roce_device.h +++ b/drivers/infiniband/hw/hns/hns_roce_device.h @@ -34,6 +34,7 @@ #define _HNS_ROCE_DEVICE_H #include +#include #define DRV_NAME "hns_roce" @@ -358,7 +359,7 @@ struct hns_roce_cmdq { struct dma_pool *pool; u8 __iomem *hcr; struct mutex hcr_mutex; - struct semaphore poll_sem; + struct mutex poll_mutex; /* * Event mode: cmd register mutex protection, * ensure to not exceed max_cmds and user use limit region