From patchwork Tue May 10 10:32:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sperl X-Patchwork-Id: 9056861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 792B79F1D3 for ; Tue, 10 May 2016 10:34:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DFF020123 for ; Tue, 10 May 2016 10:34:16 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 674A4200DF for ; Tue, 10 May 2016 10:34:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b04yE-00046Y-RB; Tue, 10 May 2016 10:32:54 +0000 Received: from 212-186-180-163.dynamic.surfer.at ([212.186.180.163] helo=cgate.sperl.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b04y9-0003px-Uy; Tue, 10 May 2016 10:32:52 +0000 Received: from [213.185.161.134] (account martin@sperl.org HELO [212.186.180.163]) by sperl.org (CommuniGate Pro SMTP 6.1.2) with ESMTPSA id 6451520; Tue, 10 May 2016 10:32:27 +0000 Subject: Re: [PATCH 0/3] clk: bcm2835: critical clocks and parent selection To: Eric Anholt , Michael Turquette , Stephen Boyd References: <1462842090-2017-1-git-send-email-eric@anholt.net> From: Martin Sperl Message-ID: <5731B8BA.30402@martin.sperl.org> Date: Tue, 10 May 2016 12:32:26 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <1462842090-2017-1-git-send-email-eric@anholt.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160510_033250_380033_CF0B156C X-CRM114-Status: GOOD ( 17.75 ) X-Spam-Score: -0.9 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 10.05.2016 03:01, Eric Anholt wrote: > With the new patch 2 inserted between my previous pair, I think this > should cover Martin's bugs with clock disabling. > > I tested patch 2 to be important on the downstream kernel: with the > DPI panel support added there, I was losing ethernet (my only I/O) > when the HDMI HSM hanging off of PLLD_PER got disabled due to > EPROBE_DEFER. > > Eric Anholt (3): > clk: bcm2835: Mark the VPU clock as critical > clk: bcm2835: Mark GPIO clocks enabled at boot as critical. > clk: bcm2835: Skip PLLC clocks when deciding on a new clock parent > > drivers/clk/bcm/clk-bcm2835.c | 32 ++++++++++++++++++++++++++++++-- > 1 file changed, 30 insertions(+), 2 deletions(-) > I gave it a try - with all 3 patches applied I get the following enabled clocks: root@raspcm:~# grep -vE ^0 /sys/kernel/debug/clk/*/clk_enable_count /sys/kernel/debug/clk/aux_uart/clk_enable_count:1 /sys/kernel/debug/clk/emmc/clk_enable_count:1 /sys/kernel/debug/clk/gp1/clk_enable_count:1 /sys/kernel/debug/clk/gp2/clk_enable_count:1 /sys/kernel/debug/clk/osc/clk_enable_count:1 /sys/kernel/debug/clk/pllc/clk_enable_count:2 /sys/kernel/debug/clk/pllc_core0/clk_enable_count:1 /sys/kernel/debug/clk/pllc_per/clk_enable_count:1 /sys/kernel/debug/clk/vpu/clk_enable_count:2 At least on my compute module gp1/gp2 is enabled, but there is no rate set - so why is it marked as critical for all devices? So why apply patch2 for all possible devices? Loading/unloading the amba_pl011 module does not crash the system, but a simple stty -F /dev/ttyAMA0 does crash the system! Here the sequence: root@raspcm:~# dmesg -C root@raspcm:~# modprobe amba_pl011 root@raspcm:~# dmesg -c [ 141.708453] Serial: AMBA PL011 UART driver [ 141.709158] 20201000.uart: ttyAMA0 at MMIO 0x20201000 (irq = 81, base_baud = 0) is a PL011 rev2 root@raspcm:~# rmmod amba_pl011 root@raspcm:~# dmesg -c [ 150.511248] Trying to free nonexistent resource <0000000020201000-0000000020201fff> root@raspcm:~# modprobe amba_pl011 root@raspcm:~# dmesg -c [ 159.385002] Serial: AMBA PL011 UART driver [ 159.385714] 20201000.uart: ttyAMA0 at MMIO 0x20201000 (irq = 81, base_baud = 0) is a PL011 rev2 root@raspcm:~# stty -F /dev/ttyAMA0 speed 9600 baud; line = 0; -brkint -imaxbel root@raspcm:~# Timeout, server raspcm not responding. The reason behind this is that the firmware pre-configured uart clock looks like this: root@raspcm:~# cat /sys/kernel/debug/clk/uart/regdump ctl = 0x00000296 div = 0x000a6aab so it is configured to use plld_per (which itself is running, even if not enabled in the kernel) But as plld_per is not among the enabled clocks then plld_per gets disabled as soon as the tty device is closed (by stty) and this also disables plld... Similar effect when using PCM/i2s and use speaker-test: root@raspcm:~# dmesg -C root@raspcm:~# modprobe snd-soc-bcm2835-i2s; modprobe snd-soc-pcm5102a; modprobe snd-soc-hifiberry-dac root@raspcm:~# dmesg [ 81.968591] snd-hifiberry-dac sound: pcm5102a-hifi <-> 20203000.i2s mapping ok root@raspcm:~# speaker-test -c 2 -r 44100 -F S16_LE -f 440 -t sine& [1] 579 root@raspcm:~# speaker-test 1.0.28 Playback device is default Stream parameters are 44100Hz, S16_LE, 2 channels Sine wave rate is 440.0000Hz Rate set to 44100Hz (requested 44100Hz) Buffer size range from 128 to 131072 Period size range from 64 to 65536 Using max buffer size 131072 Periods = 4 was set period_size = 32768 was set buffer_size = 131072 0 - Front Left 1 - Front Right root@raspcm:~# root@raspcm:~# grep -vE ^0 /sys/kernel/debug/clk/*/clk_enable_count /sys/kernel/debug/clk/aux_uart/clk_enable_count:1 /sys/kernel/debug/clk/emmc/clk_enable_count:1 /sys/kernel/debug/clk/gp1/clk_enable_count:1 /sys/kernel/debug/clk/gp2/clk_enable_count:1 /sys/kernel/debug/clk/osc/clk_enable_count:2 /sys/kernel/debug/clk/pcm/clk_enable_count:1 /sys/kernel/debug/clk/pllc/clk_enable_count:2 /sys/kernel/debug/clk/pllc_core0/clk_enable_count:1 /sys/kernel/debug/clk/pllc_per/clk_enable_count:1 /sys/kernel/debug/clk/plld/clk_enable_count:1 /sys/kernel/debug/clk/plld_per/clk_enable_count:1 /sys/kernel/debug/clk/vpu/clk_enable_count:2 root@raspcm:~# kill %1 root@raspcm:~# Time per period = 106.889502 Timeout, server raspcm not responding. You see that plld gets now used and when I kill speaker-test the machine crashes again. So this patchset does not really solve any of the problems that I have reported either. That is why my patchset has taken the "HAND_OFF" approach instead (which still just hides some of the issues), but at least it does not crash the system on the use of plld and it allows for custom parent and mash selection. In reality it would require consumers of the corresponding parent clocks in the kernel (arm, ...) and the knowledge which clocks are really needed by the firmware - i.e plld. Note that the sdram clock is using plld_core parent! root@raspcm:~# cat /sys/kernel/debug/clk/sdram/regdump ctl = 0x00004006 div = 0x00003000 root@raspcm:~# cat /sys/kernel/debug/clk/sdram/clk_rate 166533331 and also hsm (probably hardware security module): root@raspcm:~# cat /sys/kernel/debug/clk/hsm/regdump ctl = 0x000002d6 div = 0x000030e0 root@raspcm:~# cat /sys/kernel/debug/clk/hsm/clk_rate 163551916 So turning plld off stops sdram and hsm - at least that is my interpretation. This means we need to define a clock property in firmware or we need a ram node making use of "mmio-sram" maybe? Marking sdram as "critical" or "hand_off" could also solve that for the moment (but it does not solve all the other hidden clock dependencies of the firmware) .ctl_reg = CM_V3DCTL, with this patch the system does no longer crash for the above cases! Still I would say that this should actually move to the dt to correctly describe the HW. Martin --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1655,7 +1655,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .ctl_reg = CM_SDCCTL, .div_reg = CM_SDCDIV, .int_bits = 6, - .frac_bits = 0), + .frac_bits = 0, + .flags = CLK_IS_CRITICAL), [BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK( .name = "v3d",