Received: by 10.192.165.148 with SMTP id m20csp139118imm; Wed, 9 May 2018 10:03:38 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqdWPIMKGK5t4jIAYm38VPhy1yJye6yPFQe03PnV5X0/KGVmhGE7k/dHF7Z+3DlXhIbSJuD X-Received: by 10.98.217.5 with SMTP id s5mr45078490pfg.20.1525885418637; Wed, 09 May 2018 10:03:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525885418; cv=none; d=google.com; s=arc-20160816; b=UNOnesW2IC7VuhvWorg7GUuOQjDlQeWG+jenUO+4KcFmNvVeQDlfKdam9d5GC8f8Nb b4IZ6keXcwt5tuLdWLvT/ohGurwRYCLThrmyTfZCtXHtlkhxrMAGpMsdsT8pdhIISXbH RaBEXhNNhiG7ui6y2BCc0tktqMMFCz0IOWdbmTsleeSnpkihOAr9AYhaSyT70+BiRwfM B8u1zwDpOz0uAL3Bnt4zi4YzTF8FXI5S7WMKuaaDrmaZpKVf9IjopHyUQpEe0vW5n8p2 zHvwkDO3+pDuD9TMjadGsK6uMREH7d/vRvdyyzSd2v3JKD3XRow/A2XL6sGZM9t4o46l P24A== 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:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=5yxXhD+D/eVmcYj5lzWclfYzeQNoQ1LOFEl6oyJXCCY=; b=p5JY5Aa45f2MRTz9AzK6JZfjCjjb80RCmLWph/NgobvpMSkum44X0BZ8rlCQjvNJGz lBo0yCZXE2VoR8OnqggCVjNyRvV5ahLaO62Eeqn/E08FlKM+gnEaGtmrq9sHYkW26HzM 3HP8SMeIwYld7fbNLnsbBJSEIC/MTRLJX3xR9EC67yMeY6FvlozptBjLlLg3486PojTh Vf+Io1dn7gi65uJ0M+W5s/RihD3Q9EiNR8GORz5EYuM+ql68KWfBcyoyIxnHmNR80YeR uRNUyAz61bCtJzOd33LoTwEg/uFSTRc3mF46zIbuEsudeKrF3WWO4BE6H/X4956vBwLt mIcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=VS4kVGZ1; dkim=pass header.i=@codeaurora.org header.s=default header.b=frxDEFZG; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bc2-v6si5585974plb.43.2018.05.09.10.03.23; Wed, 09 May 2018 10:03:38 -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=@codeaurora.org header.s=default header.b=VS4kVGZ1; dkim=pass header.i=@codeaurora.org header.s=default header.b=frxDEFZG; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965728AbeEIRCQ (ORCPT + 99 others); Wed, 9 May 2018 13:02:16 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56928 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965686AbeEIRCM (ORCPT ); Wed, 9 May 2018 13:02:12 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D7DD36081B; Wed, 9 May 2018 17:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525885331; bh=NIRluIvJTB3DLkiFEGAg8bRU2iKsboRjRZBB45hnTNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VS4kVGZ1GECNo/6MheaSnpnS8KP/m5yZWZnpXMfo5Kxk1aKo7B2P4vVI9qKFQ8Y64 JAeAOlgLeZU3HEpnuezcniWkshLI1S+Lpxw+5TShHMGoMy7mT0VwotLG57ryfGCt4M RUOkEjEKCMZJih7bez4M61XcVMMbsPN9Gno9AWoc= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from codeaurora.org (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: ilina@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A667860C67; Wed, 9 May 2018 17:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525885330; bh=NIRluIvJTB3DLkiFEGAg8bRU2iKsboRjRZBB45hnTNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=frxDEFZGvKcQYcd8sADq7pTwQ+mtNKXGE+MxUDYe5UBh7bmZ4Q63CAVN9U21kPn0t WBVo6SaZrN0uT8vVOGGwm5wvgylfUReW3KGblAjlYDvsWYIhc/PfQC1XCXk04RHOtJ JYFhMooxGHV0+QVIVlWaGqQp6V3QMXMWf6ocnTY8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A667860C67 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=ilina@codeaurora.org From: Lina Iyer To: andy.gross@linaro.org, david.brown@linaro.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org Cc: rnayak@codeaurora.org, bjorn.andersson@linaro.org, linux-kernel@vger.kernel.org, sboyd@kernel.org, evgreen@chromium.org, dianders@chromium.org, mka@chromium.org, rplsssn@codeaurora.org, Lina Iyer Subject: [PATCH v8 05/10] drivers: qcom: rpmh-rsc: write sleep/wake requests to TCS Date: Wed, 9 May 2018 11:01:54 -0600 Message-Id: <20180509170159.29682-6-ilina@codeaurora.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509170159.29682-1-ilina@codeaurora.org> References: <20180509170159.29682-1-ilina@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sleep and wake requests are sent when the application processor subsystem of the SoC is entering deep sleep states like in suspend. These requests help lower the system power requirements when the resources are not in use. Sleep and wake requests are written to the TCS slots but are not triggered at the time of writing. The TCS are triggered by the firmware after the last of the CPUs has executed its WFI. Since these requests may come in different batches of requests, it is the job of this controller driver to find and arrange the requests into the available TCSes. Signed-off-by: Lina Iyer Reviewed-by: Evan Green --- Changes in v8: - Bounds check in find_match() Changes in v7: - Bug fix in find_match() --- drivers/soc/qcom/rpmh-internal.h | 8 ++ drivers/soc/qcom/rpmh-rsc.c | 122 +++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/drivers/soc/qcom/rpmh-internal.h b/drivers/soc/qcom/rpmh-internal.h index d9a21726e568..6e19fe458c31 100644 --- a/drivers/soc/qcom/rpmh-internal.h +++ b/drivers/soc/qcom/rpmh-internal.h @@ -14,6 +14,7 @@ #define MAX_CMDS_PER_TCS 16 #define MAX_TCS_PER_TYPE 3 #define MAX_TCS_NR (MAX_TCS_PER_TYPE * TCS_TYPE_NR) +#define MAX_TCS_SLOTS (MAX_CMDS_PER_TCS * MAX_TCS_PER_TYPE) #define RPMH_MAX_CTRLR 2 struct rsc_drv; @@ -30,6 +31,8 @@ struct rsc_drv; * @ncpt: number of commands in each TCS * @lock: lock for synchronizing this TCS writes * @req: requests that are sent from the TCS + * @cmd_cache: flattened cache of cmds in sleep/wake TCS + * @slots: indicates which of @cmd_addr are occupied */ struct tcs_group { struct rsc_drv *drv; @@ -40,6 +43,8 @@ struct tcs_group { int ncpt; spinlock_t lock; const struct tcs_request *req[MAX_TCS_PER_TYPE]; + u32 *cmd_cache; + DECLARE_BITMAP(slots, MAX_TCS_SLOTS); }; /** @@ -69,6 +74,9 @@ struct rsc_drv { extern struct list_head rsc_drv_list; int rpmh_rsc_send_data(struct rsc_drv *drv, const struct tcs_request *msg); +int rpmh_rsc_write_ctrl_data(struct rsc_drv *drv, + const struct tcs_request *msg); +int rpmh_rsc_invalidate(struct rsc_drv *drv); void rpmh_tx_done(const struct tcs_request *msg, int r); diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index c0edf3850147..b5894b001ae1 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -113,6 +113,12 @@ static struct tcs_group *get_tcs_for_msg(struct rsc_drv *drv, case RPMH_ACTIVE_ONLY_STATE: type = ACTIVE_TCS; break; + case RPMH_WAKE_ONLY_STATE: + type = WAKE_TCS; + break; + case RPMH_SLEEP_STATE: + type = SLEEP_TCS; + break; default: return ERR_PTR(-EINVAL); } @@ -353,6 +359,109 @@ int rpmh_rsc_send_data(struct rsc_drv *drv, const struct tcs_request *msg) } EXPORT_SYMBOL(rpmh_rsc_send_data); +static int find_match(const struct tcs_group *tcs, const struct tcs_cmd *cmd, + int len) +{ + int i, j; + + /* Check for already cached commands */ + for_each_set_bit(i, tcs->slots, MAX_TCS_SLOTS) { + if (tcs->cmd_cache[i] != cmd[0].addr) + continue; + if (i + len >= MAX_TCS_SLOTS) + goto seq_err; + for (j = 0; j < len; j++) { + if (tcs->cmd_cache[i + j] != cmd[j].addr) + goto seq_err; + } + return i; + } + + return -ENODATA; + +seq_err: + WARN(1, "Message does not match previous sequence.\n"); + return -EINVAL; +} + +static int find_slots(struct tcs_group *tcs, const struct tcs_request *msg, + int *tcs_id, int *cmd_id) +{ + int slot, offset; + int i = 0; + + /* Find if we already have the msg in our TCS */ + slot = find_match(tcs, msg->cmds, msg->num_cmds); + if (slot >= 0) + goto copy_data; + + /* Do over, until we can fit the full payload in a TCS */ + do { + slot = bitmap_find_next_zero_area(tcs->slots, MAX_TCS_SLOTS, + i, msg->num_cmds, 0); + if (slot == MAX_TCS_SLOTS) + return -ENOMEM; + i += tcs->ncpt; + } while (slot + msg->num_cmds - 1 >= i); + +copy_data: + bitmap_set(tcs->slots, slot, msg->num_cmds); + /* Copy the addresses of the resources over to the slots */ + for (i = 0; i < msg->num_cmds; i++) + tcs->cmd_cache[slot + i] = msg->cmds[i].addr; + + offset = slot / tcs->ncpt; + *tcs_id = offset + tcs->offset; + *cmd_id = slot % tcs->ncpt; + + return 0; +} + +static int tcs_ctrl_write(struct rsc_drv *drv, const struct tcs_request *msg) +{ + struct tcs_group *tcs; + int tcs_id = 0, cmd_id = 0; + unsigned long flags; + int ret; + + tcs = get_tcs_for_msg(drv, msg); + if (IS_ERR(tcs)) + return PTR_ERR(tcs); + + spin_lock_irqsave(&tcs->lock, flags); + /* find the m-th TCS and the n-th position in the TCS to write to */ + ret = find_slots(tcs, msg, &tcs_id, &cmd_id); + if (!ret) + __tcs_buffer_write(drv, tcs_id, cmd_id, msg); + spin_unlock_irqrestore(&tcs->lock, flags); + + return ret; +} + +/** + * rpmh_rsc_write_ctrl_data: Write request to the controller + * + * @drv: the controller + * @msg: the data to be written to the controller + * + * There is no response returned for writing the request to the controller. + */ +int rpmh_rsc_write_ctrl_data(struct rsc_drv *drv, const struct tcs_request *msg) +{ + if (!msg || !msg->cmds || !msg->num_cmds || + msg->num_cmds > MAX_RPMH_PAYLOAD) { + pr_err("Payload error\n"); + return -EINVAL; + } + + /* Data sent to this API will not be sent immediately */ + if (msg->state == RPMH_ACTIVE_ONLY_STATE) + return -EINVAL; + + return tcs_ctrl_write(drv, msg); +} +EXPORT_SYMBOL(rpmh_rsc_write_ctrl_data); + static int rpmh_probe_tcs_config(struct platform_device *pdev, struct rsc_drv *drv) { @@ -428,6 +537,19 @@ static int rpmh_probe_tcs_config(struct platform_device *pdev, tcs->mask = ((1 << tcs->num_tcs) - 1) << st; tcs->offset = st; st += tcs->num_tcs; + + /* + * Allocate memory to cache sleep and wake requests to + * avoid reading TCS register memory. + */ + if (tcs->type == ACTIVE_TCS) + continue; + + tcs->cmd_cache = devm_kcalloc(&pdev->dev, + tcs->num_tcs * ncpt, sizeof(u32), + GFP_KERNEL); + if (!tcs->cmd_cache) + return -ENOMEM; } drv->num_tcs = st; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project