From patchwork Wed May 16 11:36:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 135998 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp805313lji; Wed, 16 May 2018 04:39:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpGBWMKCmxcJiNwfHrBb4a7qjsVZ1XtJGa1fQDTMFjsSM41FPQUvhmeikto393Sdz39DT6c X-Received: by 2002:a17:902:8d8c:: with SMTP id v12-v6mr587808plo.366.1526470774541; Wed, 16 May 2018 04:39:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526470774; cv=none; d=google.com; s=arc-20160816; b=Jhty5cnEeACT6SXunWFz1z3dsFiWr1P+BkWyON+JkOqUJqT037+gCRZXPm/HA/K1bW 0MFBc3gWyhrQXVMALIbHLAqMMA5xxkLwAuZzkCPuOVfi0jhCBqYEzAMdn7WF8Me4NYjB DS6X8l+peSqcMu5muLVGQjr8D95Lab8I2E9sB/bpCdA8HFdFHBA+p1m53df8IFQjKUBR +W5aIj+EZ0VONqmaNPW/+qjqzDT+vw/w+rUYMiOY/R/nhXKOglddixtmT+6AL0HV9jbV RBZd/ENbLpDegejt7XGs33grU6i6Awu9pP60mdh4usS9YJVhzaMSFRBU0/lHoxdQf/WH QUfw== 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=h+yKZBsymFyOLdBuFEX4Ykm1mvdtJ0VJ4kvjsob+kQI=; b=cMHKYY14+OIaYcI8KlPmmzydK84ryPkVSkWmkbnhOA+7NHhwYBPEDJgPUmd2kQsFLP z3KBCoQkn/uoBJs94sZRsxYwhQNqapgClxOeYTqzkqeAI7euI/lf7AHZGo5srfow21SV 3N/gWearKWLhrXSufB2p31Yel6Jt/1ZMZvfo1N3NPoEzkVL+M/7aSRoEf2IXmT0esaHc x46ecTmwn28ZYGoewzZOIOU2/sQu1VdKd2HhC5AHuxC812mWD0E9a7DXO5vYOG+s3XcS DHqvhr/HyfbV/NEweDnThT3rvegozzqGeiAgbHorE/WApVarqfs8tm1V64IVnMWpM0o9 8Wyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mxuqsvkb; 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 g34-v6si2372565pld.411.2018.05.16.04.39.34; Wed, 16 May 2018 04:39:34 -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=Mxuqsvkb; 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 S1752644AbeEPLjb (ORCPT + 29 others); Wed, 16 May 2018 07:39:31 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:41736 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752274AbeEPLjP (ORCPT ); Wed, 16 May 2018 07:39:15 -0400 Received: by mail-wr0-f194.google.com with SMTP id g21-v6so561084wrb.8 for ; Wed, 16 May 2018 04:39:14 -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=h+yKZBsymFyOLdBuFEX4Ykm1mvdtJ0VJ4kvjsob+kQI=; b=MxuqsvkbeC7wagRMa2luw0M82AuyzMLDGaUh09icfZfE0BKe1GjhsjJb9OiUqc6sIj jCwKrXX+jfTqlUB6xxc0P0mnvez39zpxFI9wtESI10Y/a+8VyoJhgiQ96g+M6CzcIOd5 K4tTfmK/uhTacFLzD4rG0nMxIgLR9MqGvzrLQ= 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=h+yKZBsymFyOLdBuFEX4Ykm1mvdtJ0VJ4kvjsob+kQI=; b=Og9s4NC13nVBncqXcmexw8maQUi2+pAHC2OO6cifbGqS48C7dDFRnERYnZofGAoH/u tBlUbYY8zUSm0VToqeVKOY2OIPnSMcnUBs1ijkaAC6xDI+Rs6ZOXA2lUBfUPr0x2tFJ9 dHOuMVIpyTBM8mp3Zic2LpH4lYpkUVNqMInXDBfNAw+9crjYR0UnCQQbidZPFOjDbjgW /dg9ovkD5t8xdY7rTDrdLx2WIeYBdZJsgrtCrODzna465wBria2VkFAioILS6K9VXFS/ wkPNHUP4Rj90HQVmd81PPaw73m1ERN++DVH7yKQ32n4mjHxxmJcYyoMfTc9T1WqC08wO GX3w== X-Gm-Message-State: ALKqPwcH38mW3yNu4iAxymNRwzqNpmxYUSOWMksGJTXNJPCoTuov9N/W O5iYcw/GER8Wqt+/OsBIbv945ySuovc= X-Received: by 2002:adf:ac4f:: with SMTP id v73-v6mr501725wrc.5.1526470753812; Wed, 16 May 2018 04:39:13 -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 k126-v6sm4504263wmd.45.2018.05.16.04.39.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 May 2018 04:39:13 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Srinivas Kandagatla Subject: [PATCH 6/7] slimbus: messaging: add slim_prepare_txn() helper function Date: Wed, 16 May 2018 12:36:41 +0100 Message-Id: <20180516113642.28136-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180516113642.28136-1-srinivas.kandagatla@linaro.org> References: <20180516113642.28136-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 | 89 ++++++++++++++++++++++++++++++--------------- drivers/slimbus/qcom-ctrl.c | 7 +++- drivers/slimbus/slimbus.h | 2 + 3 files changed, 68 insertions(+), 30 deletions(-) -- 2.16.2 diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index 1c57b631031a..fd0788019357 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -55,6 +55,50 @@ 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 + * @need_tid: flag to indicate if tid is required for this txn + * + * 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; + + spin_lock_irqsave(&ctrl->txn_lock, flags); + + if (need_tid) { + ret = idr_alloc(&ctrl->tid_idr, txn, 0, SLIM_MAX_TIDS, + GFP_ATOMIC); + if (ret < 0) { + spin_unlock_irqrestore(&ctrl->txn_lock, flags); + return ret; + } + txn->tid = ret; + txn->need_tid = true; + } else { + txn->need_tid = false; + } + + if (!txn->msg->comp) + txn->comp = done; + else + txn->comp = txn->msg->comp; + + spin_unlock_irqrestore(&ctrl->txn_lock, flags); + + return 0; +} +EXPORT_SYMBOL_GPL(slim_prepare_txn); + /** * slim_do_transfer() - Process a SLIMbus-messaging transaction * @@ -70,10 +114,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 +137,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 +146,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 +156,12 @@ 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; } @@ -169,6 +191,7 @@ static int slim_val_inf_sanity(struct slim_controller *ctrl, if (msg->rbuf != NULL && msg->wbuf != NULL) return 0; break; + } reterr: if (msg) @@ -205,6 +228,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 +257,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/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index ffb46f915334..0783fb11c702 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -397,6 +397,7 @@ static int qcom_set_laddr(struct slim_controller *sctrl, u8 instance; u8 laddr; } __packed p; + DECLARE_COMPLETION_ONSTACK(done); struct slim_val_inf msg = {0}; DEFINE_SLIM_EDEST_TXN(txn, SLIM_MSG_MC_ASSIGN_LOGICAL_ADDRESS, 10, laddr, &msg); @@ -410,7 +411,11 @@ static int qcom_set_laddr(struct slim_controller *sctrl, msg.wbuf = (void *)&p; msg.num_bytes = 7; - ret = slim_do_transfer(&ctrl->ctrl, &txn); + + ret = slim_prepare_txn(&ctrl->ctrl, &txn, &done, + slim_tid_txn(txn.mt, txn.mc)); + if (!ret) + ret = slim_do_transfer(&ctrl->ctrl, &txn); if (ret) dev_err(ctrl->dev, "set LA:0x%x failed:ret:%d\n", diff --git a/drivers/slimbus/slimbus.h b/drivers/slimbus/slimbus.h index c0450f469e07..67e774b2b2dd 100644 --- a/drivers/slimbus/slimbus.h +++ b/drivers/slimbus/slimbus.h @@ -241,6 +241,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) {