Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp8620130imu; Thu, 15 Nov 2018 14:43:39 -0800 (PST) X-Google-Smtp-Source: AJdET5eke3A4nzRWeqvhWkfNyRTqFsIQexv/iCyBbCiD7IndauFQdAtFiY8itkWheHxmB8qyF3Nm X-Received: by 2002:a63:de04:: with SMTP id f4mr7502253pgg.292.1542321819031; Thu, 15 Nov 2018 14:43:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542321819; cv=none; d=google.com; s=arc-20160816; b=k8DRp5SEbCfvK3AXH5VxZQ1UXUXICzGxlK3vCVnfGb0Yiz+JgWE7KrfUwJoMJ+sPCs lgf6EbXd4sr1B3iQRvgOt1g034THseuh4fKyn7HmTldGEpgUK+R3QjohQjv7KELZdBn3 SKWuxvt76C6PTsFmZIZ2LDmh43/bmpwPScvWp7NcO9FQHUy3dhoUzw47XE6nMrowMS77 2WfE1h+11qif7mZOOOYTXebhWxq17IFETu2bi9Noy1uYCE57B8j07h/U9a4ZV0xS0nr0 aVKxg+Oq3AcHlHnIIkh+yNcKt00Kp85CkbweYOmVWdd8c+a6HT5sFQYAiVk9D6n/8QD7 9S1w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=NLD4R/YTd5NWWNTehYtqzH5Sq5bxq2erjxwvS1xEomw=; b=IGGUjDX+uwSnQTJiyZOWQQXfU0DGWjOB4aygThtVE4lW/+eNEwhi9V2ojs+kZMKBob MZeXt9qOb8kGAbcno/eVfZPCqg3+oEK47JI1jXvM4zq5i+mQJAhP3z2JJ/l+KzExZKaj +pf1CeQ+JNnO2jgvp+JQ1F+OJHxUA4qELnJwNstDlgar1HwX7ehNTHghsw5cO6vHV9Mh hkFEyErOUcbwbyOoX/oyzhWD2iXz/VFtVWtmsud01e8RXqEDQBTeP1fp6/lgZcDvqiQC GQCCy0nsvBz87X+f+N/mpj7UvvzLcHRqDTzdK6In3mhPSMMw9LAmHu4pPTjIRwjEpmKz hhLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=U22yi4f2; 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=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32-v6si31121959plc.370.2018.11.15.14.43.24; Thu, 15 Nov 2018 14:43:38 -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=@googlemail.com header.s=20161025 header.b=U22yi4f2; 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=QUARANTINE dis=NONE) header.from=googlemail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727272AbeKPIvC (ORCPT + 99 others); Fri, 16 Nov 2018 03:51:02 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:33697 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725860AbeKPIvC (ORCPT ); Fri, 16 Nov 2018 03:51:02 -0500 Received: by mail-wr1-f66.google.com with SMTP id u9-v6so22903859wrr.0; Thu, 15 Nov 2018 14:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NLD4R/YTd5NWWNTehYtqzH5Sq5bxq2erjxwvS1xEomw=; b=U22yi4f2wIug/BioQ6kbNV9DzJTtnymid7OR/PdGJeYZfbnPtDcAjK2QhYPPzOPlNs 1hEignwcLuvg2kPY50/MSq3yowoL3vGCIGXy69/9XRnYRUcBI67IXoyQLbhwwOc7lwNT 6t+SjizLIrbwlcN8ResSrZ4nqzWCRdkShHDC+iuJOzRBnP70qC3I8hgNs5Uf+uxnCF1N 1MxdaAtOjJ0ymy5Nrc+BODHttmrKZRE1V6lGULAmwC8LIn0ZfLweOkwDszkXyVY9ruLv 1RtlPCD0ebJ57CiM0FJqNJAzqFPwaVUXx9s92DO4iObRf3XWNTvEVW6lYZKdKnKbRvNP ypGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NLD4R/YTd5NWWNTehYtqzH5Sq5bxq2erjxwvS1xEomw=; b=M9dzBJq+pFtyb5ZWMhIa+cuHAicFN8oW9a7QTIWb1RWXFkSyvjNS+vSPqx/9N439bO s9gtFEg3bbUYR3+OKHIJSejMi4WQxDZwRh/XWtKnsUGBNpPbPeeoaKJRXl/Xm2jE5GTW DDw9DLeLVUuaC8RvGevgRgaNsGTCzROXTExvXAQ6e6XC8Z8GlFJlGi/f7zobIHfDLfCu YY/aTkc04/h6FtL9k2qu5ZCgXdo9bgxRya1bHdLiBk7bIZ82SQP5z0gPceuHpyMjQaK2 saWwjiUzpbHoQ/v2BFXzfG41GNM79gJpXTvo6qghqlR3JGfeYsYIjyO/gL2WNRQAPQZR CQ1w== X-Gm-Message-State: AGRZ1gLlOCYQsXjIiuxi6B9g1+Rxt9JWWHiUsPFGhO59vSxkOa+kGdNw h8YPekM68FBDaSuKCYJnXOU= X-Received: by 2002:a5d:418b:: with SMTP id m11mr7136326wrp.8.1542321675486; Thu, 15 Nov 2018 14:41:15 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD717A100B85ACE585A885C51.dip0.t-ipconnect.de. [2003:dc:d717:a100:b85a:ce58:5a88:5c51]) by smtp.googlemail.com with ESMTPSA id x12sm2076388wmc.37.2018.11.15.14.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:41:14 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, jbrunet@baylibre.com, narmstrong@baylibre.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mturquette@baylibre.com, sboyd@kernel.org, Martin Blumenstingl Subject: [PATCH v2 0/6] Meson8b: make the CPU clock mutable Date: Thu, 15 Nov 2018 23:40:42 +0100 Message-Id: <20181115224048.13511-1-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows changing the CPU clock on the 32-bit Amlogic Meson SoCs (Meson8, Meson8b and Meson8m2). CPU frequency scaling will be enabled with a separate series by adding the CPU clock and the OPP tables to meson8.dtsi and meson8b.dtsi. While changing the CPU frequency (sys_pll or any of it's post-dividers) we need to run the CPU clock off the XTAL clock. Otherwise the system will lock up because we need to disable the sys_pll to change it's rate. This also makes the clk-pll's .enable hook a no-op if the clock is already enabled. Otherwise we're getting lockups when calling the first clk_{prepare_}enable on the sys_pll or any of it's children (as the CCF propagates the enable event up to the sys_pll). This is because the .enable hook unconditionally disables and enables the clock. However, we can't disable that clock (not even temporarily) if the CPU is running off sys_pll. Additionally this adds support for more M/N combinations in sys_pll to achieve all of the OPPs on Meson8b and all OPPs <= 1608 MHz on Meson8 and Meson8m2. Compared to Amlogic's 3.10 kernel there's one notable difference: we are actually allowing changes to the sys_pll. Amlogic's kernel sets sys_pll to a fixed rate during boot and then uses a timer generate a "virtual clock rate" by toggling between various dividers (for example: sys_pll is set to 1536MHz. to achieve 1008MHz they are toggling every 2500us between 1536MHZ and 768MHz so the average over is 1008MHz). I could reproduce any situation where changing sys_pll failed (for example due to high temperature). To prove that I ran "stress --cpu 4" for multiple hours and then cycled through all available CPU frequencies (while keeping "stress" running in the background). This worked fine on my Meson8b Odroid-C1 and EC-100 boards as well as my Meson8m2 board. Dependencies: This series is built on top of the latest clk-meson.git tree and the patches from my other series [1] "Meson8b: fixes for the cpu_scale_div clock". Changes since v1 at [0]: - re-ordered patches as suggested by Jerome: keep all fixes first, then the new "features" - squashed patches "clk-pll: check if the clock is already enabled" and "clk-pll: add the is_enabled function in the clk_ops". This also allows calling clk_hw_is_enabled() from meson_clk_pll_enable() instead of calling meson_clk_pll_is_enabled() directly (this matches the implementation of sclk-div.c) - documented the dependencies of this series in the cover-letter - dropped "RFC" prefix - collected Jerome's Acked-/Reviewed-by's (thanks for the quick response!) [0] https://patchwork.kernel.org/cover/10683317/ [1] https://patchwork.kernel.org/cover/10617617/ Martin Blumenstingl (6): clk: meson: clk-pll: check if the clock is already enabled clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel clk: meson: meson8b: mark the CPU clock as CLK_IS_CRITICAL clk: meson: meson8b: add support for more M/N values in sys_pll clk: meson: meson8b: run from the XTAL when changing the CPU frequency clk: meson: meson8b: allow changing the CPU clock tree drivers/clk/meson/clk-pll.c | 19 ++++++++ drivers/clk/meson/meson8b.c | 94 +++++++++++++++++++++++++++++++++---- 2 files changed, 104 insertions(+), 9 deletions(-) -- 2.19.1