From patchwork Thu Oct 24 10:13:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 13848706 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 5B43E1BFE0D; Thu, 24 Oct 2024 10:13:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729764808; cv=none; b=SANbMOekZxElUXcJAC6RM0Txv0DV+hVRpfJkYYvO61dAVcumluJr/Wy1TO5QHoaSkxHg+uNh/kZBKUPl2qF9iJCospKN6+L01F/MnXoC4lK5cqMl6nQpFzSImvjxjdoXuaBi3PEwCHPZGk/t9APi1rZX2Ym9tV6sJ0DiX2VR8wc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729764808; c=relaxed/simple; bh=cU9P4qzHC4jP9o3v4wIQ+UaeV1Ek/oCy3Sa5T8uuL30=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jt3naCljX6cGGU7OO1lLddoXBDRA/Q4z+sdenDEKNR4mJyZU2ZWPhGkYiIpKTnnMMB/nqZ+wAGkjQz0BccUMqhYRdOmJvLXCaZtDrQbhjsnVEfFOQ1598g0/tRRojnhb72RseI1gIkDwuCC3gjr02C56OE945r66ztBz+MfXLc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IRE6J7gX; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IRE6J7gX" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5c948c41edeso830743a12.1; Thu, 24 Oct 2024 03:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729764804; x=1730369604; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qXV7innKMzJjCsw3L4AU06wd569JCGXLkPWGw2m6iWE=; b=IRE6J7gXANlp9Uo6xDvSU0NvNPr2oh2Oq9XSdNLgvZTKLHzPWYnmTLhwiahCi0iP2S YB15CkKKx0r/ZVyilVbMzpX7VZe31+/WF+zTXooigHo6APEcusgx2suub7Yv2NzUixdV tW8Cly4Em+7owDWSGwQG6No5sQJShQcCgqUKZPLsubzNM+UmeyhvEY1An6AbERWf/QCe g0BHpZyWl0S0R9tgSZH0fYW9zjXSDXFQEWSeWHXBfN5Vhmuh7bG85Opfwu5mEv0I+A6E RT5Nk191WaX+yfIt65u9FIgqyiqR5f7swfuQjnyt+Y+Rwyix1G/0pcdR5z7iw1FP42/w cAYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764804; x=1730369604; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qXV7innKMzJjCsw3L4AU06wd569JCGXLkPWGw2m6iWE=; b=ljzxv9Q9SJq/hEjk2UW6nzeSTJFk1vcjVf8OTsK9TE7lQ+ktiILJ6DGg7ELtLQz6ZW r3Gg+bdzw4J7M5jsZE8cnFl3mpLmTHO99euEnO3LgXHUaRXbzzrH2jCBL7BO4Mfo642c y3W4+U6L09TVRq6JSw/sfKlmzDL4A0LEIBJhDxsSZc1gYaFDCnljxnH3vCjDUiGELzsy o5v8aw62nGZiZyIe20Jn5cJsIMlcR+6qtoJMOT29HAvXmDqQxA0FcYxpsuPv0xM7CGM7 zkHJ5iCqNvkAze1m4zTEpVa0rmDqrK2DE3uHiTQBmgD0M+sQIoD5RXwC2uwKZc7yYE30 AiKA== X-Forwarded-Encrypted: i=1; AJvYcCWqsI7CwTNtpJCq7llnlUHnUy8PhDTIqdW6+/c/BkLPdVq5S7M9pqU4Em5EudxW9wnlz1O5YB7j1C0=@vger.kernel.org, AJvYcCXuaka/TILI6TxM+HXwaZ6dnbcnP8WQcUaa/XFcyANjga04JefZq289gd+tEVOJfeCCNCjnQAHjdxQIFf6s@vger.kernel.org X-Gm-Message-State: AOJu0Yw1ZoNofa0vpFZZeKEHUK+R1V2Bn8/slWVsEXH3EV2g+KIF3Ves rhd2SF7Hf5yquAJXAsSNEeyXcZ+XNMnJGsMTE+BqbWlSceUL453iiA3LeA== X-Google-Smtp-Source: AGHT+IFqsC3dLoNMueW7i9qlCy0xjygH1i/UFI/+Ze1kd34wi6cbWzoWfLN5YqXqsexRUao3mCT2xA== X-Received: by 2002:a05:6402:380a:b0:5cb:6706:ccd with SMTP id 4fb4d7f45d1cf-5cb8af6c613mr4402461a12.25.1729764803796; Thu, 24 Oct 2024 03:13:23 -0700 (PDT) Received: from [127.0.1.1] ([46.53.244.166]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66a6a6efsm5519757a12.53.2024.10.24.03.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:13:22 -0700 (PDT) From: Dzmitry Sankouski Date: Thu, 24 Oct 2024 13:13:09 +0300 Subject: [PATCH v7 1/3] clk: qcom: clk-rcg2: document calc_rate function Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241024-starqltechn_integration_upstream-v7-1-78eaf21ecee9@gmail.com> References: <20241024-starqltechn_integration_upstream-v7-0-78eaf21ecee9@gmail.com> In-Reply-To: <20241024-starqltechn_integration_upstream-v7-0-78eaf21ecee9@gmail.com> To: Bjorn Andersson , Michael Turquette , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729764800; l=1073; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=cU9P4qzHC4jP9o3v4wIQ+UaeV1Ek/oCy3Sa5T8uuL30=; b=EG5fpZM9D8fDjigq3ofy2poFvugR54iI3hQVzMkeD7fnBC/JoUZDspdxfhEl3QYDnC3MXRaVm Zm4bQ5tX8ruCGxTyxfHfDuOYr/0tKLDN8No3IqRH/UTc4FJB0miIBqB X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= Update calc_rate docs to reflect, that pre_div is not pure divisor, but a register value, and requires conversion. Signed-off-by: Dzmitry Sankouski --- drivers/clk/qcom/clk-rcg2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c index bf26c5448f00..0fc23a87b432 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -153,7 +153,14 @@ static int clk_rcg2_set_parent(struct clk_hw *hw, u8 index) * * parent_rate m * rate = ----------- x --- - * hid_div n + * pre_div n + * + * @param rate - Parent rate. + * @param m - Multiplier. + * @param n - Divisor. + * @param mode - Use zero to ignore m/n calculation. + * @param hid_div - Pre divisor register value. Pre divisor value + * relates to hid_div as pre_div = (hid_div + 1) / 2 */ static unsigned long calc_rate(unsigned long rate, u32 m, u32 n, u32 mode, u32 hid_div) From patchwork Thu Oct 24 10:13:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 13848707 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 0ED971C4A23; Thu, 24 Oct 2024 10:13:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729764811; cv=none; b=G0JadNipL9w8aPAuGTmUZHaTknQASJrzsI7WHHQ6sg35tNvyPmoU0MexsCkqRo/YrrcYDQTWzLLFo1tqjZuiwxH6vLIWnHCzfWODjGf9ZVkZdDiWTektdIAguooJoxgfLdXuXj1fqwEGw1IpOS30ByinEatH2VdgcKZhpmNXB38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729764811; c=relaxed/simple; bh=WMVFSYtiNs9+eSt5cs35mFEfRBb6kD9EOxNwlA9H3pM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YSmx0V2B2F6LIOsuL8ZNGLGHIcz3enp/aIARnd5pZXwZ3CY55Tp8ppSaLGWX4ZEV0D1qpE+94rm79C/a4oCv1/NG2YeHHdp4NO4bRS/4cGQvj4N5+be8tQikoI2ycHktgPNTtHnc217ILVku6JKWYLDLuyLr7s3BRrjqQuF9gmg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CwOAX7Tv; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CwOAX7Tv" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a99fa009adcso44264366b.0; Thu, 24 Oct 2024 03:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729764807; x=1730369607; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=E/nu93rXi66eugVXc5QNmzFF8lJpxFp1e23mrrGawYo=; b=CwOAX7TvhYXmRc/VqE3lcSuKYX02QdCcJQ9fVEM6kGw6BXpWUgV1F1/lZMKwIUCXMz jHarCoco3+gChnlfplR6Q2O9iQ8sdi1aZMUk3h+RbLo7xCdQ01Qw7HvHIzSz07to0fnY o75BifvRPZKon5w3mLh2FJvG7A5Iwq1Ay1HZEMldOzu0Fhx+hUVe3nZRf4XQ15L6zKpc nAFhDlroVjIINkhHzNsVlZes5z5GZQVcFap22bw3ZAIq1lxPVXZ9JNyxW/mM/4cFsNEC rYFb2ymo1kajSf7Mp4qMZF79WYKHtnkz751Zkxzm9eGs/sRslCEtQVLj63EdWVIwwXg/ C/Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764807; x=1730369607; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E/nu93rXi66eugVXc5QNmzFF8lJpxFp1e23mrrGawYo=; b=HgorNQrIaxOZKCU02hk0gVLhHJ4NpRWxdJyrXrofbVueUWnTN7KOgdL2G1JKsqy9P+ P3xbFdlSvoFcUo+IotlYRShukRy+6mxCDwTnSbsiVEEYiPrLCVm1tz9KTdrKZvqsNEU+ N6G5D6EQR7xHTMLzPkven132HKPeAJ9PMDI99yIP73+zeHURUlHtd0f+CuocH2JQmDe7 uRJORgjzooPk0sb5Gu5sjmWjlJkrDBX/KW96xDfdxFOKAzVxVQJJEreYbPKZoCnCpWKw CbIrxEfN8HDJIO0lpDgabSfk5C4mmcbt5sbZumMC7WeQqHuRSF0AGkyQpwU68A+jkqhy 18eQ== X-Forwarded-Encrypted: i=1; AJvYcCWcraDZJGLEctviEPxG2NrlIOo7EyhbYwOXlOvP4EI2MclDsHl0DEXNUGyMV6/jhbgJSQV9VGTLdpI=@vger.kernel.org, AJvYcCXlGwMdhBbcyvDu/7F7wrJI7RVOc3wzpMvbA8nhDpKR378u2wOPlq9rANgVWj5DfYzXtPSfWJGamc0g+rL2@vger.kernel.org X-Gm-Message-State: AOJu0YwfwmAIRmCatRl34tjJ7S0zRqTlNptqKpFSnX5ZlyfopgNarkpA SfraMuUoxGBl0reGky2fuY2LCX9Pie215Kd0NOLlvRL0b6Wvynt3wtbsBA== X-Google-Smtp-Source: AGHT+IF9E71yWN6SD1MVjWD6Quj1700l4BelhysLBUkFUgCzRuQTwkEk9k2JlZHnw03Nn7lyF07YDg== X-Received: by 2002:a05:6402:27d0:b0:5cb:6b7c:3f88 with SMTP id 4fb4d7f45d1cf-5cb8b098013mr5505187a12.8.1729764805238; Thu, 24 Oct 2024 03:13:25 -0700 (PDT) Received: from [127.0.1.1] ([46.53.244.166]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66a6a6efsm5519757a12.53.2024.10.24.03.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:13:25 -0700 (PDT) From: Dzmitry Sankouski Date: Thu, 24 Oct 2024 13:13:10 +0300 Subject: [PATCH v7 2/3] clk: qcom: clk-rcg2: split __clk_rcg2_configure function Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241024-starqltechn_integration_upstream-v7-2-78eaf21ecee9@gmail.com> References: <20241024-starqltechn_integration_upstream-v7-0-78eaf21ecee9@gmail.com> In-Reply-To: <20241024-starqltechn_integration_upstream-v7-0-78eaf21ecee9@gmail.com> To: Bjorn Andersson , Michael Turquette , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729764800; l=2751; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=WMVFSYtiNs9+eSt5cs35mFEfRBb6kD9EOxNwlA9H3pM=; b=1EaeS44p5ujtmo/vQmqT54lGa8HFrm2QoUqsIuyIbRdIwqzT33N52IsCl8Ux0JyLzPyWp2fcN ZhW5e916U85CzE4PD9PCpYkFOVr59llWXOXii23qwbIehDeK4O8JJFk X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= __clk_rcg2_configure function does 2 things - configures parent and mnd values. In order to be able to add new clock options, we should split. Move __clk_rcg2_configure logic on 2 functions: - __clk_rcg2_configure_parent which configures clock parent - __clk_rcg2_configure_mnd which configures mnd values __clk_rcg2_configure delegates to mentioned functions. Signed-off-by: Dzmitry Sankouski --- drivers/clk/qcom/clk-rcg2.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c index 0fc23a87b432..a56c7caad33a 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -400,16 +400,26 @@ static int clk_rcg2_fm_determine_rate(struct clk_hw *hw, return _freq_tbl_fm_determine_rate(hw, rcg->freq_multi_tbl, req); } -static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f, - u32 *_cfg) +static int __clk_rcg2_configure_parent(struct clk_rcg2 *rcg, u8 src, u32 *_cfg) { - u32 cfg, mask, d_val, not2d_val, n_minus_m; struct clk_hw *hw = &rcg->clkr.hw; - int ret, index = qcom_find_src_index(hw, rcg->parent_map, f->src); + int index = qcom_find_src_index(hw, rcg->parent_map, src); if (index < 0) return index; + *_cfg &= ~CFG_SRC_SEL_MASK; + *_cfg |= rcg->parent_map[index].cfg << CFG_SRC_SEL_SHIFT; + + return 0; +} + +static int __clk_rcg2_configure_mnd(struct clk_rcg2 *rcg, const struct freq_tbl *f, + u32 *_cfg) +{ + u32 cfg, mask, d_val, not2d_val, n_minus_m; + int ret; + if (rcg->mnd_width && f->n) { mask = BIT(rcg->mnd_width) - 1; ret = regmap_update_bits(rcg->clkr.regmap, @@ -438,9 +448,8 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f, } mask = BIT(rcg->hid_width) - 1; - mask |= CFG_SRC_SEL_MASK | CFG_MODE_MASK | CFG_HW_CLK_CTRL_MASK; + mask |= CFG_MODE_MASK | CFG_HW_CLK_CTRL_MASK; cfg = f->pre_div << CFG_SRC_DIV_SHIFT; - cfg |= rcg->parent_map[index].cfg << CFG_SRC_SEL_SHIFT; if (rcg->mnd_width && f->n && (f->m != f->n)) cfg |= CFG_MODE_DUAL_EDGE; if (rcg->hw_clk_ctrl) @@ -452,6 +461,22 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f, return 0; } +static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f, + u32 *_cfg) +{ + int ret; + + ret = __clk_rcg2_configure_parent(rcg, f->src, _cfg); + if (ret) + return ret; + + ret = __clk_rcg2_configure_mnd(rcg, f, _cfg); + if (ret) + return ret; + + return 0; +} + static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) { u32 cfg; From patchwork Thu Oct 24 10:13:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 13848708 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 121EA1C75FA; Thu, 24 Oct 2024 10:13:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729764812; cv=none; b=WNyveuWe+Vc9tYSH1KMJoJaabjWgB/PTcUYF4yZKV+p4cADd/WQbq1f70WPXA4/caL7L62seHBak26QnemKLxgmzkUxYiAnaKZallI68uB9rEfJjL0pOqVvS4jYXWHjSjYD39JDJLH7VJlIxyi+NCUyPOqlTAB2sH7ndpbRLcr4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729764812; c=relaxed/simple; bh=yvsN3uHXEDaNJ7PpTpFPxbPfmuXvrn9otwuak3kjTTA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GkIwl7v1baT7VuY6oqw23En81M6KGruO7N7AISIp6XiYDZ7CRG4athqk64d3VzXukhUDZBe1LpFEjYwW8qRhUVo9YNBpf1ytuWEKT7FBlIIa2PukxztksUOhcXABOuqeEMq29rgbcDoXOgOwba7xUDcf+lvfnTjY1VJx26lUiGA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hCBmdvZu; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hCBmdvZu" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a9a977d6cc7so40001866b.3; Thu, 24 Oct 2024 03:13:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729764808; x=1730369608; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=carGputot5lA13PiuUkbUqLVhby4W9zP8Cj/uY2Pmk0=; b=hCBmdvZux40r0z4spFR0+kwz88cHGyxVkT8KFd86vE0AarU7JWHGZBZYChOJxwIYOf b62gOfQDkbjO1rp6bbXn+7kA37N7CvnqWB5Mu4DxgmF3W6hFfwBNLs8Rz2kLb5eQlc/z teYMFb9Zt8KrdA0TDLgM9TAkYJ+Jqdou62UB2C+YAx6luHBRvnLGi3VbCx9eAK4+2NFs vH/OaoWA70KiDFjhenjJVXJ2hOV3ZclpcAVnrDUh8gTycw9nDoIVxQMEx2+8InrnRxki JE5n3uj/fgSUyaBZSPGxxG9Qb58G8fbRKhIwryBI9TCbsMmAIJ8CQtofs6GpJ6HwOiUq Sh7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764808; x=1730369608; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=carGputot5lA13PiuUkbUqLVhby4W9zP8Cj/uY2Pmk0=; b=GoMExeWBKx0+BmHJFxKxT/kSLa8QW3LoHdAS1L/cHT6LfbNOWnj7TAQXiNTuCyrF8H Q44C8Y5HZZ3efONhIpLTv+two4CTpdl+9nS0rf1kXC+qIT+DGPakF54jMUJRdC7dv3U0 vR+mQLyCgx1L+VdbJiwSA5G7eYiTSnl+nSGLdwiXS3RfgUVj/BYv4HalKmhuQqsQaNIM BP4bhTAOP8XX9waS1R4Ef4g2iBlcysLlQJIBmCf9PIs3lZvdsV73EcrFJzGFDz1i1H2G BAM1aOUu67lfTF4zaFVXoeGMjsZ2WkhgDbUheE/ALcKoUx9tyY4ZqEHPRAp8T2rEitvO /l9g== X-Forwarded-Encrypted: i=1; AJvYcCUfR+xtyG/FrvAu2OauBgufsD6kjq/Uf8AzZS8KlbgbsVeGVn3B4UGLWALSQtRtSSe63RExRCAawN4=@vger.kernel.org, AJvYcCUzd0VMrGhKRll4XMqm4U3UFUByzFMRV4qK8FVC1756DxJJyim79aryRlQw13Bi0Lq8m8hDbMcF9D/hhrhV@vger.kernel.org X-Gm-Message-State: AOJu0Yy/QOGWOCoOonHeTGJanLpjfiCqWzHU+lS6/f1EPGF6WJgLg9sv MebtiQ9wWiJog9rk8vcHd3AOQ+v/Xe9ioBunZn1y5gEGrX8ZWEgo4SjvUg== X-Google-Smtp-Source: AGHT+IEJbF/7RIqoJSCB4yG1ul3Cahl9BFM4aZAuq0QcGlxuo5/AyyvSF05cJwweZY++bhttfamV9Q== X-Received: by 2002:a05:6402:5387:b0:5ca:e44:6945 with SMTP id 4fb4d7f45d1cf-5cb8b1c1ac1mr5990249a12.15.1729764807718; Thu, 24 Oct 2024 03:13:27 -0700 (PDT) Received: from [127.0.1.1] ([46.53.244.166]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66a6a6efsm5519757a12.53.2024.10.24.03.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:13:26 -0700 (PDT) From: Dzmitry Sankouski Date: Thu, 24 Oct 2024 13:13:11 +0300 Subject: [PATCH v7 3/3] gcc-sdm845: Add general purpose clock ops Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241024-starqltechn_integration_upstream-v7-3-78eaf21ecee9@gmail.com> References: <20241024-starqltechn_integration_upstream-v7-0-78eaf21ecee9@gmail.com> In-Reply-To: <20241024-starqltechn_integration_upstream-v7-0-78eaf21ecee9@gmail.com> To: Bjorn Andersson , Michael Turquette , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729764800; l=9700; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=yvsN3uHXEDaNJ7PpTpFPxbPfmuXvrn9otwuak3kjTTA=; b=6EeyXt1vGYA1jyhYYKnptD5dD8DbvBc4S8u3Fd8iSt4kViB+Fpg6T3v4Dpax7Ad6zLHXKhFJv x6HIb9heEB8BpFN9fZ2o0kK5+qZXNc8OQjqXEObbvC/gGybL+/hz5Kj X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= SDM845 has "General Purpose" clocks that can be muxed to SoC pins to clock various external devices. Those clocks may be used as e.g. PWM sources for external peripherals. GPCLK can in theory have arbitrary value depending on the use case, so the concept of frequency tables, used in rcg2 clock driver, is not efficient, because it allows only defined frequencies. Introduce clk_rcg2_gp_ops, which automatically calculate clock mnd values for arbitrary clock rate. The calculation done as follows: - upon determine rate request, we calculate m/n/pre_div as follows: - find parent(from our client's assigned-clock-parent) rate - find scaled rates by dividing rates on its greatest common divisor - assign requested scaled rate to m - factorize scaled parent rate, put multipliers to n till max value (determined by mnd_width) - validate calculated values with *_width: - if doesn't fit, delete divisor and multiplier by 2 until fit - return determined rate Limitations: - The driver doesn't select a parent clock (it may be selected by client in device tree with assigned-clocks, assigned-clock-parents properties) Signed-off-by: Dzmitry Sankouski --- Changes in v7: - split patch on gp and non gp changes - use /**/ comment for kernel doc - clk_rcg2_determine_gp_rate: put freq_tbl to the stack - clk_rcg2_calc_mnd: if impossible to lower scale, return after setting max divisors values Changes in v6: - remove unused count variable - run sparse and smatch Changes in v5: - replace '/' to div64_u64 to fix 32 bit gcc error - fix empty scalar initializer --- drivers/clk/qcom/clk-rcg.h | 1 + drivers/clk/qcom/clk-rcg2.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/qcom/gcc-sdm845.c | 11 +++-------- 3 files changed, 150 insertions(+), 8 deletions(-) diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h index 8e0f3372dc7a..8817d14bbda4 100644 --- a/drivers/clk/qcom/clk-rcg.h +++ b/drivers/clk/qcom/clk-rcg.h @@ -189,6 +189,7 @@ struct clk_rcg2_gfx3d { container_of(to_clk_rcg2(_hw), struct clk_rcg2_gfx3d, rcg) extern const struct clk_ops clk_rcg2_ops; +extern const struct clk_ops clk_rcg2_gp_ops; extern const struct clk_ops clk_rcg2_floor_ops; extern const struct clk_ops clk_rcg2_fm_ops; extern const struct clk_ops clk_rcg2_mux_closest_ops; diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c index a56c7caad33a..d01d2d6f8e41 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -8,11 +8,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -32,6 +34,7 @@ #define CFG_REG 0x4 #define CFG_SRC_DIV_SHIFT 0 +#define CFG_SRC_DIV_LENGTH 8 #define CFG_SRC_SEL_SHIFT 8 #define CFG_SRC_SEL_MASK (0x7 << CFG_SRC_SEL_SHIFT) #define CFG_MODE_SHIFT 12 @@ -148,6 +151,16 @@ static int clk_rcg2_set_parent(struct clk_hw *hw, u8 index) return update_config(rcg); } +/* + * Converts divisors to corresponding clock register values. + * @param f - Frequency table with pure m/n/pre_div parameters. + */ +static void convert_to_reg_val(struct freq_tbl *f) +{ + f->pre_div *= 2; + f->pre_div -= 1; +} + /* * Calculate m/n:d rate * @@ -400,6 +413,91 @@ static int clk_rcg2_fm_determine_rate(struct clk_hw *hw, return _freq_tbl_fm_determine_rate(hw, rcg->freq_multi_tbl, req); } +/* + * Split multiplier that doesn't fit in n neither in pre_div. + * + * @param multiplier - multiplier to split between n and pre_div + * @param pre_div - pointer to pre divisor value + * @param n - pointer to n divisor value + * @param pre_div_max - pre divisor maximum value + * + */ +static inline void clk_rcg2_split_div(int multiplier, unsigned int *pre_div, + u16 *n, unsigned int pre_div_max) +{ + *n = mult_frac(multiplier * *n, *pre_div, pre_div_max); + *pre_div = pre_div_max; +} + +static void clk_rcg2_calc_mnd(u64 parent_rate, u64 rate, struct freq_tbl *f, + unsigned int mnd_max, unsigned int pre_div_max) +{ + int i = 2; + unsigned int pre_div = 1; + unsigned long rates_gcd, scaled_parent_rate; + u16 m, n = 1, n_candidate = 1, n_max; + + rates_gcd = gcd(parent_rate, rate); + m = div64_u64(rate, rates_gcd); + scaled_parent_rate = div64_u64(parent_rate, rates_gcd); + while (scaled_parent_rate > (mnd_max + m) * pre_div_max) { + // we're exceeding divisor's range, trying lower scale. + if (m > 1) { + m--; + scaled_parent_rate = mult_frac(scaled_parent_rate, m, (m + 1)); + } else { + // cannot lower scale, just set max divisor values. + f->n = mnd_max + m; + f->pre_div = pre_div_max; + f->m = m; + return; + } + } + + n_max = m + mnd_max; + + while (scaled_parent_rate > 1) { + while (scaled_parent_rate % i == 0) { + n_candidate *= i; + if (n_candidate < n_max) + n = n_candidate; + else if (pre_div * i < pre_div_max) + pre_div *= i; + else + clk_rcg2_split_div(i, &pre_div, &n, pre_div_max); + + scaled_parent_rate /= i; + } + i++; + } + + f->m = m; + f->n = n; + f->pre_div = pre_div > 1 ? pre_div : 0; +} + +static int clk_rcg2_determine_gp_rate(struct clk_hw *hw, + struct clk_rate_request *req) +{ + struct clk_rcg2 *rcg = to_clk_rcg2(hw); + struct freq_tbl f_tbl = {}, *f = &f_tbl; + int mnd_max = BIT(rcg->mnd_width) - 1; + int hid_max = BIT(rcg->hid_width) - 1; + struct clk_hw *parent; + u64 parent_rate; + + parent = clk_hw_get_parent(hw); + parent_rate = clk_get_rate(parent->clk); + if (!parent_rate) + return -EINVAL; + + clk_rcg2_calc_mnd(parent_rate, req->rate, f, mnd_max, hid_max / 2); + convert_to_reg_val(f); + req->rate = calc_rate(parent_rate, f->m, f->n, f->n, f->pre_div); + + return 0; +} + static int __clk_rcg2_configure_parent(struct clk_rcg2 *rcg, u8 src, u32 *_cfg) { struct clk_hw *hw = &rcg->clkr.hw; @@ -497,6 +595,26 @@ static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) return update_config(rcg); } +static int clk_rcg2_configure_gp(struct clk_rcg2 *rcg, const struct freq_tbl *f) +{ + u32 cfg; + int ret; + + ret = regmap_read(rcg->clkr.regmap, RCG_CFG_OFFSET(rcg), &cfg); + if (ret) + return ret; + + ret = __clk_rcg2_configure_mnd(rcg, f, &cfg); + if (ret) + return ret; + + ret = regmap_write(rcg->clkr.regmap, RCG_CFG_OFFSET(rcg), cfg); + if (ret) + return ret; + + return update_config(rcg); +} + static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate, enum freq_policy policy) { @@ -550,6 +668,22 @@ static int clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate, return __clk_rcg2_set_rate(hw, rate, CEIL); } +static int clk_rcg2_set_gp_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct clk_rcg2 *rcg = to_clk_rcg2(hw); + int mnd_max = BIT(rcg->mnd_width) - 1; + int hid_max = BIT(rcg->hid_width) - 1; + struct freq_tbl f_tbl = {}, *f = &f_tbl; + int ret; + + clk_rcg2_calc_mnd(parent_rate, rate, f, mnd_max, hid_max / 2); + convert_to_reg_val(f); + ret = clk_rcg2_configure_gp(rcg, f); + + return ret; +} + static int clk_rcg2_set_floor_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -677,6 +811,18 @@ const struct clk_ops clk_rcg2_ops = { }; EXPORT_SYMBOL_GPL(clk_rcg2_ops); +const struct clk_ops clk_rcg2_gp_ops = { + .is_enabled = clk_rcg2_is_enabled, + .get_parent = clk_rcg2_get_parent, + .set_parent = clk_rcg2_set_parent, + .recalc_rate = clk_rcg2_recalc_rate, + .determine_rate = clk_rcg2_determine_gp_rate, + .set_rate = clk_rcg2_set_gp_rate, + .get_duty_cycle = clk_rcg2_get_duty_cycle, + .set_duty_cycle = clk_rcg2_set_duty_cycle, +}; +EXPORT_SYMBOL_GPL(clk_rcg2_gp_ops); + const struct clk_ops clk_rcg2_floor_ops = { .is_enabled = clk_rcg2_is_enabled, .get_parent = clk_rcg2_get_parent, diff --git a/drivers/clk/qcom/gcc-sdm845.c b/drivers/clk/qcom/gcc-sdm845.c index dc3aa7014c3e..0def0fc0e009 100644 --- a/drivers/clk/qcom/gcc-sdm845.c +++ b/drivers/clk/qcom/gcc-sdm845.c @@ -284,11 +284,6 @@ static struct clk_rcg2 gcc_sdm670_cpuss_rbcpr_clk_src = { }; static const struct freq_tbl ftbl_gcc_gp1_clk_src[] = { - F(19200000, P_BI_TCXO, 1, 0, 0), - F(25000000, P_GPLL0_OUT_EVEN, 12, 0, 0), - F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0), - F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0), - F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0), { } }; @@ -302,7 +297,7 @@ static struct clk_rcg2 gcc_gp1_clk_src = { .name = "gcc_gp1_clk_src", .parent_data = gcc_parent_data_1, .num_parents = ARRAY_SIZE(gcc_parent_data_1), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_gp_ops, }, }; @@ -316,7 +311,7 @@ static struct clk_rcg2 gcc_gp2_clk_src = { .name = "gcc_gp2_clk_src", .parent_data = gcc_parent_data_1, .num_parents = ARRAY_SIZE(gcc_parent_data_1), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_gp_ops, }, }; @@ -330,7 +325,7 @@ static struct clk_rcg2 gcc_gp3_clk_src = { .name = "gcc_gp3_clk_src", .parent_data = gcc_parent_data_1, .num_parents = ARRAY_SIZE(gcc_parent_data_1), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_gp_ops, }, };