From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C6BF3D0B8 for ; Mon, 22 Jan 2024 13:55:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705931706; cv=none; b=QfZXJJalprwAU6Vgxllt9hlr6KaR9R1rVFBzO10YCwcl0zqYfHm82HOZnq5PRY6lUvh3evGhyHMIMuoaTRJ5Gi2E4+xce3NcjhieG5vXnljv/PuCLi7Arxq2IIFxW72svGjy5jm4kFRp+HL0kLMXtFSm+TGtS1iLbQoCIEYB0SQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705931706; c=relaxed/simple; bh=1RY42wUJ5DilToY52o14SzpTE782BXJr7ZzfgzVy/8E=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=ZmeBljBAlma1twjJV2D0EkY0oXqqf4XhRUxwqRPctrhh5Mt7CvxjziOrSDQaiCVSXZJXd2dQ5iumxN3AI1bhRkNc5nKB2IEhuB/KDYu4zR6O+M1n+HGjE9YWziHqTYCwdL7R5Ipd6m4jgys5YCE8dwedBOzxmVCsSJ30IuL3Hr8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=vXDk7cOA; arc=none smtp.client-ip=209.85.128.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vXDk7cOA" Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-6000bbdbeceso5487797b3.2 for ; Mon, 22 Jan 2024 05:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705931702; x=1706536502; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=iGOilTuqjcw1mr5eXBiSM5JbzofFFnc7w3m0lwVL+c8=; b=vXDk7cOAK/oxr4A9XouWKVqxeNKSpaCmhbZgukg13AlfEJqfH8v787o0CNX8oC8l2l m1aukb7QFC0/qvi30n33MhoXxeUDnihW/wD1s02ZSyY6byl7xJJGjMBkH+AZ1ywp9FTL b14a3VyiW2zJJvZDtYzXuTp5OdqHDAPJDgTSuEX2Erubgq54n4oYNzmvASFLJYEQBTVI EF5GY9B47jYNvuOe0X1h+Zt5oJY4POSajcgQhFvBO7jSRrGZyQdLejvLItcA+voJh6tn NRL1aICinzohoqMtqI0e45/rSx4R4HYwI8TejilxId+maLUJ2dn/CIK8B1o8fcGDkWm+ k7wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705931702; x=1706536502; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iGOilTuqjcw1mr5eXBiSM5JbzofFFnc7w3m0lwVL+c8=; b=n+1IKU16k1U6SZtWf2EyS5F/hqNctH9oQsoePMH7h1JaJtcAoV8oo/N41ZSYR4L5pu FQGoT5wlrWwKPUUrtKPN/ahrbUS2MTOJySo8mdaCwOiK365c1nmh4GL66DTM0oiSTtSc v4sosG20z79Zdd42G0+oXM/j0f9jHTeBUhSGCi15O2Rub5YY/lLH2XFOHqq6lDYlLX3P 0j1K1eWj+q+lDEZcG8QbRXWCke0Xg2XBKdLW3Fkbz1H5nfTgpvgQQBn8F1mhKcS/FHxk jV/az3QaoBHjnPSPRv5AouSfu+zEyZhN3Zv221sCL8VkZo1EIbDO143KyOyWRfAH0bHR zVLg== X-Gm-Message-State: AOJu0YzbYh0du27AATKZErlMWosrdVXyXvs9hbCwmGucDzpwzskVZjer H+G+ykpheWHRX+yD/beoJ0GUgD3P9C3YhGBeEZVYYmUX5Ph0VnL3FtAt5MqISbgp6JS+jAxT0NT Id+TjMhokoOpDD6a9/CMETfiwBzoFoSOSpfBVCg== X-Google-Smtp-Source: AGHT+IFa+LfGhrioiCJkuC7X+UFYDQskRS/0P+B4O30wfVtk2DnNiP57dGmVt7wK2/Cm1SiBp4WEPLxpF0n+246UYv0= X-Received: by 2002:a81:5344:0:b0:5f5:9898:ca3a with SMTP id h65-20020a815344000000b005f59898ca3amr3442278ywb.87.1705931702590; Mon, 22 Jan 2024 05:55:02 -0800 (PST) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240122100726.16993-1-quic_priyjain@quicinc.com> In-Reply-To: <20240122100726.16993-1-quic_priyjain@quicinc.com> From: Dmitry Baryshkov Date: Mon, 22 Jan 2024 15:54:51 +0200 Message-ID: Subject: Re: [PATCH] thermal/drivers/tsens: Add suspend to RAM support for tsens To: Priyansh Jain Cc: Amit Kucheria , Thara Gopinath , Bjorn Andersson , Konrad Dybcio , "Rafael J . Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, quic_manafm@quicinc.com Content-Type: text/plain; charset="UTF-8" On Mon, 22 Jan 2024 at 12:11, Priyansh Jain wrote: > > Add suspend callback support for tsens which disables tsens interrupts > in suspend to RAM callback. > Add resume callback support for tsens which reinitializes tsens hardware > and enables back tsens interrupts in resume callback. This describes what the patch does. This is more or less obvious from the patch itself. Instead it should describe why this is necessary. > > Signed-off-by: Priyansh Jain > --- > drivers/thermal/qcom/tsens-v2.c | 2 + > drivers/thermal/qcom/tsens.c | 93 +++++++++++++++++++++++++++++++-- > drivers/thermal/qcom/tsens.h | 7 +++ > 3 files changed, 98 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c > index 29a61d2d6ca3..1b74db6299c4 100644 > --- a/drivers/thermal/qcom/tsens-v2.c > +++ b/drivers/thermal/qcom/tsens-v2.c > @@ -107,6 +107,8 @@ static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { > static const struct tsens_ops ops_generic_v2 = { > .init = init_common, > .get_temp = get_temp_tsens_valid, > + .suspend = tsens_suspend_common, > + .resume = tsens_resume_common, > }; > > struct tsens_plat_data data_tsens_v2 = { > diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c > index 6d7c16ccb44d..603ccb91009d 100644 > --- a/drivers/thermal/qcom/tsens.c > +++ b/drivers/thermal/qcom/tsens.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > #include "../thermal_hwmon.h" > #include "tsens.h" > @@ -1153,7 +1154,7 @@ static const struct thermal_zone_device_ops tsens_of_ops = { > }; > > static int tsens_register_irq(struct tsens_priv *priv, char *irqname, > - irq_handler_t thread_fn) > + irq_handler_t thread_fn, int *irq_num) > { > struct platform_device *pdev; > int ret, irq; > @@ -1169,6 +1170,7 @@ static int tsens_register_irq(struct tsens_priv *priv, char *irqname, > if (irq == -ENXIO) > ret = 0; > } else { > + *irq_num = irq; > /* VER_0 interrupt is TRIGGER_RISING, VER_0_1 and up is ONESHOT */ > if (tsens_version(priv) == VER_0) > ret = devm_request_threaded_irq(&pdev->dev, irq, > @@ -1193,6 +1195,85 @@ static int tsens_register_irq(struct tsens_priv *priv, char *irqname, > return ret; > } > > +static int tsens_reinit(struct tsens_priv *priv) > +{ > + unsigned long flags; > + > + spin_lock_irqsave(&priv->ul_lock, flags); > + > + /* in VER_0 TSENS need to be explicitly enabled */ > + if (tsens_version(priv) == VER_0) > + regmap_field_write(priv->rf[TSENS_EN], 1); > + > + /* > + * Re-enable the watchdog, unmask the bark. > + * Disable cycle completion monitoring > + */ > + if (priv->feat->has_watchdog) { > + regmap_field_write(priv->rf[WDOG_BARK_MASK], 0); > + regmap_field_write(priv->rf[CC_MON_MASK], 1); > + } > + > + /* Re-enable interrupts */ > + if (tsens_version(priv) >= VER_0_1) > + tsens_enable_irq(priv); > + > + spin_unlock_irqrestore(&priv->ul_lock, flags); > + > + return 0; > +} > + > +int tsens_suspend_common(struct tsens_priv *priv) > +{ > + switch (pm_suspend_target_state) { > + case PM_SUSPEND_MEM: > + if (priv->combo_irq > 0) { > + disable_irq_nosync(priv->combo_irq); > + disable_irq_wake(priv->combo_irq); > + } > + > + if (priv->uplow_irq > 0) { > + disable_irq_nosync(priv->uplow_irq); > + disable_irq_wake(priv->uplow_irq); > + } > + > + if (priv->crit_irq > 0) { > + disable_irq_nosync(priv->crit_irq); > + disable_irq_wake(priv->crit_irq); > + } > + break; > + default: > + break; > + } > + return 0; > +} > + > +int tsens_resume_common(struct tsens_priv *priv) > +{ > + switch (pm_suspend_target_state) { > + case PM_SUSPEND_MEM: > + tsens_reinit(priv); > + if (priv->combo_irq > 0) { > + enable_irq(priv->combo_irq); > + enable_irq_wake(priv->combo_irq); > + } > + > + if (priv->uplow_irq > 0) { > + enable_irq(priv->uplow_irq); > + enable_irq_wake(priv->uplow_irq); > + } > + > + if (priv->crit_irq > 0) { > + enable_irq(priv->crit_irq); > + enable_irq_wake(priv->crit_irq); > + } > + break; > + default: > + break; > + } > + return 0; > +} > + > static int tsens_register(struct tsens_priv *priv) > { > int i, ret; > @@ -1227,15 +1308,19 @@ static int tsens_register(struct tsens_priv *priv) > > if (priv->feat->combo_int) { > ret = tsens_register_irq(priv, "combined", > - tsens_combined_irq_thread); > + tsens_combined_irq_thread, > + &priv->combo_irq); > } else { > - ret = tsens_register_irq(priv, "uplow", tsens_irq_thread); > + ret = tsens_register_irq(priv, "uplow", > + tsens_irq_thread, > + &priv->uplow_irq); > if (ret < 0) > return ret; > > if (priv->feat->crit_int) > ret = tsens_register_irq(priv, "critical", > - tsens_critical_irq_thread); > + tsens_critical_irq_thread, > + &priv->crit_irq); > } > > return ret; > diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h > index cb637fa289ca..268bf56105be 100644 > --- a/drivers/thermal/qcom/tsens.h > +++ b/drivers/thermal/qcom/tsens.h > @@ -582,6 +582,11 @@ struct tsens_priv { > const struct reg_field *fields; > const struct tsens_ops *ops; > > + /* For saving irq number to re-use later */ > + int uplow_irq; > + int crit_irq; > + int combo_irq; > + > struct dentry *debug_root; > struct dentry *debug; > > @@ -634,6 +639,8 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mo > int init_common(struct tsens_priv *priv); > int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp); > int get_temp_common(const struct tsens_sensor *s, int *temp); > +int tsens_suspend_common(struct tsens_priv *priv); > +int tsens_resume_common(struct tsens_priv *priv); > > /* TSENS target */ > extern struct tsens_plat_data data_8960; > -- > 2.17.1 > > -- With best wishes Dmitry