From nobody Tue Oct 7 10:35:43 2025 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 BE9FD29AB16 for ; Thu, 10 Jul 2025 22:46:02 +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=1752187564; cv=none; b=Jnqo3fTQpEUoZLfip4pKD1Pu6Fa6xOpsdE9qrFpetEUIVOPZ6reF0tlMlrt+z9WNi+8GaRILVnRbIkz3OxnBQvfqmBpaERyNjbjqesm3KNYjmn02AKEnUl52kjGP8TwWhSTXamtfay4U7SUJdZvfK3qv9C0FqK8MJDptaeL2tq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752187564; c=relaxed/simple; bh=+Eoq5QK+Z4TcLAmXwts6HQBk6+27HKQ9YgXVeCWlpr0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=L3rANeY3Z+oNUSFNz+bbh1+QYAfRXxFWtAIxjaiqpGzs8MRBVZyhmgMjPDADvhKm6eJ0imDfTJ0QL74YCXYo22HVbje+JCQKdvcWKpREoJsSv7h2ZyyicMUgQSSRsdqs0B0YBss0iO/gPIchXQc+qyX4eSB/NOUB0ah561ui3+0= 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=dGiiBLMy; 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="dGiiBLMy" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AJRZZ2015055 for ; Thu, 10 Jul 2025 22:46:01 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=ZP+qUw1MC4b uspzImbL7NoA9rFA4HkK9harDxg/RzyE=; b=dGiiBLMysYQEf75s1YHzUlBcoZ0 Ahx9uSNit08dpuYoGtX2B5fTHUpH5mdGScGfIkYP9VFfzndIEWvfPofJvXDIX/3U 2ezlkr0j+DFpIoeyhZYmmmc5ZPxpxInjq3ClEamHGIj2dcd8CscY6OXO4NVn+SAH KH+htdXSUQ6PEdUVm8C1tWBw8a0zRcVpUFqbC2ZYgeE4eqV0ZjipcskfDDhcZ9DZ vL7gxMBO004FWSai4Mr/58TXQATtWCVixI125hKaBZe+asWhswJAi2ikEz4d44g4 5bnpen+sO93p3STozS0QRfJsddHcviCloXzNaPsRZB2TRyvH+lvJUpJab/w== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47pucna2t1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 10 Jul 2025 22:46:01 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-235f77f86f6so14153985ad.2 for ; Thu, 10 Jul 2025 15:46:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752187560; x=1752792360; 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=ZP+qUw1MC4buspzImbL7NoA9rFA4HkK9harDxg/RzyE=; b=Oz0ZHX15eaWlWomQVNvcgunxnWdAksycLCcapwVepvbUwdpJmf/20mN9ABkcwFmbP+ y31vj1l16/QoMGG0FWJiiMDAWonLkElP7i4tDt1PPeyXZ8TvzsWIxwsSatUHD05+UL4K LmEozrpIc8Lb0WWJDeAf21vS0lBh33aIkQZZQTDix0nnbYh+QU0jD5sFjASAnbaXcDw3 cOadaaL0AZRoXUlUAQNg/XIY1fIketXYWn24XIsomgu5jtiTjkK2e920h1CFxZqIyDF6 QU+XpoSsMYAO1TV/yiiJt1fXTz4DN4WXqB6+XSw0WGtepVWfIrZAs0pldeNeuLW5waRJ tKQA== X-Forwarded-Encrypted: i=1; AJvYcCXbmRj0blbIASHXCP6b7jz6++fUfj04qer6WBvCO++vDrva7rUQ6TZy6JMFyHjW1mKXTOW4CXJe5mz31nk=@vger.kernel.org X-Gm-Message-State: AOJu0YyK+2/cZhyH2PusD8miH7fam1tR2FNLokxegG1xDehlWqDHCdiu I0DU7PuLmxuDSHAGTuLVP6h/3FIlZvPbK0EZgChAuKGQzubcWWmCYRVrDJPK46SIhrRXYdPo0Oi rOINmij0JoOn6/dwO3xqNpHnMAFCsa5V4qFpSPtwIL8LMhNQ3jdGLaSHUQxjhmJt2JZw= X-Gm-Gg: ASbGncu63IoDEOEZxLbQ0siiwL7uZuRwA/FNjwL9Qv5pxQ95i5WWn6DWRG9hfSFWaNP AOvDgHwVWB6qFFTcxoKY+aoSyIyS82h5FycYQIQ/SIVIHuwCOkFwFcIgom5Vy3FB2tExdsz2A9F VI7ifdv00f5gni/S29VCddItFU4E6x4IRMFFO1JBd26SP6ITgpwmP7As40ZSxpG9QffMMIAy9H7 eyXbu62ELtPNNab0ekc4p0F2xKAyx2IE5W6+2+WupYSrFWlzoIJw0eX4BrcMKymRIaEMXLKf6A9 a7BgFa4G3NvVVxiCK6eEtbptqkmbJReojOa6EKwG0vv4ttvesUoeT3nXmTzmTzOdNjVGKGTEy+d Zz6kPS9n6+OmCNSug5GKzgP+hXfM= X-Received: by 2002:a17:903:1a0b:b0:23d:ed96:e2b6 with SMTP id d9443c01a7336-23dee2a09c6mr11931745ad.44.1752187559957; Thu, 10 Jul 2025 15:45:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkENv3EZgXL2V0Tg8YXKutWmikxrgBnK5ws65xd+qPdGWLFXphAye7Sp98D4bIpTFjAkWfGg== X-Received: by 2002:a17:903:1a0b:b0:23d:ed96:e2b6 with SMTP id d9443c01a7336-23dee2a09c6mr11931395ad.44.1752187559492; Thu, 10 Jul 2025 15:45:59 -0700 (PDT) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23de4341d51sm30479615ad.189.2025.07.10.15.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 15:45:58 -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, konrad.dybcio@oss.qualcomm.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 v6 2/5] thermal: qcom-spmi-temp-alarm: Add temp alarm data struct based on HW subtype Date: Thu, 10 Jul 2025 15:45:52 -0700 Message-Id: <20250710224555.3047790-3-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250710224555.3047790-1-anjelique.melendez@oss.qualcomm.com> References: <20250710224555.3047790-1-anjelique.melendez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=GdQXnRXL c=1 sm=1 tr=0 ts=687042a9 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=3gcoFgraK96GEOzUlygA:9 a=1OuFwYUASf3TG4hYMiVC:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: ycs4vAJWYFru_Zj63w2yciT9eYKzRlFB X-Proofpoint-ORIG-GUID: ycs4vAJWYFru_Zj63w2yciT9eYKzRlFB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDE5MSBTYWx0ZWRfX+10I9bWOdVMF ZMFOK9fQRGYtoPPXZffatuZ6gmejNT17j8zzBY9/cpAhzKoZHNQfSuWVQWQOQFZypYyBRXATam4 6PoK7ad/RGNIiJgTXfRMRwpUEdI6msO90BKAf/tyWX/HtcA25c1iHcNAr4jYgODUVzYXDfIEXa0 xtnhDe3qfrkCFxCiY9qXL5LmLV48A+GrcWG178RCaHFYf2KHZ11WOwQ6P/RXyY3LPy0y4HKhyuT 9qc2HvYH0DhL9Av7rHO2h4fpKYfwJaVx5kacFZpwOfMz/trSn6C4l6xYXLn1pIWAfhsjplCqB6l lDH+IoA8UracdXbIkTMfckh8KRUrKC1mPsBbYQ5xkvk+aQeOtl9Or0jVJA5ea0DFHFGhP2RKMcS sfJrTPlSqXTy41+TCrS7W7CX1UEVMGPng8L7BS844d9nFhula+HuqIhkUxkVl+TusccB2Utq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_05,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 adultscore=0 bulkscore=0 clxscore=1015 spamscore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 malwarescore=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-2507100191 Content-Type: text/plain; charset="utf-8" Currently multiple if/else statements are used in functions to decipher between SPMI temp alarm Gen 1, Gen 2 and Gen 2 Rev 1 functionality. Instead refactor the driver so that SPMI temp alarm chips will have reference to a spmi_temp_alarm_data struct which defines data and function callbacks based on the HW subtype. Signed-off-by: Anjelique Melendez Reviewed-by: Dmitry Baryshkov --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 135 +++++++++++++------- 1 file changed, 88 insertions(+), 47 deletions(-) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/= qcom/qcom-spmi-temp-alarm.c index 4b91cc13ce34..607838162c7d 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -4,6 +4,7 @@ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ =20 +#include #include #include #include @@ -31,7 +32,6 @@ =20 #define STATUS_GEN1_STAGE_MASK GENMASK(1, 0) #define STATUS_GEN2_STATE_MASK GENMASK(6, 4) -#define STATUS_GEN2_STATE_SHIFT 4 =20 #define SHUTDOWN_CTRL1_OVERRIDE_STAGE2 BIT(6) #define SHUTDOWN_CTRL1_THRESHOLD_MASK GENMASK(1, 0) @@ -43,6 +43,12 @@ #define THRESH_COUNT 4 #define STAGE_COUNT 3 =20 +enum overtemp_stage { + STAGE1 =3D 0, + STAGE2, + STAGE3, +}; + /* Over-temperature trip point values in mC */ static const long temp_map_gen1[THRESH_COUNT][STAGE_COUNT] =3D { { 105000, 125000, 145000 }, @@ -68,22 +74,29 @@ static const long temp_map_gen2_v1[THRESH_COUNT][STAGE_= COUNT] =3D { /* Temperature in Milli Celsius reported during stage 0 if no ADC is prese= nt */ #define DEFAULT_TEMP 37000 =20 +struct qpnp_tm_chip; + +struct spmi_temp_alarm_data { + const long (*temp_map)[THRESH_COUNT][STAGE_COUNT]; + int (*get_temp_stage)(struct qpnp_tm_chip *chip); +}; + struct qpnp_tm_chip { struct regmap *map; struct device *dev; struct thermal_zone_device *tz_dev; + const struct spmi_temp_alarm_data *data; unsigned int subtype; long temp; - unsigned int thresh; unsigned int stage; unsigned int base; /* protects .thresh, .stage and chip registers */ struct mutex lock; bool initialized; bool require_stage2_shutdown; + long temp_thresh_map[STAGE_COUNT]; =20 struct iio_channel *adc; - const long (*temp_map)[THRESH_COUNT][STAGE_COUNT]; }; =20 /* This array maps from GEN2 alarm state to GEN1 alarm stage */ @@ -117,34 +130,48 @@ static int qpnp_tm_write(struct qpnp_tm_chip *chip, u= 16 addr, u8 data) */ static long qpnp_tm_decode_temp(struct qpnp_tm_chip *chip, unsigned int st= age) { - if (!chip->temp_map || chip->thresh >=3D THRESH_COUNT || stage =3D=3D 0 || - stage > STAGE_COUNT) + if (stage =3D=3D 0 || stage > STAGE_COUNT) return 0; =20 - return (*chip->temp_map)[chip->thresh][stage - 1]; + return chip->temp_thresh_map[stage - 1]; } =20 /** - * qpnp_tm_get_temp_stage() - return over-temperature stage + * qpnp_tm_gen1_get_temp_stage() - return over-temperature stage * @chip: Pointer to the qpnp_tm chip * - * Return: stage (GEN1) or state (GEN2) on success, or errno on failure. + * Return: stage on success, or errno on failure. */ -static int qpnp_tm_get_temp_stage(struct qpnp_tm_chip *chip) +static int qpnp_tm_gen1_get_temp_stage(struct qpnp_tm_chip *chip) { int ret; - u8 reg =3D 0; + u8 reg; =20 ret =3D qpnp_tm_read(chip, QPNP_TM_REG_STATUS, ®); if (ret < 0) return ret; =20 - if (chip->subtype =3D=3D QPNP_TM_SUBTYPE_GEN1) - ret =3D reg & STATUS_GEN1_STAGE_MASK; - else - ret =3D (reg & STATUS_GEN2_STATE_MASK) >> STATUS_GEN2_STATE_SHIFT; + return FIELD_GET(STATUS_GEN1_STAGE_MASK, reg); +} =20 - return ret; +/** + * qpnp_tm_gen2_get_temp_stage() - return over-temperature stage + * @chip: Pointer to the qpnp_tm chip + * + * Return: stage on success, or errno on failure. + */ +static int qpnp_tm_gen2_get_temp_stage(struct qpnp_tm_chip *chip) +{ + int ret; + u8 reg; + + ret =3D qpnp_tm_read(chip, QPNP_TM_REG_STATUS, ®); + if (ret < 0) + return ret; + + ret =3D FIELD_GET(STATUS_GEN2_STATE_MASK, reg); + + return alarm_state_map[ret]; } =20 /* @@ -153,23 +180,16 @@ static int qpnp_tm_get_temp_stage(struct qpnp_tm_chip= *chip) */ static int qpnp_tm_update_temp_no_adc(struct qpnp_tm_chip *chip) { - unsigned int stage, stage_new, stage_old; + unsigned int stage_new, stage_old; int ret; =20 WARN_ON(!mutex_is_locked(&chip->lock)); =20 - ret =3D qpnp_tm_get_temp_stage(chip); + ret =3D chip->data->get_temp_stage(chip); if (ret < 0) return ret; - stage =3D ret; - - if (chip->subtype =3D=3D QPNP_TM_SUBTYPE_GEN1) { - stage_new =3D stage; - stage_old =3D chip->stage; - } else { - stage_new =3D alarm_state_map[stage]; - stage_old =3D alarm_state_map[chip->stage]; - } + stage_new =3D ret; + stage_old =3D chip->stage; =20 if (stage_new > stage_old) { /* increasing stage, use lower bound */ @@ -181,7 +201,7 @@ static int qpnp_tm_update_temp_no_adc(struct qpnp_tm_ch= ip *chip) - TEMP_STAGE_HYSTERESIS; } =20 - chip->stage =3D stage; + chip->stage =3D stage_new; =20 return 0; } @@ -221,10 +241,10 @@ static int qpnp_tm_get_temp(struct thermal_zone_devic= e *tz, int *temp) static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, int temp) { - long stage2_threshold_min =3D (*chip->temp_map)[THRESH_MIN][1]; - long stage2_threshold_max =3D (*chip->temp_map)[THRESH_MAX][1]; + long stage2_threshold_min =3D (*chip->data->temp_map)[THRESH_MIN][STAGE2]; + long stage2_threshold_max =3D (*chip->data->temp_map)[THRESH_MAX][STAGE2]; bool disable_stage2_shutdown =3D false; - u8 reg; + u8 reg, threshold; =20 WARN_ON(!mutex_is_locked(&chip->lock)); =20 @@ -236,17 +256,17 @@ static int qpnp_tm_update_critical_trip_temp(struct q= pnp_tm_chip *chip, =20 if (temp =3D=3D THERMAL_TEMP_INVALID || temp < stage2_threshold_min) { - chip->thresh =3D THRESH_MIN; + threshold =3D THRESH_MIN; goto skip; } =20 if (temp <=3D stage2_threshold_max) { - chip->thresh =3D THRESH_MAX - + threshold =3D THRESH_MAX - ((stage2_threshold_max - temp) / TEMP_THRESH_STEP); disable_stage2_shutdown =3D true; } else { - chip->thresh =3D THRESH_MAX; + threshold =3D THRESH_MAX; =20 if (chip->adc) disable_stage2_shutdown =3D true; @@ -257,7 +277,9 @@ static int qpnp_tm_update_critical_trip_temp(struct qpn= p_tm_chip *chip, } =20 skip: - reg |=3D chip->thresh; + memcpy(chip->temp_thresh_map, chip->data->temp_map[threshold], + sizeof(chip->temp_thresh_map)); + reg |=3D threshold; if (disable_stage2_shutdown && !chip->require_stage2_shutdown) reg |=3D SHUTDOWN_CTRL1_OVERRIDE_STAGE2; =20 @@ -294,6 +316,21 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data) return IRQ_HANDLED; } =20 +static const struct spmi_temp_alarm_data spmi_temp_alarm_data =3D { + .temp_map =3D &temp_map_gen1, + .get_temp_stage =3D qpnp_tm_gen1_get_temp_stage, +}; + +static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_data =3D { + .temp_map =3D &temp_map_gen1, + .get_temp_stage =3D qpnp_tm_gen2_get_temp_stage, +}; + +static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_rev1_data = =3D { + .temp_map =3D &temp_map_gen2_v1, + .get_temp_stage =3D 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 @@ -301,10 +338,10 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data) */ static int qpnp_tm_init(struct qpnp_tm_chip *chip) { - unsigned int stage; - int ret; - u8 reg =3D 0; int crit_temp; + u8 threshold; + int ret; + u8 reg; =20 mutex_lock(&chip->lock); =20 @@ -312,19 +349,19 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) if (ret < 0) goto out; =20 - chip->thresh =3D reg & SHUTDOWN_CTRL1_THRESHOLD_MASK; + threshold =3D reg & SHUTDOWN_CTRL1_THRESHOLD_MASK; + memcpy(chip->temp_thresh_map, chip->data->temp_map[threshold], + sizeof(chip->temp_thresh_map)); + chip->temp =3D DEFAULT_TEMP; =20 - ret =3D qpnp_tm_get_temp_stage(chip); + ret =3D chip->data->get_temp_stage(chip); if (ret < 0) goto out; chip->stage =3D ret; =20 - stage =3D chip->subtype =3D=3D QPNP_TM_SUBTYPE_GEN1 - ? chip->stage : alarm_state_map[chip->stage]; - - if (stage) - chip->temp =3D qpnp_tm_decode_temp(chip, stage); + if (chip->stage) + chip->temp =3D qpnp_tm_decode_temp(chip, chip->stage); =20 mutex_unlock(&chip->lock); =20 @@ -418,10 +455,14 @@ static int qpnp_tm_probe(struct platform_device *pdev) } =20 chip->subtype =3D subtype; - if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2 && dig_major >=3D 1) - chip->temp_map =3D &temp_map_gen2_v1; + if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN1) + chip->data =3D &spmi_temp_alarm_data; + else if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2 && dig_major =3D=3D 0) + chip->data =3D &spmi_temp_alarm_gen2_data; + else if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2 && dig_major >=3D 1) + chip->data =3D &spmi_temp_alarm_gen2_rev1_data; else - chip->temp_map =3D &temp_map_gen1; + return -ENODEV; =20 if (chip->subtype =3D=3D QPNP_TM_SUBTYPE_GEN2) { dig_revision =3D (dig_major << 8) | dig_minor; --=20 2.34.1