From patchwork Fri Jun 20 00:19:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anjelique Melendez X-Patchwork-Id: 898217 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FD25101F2 for ; Fri, 20 Jun 2025 00:19:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750378768; cv=none; b=VePHs4gywAW+pOq/sB+y0ngQywnKXAE2YgJCIgMhiPojPnfgsrikGLex9T7E+IYe94lcTH7VXktxLRg4L62rWF4Rt/YQF8M9EbF5g1x6LgWmK/lhq7bpECP6me9ebzhUFRmpdTMiUvVmLZouB2lxXAnKME4fQl3e3YBVvhLz1Z4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750378768; c=relaxed/simple; bh=+8OY4JoTHqGyG6xiUsqBMtWQ8oXuUcdTUK2QrI1nLas=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FPLJxaFfoiuBHq7MnwRj6lolSZW/EqJuGtQx7yYoILR72rGVCZrE2hf4QYNQLtH52a2DYqGkGIHC/bwp2VT3HUs3iJgLwuzrQ1c1ykejoms+fgfrqrZlG1mtSOIy7MBjlbEPQqlTz3HTmO2JCqB0f3lwd5AIWWl26n0gfNolW50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=RKt6/DxS; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="RKt6/DxS" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55JDF8uM010256 for ; Fri, 20 Jun 2025 00:19:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Jah2XjONJNu kYJbz0qo+k7o+HZ8jA3wmQBqbppH0WT4=; b=RKt6/DxSLzXSkyRK89r0qPIp7B1 9+ZKUsaLRnCx1/dvEfsApGlXPkI0Iab0wkOjI2r5hUF2B+b0giL/h4zpIPEs0J71 wsjF2Gly4GeioP3OnjpavABoOYY7Nk6AEl5zKcspsje/SGF90g0DclFbGYMxp+xB gZvEoeqhUuO6A5+v1sTOKUVcnWKmiuwJmaqh59N8LzEBS9YkZFLH2AcMTdKFW1vq oOuANsCh8ayt1TaYQh6zcIOAhGSAOLJuW+/aNH3r86NcCWCKD8Dxl/0Gz3gziY7f MMw02J2UJy2BDg1eKqsV3aHRcMlTWnDLetn6CHthAmeVkzSElfFTm0lTLxA== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4791f7hfdx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 20 Jun 2025 00:19:25 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748fd21468cso907532b3a.1 for ; Thu, 19 Jun 2025 17:19:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750378765; x=1750983565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jah2XjONJNukYJbz0qo+k7o+HZ8jA3wmQBqbppH0WT4=; b=ura+d9Cp/omO9Z6qIuoWo90P7lqXBal9T7G43AQxoAyVqYZM/UuGX2yzGjTeEBJV9j WLF46P8G2VNWINI7nzCVoiEUQAYdIwpNre8Ho9Wt/tklqo9EJi7t2OOk3SWYt8qbpSMh iAVfF8Hl19pRTQQcbR4w/5uuWElKhQsWlR2dClNZYagX289Udrk0lPNBJhOmzwlRRkUr AH/7ID3+bPy4QDL8eUDpuquebCfaCk2MOyn7u0KimGB2eImGThcxL0mDiFqMc34O+leT rbzyS/Q2nT/E6ZtTkDzBXFvadqOBjckkzbFGKP7bixhk4Cd7YpmHDT04mj6kC1Aw54tY KvnQ== X-Forwarded-Encrypted: i=1; AJvYcCUO503aZwbIaS2espJNIlGmgMbH87QTMjMdBkVbWq5yOSyz7zmdEPS87pdv8Fd+Hp/t6a7ZiGsTMQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yw811IWLzI3ZQbePg6Pit7lGJNEpY9gJCVN3CQffAu6lEGFdhGs Tn02St+1PXDwwys1fLEEyrCtWUPISVx9FDKype/oQR9H56AuwHj2j/Lidn3aahr4+ET9SpPseJa /Z83neQOvLi6luswbleJuQYpGmxFBj/1ZGGqLWLg+Eb+Xh637AbMIoITkXwZgGA== X-Gm-Gg: ASbGnctzorj1QNUOMlFrEXmTtWPNWfvnt1pY6sA2dEZIYsbb2mkAMQBZ581hR2BcYjR g03Cit+aGeFOrpyZ09fvyOaQIuSJxAUSILBXXD18FvvwQFa+i+rGLSIDhCvOYSGpFwq6vi77XTc QGaq6N06hFaVe9Txzg+ytnNic/MGWvXtXvtTxcwub9YO0Riyf7rehTrt2zY5Fv97yuumshyXVJj 79TklGsL51246FKul+zw/QD0iKw6mP6t+4I0NnXjMlbywcWzthJ+EcDZT9+kX87+/MaTYBMc4GC yyUdMMB7pALNvC8STHJYpvHAzYbo7GkN/jc+n4Jw3OwMhi4Xv59DGZSBYejysjbIsgg6iQ0v7iC U/P1W82sonQ== X-Received: by 2002:a05:6a20:7f8a:b0:220:eef:e8f0 with SMTP id adf61e73a8af0-22026e479cdmr1424577637.23.1750378764622; Thu, 19 Jun 2025 17:19:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAzfGf+Jh3u0unIl4HMJbDQqUuijAI+3iHof4/otrzhv6Y/3OKh17h4Zj6kml5UzCfd9Bv4g== X-Received: by 2002:a05:6a20:7f8a:b0:220:eef:e8f0 with SMTP id adf61e73a8af0-22026e479cdmr1424537637.23.1750378764215; Thu, 19 Jun 2025 17:19:24 -0700 (PDT) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b31f1258932sm410011a12.64.2025.06.19.17.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 17:19:23 -0700 (PDT) From: Anjelique Melendez To: amitk@kernel.org, thara.gopinath@gmail.com, rafael@kernel.org, daniel.lezcano@linaro.org Cc: rui.zhang@intel.com, lukasz.luba@arm.com, david.collins@oss.qualcomm.com, stefan.schmidt@linaro.org, quic_tsoni@quicinc.com, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.baryshkov@linaro.org, dmitry.baryshkov@oss.qualcomm.com Subject: [PATCH v5 3/5] thermal: qcom-spmi-temp-alarm: Prepare to support additional Temp Alarm subtypes Date: Thu, 19 Jun 2025 17:19:16 -0700 Message-Id: <20250620001918.4090853-4-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250620001918.4090853-1-anjelique.melendez@oss.qualcomm.com> References: <20250620001918.4090853-1-anjelique.melendez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjIwMDAwMCBTYWx0ZWRfX3jM860OMHj6V myeowXNCqAE1Kq6aBHXO793dx3zu+a3jLSpRYI2ugKb3/1FXgiVmty9BXxPuqVM1cx/rDcnyIix 2qtgBLcW0VBNRKFhF2I+IHEso/kqj9kaN2fRSLOt1VPgvvtqYKCD1ifDqJi99ofp2aprBWcur3O i2WfXmN3/bAlmm6ddU9nwrDT4jtv+co45zPq6uQ8YChpOz5/Np2EuiLupndUA0Th+oAzMANW6DP /IP4VX+EICYTF0QaIK9eTmJfadCoQc/2ay4Bk01TyE4Ic99O2zq3sN7rQAEQiFQB3dm1Hv9VayY Ckl4GvM/S1cjleaZbXRHpSskkiFOUG3zNZUyZL7C6dzGwrdwL9gjCtYoQ6JZVAhkZUEp8Mvcslk +WCc7OL39v/5k36/czAAG1OryBwR7PMgPjaTc7H1bXJOZaQV1LnR6NtHVFZHx2nLha8LWAh5 X-Proofpoint-GUID: 3RVdWTo8S6uLTcBK8SYGeXZJps5Gp4Oq X-Proofpoint-ORIG-GUID: 3RVdWTo8S6uLTcBK8SYGeXZJps5Gp4Oq X-Authority-Analysis: v=2.4 cv=FrIF/3rq c=1 sm=1 tr=0 ts=6854a90d cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=VcnGJyyLPHPoHGOjSs8A:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-19_08,2025-06-18_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 impostorscore=0 malwarescore=0 phishscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506200000 In preparation to support newer temp alarm subtypes, add the "ops", "sync_thresholds" and "configure_trip_temps" references to spmi_temp_alarm_data. This will allow for each Temp Alarm subtype to define its own thermal_zone_device_ops and properly initialize and configure thermal trip temperature. Signed-off-by: Anjelique Melendez --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 96 ++++++++++++++------- 1 file changed, 67 insertions(+), 29 deletions(-) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c index fdabde39a7e5..5991067d3484 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -71,8 +71,11 @@ static const long temp_map_gen2_v1[THRESH_COUNT][STAGE_COUNT] = { struct qpnp_tm_chip; struct spmi_temp_alarm_data { + const struct thermal_zone_device_ops *ops; const long (*temp_map)[THRESH_COUNT][STAGE_COUNT]; + int (*sync_thresholds)(struct qpnp_tm_chip *chip); int (*get_temp_stage)(struct qpnp_tm_chip *chip); + int (*configure_trip_temps)(struct qpnp_tm_chip *chip); }; struct qpnp_tm_chip { @@ -310,64 +313,97 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data) return IRQ_HANDLED; } +/* Read the hardware default stage threshold temperatures */ +static int qpnp_tm_sync_thresholds(struct qpnp_tm_chip *chip) +{ + u8 reg, threshold; + int ret; + + ret = qpnp_tm_read(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, ®); + if (ret < 0) + return ret; + + threshold = reg & SHUTDOWN_CTRL1_THRESHOLD_MASK; + memcpy(chip->temp_thresh_map, chip->data->temp_map[threshold], + sizeof(chip->temp_thresh_map)); + + return ret; +} + +static int qpnp_tm_configure_trip_temp(struct qpnp_tm_chip *chip) +{ + int crit_temp, ret; + + ret = thermal_zone_get_crit_temp(chip->tz_dev, &crit_temp); + if (ret) + crit_temp = THERMAL_TEMP_INVALID; + + mutex_lock(&chip->lock); + ret = qpnp_tm_update_critical_trip_temp(chip, crit_temp); + mutex_unlock(&chip->lock); + + return ret; +} + static const struct spmi_temp_alarm_data spmi_temp_alarm_data = { + .ops = &qpnp_tm_sensor_ops, .temp_map = &temp_map_gen1, + .sync_thresholds = qpnp_tm_sync_thresholds, + .configure_trip_temps = qpnp_tm_configure_trip_temp, .get_temp_stage = qpnp_tm_gen1_get_temp_stage, }; static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_data = { + .ops = &qpnp_tm_sensor_ops, .temp_map = &temp_map_gen1, + .sync_thresholds = qpnp_tm_sync_thresholds, + .configure_trip_temps = qpnp_tm_configure_trip_temp, .get_temp_stage = qpnp_tm_gen2_get_temp_stage, }; static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_rev1_data = { + .ops = &qpnp_tm_sensor_ops, .temp_map = &temp_map_gen2_v1, + .sync_thresholds = qpnp_tm_sync_thresholds, + .configure_trip_temps = qpnp_tm_configure_trip_temp, .get_temp_stage = qpnp_tm_gen2_get_temp_stage, }; /* - * This function initializes the internal temp value based on only the - * current thermal stage and threshold. Setup threshold control and - * disable shutdown override. + * This function intializes the internal temp value based on only the + * current thermal stage and threshold. */ -static int qpnp_tm_init(struct qpnp_tm_chip *chip) +static int qpnp_tm_threshold_init(struct qpnp_tm_chip *chip) { - int crit_temp; - u8 threshold; - u8 reg = 0; int ret; - mutex_lock(&chip->lock); - - ret = qpnp_tm_read(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, ®); + ret = chip->data->sync_thresholds(chip); if (ret < 0) - goto out; - - threshold = reg & SHUTDOWN_CTRL1_THRESHOLD_MASK; - memcpy(chip->temp_thresh_map, chip->data->temp_map[threshold], - sizeof(chip->temp_thresh_map)); - - chip->temp = DEFAULT_TEMP; + return ret; ret = chip->data->get_temp_stage(chip); if (ret < 0) - goto out; + return ret; chip->stage = ret; + chip->temp = DEFAULT_TEMP; if (chip->stage) chip->temp = qpnp_tm_decode_temp(chip, chip->stage); - mutex_unlock(&chip->lock); - - ret = thermal_zone_get_crit_temp(chip->tz_dev, &crit_temp); - if (ret) - crit_temp = THERMAL_TEMP_INVALID; + return ret; +} - mutex_lock(&chip->lock); +/* + * This function intalizes threshold control and disables shutdown override. + */ +static int qpnp_tm_init(struct qpnp_tm_chip *chip) +{ + int ret; + u8 reg = 0; - ret = qpnp_tm_update_critical_trip_temp(chip, crit_temp); + ret = chip->data->configure_trip_temps(chip); if (ret < 0) - goto out; + return ret; /* Enable the thermal alarm PMIC module in always-on mode. */ reg = ALARM_CTRL_FORCE_ENABLE; @@ -375,8 +411,6 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) chip->initialized = true; -out: - mutex_unlock(&chip->lock); return ret; } @@ -476,13 +510,17 @@ static int qpnp_tm_probe(struct platform_device *pdev) } } + ret = qpnp_tm_threshold_init(chip); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, "threshold init failed\n"); + /* * Register the sensor before initializing the hardware to be able to * read the trip points. get_temp() returns the default temperature * before the hardware initialization is completed. */ chip->tz_dev = devm_thermal_of_zone_register( - &pdev->dev, 0, chip, &qpnp_tm_sensor_ops); + &pdev->dev, 0, chip, chip->data->ops); if (IS_ERR(chip->tz_dev)) return dev_err_probe(&pdev->dev, PTR_ERR(chip->tz_dev), "failed to register sensor\n");