From patchwork Sun May 17 10:46:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manaf Meethalavalappu Pallikunhi X-Patchwork-Id: 11554113 X-Patchwork-Delegate: daniel.lezcano@linaro.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B592C912 for ; Sun, 17 May 2020 10:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92BD0207D3 for ; Sun, 17 May 2020 10:47:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="fQwAEijT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727926AbgEQKrR (ORCPT ); Sun, 17 May 2020 06:47:17 -0400 Received: from mail26.static.mailgun.info ([104.130.122.26]:64667 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727900AbgEQKrR (ORCPT ); Sun, 17 May 2020 06:47:17 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1589712436; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=5IVWxnx716uDF3iMrCsIn2VtmXUpvy7lYX+w/DP2E+0=; b=fQwAEijTa/q7CiDrI0hiMjHDF4DcjgFJrufkUmhIXum7Q4cFQww1Th5nnYpR047/2QbIdi08 1+v8XgLU0d3tx11xHsv1mTGDR/95pE2Gr01eL7HDoicgj3KvNnv4MKTxrH/YbaYF6CC75AIM 4HrnbJYTLcZFImQsx48YpzRUJ5E= X-Mailgun-Sending-Ip: 104.130.122.26 X-Mailgun-Sid: WyI5ZDFmMiIsICJsaW51eC1wbUB2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5ec11631.7ff978765ae8-smtp-out-n05; Sun, 17 May 2020 10:47:13 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 8AF64C43637; Sun, 17 May 2020 10:47:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=ham autolearn_force=no version=3.4.0 Received: from codeaurora.org (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: manafm) by smtp.codeaurora.org (Postfix) with ESMTPSA id D7178C433F2; Sun, 17 May 2020 10:47:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D7178C433F2 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=manafm@codeaurora.org From: Manaf Meethalavalappu Pallikunhi To: Amit Kucheria , Andy Gross , Bjorn Andersson , Zhang Rui , Daniel Lezcano , Rob Herring Cc: linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Manaf Meethalavalappu Pallikunhi Subject: [PATCH v2 1/2] drivers: thermal: tsens: Add zeroc interrupt support Date: Sun, 17 May 2020 16:16:26 +0530 Message-Id: <20200517104627.29501-2-manafm@codeaurora.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517104627.29501-1-manafm@codeaurora.org> References: <20200517104627.29501-1-manafm@codeaurora.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org TSENS IP v2.6+ adds zeroc interrupt support. It triggers set interrupt when aggregated minimum temperature of all TSENS falls below zeroc preset threshold and triggers reset interrupt when aggregated minimum temperature of all TSENS crosses above reset threshold. Add support for this interrupt in the driver. It adds another sensor to the of-thermal along with all individual TSENS. It enables to add any mitigation for zeroc interrupt. Signed-off-by: Manaf Meethalavalappu Pallikunhi --- drivers/thermal/qcom/tsens-v2.c | 5 ++ drivers/thermal/qcom/tsens.c | 107 +++++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.h | 10 +++ 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index b293ed32174b..8f30b859ab22 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -23,6 +23,7 @@ #define TM_Sn_UPPER_LOWER_THRESHOLD_OFF 0x0020 #define TM_Sn_CRITICAL_THRESHOLD_OFF 0x0060 #define TM_Sn_STATUS_OFF 0x00a0 +#define TM_ZEROC_INT_STATUS_OFF 0x00e0 #define TM_TRDY_OFF 0x00e4 #define TM_WDOG_LOG_OFF 0x013c @@ -86,6 +87,9 @@ static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { REG_FIELD_FOR_EACH_SENSOR16(CRITICAL_STATUS, TM_Sn_STATUS_OFF, 19, 19), REG_FIELD_FOR_EACH_SENSOR16(MAX_STATUS, TM_Sn_STATUS_OFF, 20, 20), + /* ZEROC INTERRUPT STATUS */ + [ZEROC_STATUS] = REG_FIELD(TM_ZEROC_INT_STATUS_OFF, 0, 0), + /* TRDY: 1=ready, 0=in progress */ [TRDY] = REG_FIELD(TM_TRDY_OFF, 0, 0), }; @@ -93,6 +97,7 @@ static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { static const struct tsens_ops ops_generic_v2 = { .init = init_common, .get_temp = get_temp_tsens_valid, + .get_zeroc_status = get_tsens_zeroc_status, }; struct tsens_plat_data data_tsens_v2 = { diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 8d3e94d2a9ed..dd0172f05eb6 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -205,7 +205,8 @@ static void tsens_set_interrupt_v1(struct tsens_priv *priv, u32 hw_id, index = LOW_INT_CLEAR_0 + hw_id; break; case CRITICAL: - /* No critical interrupts before v2 */ + case ZEROC: + /* No critical and zeroc interrupts before v2 */ return; } regmap_field_write(priv->rf[index], enable ? 0 : 1); @@ -236,6 +237,9 @@ static void tsens_set_interrupt_v2(struct tsens_priv *priv, u32 hw_id, index_mask = CRIT_INT_MASK_0 + hw_id; index_clear = CRIT_INT_CLEAR_0 + hw_id; break; + case ZEROC: + /* Nothing to handle for zeroc interrupt */ + return; } if (enable) { @@ -367,6 +371,35 @@ static inline u32 masked_irq(u32 hw_id, u32 mask, enum tsens_ver ver) return 0; } +/** + * tsens_zeroc_irq_thread - Threaded interrupt handler for zeroc interrupt + * @irq: irq number + * @data: tsens controller private data + * + * Whenever interrupt triggers notify thermal framework using + * thermal_zone_device_update(). + * + * Return: IRQ_HANDLED + */ + +irqreturn_t tsens_zeroc_irq_thread(int irq, void *data) +{ + struct tsens_priv *priv = data; + struct tsens_sensor *s = &priv->sensor[priv->num_sensors]; + int temp, ret; + + ret = regmap_field_read(priv->rf[ZEROC_STATUS], &temp); + if (ret) + return ret; + + dev_dbg(priv->dev, "[%u] %s: zeroc interrupt is %s\n", + s->hw_id, __func__, temp ? "triggered" : "cleared"); + + thermal_zone_device_update(s->tzd, THERMAL_EVENT_UNSPECIFIED); + + return IRQ_HANDLED; +} + /** * tsens_critical_irq_thread() - Threaded handler for critical interrupts * @irq: irq number @@ -575,6 +608,20 @@ void tsens_disable_irq(struct tsens_priv *priv) regmap_field_write(priv->rf[INT_EN], 0); } +int get_tsens_zeroc_status(const struct tsens_sensor *s, int *temp) +{ + struct tsens_priv *priv = s->priv; + int last_temp = 0, ret; + + ret = regmap_field_read(priv->rf[ZEROC_STATUS], &last_temp); + if (ret) + return ret; + + *temp = last_temp; + + return 0; +} + int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp) { struct tsens_priv *priv = s->priv; @@ -843,6 +890,19 @@ int __init init_common(struct tsens_priv *priv) regmap_field_write(priv->rf[CC_MON_MASK], 1); } + if (tsens_version(priv) > VER_1_X && ver_minor > 5) { + /* ZEROC interrupt is present only on v2.6+ */ + priv->feat->zeroc_int = 1; + priv->rf[ZEROC_STATUS] = devm_regmap_field_alloc( + dev, + priv->tm_map, + priv->fields[ZEROC_STATUS]); + if (IS_ERR(priv->rf[ZEROC_STATUS])) { + ret = PTR_ERR(priv->rf[ZEROC_STATUS]); + goto err_put_device; + } + } + spin_lock_init(&priv->ul_lock); tsens_enable_irq(priv); tsens_debug_init(op); @@ -852,6 +912,17 @@ int __init init_common(struct tsens_priv *priv) return ret; } +static int tsens_zeroc_get_temp(void *data, int *temp) +{ + struct tsens_sensor *s = data; + struct tsens_priv *priv = s->priv; + + if (priv->ops->get_zeroc_status) + return priv->ops->get_zeroc_status(s, temp); + + return -ENOTSUPP; +} + static int tsens_get_temp(void *data, int *temp) { struct tsens_sensor *s = data; @@ -923,6 +994,10 @@ static const struct thermal_zone_of_device_ops tsens_of_ops = { .set_trips = tsens_set_trips, }; +static const struct thermal_zone_of_device_ops tsens_zeroc_of_ops = { + .get_temp = tsens_zeroc_get_temp, +}; + static int tsens_register_irq(struct tsens_priv *priv, char *irqname, irq_handler_t thread_fn) { @@ -980,6 +1055,21 @@ static int tsens_register(struct tsens_priv *priv) ret = tsens_register_irq(priv, "critical", tsens_critical_irq_thread); + if (priv->feat->zeroc_int && priv->zeroc_en) { + priv->sensor[priv->num_sensors].priv = priv; + tzd = devm_thermal_zone_of_sensor_register(priv->dev, + priv->sensor[priv->num_sensors].hw_id, + &priv->sensor[priv->num_sensors], + &tsens_zeroc_of_ops); + if (IS_ERR(tzd)) { + ret = 0; + return ret; + } + + priv->sensor[priv->num_sensors].tzd = tzd; + ret = tsens_register_irq(priv, "zeroc", tsens_zeroc_irq_thread); + } + return ret; } @@ -992,6 +1082,7 @@ static int tsens_probe(struct platform_device *pdev) const struct tsens_plat_data *data; const struct of_device_id *id; u32 num_sensors; + bool zeroc_en = false; if (pdev->dev.of_node) dev = &pdev->dev; @@ -1016,6 +1107,12 @@ static int tsens_probe(struct platform_device *pdev) return -EINVAL; } + /* Check whether zeroc interrupt is enabled or not */ + if (platform_get_irq_byname(pdev, "zeroc") > 0) { + zeroc_en = true; + num_sensors++; + } + priv = devm_kzalloc(dev, struct_size(priv, sensor, num_sensors), GFP_KERNEL); @@ -1023,7 +1120,7 @@ static int tsens_probe(struct platform_device *pdev) return -ENOMEM; priv->dev = dev; - priv->num_sensors = num_sensors; + priv->num_sensors = zeroc_en ? num_sensors - 1 : num_sensors; priv->ops = data->ops; for (i = 0; i < priv->num_sensors; i++) { if (data->hw_ids) @@ -1031,6 +1128,12 @@ static int tsens_probe(struct platform_device *pdev) else priv->sensor[i].hw_id = i; } + + if (zeroc_en) { + priv->zeroc_en = zeroc_en; + priv->sensor[num_sensors].hw_id = data->feat->max_sensors; + } + priv->feat = data->feat; priv->fields = data->fields; diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index 59d01162c66a..34d24332b320 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -34,6 +34,7 @@ enum tsens_irq_type { LOWER, UPPER, CRITICAL, + ZEROC, }; /** @@ -64,6 +65,7 @@ struct tsens_sensor { * @suspend: Function to suspend the tsens device * @resume: Function to resume the tsens device * @get_trend: Function to get the thermal/temp trend + * @get_zeroc_status: Function to get the zeroc interrupt status */ struct tsens_ops { /* mandatory callbacks */ @@ -76,6 +78,7 @@ struct tsens_ops { int (*suspend)(struct tsens_priv *priv); int (*resume)(struct tsens_priv *priv); int (*get_trend)(struct tsens_sensor *s, enum thermal_trend *trend); + int (*get_zeroc_status)(const struct tsens_sensor *s, int *temp); }; #define REG_FIELD_FOR_EACH_SENSOR11(_name, _offset, _startbit, _stopbit) \ @@ -485,6 +488,8 @@ enum regfield_ids { MAX_STATUS_14, MAX_STATUS_15, + ZEROC_STATUS, /* ZEROC INTERRUPT status */ + /* Keep last */ MAX_REGFIELDS }; @@ -497,6 +502,7 @@ enum regfield_ids { * @srot_split: does the IP neatly splits the register space into SROT and TM, * with SROT only being available to secure boot firmware? * @has_watchdog: does this IP support watchdog functionality? + * @zeroc_int: does this IP support ZEROC interrupt ? * @max_sensors: maximum sensors supported by this version of the IP */ struct tsens_features { @@ -505,6 +511,7 @@ struct tsens_features { unsigned int adc:1; unsigned int srot_split:1; unsigned int has_watchdog:1; + unsigned int zeroc_int:1; unsigned int max_sensors; }; @@ -549,6 +556,7 @@ struct tsens_context { * @feat: features of the IP * @fields: bitfield locations * @ops: pointer to list of callbacks supported by this device + * @zeroc_en: variable to check zeroc interrupt sensor is enabled or not * @debug_root: pointer to debugfs dentry for all tsens * @debug: pointer to debugfs dentry for tsens controller * @sensor: list of sensors attached to this device @@ -568,6 +576,7 @@ struct tsens_priv { struct tsens_features *feat; const struct reg_field *fields; const struct tsens_ops *ops; + bool zeroc_en; struct dentry *debug_root; struct dentry *debug; @@ -580,6 +589,7 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mo int init_common(struct tsens_priv *priv); int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp); int get_temp_common(const struct tsens_sensor *s, int *temp); +int get_tsens_zeroc_status(const struct tsens_sensor *s, int *temp); /* TSENS target */ extern struct tsens_plat_data data_8960; From patchwork Sun May 17 10:46:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manaf Meethalavalappu Pallikunhi X-Patchwork-Id: 11554117 X-Patchwork-Delegate: daniel.lezcano@linaro.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24170618 for ; Sun, 17 May 2020 10:47:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09F16207D4 for ; Sun, 17 May 2020 10:47:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="OcifvWB5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727954AbgEQKr1 (ORCPT ); Sun, 17 May 2020 06:47:27 -0400 Received: from mail27.static.mailgun.info ([104.130.122.27]:35881 "EHLO mail27.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727943AbgEQKr1 (ORCPT ); Sun, 17 May 2020 06:47:27 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1589712446; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=q9iI9zh/lVW9wi2kuh1erK872V+tOBI5Kri0nX3QX1U=; b=OcifvWB5ZBt4Imo9Kw8k77itlEYztx2TPo+ZZSPhlUVqs3xVBuSWkHyJF3dkTD2uEKSWLBS/ IZ0UxYGkgipcWXjpDdTwPsCX53/ljEq4idpYq7tHC6Ds0hO5KMlBFKIubUQAh+XhF0DoZspP WFaIE/aFvCswW7N/DOpAAHOGWHw= X-Mailgun-Sending-Ip: 104.130.122.27 X-Mailgun-Sid: WyI5ZDFmMiIsICJsaW51eC1wbUB2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5ec1163e.7f453b6a4e30-smtp-out-n05; Sun, 17 May 2020 10:47:26 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 527B6C4478C; Sun, 17 May 2020 10:47:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from codeaurora.org (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: manafm) by smtp.codeaurora.org (Postfix) with ESMTPSA id A30F1C44791; Sun, 17 May 2020 10:47:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A30F1C44791 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=manafm@codeaurora.org From: Manaf Meethalavalappu Pallikunhi To: Amit Kucheria , Andy Gross , Bjorn Andersson , Zhang Rui , Daniel Lezcano , Rob Herring Cc: linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Manaf Meethalavalappu Pallikunhi Subject: [PATCH v2 2/2] dt-bindings: thermal: tsens: Add zeroc interrupt support in yaml Date: Sun, 17 May 2020 16:16:27 +0530 Message-Id: <20200517104627.29501-3-manafm@codeaurora.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517104627.29501-1-manafm@codeaurora.org> References: <20200517104627.29501-1-manafm@codeaurora.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add zeroc interrupt support for tsens in yaml. Signed-off-by: Manaf Meethalavalappu Pallikunhi Reviewed-by: Rob Herring --- .../bindings/thermal/qcom-tsens.yaml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml index 2ddd39d96766..717b0dd967e2 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml @@ -52,12 +52,14 @@ properties: items: - description: Combined interrupt if upper or lower threshold crossed - description: Interrupt if critical threshold crossed + - description: Interrupt if zeroC threshold is crossed interrupt-names: minItems: 1 items: - const: uplow - const: critical + - const: zeroc nvmem-cells: minItems: 1 @@ -109,8 +111,10 @@ allOf: properties: interrupts: minItems: 2 + maxItems: 3 interrupt-names: minItems: 2 + maxItems: 3 required: - compatible @@ -174,4 +178,21 @@ examples: #qcom,sensors = <13>; #thermal-sensor-cells = <1>; }; + + - | + #include + // Example 4 (for any platform containing v2.6+ of the TSENS IP): + tsens4: thermal-sensor@c265000 { + compatible = "qcom,sc7180-tsens", "qcom,tsens-v2"; + reg = <0xc265000 0x1ff>, + <0xc223000 0x1ff>; + + interrupts = , + , + ; + interrupt-names = "uplow", "critical", "zeroc"; + + #qcom,sensors = <15>; + #thermal-sensor-cells = <1>; + }; ...