From patchwork Mon Nov 21 06:08:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 83176 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1324767qge; Sun, 20 Nov 2016 22:09:20 -0800 (PST) X-Received: by 10.129.86.5 with SMTP id k5mr12317372ywb.24.1479708560908; Sun, 20 Nov 2016 22:09:20 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s15si4303946ybi.301.2016.11.20.22.09.20; Sun, 20 Nov 2016 22:09:20 -0800 (PST) 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 S1753332AbcKUGJK (ORCPT + 26 others); Mon, 21 Nov 2016 01:09:10 -0500 Received: from mail-pf0-f173.google.com ([209.85.192.173]:33287 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753159AbcKUGJI (ORCPT ); Mon, 21 Nov 2016 01:09:08 -0500 Received: by mail-pf0-f173.google.com with SMTP id d2so62629994pfd.0 for ; Sun, 20 Nov 2016 22:09:08 -0800 (PST) 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=Czp2K2SFif77vWOHAD50it9N7AmUkCBx8v4j6ejoX1s=; b=b16WbXYCTuE25DCnkI2ho0nG0wgV8QZUyou+nM7oV5+CdGFUQUyejsDyNV1WrQXko8 4lA1gmov8LnPGSQtmTCjgR0kLJwByxbg3Qm7dLhJNZkWVyUhIG4ojzZxT6YUSW5Xkz8c Dqpc8ugEcql0R/I3QpyVXumr+xVVZdvmmJobc= 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=Czp2K2SFif77vWOHAD50it9N7AmUkCBx8v4j6ejoX1s=; b=fkGCaLuzZDMkxhi5C8C+beda6VhB+MLypyju/Ez/96VsNxyP4yUwlCia807Glg3+Zs yORbc6D+i/OZ/YDDWGjOF3bM3cdnIyR6VkiD/g5Nq7qrZ1vGJrFmDXYxZxZzRMR/VmPt HcIndK/fpWuXpeSRHz93evHVQGL6Y5LuZfedN55jIW6FH9d3uxIjXof1sU8tEZZsJigm 26w/nGWSkMtN4Ire9WYTWDEp6fCP9fT9YcvGwysfkxBfTFjqyQxgtZipKu3zvN2Qy2dy Nk62imLBwremuucY6E1hT+xnytV65RTiV+rRXtjefzfLAVGezxnMz8Dt4gzBZvy2XCPy 9rhg== X-Gm-Message-State: AKaTC025Y+h3dgy5l+ZJO27WWMKnr79j6hJMmfj0pEYOQc8yWFEDKVUHXwW68iA4LeO5rU+y X-Received: by 10.99.48.68 with SMTP id w65mr28437736pgw.68.1479708542481; Sun, 20 Nov 2016 22:09:02 -0800 (PST) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id 74sm16068432pge.2.2016.11.20.22.08.55 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Nov 2016 22:09:01 -0800 (PST) From: Binoy Jayan To: Doug Ledford , Sean Hefty , Sagi Grimberg , Hal Rosenstock , Leon Romanovsky , Sagi Grimberg , Bart Van Assche , Nicholas Bellinger , Jenny Derzhavetz , Ira Weiny , Steve Wise , Mark Bloch , Tatyana E Nikolova , Matan Barak , Lijun Ou , "Wei Hu(Xavier)" Cc: Faisal Latif , Mustafa Ismail , Mark Brown , Arnd Bergmann , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, target-devel@vger.kernel.org, Binoy Jayan Subject: [PATCH v5 3/9] IB/hns: Replace semaphore poll_sem with mutex Date: Mon, 21 Nov 2016 11:38:10 +0530 Message-Id: <1479708496-9828-4-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1479708496-9828-1-git-send-email-binoy.jayan@linaro.org> References: <1479708496-9828-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 it 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