Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965891AbcCOT4c (ORCPT ); Tue, 15 Mar 2016 15:56:32 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33936 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965194AbcCOT43 (ORCPT ); Tue, 15 Mar 2016 15:56:29 -0400 Date: Tue, 15 Mar 2016 12:56:25 -0700 From: Eduardo Valentin To: Wei Ni Cc: rui.zhang@intel.com, thierry.reding@gmail.com, MLongnecker@nvidia.com, swarren@wwwdotorg.org, mikko.perttunen@kapsi.fi, linux-tegra@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH V7 03/12] thermal: tegra: get rid of PDIV/HOTSPOT hack Message-ID: <20160315195624.GE26619@localhost.localdomain> References: <1457665763-29781-1-git-send-email-wni@nvidia.com> <1457665763-29781-4-git-send-email-wni@nvidia.com> <20160314200539.GH1872@localhost.localdomain> <56E7AA01.4000305@nvidia.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="lteA1dqeVaWQ9QQl" Content-Disposition: inline In-Reply-To: <56E7AA01.4000305@nvidia.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4103 Lines: 117 --lteA1dqeVaWQ9QQl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 15, 2016 at 02:21:53PM +0800, Wei Ni wrote: >=20 >=20 > On 2016=E5=B9=B403=E6=9C=8815=E6=97=A5 04:05, Eduardo Valentin wrote: > > * PGP Signed by an unknown key > >=20 > > On Fri, Mar 11, 2016 at 11:09:14AM +0800, Wei Ni wrote: > >> Get rid of T124-specific PDIV/HOTSPOT hack. > >> tegra-soctherm.c contained a hack to set the SENSOR_PDIV and > >> SENSOR_HOTSPOT_OFFSET registers - it just did two writes of > >> T124-specific opaque values. Convert these into a form that can be > >> substituted on a per-chip basis, and into structure fields that have > >> at least some independent meaning. > >> > >> Signed-off-by: Wei Ni > >> --- > >> drivers/thermal/tegra/tegra-soctherm.c | 18 ++++++++++++++---- > >> 1 file changed, 14 insertions(+), 4 deletions(-) > >> > >> diff --git a/drivers/thermal/tegra/tegra-soctherm.c b/drivers/thermal/= tegra/tegra-soctherm.c > >> index b3ec0faa2bee..b4b791ebfbb6 100644 > >> --- a/drivers/thermal/tegra/tegra-soctherm.c > >> +++ b/drivers/thermal/tegra/tegra-soctherm.c > >> @@ -48,14 +48,12 @@ > >> #define SENSOR_CONFIG2_THERMB_SHIFT 0 > >> =20 > >> #define SENSOR_PDIV 0x1c0 > >> -#define SENSOR_PDIV_T124 0x8888 > >> #define SENSOR_PDIV_CPU_MASK (0xf << 12) > >> #define SENSOR_PDIV_GPU_MASK (0xf << 8) > >> #define SENSOR_PDIV_MEM_MASK (0xf << 4) > >> #define SENSOR_PDIV_PLLX_MASK (0xf << 0) > >> =20 > >> #define SENSOR_HOTSPOT_OFF 0x1c4 > >> -#define SENSOR_HOTSPOT_OFF_T124 0x00060600 > >> #define SENSOR_HOTSPOT_CPU_MASK (0xff << 16) > >> #define SENSOR_HOTSPOT_GPU_MASK (0xff << 8) > >> #define SENSOR_HOTSPOT_MEM_MASK (0xff << 0) > >> @@ -436,6 +434,7 @@ static int tegra_soctherm_probe(struct platform_de= vice *pdev) > >> struct resource *res; > >> unsigned int i; > >> int err; > >> + u32 pdiv, hotspot; > >> =20 > >> const struct tegra_tsensor *tsensors =3D t124_tsensors; > >> const struct tegra_tsensor_group **ttgs =3D tegra124_tsensor_groups; > >> @@ -493,8 +492,19 @@ static int tegra_soctherm_probe(struct platform_d= evice *pdev) > >> goto disable_clocks; > >> } > >> =20 > >> - writel(SENSOR_PDIV_T124, tegra->regs + SENSOR_PDIV); > >> - writel(SENSOR_HOTSPOT_OFF_T124, tegra->regs + SENSOR_HOTSPOT_OFF); > >> + /* Program pdiv and hotspot offsets per THERM */ > >> + pdiv =3D readl(tegra->regs + SENSOR_PDIV); > >> + hotspot =3D readl(tegra->regs + SENSOR_HOTSPOT_OFF); > >> + for (i =3D 0; i < TEGRA124_SOCTHERM_SENSOR_NUM; ++i) { > >> + pdiv =3D REG_SET_MASK(pdiv, ttgs[i]->pdiv_mask, > >> + ttgs[i]->pdiv); > >> + if (ttgs[i]->id !=3D TEGRA124_SOCTHERM_SENSOR_PLLX) > >> + hotspot =3D REG_SET_MASK(hotspot, > >> + ttgs[i]->pllx_hotspot_mask, > >> + ttgs[i]->pllx_hotspot_diff); > >> + } > >> + writel(pdiv, tegra->regs + SENSOR_PDIV); > >> + writel(hotspot, tegra->regs + SENSOR_HOTSPOT_OFF); > >=20 > > Is the above logic the same for all supported chips? e.g. do we always > > skip pllx for hotspot configuration? >=20 > Yes, this logic support Tegra124, Tegra210, and Tegra132 which I will sen= d out > in next series. Ok. Could you please add a comment then explaining why pllx is not needed for the hotspot configuration? >=20 > >=20 > >=20 > >> =20 > >> /* Initialize thermctl sensors */ > >> =20 > >> --=20 > >> 1.9.1 > >> > >=20 > > * Unknown Key > > * 0x7DA4E256 > >=20 --lteA1dqeVaWQ9QQl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJW6GjUAAoJEMLUO4d9pOJWrDgH/0SVkmyQgc6q2ET0+lqnnY2s ml7t0STHQwh8kaB/EQ6DSeT2sPGwvvwM2pa59ekMWI1x5SOr7p/qhHgHgPaL14RD SP75epHfDvYHZEN1gxEIOd8bgg1YCfLxL5Dq1VydpwVUlqVuXfW8xBUY2eWTE9T8 IA+PH+qvoyt+j6aVdW22iEpKOadluFJc+6AhYTKUsV9rlQzf9UAZHCUmEjI/Tku5 KUfDYmF4t6grDseBSpdHHohaxwdhF/Uhykl8ZepsO5X+ZriSODIXwFtORqFzLHjz SPmlQE9+3JbXibeXB/BugOQ89UjW6ypnk4BxMdhPkqp1BHHTBF/3Ag2ifBFpKiY= =a5Tx -----END PGP SIGNATURE----- --lteA1dqeVaWQ9QQl--