From patchwork Mon Aug 9 08:24:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 493839 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp2688721jap; Mon, 9 Aug 2021 01:24:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyb9vKKvGWuZhALnM/JfdTbq3fIpkEoLgzZuf3XPlvC0WiYtMYMCE9P/ripEe/DMduvt+An X-Received: by 2002:a05:6638:1004:: with SMTP id r4mr21701960jab.105.1628497488588; Mon, 09 Aug 2021 01:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628497488; cv=none; d=google.com; s=arc-20160816; b=Dxx2bZCvMt5xAyoh9WD3r9Y+rFgjfcS2UukgLxuADZvgMzdx48PrfcFgAuIX3b59WP /gZaP5IePUJj+jtoIEEGbgMtrqJSmER+PZVunTbHaDZigaOF546faqPAcHtVYlc6oFVT L0/xXkJqPFb5vvk2HHOctf4nT0I+fj2pLUc6tV3yZNyv+rPBWkefdrmzenijfev1riVz ucvwDM8U/H7/IToPnEMrCi4K+MTy2lxueCag5A2A+mDgCH1N68guAxtExHkPoVw7Qiq6 wACq7r7gI8on5NG3COLIsqCdSDiPO5K/9OaCt7EJI+cC0TMWJNE25f7dgRAZ54ooiO/j wjeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=P17OeSiwNU27tPgzIXbVaCeJQjA2Rn8XgRVpE6+nR8Q=; b=ZMxXRJic+ziJOv1DP7fZc2zpG24NNInSQseHOionMR6hI3T00yGXv3U0eUoXTlDXQI 9+mbSe2PdM/TgsGO0Oj3Y/AXhGcFfSVgpc7aYnVM8ki8VxVJUlc+JMh5gPQ4xBmWaxVU BkRD+jPwLwXqDfeZ5moXRcgjUSCw5H+61brjWSm67LIbJzYDB4sVZsQPtL3tYT2YvNxj 48OS7hNeG7iuFklW6oKT3ZMaw8k6anp8ajXrhEGbmXnOV4dzujee3VeNKpI4mkXSVx6W MD57chlrFtkcFkDK6Yl82QUOj8PdffqoZiTGQUYdDgraueiiNWbFIq9MY3J3EpzmocJe Ulew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FfNaBNHt; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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. [23.128.96.18]) by mx.google.com with ESMTP id o12si18238814ilu.155.2021.08.09.01.24.48; Mon, 09 Aug 2021 01:24:48 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FfNaBNHt; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S233959AbhHIIZG (ORCPT + 12 others); Mon, 9 Aug 2021 04:25:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233926AbhHIIZF (ORCPT ); Mon, 9 Aug 2021 04:25:05 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E82FAC06179A for ; Mon, 9 Aug 2021 01:24:44 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id l34-20020a05600c1d22b02902573c214807so13910408wms.2 for ; Mon, 09 Aug 2021 01:24:44 -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 :mime-version:content-transfer-encoding; bh=P17OeSiwNU27tPgzIXbVaCeJQjA2Rn8XgRVpE6+nR8Q=; b=FfNaBNHtenFz64h3TEkWwoH4t4gtVDyUsXq6bYM5JzZsupGRdA4O02JGELm1/pC33f cR6SswkNuCn+rTBtMGi1wH1JWVkA9U8vx8p7lJme69+B3Q5FEs3MAzADYPWDRAeh4J0G xIG+1Lf1m5RxobQ6EIhoqBznLHx0QyQpJIABoxTfJecQ72CFrStJjpwpKf+uX4nNNir9 f/zdA/J7Z0kVMo9eZnEt+CZhazZ+s2HARiGtB5YKDX3zueUf9SNj5seWG281oXr+Tbz+ voxm58rgi2nElKh++Xa3aw3zOCZeheCi1WV+sk61M7JbFc32EFpGDIGDow87LWlBX5Y7 8xYg== 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:mime-version:content-transfer-encoding; bh=P17OeSiwNU27tPgzIXbVaCeJQjA2Rn8XgRVpE6+nR8Q=; b=WkOMWRsJ5BxGjoVfN8FhesvHYS+Cv2fRpYV52VSwAsp/Me6FRnY0AOCxcAQSnVC8lY RH6zwb1oQkbU0x18K2M3keAxbVawGr3dVr8ZE6MoO4pATnJw2v3cIUZBeQW3J77buokN o4gGWPEQXxlVsOaBbHbEfMH/fCoAMFC2EMrbmT0AnoYMBOx3AOMVchFcLLEpc+wxQ5qu CTu/OYdjaserrqDlccyPMuHT9SFc7kq/OivDKCFgkbSyMAACme3XCDMfUGDQoWKPOVfr j6jmd8x2tEQbG0R6imhqs8OyFSw50jTypMq3Q2YC6JtQ6bmdNYdqSQLMxtUomPBPH9cm BN7w== X-Gm-Message-State: AOAM531xFL/M5XBbMN4/pLLGTcjwpbcrISJn5GGltdUWTAfCNk1jWMjM W4m3FHmZdoE93wyS+3lMcIN3MPVKFI5tTA== X-Received: by 2002:a1c:cc05:: with SMTP id h5mr32650946wmb.5.1628497483634; Mon, 09 Aug 2021 01:24:43 -0700 (PDT) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id t15sm18036371wrw.48.2021.08.09.01.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Aug 2021 01:24:43 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Srinivas Kandagatla , stable@vger.kernel.org Subject: [RESEND PATCH 4/4] slimbus: ngd: reset dma setup during runtime pm Date: Mon, 9 Aug 2021 09:24:28 +0100 Message-Id: <20210809082428.11236-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210809082428.11236-1-srinivas.kandagatla@linaro.org> References: <20210809082428.11236-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org During suspend/resume NGD remote instance is power cycled along with remotely controlled bam dma engine. So Reset the dma configuration during this suspend resume path so that we are not dealing with any stale dma setup. Without this transactions timeout after first suspend resume path. Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") Cc: Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.21.0 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index f3ee8e036372..7040293c2ee8 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1080,7 +1080,8 @@ static void qcom_slim_ngd_setup(struct qcom_slim_ngd_ctrl *ctrl) { u32 cfg = readl_relaxed(ctrl->ngd->base); - if (ctrl->state == QCOM_SLIM_NGD_CTRL_DOWN) + if (ctrl->state == QCOM_SLIM_NGD_CTRL_DOWN || + ctrl->state == QCOM_SLIM_NGD_CTRL_ASLEEP) qcom_slim_ngd_init_dma(ctrl); /* By default enable message queues */ @@ -1131,6 +1132,7 @@ static int qcom_slim_ngd_power_up(struct qcom_slim_ngd_ctrl *ctrl) dev_info(ctrl->dev, "Subsys restart: ADSP active framer\n"); return 0; } + qcom_slim_ngd_setup(ctrl); return 0; } @@ -1618,6 +1620,7 @@ static int __maybe_unused qcom_slim_ngd_runtime_suspend(struct device *dev) struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev); int ret = 0; + qcom_slim_ngd_exit_dma(ctrl); if (!ctrl->qmi.handle) return 0;