From patchwork Tue Nov 13 10:06:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 996992 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="OU8GSXWq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42vNZT00xKz9s9m for ; Tue, 13 Nov 2018 21:06:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731938AbeKMUDq (ORCPT ); Tue, 13 Nov 2018 15:03:46 -0500 Received: from hqemgate16.nvidia.com ([216.228.121.65]:15594 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731448AbeKMUDp (ORCPT ); Tue, 13 Nov 2018 15:03:45 -0500 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 13 Nov 2018 02:06:32 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Tue, 13 Nov 2018 02:06:23 -0800 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Tue, 13 Nov 2018 02:06:23 -0800 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 13 Nov 2018 10:06:23 +0000 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 13 Nov 2018 10:06:23 +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; Tue, 13 Nov 2018 10:06:23 +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 ; Tue, 13 Nov 2018 02:06:22 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v2 1/3] thermal: tegra: continue if sensor register fails Date: Tue, 13 Nov 2018 18:06:05 +0800 Message-ID: <1542103567-5521-2-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542103567-5521-1-git-send-email-wni@nvidia.com> References: <1542103567-5521-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=1542103592; bh=wh+6aFiP4fPQoSQeJZeVk6+n0tLre9/VfwW2MJg4tTg=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=OU8GSXWqq0x2ZRIOtlnyauDU/wkVn+EG1lYYjh+070kznFpcjVg8ysaYqY15Y0k6s s1qpY0Hue/b1egzYMDtxOU7ipjZN+3+ZVT1lHue+vLZEZu9cUKiyylf6PVdDAHlbX3 9+Q+zBKxT1uNuheeVEj2NDaHwzbT0UzfklxSSURf0frX/p6boCDYBSF2D0azwEk4lN RKJ1XwR4q1DU1BLuxZaqrqomeVQwd8onq6feuXwP/MyeH6ZQju3l3wFtxL7xmy4JRq 7kshaNwowI+Q4kD1paK4gJZT8NxIuXcS2LvMPRUKuuuFbDu//NWZNtZQlC7zDy6jIP b1smwDa1IJ0TA== 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 --- drivers/thermal/tegra/soctherm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index ed28110a3535..a824d2e63af3 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", - err); - goto disable_clocks; + dev_warn(&pdev->dev, "failed to register sensor %s: %d\n", + soc->ttgs[i]->name, err); + 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 Tue Nov 13 10:06:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 996990 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="UnCy2UWi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42vNZD3nLnz9s9m for ; Tue, 13 Nov 2018 21:06:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732008AbeKMUDs (ORCPT ); Tue, 13 Nov 2018 15:03:48 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:8794 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731448AbeKMUDr (ORCPT ); Tue, 13 Nov 2018 15:03:47 -0500 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 13 Nov 2018 02:06:19 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Tue, 13 Nov 2018 02:06:25 -0800 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Tue, 13 Nov 2018 02:06:25 -0800 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 13 Nov 2018 10:06:25 +0000 Received: from HQMAIL108.nvidia.com (172.18.146.13) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 13 Nov 2018 10:06:25 +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; Tue, 13 Nov 2018 10:06:25 +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 ; Tue, 13 Nov 2018 02:06:24 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v2 2/3] thermal: tegra: remove unnecessary warnings Date: Tue, 13 Nov 2018 18:06:06 +0800 Message-ID: <1542103567-5521-3-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542103567-5521-1-git-send-email-wni@nvidia.com> References: <1542103567-5521-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=1542103579; bh=reATQUwOg/Uzmb4lnGvhLuA0qkCQfVQ/FtzH4GzqvY0=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=UnCy2UWiOpUt5PvJ/Yl9Fy3X9k0I1DdhJ0b1q9nscEfCsc4ILQt/RxypL2qSxQ36p EmBWDGDHBBFzJmEmpMI7NY0oLcbBhZsr7zhqgfJ9Oo4fuGyHlL7bltA3tY9EhpbcSo +sMJU6zHTli70y8Eb3z1bRKfQiRpcGvW5r6R5Dch/aN++DItofnn/EVm6P+PbazQNI yDB23d7aLOsEK/1achzG4viZ1gI8nMyK7uFN8xeOuHmaJN4RFXT46tP+baegdQY0Xz BOtPqTd1HGOcTXE4/FeL8O1U7mmq/XUiiVH9XkKtN3w+ZFjWmCkxccT2QchR3txGmS gnbugOikuYxQA== 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 a824d2e63af3..161ef242bcca 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 Tue Nov 13 10:06:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 996991 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="Vu33SjCf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42vNZG2nFzz9sBZ for ; Tue, 13 Nov 2018 21:06:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732076AbeKMUDt (ORCPT ); Tue, 13 Nov 2018 15:03:49 -0500 Received: from hqemgate14.nvidia.com ([216.228.121.143]:7713 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731448AbeKMUDt (ORCPT ); Tue, 13 Nov 2018 15:03:49 -0500 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 13 Nov 2018 02:06:09 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Tue, 13 Nov 2018 02:06:27 -0800 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Tue, 13 Nov 2018 02:06:27 -0800 Received: from HQMAIL103.nvidia.com (172.20.187.11) by HQMAIL104.nvidia.com (172.18.146.11) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 13 Nov 2018 10:06:27 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL103.nvidia.com (172.20.187.11) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Tue, 13 Nov 2018 10:06:27 +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 ; Tue, 13 Nov 2018 02:06:26 -0800 From: Wei Ni To: , , CC: , , , Wei Ni Subject: [PATCH v2 3/3] thermal: tegra: fix memory allocation Date: Tue, 13 Nov 2018 18:06:07 +0800 Message-ID: <1542103567-5521-4-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542103567-5521-1-git-send-email-wni@nvidia.com> References: <1542103567-5521-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=1542103570; bh=8nBqymvQ6Qtdv79G+fvJHJGiahRJFTaQXHo5R88mI8w=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=Vu33SjCfH/fUfiKhPbZsXROU5+ZgtX32lwa9Eqa5VbelXn+mTU+kXOWPU37WCzSP9 Ln5b/DaYt0EX3Xj5MxvnOTN0Mi+lpoN+p8+AiLTyOy2jsKWrN4ceWuWR7VpMXOqNcJ ctWt65DtQu98EIKzreZ3x+QbktwZPWf4qfQnViI79qgm5CBTCE3dJEDmlzA4VpSVlA 5wETPWN0aD2TyBWSFK4AFAqIaYuoT0xBV0wXzCXmIm1idnGGAPwQRF3jtON3yfkQpy ru/+GdFdrjeXAJrswdAj2nbSO9KAyUehttfohJqzppFQHsoRwfBRCsElWZ7oj1L+xh h4vRGNKMl1S8w== 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 161ef242bcca..96ca10789f17 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;