From patchwork Thu Oct 4 05:51:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 10625633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2240414BD for ; Thu, 4 Oct 2018 05:52:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13C8328DF9 for ; Thu, 4 Oct 2018 05:52:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 07F7728E03; Thu, 4 Oct 2018 05:52:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0A4C28DF9 for ; Thu, 4 Oct 2018 05:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727375AbeJDMnp (ORCPT ); Thu, 4 Oct 2018 08:43:45 -0400 Received: from mail.andi.de1.cc ([85.214.239.24]:59978 "EHLO h2641619.stratoserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726438AbeJDMno (ORCPT ); Thu, 4 Oct 2018 08:43:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=References:In-Reply-To:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=06LAMQJB8ip9/Ma0/muLzq4j1/rsfXZ5Gl2usBBhVpg=; b=QZ9Ux2Bt6nfVxKWqtwRxHkQoa lDb+NIJuMJ4kmgd+TDXmDHuwNFHxtGPFI0nAWn0N7NWbTCIsza9sgSYgRzX36cDehtZKPuANVPHsF 1Mjpark4yZFwNaHhCp2ECo57zJaaNUIXGf4OsIrsEkftyeOYrTaDskYOF8136/Kf5ysL4=; Received: from p200300ccfbcbd5001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:fbcb:d500:1a3d:a2ff:febf:d33a] helo=aktux) by h2641619.stratoserver.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g7wYM-0003YA-60; Thu, 04 Oct 2018 07:52:02 +0200 Received: from andi by aktux with local (Exim 4.89) (envelope-from ) id 1g7wYM-00060Y-32; Thu, 04 Oct 2018 07:52:02 +0200 From: Andreas Kemnade To: t-kristo@ti.com, mturquette@baylibre.com, sboyd@kernel.org, linux-omap@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, paul@pwsan.com, tony@atomide.com, letux-kernel@openphoenux.org Cc: Andreas Kemnade Subject: [PATCH RFC 1/2] clk: ti: add a usecount for autoidle Date: Thu, 4 Oct 2018 07:51:46 +0200 Message-Id: <20181004055147.23048-2-andreas@kemnade.info> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181004055147.23048-1-andreas@kemnade.info> References: <20181004055147.23048-1-andreas@kemnade.info> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have the scenario that first autoidle is disabled for all clocks, then it is disabled for selected ones and then enabled for all. So we should have some counting here, also according to the comment in _setup_iclk_autoidle() Signed-off-by: Andreas Kemnade --- drivers/clk/ti/autoidle.c | 20 ++++++++++++-------- include/linux/clk/ti.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/clk/ti/autoidle.c b/drivers/clk/ti/autoidle.c index 7bb9afbe4058..be2ce42e4f33 100644 --- a/drivers/clk/ti/autoidle.c +++ b/drivers/clk/ti/autoidle.c @@ -48,8 +48,11 @@ int omap2_clk_deny_idle(struct clk *clk) struct clk_hw_omap *c; c = to_clk_hw_omap(__clk_get_hw(clk)); - if (c->ops && c->ops->deny_idle) - c->ops->deny_idle(c); + if (c->ops && c->ops->deny_idle) { + c->autoidle_count--; + if (c->autoidle_count == -1) + c->ops->deny_idle(c); + } return 0; } @@ -64,8 +67,11 @@ int omap2_clk_allow_idle(struct clk *clk) struct clk_hw_omap *c; c = to_clk_hw_omap(__clk_get_hw(clk)); - if (c->ops && c->ops->allow_idle) - c->ops->allow_idle(c); + if (c->ops && c->ops->allow_idle) { + c->autoidle_count++; + if (c->autoidle_count == 0) + c->ops->allow_idle(c); + } return 0; } @@ -201,8 +207,7 @@ int omap2_clk_enable_autoidle_all(void) struct clk_hw_omap *c; list_for_each_entry(c, &clk_hw_omap_clocks, node) - if (c->ops && c->ops->allow_idle) - c->ops->allow_idle(c); + omap2_clk_allow_idle(c->hw.clk); _clk_generic_allow_autoidle_all(); @@ -223,8 +228,7 @@ int omap2_clk_disable_autoidle_all(void) struct clk_hw_omap *c; list_for_each_entry(c, &clk_hw_omap_clocks, node) - if (c->ops && c->ops->deny_idle) - c->ops->deny_idle(c); + omap2_clk_deny_idle(c->hw.clk); _clk_generic_deny_autoidle_all(); diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index a8faa38b1ed6..c460355419c0 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -159,6 +159,7 @@ struct clk_hw_omap { const char *clkdm_name; struct clockdomain *clkdm; const struct clk_hw_omap_ops *ops; + int autoidle_count; }; /* From patchwork Thu Oct 4 05:51:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 10625631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A0BC1731 for ; Thu, 4 Oct 2018 05:52:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEBF828DF9 for ; Thu, 4 Oct 2018 05:52:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E323628E05; Thu, 4 Oct 2018 05:52:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 934FF28E02 for ; Thu, 4 Oct 2018 05:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727470AbeJDMnu (ORCPT ); Thu, 4 Oct 2018 08:43:50 -0400 Received: from mail.andi.de1.cc ([85.214.239.24]:60024 "EHLO h2641619.stratoserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726438AbeJDMnu (ORCPT ); Thu, 4 Oct 2018 08:43:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=References:In-Reply-To:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=A8OtTmmIqAi34/iweTVhJk0UefWSAt5qAatDD1l4zfM=; b=DDvUfGyp1Umgk+HpkDcRN3V9l dSNmPn8YCxOZsJ0LQkMQriiPc1SvYu78AxEA1wuTHgU6lcdZTlM0hxEaDCKnDlv1CRCNnkHl0BC6x cuhlro14U1xWKVroCu7ic2GYq+x0KmgCnoXmPZ0UbcijC4XvxPZi2miqdjmNFVnthbayY=; Received: from p200300ccfbcbd5001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:fbcb:d500:1a3d:a2ff:febf:d33a] helo=aktux) by h2641619.stratoserver.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g7wYS-0003YY-5q; Thu, 04 Oct 2018 07:52:08 +0200 Received: from andi by aktux with local (Exim 4.89) (envelope-from ) id 1g7wYS-00060b-1G; Thu, 04 Oct 2018 07:52:08 +0200 From: Andreas Kemnade To: t-kristo@ti.com, mturquette@baylibre.com, sboyd@kernel.org, linux-omap@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, paul@pwsan.com, tony@atomide.com, letux-kernel@openphoenux.org Cc: Andreas Kemnade Subject: [PATCH RFC 2/2] arm: mach-omap2: setup iclk autoidle according to flags Date: Thu, 4 Oct 2018 07:51:47 +0200 Message-Id: <20181004055147.23048-3-andreas@kemnade.info> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181004055147.23048-1-andreas@kemnade.info> References: <20181004055147.23048-1-andreas@kemnade.info> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Deny autoidle for hwmods with the OCPIF_SWSUP_IDLE flag, that makes hwmods working properly which cannot handle autoidle properly in lower power states. Affected is e. g. the omap_hdq. It also disables CM_AUTOIDLE_DSS. Need to check if that is wanted or not. Note: Autoidle is not enabled explicitly because there might be clocks which do not support that operation and it is enabled afterwards in arm/mach-omap2/pm.c anyways. Signed-off-by: Andreas Kemnade --- arch/arm/mach-omap2/omap_hwmod.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index bb641e6c93d0..6f9687a4f421 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -131,6 +131,7 @@ #include #include #include +#include #include #include #include @@ -2410,9 +2411,12 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) continue; if (os->flags & OCPIF_SWSUP_IDLE) { - /* XXX omap_iclk_deny_idle(c); */ + omap2_clk_deny_idle(os->_clk); } else { - /* XXX omap_iclk_allow_idle(c); */ + /* + * no allow_idle here since there is + * later an allow idle in pm.c + */ clk_enable(os->_clk); } }