From patchwork Tue Nov 19 05:19:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179677 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp161052ilf; Mon, 18 Nov 2019 21:40:34 -0800 (PST) X-Google-Smtp-Source: APXvYqyXNK4F9A/DnD6VP/aDf3+WsHsCMVK1KOcnf1m904waJ0raPzf6KsxjkO3yXYWYiUpo65An X-Received: by 2002:a17:906:90b:: with SMTP id i11mr18392450ejd.109.1574142029250; Mon, 18 Nov 2019 21:40:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142029; cv=none; d=google.com; s=arc-20160816; b=PPB19AOJ0ZjnHDgzxlUKtZbjXq9c9rE9j7eiXoxA2Q0aNLECwIJSDs+A9UlgBof3pc Sc+m51oBQSMa/f6PktA41QTTItWcbAZpBd6m1GA6azifw9bD9RqHHdGyM58cp1KHwLSJ SFjm/N1HGlDeT0QDiG8/U/4+/7HmixksL5Cy1AGA+vuo09dUyHqd7PmU8T+FhVon1c0/ SCPKt3pcPI056j62UrfoOfPB55xnQ3vFCi1suTZCrp8qRXubB8fxh019YiYHz1HdvoxK XerxROMxGU4d1xesfIgOBI6Pc7fcJ09Fe9frfk/0ZKJcDepLFHD5oZ4tDXcZGkf1jlbx MXmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O28kOt5fEkxaqVnD5AqAXZhw21kB5vR1b/c4w2qqKWY=; b=Gdn3pHR4hY8Uzd4BMHbv6QcoCnZX4xX3VXXfJvLLDH9k8yPfD3b8W5myganADwIi7M 2mrZuQjRMq71fxQOlakKM6idUs7MRh2yWK/duGoDlqPrWUWXUcDkkntArMCnviuglDrQ QLNj0K4om9haxNomQc1w72zLdCqOa9WcLqK6Z0Id0yCdaKt412S4W7h+z0VWi0yRVBss 3taykbL54QhNBl2/asIUY57bobN+20R8HAa2zIt6j1ZZ2HKZEgwZ0v0Ds45nny5LJbyk 0qwiMbNsTFI2z9uXvgR3U4IjdCCtcEJFcPNiiHRyFhCv4ncv5k8Qf5mZk6xRX88+eDp8 a8ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bGjgvlP0; 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 f6si15397733edl.442.2019.11.18.21.40.28; Mon, 18 Nov 2019 21:40:29 -0800 (PST) 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=@kernel.org header.s=default header.b=bGjgvlP0; 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 S1730401AbfKSFk0 (ORCPT + 26 others); Tue, 19 Nov 2019 00:40:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:34562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730393AbfKSFkX (ORCPT ); Tue, 19 Nov 2019 00:40:23 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 815ED21783; Tue, 19 Nov 2019 05:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142022; bh=oNMpK4uCT6FqDAbQaOrbyYV5qSgpW9C8QAqC4iyX9LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bGjgvlP0caNDgRTbOwhp6a6Ejz0BDtwAslkdAAzFd7AR3Kq2czry2CVk8EiNkUSB9 /9M/f5FbvXv57jsMzNy6t3cO++BjB9hPhWFsECXPWssU/xDiKJo3nYCPbXDux2k4ZO IJ+Tk9ttcc4A6ebVznivXhepU6tri2snFh+SyfVs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.19 354/422] silmbus: ngd: register controller after power up. Date: Tue, 19 Nov 2019 06:19:11 +0100 Message-Id: <20191119051421.958702318@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 94fe5f2b45c4108885e4b71f6b181068632ec904 ] Register slimbus controller only after finishing powerup sequnce so that we do not endup in situation where core starts sending transactions before the controller is ready. Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index e587be9064e74..d72f8eed2e8b7 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1234,8 +1234,17 @@ static int qcom_slim_ngd_enable(struct qcom_slim_ngd_ctrl *ctrl, bool enable) pm_runtime_resume(ctrl->dev); pm_runtime_mark_last_busy(ctrl->dev); pm_runtime_put(ctrl->dev); + + ret = slim_register_controller(&ctrl->ctrl); + if (ret) { + dev_err(ctrl->dev, "error adding slim controller\n"); + return ret; + } + + dev_info(ctrl->dev, "SLIM controller Registered\n"); } else { qcom_slim_qmi_exit(ctrl); + slim_unregister_controller(&ctrl->ctrl); } return 0; @@ -1360,11 +1369,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) int ret; ctrl->ctrl.dev = dev; - ret = slim_register_controller(&ctrl->ctrl); - if (ret) { - dev_err(dev, "error adding slim controller\n"); - return ret; - } pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND); @@ -1374,7 +1378,7 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) ret = qcom_slim_ngd_qmi_svc_event_init(ctrl); if (ret) { dev_err(&pdev->dev, "QMI service registration failed:%d", ret); - goto err; + return ret; } INIT_WORK(&ctrl->m_work, qcom_slim_ngd_master_worker); @@ -1386,8 +1390,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) } return 0; -err: - slim_unregister_controller(&ctrl->ctrl); wq_err: qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); if (ctrl->mwq) @@ -1460,7 +1462,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev) struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); pm_runtime_disable(&pdev->dev); - slim_unregister_controller(&ctrl->ctrl); + qcom_slim_ngd_enable(ctrl, false); qcom_slim_ngd_exit_dma(ctrl); qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); if (ctrl->mwq)