Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755098AbcCOGVy (ORCPT ); Tue, 15 Mar 2016 02:21:54 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:16659 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754579AbcCOGVr convert rfc822-to-8bit (ORCPT ); Tue, 15 Mar 2016 02:21:47 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 14 Mar 2016 23:21:00 -0700 Message-ID: <56E7AA01.4000305@nvidia.com> Date: Tue, 15 Mar 2016 14:21:53 +0800 From: Wei Ni User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Eduardo Valentin CC: , , , , , , , Subject: Re: [PATCH V7 03/12] thermal: tegra: get rid of PDIV/HOTSPOT hack References: <1457665763-29781-1-git-send-email-wni@nvidia.com> <1457665763-29781-4-git-send-email-wni@nvidia.com> <20160314200539.GH1872@localhost.localdomain> In-Reply-To: <20160314200539.GH1872@localhost.localdomain> X-Originating-IP: [10.19.224.146] X-ClientProxiedBy: HKMAIL104.nvidia.com (10.18.16.13) To HKMAIL101.nvidia.com (10.18.16.10) Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2947 Lines: 83 On 2016年03月15日 04:05, Eduardo Valentin wrote: > * PGP Signed by an unknown key > > 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 >> >> #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) >> >> #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_device *pdev) >> struct resource *res; >> unsigned int i; >> int err; >> + u32 pdiv, hotspot; >> >> const struct tegra_tsensor *tsensors = t124_tsensors; >> const struct tegra_tsensor_group **ttgs = tegra124_tsensor_groups; >> @@ -493,8 +492,19 @@ static int tegra_soctherm_probe(struct platform_device *pdev) >> goto disable_clocks; >> } >> >> - 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 = readl(tegra->regs + SENSOR_PDIV); >> + hotspot = readl(tegra->regs + SENSOR_HOTSPOT_OFF); >> + for (i = 0; i < TEGRA124_SOCTHERM_SENSOR_NUM; ++i) { >> + pdiv = REG_SET_MASK(pdiv, ttgs[i]->pdiv_mask, >> + ttgs[i]->pdiv); >> + if (ttgs[i]->id != TEGRA124_SOCTHERM_SENSOR_PLLX) >> + hotspot = 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); > > Is the above logic the same for all supported chips? e.g. do we always > skip pllx for hotspot configuration? Yes, this logic support Tegra124, Tegra210, and Tegra132 which I will send out in next series. > > >> >> /* Initialize thermctl sensors */ >> >> -- >> 1.9.1 >> > > * Unknown Key > * 0x7DA4E256 >