From patchwork Sat Feb 11 08:47:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 55760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1402537wrn; Sat, 11 Feb 2023 00:54:50 -0800 (PST) X-Google-Smtp-Source: AK7set/j0Mph0F6TQWVSrqd7T3Si1ztASvfRppzPxTrDj+UtHM140WWLKTVQ8to5ATqGhaTEDW5s X-Received: by 2002:a17:902:ce83:b0:193:38ce:7bb8 with SMTP id f3-20020a170902ce8300b0019338ce7bb8mr21274749plg.37.1676105690142; Sat, 11 Feb 2023 00:54:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676105690; cv=none; d=google.com; s=arc-20160816; b=cgWy1Me3kTFBRoVDn6YKJd7NbrrGKs3TBglHx2Bl4cwClDZ3iG4XSpf6stFePY5wRF it/MBVU5VXwtnQ5rQ4ZsJwnXeGZa+kD42ia8PtxB7KM1B1FsIPziF4DFk3LIYWGK+G95 jgr+p0Ez13B9cvm3J9y58IHLtsughp2d9wW55vD7PMZNr76saZZ03KTVRzFMbkqnjT6u 8oJCnGMUQDXJmNWMg+l6GlyWlV8SzWJtIolYx252fVK8sIqo70a13Xv3H16cmKoB0xhp He8KibJpptPyf3DZdSuXQzcqqVSYhObv3NGgz4O8JDporNonvuw9mu/gZoEqf7TUtArJ P1Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jq+4qyZgjn7Ux2ZPfRgOnvin67k5jNYNMyXMT0aIWkM=; b=07EcajcPbVv0tdJBakmLR/Trwdh+nIwhBmAGMgrYuH63yFwkSKq8nljeyv4+iDdxvK Xctq1H/j3fFbvRPDBGsjpT0kuMVpC3KekpeyTcYwYDbPhjRbU/W6Fn/JRDJpD1gGYSmL Hp9oUr3h/uIfRvhGmF0Gdn5WlEkwQPMSnPUvVeUlNboNiTPfCrVHfINA/l1ZGnnedkhX NrMat9lfOWnSYax3UVjG2fLZBBoq8u6XjLb03lfp5oecbQyjRJcvnp3zBXmaGyVgSOok VawuTwE/qCkQuGXD3nTBNahvPgl5Zi4vpzj/u2H1ueZCeS8F1P0ZT9kkGj0TwJmWXGtW Dzaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=MZZ588Sp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m12-20020a170902c44c00b001948e6ba8f3si1327145plm.315.2023.02.11.00.54.37; Sat, 11 Feb 2023 00:54:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=MZZ588Sp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229869AbjBKIsA (ORCPT + 99 others); Sat, 11 Feb 2023 03:48:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjBKIrx (ORCPT ); Sat, 11 Feb 2023 03:47:53 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BC531ABCA for ; Sat, 11 Feb 2023 00:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=/YjnQpFhErZubY 7S1AQiEv/HeNJShkh37dU+bd91wQU=; b=MZZ588SppR9zVxOnE+9kGXUuely904 8JczVC5OO785aSQ+EGpgAFgv9/dejLLl3oReVhDgA96y87RYE8zrum4LQolkBaAA 8Vwrz5uxV1y8uq5Gs1SqmYtwYa8oXVG+r+fFwHujy0JQ+9f+CoxJB4OlNb6MUL3m 7GROMyPGH0tOQ= Received: (qmail 2337587 invoked from network); 11 Feb 2023 09:47:31 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 11 Feb 2023 09:47:31 +0100 X-UD-Smtp-Session: l3s3148p1@TTIYqmj0Dpcujntl From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Yoshihiro Shimoda , Wolfram Sang , =?utf-8?q?Niklas_S=C3=B6de?= =?utf-8?q?rlund?= , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RFT 2/3] drivers/thermal/rcar_gen3_thermal: refactor reading fuses into seprarate function Date: Sat, 11 Feb 2023 09:47:26 +0100 Message-Id: <20230211084728.27832-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230211084728.27832-1-wsa+renesas@sang-engineering.com> References: <20230211084728.27832-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757524200328608167?= X-GMAIL-MSGID: =?utf-8?q?1757524200328608167?= Gen4 will be very different, so refactor Gen3 access into separate call first. Signed-off-by: Wolfram Sang --- drivers/thermal/rcar_gen3_thermal.c | 60 +++++++++++++++++------------ 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index bfccb91bda21..c88ca7e04710 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -77,8 +77,11 @@ struct equation_coefs { int b2; }; +struct rcar_gen3_thermal_priv; + struct rcar_thermal_info { int ths_tj_1; + void (*read_fuses)(struct rcar_gen3_thermal_priv *priv); }; struct rcar_gen3_thermal_tsc { @@ -259,6 +262,34 @@ static const struct soc_device_attribute r8a7795es1[] = { { /* sentinel */ } }; +static void rcar_gen3_thermal_read_fuses_gen3(struct rcar_gen3_thermal_priv *priv) +{ + unsigned int i; + + /* + * Set the pseudo calibration points with fused values. + * PTAT is shared between all TSCs but only fused for the first + * TSC while THCODEs are fused for each TSC. + */ + priv->ptat[0] = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_PTAT1) & + GEN3_FUSE_MASK; + priv->ptat[1] = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_PTAT2) & + GEN3_FUSE_MASK; + priv->ptat[2] = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_PTAT3) & + GEN3_FUSE_MASK; + + for (i = 0; i < priv->num_tscs; i++) { + struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; + + tsc->thcode[0] = rcar_gen3_thermal_read(tsc, REG_GEN3_THCODE1) & + GEN3_FUSE_MASK; + tsc->thcode[1] = rcar_gen3_thermal_read(tsc, REG_GEN3_THCODE2) & + GEN3_FUSE_MASK; + tsc->thcode[2] = rcar_gen3_thermal_read(tsc, REG_GEN3_THCODE3) & + GEN3_FUSE_MASK; + } +} + static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv) { unsigned int i; @@ -266,7 +297,8 @@ static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv) /* If fuses are not set, fallback to pseudo values. */ thscp = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_THSCP); - if ((thscp & THSCP_COR_PARA_VLD) != THSCP_COR_PARA_VLD) { + if (!priv->info->read_fuses || + (thscp & THSCP_COR_PARA_VLD) != THSCP_COR_PARA_VLD) { /* Default THCODE values in case FUSEs are not set. */ static const int thcodes[TSC_MAX_NUM][3] = { { 3397, 2800, 2221 }, @@ -291,29 +323,7 @@ static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv) return false; } - /* - * Set the pseudo calibration points with fused values. - * PTAT is shared between all TSCs but only fused for the first - * TSC while THCODEs are fused for each TSC. - */ - priv->ptat[0] = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_PTAT1) & - GEN3_FUSE_MASK; - priv->ptat[1] = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_PTAT2) & - GEN3_FUSE_MASK; - priv->ptat[2] = rcar_gen3_thermal_read(priv->tscs[0], REG_GEN3_PTAT3) & - GEN3_FUSE_MASK; - - for (i = 0; i < priv->num_tscs; i++) { - struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; - - tsc->thcode[0] = rcar_gen3_thermal_read(tsc, REG_GEN3_THCODE1) & - GEN3_FUSE_MASK; - tsc->thcode[1] = rcar_gen3_thermal_read(tsc, REG_GEN3_THCODE2) & - GEN3_FUSE_MASK; - tsc->thcode[2] = rcar_gen3_thermal_read(tsc, REG_GEN3_THCODE3) & - GEN3_FUSE_MASK; - } - + priv->info->read_fuses(priv); return true; } @@ -371,10 +381,12 @@ static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_priv *priv, static const struct rcar_thermal_info rcar_m3w_thermal_info = { .ths_tj_1 = 116, + .read_fuses = rcar_gen3_thermal_read_fuses_gen3, }; static const struct rcar_thermal_info rcar_gen3_thermal_info = { .ths_tj_1 = 126, + .read_fuses = rcar_gen3_thermal_read_fuses_gen3, }; static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {