From patchwork Mon Jul 8 12:22:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 811211 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 887A113A87E for ; Mon, 8 Jul 2024 12:23:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720441396; cv=none; b=Djt2ng2Hr0nJ8C4x5oAdC+pwQioyXpHsX4Ef4LVBngH3DHDf6vu086mHLZ10dX+MecTa/6ZazFfERJAXjcAzHvPtRT7d4xcSlcMuta8bLS2f6iVUeolg5yOZGaiN2gEVqt+ZG5g8NGspi5bOALRQfkny5GNegeYM5vUUZ0tr0G4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720441396; c=relaxed/simple; bh=S4/6dqVzCQ55H+jEzo18/eSt3/yhBjBw+Vgvf5+K9HA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IfF9VXQ0yNnn3A7xXyPOCmVOoMWOIvKTViaJwmEO9Fztdqh3Aj06uGTpvg5M7tFS/16OpSGWMVBZBUKsMyhlmH8Eejb0lb0oKhD7q14eW4K1+8Io2FhhtK534EzBkkGoe4Ya1d0nFd3Lnd3bhTOmj+JI87icnCqtWVhUBwsEnSo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=hi7/S844; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="hi7/S844" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a7527afa23cso478279866b.2 for ; Mon, 08 Jul 2024 05:23:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720441393; x=1721046193; 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=JS6pi0mbZ0HVf65HjWjlZ5m8NQ5AsGtLpzqZjXxkjCQ=; b=hi7/S8443ET0GeYaRrO34NlP7gPKm8FIxVbGmOSki0bNdU5gQEa7r2Boo1hAiHDGK8 ihu/XLIkF9gSoEFreor/C0dX4TNaQ2kjVisiGoEgIbWNPizaAOrn7DqaadmMsWWYdOVC 7JSvn66BZnSvv6PxzaKls8Go8bZdn+fx/4aN+Rm0DJ8JKgU++2LC9eIGCDlL9hsJHvzw DBjA1m4amhIIBWUB0qjtwga7pWd8NijWC/WXIjIBG+ixh7n3ZIYnYlcaJoH7ykeoY+O1 K2uo2/k4jRjspaby15RXl2/LNxTuBr47fSzlukoVKvHjE88Iz+bM8t836F0LLWgWRWNG waWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720441393; x=1721046193; 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=JS6pi0mbZ0HVf65HjWjlZ5m8NQ5AsGtLpzqZjXxkjCQ=; b=aXOGTD5k71TrEQA4Rg5Khz6Sbkk/EG+TbC/7wxCc/QdWEyfvhcJSaWsltQdtpuBrRX jTygsZQc1Ay7JQBOXyyK30cvFSVttuz6SGcauoLmuFXlaQdGwVoCMdXZj5GyylRGfHzw jy6Jnk9dxJ069mQ/RcM+HxbIi4aGN12blmqtNR39rMH6niQqPB1/LinhEp02unUFWsu2 jt9GL/izqDpQnGOyIWOMVfiOB5V/PxbmQNfVZ8dEF3lf6oSXL4fieWO1TdN8DjOVpVKm GryMAaqQX2VUn1RBGzbZ8L6r1zal8ufOX0FAmk/PrDAljEoZdnlDx4YogLeWeTY/hIgS Z7kg== X-Forwarded-Encrypted: i=1; AJvYcCUhAQAX0nX4DUmC4cOu2FaBJpnF2NmBdbKndbb7fIVPNJ3lL+lp0WeRa5jy9k2lbCIIIGresoXlihZYx1KvBxgIHjj7GdsAm4IZEMHfgg== X-Gm-Message-State: AOJu0Ywmp2+hr56sf24Hy2BJLtAq0n0uKeOZaKmteUlDPaA3A3iaASaU P73u7CkyvGL/y1VSIySAKBuuVc40m64+vack/NaN+uAuZLng5sVTt0GeqkMiaBI= X-Google-Smtp-Source: AGHT+IEqCM5zd4aXRr5or3PDC2PLi11dRi2QzgmCl8YdBcyy4aTB4fLnWFVBxZOXWniNk5yrvjX17g== X-Received: by 2002:a17:906:24ce:b0:a77:e1fb:7df4 with SMTP id a640c23a62f3a-a77e1fb7f9cmr411901866b.13.1720441392984; Mon, 08 Jul 2024 05:23:12 -0700 (PDT) Received: from [192.168.105.194] (078088045245.garwolin.vectranet.pl. [78.88.45.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77e52ccf19sm208983666b.147.2024.07.08.05.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 05:23:12 -0700 (PDT) From: Konrad Dybcio Date: Mon, 08 Jul 2024 14:22:38 +0200 Subject: [PATCH v15 07/10] soc: qcom: cpr: Use u64 for frequency Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240708-topic-cpr3h-v15-7-5bc8b8936489@linaro.org> References: <20240708-topic-cpr3h-v15-0-5bc8b8936489@linaro.org> In-Reply-To: <20240708-topic-cpr3h-v15-0-5bc8b8936489@linaro.org> To: AngeloGioacchino Del Regno , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Stephen Boyd , Niklas Cassel , Liam Girdwood , Mark Brown , Conor Dooley , "Rafael J. Wysocki" , Viresh Kumar , Ulf Hansson , Rob Herring , Krzysztof Kozlowski Cc: Robert Marko , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org, Jeffrey Hugo , Marijn Suijten , Konrad Dybcio , Varadarajan Narayanan , Konrad Dybcio X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1720441372; l=4791; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=S4/6dqVzCQ55H+jEzo18/eSt3/yhBjBw+Vgvf5+K9HA=; b=JNg8MhX1IceKVwxNHOoyy/y2U2abJGJALs6cO2umKguYPDeKiU5SIgPNlLiFqqrhT+D8Q5X0S YUib4hKDlVUB3JPKtjezGFNVSiTsbqXuj8tonaXAcrQaYCfFnPtDSX2 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 32 bits is not enough for over-2.changeGHz frequencies. Move all variables that operate on Hz to u64 to avoid overflows. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Konrad Dybcio --- drivers/pmdomain/qcom/cpr-common.c | 13 +++++++------ drivers/pmdomain/qcom/cpr-common.h | 9 ++++----- drivers/pmdomain/qcom/cpr.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/pmdomain/qcom/cpr-common.c b/drivers/pmdomain/qcom/cpr-common.c index 44c681bbbf13..3e3a4a61cfde 100644 --- a/drivers/pmdomain/qcom/cpr-common.c +++ b/drivers/pmdomain/qcom/cpr-common.c @@ -218,7 +218,7 @@ unsigned int cpr_get_fuse_corner(struct dev_pm_opp *opp) } EXPORT_SYMBOL_GPL(cpr_get_fuse_corner); -unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref, +u64 cpr_get_opp_hz_for_req(struct dev_pm_opp *ref, struct device *cpu_dev) { u64 rate = 0; @@ -250,7 +250,7 @@ unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref, out_ref: of_node_put(desc_np); - return (unsigned long) rate; + return rate; } EXPORT_SYMBOL_GPL(cpr_get_opp_hz_for_req); @@ -260,7 +260,7 @@ int cpr_calculate_scaling(struct device *dev, const struct corner *corner) { u32 quot_diff = 0; - unsigned long freq_diff; + u64 freq_diff; int scaling; const struct fuse_corner *fuse, *prev_fuse; int ret; @@ -280,8 +280,9 @@ int cpr_calculate_scaling(struct device *dev, } freq_diff = fuse->max_freq - prev_fuse->max_freq; - freq_diff /= 1000000; /* Convert to MHz */ - scaling = 1000 * quot_diff / freq_diff; + freq_diff = div_u64(freq_diff, 1000000); /* Convert to MHz */ + scaling = 1000 * quot_diff; + do_div(scaling, freq_diff); return min(scaling, fdata->max_quot_scale); } EXPORT_SYMBOL_GPL(cpr_calculate_scaling); @@ -289,7 +290,7 @@ EXPORT_SYMBOL_GPL(cpr_calculate_scaling); int cpr_interpolate(const struct corner *corner, int step_volt, const struct fuse_corner_data *fdata) { - unsigned long f_high, f_low, f_diff; + u64 f_high, f_low, f_diff; int uV_high, uV_low, uV; u64 temp, temp_limit; const struct fuse_corner *fuse, *prev_fuse; diff --git a/drivers/pmdomain/qcom/cpr-common.h b/drivers/pmdomain/qcom/cpr-common.h index 0aa227617d2f..1b2fa344eb09 100644 --- a/drivers/pmdomain/qcom/cpr-common.h +++ b/drivers/pmdomain/qcom/cpr-common.h @@ -42,7 +42,7 @@ struct fuse_corner { int step_quot; const struct reg_sequence *accs; int num_accs; - unsigned long max_freq; + u64 max_freq; u8 ring_osc_idx; }; @@ -54,13 +54,13 @@ struct corner { int quot_adjust; u32 save_ctl; u32 save_irq; - unsigned long freq; + u64 freq; struct fuse_corner *fuse_corner; }; struct corner_data { unsigned int fuse_corner; - unsigned long freq; + u64 freq; }; struct acc_desc { @@ -92,8 +92,7 @@ int cpr_populate_fuse_common(struct device *dev, int cpr_find_initial_corner(struct device *dev, struct clk *cpu_clk, struct corner *corners, int num_corners); u32 cpr_get_fuse_corner(struct dev_pm_opp *opp); -unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref, - struct device *cpu_dev); +u64 cpr_get_opp_hz_for_req(struct dev_pm_opp *ref, struct device *cpu_dev); int cpr_calculate_scaling(struct device *dev, const char *quot_offset, const struct fuse_corner_data *fdata, diff --git a/drivers/pmdomain/qcom/cpr.c b/drivers/pmdomain/qcom/cpr.c index 5c83f0c26b29..b2e6e6eaae73 100644 --- a/drivers/pmdomain/qcom/cpr.c +++ b/drivers/pmdomain/qcom/cpr.c @@ -826,8 +826,8 @@ static int cpr_corner_init(struct cpr_drv *drv) struct corner_data *cdata; const struct fuse_corner_data *fdata; bool apply_scaling; - unsigned long freq_diff, freq_diff_mhz; - unsigned long freq; + unsigned long freq_diff_mhz; + u64 freq, freq_diff; int step_volt = regulator_get_linear_step(drv->vdd_apc); struct dev_pm_opp *opp; @@ -866,7 +866,7 @@ static int cpr_corner_init(struct cpr_drv *drv) cdata[level - 1].freq = freq; fuse = &drv->fuse_corners[fnum]; - dev_dbg(drv->dev, "freq: %lu level: %u fuse level: %u\n", + dev_dbg(drv->dev, "freq: %llu level: %u fuse level: %u\n", freq, dev_pm_opp_get_level(opp) - 1, fnum); if (freq > fuse->max_freq) fuse->max_freq = freq; @@ -940,7 +940,7 @@ static int cpr_corner_init(struct cpr_drv *drv) if (apply_scaling) { freq_diff = fuse->max_freq - corner->freq; - freq_diff_mhz = freq_diff / 1000000; + freq_diff_mhz = (u32)div_u64(freq_diff, 1000000); corner->quot_adjust = scaling * freq_diff_mhz / 1000; corner->uV = cpr_interpolate(corner, step_volt, fdata);