From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20A7D290A for ; Sun, 3 Jul 2022 18:43:52 +0000 (UTC) Received: by mail-ej1-f50.google.com with SMTP id sb34so13066542ejc.11 for ; Sun, 03 Jul 2022 11:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YNiliZWXNoSejurrkg/bZM1+hwajBnqHCSCntKvBUaI=; b=npbI1nD+znAoMU7pXRx5AAX2LM820YJ/YUybd49rlin0LVoZdUNVLe9DSUHETWBfh5 LlBJioKkqM6GkY/WB0BE2keebr0ENUPFlCaQ3FQWJ9+n0kS8Nvu+u/fSUo4Sk59Rr0nG rSs4yJ9A9wIJzkjMqJU0nQ0PWemZJ593KwBvQ5pT5YmIshoS/123yM1iJsw+PvRGxReo lkiUH+q1nltWejKztICUVGfEWbJ72NTWGhuVnzs5LW7KY0e1Tuyf9SYxjN0AntHJRyxe yTzfcQVCLnrWqNtT/3BA7S7Xaz9PPg2stfswbBVVUpi30mxEpPNXFWawNED7W4cVugNr wwzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YNiliZWXNoSejurrkg/bZM1+hwajBnqHCSCntKvBUaI=; b=ytwjuaYSmP6me5QFxWANgKnKIIW6lc4JJsGpgRKbJrWNjkgCUWSwJavX+R4O6gW9Ko d0dB4Qe8g4U1j1E9OML9XZH9vwe/B9LQXIED+TgxnVNoqw1ilvShpJ+QevV1GW2Vh0H+ JTJAH8MUKszu4JpWgCjzpw/UBvdQl2Nq7ITHP1S1JObO1b5e5HKGHrlb69q4M78WHosw icLOXTNzmKZy5lj2iBDd0szXhX4ahpfVM4WAXvimzdnLH+7vgJOWIn2PQh3ruz5oA7od qFJdLW9b+r5rG/Ath+TaSPogMI64Cb1DtiUQsKzc8c+k5agiIiyYjo4PhxMaNSAE69cZ RB6w== X-Gm-Message-State: AJIora/uYMTSyymeSwvOrLn+UeRweTxgl61emrF0mYubwVZnZbm2ZnNe ZZJ+BGiq1lUvXTLUyK0KTCo= X-Google-Smtp-Source: AGRyM1uhjp+RgS2ynpA11LiieVXvsXwvY7y8TuIgmM3sQHxv0yU0hV6peQrIhc6stvF4D+KvPe7s3Q== X-Received: by 2002:a17:907:3e8c:b0:726:41fa:2866 with SMTP id hs12-20020a1709073e8c00b0072641fa2866mr24122132ejc.562.1656873830342; Sun, 03 Jul 2022 11:43:50 -0700 (PDT) Received: from jernej-laptop.localnet (213-161-3-76.dynamic.telemach.net. [213.161.3.76]) by smtp.gmail.com with ESMTPSA id s10-20020a1709060c0a00b0070beb9401d9sm13390726ejf.171.2022.07.03.11.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 11:43:49 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: samuel@sholland.org, Roman Stratiienko Cc: peron.clem@gmail.com, mturquette@baylibre.com, sboyd@kernel.org, mripard@kernel.org, wens@csie.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Roman Stratiienko Subject: Re: [PATCH v2] clk: sunxi-ng: sun50i: h6: Modify GPU clock configuration to support DFS Date: Sun, 03 Jul 2022 20:43:48 +0200 Message-ID: <4748270.31r3eYUQgx@jernej-laptop> In-Reply-To: <20220703164514.308622-1-r.stratiienko@gmail.com> References: <20220703164514.308622-1-r.stratiienko@gmail.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Dne nedelja, 03. julij 2022 ob 18:45:14 CEST je Roman Stratiienko napisal(a): > Using simple bash script it was discovered that not all CCU registers > can be safely used for DFS, e.g.: > > while true > do > devmem 0x3001030 4 0xb0003e02 > devmem 0x3001030 4 0xb0001e02 > done > > Script above changes the GPU_PLL multiplier register value. While the > script is running, the user should interact with the user interface. > > Using this method the following results were obtained: > | Register | Name | Bits | Values | Result | > | -- | -- | -- | -- | -- | > | 0x3001030 | GPU_PLL.MULT | 15..8 | 20-62 | OK | > | 0x3001030 | GPU_PLL.INDIV | 1 | 0-1 | OK | > | 0x3001030 | GPU_PLL.OUTDIV | 0 | 0-1 | FAIL | > | 0x3001670 | GPU_CLK.DIV | 3..0 | ANY | FAIL | > > DVFS started to work seamlessly once dividers which caused the > glitches were set to fixed values. > > Signed-off-by: Roman Stratiienko > > --- > > Changelog: > > V2: > - Drop changes related to mux > - Drop frequency limiting > - Add unused dividers initialization > --- > drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6.c > b/drivers/clk/sunxi-ng/ccu-sun50i-h6.c index 2ddf0a0da526f..1b0205ff24108 > 100644 > --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6.c > +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6.c > @@ -95,13 +95,13 @@ static struct ccu_nkmp pll_periph1_clk = { > }, > }; > > +/* For GPU PLL, using an output divider for DFS causes system to fail */ > #define SUN50I_H6_PLL_GPU_REG 0x030 > static struct ccu_nkmp pll_gpu_clk = { > .enable = BIT(31), > .lock = BIT(28), > .n = _SUNXI_CCU_MULT_MIN(8, 8, 12), > .m = _SUNXI_CCU_DIV(1, 1), /* input divider */ > - .p = _SUNXI_CCU_DIV(0, 1), /* output divider */ Having minimum (288 MHz) as per vendor GPU driver and maximum, either max. opp or max. from datasheet is equally good. I know that both are basically limited with opp table, but people like to play with these, so it's good to have them in. > .common = { > .reg = 0x030, > .hw.init = CLK_HW_INIT("pll-gpu", "osc24M", > @@ -294,9 +294,9 @@ static SUNXI_CCU_M_WITH_MUX_GATE(deinterlace_clk, > "deinterlace", static SUNXI_CCU_GATE(bus_deinterlace_clk, > "bus-deinterlace", "psi-ahb1-ahb2", 0x62c, BIT(0), 0); > > +/* Keep GPU_CLK divider const to avoid DFS instability. */ > static const char * const gpu_parents[] = { "pll-gpu" }; > -static SUNXI_CCU_M_WITH_MUX_GATE(gpu_clk, "gpu", gpu_parents, 0x670, > - 0, 3, /* M */ > +static SUNXI_CCU_MUX_WITH_GATE(gpu_clk, "gpu", gpu_parents, 0x670, > 24, 1, /* mux */ > BIT(31), /* gate */ > CLK_SET_RATE_PARENT); > @@ -1193,6 +1193,16 @@ static int sun50i_h6_ccu_probe(struct platform_device > *pdev) if (IS_ERR(reg)) > return PTR_ERR(reg); > > + /* Force PLL_GPU output divider to 0 */ Divider 0 here > + val = readl(reg + SUN50I_H6_PLL_GPU_REG); > + val &= ~BIT(0); > + writel(val, reg + SUN50I_H6_PLL_GPU_REG); > + > + /* Force GPU_CLK divider to 0 */ and here sounds wrong, since division by zero is not defined. Using 1 is more intuitive and correct, since that's what HW actually uses. Patch looks good otherwise. Best regards, Jernej > + val = readl(reg + gpu_clk.common.reg); > + val &= ~GENMASK(3, 0); > + writel(val, reg + gpu_clk.common.reg); > + > /* Enable the lock bits on all PLLs */ > for (i = 0; i < ARRAY_SIZE(pll_regs); i++) { > val = readl(reg + pll_regs[i]);