From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Markus Mayer <mmayer@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM STB
AVS TMON DRIVER), Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Amit Kucheria <amit.kucheria@verdurent.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
linux-pm@vger.kernel.org (open list:BROADCOM STB AVS TMON DRIVER),
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND
FLATTENED DEVICE TREE BINDINGS),
linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM
BCM7XXX ARM ARCHITECTURE)
Subject: [PATCH 2/6] thermal: brcmstb_thermal: Prepare to support a different process
Date: Wed, 30 Oct 2019 11:21:28 -0700 [thread overview]
Message-ID: <20191030182132.25763-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20191030182132.25763-1-f.fainelli@gmail.com>
The driver is currently assuming that it is operating with a 28nm
process chip, which has a specific formula to convert temperature to a
code and vice versa. Update the code to support providing two key
values: offset and multiplier to derive the correct formulas.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/thermal/broadcom/brcmstb_thermal.c | 49 +++++++++++++++++-----
1 file changed, 38 insertions(+), 11 deletions(-)
diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
index 42482af0422e..2ad4eeb79f9c 100644
--- a/drivers/thermal/broadcom/brcmstb_thermal.c
+++ b/drivers/thermal/broadcom/brcmstb_thermal.c
@@ -93,17 +93,27 @@ static struct avs_tmon_trip avs_tmon_trips[] = {
},
};
+struct brcmstb_thermal_params {
+ unsigned int offset;
+ unsigned int mult;
+};
+
struct brcmstb_thermal_priv {
void __iomem *tmon_base;
struct device *dev;
struct thermal_zone_device *thermal;
+ /* Process specific thermal parameters used for calculations */
+ struct brcmstb_thermal_params temp_params;
};
/* Convert a HW code to a temperature reading (millidegree celsius) */
-static inline int avs_tmon_code_to_temp(struct thermal_zone_device *tz,
+static inline int avs_tmon_code_to_temp(struct brcmstb_thermal_priv *priv,
u32 code)
{
- return (410040 - (int)((code & 0x3FF) * 487));
+ int offset = priv->temp_params.offset;
+ int mult = priv->temp_params.mult;
+
+ return (offset - (int)((code & 0x3FF) * mult));
}
/*
@@ -112,19 +122,22 @@ static inline int avs_tmon_code_to_temp(struct thermal_zone_device *tz,
* @temp: temperature to convert
* @low: if true, round toward the low side
*/
-static inline u32 avs_tmon_temp_to_code(struct thermal_zone_device *tz,
+static inline u32 avs_tmon_temp_to_code(struct brcmstb_thermal_priv *priv,
int temp, bool low)
{
+ int offset = priv->temp_params.offset;
+ int mult = priv->temp_params.mult;
+
if (temp < -88161)
return 0x3FF; /* Maximum code value */
- if (temp >= 410040)
+ if (temp >= offset)
return 0; /* Minimum code value */
if (low)
- return (u32)(DIV_ROUND_UP(410040 - temp, 487));
+ return (u32)(DIV_ROUND_UP(offset - temp, mult));
else
- return (u32)((410040 - temp) / 487);
+ return (u32)((offset - temp) / mult);
}
static int brcmstb_get_temp(void *data, int *temp)
@@ -142,7 +155,7 @@ static int brcmstb_get_temp(void *data, int *temp)
val = (val & AVS_TMON_STATUS_data_msk) >> AVS_TMON_STATUS_data_shift;
- t = avs_tmon_code_to_temp(priv->thermal, val);
+ t = avs_tmon_code_to_temp(priv, val);
if (t < 0)
*temp = 0;
else
@@ -176,7 +189,7 @@ static int avs_tmon_get_trip_temp(struct brcmstb_thermal_priv *priv,
val &= trip->reg_msk;
val >>= trip->reg_shift;
- return avs_tmon_code_to_temp(priv->thermal, val);
+ return avs_tmon_code_to_temp(priv, val);
}
static void avs_tmon_set_trip_temp(struct brcmstb_thermal_priv *priv,
@@ -189,7 +202,7 @@ static void avs_tmon_set_trip_temp(struct brcmstb_thermal_priv *priv,
dev_dbg(priv->dev, "set temp %d to %d\n", type, temp);
/* round toward low temp for the low interrupt */
- val = avs_tmon_temp_to_code(priv->thermal, temp,
+ val = avs_tmon_temp_to_code(priv, temp,
type == TMON_TRIP_TYPE_LOW);
val <<= trip->reg_shift;
@@ -206,7 +219,7 @@ static int avs_tmon_get_intr_temp(struct brcmstb_thermal_priv *priv)
u32 val;
val = __raw_readl(priv->tmon_base + AVS_TMON_TEMP_INT_CODE);
- return avs_tmon_code_to_temp(priv->thermal, val);
+ return avs_tmon_code_to_temp(priv, val);
}
static irqreturn_t brcmstb_tmon_irq_thread(int irq, void *data)
@@ -270,19 +283,32 @@ static const struct thermal_zone_of_device_ops of_ops = {
.set_trips = brcmstb_set_trips,
};
+static const struct brcmstb_thermal_params brcmstb_28nm_params = {
+ .offset = 410040,
+ .mult = 487,
+};
+
static const struct of_device_id brcmstb_thermal_id_table[] = {
- { .compatible = "brcm,avs-tmon" },
+ { .compatible = "brcm,avs-tmon", .data = &brcmstb_28nm_params },
{},
};
MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table);
static int brcmstb_thermal_probe(struct platform_device *pdev)
{
+ const struct brcmstb_thermal_params *params;
+ const struct of_device_id *of_id = NULL;
struct thermal_zone_device *thermal;
struct brcmstb_thermal_priv *priv;
struct resource *res;
int irq, ret;
+ of_id = of_match_node(brcmstb_thermal_id_table, pdev->dev.of_node);
+ if (!of_id || !of_id->data)
+ return -EINVAL;
+
+ params = of_id->data;
+
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -292,6 +318,7 @@ static int brcmstb_thermal_probe(struct platform_device *pdev)
if (IS_ERR(priv->tmon_base))
return PTR_ERR(priv->tmon_base);
+ memcpy(&priv->temp_params, params, sizeof(priv->temp_params));
priv->dev = &pdev->dev;
platform_set_drvdata(pdev, priv);
--
2.17.1
next prev parent reply other threads:[~2019-10-30 18:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 18:21 [PATCH 0/6] brcmstb_thermal updates for new processes Florian Fainelli
2019-10-30 18:21 ` [PATCH 1/6] thermal: brcmstb_thermal: Do not use DT coefficients Florian Fainelli
2019-12-04 8:41 ` Amit Kucheria
2019-12-04 17:41 ` Florian Fainelli
2019-12-04 19:01 ` Amit Kucheria
2019-10-30 18:21 ` Florian Fainelli [this message]
2019-10-30 18:21 ` [PATCH 3/6] dt-bindings: thermal: Define BCM7216 thermal sensor compatible Florian Fainelli
2019-11-06 3:55 ` Rob Herring
2019-10-30 18:21 ` [PATCH 4/6] thermal: brcmstb_thermal: Add 16nm process thermal parameters Florian Fainelli
2019-12-04 8:43 ` Amit Kucheria
2019-10-30 18:21 ` [PATCH 5/6] thermal: brcmstb_thermal: Restructure interrupt registration Florian Fainelli
2019-12-04 9:38 ` Amit Kucheria
2019-10-30 18:21 ` [PATCH 6/6] thermal: brcmstb_thermal: Register different ops per process Florian Fainelli
2019-12-04 9:38 ` Amit Kucheria
2019-11-20 18:43 ` [PATCH 0/6] brcmstb_thermal updates for new processes Florian Fainelli
2019-12-04 4:50 ` Florian Fainelli
2019-12-09 9:04 ` Daniel Lezcano
2019-12-09 17:36 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191030182132.25763-3-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=amit.kucheria@verdurent.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mmayer@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).