From nobody Mon Feb 9 13:04:07 2026 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 254691A238F for ; Tue, 25 Feb 2025 19:24:34 +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=1740511476; cv=none; b=kYJgjvAxpmGbMVr1nxulPHHKuM1EpiPHjLL+5b23LX7N2mE2uZemM+W9Au+AgDGIfuIG6vvMzv/ElpNt36E+2Vkmf3foZz44GfrDxTAy7a78mXzxpPxJR6l6dzn7JB2/FIP53zC1WBvhvLZ4O8e5W06z8G1nSX8Z6tfSg6Ub6vQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740511476; c=relaxed/simple; bh=Hm34EcCZY7Nya6IWrGgD3q/+JNM1BPaGd40TDCxo+LM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZMkEFezMf8oqwEq6+ahRDuryu1xA4GcZwMIRgyXNxMUWSsgxiZV/AE9bPKrux9NBXV7jmQ1Ymoon0So3e7TUG/GHZlKz8HD+eEDPleaR3COEbNklIYREVUO9YdHWba19wDe9+96e5XilnLNYswSawJybz4TJYc7uuae7ENFx88w= 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=i/2Hb0V5; 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="i/2Hb0V5" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51P8Vf8G031945 for ; Tue, 25 Feb 2025 19:24:34 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=/E2f4sNa5dJ 1J/+u/sCAiw4E4qFHfywaLempWlQrqbI=; b=i/2Hb0V5NsEebQw9ycLIHTSSTir LYy/B4LQHWWzvwJovdpPH1ZPbJswabPUwwyl+7sxBazO506+GQ7dO5PNQnb8trb8 sH+JmgkLwJZOqejyMzqXmkuwCPzLZqrHAH1IjvzFFb5/Oqk+qxTNuOXpZUUDc/YY sAUgC8cpLJfvutBH/ayM95WhobzZ31hMDo6lyfhYh3sIv4wB6MCW2ts88bwuxpm7 gYQP79x3PHLRM3/mcnNwI/lhEPs8KNBedQTZ2Hwb5iNPIVggIEt5kUfidNyuDXP5 kcs0y20/1jScOEKNal3ygbpW2T+iqDTS4CX9jFWsaJ3chKlIA7JM8qOgP6g== 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 44y6nu20xy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 25 Feb 2025 19:24:33 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-220bf94cb40so92022835ad.0 for ; Tue, 25 Feb 2025 11:24:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740511472; x=1741116272; 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=/E2f4sNa5dJ1J/+u/sCAiw4E4qFHfywaLempWlQrqbI=; b=BTclYtao3sCP1uTe3i+/3OyRlWMo9VLRxSxpiVU3CGkrm+UiQXDkLL7fl9lcXfNiPH h6u6uvhci3fWS0Pl4DeebLp4ukJe9Cjg6oer6+miJ0YP3wXZ3AFUoyCm+wHc3LEQ7kb2 KlUyTaiYVmbzTJ2NU2+R3xElDK+4C+GJuQIcWCsBU3NL3j2KNMpzhjtEexeQvpJGEkUg RJiw507ZM+JV0Bw8JU/ZFIxnBCbVV/980Bw+O5IEs1/0kfIKwlDvTcAwOTCUmruhV32j 9uVehDDhx8xnFWqOY8xFdYBLWomlYya+55glfDN4otEz7f5C9E6AwFqh8KCeyPg7bWbf LbnA== X-Forwarded-Encrypted: i=1; AJvYcCVrvO1TfRH/ZcnWlXf+8IynGhF6OVG4JLsxjCvc5eQVaVZGkAuVXG6uEJ3blRu8D6ZFh6zK/Q89quz0S6k=@vger.kernel.org X-Gm-Message-State: AOJu0YybTtZjCXg1Vp1HAE96W05tRLqiFt06mBAfKSL7oUlDuv1aldlY +ZQgZL29R5/dgW+848tkJJckc/iaYwrkti09deB+uRpru+H+bhL8ZFMgoZjfH2546BNg9XIEdhz LbIZ1/VDfKmSWhkqVw0SuT0I/+msmutKnxxyt76gHTiyfOLU/E3MC/yewZ4D+MVg= X-Gm-Gg: ASbGnctMoy/6qq7ak2M27rf39KU9QsIZF1kLkwijaQj9hQK4Tc+QO8M9ucBcl3iF2U/ qZRr9/LnZBG8BozgDGbbj2T5jwsIdII9/26G1EGSazZuvw/mDfbsHXFYP+PXcjLTNeoDoeoJIU9 8OsNcRLk8QpSHIWEn1LHjVSrsTOpX9sFojpSUJYgy++2XdUTNbBFsesMn7ZbAM4a05Wfo9XF9o1 seimqJJ5KxX9ZP7z+iimMiYmscUhxXL9Knctp4OsqZ1NQZnTvqKNqXs6OQA52qFS5qAVf+3r32I wrdQAhlwPgpGSHS+MSpQsnjcMeOQxzwFeb8ytWKrW8wbnppXAZo16AxNR8uBe/QwGbf0BhHRMIE TUhY= X-Received: by 2002:a17:902:dac5:b0:21f:8453:7484 with SMTP id d9443c01a7336-223200b52d7mr8785255ad.30.1740511472430; Tue, 25 Feb 2025 11:24:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEwO0S/qaA8GgdupCwxJV5nNfNSkXN4bBXv7CbFQ0sqjA3BJOLCmca6dKdj/Eghvry9gvymw== X-Received: by 2002:a17:902:dac5:b0:21f:8453:7484 with SMTP id d9443c01a7336-223200b52d7mr8784895ad.30.1740511472007; Tue, 25 Feb 2025 11:24:32 -0800 (PST) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a095865sm17915365ad.145.2025.02.25.11.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 11:24:31 -0800 (PST) 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, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] thermal: qcom-spmi-temp-alarm: enable stage 2 shutdown when required Date: Tue, 25 Feb 2025 11:24:25 -0800 Message-Id: <20250225192429.2328092-2-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225192429.2328092-1-anjelique.melendez@oss.qualcomm.com> References: <20250225192429.2328092-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-Proofpoint-ORIG-GUID: bqi8-UcdaPM-Fv6Y_8a_3muYbkbA1vc9 X-Proofpoint-GUID: bqi8-UcdaPM-Fv6Y_8a_3muYbkbA1vc9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_06,2025-02-25_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2502250120 Content-Type: text/plain; charset="utf-8" From: David Collins Certain TEMP_ALARM GEN2 PMIC peripherals need over-temperature stage 2 automatic PMIC partial shutdown to be enabled in order to avoid repeated faults in the event of reaching over-temperature stage 3. Modify the stage 2 shutdown control logic to ensure that stage 2 shutdown is enabled on all affected PMICs. Read the digital major and minor revision registers to identify these PMICs. Signed-off-by: David Collins Signed-off-by: Anjelique Melendez --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 32 +++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/= qcom/qcom-spmi-temp-alarm.c index c2d59cbfaea9..b2077ff9fe73 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2011-2015, 2017, 2020, The Linux Foundation. All rights r= eserved. + * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserve= d. */ =20 #include @@ -16,6 +17,7 @@ =20 #include "../thermal_hwmon.h" =20 +#define QPNP_TM_REG_DIG_MINOR 0x00 #define QPNP_TM_REG_DIG_MAJOR 0x01 #define QPNP_TM_REG_TYPE 0x04 #define QPNP_TM_REG_SUBTYPE 0x05 @@ -71,6 +73,7 @@ struct qpnp_tm_chip { struct device *dev; struct thermal_zone_device *tz_dev; unsigned int subtype; + unsigned int dig_revision; long temp; unsigned int thresh; unsigned int stage; @@ -78,6 +81,7 @@ struct qpnp_tm_chip { /* protects .thresh, .stage and chip registers */ struct mutex lock; bool initialized; + bool require_s2_shutdown; =20 struct iio_channel *adc; const long (*temp_map)[THRESH_COUNT][STAGE_COUNT]; @@ -255,7 +259,7 @@ static int qpnp_tm_update_critical_trip_temp(struct qpn= p_tm_chip *chip, =20 skip: reg |=3D chip->thresh; - if (disable_s2_shutdown) + if (disable_s2_shutdown && !chip->require_s2_shutdown) reg |=3D SHUTDOWN_CTRL1_OVERRIDE_S2; =20 return qpnp_tm_write(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, reg); @@ -350,7 +354,7 @@ static int qpnp_tm_probe(struct platform_device *pdev) { struct qpnp_tm_chip *chip; struct device_node *node; - u8 type, subtype, dig_major; + u8 type, subtype, dig_major, dig_minor; u32 res; int ret, irq; =20 @@ -403,6 +407,30 @@ static int qpnp_tm_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, ret, "could not read dig_major\n"); =20 + ret =3D qpnp_tm_read(chip, QPNP_TM_REG_DIG_MINOR, &dig_minor); + if (ret < 0) { + dev_err(&pdev->dev, "could not read dig_minor\n"); + return ret; + } + + chip->dig_revision =3D (dig_major << 8) | dig_minor; + + if (chip->subtype =3D=3D QPNP_TM_SUBTYPE_GEN2) { + /* + * Check if stage 2 automatic partial shutdown must remain + * enabled to avoid potential repeated faults upon reaching + * over-temperature stage 3. + */ + switch (chip->dig_revision) { + case 0x0001: + case 0x0002: + case 0x0100: + case 0x0101: + chip->require_s2_shutdown =3D true; + break; + } + } + if (type !=3D QPNP_TM_TYPE || (subtype !=3D QPNP_TM_SUBTYPE_GEN1 && subtype !=3D QPNP_TM_SUBTYPE_GEN2)) { dev_err(&pdev->dev, "invalid type 0x%02x or subtype 0x%02x\n", --=20 2.34.1 From nobody Mon Feb 9 13:04:07 2026 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 5377C20E70D for ; Tue, 25 Feb 2025 19:24:46 +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=1740511488; cv=none; b=NazjSBjLUQd8LO0KSZhAvXqUSHZALXi1nxc/Rr80tLeK5tvWePEM1KKBPdrAnco5PdB4L3BOZcCfyCX82RhdSRWgugjC/g3jv4hYcX98GGjdaUwPO6e0qwL1jiqNydxT26YLFlJBGhRRjciDZCW8Tedvj0SUx0LsC9z4fk2FUF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740511488; c=relaxed/simple; bh=16cb+1NORKIaQVLKBujy43BYn4/BrzsfyuaV882E/qk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PmzQxp+jXQCY+8wWzORveVzhSTcF+5AJ8Ax5PLQNqjDZF0a8GYkTcMKXPkoQNqyXnBeKN5/XWkMeluN5GQptpDS3NY2DPvOySmPXqkdX68w3sWDYei97UmZgi6XKN1Ro5ILPGqKaYV/q2afkxJ2RcBKMNZ7ddyZ7bono9QNIlS0= 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=PZLPyKoN; 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="PZLPyKoN" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51PH8NcE031835 for ; Tue, 25 Feb 2025 19:24:46 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=LcoRWvJbflo ytDZRCtlhUjdEvFcCP891bnOPZ84hFdk=; b=PZLPyKoNX9mTllm/s2kCiP5+2lS kRTnEkSl7RzUewbHp8DKa4JSD8LWzhtFAv/LWW6zopSO4WbG9KLYMuaB0ax65XBN skYEJchG4EhDXa77KlYQdHp5Vy5J18sKi2gRERXDS/OM6JwUKF/WOcpEcdYcRXjQ Yzuvhv+LOW77pFiJPZXgDAuJ/27judkgRFjM2o7o3oTR/t4qgzH8rdleafZq0myd 4BgjN9JpSnbU9wZMva8sxBoF/oS7TW5dRmEzd6G3iwe0GS0m0Tbs1jYQurp462Yk cecSyFbANpaZd5v3a1hBXu86yTGyP0iCIBBJJiZ6ePcZ2vp0EcrFxwYyTLQ== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44y6nu20yw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 25 Feb 2025 19:24:45 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2210305535bso197958195ad.1 for ; Tue, 25 Feb 2025 11:24:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740511484; x=1741116284; 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=LcoRWvJbfloytDZRCtlhUjdEvFcCP891bnOPZ84hFdk=; b=Qyl1bMkrYyuA+11N05kGMbnMVvc5cVKDNSb9l2njkJzE2N4h0GKhzT98qkf228DNYO +WByvC1pbzYvTSDw/krC2XXYe1o01xHUpKiSr81qJhmgSLLZVICo40rL86NH2p42Gn/J 1SQ4orqwmZ23ANbxEvQVsvoXCBNWeBxcDqUfnnkeAELQuSIjn1xLZYoUQFobRuH/gTEL up5QpsePpXpiZckunOrJ2mLL2cRO0krbcj/NdNy4P+cvQeLpp1vgIBKLG91yX4gQKA03 cMADD5MfK7i445M0ydi2XdYnbHxCoMgyHnv+sLEuOfmcldMYn8hG0rxGTYa/Ersfp3nI lTgg== X-Forwarded-Encrypted: i=1; AJvYcCXC+bGy1pDaX6cjjWqgWiXosUBgdLpSYqgWIx6JyM1GjZyJ0r+VuLDAyimF+sQYJ5vsHdNSZXuNEnoM3mU=@vger.kernel.org X-Gm-Message-State: AOJu0YzRQm+0QfP6bC/khY03B0e7m2HBux+pxo/X/x8sAkkk5aD9+fTj GDjMxFD8YJSVfHuRlDQSlVzDRXJGKJHlsHj3GxU4H9IkMaERbpVoW077OBuAh83LwXagZn+ZF+2 jn8s8VwgAJ4i2A2SdXDIGvA40iCKmWP0S3gnEQDtdxXSq/e+LT4OKpNLTNyK0b9A= X-Gm-Gg: ASbGnctOdbX/JXq0YwGcD/bGMCSfA+v9XY3fIGxbXaUm68sokYozmJZCauopR7UO+q8 J/tBURE+by1R1GL7mFpX0yNkWiczgp+xOkDjNvy/JT9lx8SK8V1tJiTc1F7tPx3oSrbAgPnq3iu dMHXsg9/E1rUMhTObQrEDf/qxSQze4M26OsJLBCGOVsoptWJ6SQtca53OXWH1r6KPkW6hHB5+Nz iYHaXkrGEN602me2rFBCksx3OG1IT0zFZC97AmdxmKsvTxPlUhqeWWAX5TSZvn2n1uDRvB76JWM 0IrIxuc+g2EhgG7CpkrehrPqmMkTR7AKseKB7NNjPVpWheApyxQ5yxB3QRuYPDfRogh/sFS1GDz OvEA= X-Received: by 2002:a17:902:d48e:b0:21b:d105:26b8 with SMTP id d9443c01a7336-221a0ec46c1mr260884965ad.7.1740511474022; Tue, 25 Feb 2025 11:24:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFjSOvXO38VCPu0/p19WNskPbexVkodRLpQ8MRiXPULLdKrwJIV06xJDSQSgrZ3mwZZX9ITZg== X-Received: by 2002:a17:902:d48e:b0:21b:d105:26b8 with SMTP id d9443c01a7336-221a0ec46c1mr260884405ad.7.1740511473397; Tue, 25 Feb 2025 11:24:33 -0800 (PST) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a095865sm17915365ad.145.2025.02.25.11.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 11:24:32 -0800 (PST) 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, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] thermal: qcom-spmi-temp-alarm: Add temp alarm data struct based on HW subtype Date: Tue, 25 Feb 2025 11:24:26 -0800 Message-Id: <20250225192429.2328092-3-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225192429.2328092-1-anjelique.melendez@oss.qualcomm.com> References: <20250225192429.2328092-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-Proofpoint-ORIG-GUID: G5cXT6ES7BdnhXOwBty-gDXVl2SCN2eR X-Proofpoint-GUID: G5cXT6ES7BdnhXOwBty-gDXVl2SCN2eR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_06,2025-02-25_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2502250120 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 | 103 +++++++++++++------- 1 file changed, 68 insertions(+), 35 deletions(-) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/= qcom/qcom-spmi-temp-alarm.c index b2077ff9fe73..64f5db214ed2 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) 2024, Qualcomm Innovation Center, Inc. All rights reserve= d. */ =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_S2 BIT(6) #define SHUTDOWN_CTRL1_THRESHOLD_MASK GENMASK(1, 0) @@ -68,10 +68,18 @@ 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; unsigned int dig_revision; long temp; @@ -82,9 +90,9 @@ struct qpnp_tm_chip { struct mutex lock; bool initialized; bool require_s2_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 */ @@ -118,18 +126,17 @@ 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 * @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) { @@ -140,12 +147,27 @@ static int qpnp_tm_get_temp_stage(struct qpnp_tm_chip= *chip) 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) +{ + u8 reg =3D 0; + int ret; + + 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 /* @@ -154,23 +176,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 */ @@ -182,7 +197,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; } @@ -222,8 +237,8 @@ static int qpnp_tm_get_temp(struct thermal_zone_device = *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][1]; + long stage2_threshold_max =3D (*chip->data->temp_map)[THRESH_MAX][1]; bool disable_s2_shutdown =3D false; u8 reg; =20 @@ -258,6 +273,8 @@ static int qpnp_tm_update_critical_trip_temp(struct qpn= p_tm_chip *chip, } =20 skip: + memcpy(chip->temp_thresh_map, chip->data->temp_map[chip->thresh], + sizeof(chip->temp_thresh_map)); reg |=3D chip->thresh; if (disable_s2_shutdown && !chip->require_s2_shutdown) reg |=3D SHUTDOWN_CTRL1_OVERRIDE_S2; @@ -295,6 +312,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_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 @@ -302,7 +334,6 @@ 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; @@ -316,16 +347,13 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) chip->thresh =3D reg & SHUTDOWN_CTRL1_THRESHOLD_MASK; 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 @@ -439,10 +467,15 @@ 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 1) + chip->data =3D &spmi_temp_alarm_gen2_rev1_data; + else if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2) + chip->data =3D &spmi_temp_alarm_gen2_data; else - chip->temp_map =3D &temp_map_gen1; + return -ENODEV; =20 /* * Register the sensor before initializing the hardware to be able to --=20 2.34.1 From nobody Mon Feb 9 13:04:08 2026 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 DB552204C31 for ; Tue, 25 Feb 2025 19:24: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=1740511479; cv=none; b=MBMwnItFq+9dNaQ3aAagn4//en4U2vPZ8Rpy+WeEBfnKozxjB8mD0NRH8h/OsICIPYOgZmJnybCoOejFcLUuvQ6VE8fItUBsZempoNCm5SDy4clSKRmWzYQ+Dw/HlDUwYORAY9W1Z3f1AC8ZPauDsTyMYG6iw9sJ/zGU2NAtb7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740511479; c=relaxed/simple; bh=CR26jXTg2/X5J+j12gYsUxJf8s0aAmGvG88dOmqgQl0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WXvg9Qe3XUW22WJPxzrxI8ay3Llw2yGYziktSkGgsl+/nqSzwCyvgdV2dqNYBj69rEc4DLoJDFmv0oYeaJUxbLNbeXwG5nZJunIUQ4k1PhmOPWK1vxY9ZynzmB7+0w4kTQ/RCUyJ7loUtKZOAecQiR2gywA72N8Q0zxqpNS/6Os= 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=U0QdUQWf; 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="U0QdUQWf" 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 51PIGrFw017995 for ; Tue, 25 Feb 2025 19:24:36 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=vFrC2AeMOYq 9cU1JXQAYhFEPeJ5b7DK4aDTWJYKIxLY=; b=U0QdUQWfFbsHpFN8/7ydq4xAskW 9MVxmA3KLxyuNeab/W8Vp3AQyNwWIA7RHezhUXGH/5dWWSK/qOM0t4+hru7/iACB uS/o7R+dE077+T8jSRJeikGyFu80vbUHX8DeIalznoWrG0vWjcaGFF6hSjU5Dwk4 BACIx5OseeCSfkLe/iS6mJL52uWu2ZpxIGabp4XAuhp4bNxZjBqL1+nvGULOs3v2 L3z1z9WvqfvWcQFmlU6KDpwr6Z8cgg16nFJmJlt7HQDdOU6WdKxGsS27Ih8mZQcd 7vNA3pt5G+t7dX3YK3TIozAC4OYsbCYn5/CtYbBquhwzxlWhVbiAOfvv0yQ== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44y5k6a44t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 25 Feb 2025 19:24:36 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-220ff7d7b67so116801615ad.2 for ; Tue, 25 Feb 2025 11:24:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740511475; x=1741116275; 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=vFrC2AeMOYq9cU1JXQAYhFEPeJ5b7DK4aDTWJYKIxLY=; b=ODQfjQ6s4k5N6juy9yFqpXZoo/GbpzR5Cxn9ClkrFjOEmyy1olHw8dNwm79pD+JkeR YA2GXefPWzBfE3JmRewL0kQffeH8Gc74YjvXUp1Z7N7WHnJJ7QSPE04q/dMqlEUX6ZYC DrCu3IMZd6tHVB8XHXc1b4md++QbAWjbO6EFEZjz9N6Gb8bdeliHX0tPypJYAMwK5aML oq7z8IcH00NGYaOI4/i2DHn85pf7JqxTmguj0irLx9R/r2zJHjQZ1OJa9YyYMHbFHYKB dlDYm74GRvKYTEOKBqu49IkR33kGup13sylkEV3JOW198yG3cazlNaz6OW0x0PhS/eXn UQ6Q== X-Forwarded-Encrypted: i=1; AJvYcCXFii8pFRCM5sRYv+vloXF9C2vSclBSMba4iLx84DWFiUVUpspyz5PxAOy/BrzET8yNts8ARUBB4PsIDsM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxxu5CLDM6zHtKtB0ZqGpew3lSqGAbz3odp7AQGbntFymo3NqtO LywbNwa1vPymUZ2dqRHZL8oNOwdOXxdpZ+hfB/PIkIhw8pdyynrhAXWMawD2vYDFQPe+lp8xBRA PkwdBsBoO+RDYIWW64b9Yepy/8feCphQZRxHRgo3eUgC+EuXGXO/0SOFNo10Pn6o= X-Gm-Gg: ASbGncs9cuDDOv4LfYT9n+ewvjSvG9w6feIRBVEzBqk9MSzLXkNS+VQXjArC/lSZ6KF eDkyzqmzubLia6aOlKHS7eYoIMBiXLtqJYDUc0+Vb6YZ4nMqXLeFg2qWjL1Gwa8N0hcvNI5AzGu K631Q6vM9iK6DTCWaE5Fdlal+FlOoC/hnyb3dX3H0gBDXuBOxlYt5m4lVm5RDHHuUUFE1jzOm6A YblIO9UI1jFTd3qaQ5QGzZ4DusBVPy+cs8SWC+0QFWRPd8ImrV6uXq0KBxZgq9dzDlkE+2XiIlp ExMNsqfyjde1FzuSfW8BQEB5INWTQ3YlFDBDbNo/z9Vwfc2JmzmCN4Twxwoft99BXb6CiTOfNoM aS74= X-Received: by 2002:a17:903:22c4:b0:215:a05d:fb05 with SMTP id d9443c01a7336-221a00156b6mr299296145ad.32.1740511475173; Tue, 25 Feb 2025 11:24:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8iHBDY/jv0KrOzt8rpTFt9wvVgHtIsIFt2xbZ/ZpLcLWlAYAuql65fnBU01kMxzRemdjsEQ== X-Received: by 2002:a17:903:22c4:b0:215:a05d:fb05 with SMTP id d9443c01a7336-221a00156b6mr299295765ad.32.1740511474838; Tue, 25 Feb 2025 11:24:34 -0800 (PST) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a095865sm17915365ad.145.2025.02.25.11.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 11:24:34 -0800 (PST) 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, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] thermal: qcom-spmi-temp-alarm: Prepare to support additional Temp Alarm subtypes Date: Tue, 25 Feb 2025 11:24:27 -0800 Message-Id: <20250225192429.2328092-4-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225192429.2328092-1-anjelique.melendez@oss.qualcomm.com> References: <20250225192429.2328092-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-Proofpoint-ORIG-GUID: U7X02qo5aVMkZvmuSR7aCTLUk0UX65hE X-Proofpoint-GUID: U7X02qo5aVMkZvmuSR7aCTLUk0UX65hE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_06,2025-02-25_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 suspectscore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2502250120 Content-Type: text/plain; charset="utf-8" In preparation to support newer temp alarm subtypes, add the "ops" 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 configure thermal trip temperature. Signed-off-by: Anjelique Melendez --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 38 ++++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/= qcom/qcom-spmi-temp-alarm.c index 64f5db214ed2..fbfe633441ba 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2011-2015, 2017, 2020, The Linux Foundation. All rights r= eserved. - * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserve= d. + * Copyright (c) 2024-2025, Qualcomm Innovation Center, Inc. All rights re= served. */ =20 #include @@ -71,8 +71,10 @@ static const long temp_map_gen2_v1[THRESH_COUNT][STAGE_C= OUNT] =3D { struct qpnp_tm_chip; =20 struct spmi_temp_alarm_data { + const struct thermal_zone_device_ops *ops; const long (*temp_map)[THRESH_COUNT][STAGE_COUNT]; int (*get_temp_stage)(struct qpnp_tm_chip *chip); + int (*configure_trip_temps)(struct qpnp_tm_chip *chip); }; =20 struct qpnp_tm_chip { @@ -312,18 +314,39 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data) return IRQ_HANDLED; } =20 +static int qpnp_tm_configure_trip_temp(struct qpnp_tm_chip *chip) +{ + int crit_temp, ret; + + mutex_unlock(&chip->lock); + + ret =3D thermal_zone_get_crit_temp(chip->tz_dev, &crit_temp); + if (ret) + crit_temp =3D THERMAL_TEMP_INVALID; + + mutex_lock(&chip->lock); + + return qpnp_tm_update_critical_trip_temp(chip, crit_temp); +} + static const struct spmi_temp_alarm_data spmi_temp_alarm_data =3D { + .ops =3D &qpnp_tm_sensor_ops, .temp_map =3D &temp_map_gen1, + .configure_trip_temps =3D qpnp_tm_configure_trip_temp, .get_temp_stage =3D qpnp_tm_get_temp_stage, }; =20 static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_data =3D { + .ops =3D &qpnp_tm_sensor_ops, .temp_map =3D &temp_map_gen1, + .configure_trip_temps =3D qpnp_tm_configure_trip_temp, .get_temp_stage =3D qpnp_tm_gen2_get_temp_stage, }; =20 static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_rev1_data = =3D { + .ops =3D &qpnp_tm_sensor_ops, .temp_map =3D &temp_map_gen2_v1, + .configure_trip_temps =3D qpnp_tm_configure_trip_temp, .get_temp_stage =3D qpnp_tm_gen2_get_temp_stage, }; =20 @@ -336,7 +359,6 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) { int ret; u8 reg =3D 0; - int crit_temp; =20 mutex_lock(&chip->lock); =20 @@ -355,15 +377,7 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) if (chip->stage) chip->temp =3D qpnp_tm_decode_temp(chip, chip->stage); =20 - mutex_unlock(&chip->lock); - - ret =3D thermal_zone_get_crit_temp(chip->tz_dev, &crit_temp); - if (ret) - crit_temp =3D THERMAL_TEMP_INVALID; - - mutex_lock(&chip->lock); - - ret =3D qpnp_tm_update_critical_trip_temp(chip, crit_temp); + ret =3D chip->data->configure_trip_temps(chip); if (ret < 0) goto out; =20 @@ -483,7 +497,7 @@ static int qpnp_tm_probe(struct platform_device *pdev) * before the hardware initialization is completed. */ chip->tz_dev =3D 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"); --=20 2.34.1 From nobody Mon Feb 9 13:04:08 2026 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 E2B4120C006 for ; Tue, 25 Feb 2025 19:24:38 +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=1740511480; cv=none; b=OKXkopT3iqyeChUaLMIncl/biPpBsydVU5u761fof2LxDMFKl7M2C13cDDDIc/p9GAgoalYBYCEL1UqpvShY9vtAsTHQj7FShwi5Y2j+2YdAiqgurOOMIIVFeDtzWeYvZ6W+w4yAlRO8GN/65kgBkUSnF0iT8xl6t2bx4nyN/CM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740511480; c=relaxed/simple; bh=lLwIURtKZJUGidXlT3Y8BXV8+48ulOdPve60a5sXTu8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kBTfzsmbJK98IcVvvPINKEVVrDOil3EHDdo9tRNhm+MTSHoRWdf6j6gEoQkp+O9ob84KtaCeWkSy81lP2fqp4qqZj5+OxMEFnqr3pCdHTvPC/RgoWwYFy4pJGbE0YEO27ZySdrAVyTRwfKsTbpV7uyHNgVN4oAQYphuvAgGYy80= 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=WiAtUBIZ; 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="WiAtUBIZ" 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 51PI4USn013334 for ; Tue, 25 Feb 2025 19:24:38 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=sncinBpcYxj t4APU9WKLzYEwcQdqUmwiyrxdzC7yG6M=; b=WiAtUBIZj0ttkCcp07XUSFDGiyj 1HiQg5y53sKGXUZHvwodICq4dxQER817hoFLKh7C2dPfuwcTgTfGjVjqYgCRjJ/C X9YOUJleEHPLCUWMIRWF/f+as8DrYT67AiDBWdOURV10QQvhJTBgOHOHbOG+sOXn jP86iNP7sagbe/fGS3IHfckpQVNcHZEbi2UVXf2qMTz+2z8X7Fgsic19Pw3OP6Hv SPbPC1CdeBxtXaBEHh5GUCVQk7kWSpOztTvBQ02kV1bfc5wmMA1893N6FFbfk5wp X+SEHGBAmzxE+s9r53zrMWszPL3eUWnNQx3eNcvt8ysqT6Xnd6OW9NZAHLw== 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 44y5wgt28x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 25 Feb 2025 19:24:37 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2210305535bso197954705ad.1 for ; Tue, 25 Feb 2025 11:24:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740511476; x=1741116276; 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=sncinBpcYxjt4APU9WKLzYEwcQdqUmwiyrxdzC7yG6M=; b=iHMBvHKTIDkJoVBK9T5EjkGeEcR0ruj4OIZqr+Fwr5tvvphY9rYHAl75gjh4EH5FOc 2Y9+dt0N+3UBi4Hr8C9ikHVazddSa3umvbBl3s2T8BWPnpQTO7OIMU91ooSXswMuSAmq 5YrCcaE9lJgtK/IanN/MxkUfwRJ53z8YR/LMdTyBC0b3/hkBk6oJ0ww0XPIxnmOch8bE 6Rcy6WxED6H1cZ3SjUeikZ2pTJeZYasankgLFabDnvYhgHaOCgf4rFiKZwPEdj/vD5LN ZOFRQBmkWaNP6Cio7jVpyqyzXXkJRhqo5uCeyV1W/zkarBLxsQvrNV4yqM37XTNs7MTv PHhQ== X-Forwarded-Encrypted: i=1; AJvYcCVh1eKm1wnqylWsKPoCKGJULiCBAPIISneecW3cwLNcm1R5qoNG5JHQ8/RGR63JhlWyyK6SsxFyiPkl+8U=@vger.kernel.org X-Gm-Message-State: AOJu0YwN/rA4Dk2Ughpvz3B+9s57V4/ZHskf1mP9zZbo6jEeZlpi6Ch4 HvzzsBdRtiqKmXgcUrOHtWLjmK+oqYMvGwaY/1P71BPVDoBV8udp6vNRmRVcW4Az4b5UM1VMW8y +919dQ0QccZ59ZXCP10Wf7oa87ASDwe8CD323xhVAs+2j/+mi5uomP2QMxp3AMqw= X-Gm-Gg: ASbGncvJhB7/L2so9E4SbFju+uXjP/L8w8Cd2rsTZrUxL4roxhykmlp53KPlb6orinG R9Mrsa11mbTm6mbgzG5eJGZCa2s9YFm+8i7n4Tj8k2BdoRlDRk/sDKC+XPchZvXM0xWMpsoDBs0 UcUF0V7uq/dNx+n/O36bPy4NuLaIA6i3PmC9PwcLiq2zahEypEDlpBWzvOnOh6qfPZ/NRmYeJJV AYzJ0bKKipKXdItHf17AqCRmtSSmRIrRxo4hJmy2ehtAeada03EpBIM1Y/zYLRVxlCzyD8tM2Ob IZP+tCEBvkjYT9sRiI19o1A6zh7zGEMwD3YY3A5+X7oYu922GjGkKk9qnLSLuYOVeqjnPPBwAmw W4Uk= X-Received: by 2002:a17:902:ea0c:b0:21f:35fd:1b57 with SMTP id d9443c01a7336-221a118747dmr293239285ad.43.1740511476554; Tue, 25 Feb 2025 11:24:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcZhSdu3/3liSui3KRPqS+qc4K7OLYsdM23pgGyUKxKLvh4wc8up9IeNok70qF0g++GnZEmw== X-Received: by 2002:a17:902:ea0c:b0:21f:35fd:1b57 with SMTP id d9443c01a7336-221a118747dmr293238895ad.43.1740511476154; Tue, 25 Feb 2025 11:24:36 -0800 (PST) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a095865sm17915365ad.145.2025.02.25.11.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 11:24:35 -0800 (PST) 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, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] thermal: qcom-spmi-temp-alarm: add support for GEN2 rev 2 PMIC peripherals Date: Tue, 25 Feb 2025 11:24:28 -0800 Message-Id: <20250225192429.2328092-5-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225192429.2328092-1-anjelique.melendez@oss.qualcomm.com> References: <20250225192429.2328092-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-Proofpoint-GUID: 9qlrgNtODXC68mKW1w5CIWA6mDaHzXD5 X-Proofpoint-ORIG-GUID: 9qlrgNtODXC68mKW1w5CIWA6mDaHzXD5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_06,2025-02-25_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 adultscore=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2502250120 Content-Type: text/plain; charset="utf-8" Add support for TEMP_ALARM GEN2 PMIC peripherals with digital major revision 2. This revision utilizes individual temp DAC registers to set the threshold temperature for over-temperature stages 1, 2, and 3 instead of a single register to specify a set of thresholds. Signed-off-by: David Collins Signed-off-by: Anjelique Melendez --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 136 ++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/= qcom/qcom-spmi-temp-alarm.c index fbfe633441ba..b4afe93ae87f 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -26,6 +26,11 @@ #define QPNP_TM_REG_SHUTDOWN_CTRL1 0x40 #define QPNP_TM_REG_ALARM_CTRL 0x46 =20 +/* TEMP_DAC_STGx registers are only present for TEMP_GEN2 v2.0 */ +#define QPNP_TM_REG_TEMP_DAC_STG1 0x47 +#define QPNP_TM_REG_TEMP_DAC_STG2 0x48 +#define QPNP_TM_REG_TEMP_DAC_STG3 0x49 + #define QPNP_TM_TYPE 0x09 #define QPNP_TM_SUBTYPE_GEN1 0x08 #define QPNP_TM_SUBTYPE_GEN2 0x09 @@ -65,6 +70,25 @@ static const long temp_map_gen2_v1[THRESH_COUNT][STAGE_C= OUNT] =3D { =20 #define TEMP_STAGE_HYSTERESIS 2000 =20 +/* + * For TEMP_GEN2 v2.0, TEMP_DAC_STG1/2/3 registers are used to set the thr= eshold + * for each stage independently. + * TEMP_DAC_STG* =3D 0 --> 80 C + * Each 8 step increase in TEMP_DAC_STG* value corresponds to 5 C (5000 mC= ). + */ +#define TEMP_DAC_MIN 80000 +#define TEMP_DAC_SCALE_NUM 8 +#define TEMP_DAC_SCALE_DEN 5000 + +#define TEMP_DAC_TEMP_TO_REG(temp) \ + (((temp) - TEMP_DAC_MIN) * TEMP_DAC_SCALE_NUM / TEMP_DAC_SCALE_DEN) +#define TEMP_DAC_REG_TO_TEMP(reg) \ + (TEMP_DAC_MIN + (reg) * TEMP_DAC_SCALE_DEN / TEMP_DAC_SCALE_NUM) + +static const long temp_dac_max[STAGE_COUNT] =3D { + 119375, 159375, 159375 +}; + /* Temperature in Milli Celsius reported during stage 0 if no ADC is prese= nt */ #define DEFAULT_TEMP 37000 =20 @@ -73,6 +97,7 @@ 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 (*setup)(struct qpnp_tm_chip *chip); int (*get_temp_stage)(struct qpnp_tm_chip *chip); int (*configure_trip_temps)(struct qpnp_tm_chip *chip); }; @@ -88,6 +113,7 @@ struct qpnp_tm_chip { unsigned int thresh; unsigned int stage; unsigned int base; + unsigned int ntrips; /* protects .thresh, .stage and chip registers */ struct mutex lock; bool initialized; @@ -305,6 +331,52 @@ static const struct thermal_zone_device_ops qpnp_tm_se= nsor_ops =3D { .set_trip_temp =3D qpnp_tm_set_trip_temp, }; =20 +static int qpnp_tm_gen2_rev2_set_temp_thresh(struct qpnp_tm_chip *chip, in= t trip, int temp) +{ + int ret, temp_cfg; + u8 reg; + + if (trip < 0 || trip >=3D STAGE_COUNT) { + dev_err(chip->dev, "invalid TEMP_DAC trip =3D %d\n", trip); + return -EINVAL; + } else if (temp < TEMP_DAC_MIN || temp > temp_dac_max[trip]) { + dev_err(chip->dev, "invalid TEMP_DAC temp =3D %d\n", temp); + return -EINVAL; + } + + reg =3D TEMP_DAC_TEMP_TO_REG(temp); + temp_cfg =3D TEMP_DAC_REG_TO_TEMP(reg); + + ret =3D qpnp_tm_write(chip, QPNP_TM_REG_TEMP_DAC_STG1 + trip, reg); + if (ret < 0) { + dev_err(chip->dev, "TEMP_DAC_STG write failed, ret=3D%d\n", ret); + return ret; + } + + chip->temp_thresh_map[trip] =3D temp_cfg; + + return 0; +} + +static int qpnp_tm_gen2_rev2_set_trip_temp(struct thermal_zone_device *tz, + const struct thermal_trip *trip, int temp) +{ + unsigned int trip_index =3D THERMAL_TRIP_PRIV_TO_INT(trip->priv); + struct qpnp_tm_chip *chip =3D thermal_zone_device_priv(tz); + int ret; + + mutex_lock(&chip->lock); + ret =3D qpnp_tm_gen2_rev2_set_temp_thresh(chip, trip_index, temp); + mutex_unlock(&chip->lock); + + return ret; +} + +static const struct thermal_zone_device_ops qpnp_tm_gen2_rev2_sensor_ops = =3D { + .get_temp =3D qpnp_tm_get_temp, + .set_trip_temp =3D qpnp_tm_gen2_rev2_set_trip_temp, +}; + static irqreturn_t qpnp_tm_isr(int irq, void *data) { struct qpnp_tm_chip *chip =3D data; @@ -329,6 +401,58 @@ static int qpnp_tm_configure_trip_temp(struct qpnp_tm_= chip *chip) return qpnp_tm_update_critical_trip_temp(chip, crit_temp); } =20 +/* Configure TEMP_DAC registers based on DT thermal_zone trips */ +static int qpnp_tm_gen2_rev2_configure_trip_temps_cb(struct thermal_trip *= trip, void *data) +{ + struct qpnp_tm_chip *chip =3D data; + int ret; + + trip->priv =3D THERMAL_INT_TO_TRIP_PRIV(chip->ntrips); + ret =3D qpnp_tm_gen2_rev2_set_temp_thresh(chip, chip->ntrips, trip->tempe= rature); + chip->ntrips++; + + return ret; +} + +static int qpnp_tm_gen2_rev2_configure_trip_temps(struct qpnp_tm_chip *chi= p) +{ + int ret, i; + + ret =3D thermal_zone_for_each_trip(chip->tz_dev, + qpnp_tm_gen2_rev2_configure_trip_temps_cb, chip); + if (ret < 0) + return ret; + + /* Verify that trips are strictly increasing. */ + for (i =3D 1; i < STAGE_COUNT; i++) { + if (chip->temp_thresh_map[i] <=3D chip->temp_thresh_map[i - 1]) { + dev_err(chip->dev, "Threshold %d=3D%ld <=3D threshold %d=3D%ld\n", + i, chip->temp_thresh_map[i], i - 1, + chip->temp_thresh_map[i - 1]); + return -EINVAL; + } + } + + return 0; +} + +/* Read the hardware default TEMP_DAC stage threshold temperatures */ +static int qpnp_tm_gen2_rev2_setup(struct qpnp_tm_chip *chip) +{ + int ret, i; + u8 reg =3D 0; + + for (i =3D 0; i < STAGE_COUNT; i++) { + ret =3D qpnp_tm_read(chip, QPNP_TM_REG_TEMP_DAC_STG1 + i, ®); + if (ret < 0) + return ret; + + chip->temp_thresh_map[i] =3D TEMP_DAC_REG_TO_TEMP(reg); + } + + return 0; +} + static const struct spmi_temp_alarm_data spmi_temp_alarm_data =3D { .ops =3D &qpnp_tm_sensor_ops, .temp_map =3D &temp_map_gen1, @@ -350,6 +474,13 @@ static const struct spmi_temp_alarm_data spmi_temp_ala= rm_gen2_rev1_data =3D { .get_temp_stage =3D qpnp_tm_gen2_get_temp_stage, }; =20 +static const struct spmi_temp_alarm_data spmi_temp_alarm_gen2_rev2_data = =3D { + .ops =3D &qpnp_tm_gen2_rev2_sensor_ops, + .setup =3D qpnp_tm_gen2_rev2_setup, + .configure_trip_temps =3D qpnp_tm_gen2_rev2_configure_trip_temps, + .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 @@ -484,6 +615,8 @@ static int qpnp_tm_probe(struct platform_device *pdev) =20 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 2) + chip->data =3D &spmi_temp_alarm_gen2_rev2_data; else if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2 && dig_major >=3D 1) chip->data =3D &spmi_temp_alarm_gen2_rev1_data; else if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2) @@ -491,6 +624,9 @@ static int qpnp_tm_probe(struct platform_device *pdev) else return -ENODEV; =20 + if (chip->data->setup) + chip->data->setup(chip); + /* * Register the sensor before initializing the hardware to be able to * read the trip points. get_temp() returns the default temperature --=20 2.34.1 From nobody Mon Feb 9 13:04:08 2026 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 849C420CCEF for ; Tue, 25 Feb 2025 19:24:40 +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=1740511482; cv=none; b=kG+P+o230RX7d8yxVwJRyxIMswxR8bRkCI9upCHt3YOQcsvUk4Ik8b5TpqC9du56e8vpcUn/L2wAsLpHYFp6qR3rpSzhUpZ5zT+K7rqcdZfPdFmy0w2tzOXGVz5N4yHj2N87gAcOaoEgvG3C6CTZ//NePp5B6ICp+NBF3690rOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740511482; c=relaxed/simple; bh=Pp4LWmQJeI2n2hns25e4yRUIVR5rPF1mXNrxkrycmYI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=j9WjmvZKGgAzNcSbe47NFVtRoihGCJZIk6HJiQS1Fd+YfFNjVchr7CfN1uItMqNd59CvdQpJ0GISrNZ0WEOTXbH8VSNFz0TsjJkdxU3rn6VopSp6cCu6R3Fq/u3SPPImSwI0DuqCso9s8lC5Lz1QGLbDFJRt6W6fAN69u7SxyiI= 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=pet9dkxl; 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="pet9dkxl" 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 51PIRB7Q017266 for ; Tue, 25 Feb 2025 19:24:39 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=n9ufafBkhPy 0t2hvJ7w74GUJXSKmHUttNBHTqYvNH+0=; b=pet9dkxlTjnq9D0ziJT/vdx1Sel cypuh4ehD/7v+g4mRg9TwY9Iy7TSxnE3GtdM1E4oOdaQFtAyHDbUoojBbQkGetlH mlgjUM+uiK44p/AZxrEDlnOYsOSaJ9u6p1uLw+mHEjsQ4g6Er0HZ0SePOw5u6Tvk l7Cp5vy+2OY4R40tonSJFZqgejiZGPDF1dajdqAJoW/mSj6yfAnZo0nUr+jfgBLI kHaXXbLA6zEUjrsJWN/Cd/O9rO2+rptxEksqveSoFY2hKPlvHmH9b8zf8fJ22ZBB eRq2bns53PFAs3lteyorFX1+Zlf6K8Y2CMWH0o7072jBlljwPxMaYPGyrjA== 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 44y5k6a44y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 25 Feb 2025 19:24:39 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-22114b800f0so75048685ad.1 for ; Tue, 25 Feb 2025 11:24:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740511478; x=1741116278; 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=n9ufafBkhPy0t2hvJ7w74GUJXSKmHUttNBHTqYvNH+0=; b=DhZdaHHEjDDDrqI9BF+4YQKMJmn1afWV9vVG9lXDCTRJOpqOClSjiu+QTiMhSnzRqv 3Gy+ujgO5ZjIKMjWt+1uv+Wk9zKzHB1e9nZXVzvTcRGIuxMxy3AZuP2jR6GxlKt0+2hl DimePomOVBJyVM7ZGACIrJ1QShWpnuvnK9iUG1PNdB6WFLEpllDSgpXXOhZ9RqlntG5p Jplm7Gs/thkecj5WFUt+Fa8nPpOc4vP7ov0q0QfhEqNAxtT9oB/1XVOSIBmEx+h15wTk 39DjyAO7x23lA0JZfwCSOqlKFGFl2TPaz7ZRzQc2DtwWoMK52LXbEovUhcnVR8BLvZu8 33Wg== X-Forwarded-Encrypted: i=1; AJvYcCVokaQWgoiNQY2qWHm+nZg0Ic2RIMPjDkczRUjLT6ZMuYKeLV0wzxR0ABK9DnN6aSCl+RIXC6orYa6vD0k=@vger.kernel.org X-Gm-Message-State: AOJu0YxMnHd4Me01kHi8Z691waUDS27I+yq++UGpFXKnIt4cErpcvqlQ kbYhbj6xRUECJniUr18xnRu24PH5e+oi3Gx5jQfFkpKjoCLPUYFnPrWbTrtNxD3rksQaCqqzBAl VSeVgVuYrcX+19Z7ASZ3+kjLf6KJhAQNK/a/W9yrARliG8Nd1/0PjHcRf/S7DOqc= X-Gm-Gg: ASbGncvrtTrsyb1M0lfRQjLhbV52agVO8E0jnK/aj08rJ2yVKOYpkqm/vFdvcY8xViQ I6ZFsNAw0QafP/884NrGObvVvTO7PMcwlogf8qVOmRzt2qEv0n5U49h/2Anr3+3ugX3gAJOOwob o4qP3kqUjcO5ActLMtjVW9X2PI/UJd3H8r7oMQ+h+LuPk5pRzPEv9+64K1HCNVpexbD1l/tTypd IASBjpfeBupaPvrA59t/VlRugSKQgXjpYGtCfgGN0XUkQMlI3hJNTxbfzHr8drSYxidzXyuGM/9 A8Gr4inKQs1Xd7Wsk2Muy9NxmCYSnLEPpTpm+TwPKv1c63gKyo4IMhXw0rOAG/edgHQBMmteoDL BG90= X-Received: by 2002:a17:902:db0f:b0:220:efc8:60b1 with SMTP id d9443c01a7336-22307e6587bmr72524575ad.39.1740511477934; Tue, 25 Feb 2025 11:24:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGV3PgJsP16R7Q9ZLc4cvyMFvQrhThDMR9kUHqv1+xLdIaqLpkSjGLYubMLFsHKJcqWKu/48w== X-Received: by 2002:a17:902:db0f:b0:220:efc8:60b1 with SMTP id d9443c01a7336-22307e6587bmr72524205ad.39.1740511477512; Tue, 25 Feb 2025 11:24:37 -0800 (PST) Received: from hu-amelende-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a095865sm17915365ad.145.2025.02.25.11.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 11:24:36 -0800 (PST) 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, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] thermal: qcom-spmi-temp-alarm: add support for LITE PMIC peripherals Date: Tue, 25 Feb 2025 11:24:29 -0800 Message-Id: <20250225192429.2328092-6-anjelique.melendez@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225192429.2328092-1-anjelique.melendez@oss.qualcomm.com> References: <20250225192429.2328092-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-Proofpoint-ORIG-GUID: gzzHCNxHWyYLyQGMscosjUGJjJuMZHuC X-Proofpoint-GUID: gzzHCNxHWyYLyQGMscosjUGJjJuMZHuC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_06,2025-02-25_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 suspectscore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2502250120 Content-Type: text/plain; charset="utf-8" Add support for TEMP_ALARM LITE PMIC peripherals. This subtype utilizes a pair of registers to configure a warning interrupt threshold temperature and an automatic hardware shutdown threshold temperature. Signed-off-by: David Collins Signed-off-by: Anjelique Melendez --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 204 +++++++++++++++++++- 1 file changed, 203 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/= qcom/qcom-spmi-temp-alarm.c index b4afe93ae87f..50e6c29afde3 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -23,6 +23,7 @@ #define QPNP_TM_REG_TYPE 0x04 #define QPNP_TM_REG_SUBTYPE 0x05 #define QPNP_TM_REG_STATUS 0x08 +#define QPNP_TM_REG_IRQ_STATUS 0x10 #define QPNP_TM_REG_SHUTDOWN_CTRL1 0x40 #define QPNP_TM_REG_ALARM_CTRL 0x46 =20 @@ -30,14 +31,20 @@ #define QPNP_TM_REG_TEMP_DAC_STG1 0x47 #define QPNP_TM_REG_TEMP_DAC_STG2 0x48 #define QPNP_TM_REG_TEMP_DAC_STG3 0x49 +#define QPNP_TM_REG_LITE_TEMP_CFG1 0x50 +#define QPNP_TM_REG_LITE_TEMP_CFG2 0x51 =20 #define QPNP_TM_TYPE 0x09 #define QPNP_TM_SUBTYPE_GEN1 0x08 #define QPNP_TM_SUBTYPE_GEN2 0x09 +#define QPNP_TM_SUBTYPE_LITE 0xC0 =20 #define STATUS_GEN1_STAGE_MASK GENMASK(1, 0) #define STATUS_GEN2_STATE_MASK GENMASK(6, 4) =20 +/* IRQ status only needed for TEMP_ALARM_LITE */ +#define IRQ_STATUS_MASK BIT(0) + #define SHUTDOWN_CTRL1_OVERRIDE_S2 BIT(6) #define SHUTDOWN_CTRL1_THRESHOLD_MASK GENMASK(1, 0) =20 @@ -45,6 +52,8 @@ =20 #define ALARM_CTRL_FORCE_ENABLE BIT(7) =20 +#define LITE_TEMP_CFG_THRESHOLD_MASK GENMASK(3, 2) + #define THRESH_COUNT 4 #define STAGE_COUNT 3 =20 @@ -89,6 +98,19 @@ static const long temp_dac_max[STAGE_COUNT] =3D { 119375, 159375, 159375 }; =20 +/* + * TEMP_ALARM_LITE has two stages: warning and shutdown with independently + * configured threshold temperatures. + */ + +static const long temp_lite_warning_map[THRESH_COUNT] =3D { + 115000, 125000, 135000, 145000 +}; + +static const long temp_lite_shutdown_map[THRESH_COUNT] =3D { + 135000, 145000, 160000, 175000 +}; + /* Temperature in Milli Celsius reported during stage 0 if no ADC is prese= nt */ #define DEFAULT_TEMP 37000 =20 @@ -198,6 +220,24 @@ static int qpnp_tm_gen2_get_temp_stage(struct qpnp_tm_= chip *chip) return alarm_state_map[ret]; } =20 +/** + * qpnp_tm_lite_get_temp_stage() - return over-temperature stage + * @chip: Pointer to the qpnp_tm chip + * + * Return: alarm interrupt state on success, or errno on failure. + */ +static int qpnp_tm_lite_get_temp_stage(struct qpnp_tm_chip *chip) +{ + u8 reg =3D 0; + int ret; + + ret =3D qpnp_tm_read(chip, QPNP_TM_REG_IRQ_STATUS, ®); + if (ret < 0) + return ret; + + return reg & IRQ_STATUS_MASK; +} + /* * This function updates the internal temp value based on the * current thermal stage and threshold as well as the previous stage @@ -377,6 +417,96 @@ static const struct thermal_zone_device_ops qpnp_tm_ge= n2_rev2_sensor_ops =3D { .set_trip_temp =3D qpnp_tm_gen2_rev2_set_trip_temp, }; =20 +static int qpnp_tm_lite_set_temp_thresh(struct qpnp_tm_chip *chip, int tri= p, int temp) +{ + int ret, temp_cfg, i; + const long *temp_map; + u16 addr; + u8 reg, thresh; + + if (trip < 0 || trip >=3D STAGE_COUNT) { + dev_err(chip->dev, "invalid TEMP_LITE trip =3D %d\n", trip); + return -EINVAL; + } + + switch (trip) { + case 0: + temp_map =3D temp_lite_warning_map; + addr =3D QPNP_TM_REG_LITE_TEMP_CFG1; + break; + case 1: + /* + * The second trip point is purely in software to facilitate + * a controlled shutdown after the warning threshold is crossed + * but before the automatic hardware shutdown threshold is + * crossed. + */ + return 0; + case 2: + temp_map =3D temp_lite_shutdown_map; + addr =3D QPNP_TM_REG_LITE_TEMP_CFG2; + break; + default: + return 0; + } + + if (temp < temp_map[THRESH_MIN] || temp > temp_map[THRESH_MAX]) { + dev_err(chip->dev, "invalid TEMP_LITE temp =3D %d\n", temp); + return -EINVAL; + } + + thresh =3D 0; + temp_cfg =3D temp_map[thresh]; + for (i =3D THRESH_MAX; i >=3D THRESH_MIN; i--) { + if (temp >=3D temp_map[i]) { + thresh =3D i; + temp_cfg =3D temp_map[i]; + break; + } + } + + if (temp_cfg =3D=3D chip->temp_thresh_map[trip]) + return 0; + + ret =3D qpnp_tm_read(chip, addr, ®); + if (ret < 0) { + dev_err(chip->dev, "LITE_TEMP_CFG read failed, ret=3D%d\n", ret); + return ret; + } + + reg &=3D ~LITE_TEMP_CFG_THRESHOLD_MASK; + reg |=3D FIELD_PREP(LITE_TEMP_CFG_THRESHOLD_MASK, thresh); + + ret =3D qpnp_tm_write(chip, addr, reg); + if (ret < 0) { + dev_err(chip->dev, "LITE_TEMP_CFG write failed, ret=3D%d\n", ret); + return ret; + } + + chip->temp_thresh_map[trip] =3D temp_cfg; + + return 0; +} + +static int qpnp_tm_lite_set_trip_temp(struct thermal_zone_device *tz, + const struct thermal_trip *trip, int temp) +{ + unsigned int trip_index =3D THERMAL_TRIP_PRIV_TO_INT(trip->priv); + struct qpnp_tm_chip *chip =3D thermal_zone_device_priv(tz); + int ret; + + mutex_lock(&chip->lock); + ret =3D qpnp_tm_lite_set_temp_thresh(chip, trip_index, temp); + mutex_unlock(&chip->lock); + + return ret; +} + +static const struct thermal_zone_device_ops qpnp_tm_lite_sensor_ops =3D { + .get_temp =3D qpnp_tm_get_temp, + .set_trip_temp =3D qpnp_tm_lite_set_trip_temp, +}; + static irqreturn_t qpnp_tm_isr(int irq, void *data) { struct qpnp_tm_chip *chip =3D data; @@ -453,6 +583,68 @@ static int qpnp_tm_gen2_rev2_setup(struct qpnp_tm_chip= *chip) return 0; } =20 +/* Configure TEMP_LITE registers based on DT thermal_zone trips */ +static int qpnp_tm_lite_configure_trip_temps_cb(struct thermal_trip *trip,= void *data) +{ + struct qpnp_tm_chip *chip =3D data; + int ret; + + trip->priv =3D THERMAL_INT_TO_TRIP_PRIV(chip->ntrips); + ret =3D qpnp_tm_lite_set_temp_thresh(chip, chip->ntrips, trip->temperatur= e); + chip->ntrips++; + + return ret; +} + +static int qpnp_tm_lite_configure_trip_temps(struct qpnp_tm_chip *chip) +{ + int ret; + + ret =3D thermal_zone_for_each_trip(chip->tz_dev, qpnp_tm_lite_configure_t= rip_temps_cb, chip); + if (ret < 0) + return ret; + + /* Verify that trips are strictly increasing. */ + if (chip->temp_thresh_map[2] <=3D chip->temp_thresh_map[0]) { + dev_err(chip->dev, "Threshold 2=3D%ld <=3D threshold 0=3D%ld\n", + chip->temp_thresh_map[2], chip->temp_thresh_map[0]); + return -EINVAL; + } + + return 0; +} + +/* Read the hardware default TEMP_LITE stage threshold temperatures */ +static int qpnp_tm_lite_setup(struct qpnp_tm_chip *chip) +{ + int ret, thresh; + u8 reg =3D 0; + + /* + * Store the warning trip temp in temp_thresh_map[0] and the shutdown trip + * temp in temp_thresh_map[2]. The second trip point is purely in softwa= re + * to facilitate a controlled shutdown after the warning threshold is + * crossed but before the automatic hardware shutdown threshold is + * crossed. Thus, there is no register to read for the second trip + * point. + */ + ret =3D qpnp_tm_read(chip, QPNP_TM_REG_LITE_TEMP_CFG1, ®); + if (ret < 0) + return ret; + + thresh =3D FIELD_GET(LITE_TEMP_CFG_THRESHOLD_MASK, reg); + chip->temp_thresh_map[0] =3D temp_lite_warning_map[thresh]; + + ret =3D qpnp_tm_read(chip, QPNP_TM_REG_LITE_TEMP_CFG2, ®); + if (ret < 0) + return ret; + + thresh =3D FIELD_GET(LITE_TEMP_CFG_THRESHOLD_MASK, reg); + chip->temp_thresh_map[2] =3D temp_lite_shutdown_map[thresh]; + + return 0; +} + static const struct spmi_temp_alarm_data spmi_temp_alarm_data =3D { .ops =3D &qpnp_tm_sensor_ops, .temp_map =3D &temp_map_gen1, @@ -481,6 +673,13 @@ static const struct spmi_temp_alarm_data spmi_temp_ala= rm_gen2_rev2_data =3D { .get_temp_stage =3D qpnp_tm_gen2_get_temp_stage, }; =20 +static const struct spmi_temp_alarm_data spmi_temp_alarm_lite_data =3D { + .ops =3D &qpnp_tm_lite_sensor_ops, + .setup =3D qpnp_tm_lite_setup, + .configure_trip_temps =3D qpnp_tm_lite_configure_trip_temps, + .get_temp_stage =3D qpnp_tm_lite_get_temp_stage, +}; + /* * This function initializes the internal temp value based on only the * current thermal stage and threshold. Setup threshold control and @@ -605,7 +804,8 @@ static int qpnp_tm_probe(struct platform_device *pdev) } =20 if (type !=3D QPNP_TM_TYPE || (subtype !=3D QPNP_TM_SUBTYPE_GEN1 - && subtype !=3D QPNP_TM_SUBTYPE_GEN2)) { + && subtype !=3D QPNP_TM_SUBTYPE_GEN2 + && subtype !=3D QPNP_TM_SUBTYPE_LITE)) { dev_err(&pdev->dev, "invalid type 0x%02x or subtype 0x%02x\n", type, subtype); return -ENODEV; @@ -621,6 +821,8 @@ static int qpnp_tm_probe(struct platform_device *pdev) chip->data =3D &spmi_temp_alarm_gen2_rev1_data; else if (subtype =3D=3D QPNP_TM_SUBTYPE_GEN2) chip->data =3D &spmi_temp_alarm_gen2_data; + else if (subtype =3D=3D QPNP_TM_SUBTYPE_LITE) + chip->data =3D &spmi_temp_alarm_lite_data; else return -ENODEV; =20 --=20 2.34.1