From patchwork Tue Feb 7 17:10:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 13131876 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5F2EC64EC4 for ; Tue, 7 Feb 2023 17:11:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229565AbjBGRLP (ORCPT ); Tue, 7 Feb 2023 12:11:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231225AbjBGRLP (ORCPT ); Tue, 7 Feb 2023 12:11:15 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9D13C282 for ; Tue, 7 Feb 2023 09:11:12 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id qw12so44406137ejc.2 for ; Tue, 07 Feb 2023 09:11:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c7RVUm6qi5zdXXG0mz0c47Sldb1nd0ZjmrRR9n+6EfE=; b=SH1EHUvb9iAWRzUXcGYHoM8W6Cve5L5GbWsqPh2vaSQcUWUzu2plrTM+/km77VaTqN Leg42vbuwaMHZF/Lha4jzV9HcNGsF4lG1col56YhU7JPEOerERbIL2dCZzgVKhuFZNn4 /C/EZVghVpD4CHmMsezl5wZ/se3n26vOC/BcU5f8B4nCOJfaQorNjdWacZQG7NVyFghe UyZdRPbSSCZfRX1iwSZ6mIgTA/UUPnbdo+jnvV+zLx5Nc8Y5uoU7ZsQnI3WMq3L6+o/p TILazUBi5Q3V4+3pkTpPbfCeguGXCklKLGPiOWgp6G5u1GkIyFg/gmncpgDOy5BMfuFK cAYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=c7RVUm6qi5zdXXG0mz0c47Sldb1nd0ZjmrRR9n+6EfE=; b=HzjshKztT7NoVIvGTKsj/gITRa3FnF7fkyTyOPvGEbQrQR+viisLH6ep9mfm8Zd9eD 8mh8+TXMRRMAaL5UG6fLYd9FeHAvqtQ5t8PXJRenHTKdGD3hQ5j1dY8snZJnuHK8/ZO4 LOYCklPkC9ikQ6unAXWZJalcLZRVEsLbl+hw7EygRA2KUyZTxPfhX9QsrKK2S4QGfYt/ 0+oROncoVgK8ScXB6nViBSvRqOACQ0WvX+9Ls27nu7L3qa/zDD7e/WwHVAA+67BFL4ZS oT78FZl78nRlv3gcxWWqIhPorhVignSWfkFeIaproEPtLLvHsimPmVG/01pO4PZut0/l OgSg== X-Gm-Message-State: AO0yUKXlVkAuv69aMJ2DuFnvV2ufmcOIx/V6VSPM6JLPUamtqIWHjR8t p5oSvg9rtLaP0iRs52velGcpQnTnGoN2FsC7TodBsg== X-Google-Smtp-Source: AK7set81S60Kv9YD5SU6s9hgHDhA/kYDvmraf6qlT8K3h3Gf7QOSJOUWhyAGwAkLXUVl9aKBF6Dyxg== X-Received: by 2002:a17:906:198f:b0:894:acbe:7a97 with SMTP id g15-20020a170906198f00b00894acbe7a97mr4183548ejd.13.1675789871524; Tue, 07 Feb 2023 09:11:11 -0800 (PST) Received: from sleipner.berto.se (p4fca2792.dip0.t-ipconnect.de. [79.202.39.146]) by smtp.googlemail.com with ESMTPSA id n23-20020a1709062bd700b007a4e02e32ffsm7132298ejg.60.2023.02.07.09.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:11:11 -0800 (PST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Daniel Lezcano , Wolfram Sang , linux-pm@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH 1/2] drivers/thermal/rcar_gen3_thermal: Create device local ops struct Date: Tue, 7 Feb 2023 18:10:10 +0100 Message-Id: <20230207171011.1596127-2-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230207171011.1596127-1-niklas.soderlund+renesas@ragnatech.se> References: <20230207171011.1596127-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The callback operations are modified on a driver global level. If one device tree description do not define interrupts, the set_trips() operation was disabled globally for all users of the driver. Fix this by creating a device local copy of the operations structure and modify the copy depending on what the device can do. Signed-off-by: Niklas Söderlund --- drivers/thermal/rcar_gen3_thermal.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index 4c1c6f89aa2f..bfa2ff20b945 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -87,6 +87,7 @@ struct rcar_gen3_thermal_tsc { struct rcar_gen3_thermal_priv { struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM]; + struct thermal_zone_device_ops ops; unsigned int num_tscs; void (*thermal_init)(struct rcar_gen3_thermal_tsc *tsc); int ptat[3]; @@ -225,7 +226,7 @@ static int rcar_gen3_thermal_set_trips(struct thermal_zone_device *tz, int low, return 0; } -static struct thermal_zone_device_ops rcar_gen3_tz_of_ops = { +static const struct thermal_zone_device_ops rcar_gen3_tz_of_ops = { .get_temp = rcar_gen3_thermal_get_temp, .set_trips = rcar_gen3_thermal_set_trips, }; @@ -466,6 +467,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; + priv->ops = rcar_gen3_tz_of_ops; priv->thermal_init = rcar_gen3_thermal_init; if (soc_device_match(r8a7795es1)) priv->thermal_init = rcar_gen3_thermal_init_r8a7795es1; @@ -473,7 +475,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); if (rcar_gen3_thermal_request_irqs(priv, pdev)) - rcar_gen3_tz_of_ops.set_trips = NULL; + priv->ops.set_trips = NULL; pm_runtime_enable(dev); pm_runtime_get_sync(dev); @@ -508,8 +510,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) for (i = 0; i < priv->num_tscs; i++) { struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; - zone = devm_thermal_of_zone_register(dev, i, tsc, - &rcar_gen3_tz_of_ops); + zone = devm_thermal_of_zone_register(dev, i, tsc, &priv->ops); if (IS_ERR(zone)) { dev_err(dev, "Sensor %u: Can't register thermal zone\n", i); ret = PTR_ERR(zone); From patchwork Tue Feb 7 17:10:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 13131877 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27405C636D3 for ; Tue, 7 Feb 2023 17:11:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbjBGRLQ (ORCPT ); Tue, 7 Feb 2023 12:11:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230510AbjBGRLP (ORCPT ); Tue, 7 Feb 2023 12:11:15 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AABD83C2A8 for ; Tue, 7 Feb 2023 09:11:13 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id dr8so44305784ejc.12 for ; Tue, 07 Feb 2023 09:11:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I/fUNiCLNvLYxVN4V7dFrBCGBJ6ieG61uRg7cqDK9W0=; b=YPrjSRRviTlxn5O6rsaS9MqRZRJwWRvA7lYzBbOAa2YwRFC78Bf1ZTKkgoCSN4m5og 6G4n0gtj4pXDTBOpjqtwxCVM6vN+uIlpcd5DlDT7OK9k6Hzj5HH2e9q3MH9h196gHAKr cxncKgwVNR15+8Rf0ndXhwowMLP5Pzs5IMmgzNEtdx8I8+Zod7E404Me76XwVqBo7dEX s9K9EecJ1goMfRKOg2jPwDqwoISl9CAbUGZA8QvIHikS3ss8f0P1dri4ZtcRxq7rw7fi HZrvpv9LdfNjdq2RjrKbkmt4qwVav+GcGQbOf/DSHVffsFp8IS6GgE8L9u+/1k8rD/y6 p7ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=I/fUNiCLNvLYxVN4V7dFrBCGBJ6ieG61uRg7cqDK9W0=; b=LrcZfie7GPaI9M9qky3bs9MDJVPb0WoZ8IITy1NTGnzJjlEFp0qH+i1pUp59Sg0vNB e63551VWrSPa9hnAlJSUiSEnaHkdjOO/I4JO6YTfu8si++RmO3mk6K426BpNntjpv9V2 v/tVxwnQRaJLJMGLTiP/2uhO9H0oMK1zFC4COz7VxCYmQWmlCGzX1sT/Vctb+4lX0Nco 41CxUqPpgwoPxQ/y2K1s5BXeTulozreY/XJtHkInFI3nQrIGNvsopGtpAvjVqgdFu0t6 cUoiZg8rbGh4dxLeG24fMpvYy2dAIHBnPgXRp3aV+Lm13ztwUb2cwje36QbOZymbOMWI KiVw== X-Gm-Message-State: AO0yUKWYQV0L0YZX4ylil8oL7LmTsvGD2QdC8cI8p/CyEXA0mOYoc+kn bG9rIbh/2Mgpiku/xkM+MndxKQ== X-Google-Smtp-Source: AK7set8WtHapdiat1tJByb6ZuWhTjC5JWXfvr+nr4498wduX+U4awp6nDbEJAaEffZcXOQuGf4dqvg== X-Received: by 2002:a17:907:1c0f:b0:88d:ba89:1836 with SMTP id nc15-20020a1709071c0f00b0088dba891836mr23511262ejc.7.1675789872281; Tue, 07 Feb 2023 09:11:12 -0800 (PST) Received: from sleipner.berto.se (p4fca2792.dip0.t-ipconnect.de. [79.202.39.146]) by smtp.googlemail.com with ESMTPSA id n23-20020a1709062bd700b007a4e02e32ffsm7132298ejg.60.2023.02.07.09.11.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:11:11 -0800 (PST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Daniel Lezcano , Wolfram Sang , linux-pm@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH 2/2] drivers/thermal/rcar_gen3_thermal: Fix device initialization Date: Tue, 7 Feb 2023 18:10:11 +0100 Message-Id: <20230207171011.1596127-3-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230207171011.1596127-1-niklas.soderlund+renesas@ragnatech.se> References: <20230207171011.1596127-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The thermal zone is registered before the device is register and the thermal coefficients are calculated, providing a window for very incorrect readings. The reason why the zone was register before the device was fully initialized was that the presence of the set_trips() callback is used to determine if the driver supports interrupt or not, as it is not defined if the device is incapable of interrupts. Fix this by using the operations structure in the private data instead of the zone to determine if interrupts are available or not, and initialize the device before registering the zone. Signed-off-by: Niklas Söderlund Reviewed-by: Wolfram Sang --- drivers/thermal/rcar_gen3_thermal.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index bfa2ff20b945..1dedeece1a00 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -89,7 +89,8 @@ struct rcar_gen3_thermal_priv { struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM]; struct thermal_zone_device_ops ops; unsigned int num_tscs; - void (*thermal_init)(struct rcar_gen3_thermal_tsc *tsc); + void (*thermal_init)(struct rcar_gen3_thermal_priv *priv, + struct rcar_gen3_thermal_tsc *tsc); int ptat[3]; }; @@ -240,7 +241,7 @@ static irqreturn_t rcar_gen3_thermal_irq(int irq, void *data) for (i = 0; i < priv->num_tscs; i++) { status = rcar_gen3_thermal_read(priv->tscs[i], REG_GEN3_IRQSTR); rcar_gen3_thermal_write(priv->tscs[i], REG_GEN3_IRQSTR, 0); - if (status) + if (status && priv->tscs[i]->zone) thermal_zone_device_update(priv->tscs[i]->zone, THERMAL_EVENT_UNSPECIFIED); } @@ -311,7 +312,8 @@ static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv) return true; } -static void rcar_gen3_thermal_init_r8a7795es1(struct rcar_gen3_thermal_tsc *tsc) +static void rcar_gen3_thermal_init_r8a7795es1(struct rcar_gen3_thermal_priv *priv, + struct rcar_gen3_thermal_tsc *tsc) { rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, CTSR_THBGR); rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, 0x0); @@ -322,7 +324,7 @@ static void rcar_gen3_thermal_init_r8a7795es1(struct rcar_gen3_thermal_tsc *tsc) rcar_gen3_thermal_write(tsc, REG_GEN3_IRQCTL, 0x3F); rcar_gen3_thermal_write(tsc, REG_GEN3_IRQMSK, 0); - if (tsc->zone->ops->set_trips) + if (priv->ops.set_trips) rcar_gen3_thermal_write(tsc, REG_GEN3_IRQEN, IRQ_TEMPD1 | IRQ_TEMP2); @@ -338,7 +340,8 @@ static void rcar_gen3_thermal_init_r8a7795es1(struct rcar_gen3_thermal_tsc *tsc) usleep_range(1000, 2000); } -static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_tsc *tsc) +static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_priv *priv, + struct rcar_gen3_thermal_tsc *tsc) { u32 reg_val; @@ -350,7 +353,7 @@ static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_tsc *tsc) rcar_gen3_thermal_write(tsc, REG_GEN3_IRQCTL, 0); rcar_gen3_thermal_write(tsc, REG_GEN3_IRQMSK, 0); - if (tsc->zone->ops->set_trips) + if (priv->ops.set_trips) rcar_gen3_thermal_write(tsc, REG_GEN3_IRQEN, IRQ_TEMPD1 | IRQ_TEMP2); @@ -510,6 +513,9 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) for (i = 0; i < priv->num_tscs; i++) { struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; + priv->thermal_init(priv, tsc); + rcar_gen3_thermal_calc_coefs(priv, tsc, *ths_tj_1); + zone = devm_thermal_of_zone_register(dev, i, tsc, &priv->ops); if (IS_ERR(zone)) { dev_err(dev, "Sensor %u: Can't register thermal zone\n", i); @@ -518,9 +524,6 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) } tsc->zone = zone; - priv->thermal_init(tsc); - rcar_gen3_thermal_calc_coefs(priv, tsc, *ths_tj_1); - tsc->zone->tzp->no_hwmon = false; ret = thermal_add_hwmon_sysfs(tsc->zone); if (ret) @@ -559,8 +562,8 @@ static int __maybe_unused rcar_gen3_thermal_resume(struct device *dev) struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; struct thermal_zone_device *zone = tsc->zone; - priv->thermal_init(tsc); - if (zone->ops->set_trips) + priv->thermal_init(priv, tsc); + if (priv->ops.set_trips) rcar_gen3_thermal_set_trips(zone, zone->prev_low_trip, zone->prev_high_trip); }