From patchwork Tue May 31 10:10:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 578403 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 725E1C433EF for ; Tue, 31 May 2022 10:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245640AbiEaKKq (ORCPT ); Tue, 31 May 2022 06:10:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245552AbiEaKKd (ORCPT ); Tue, 31 May 2022 06:10:33 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A06739980E for ; Tue, 31 May 2022 03:10:28 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id t2so4812197pld.4 for ; Tue, 31 May 2022 03:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=841lChJS+wM9jNwwGNIhEP39YB5JqkFPrtXZuFk54ZE=; b=wsVUZDBwbwJUD2AB5HlQVmhzbHK1IExWV+c19cH6hRQ4ggbGuqoH+/SviPapk+UlP+ GovfI79gVH10UBXFXfmTlzsthLjkOA1835nlQttp3GoFkWxIC4661qZxSOfIiheO8Jyw aJF9fFoEdU6QbLPEmfh0HxVzDsBEKdgLMoInHDuIZQ9QyYsYfdgF3Dpoaa7WeI4bOvdm pqaXYir/RYh5smiEISje8EncY1SXUyW4g40HmCOsALNm9ET1E9roOEzH3Y2qIIJuU3uC XESf+PGPGVZ454UhBrQzSmVQ84pdaWc8BChcLIAO5vQznh4ONZ1jsw3BIP5Wsn8Bpf1T o5aw== 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=841lChJS+wM9jNwwGNIhEP39YB5JqkFPrtXZuFk54ZE=; b=x3FbKrOXnf11riIfb3ZOSBWcp0RBK485I9q/Gg7Eg3srwcWOwCLK3XAjXzdlCEqp9T Fk8fuIlZ+csGWc8Ze4k9J1d5xSzMUuREdG8HF85NjYv6c5+Mdfe+E0Jk3F6K6pmnFFdA sFzjhjhovhj3vb/JZdYD/peVIPnJduJXWg/3g3nik4Fgn27bAHhYuQtj7Yy5m2dfrbOd B4AlvF4rdNs5kBBI2oX6nwT+gocbpS0q1R4q7WZ6DH0rM6mbgzszLU6NpF7+EyFlP5Xf TB0cVnsvRX3kxyV0iA9pfPyplA99NDbxYoSjPB1+7aPxzcFW4BzvbsgpejlKrFX8f4/c gTPQ== X-Gm-Message-State: AOAM533h4bAFkhNQbz5lTW7IQ9txDK4RJ8XkpJ0rt4gMDp68kQZBZabE w/xgb1/OwMlgJjNXBe+Tl/hdiQ== X-Google-Smtp-Source: ABdhPJyykrDTXjJH194BNbajlW0qZVaKHHLjVigQyygVAMr38BqXMuyG1t704aSR+1M4CfeL+rYRSg== X-Received: by 2002:a17:90b:33cd:b0:1e2:a03c:a4b1 with SMTP id lk13-20020a17090b33cd00b001e2a03ca4b1mr17806391pjb.49.1653991828146; Tue, 31 May 2022 03:10:28 -0700 (PDT) Received: from localhost ([122.162.234.2]) by smtp.gmail.com with ESMTPSA id l7-20020a17090a150700b001e2f3831102sm1509234pja.17.2022.05.31.03.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 03:10:27 -0700 (PDT) From: Viresh Kumar To: Keerthy , Dave Gerlach , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J. Wysocki" , Krzysztof Kozlowski , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] OPP: ti: Migrate to config_regulators() Date: Tue, 31 May 2022 15:40:03 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The OPP core now provides config_regulators() interface, which needs the platforms to just set the OPP voltages instead of both clk and voltage. The clock is set by the OPP core instead and hence reduces code redundancy. Migrate the only user of the custom set_opp() interface to config_regulators(). Signed-off-by: Viresh Kumar --- drivers/opp/ti-opp-supply.c | 74 +++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c index a30825dc30cf..2aeb084fc379 100644 --- a/drivers/opp/ti-opp-supply.c +++ b/drivers/opp/ti-opp-supply.c @@ -36,11 +36,15 @@ struct ti_opp_supply_optimum_voltage_table { * @vdd_table: Optimized voltage mapping table * @num_vdd_table: number of entries in vdd_table * @vdd_absolute_max_voltage_uv: absolute maximum voltage in UV for the supply + * @old_supplies: Placeholder for supplies information for old OPP. + * @new_supplies: Placeholder for supplies information for new OPP. */ struct ti_opp_supply_data { struct ti_opp_supply_optimum_voltage_table *vdd_table; u32 num_vdd_table; u32 vdd_absolute_max_voltage_uv; + struct dev_pm_opp_supply old_supplies[2]; + struct dev_pm_opp_supply new_supplies[2]; }; static struct ti_opp_supply_data opp_data; @@ -266,27 +270,32 @@ static int _opp_set_voltage(struct device *dev, return 0; } -/** - * ti_opp_supply_set_opp() - do the opp supply transition - * @data: information on regulators and new and old opps provided by - * opp core to use in transition - * - * Return: If successful, 0, else appropriate error value. - */ -static int ti_opp_supply_set_opp(struct dev_pm_set_opp_data *data) +/* Do the opp supply transition */ +static int ti_opp_config_regulators(struct device *dev, struct dev_pm_opp *old_opp, + struct dev_pm_opp *new_opp, struct regulator **regulators, + unsigned int count) { - struct dev_pm_opp_supply *old_supply_vdd = &data->old_opp.supplies[0]; - struct dev_pm_opp_supply *old_supply_vbb = &data->old_opp.supplies[1]; - struct dev_pm_opp_supply *new_supply_vdd = &data->new_opp.supplies[0]; - struct dev_pm_opp_supply *new_supply_vbb = &data->new_opp.supplies[1]; - struct device *dev = data->dev; - unsigned long old_freq = data->old_opp.rate, freq = data->new_opp.rate; - struct clk *clk = data->clk; - struct regulator *vdd_reg = data->regulators[0]; - struct regulator *vbb_reg = data->regulators[1]; + struct dev_pm_opp_supply *old_supply_vdd = &opp_data.old_supplies[0]; + struct dev_pm_opp_supply *old_supply_vbb = &opp_data.old_supplies[1]; + struct dev_pm_opp_supply *new_supply_vdd = &opp_data.new_supplies[0]; + struct dev_pm_opp_supply *new_supply_vbb = &opp_data.new_supplies[1]; + struct regulator *vdd_reg = regulators[0]; + struct regulator *vbb_reg = regulators[1]; + unsigned long old_freq, freq; int vdd_uv; int ret; + /* We must have two regulators here */ + WARN_ON(count != 2); + + /* Fetch supplies and freq information from OPP core */ + ret = dev_pm_opp_get_supplies(new_opp, opp_data.new_supplies); + WARN_ON(ret); + + old_freq = dev_pm_opp_get_freq(old_opp); + freq = dev_pm_opp_get_freq(new_opp); + WARN_ON(!old_freq || !freq); + vdd_uv = _get_optimal_vdd_voltage(dev, &opp_data, new_supply_vdd->u_volt); @@ -303,39 +312,24 @@ static int ti_opp_supply_set_opp(struct dev_pm_set_opp_data *data) ret = _opp_set_voltage(dev, new_supply_vbb, 0, vbb_reg, "vbb"); if (ret) goto restore_voltage; - } - - /* Change frequency */ - dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n", - __func__, old_freq, freq); - - ret = clk_set_rate(clk, freq); - if (ret) { - dev_err(dev, "%s: failed to set clock rate: %d\n", __func__, - ret); - goto restore_voltage; - } - - /* Scaling down? Scale voltage after frequency */ - if (freq < old_freq) { + } else { ret = _opp_set_voltage(dev, new_supply_vbb, 0, vbb_reg, "vbb"); if (ret) - goto restore_freq; + goto restore_voltage; ret = _opp_set_voltage(dev, new_supply_vdd, vdd_uv, vdd_reg, "vdd"); if (ret) - goto restore_freq; + goto restore_voltage; } return 0; -restore_freq: - ret = clk_set_rate(clk, old_freq); - if (ret) - dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n", - __func__, old_freq); restore_voltage: + /* Fetch old supplies information only if required */ + ret = dev_pm_opp_get_supplies(old_opp, opp_data.old_supplies); + WARN_ON(ret); + /* This shouldn't harm even if the voltages weren't updated earlier */ if (old_supply_vdd->u_volt) { ret = _opp_set_voltage(dev, old_supply_vbb, 0, vbb_reg, "vbb"); @@ -383,7 +377,7 @@ static int ti_opp_supply_probe(struct platform_device *pdev) const struct ti_opp_supply_of_data *of_data; int ret = 0; struct dev_pm_opp_config config = { - .set_opp = ti_opp_supply_set_opp, + .config_regulators = ti_opp_config_regulators, }; match = of_match_device(ti_opp_supply_of_match, dev);