From patchwork Thu Jan 24 06:27:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 2029231 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by patchwork1.kernel.org (Postfix) with ESMTP id 847CE3FDC3 for ; Thu, 24 Jan 2013 06:32:16 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0O6S7cJ012064; Thu, 24 Jan 2013 00:28:07 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O6S72K021268; Thu, 24 Jan 2013 00:28:07 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Thu, 24 Jan 2013 00:28:06 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O6S61m012413; Thu, 24 Jan 2013 00:28:06 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id D158880627; Thu, 24 Jan 2013 00:28:06 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dbdp20.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by linux.omap.com (Postfix) with ESMTP id EC64880626 for ; Thu, 24 Jan 2013 00:28:04 -0600 (CST) Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O6S1Tr025481; Thu, 24 Jan 2013 11:58:01 +0530 (IST) Received: from dbdp33.itg.ti.com (172.24.170.252) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Thu, 24 Jan 2013 11:58:00 +0530 Received: from [172.24.133.14] (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp33.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O6Rvoo024811; Thu, 24 Jan 2013 11:57:58 +0530 Message-ID: <5100D46D.9030408@ti.com> Date: Thu, 24 Jan 2013 11:57:57 +0530 From: Sekhar Nori User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: "Tivy, Robert" Subject: Re: [PATCH v5 9/9] ARM: davinci: da850: Added dsp clock definition References: <1357863807-380-1-git-send-email-rtivy@ti.com> <1357863807-380-10-git-send-email-rtivy@ti.com> <50FE802E.2020306@ti.com> <13514BD7FAEBA745BBD7D8A672905C1431206095@DFLE08.ent.ti.com> In-Reply-To: <13514BD7FAEBA745BBD7D8A672905C1431206095@DFLE08.ent.ti.com> CC: "ohad@wizery.com" , "davinci-linux-open-source@linux.davincidsp.com" , "linux-doc@vger.kernel.org" , "rob@landley.net" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com On 1/23/2013 7:07 AM, Tivy, Robert wrote: >> -----Original Message----- >> From: Nori, Sekhar >> Sent: Tuesday, January 22, 2013 4:04 AM >> >> Rob, >> >> On 1/11/2013 5:53 AM, Robert Tivy wrote: >>> Added dsp clock definition, keyed to "davinci-rproc.0". >>> >>> Signed-off-by: Robert Tivy >>> --- >>> arch/arm/mach-davinci/da850.c | 9 +++++++++ >>> 1 file changed, 9 insertions(+) >>> >>> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach- >> davinci/da850.c >>> index 097fcb2..50107c5 100644 >>> --- a/arch/arm/mach-davinci/da850.c >>> +++ b/arch/arm/mach-davinci/da850.c >>> @@ -375,6 +375,14 @@ static struct clk sata_clk = { >>> .flags = PSC_FORCE, >>> }; >>> >>> +static struct clk dsp_clk = { >>> + .name = "dsp", >>> + .parent = &pll0_sysclk1, >>> + .domain = DAVINCI_GPSC_DSPDOMAIN, >>> + .lpsc = DA8XX_LPSC0_GEM, >>> + .flags = PSC_LRST, >>> +}; >>> + >>> static struct clk_lookup da850_clks[] = { >>> CLK(NULL, "ref", &ref_clk), >>> CLK(NULL, "pll0", &pll0_clk), >>> @@ -421,6 +429,7 @@ static struct clk_lookup da850_clks[] = { >>> CLK("spi_davinci.1", NULL, &spi1_clk), >>> CLK("vpif", NULL, &vpif_clk), >>> CLK("ahci", NULL, &sata_clk), >>> + CLK("davinci-rproc.0", NULL, &dsp_clk), >> >> Adding this clock node without the having the driver probed leads to >> kernel hang while booting. With CONFIG_DAVINCI_RESET_CLOCKS=n, the >> kernel boot fine. It looks like there is some trouble disabling the >> clock if it is not used. Can you please check this issue? >> >> Thanks, >> Sekhar > > Sekhar, > > Thankyou for trying that out. > > I discovered that the kernel boot hang is caused when trying to disable this clk during init, from within the function davinci_clk_disable_unused(). That function calls davinci_psc_config() which attempts to disable the DSP clock. Since this clk is enabled after reset, disabling it involves a state transition, and therefore the function must wait for GOSTAT[1] to be 0. For most peripherals this happens automatically, but for the DSP (and ARM, too), the DSP must execute the IDLE instruction to allow a clock enable->disable transition. Since this is bootup and there is no real program on the DSP yet, this doesn't happen. > > I was able to overcome this by adding PSC_FORCE to the clk->flags for dsp_clk. In fact, without PSC_FORCE I was not able to "rmmod davinci_remoteproc" since the firmware file that I'm loading did not execute IDLE. It feels like for davinci we should have a way to control the clk->flags' PSC_FORCE setting at run-time. The PSC_FORCE would be set initially (during boot) and the user (or system integrator) would have a way to unset it dynamically. That way, when the DSP firmware does actually have a structured way to enter IDLE, the user can say "I'd like a structured shutdown" and unset PSC_FORCE (via a clean API). But for now I'm just going to turn on PSC_FORCE: > .flags = PSC_LRST | PSC_FORCE, Thanks for the debug. It works for me after I added PSC_FORCE. Here is the patch I am finally committing. Thanks, Sekhar commit 09810a853b9a7920ba8c250d18815ef236effc47 Author: Robert Tivy AuthorDate: Thu Jan 10 16:23:22 2013 -0800 Commit: Sekhar Nori CommitDate: Thu Jan 24 10:54:08 2013 +0530 ARM: davinci: da850: add dsp clock definition Added dsp clock definition, keyed to "davinci-rproc.0". DSP clocks is derived from pll0 sysclk1. Add a clock tree node for that too. Signed-off-by: Robert Tivy [nsekhar@ti.com: merge addition of pll0 sysclk1 and dsp clock into one commit. Add PSC_FORCE to dsp clock node to handle the case where DSP does not go into IDLE and its clock needs to be disabled.] Signed-off-by: Sekhar Nori diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 6b9154e..0c4a26d 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -76,6 +76,13 @@ static struct clk pll0_aux_clk = { .flags = CLK_PLL | PRE_PLL, }; +static struct clk pll0_sysclk1 = { + .name = "pll0_sysclk1", + .parent = &pll0_clk, + .flags = CLK_PLL, + .div_reg = PLLDIV1, +}; + static struct clk pll0_sysclk2 = { .name = "pll0_sysclk2", .parent = &pll0_clk, @@ -368,10 +375,19 @@ static struct clk sata_clk = { .flags = PSC_FORCE, }; +static struct clk dsp_clk = { + .name = "dsp", + .parent = &pll0_sysclk1, + .domain = DAVINCI_GPSC_DSPDOMAIN, + .lpsc = DA8XX_LPSC0_GEM, + .flags = PSC_LRST | PSC_FORCE, +}; + static struct clk_lookup da850_clks[] = { CLK(NULL, "ref", &ref_clk), CLK(NULL, "pll0", &pll0_clk), CLK(NULL, "pll0_aux", &pll0_aux_clk), + CLK(NULL, "pll0_sysclk1", &pll0_sysclk1), CLK(NULL, "pll0_sysclk2", &pll0_sysclk2), CLK(NULL, "pll0_sysclk3", &pll0_sysclk3), CLK(NULL, "pll0_sysclk4", &pll0_sysclk4), @@ -413,6 +429,7 @@ static struct clk_lookup da850_clks[] = { CLK("spi_davinci.1", NULL, &spi1_clk), CLK("vpif", NULL, &vpif_clk), CLK("ahci", NULL, &sata_clk), + CLK("davinci-rproc.0", NULL, &dsp_clk), CLK(NULL, NULL, NULL), };