From nobody Sun Nov 24 06:30:44 2024 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 0B552212D2F; Thu, 7 Nov 2024 14:08:37 +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=1730988520; cv=none; b=hJIBqfKtP9xjVuskeP0/zgYIiKXXKKSsU+l5gSAxZT6kBtkglGENjDrLV1/e+RltMJoEg2eCaxvcGwwcW8MqqJOvomv6x9tQlcZSXw7sIYw8pOvSTm51U/5A/N7c0ib7BNveE30B8ynbRIhf8YN0/+/xWWCuLBECvKEoUMgAtvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730988520; c=relaxed/simple; bh=0MAfuig6G4lSuH8whziOmDuFyzpGoDEf0CQU/xKGzTU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X/IOAHeAS4YCKRwTcywcw5fQyk5neHg+kUOoj5/tdvr9MieWawrIEAGQJV6dFGLTok7PfxcpxGdv/J68CQL7XO19Vouzd0WfISskcxeqaIX+1b9Uy0Rb6ikPZIDqEOAnKtTPZ0PVwjJvZwJlnBIBLf3f1ysk+kw6yThAtGQqKZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=Ce4qzXAZ; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="Ce4qzXAZ" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A76ojvl013219; Thu, 7 Nov 2024 14:06:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Q6gj5ksXsCYm4nqe/F/3e6MAUuhdMPFkBu4PdTuajpU=; b=Ce4qzXAZMo/GqrXm 2qk/8Ms7VW7tCGCy9noWFSL/tPG0dxM16saHfkBIa8ilCFlbyyF0mV9ml09Sq5wz VfMuwksg2ETEhCQJz6/HHgbUwLRDBWQxbwOmOJoErRbLQjjvbWqzHN/kOpOmg/dq C4wdsSCp+xb5d0n0A6Xm+UkLvirPnGZYslz2otuVM9wfA/5q9AgPFDrs7tj+LDPl Qx1caYuF+mqWNdxy/Kb6rNehoTGmFa/DMjiT3TlQN3SycMZbg0qRGI0dDluzoIdR HiEtYOXsYO06r5oA9+k6AwR6Y+LwvvXjuv53gEw4pK+crQN+yQDKXKxA0L58oLVz 14s7GA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 42qp2rxgxp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 07 Nov 2024 14:06:26 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 4A7E6PqU011562 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 7 Nov 2024 14:06:25 GMT Received: from hu-mmanikan-blr.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 7 Nov 2024 06:06:20 -0800 From: Manikanta Mylavarapu To: , , , , , , , , , , , , , , , CC: , Subject: [PATCH v7 3/7] thermal/drivers/tsens: Add TSENS enable and calibration support for V2 Date: Thu, 7 Nov 2024 19:35:46 +0530 Message-ID: <20241107140550.3260859-4-quic_mmanikan@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107140550.3260859-1-quic_mmanikan@quicinc.com> References: <20241107140550.3260859-1-quic_mmanikan@quicinc.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-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: sYefHWelo9K42z47z87afOS9DhKk9VUF X-Proofpoint-ORIG-GUID: sYefHWelo9K42z47z87afOS9DhKk9VUF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 bulkscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 mlxscore=0 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411070110 Content-Type: text/plain; charset="utf-8" From: Praveenkumar I SoCs without RPM need to enable sensors and calibrate them from the kernel. The IPQ5332 and IPQ5424 use the tsens v2.3.3 IP and do not have RPM. Therefore, add a new calibration function for V2, as the tsens.c calib function only supports V1. Also add new feature_config, ops and data for IPQ5332, IPQ5424. Although the TSENS IP supports 16 sensors, not all are used. The hw_id is used to enable the relevant sensors. Signed-off-by: Praveenkumar I Signed-off-by: Manikanta Mylavarapu --- Changes in V7: - Move val calculation out of switch-case and assign default values to shift, slope and czero and then change them under switch-case in tsens_v2_calibrate_sensor(). drivers/thermal/qcom/tsens-v2.c | 176 ++++++++++++++++++++++++++++++++ drivers/thermal/qcom/tsens.c | 8 +- drivers/thermal/qcom/tsens.h | 4 +- 3 files changed, 186 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v= 2.c index 0cb7301eca6e..6d2783577139 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -4,13 +4,32 @@ * Copyright (c) 2018, Linaro Limited */ =20 +#include #include #include +#include #include "tsens.h" =20 /* ----- SROT ------ */ #define SROT_HW_VER_OFF 0x0000 #define SROT_CTRL_OFF 0x0004 +#define SROT_MEASURE_PERIOD 0x0008 +#define SROT_Sn_CONVERSION 0x0060 +#define V2_SHIFT_DEFAULT 0x0003 +#define V2_SLOPE_DEFAULT 0x0cd0 +#define V2_CZERO_DEFAULT 0x016a +#define ONE_PT_SLOPE 0x0cd0 +#define TWO_PT_SHIFTED_GAIN 921600 +#define ONE_PT_CZERO_CONST 94 +#define SW_RST_DEASSERT 0x0 +#define SW_RST_ASSERT 0x1 +#define MEASURE_PERIOD_2mSEC 0x1 +#define RSEULT_FORMAT_TEMP 0x1 +#define TSENS_ENABLE 0x1 +#define SENSOR_CONVERSION(n) (((n) * 4) + SROT_Sn_CONVERSION) +#define CONVERSION_SHIFT_MASK GENMASK(24, 23) +#define CONVERSION_SLOPE_MASK GENMASK(22, 10) +#define CONVERSION_CZERO_MASK GENMASK(9, 0) =20 /* ----- TM ------ */ #define TM_INT_EN_OFF 0x0004 @@ -50,6 +69,17 @@ static struct tsens_features ipq8074_feat =3D { .trip_max_temp =3D 204000, }; =20 +static struct tsens_features ipq5332_feat =3D { + .ver_major =3D VER_2_X_NO_RPM, + .crit_int =3D 1, + .combo_int =3D 1, + .adc =3D 0, + .srot_split =3D 1, + .max_sensors =3D 16, + .trip_min_temp =3D 0, + .trip_max_temp =3D 204000, +}; + static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] =3D { /* ----- SROT ------ */ /* VERSION */ @@ -59,6 +89,10 @@ static const struct reg_field tsens_v2_regfields[MAX_REG= FIELDS] =3D { /* CTRL_OFF */ [TSENS_EN] =3D REG_FIELD(SROT_CTRL_OFF, 0, 0), [TSENS_SW_RST] =3D REG_FIELD(SROT_CTRL_OFF, 1, 1), + [SENSOR_EN] =3D REG_FIELD(SROT_CTRL_OFF, 3, 18), + [CODE_OR_TEMP] =3D REG_FIELD(SROT_CTRL_OFF, 21, 21), + + [MAIN_MEASURE_PERIOD] =3D REG_FIELD(SROT_MEASURE_PERIOD, 0, 7), =20 /* ----- TM ------ */ /* INTERRUPT ENABLE */ @@ -104,6 +138,126 @@ static const struct reg_field tsens_v2_regfields[MAX_= REGFIELDS] =3D { [TRDY] =3D REG_FIELD(TM_TRDY_OFF, 0, 0), }; =20 +static int tsens_v2_calibrate_sensor(struct device *dev, struct tsens_sens= or *sensor, + struct regmap *map, u32 mode, u32 base0, u32 base1) +{ + u32 shift =3D V2_SHIFT_DEFAULT; + u32 slope =3D V2_SLOPE_DEFAULT, czero =3D V2_CZERO_DEFAULT, val; + char name[8]; + int ret; + + /* Read offset value */ + ret =3D snprintf(name, sizeof(name), "s%d", sensor->hw_id); + if (ret < 0) + return ret; + + ret =3D nvmem_cell_read_variable_le_u32(dev, name, &sensor->offset); + if (ret) + return ret; + + /* Based on calib mode, program SHIFT, SLOPE and CZERO */ + switch (mode) { + case TWO_PT_CALIB: + slope =3D (TWO_PT_SHIFTED_GAIN / (base1 - base0)); + + czero =3D (base0 + sensor->offset - ((base1 - base0) / 3)); + + fallthrough; + case ONE_PT_CALIB2: + czero =3D base0 + sensor->offset - ONE_PT_CZERO_CONST; + + slope =3D ONE_PT_SLOPE; + + break; + default: + dev_dbg(dev, "calibrationless mode\n"); + } + + val =3D FIELD_PREP(CONVERSION_SHIFT_MASK, shift) | + FIELD_PREP(CONVERSION_SLOPE_MASK, slope) | + FIELD_PREP(CONVERSION_CZERO_MASK, czero); + + regmap_write(map, SENSOR_CONVERSION(sensor->hw_id), val); + + return 0; +} + +static int tsens_v2_calibration(struct tsens_priv *priv) +{ + struct device *dev =3D priv->dev; + u32 mode, base0, base1; + int i, ret; + + if (priv->num_sensors > MAX_SENSORS) + return -EINVAL; + + ret =3D nvmem_cell_read_variable_le_u32(priv->dev, "mode", &mode); + if (ret =3D=3D -ENOENT) + dev_warn(priv->dev, "Calibration data not present in DT\n"); + if (ret < 0) + return ret; + + dev_dbg(priv->dev, "calibration mode is %d\n", mode); + + ret =3D nvmem_cell_read_variable_le_u32(priv->dev, "base0", &base0); + if (ret < 0) + return ret; + + ret =3D nvmem_cell_read_variable_le_u32(priv->dev, "base1", &base1); + if (ret < 0) + return ret; + + /* Calibrate each sensor */ + for (i =3D 0; i < priv->num_sensors; i++) { + ret =3D tsens_v2_calibrate_sensor(dev, &priv->sensor[i], priv->srot_map, + mode, base0, base1); + if (ret < 0) + return ret; + } + + return 0; +} + +static int __init init_tsens_v2_no_rpm(struct tsens_priv *priv) +{ + struct device *dev =3D priv->dev; + int i, ret; + u32 val =3D 0; + + ret =3D init_common(priv); + if (ret < 0) + return ret; + + priv->rf[CODE_OR_TEMP] =3D devm_regmap_field_alloc(dev, priv->srot_map, + priv->fields[CODE_OR_TEMP]); + if (IS_ERR(priv->rf[CODE_OR_TEMP])) + return PTR_ERR(priv->rf[CODE_OR_TEMP]); + + priv->rf[MAIN_MEASURE_PERIOD] =3D devm_regmap_field_alloc(dev, priv->srot= _map, + priv->fields[MAIN_MEASURE_PERIOD]); + if (IS_ERR(priv->rf[MAIN_MEASURE_PERIOD])) + return PTR_ERR(priv->rf[MAIN_MEASURE_PERIOD]); + + regmap_field_write(priv->rf[TSENS_SW_RST], SW_RST_ASSERT); + + regmap_field_write(priv->rf[MAIN_MEASURE_PERIOD], MEASURE_PERIOD_2mSEC); + + /* Enable available sensors */ + for (i =3D 0; i < priv->num_sensors; i++) + val |=3D 1 << priv->sensor[i].hw_id; + + regmap_field_write(priv->rf[SENSOR_EN], val); + + /* Select temperature format, unit is deci-Celsius */ + regmap_field_write(priv->rf[CODE_OR_TEMP], RSEULT_FORMAT_TEMP); + + regmap_field_write(priv->rf[TSENS_SW_RST], SW_RST_DEASSERT); + + regmap_field_write(priv->rf[TSENS_EN], TSENS_ENABLE); + + return 0; +} + static const struct tsens_ops ops_generic_v2 =3D { .init =3D init_common, .get_temp =3D get_temp_tsens_valid, @@ -122,6 +276,28 @@ struct tsens_plat_data data_ipq8074 =3D { .fields =3D tsens_v2_regfields, }; =20 +static const struct tsens_ops ops_ipq5332 =3D { + .init =3D init_tsens_v2_no_rpm, + .get_temp =3D get_temp_tsens_valid, + .calibrate =3D tsens_v2_calibration, +}; + +struct tsens_plat_data data_ipq5332 =3D { + .num_sensors =3D 5, + .ops =3D &ops_ipq5332, + .hw_ids =3D (unsigned int []){11, 12, 13, 14, 15}, + .feat =3D &ipq5332_feat, + .fields =3D tsens_v2_regfields, +}; + +struct tsens_plat_data data_ipq5424 =3D { + .num_sensors =3D 7, + .ops =3D &ops_ipq5332, + .hw_ids =3D (unsigned int []){9, 10, 11, 12, 13, 14, 15}, + .feat =3D &ipq5332_feat, + .fields =3D tsens_v2_regfields, +}; + /* Kept around for backward compatibility with old msm8996.dtsi */ struct tsens_plat_data data_8996 =3D { .num_sensors =3D 13, diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 0b4421bf4785..c5409225756f 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -975,7 +975,7 @@ int __init init_common(struct tsens_priv *priv) ret =3D regmap_field_read(priv->rf[TSENS_EN], &enabled); if (ret) goto err_put_device; - if (!enabled) { + if (!enabled && (tsens_version(priv) !=3D VER_2_X_NO_RPM)) { dev_err(dev, "%s: device not enabled\n", __func__); ret =3D -ENODEV; goto err_put_device; @@ -1102,6 +1102,12 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend= , tsens_resume); =20 static const struct of_device_id tsens_table[] =3D { { + .compatible =3D "qcom,ipq5332-tsens", + .data =3D &data_ipq5332, + }, { + .compatible =3D "qcom,ipq5424-tsens", + .data =3D &data_ipq5424, + }, { .compatible =3D "qcom,ipq8064-tsens", .data =3D &data_8960, }, { diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index cab39de045b1..ac5358e48f74 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -35,6 +35,7 @@ enum tsens_ver { VER_0_1, VER_1_X, VER_2_X, + VER_2_X_NO_RPM, }; =20 enum tsens_irq_type { @@ -168,6 +169,7 @@ enum regfield_ids { TSENS_SW_RST, SENSOR_EN, CODE_OR_TEMP, + MAIN_MEASURE_PERIOD, =20 /* ----- TM ------ */ /* TRDY */ @@ -650,6 +652,6 @@ extern struct tsens_plat_data data_8226, data_8909, dat= a_8916, data_8939, data_8 extern struct tsens_plat_data data_tsens_v1, data_8976, data_8956; =20 /* TSENS v2 targets */ -extern struct tsens_plat_data data_8996, data_ipq8074, data_tsens_v2; +extern struct tsens_plat_data data_8996, data_ipq8074, data_ipq5332, data_= ipq5424, data_tsens_v2; =20 #endif /* __QCOM_TSENS_H__ */ --=20 2.34.1