From patchwork Fri May 25 14:36:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 136933 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3676014lji; Fri, 25 May 2018 07:39:21 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqLuj5irE562WUVzWhai9DZ1Oew2UF+8XGImEQ1Zs8wvAxZZ9Uqly1vv3prVVWfPO+EA2sF X-Received: by 2002:a63:735e:: with SMTP id d30-v6mr1850709pgn.257.1527259161009; Fri, 25 May 2018 07:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527259161; cv=none; d=google.com; s=arc-20160816; b=UbuM0mhsZBJunsfGPs6osa4HLd2rXcZsnl+MYEBy/hvaqOyKupfQpYmwi/LmZm3srx RaC/ztLNyrl7N+GsiSMomR7g+IBMEpIt1W+PZM9EOOhBeDOQWNvszlvV5Cp4oAiYFyST yXUN8GmbxeJO4Sr4CVzHg5jU1kIt7ttDuBFso5HIVEPJh24w3mgvQenKLbsB9esgvPYp Z5+39bQHp9MOmUOVum+0XlsET1iDD6Wvxk47Gf/dWx9DEolFwRr9gp/4W4Qza8SL5cqj 7uPnJiJVkM78/M8DK7IzK9g2IdOOX6L1k2p9eu9WIjya4CSwpyZmx0A/GITqGWgnfgPN HjZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=7dM/CZexMEE5T1vDyvQzFcF6a9NhIWwy9vIqMTrnZ70=; b=O9b09WMzSeroEizQYmB0pF9COwt9dMoV5l5HUlNjFihFAJFeklaVoDBFxapESGzmzB maLhECaRs9fObjD15mYLZMfUIUXNSPaWJPNe4Jk3mC3WCq8hEehTGfJ3BVyahHpbbvM3 CkTwtzc3VyS2u8PPFb0avYNN75mRFrEnkQfSGE+uffSMgXNtvzAJdtOcOOsL3muzJOq0 rLh7NFty+t0IUlgNjZM1m79j5X5vJXfLCUFUKbc1HLNRa7MkMS4+gGfLcnq9z9+ZHvta xGXtUPHScQj/yT3QJXn7zpFSk8MN5jIegc8pCRZd12xnCgNK8H9X/1MntOgmaAKkcn+I 37+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TbyDhLnB; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n12-v6si19479486pgs.560.2018.05.25.07.39.20; Fri, 25 May 2018 07:39:20 -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 header.s=google header.b=TbyDhLnB; 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 sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965805AbeEYOig (ORCPT + 30 others); Fri, 25 May 2018 10:38:36 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:39654 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965109AbeEYOia (ORCPT ); Fri, 25 May 2018 10:38:30 -0400 Received: by mail-wm0-f65.google.com with SMTP id f8-v6so15257469wmc.4 for ; Fri, 25 May 2018 07:38:29 -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=7dM/CZexMEE5T1vDyvQzFcF6a9NhIWwy9vIqMTrnZ70=; b=TbyDhLnBW+rke/ZeVaga++roBfMBYgPqxMobrrSjEINnwhKvXTnFbFsAYUPkBBrfBK YRfAOZHJbZTpBWRA7/LiHw6c6YH4smQ0W51eBvOPx5SDzRgUqjTqIHzmI8uJAA6qYG3U VFdemBq7sjhbpAppPt3jYLv32pP68Cn7KxguE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7dM/CZexMEE5T1vDyvQzFcF6a9NhIWwy9vIqMTrnZ70=; b=lYmVbWXb55ggrHPkuIm5nnb2hS3Nj9/nT3fjFkdHXbrTT+4a4QSz1Hvbrdz3LKeVh9 nNEFj8J3kbjyYMn1dhivMafDCmjgv26A7MKVSrUTdvWVUEKp/R2exjxp01Z7TcMvE/og goHGcuK5g1O+rKqztk8feilOZwKY05DwNkOgKxi+Xk2M+y3dE8egbEXtJWuSwEkbPykc 7l5tKDWaaJAf7fbJV2cW9WwW6qRrAK++ZVGWMEnyBrCSGv54o9piM2c66GR+1HlGD9Rp aO74qwwRdDt5A3ZqYT9Yb2JR155Cn/P92ZQThoshhZ76K/oCOdggbbN+MsQquZlhGQGy 9xlg== X-Gm-Message-State: ALKqPwcRiryR/oVO5WlyCpf573CDGYsu49KM3uMLaXuck62QYoLnQww+ 953mEKA9N0tq0KYviJhFQ1xRRw== X-Received: by 2002:a1c:da50:: with SMTP id r77-v6mr1794303wmg.105.1527259109091; Fri, 25 May 2018 07:38:29 -0700 (PDT) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id r6-v6sm26165729wrg.73.2018.05.25.07.38.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 May 2018 07:38:28 -0700 (PDT) From: Srinivas Kandagatla To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Srinivas Kandagatla Subject: [PATCH v3 7/8] slimbus: messaging: add slim_prepare_txn() helper function Date: Fri, 25 May 2018 15:36:17 +0100 Message-Id: <20180525143618.820-8-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180525143618.820-1-srinivas.kandagatla@linaro.org> References: <20180525143618.820-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds slim_prepare_txn() to allow controllers to prepare controller specific transaction. If not each controllers will duplicate the same code from core. Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/messaging.c | 84 ++++++++++++++++++++++++++++++--------------- drivers/slimbus/slimbus.h | 2 ++ 2 files changed, 58 insertions(+), 28 deletions(-) -- 2.16.2 diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index e3605ed1c459..cfffa1dece61 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -55,6 +55,46 @@ void slim_msg_response(struct slim_controller *ctrl, u8 *reply, u8 tid, u8 len) } EXPORT_SYMBOL_GPL(slim_msg_response); +/** + * slim_prepare_txn() - Prepare a transaction + * + * @ctrl: Controller handle + * @txn: transaction to be prepared + * @done: completion for transaction if msg does not have completion + * @need_tid: flag to indicate if tid is required for this txn + * note, user defined commands would need tid. + * + * Called by controller to prepare a transaction + * + * Return: zero on success and error code on failures. + */ +int slim_prepare_txn(struct slim_controller *ctrl, struct slim_msg_txn *txn, + struct completion *done, bool need_tid) +{ + unsigned long flags; + int ret = 0; + + txn->need_tid = need_tid; + if (!need_tid) + return 0; + + spin_lock_irqsave(&ctrl->txn_lock, flags); + ret = idr_alloc(&ctrl->tid_idr, txn, 0, SLIM_MAX_TIDS, GFP_ATOMIC); + if (ret < 0) + goto err; + + txn->tid = ret; + if (!txn->msg->comp) + txn->comp = done; + else + txn->comp = txn->msg->comp; + +err: + spin_unlock_irqrestore(&ctrl->txn_lock, flags); + return ret; +} +EXPORT_SYMBOL_GPL(slim_prepare_txn); + /** * slim_do_transfer() - Process a SLIMbus-messaging transaction * @@ -70,10 +110,9 @@ EXPORT_SYMBOL_GPL(slim_msg_response); */ int slim_do_transfer(struct slim_controller *ctrl, struct slim_msg_txn *txn) { - DECLARE_COMPLETION_ONSTACK(done); - bool need_tid = false, clk_pause_msg = false; + bool clk_pause_msg = false; unsigned long flags; - int ret, tid, timeout; + int ret, timeout; /* * do not vote for runtime-PM if the transactions are part of clock @@ -94,28 +133,8 @@ int slim_do_transfer(struct slim_controller *ctrl, struct slim_msg_txn *txn) } } - need_tid = slim_tid_txn(txn->mt, txn->mc); - - if (need_tid) { - spin_lock_irqsave(&ctrl->txn_lock, flags); - tid = idr_alloc(&ctrl->tid_idr, txn, 0, - SLIM_MAX_TIDS, GFP_ATOMIC); - txn->tid = tid; - - if (!txn->msg->comp) - txn->comp = &done; - else - txn->comp = txn->comp; - - spin_unlock_irqrestore(&ctrl->txn_lock, flags); - - if (tid < 0) - return tid; - } - ret = ctrl->xfer_msg(ctrl, txn); - - if (ret && need_tid && !txn->msg->comp) { + if (!ret && txn->need_tid && !txn->msg->comp) { unsigned long ms = txn->rl + HZ; timeout = wait_for_completion_timeout(txn->comp, @@ -123,7 +142,7 @@ int slim_do_transfer(struct slim_controller *ctrl, struct slim_msg_txn *txn) if (!timeout) { ret = -ETIMEDOUT; spin_lock_irqsave(&ctrl->txn_lock, flags); - idr_remove(&ctrl->tid_idr, tid); + idr_remove(&ctrl->tid_idr, txn->tid); spin_unlock_irqrestore(&ctrl->txn_lock, flags); } } @@ -133,13 +152,14 @@ int slim_do_transfer(struct slim_controller *ctrl, struct slim_msg_txn *txn) txn->mt, txn->mc, txn->la, ret); slim_xfer_err: - if (!clk_pause_msg && (!need_tid || ret == -ETIMEDOUT)) { + if (!clk_pause_msg && (!txn->need_tid || ret == -ETIMEDOUT)) { /* * remove runtime-pm vote if this was TX only, or * if there was error during this transaction */ pm_runtime_mark_last_busy(ctrl->dev); pm_runtime_put_autosuspend(ctrl->dev); + } return ret; } @@ -205,6 +225,8 @@ int slim_xfer_msg(struct slim_device *sbdev, struct slim_val_inf *msg, DEFINE_SLIM_LDEST_TXN(txn_stack, mc, 6, sbdev->laddr, msg); struct slim_msg_txn *txn = &txn_stack; struct slim_controller *ctrl = sbdev->ctrl; + DECLARE_COMPLETION_ONSTACK(done); + bool need_tid = false; int ret; u16 sl; @@ -232,10 +254,16 @@ int slim_xfer_msg(struct slim_device *sbdev, struct slim_val_inf *msg, break; } - if (slim_tid_txn(txn->mt, txn->mc)) + if (slim_tid_txn(txn->mt, txn->mc)) { txn->rl++; + need_tid = true; + } - return slim_do_transfer(ctrl, txn); + ret = slim_prepare_txn(ctrl, txn, &done, need_tid); + if (!ret) + return slim_do_transfer(ctrl, txn); + + return ret; } EXPORT_SYMBOL_GPL(slim_xfer_msg); diff --git a/drivers/slimbus/slimbus.h b/drivers/slimbus/slimbus.h index 3ec5a85fba8e..8266e53535cb 100644 --- a/drivers/slimbus/slimbus.h +++ b/drivers/slimbus/slimbus.h @@ -242,6 +242,8 @@ int slim_unregister_controller(struct slim_controller *ctrl); void slim_msg_response(struct slim_controller *ctrl, u8 *reply, u8 tid, u8 l); int slim_do_transfer(struct slim_controller *ctrl, struct slim_msg_txn *txn); int slim_ctrl_clk_pause(struct slim_controller *ctrl, bool wakeup, u8 restart); +int slim_prepare_txn(struct slim_controller *ctrl, struct slim_msg_txn *txn, + struct completion *done, bool need_tid); static inline bool slim_tid_txn(u8 mt, u8 mc) {