From patchwork Mon Nov 5 09:32:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 992969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nvidia.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.b="d6HRKgJO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42pSD316mrz9sBh for ; Mon, 5 Nov 2018 20:33:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727522AbeKESv5 (ORCPT ); Mon, 5 Nov 2018 13:51:57 -0500 Received: from hqemgate14.nvidia.com ([216.228.121.143]:6271 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbeKESv4 (ORCPT ); Mon, 5 Nov 2018 13:51:56 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 05 Nov 2018 01:32:52 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 05 Nov 2018 01:32:59 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 05 Nov 2018 01:32:59 -0800 Received: from HQMAIL102.nvidia.com (172.18.146.10) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 5 Nov 2018 09:33:06 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL102.nvidia.com (172.18.146.10) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 5 Nov 2018 09:33:06 +0000 Received: from niwei-ubuntu.nvidia.com (Not Verified[10.19.225.182]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Mon, 05 Nov 2018 01:33:06 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v1 1/4] thermal: tegra: continue if sensor register fails Date: Mon, 5 Nov 2018 17:32:31 +0800 Message-ID: <1541410354-19090-2-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541410354-19090-1-git-send-email-wni@nvidia.com> References: <1541410354-19090-1-git-send-email-wni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1541410372; bh=YE/S17OzKcjiqh7ysTGXR48lrMGkSFYZxxuKOvxpNYU=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=d6HRKgJOTs+SZiVjk+xfi2YYIVMEEtQTQvjb8Ej727aj+FPrI9eiaRyaUrUsOBq8G EpiqBhpeOHjtEU/PWmqKaYziQRrgW9+cD64r0pFIcSflAPAqRf0+5TYowf8P940t/M zx3U5xiRlV5HqCtyWGYiDyAvOq26eovlO/RB4B/exBC67GhcUSFyFCzOqawRG7CsYm IXWRzi1iyLwUw16qi4wA9tAFMAGij4+fUPa0RxC1U512jFWkIIZd26Cu46GaJJHLGa g6R+qjhGqDmyW9gph232BY9T8ui3axvI2HGKi5p4sYdLObXZ5XZEpDRoNKkZAkPqvo YOTDdEkG0kmzg== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Don't bail when a sensor fails to register with the thermal zone and allow other sensors to register. This allows other sensors to register with thermal framework even if one sensor fails registration. Signed-off-by: Wei Ni Acked-by: Thierry Reding --- drivers/thermal/tegra/soctherm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index ed28110a3535..b708300303ff 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -1370,9 +1370,9 @@ static int tegra_soctherm_probe(struct platform_device *pdev) &tegra_of_thermal_ops); if (IS_ERR(z)) { err = PTR_ERR(z); - dev_err(&pdev->dev, "failed to register sensor: %d\n", + dev_warn(&pdev->dev, "failed to register sensor: %d\n", err); - goto disable_clocks; + continue; } zone->tz = z; @@ -1434,6 +1434,8 @@ static int __maybe_unused soctherm_resume(struct device *dev) struct thermal_zone_device *tz; tz = tegra->thermctl_tzs[soc->ttgs[i]->id]; + if (!tz) + continue; err = tegra_soctherm_set_hwtrips(dev, soc->ttgs[i], tz); if (err) { dev_err(&pdev->dev, From patchwork Mon Nov 5 09:32:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 992968 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nvidia.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.b="UQY+MmtS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42pSD02cRmz9sBh for ; Mon, 5 Nov 2018 20:33:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728928AbeKESv6 (ORCPT ); Mon, 5 Nov 2018 13:51:58 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:12467 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbeKESv6 (ORCPT ); Mon, 5 Nov 2018 13:51:58 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 05 Nov 2018 01:33:08 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 05 Nov 2018 01:33:01 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 05 Nov 2018 01:33:01 -0800 Received: from HQMAIL108.nvidia.com (172.18.146.13) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 5 Nov 2018 09:33:08 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 5 Nov 2018 09:33:08 +0000 Received: from niwei-ubuntu.nvidia.com (Not Verified[10.19.225.182]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Mon, 05 Nov 2018 01:33:08 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v1 2/4] thermal: tegra: remove unnecessary warnings Date: Mon, 5 Nov 2018 17:32:32 +0800 Message-ID: <1541410354-19090-3-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541410354-19090-1-git-send-email-wni@nvidia.com> References: <1541410354-19090-1-git-send-email-wni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1541410388; bh=m/aRnU00O9HPPDJzahgboRij5X/QIAmPClYqvNmazwo=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=UQY+MmtS7nxacUvtJ5KYDhiUGmmx8Ko1u3U9BPEqQkZVm0XQK+A+qaJV2B43/gLSE weVtES4bV2S76jjrEhSM2NS+5iZeXTMyaf0ToOqUJS6k360u+UGOFalPuzQffJRtxj WZK1nkb8WupKaAifxXX0b663pD3QGwmwbj038grU3RircDhnX8Bvq/7f8uftGm0qcm cA56CWlJUh/ZFhmtXjDZfm2Ed9prJDmGuCnVjmLWrELhInSLlH1OnMQE/glxqnsSzY eUUEoQBbtGetQ75Gk5FChVN99uQ0eh8Xap2sAvuAMQvUL6+DrvufzR5Trcth96KHxN qe8yY3Ld2JI6g== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Convert warnings to info as not all platforms may have all the thresholds and sensors enabled. Signed-off-by: Wei Ni --- drivers/thermal/tegra/soctherm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index b708300303ff..39a8bda07ac4 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -550,7 +550,7 @@ static int tegra_soctherm_set_hwtrips(struct device *dev, ret = tz->ops->get_crit_temp(tz, &temperature); if (ret) { - dev_warn(dev, "thermtrip: %s: missing critical temperature\n", + dev_info(dev, "thermtrip: %s: missing critical temperature\n", sg->name); goto set_throttle; } @@ -569,7 +569,7 @@ static int tegra_soctherm_set_hwtrips(struct device *dev, set_throttle: ret = get_hot_temp(tz, &trip, &temperature); if (ret) { - dev_warn(dev, "throttrip: %s: missing hot temperature\n", + dev_info(dev, "throttrip: %s: missing hot temperature\n", sg->name); return 0; } @@ -600,7 +600,7 @@ static int tegra_soctherm_set_hwtrips(struct device *dev, } if (i == THROTTLE_SIZE) - dev_warn(dev, "throttrip: %s: missing throttle cdev\n", + dev_info(dev, "throttrip: %s: missing throttle cdev\n", sg->name); return 0; From patchwork Mon Nov 5 09:32:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 992967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nvidia.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.b="Jpv2Yyg4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42pSCr4jG4z9sC7 for ; Mon, 5 Nov 2018 20:33:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726958AbeKESwA (ORCPT ); Mon, 5 Nov 2018 13:52:00 -0500 Received: from hqemgate14.nvidia.com ([216.228.121.143]:6275 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728971AbeKESwA (ORCPT ); Mon, 5 Nov 2018 13:52:00 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 05 Nov 2018 01:32:56 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 05 Nov 2018 01:33:03 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 05 Nov 2018 01:33:03 -0800 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 5 Nov 2018 09:33:10 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 5 Nov 2018 09:33:10 +0000 Received: from niwei-ubuntu.nvidia.com (Not Verified[10.19.225.182]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Mon, 05 Nov 2018 01:33:10 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v1 3/4] thermal: tegra: fix memory allocation Date: Mon, 5 Nov 2018 17:32:33 +0800 Message-ID: <1541410354-19090-4-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541410354-19090-1-git-send-email-wni@nvidia.com> References: <1541410354-19090-1-git-send-email-wni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1541410376; bh=C4fnQckN6Sd/pqit2s5lJD28cF6hUr2nh/oL11UV6g0=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=Jpv2Yyg40rU+5h9/whjIH6T0fP/RRhzPLN/4jJtmovhN+H3OvzhUSuIKyHZnWdw4U 8gQazZ82F0109RFK3ACprl7alS0F9YXF1nBfXJ8znpLi/YoHNPkJ+GnDPkAjDHzQ0+ U/lFs5oQU32vf7MtL6iXDBvPzMqOdHrlWbnrkk62iS8lU4ttG4FDF8fT37sfENJO+2 3FQLLAMJnuRMUegGsfmAjTPpU4aWE0VGyQ7Gp50k6ctSKrEZhkTUGwPXfB0IkVb+xU k6K7UXZZrSOlX0SnFvE0HbcE9vR5rk1aRvXbfSyR0HxSbkkranf5s+LzDB3YFTHa38 uqjKx43HbjMxA== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Fix memory allocation to store the pointers to thermal_zone_device. Signed-off-by: Wei Ni Acked-by: Thierry Reding --- drivers/thermal/tegra/soctherm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index 39a8bda07ac4..3042837364e8 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -1339,7 +1339,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev) } tegra->thermctl_tzs = devm_kcalloc(&pdev->dev, - soc->num_ttgs, sizeof(*z), + soc->num_ttgs, sizeof(z), GFP_KERNEL); if (!tegra->thermctl_tzs) return -ENOMEM; From patchwork Mon Nov 5 09:32:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 992966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nvidia.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.b="Zvc+a3rM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42pSCd0gNNz9sCh for ; Mon, 5 Nov 2018 20:33:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729035AbeKESwD (ORCPT ); Mon, 5 Nov 2018 13:52:03 -0500 Received: from hqemgate16.nvidia.com ([216.228.121.65]:4941 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728971AbeKESwC (ORCPT ); Mon, 5 Nov 2018 13:52:02 -0500 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 05 Nov 2018 01:33:20 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Mon, 05 Nov 2018 01:33:12 -0800 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Mon, 05 Nov 2018 01:33:12 -0800 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 5 Nov 2018 09:33:12 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 5 Nov 2018 09:33:12 +0000 Received: from niwei-ubuntu.nvidia.com (Not Verified[10.19.225.182]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Mon, 05 Nov 2018 01:33:12 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v1 4/4] thermal: tegra: fix coverity defect Date: Mon, 5 Nov 2018 17:32:34 +0800 Message-ID: <1541410354-19090-5-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541410354-19090-1-git-send-email-wni@nvidia.com> References: <1541410354-19090-1-git-send-email-wni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1541410401; bh=Q5lgwwI271wuGc9mM0mSl/fwyPck+Gs4fTtsLWe1/L4=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=Zvc+a3rMj0JGdW8jMbfYV9cuCTRbNaRsVXIZm8OmTVpdN/iKCkZ6uYQ3zamtqunJe SXpaARrVzKHfp25/b+5sW1hkqPd5O2poTIv7zijyDY24vEkTeEBZujpQNil6taUwBk TTl4kf2ex10OQtS82QErTzAQQFlgHdz6Q+RLunUQLxmm4SwNQxJsvtt4qw54SX74FB DBKEktTD/xQDQtHyDkp9lMYG99humDfilDvtBogGor2Q+e9cI6rY6ZWEX0KURneJ13 yyGRfYcXPw9f5vgvCWDV1xbDDjDdyE64+dbreFUXVYEQzfpxpl9XsRNfRl2w8A0UhG qq3wNiBdpyeMA== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Fix dereference dev before null check. Signed-off-by: Wei Ni --- drivers/thermal/tegra/soctherm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index 3042837364e8..96527df91f2a 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -397,7 +397,7 @@ static int throttrip_program(struct device *dev, struct soctherm_throt_cfg *stc, int trip_temp) { - struct tegra_soctherm *ts = dev_get_drvdata(dev); + struct tegra_soctherm *ts; int temp, cpu_throt, gpu_throt; unsigned int throt; u32 r, reg_off; @@ -405,6 +405,8 @@ static int throttrip_program(struct device *dev, if (!sg || !stc || !stc->init) return -EINVAL; + ts = dev_get_drvdata(dev); + temp = enforce_temp_range(dev, trip_temp) / ts->soc->thresh_grain; /* Hardcode LIGHT on LEVEL1 and HEAVY on LEVEL2 */