From patchwork Wed Aug 7 12:46:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 170748 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp7098064ile; Wed, 7 Aug 2019 05:46:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtP6af9AF0qFdgE9co9MKTWOU4eVQi6uCgUWwOXOF6yjPCu7SW8zr8ExGPU6dr9eB3e6AI X-Received: by 2002:a17:902:8a8a:: with SMTP id p10mr8232002plo.88.1565182000576; Wed, 07 Aug 2019 05:46:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565182000; cv=none; d=google.com; s=arc-20160816; b=ShVWr0Y+hbjVs5lSsBDlwtyLOQP/zD1Pmlnum/sQF8PqosinTkRMqydAaEsgDVYwKT 7lWVpMi0k/idMF2jTRJ8phd5JsUNXp16pl+cDO82q8i3rtDX7IzK97PDqqHXD4maDAVT cgP0BGXM1e7nitabHJTWroho9qYT9ienL4/agC/S00OIREKmcVSxC1oFnRwzka0MluS2 3DAfM/Uqn/LLUYawKFoia1IQeejGGXBBL6CNr3WP5CbYwaY0C6IZ6zdZQWkJYiL6arpb AIVapUcboUNNqnC5I30GT0N3vdYBDvW8O0yTN6H2kvY6bn9RzFbskUkQ8gExQ7cifIQM PAHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=go1rEFtGevssljUuoQMcTiduz8S4vZ6Y+2SOQxAcj8k=; b=NMPg2x7mgXEXXq0FiSByPHXqEVaZqmi+f8++CQaL7Gl+COBMsQuzDsUa5B2sp/jd7U fDk2wtmgx8DGnOo2BcpHZDJcTxNevGcBFnhJB1NO18fO+OQpusVrpxdMOTkl/o90yuxW o2qehutuen/qfmh0nl2RgAngPUHQsnW4k/H59bGHAj8wI3HiqAOibKLfDtkv52K/epAY WP5Gp45se0PsNpMgbO1p+nFlzLs0c4GrUzrRkpAHjlCEZ+49BSdDBvfZmUdzVmOr8fNJ qfFNRBk8zMGS4ycKeO1h61QI+8kOkET2rnyAWHFXvau8SlRb2RuKSLFtjH/9Y7yEoJDi VAkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=km6RONXq; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c11si18168285pjq.0.2019.08.07.05.46.40; Wed, 07 Aug 2019 05:46:40 -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=@ti.com header.s=ti-com-17Q1 header.b=km6RONXq; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387911AbfHGMqj (ORCPT + 28 others); Wed, 7 Aug 2019 08:46:39 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:42622 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387777AbfHGMqi (ORCPT ); Wed, 7 Aug 2019 08:46:38 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x77Cka81067113; Wed, 7 Aug 2019 07:46:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1565181996; bh=go1rEFtGevssljUuoQMcTiduz8S4vZ6Y+2SOQxAcj8k=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=km6RONXqRJ+XTbEbIiI0tfyl4ZxMxu4u+d4NbdUepxxw/t33a5Cqb4cqk2JpX4eC/ tP/OZWxpOxcsLo/Qms4b6umkMDIPo5SvDwFggSfKTMk84sEFAq1cLjaHLDum3LX3xh LRtFrub/2z8DKny+cHxbuTGc5u7paLX/KaMHFKsk= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x77CkaaS018291 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 7 Aug 2019 07:46:36 -0500 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Wed, 7 Aug 2019 07:46:35 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Wed, 7 Aug 2019 07:46:35 -0500 Received: from gomoku.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x77CkVoI016945; Wed, 7 Aug 2019 07:46:33 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 1/3] bus: ti-sysc: re-order the clkdm control around reset handling Date: Wed, 7 Aug 2019 15:46:03 +0300 Message-ID: <1565181965-21039-2-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1565181965-21039-1-git-send-email-t-kristo@ti.com> References: <1565181965-21039-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Parenting clockdomain for the IP should be enabled during the reset handling logic, otherwise the reset may not finish properly. Re-order the clockdomain control logic to avoid this. Signed-off-by: Tero Kristo --- drivers/bus/ti-sysc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index e6deabd..ad9c6d3 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1091,11 +1091,11 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev) ddata->enabled = false; err_allow_idle: - sysc_clkdm_allow_idle(ddata); - if (ddata->disable_on_idle) reset_control_assert(ddata->rsts); + sysc_clkdm_allow_idle(ddata); + return error; } @@ -1109,11 +1109,12 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) if (ddata->enabled) return 0; - if (ddata->disable_on_idle) - reset_control_deassert(ddata->rsts); sysc_clkdm_deny_idle(ddata); + if (ddata->disable_on_idle) + reset_control_deassert(ddata->rsts); + if (sysc_opt_clks_needed(ddata)) { error = sysc_enable_opt_clocks(ddata); if (error)