From patchwork Fri Aug 6 09:16:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 492821 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp123271jap; Fri, 6 Aug 2021 02:16:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1L3S314ub11jUgzVL+6TP3b0dJe3Zyn5/SOwIPrIe7/MaQpP63AKFaoViiIXl5HoKGvOO X-Received: by 2002:a5d:8e11:: with SMTP id e17mr5263iod.138.1628241417834; Fri, 06 Aug 2021 02:16:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628241417; cv=none; d=google.com; s=arc-20160816; b=NDxxOrm8IYLHeZ+MVLd0JqSdYCOYuEepn9hIl854wHNFv88I9o4JBHyGgU8c0aNlU9 +68iffyeyJnhH1l26vnSPObvUiR+mmqTYpXZIOf2RLSlzGjvgsaLHTgA9DCXuXhnFCWT DunJ1P/nBNSoEY1ek9FDhgaUJvHjriqPpDwfaihVXxjjVIKaoeUHFAx4ORMfzLmFak4d cJwZEQSInO7bZvBcQ4cSl5V6ehlIg20knZcZmBaOpIk5UMAfqPOKk8wGn1kZw1tFI8cO yZNz1Zd1g7aliw/2dTUhtU6JE+u5ucdoeiskfh8flCs52FzY6r3S9Uf7KT3QdXSYxwE8 ovXg== 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=RkDrw62gmktGJ8T0sZH1ZMmzuGwGKSVJK0hF34w/urKU/M3tWU45OR+uYLb3LwSpC2 cuC6eb0n9LNUx9RsPG+BCNIqHdck5L6436pSZXjd3zulBR8dbE1mPcmDh7S+nTUjjy9k FRGEYIF8fo2qZDfLBGWJ9RTHpCVBmepuCZNIjcxu/OdSk805r8cqcQyToREEfnCGgsk0 of0khWQZ7HpI8fpCPiYy2jCGMnn+GPnIsBh31a+O816BGnidbe+/0lKXUEwDGGwgHgPS KtalG58gZKyTA0v0L+6j5Z6sebHDAUkxAZHZFMqXvLfv3cS92RmJ+Y8tGL7BHAeFQuxF dgug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hwATRVzG; 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 h17si8426949jav.110.2021.08.06.02.16.57; Fri, 06 Aug 2021 02:16:57 -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=hwATRVzG; 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 S244411AbhHFJRK (ORCPT + 12 others); Fri, 6 Aug 2021 05:17:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244432AbhHFJRG (ORCPT ); Fri, 6 Aug 2021 05:17:06 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6101FC061799 for ; Fri, 6 Aug 2021 02:16:50 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id d8so10188275wrm.4 for ; Fri, 06 Aug 2021 02:16:50 -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=hwATRVzGY1MjEK9PKMjeKcQc8kTgnMbjTwOt54o80ZKcWiuvv7ji8lT4fr1+5FCbLB LALOGZyytElaOH589hrZKAf3ty5yd4TzFn+FiMrtk81opkB1GU5Z4YqHOZmMcMOsMRqL 2O0B7sq6Wc+bLmhtBExf/XhSdwd4xEZvSMEriiiXTheeomulez9olz/O8F6pjR3JxnuB W2LsyDk2rPIm57peb9aELWMawJCKxQbLcRXmpCw11SAddMmgP13mKv/5O6b7o81elxRa j8TmEAyOoNIPnVnDSnQbSCHaYrVgtX7MDpwMn01ifOaG7tpJAsO+HYqH+G4fV6my987Z uG6A== 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=kDWOrCZhY5zx2wWvwisC0IyGEL4BpIF7NXNO4Y2OyliPT1++vatMnpaxwkMF3u3DfX fbsi3+f9QpWtwCdoZVM+quISpgMHvioljPYhZfMQGhQ6Gzq8Jy908sBERdMY8fhBlWoI NpX79aCseHCt3an4McqUNdyJwgzqcC0zA7ZwFwKnJFEKQlWTwuj5kXSSMPmpw2zZuNBk uu1QV3gJr/xNivwhtjT4kY9nI23AiirahMbTz5KwRovruXc8m68Pm8PL1Qosk6k6Vqo/ oY7UfMNvrDiLjxXzMrXCsceLhRNTX0EvpT5+ymntl+soq6qkXVLXrrViswtauHYLz0ZO soqg== X-Gm-Message-State: AOAM532RAihXcAajJOFo0ntVB4iYlg87ngpbwevHUKynrFauaKJtmQVW gZD1kvEYvzJ5mr5VoE3B1w4Mrd0H93+Ssg== X-Received: by 2002:a5d:6891:: with SMTP id h17mr9284173wru.324.1628241409049; Fri, 06 Aug 2021 02:16:49 -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 w3sm7811760wmi.44.2021.08.06.02.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 02:16:48 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Srinivas Kandagatla , stable@vger.kernel.org Subject: [PATCH 4/4] slimbus: ngd: reset dma setup during runtime pm Date: Fri, 6 Aug 2021 10:16:39 +0100 Message-Id: <20210806091639.532-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210806091639.532-1-srinivas.kandagatla@linaro.org> References: <20210806091639.532-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;