From patchwork Tue Sep 1 14:54:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Dolca X-Patchwork-Id: 512874 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 A97FA14076A for ; Wed, 2 Sep 2015 00:56:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755299AbbIAOzZ (ORCPT ); Tue, 1 Sep 2015 10:55:25 -0400 Received: from mga03.intel.com ([134.134.136.65]:28681 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753960AbbIAOzW (ORCPT ); Tue, 1 Sep 2015 10:55:22 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Sep 2015 07:55:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,449,1437462000"; d="scan'208";a="553098253" Received: from rdolca-desk.ger.corp.intel.com (HELO rdolca-desk.rb.intel.com) ([10.237.104.147]) by FMSMGA003.fm.intel.com with ESMTP; 01 Sep 2015 07:55:19 -0700 From: Robert Dolca To: linux-nfc@lists.01.org, Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Christophe Ricard , Robert Dolca Subject: [PATCH v2 7/9] nfc: nci: Use a separate mutex for nci open and close Date: Tue, 1 Sep 2015 17:54:26 +0300 Message-Id: <1441119268-30654-8-git-send-email-robert.dolca@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441119268-30654-1-git-send-email-robert.dolca@intel.com> References: <1441119268-30654-1-git-send-email-robert.dolca@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The functions were using req_lock for serialization. Doing so it prevented the driver from calling nci_request during setup because it uses the same mutex. In the open and close functions __nci_request was replaced with nci_request because it acquires req_lock. Add test for NCI_INIT bit in nci_request to allow calling the function during setup. Signed-off-by: Robert Dolca --- include/net/nfc/nci_core.h | 3 +++ net/nfc/nci/core.c | 30 ++++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index d28b7a3..61dcaf2 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -266,6 +266,9 @@ struct nci_dev { /* stored during intf_activated_ntf */ __u8 remote_gb[NFC_MAX_GT_LEN]; __u8 remote_gb_len; + + /* lock used for setup and other nci_ops serialization */ + struct mutex op_lock; }; /* ----- NCI Devices ----- */ diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 6f173cd..5d61b6e 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -136,7 +136,8 @@ inline int nci_request(struct nci_dev *ndev, { int rc; - if (!test_bit(NCI_UP, &ndev->flags)) + if (!test_bit(NCI_UP, &ndev->flags) && + !test_bit(NCI_INIT, &ndev->flags)) return -ENETDOWN; /* Serialize all requests */ @@ -383,7 +384,7 @@ static int nci_open_device(struct nci_dev *ndev) { int rc = 0; - mutex_lock(&ndev->req_lock); + mutex_lock(&ndev->op_lock); if (test_bit(NCI_UP, &ndev->flags)) { rc = -EALREADY; @@ -403,8 +404,8 @@ static int nci_open_device(struct nci_dev *ndev) rc = ndev->ops->init(ndev); if (!rc) { - rc = __nci_request(ndev, nci_reset_req, 0, - msecs_to_jiffies(NCI_RESET_TIMEOUT)); + rc = nci_request(ndev, nci_reset_req, 0, + msecs_to_jiffies(NCI_RESET_TIMEOUT)); } if (!rc && ndev->ops->setup) { @@ -412,16 +413,16 @@ static int nci_open_device(struct nci_dev *ndev) } if (!rc) { - rc = __nci_request(ndev, nci_init_req, 0, - msecs_to_jiffies(NCI_INIT_TIMEOUT)); + rc = nci_request(ndev, nci_init_req, 0, + msecs_to_jiffies(NCI_INIT_TIMEOUT)); } if (!rc && ndev->ops->post_setup) rc = ndev->ops->post_setup(ndev); if (!rc) { - rc = __nci_request(ndev, nci_init_complete_req, 0, - msecs_to_jiffies(NCI_INIT_TIMEOUT)); + rc = nci_request(ndev, nci_init_complete_req, 0, + msecs_to_jiffies(NCI_INIT_TIMEOUT)); } clear_bit(NCI_INIT, &ndev->flags); @@ -441,19 +442,19 @@ static int nci_open_device(struct nci_dev *ndev) } done: - mutex_unlock(&ndev->req_lock); + mutex_unlock(&ndev->op_lock); return rc; } static int nci_close_device(struct nci_dev *ndev) { nci_req_cancel(ndev, ENODEV); - mutex_lock(&ndev->req_lock); + mutex_lock(&ndev->op_lock); if (!test_and_clear_bit(NCI_UP, &ndev->flags)) { del_timer_sync(&ndev->cmd_timer); del_timer_sync(&ndev->data_timer); - mutex_unlock(&ndev->req_lock); + mutex_unlock(&ndev->op_lock); return 0; } @@ -470,8 +471,8 @@ static int nci_close_device(struct nci_dev *ndev) atomic_set(&ndev->cmd_cnt, 1); set_bit(NCI_INIT, &ndev->flags); - __nci_request(ndev, nci_reset_req, 0, - msecs_to_jiffies(NCI_RESET_TIMEOUT)); + nci_request(ndev, nci_reset_req, 0, + msecs_to_jiffies(NCI_RESET_TIMEOUT)); /* After this point our queues are empty * and no works are scheduled. @@ -488,7 +489,7 @@ static int nci_close_device(struct nci_dev *ndev) /* Clear flags */ ndev->flags = 0; - mutex_unlock(&ndev->req_lock); + mutex_unlock(&ndev->op_lock); return 0; } @@ -1123,6 +1124,7 @@ int nci_register_device(struct nci_dev *ndev) (unsigned long) ndev); mutex_init(&ndev->req_lock); + mutex_init(&ndev->op_lock); INIT_LIST_HEAD(&ndev->conn_info_list); rc = nfc_register_device(ndev->nfc_dev);