Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965719AbcCPI4Q (ORCPT ); Wed, 16 Mar 2016 04:56:16 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:11710 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751795AbcCPI4K (ORCPT ); Wed, 16 Mar 2016 04:56:10 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Wed, 16 Mar 2016 01:55:21 -0700 From: Wei Ni To: , , CC: , , , , , , Wei Ni Subject: [PATCH V8 02/14] thermal: tegra: combine sensor group-related data Date: Wed, 16 Mar 2016 16:55:59 +0800 Message-ID: <1458118571-29717-3-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458118571-29717-1-git-send-email-wni@nvidia.com> References: <1458118571-29717-1-git-send-email-wni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-Originating-IP: [10.19.224.146] X-ClientProxiedBy: HKMAIL103.nvidia.com (10.18.16.12) To HKMAIL101.nvidia.com (10.18.16.10) Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 10630 Lines: 324 Combine sensor group-related data structures into struct tegra_tsensor_group. This provides a single location for sensor group data storage. More sensor group data will be added in subsequent patches. Signed-off-by: Wei Ni --- drivers/thermal/tegra/tegra-soctherm.c | 145 +++++++++++++++++++----- include/dt-bindings/thermal/tegra124-soctherm.h | 1 + 2 files changed, 119 insertions(+), 27 deletions(-) diff --git a/drivers/thermal/tegra/tegra-soctherm.c b/drivers/thermal/tegra/tegra-soctherm.c index 0018ccd51de4..b3ec0faa2bee 100644 --- a/drivers/thermal/tegra/tegra-soctherm.c +++ b/drivers/thermal/tegra/tegra-soctherm.c @@ -28,6 +28,7 @@ #include #include +#include #define SENSOR_CONFIG0 0 #define SENSOR_CONFIG0_STOP BIT(0) @@ -48,12 +49,24 @@ #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) + #define SENSOR_TEMP1 0x1c8 +#define SENSOR_TEMP1_CPU_TEMP_MASK (0xffff << 16) +#define SENSOR_TEMP1_GPU_TEMP_MASK 0xffff #define SENSOR_TEMP2 0x1cc +#define SENSOR_TEMP2_MEM_TEMP_MASK (0xffff << 16) +#define SENSOR_TEMP2_PLLX_TEMP_MASK 0xffff -#define SENSOR_TEMP_MASK 0xffff #define READBACK_VALUE_MASK 0xff00 #define READBACK_VALUE_SHIFT 8 #define READBACK_ADD_HALF BIT(7) @@ -77,8 +90,36 @@ #define NOMINAL_CALIB_FT_T124 105 #define NOMINAL_CALIB_CP_T124 25 +/* get val from register(r) mask bits(m) */ +#define REG_GET_MASK(r, m) (((r) & (m)) >> (ffs(m) - 1)) +/* set val(v) to mask bits(m) of register(r) */ +#define REG_SET_MASK(r, m, v) (((r) & ~(m)) | \ + (((v) & (m >> (ffs(m) - 1))) << (ffs(m) - 1))) + +/** + * struct tegra_tsensor_group - SOC_THERM sensor group data + * @name: short name of the temperature sensor group + * @id: numeric ID of the temperature sensor group + * @sensor_temp_offset: offset of the SENSOR_TEMP* register + * @sensor_temp_mask: bit mask for this sensor group in SENSOR_TEMP* register + * @pdiv: the sensor count post-divider to use during runtime + * @pdiv_ate: the sensor count post-divider used during automated test + * @pdiv_mask: register bitfield mask for the PDIV field for this sensor + * @pllx_hotspot_diff: hotspot offset from the PLLX sensor, must be 0 for + PLLX sensor group + * @pllx_hotspot_mask: register bitfield mask for the HOTSPOT field + */ +struct tegra_tsensor_group { + const char *name; + u8 id; + u16 sensor_temp_offset; + u32 sensor_temp_mask; + u32 pdiv, pdiv_ate, pdiv_mask; + u32 pllx_hotspot_diff, pllx_hotspot_mask; +}; + struct tegra_tsensor_configuration { - u32 tall, tsample, tiddq_en, ten_count, pdiv, tsample_ate, pdiv_ate; + u32 tall, tiddq_en, ten_count, tsample, tsample_ate; }; struct tegra_tsensor { @@ -86,21 +127,74 @@ struct tegra_tsensor { u32 base, calib_fuse_offset; /* Correction values used to modify values read from calibration fuses */ s32 fuse_corr_alpha, fuse_corr_beta; + const struct tegra_tsensor_group *group; }; struct tegra_thermctl_zone { void __iomem *reg; - unsigned int shift; + u32 mask; }; static const struct tegra_tsensor_configuration t124_tsensor_config = { .tall = 16300, - .tsample = 120, .tiddq_en = 1, .ten_count = 1, - .pdiv = 8, + .tsample = 120, .tsample_ate = 480, - .pdiv_ate = 8 +}; + +static const struct tegra_tsensor_group tegra124_tsensor_group_cpu = { + .id = TEGRA124_SOCTHERM_SENSOR_CPU, + .name = "cpu", + .sensor_temp_offset = SENSOR_TEMP1, + .sensor_temp_mask = SENSOR_TEMP1_CPU_TEMP_MASK, + .pdiv = 8, + .pdiv_ate = 8, + .pdiv_mask = SENSOR_PDIV_CPU_MASK, + .pllx_hotspot_diff = 10, + .pllx_hotspot_mask = SENSOR_HOTSPOT_CPU_MASK, +}; + +static const struct tegra_tsensor_group tegra124_tsensor_group_gpu = { + .id = TEGRA124_SOCTHERM_SENSOR_GPU, + .name = "gpu", + .sensor_temp_offset = SENSOR_TEMP1, + .sensor_temp_mask = SENSOR_TEMP1_GPU_TEMP_MASK, + .pdiv = 8, + .pdiv_ate = 8, + .pdiv_mask = SENSOR_PDIV_GPU_MASK, + .pllx_hotspot_diff = 5, + .pllx_hotspot_mask = SENSOR_HOTSPOT_GPU_MASK, +}; + +static const struct tegra_tsensor_group tegra124_tsensor_group_pll = { + .id = TEGRA124_SOCTHERM_SENSOR_PLLX, + .name = "pll", + .sensor_temp_offset = SENSOR_TEMP2, + .sensor_temp_mask = SENSOR_TEMP2_PLLX_TEMP_MASK, + .pdiv = 8, + .pdiv_ate = 8, + .pdiv_mask = SENSOR_PDIV_PLLX_MASK, + .pllx_hotspot_diff = 0, + .pllx_hotspot_mask = SENSOR_HOTSPOT_MEM_MASK, +}; + +static const struct tegra_tsensor_group tegra124_tsensor_group_mem = { + .id = TEGRA124_SOCTHERM_SENSOR_MEM, + .name = "mem", + .sensor_temp_offset = SENSOR_TEMP2, + .sensor_temp_mask = SENSOR_TEMP2_MEM_TEMP_MASK, + .pdiv = 8, + .pdiv_ate = 8, + .pdiv_mask = SENSOR_PDIV_MEM_MASK, +}; + +static const struct tegra_tsensor_group * +tegra124_tsensor_groups[TEGRA124_SOCTHERM_SENSOR_NUM] = { + &tegra124_tsensor_group_cpu, + &tegra124_tsensor_group_gpu, + &tegra124_tsensor_group_pll, + &tegra124_tsensor_group_mem, }; static const struct tegra_tsensor t124_tsensors[] = { @@ -110,6 +204,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x098, .fuse_corr_alpha = 1135400, .fuse_corr_beta = -6266900, + .group = &tegra124_tsensor_group_cpu, }, { .config = &t124_tsensor_config, @@ -117,6 +212,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x084, .fuse_corr_alpha = 1122220, .fuse_corr_beta = -5700700, + .group = &tegra124_tsensor_group_cpu, }, { .config = &t124_tsensor_config, @@ -124,6 +220,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x088, .fuse_corr_alpha = 1127000, .fuse_corr_beta = -6768200, + .group = &tegra124_tsensor_group_cpu, }, { .config = &t124_tsensor_config, @@ -131,6 +228,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x12c, .fuse_corr_alpha = 1110900, .fuse_corr_beta = -6232000, + .group = &tegra124_tsensor_group_cpu, }, { .config = &t124_tsensor_config, @@ -138,6 +236,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x158, .fuse_corr_alpha = 1122300, .fuse_corr_beta = -5936400, + .group = &tegra124_tsensor_group_mem, }, { .config = &t124_tsensor_config, @@ -145,6 +244,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x15c, .fuse_corr_alpha = 1145700, .fuse_corr_beta = -7124600, + .group = &tegra124_tsensor_group_mem, }, { .config = &t124_tsensor_config, @@ -152,6 +252,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x154, .fuse_corr_alpha = 1120100, .fuse_corr_beta = -6000500, + .group = &tegra124_tsensor_group_gpu, }, { .config = &t124_tsensor_config, @@ -159,6 +260,7 @@ static const struct tegra_tsensor t124_tsensors[] = { .calib_fuse_offset = 0x160, .fuse_corr_alpha = 1106500, .fuse_corr_beta = -6729300, + .group = &tegra124_tsensor_group_pll, }, }; @@ -167,8 +269,6 @@ struct tegra_soctherm { struct clk *clock_tsensor; struct clk *clock_soctherm; void __iomem *regs; - -#define ZONE_NUMBER 4 }; struct tsensor_shared_calibration { @@ -237,8 +337,8 @@ calculate_tsensor_calibration(const struct tegra_tsensor *sensor, delta_sens = actual_tsensor_ft - actual_tsensor_cp; delta_temp = shared->actual_temp_ft - shared->actual_temp_cp; - mult = sensor->config->pdiv * sensor->config->tsample_ate; - div = sensor->config->tsample * sensor->config->pdiv_ate; + mult = sensor->group->pdiv * sensor->config->tsample_ate; + div = sensor->config->tsample * sensor->group->pdiv_ate; therma = div64_s64_precise((s64) delta_temp * (1LL << 13) * mult, (s64) delta_sens * div); @@ -311,7 +411,8 @@ static int tegra_thermctl_get_temp(void *data, int *out_temp) struct tegra_thermctl_zone *zone = data; u32 val; - val = (readl(zone->reg) >> zone->shift) & SENSOR_TEMP_MASK; + val = readl(zone->reg); + val = REG_GET_MASK(val, zone->mask); *out_temp = translate_temp(val); return 0; @@ -327,18 +428,6 @@ static const struct of_device_id tegra_soctherm_of_match[] = { }; MODULE_DEVICE_TABLE(of, tegra_soctherm_of_match); -struct thermctl_zone_desc { - unsigned int offset; - unsigned int shift; -}; - -static const struct thermctl_zone_desc t124_thermctl_temp_zones[] = { - { SENSOR_TEMP1, 16 }, - { SENSOR_TEMP2, 16 }, - { SENSOR_TEMP1, 0 }, - { SENSOR_TEMP2, 0 } -}; - static int tegra_soctherm_probe(struct platform_device *pdev) { struct tegra_soctherm *tegra; @@ -349,6 +438,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev) int err; const struct tegra_tsensor *tsensors = t124_tsensors; + const struct tegra_tsensor_group **ttgs = tegra124_tsensor_groups; tegra = devm_kzalloc(&pdev->dev, sizeof(*tegra), GFP_KERNEL); if (!tegra) @@ -408,7 +498,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev) /* Initialize thermctl sensors */ - for (i = 0; i < ZONE_NUMBER; ++i) { + for (i = 0; i < TEGRA124_SOCTHERM_SENSOR_NUM; ++i) { struct tegra_thermctl_zone *zone = devm_kzalloc(&pdev->dev, sizeof(*zone), GFP_KERNEL); if (!zone) { @@ -416,10 +506,11 @@ static int tegra_soctherm_probe(struct platform_device *pdev) goto disable_clocks; } - zone->reg = tegra->regs + t124_thermctl_temp_zones[i].offset; - zone->shift = t124_thermctl_temp_zones[i].shift; + zone->reg = tegra->regs + ttgs[i]->sensor_temp_offset; + zone->mask = ttgs[i]->sensor_temp_mask; - z = devm_thermal_zone_of_sensor_register(&pdev->dev, i, zone, + z = devm_thermal_zone_of_sensor_register(&pdev->dev, + ttgs[i]->id, zone, &tegra_of_thermal_ops); if (IS_ERR(z)) { err = PTR_ERR(z); diff --git a/include/dt-bindings/thermal/tegra124-soctherm.h b/include/dt-bindings/thermal/tegra124-soctherm.h index 85aaf66690f9..729ab9fc325e 100644 --- a/include/dt-bindings/thermal/tegra124-soctherm.h +++ b/include/dt-bindings/thermal/tegra124-soctherm.h @@ -9,5 +9,6 @@ #define TEGRA124_SOCTHERM_SENSOR_MEM 1 #define TEGRA124_SOCTHERM_SENSOR_GPU 2 #define TEGRA124_SOCTHERM_SENSOR_PLLX 3 +#define TEGRA124_SOCTHERM_SENSOR_NUM 4 #endif -- 1.9.1