From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BA18C2D0CE for ; Fri, 3 Jan 2020 06:44:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D127224125 for ; Fri, 3 Jan 2020 06:44:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bKf8RY2U"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="a5u2SUAB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D127224125 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AcX2tbNNspjNFMiG42eg8ANgj/7dSpXWYheMM8UTP1M=; b=bKf8RY2UTmKi0S T69HPfYVYO04UYJSc0m4bx9iWjuUQYe+JXWPDZN2hn6vXs63PBG5yO4fHMmJMGjkx39pkI2ADqvzA 0DOq8vv6+NNkYGN9QpSzdIaEcqTBs9N43iiTa2RrPn9N701eytFE/5hM1omPMC06u7fX+bvHSJpbe IZ3tvyih3+fmSNQWUhXvIDdUGeagc157H0XOGRVf+cM/fcs1nTjAnt1WHjvsDDSC4YHlljFH3BC8D 9HKrdehQ5Gjl3CA89sgoRIC7sdnePAI52zaKOaAExcRJ72xbzjYYrpxcEAENaf8UWhjN9RA4G1D6G 4Hz6L+E4aURlP76pr0GQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inGhE-0004mv-Eh; Fri, 03 Jan 2020 06:44:32 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inGhB-0004lI-EK; Fri, 03 Jan 2020 06:44:31 +0000 X-UUID: a583988803af45e4b947fe748b166e23-20200102 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nZu5Vg6KMNlzJgVAxVNPrImqFUM2QdXibq/TjqkgBuo=; b=a5u2SUABpErw+Z3MiXyeTKhfpmQ8l83pcyM/AAGPQx2foGxH8WoivR52CXmHdN2QidfbvAsxwRgaK1/AmLlEv8XJC07879w1XG43Lz4zzeS0W9zLbSLh1NxFNtoDFaqWPGWE8sys54B4LnQ1lIF9nbbsBbL7A8n0sl1SrWq7HSU=; X-UUID: a583988803af45e4b947fe748b166e23-20200102 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1050637886; Thu, 02 Jan 2020 22:44:23 -0800 Received: from mtkmbs05n1.mediatek.inc (172.21.101.15) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 2 Jan 2020 22:44:37 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 3 Jan 2020 14:43:44 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 3 Jan 2020 14:44:09 +0800 From: Michael Kao To: Zhang Rui , Eduardo Valentin , Daniel Lezcano , Rob Herring , Mark Rutland , Matthias Brugger , , , Subject: [PATCH v3, 7/8] thermal: mediatek: add another get_temp ops for thermal sensors Date: Fri, 3 Jan 2020 14:44:06 +0800 Message-ID: <20200103064407.19861-8-michael.kao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200103064407.19861-1-michael.kao@mediatek.com> References: <20200103064407.19861-1-michael.kao@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200102_224429_492158_25E919C9 X-CRM114-Status: GOOD ( 17.42 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michael Kao Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Provide thermal zone to read thermal sensor in the SoC. We can read all the thermal sensors value in the SoC by the node /sys/class/thermal/ Bypass the failure that non cpu_thermal sensor is not find in thermal-zones in dts, which is normal for mt8173, so prompt a warning here instead of failing. Return -EAGAIN instead of -EACCESS on the first read of sensor that often are bogus values. This can avoid following warning on boot: thermal thermal_zone6: failed to read out thermal zone (-13) Signed-off-by: Michael Kao Signed-off-by: Hsin-Yi Wang --- drivers/thermal/mtk_thermal.c | 74 +++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index d6fabd0a7da6..9be9fcb18d9e 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -225,6 +225,11 @@ enum { struct mtk_thermal; +struct mtk_thermal_zone { + struct mtk_thermal *mt; + int id; +}; + struct thermal_bank_cfg { unsigned int num_sensors; const int *sensors; @@ -607,7 +612,7 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) * not immediately shut down. */ if (temp > 200000) - temp = 0; + temp = -EAGAIN; if (temp > max) max = temp; @@ -618,7 +623,8 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) static int mtk_read_temp(void *data, int *temperature) { - struct mtk_thermal *mt = data; + struct mtk_thermal_zone *tz = data; + struct mtk_thermal *mt = tz->mt; int i; int tempmax = INT_MIN; @@ -631,16 +637,48 @@ static int mtk_read_temp(void *data, int *temperature) mtk_thermal_put_bank(bank); } - *temperature = tempmax; return 0; } +static int mtk_read_sensor_temp(void *data, int *temperature) +{ + struct mtk_thermal_zone *tz = data; + struct mtk_thermal *mt = tz->mt; + const struct mtk_thermal_data *conf = mt->conf; + int id = tz->id - 1; + int temp = INT_MIN; + u32 raw; + + if (id < 0) + return -EACCES; + + raw = readl(mt->thermal_base + conf->msr[id]); + + temp = raw_to_mcelsius(mt, id, raw); + + /* + * The first read of a sensor often contains very high bogus + * temperature value. Filter these out so that the system does + * not immediately shut down. + */ + + if (temp > 200000) + return -EAGAIN; + + *temperature = temp; + return 0; +} + static const struct thermal_zone_of_device_ops mtk_thermal_ops = { .get_temp = mtk_read_temp, }; +static const struct thermal_zone_of_device_ops mtk_thermal_sensor_ops = { + .get_temp = mtk_read_sensor_temp, +}; + static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, u32 apmixed_phys_base, u32 auxadc_phys_base, int ctrl_id) @@ -873,6 +911,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) struct resource *res; u64 auxadc_phys_base, apmixed_phys_base; struct thermal_zone_device *tzdev; + struct mtk_thermal_zone *tz; mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) @@ -954,11 +993,30 @@ static int mtk_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mt); - tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt, - &mtk_thermal_ops); - if (IS_ERR(tzdev)) { - ret = PTR_ERR(tzdev); - goto err_disable_clk_peri_therm; + for (i = 0; i < mt->conf->num_sensors + 1; i++) { + tz = kmalloc(sizeof(*tz), GFP_KERNEL); + if (!tz) + return -ENOMEM; + + tz->mt = mt; + tz->id = i; + + tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, i, + tz, (i == 0) ? + &mtk_thermal_ops : &mtk_thermal_sensor_ops); + + if (IS_ERR(tzdev)) { + if (PTR_ERR(tzdev) == -ENODEV) { + dev_warn(&pdev->dev, + "sensor %d not registered in thermal zone in dt\n", + i); + continue; + } + if (IS_ERR(tzdev) != -EACCES) { + ret = PTR_ERR(tzdev); + goto err_disable_clk_peri_therm; + } + } } return 0; -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3050AC2D0CE for ; Fri, 3 Jan 2020 06:44:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDF0B24649 for ; Fri, 3 Jan 2020 06:44:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="a5u2SUAB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727206AbgACGoR (ORCPT ); Fri, 3 Jan 2020 01:44:17 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:62118 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726180AbgACGoR (ORCPT ); Fri, 3 Jan 2020 01:44:17 -0500 X-UUID: 218839f4868f4a36a440e08c7b5ac2a6-20200103 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nZu5Vg6KMNlzJgVAxVNPrImqFUM2QdXibq/TjqkgBuo=; b=a5u2SUABpErw+Z3MiXyeTKhfpmQ8l83pcyM/AAGPQx2foGxH8WoivR52CXmHdN2QidfbvAsxwRgaK1/AmLlEv8XJC07879w1XG43Lz4zzeS0W9zLbSLh1NxFNtoDFaqWPGWE8sys54B4LnQ1lIF9nbbsBbL7A8n0sl1SrWq7HSU=; X-UUID: 218839f4868f4a36a440e08c7b5ac2a6-20200103 Received: from mtkmrs01.mediatek.inc [(172.21.131.159)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1556896153; Fri, 03 Jan 2020 14:44:11 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 3 Jan 2020 14:43:44 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 3 Jan 2020 14:44:09 +0800 From: Michael Kao To: Zhang Rui , Eduardo Valentin , Daniel Lezcano , Rob Herring , Mark Rutland , Matthias Brugger , , , CC: , , , , Michael Kao Subject: [PATCH v3,7/8] thermal: mediatek: add another get_temp ops for thermal sensors Date: Fri, 3 Jan 2020 14:44:06 +0800 Message-ID: <20200103064407.19861-8-michael.kao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200103064407.19861-1-michael.kao@mediatek.com> References: <20200103064407.19861-1-michael.kao@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org UHJvdmlkZSB0aGVybWFsIHpvbmUgdG8gcmVhZCB0aGVybWFsIHNlbnNvcg0KaW4gdGhlIFNvQy4g V2UgY2FuIHJlYWQgYWxsIHRoZSB0aGVybWFsIHNlbnNvcnMNCnZhbHVlIGluIHRoZSBTb0MgYnkg dGhlIG5vZGUgL3N5cy9jbGFzcy90aGVybWFsLw0KDQpCeXBhc3MgdGhlIGZhaWx1cmUgdGhhdCBu b24gY3B1X3RoZXJtYWwgc2Vuc29yIGlzIG5vdCBmaW5kIGluIHRoZXJtYWwtem9uZXMNCmluIGR0 cywgd2hpY2ggaXMgbm9ybWFsIGZvciBtdDgxNzMsIHNvIHByb21wdCBhIHdhcm5pbmcgaGVyZSBp bnN0ZWFkIG9mDQpmYWlsaW5nLg0KDQpSZXR1cm4gLUVBR0FJTiBpbnN0ZWFkIG9mIC1FQUNDRVNT IG9uIHRoZSBmaXJzdCByZWFkIG9mIHNlbnNvciB0aGF0DQpvZnRlbiBhcmUgYm9ndXMgdmFsdWVz LiBUaGlzIGNhbiBhdm9pZCBmb2xsb3dpbmcgd2FybmluZyBvbiBib290Og0KDQogIHRoZXJtYWwg dGhlcm1hbF96b25lNjogZmFpbGVkIHRvIHJlYWQgb3V0IHRoZXJtYWwgem9uZSAoLTEzKQ0KDQpT aWduZWQtb2ZmLWJ5OiBNaWNoYWVsIEthbyA8bWljaGFlbC5rYW9AbWVkaWF0ZWsuY29tPg0KU2ln bmVkLW9mZi1ieTogSHNpbi1ZaSBXYW5nIDxoc2lueWlAY2hyb21pdW0ub3JnPg0KLS0tDQogZHJp dmVycy90aGVybWFsL210a190aGVybWFsLmMgfCA3NCArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9u cygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy90aGVybWFsL210a190aGVybWFsLmMgYi9kcml2 ZXJzL3RoZXJtYWwvbXRrX3RoZXJtYWwuYw0KaW5kZXggZDZmYWJkMGE3ZGE2Li45YmU5ZmNiMThk OWUgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL3RoZXJtYWwvbXRrX3RoZXJtYWwuYw0KKysrIGIvZHJp dmVycy90aGVybWFsL210a190aGVybWFsLmMNCkBAIC0yMjUsNiArMjI1LDExIEBAIGVudW0gew0K IA0KIHN0cnVjdCBtdGtfdGhlcm1hbDsNCiANCitzdHJ1Y3QgbXRrX3RoZXJtYWxfem9uZSB7DQor CXN0cnVjdCBtdGtfdGhlcm1hbCAqbXQ7DQorCWludCBpZDsNCit9Ow0KKw0KIHN0cnVjdCB0aGVy bWFsX2JhbmtfY2ZnIHsNCiAJdW5zaWduZWQgaW50IG51bV9zZW5zb3JzOw0KIAljb25zdCBpbnQg KnNlbnNvcnM7DQpAQCAtNjA3LDcgKzYxMiw3IEBAIHN0YXRpYyBpbnQgbXRrX3RoZXJtYWxfYmFu a190ZW1wZXJhdHVyZShzdHJ1Y3QgbXRrX3RoZXJtYWxfYmFuayAqYmFuaykNCiAJCSAqIG5vdCBp bW1lZGlhdGVseSBzaHV0IGRvd24uDQogCQkgKi8NCiAJCWlmICh0ZW1wID4gMjAwMDAwKQ0KLQkJ CXRlbXAgPSAwOw0KKwkJCXRlbXAgPSAtRUFHQUlOOw0KIA0KIAkJaWYgKHRlbXAgPiBtYXgpDQog CQkJbWF4ID0gdGVtcDsNCkBAIC02MTgsNyArNjIzLDggQEAgc3RhdGljIGludCBtdGtfdGhlcm1h bF9iYW5rX3RlbXBlcmF0dXJlKHN0cnVjdCBtdGtfdGhlcm1hbF9iYW5rICpiYW5rKQ0KIA0KIHN0 YXRpYyBpbnQgbXRrX3JlYWRfdGVtcCh2b2lkICpkYXRhLCBpbnQgKnRlbXBlcmF0dXJlKQ0KIHsN Ci0Jc3RydWN0IG10a190aGVybWFsICptdCA9IGRhdGE7DQorCXN0cnVjdCBtdGtfdGhlcm1hbF96 b25lICp0eiA9IGRhdGE7DQorCXN0cnVjdCBtdGtfdGhlcm1hbCAqbXQgPSB0ei0+bXQ7DQogCWlu dCBpOw0KIAlpbnQgdGVtcG1heCA9IElOVF9NSU47DQogDQpAQCAtNjMxLDE2ICs2MzcsNDggQEAg c3RhdGljIGludCBtdGtfcmVhZF90ZW1wKHZvaWQgKmRhdGEsIGludCAqdGVtcGVyYXR1cmUpDQog DQogCQltdGtfdGhlcm1hbF9wdXRfYmFuayhiYW5rKTsNCiAJfQ0KLQ0KIAkqdGVtcGVyYXR1cmUg PSB0ZW1wbWF4Ow0KIA0KIAlyZXR1cm4gMDsNCiB9DQogDQorc3RhdGljIGludCBtdGtfcmVhZF9z ZW5zb3JfdGVtcCh2b2lkICpkYXRhLCBpbnQgKnRlbXBlcmF0dXJlKQ0KK3sNCisJc3RydWN0IG10 a190aGVybWFsX3pvbmUgKnR6ID0gZGF0YTsNCisJc3RydWN0IG10a190aGVybWFsICptdCA9IHR6 LT5tdDsNCisJY29uc3Qgc3RydWN0IG10a190aGVybWFsX2RhdGEgKmNvbmYgPSBtdC0+Y29uZjsN CisJaW50IGlkID0gdHotPmlkIC0gMTsNCisJaW50IHRlbXAgPSBJTlRfTUlOOw0KKwl1MzIgcmF3 Ow0KKw0KKwlpZiAoaWQgPCAwKQ0KKwkJcmV0dXJuICAtRUFDQ0VTOw0KKw0KKwlyYXcgPSByZWFk bChtdC0+dGhlcm1hbF9iYXNlICsgY29uZi0+bXNyW2lkXSk7DQorDQorCXRlbXAgPSByYXdfdG9f bWNlbHNpdXMobXQsIGlkLCByYXcpOw0KKw0KKwkvKg0KKwkgKiBUaGUgZmlyc3QgcmVhZCBvZiBh IHNlbnNvciBvZnRlbiBjb250YWlucyB2ZXJ5IGhpZ2ggYm9ndXMNCisJICogdGVtcGVyYXR1cmUg dmFsdWUuIEZpbHRlciB0aGVzZSBvdXQgc28gdGhhdCB0aGUgc3lzdGVtIGRvZXMNCisJICogbm90 IGltbWVkaWF0ZWx5IHNodXQgZG93bi4NCisJICovDQorDQorCWlmICh0ZW1wID4gMjAwMDAwKQ0K KwkJcmV0dXJuICAtRUFHQUlOOw0KKw0KKwkqdGVtcGVyYXR1cmUgPSB0ZW1wOw0KKwlyZXR1cm4g MDsNCit9DQorDQogc3RhdGljIGNvbnN0IHN0cnVjdCB0aGVybWFsX3pvbmVfb2ZfZGV2aWNlX29w cyBtdGtfdGhlcm1hbF9vcHMgPSB7DQogCS5nZXRfdGVtcCA9IG10a19yZWFkX3RlbXAsDQogfTsN CiANCitzdGF0aWMgY29uc3Qgc3RydWN0IHRoZXJtYWxfem9uZV9vZl9kZXZpY2Vfb3BzIG10a190 aGVybWFsX3NlbnNvcl9vcHMgPSB7DQorCS5nZXRfdGVtcCA9IG10a19yZWFkX3NlbnNvcl90ZW1w LA0KK307DQorDQogc3RhdGljIHZvaWQgbXRrX3RoZXJtYWxfaW5pdF9iYW5rKHN0cnVjdCBtdGtf dGhlcm1hbCAqbXQsIGludCBudW0sDQogCQkJCSAgdTMyIGFwbWl4ZWRfcGh5c19iYXNlLCB1MzIg YXV4YWRjX3BoeXNfYmFzZSwNCiAJCQkJICBpbnQgY3RybF9pZCkNCkBAIC04NzMsNiArOTExLDcg QEAgc3RhdGljIGludCBtdGtfdGhlcm1hbF9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2KQ0KIAlzdHJ1Y3QgcmVzb3VyY2UgKnJlczsNCiAJdTY0IGF1eGFkY19waHlzX2Jhc2UsIGFw bWl4ZWRfcGh5c19iYXNlOw0KIAlzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZSAqdHpkZXY7DQor CXN0cnVjdCBtdGtfdGhlcm1hbF96b25lICp0ejsNCiANCiAJbXQgPSBkZXZtX2t6YWxsb2MoJnBk ZXYtPmRldiwgc2l6ZW9mKCptdCksIEdGUF9LRVJORUwpOw0KIAlpZiAoIW10KQ0KQEAgLTk1NCwx MSArOTkzLDMwIEBAIHN0YXRpYyBpbnQgbXRrX3RoZXJtYWxfcHJvYmUoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldikNCiANCiAJcGxhdGZvcm1fc2V0X2RydmRhdGEocGRldiwgbXQpOw0KIA0K LQl0emRldiA9IGRldm1fdGhlcm1hbF96b25lX29mX3NlbnNvcl9yZWdpc3RlcigmcGRldi0+ZGV2 LCAwLCBtdCwNCi0JCQkJCQkgICAgICZtdGtfdGhlcm1hbF9vcHMpOw0KLQlpZiAoSVNfRVJSKHR6 ZGV2KSkgew0KLQkJcmV0ID0gUFRSX0VSUih0emRldik7DQotCQlnb3RvIGVycl9kaXNhYmxlX2Ns a19wZXJpX3RoZXJtOw0KKwlmb3IgKGkgPSAwOyBpIDwgbXQtPmNvbmYtPm51bV9zZW5zb3JzICsg MTsgaSsrKSB7DQorCQl0eiA9IGttYWxsb2Moc2l6ZW9mKCp0eiksIEdGUF9LRVJORUwpOw0KKwkJ aWYgKCF0eikNCisJCQlyZXR1cm4gLUVOT01FTTsNCisNCisJCXR6LT5tdCA9IG10Ow0KKwkJdHot PmlkID0gaTsNCisNCisJCXR6ZGV2ID0gZGV2bV90aGVybWFsX3pvbmVfb2Zfc2Vuc29yX3JlZ2lz dGVyKCZwZGV2LT5kZXYsIGksDQorCQkJCXR6LCAoaSA9PSAwKSA/DQorCQkJCSZtdGtfdGhlcm1h bF9vcHMgOiAmbXRrX3RoZXJtYWxfc2Vuc29yX29wcyk7DQorDQorCQlpZiAoSVNfRVJSKHR6ZGV2 KSkgew0KKwkJCWlmIChQVFJfRVJSKHR6ZGV2KSA9PSAtRU5PREVWKSB7DQorCQkJCWRldl93YXJu KCZwZGV2LT5kZXYsDQorCQkJCQkic2Vuc29yICVkIG5vdCByZWdpc3RlcmVkIGluIHRoZXJtYWwg em9uZSBpbiBkdFxuIiwNCisJCQkJCWkpOw0KKwkJCQljb250aW51ZTsNCisJCQl9DQorCQkJaWYg KElTX0VSUih0emRldikgIT0gLUVBQ0NFUykgew0KKwkJCQlyZXQgPSBQVFJfRVJSKHR6ZGV2KTsN CisJCQkJZ290byBlcnJfZGlzYWJsZV9jbGtfcGVyaV90aGVybTsNCisJCQl9DQorCQl9DQogCX0N CiANCiAJcmV0dXJuIDA7DQotLSANCjIuMTguMA0K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87E6AC2D0CE for ; Fri, 3 Jan 2020 06:44:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E25702084D for ; Fri, 3 Jan 2020 06:44:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TkdhQNNj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="a5u2SUAB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E25702084D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EncqDd+W6D2JgxwEZMLOswmd6fO1fxUr7Rip0prGd2s=; b=TkdhQNNjLoTIR5 BGdgCvTfcF+SiQCBoOP5qhIdx9rIS+wumb9rTgidpY9yuJz9d7H5M3MOXBpfFPjyDDiczHOi+4S5q T8TvR8A071nZPk15mpnQVDy7z8B9m6EqPPMcnOUm193y82YpqcfHvpwtpUhGtzO5bqKM09r2tjMAz JjWoYyREvncxqJK3mBY7gVa9ypdayjGlDYI+SPM94pmVtTNTw0j6trs9OKly1oin+4anlb2+lwmkR g4Owf1iRKfYcw1qPHtJBINundY/UFBfgbTW+4nVdAdUDzn/6Leb3dxM/lqQrB32yRBh5rGcEZP2NK ifVR8lraOgoJH1nQWtrw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inGhO-0004wu-CH; Fri, 03 Jan 2020 06:44:42 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inGhB-0004lI-EK; Fri, 03 Jan 2020 06:44:31 +0000 X-UUID: a583988803af45e4b947fe748b166e23-20200102 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nZu5Vg6KMNlzJgVAxVNPrImqFUM2QdXibq/TjqkgBuo=; b=a5u2SUABpErw+Z3MiXyeTKhfpmQ8l83pcyM/AAGPQx2foGxH8WoivR52CXmHdN2QidfbvAsxwRgaK1/AmLlEv8XJC07879w1XG43Lz4zzeS0W9zLbSLh1NxFNtoDFaqWPGWE8sys54B4LnQ1lIF9nbbsBbL7A8n0sl1SrWq7HSU=; X-UUID: a583988803af45e4b947fe748b166e23-20200102 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1050637886; Thu, 02 Jan 2020 22:44:23 -0800 Received: from mtkmbs05n1.mediatek.inc (172.21.101.15) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 2 Jan 2020 22:44:37 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 3 Jan 2020 14:43:44 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 3 Jan 2020 14:44:09 +0800 From: Michael Kao To: Zhang Rui , Eduardo Valentin , Daniel Lezcano , Rob Herring , Mark Rutland , Matthias Brugger , , , Subject: [PATCH v3, 7/8] thermal: mediatek: add another get_temp ops for thermal sensors Date: Fri, 3 Jan 2020 14:44:06 +0800 Message-ID: <20200103064407.19861-8-michael.kao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200103064407.19861-1-michael.kao@mediatek.com> References: <20200103064407.19861-1-michael.kao@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200102_224429_492158_25E919C9 X-CRM114-Status: GOOD ( 17.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michael Kao Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Provide thermal zone to read thermal sensor in the SoC. We can read all the thermal sensors value in the SoC by the node /sys/class/thermal/ Bypass the failure that non cpu_thermal sensor is not find in thermal-zones in dts, which is normal for mt8173, so prompt a warning here instead of failing. Return -EAGAIN instead of -EACCESS on the first read of sensor that often are bogus values. This can avoid following warning on boot: thermal thermal_zone6: failed to read out thermal zone (-13) Signed-off-by: Michael Kao Signed-off-by: Hsin-Yi Wang --- drivers/thermal/mtk_thermal.c | 74 +++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index d6fabd0a7da6..9be9fcb18d9e 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -225,6 +225,11 @@ enum { struct mtk_thermal; +struct mtk_thermal_zone { + struct mtk_thermal *mt; + int id; +}; + struct thermal_bank_cfg { unsigned int num_sensors; const int *sensors; @@ -607,7 +612,7 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) * not immediately shut down. */ if (temp > 200000) - temp = 0; + temp = -EAGAIN; if (temp > max) max = temp; @@ -618,7 +623,8 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) static int mtk_read_temp(void *data, int *temperature) { - struct mtk_thermal *mt = data; + struct mtk_thermal_zone *tz = data; + struct mtk_thermal *mt = tz->mt; int i; int tempmax = INT_MIN; @@ -631,16 +637,48 @@ static int mtk_read_temp(void *data, int *temperature) mtk_thermal_put_bank(bank); } - *temperature = tempmax; return 0; } +static int mtk_read_sensor_temp(void *data, int *temperature) +{ + struct mtk_thermal_zone *tz = data; + struct mtk_thermal *mt = tz->mt; + const struct mtk_thermal_data *conf = mt->conf; + int id = tz->id - 1; + int temp = INT_MIN; + u32 raw; + + if (id < 0) + return -EACCES; + + raw = readl(mt->thermal_base + conf->msr[id]); + + temp = raw_to_mcelsius(mt, id, raw); + + /* + * The first read of a sensor often contains very high bogus + * temperature value. Filter these out so that the system does + * not immediately shut down. + */ + + if (temp > 200000) + return -EAGAIN; + + *temperature = temp; + return 0; +} + static const struct thermal_zone_of_device_ops mtk_thermal_ops = { .get_temp = mtk_read_temp, }; +static const struct thermal_zone_of_device_ops mtk_thermal_sensor_ops = { + .get_temp = mtk_read_sensor_temp, +}; + static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, u32 apmixed_phys_base, u32 auxadc_phys_base, int ctrl_id) @@ -873,6 +911,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) struct resource *res; u64 auxadc_phys_base, apmixed_phys_base; struct thermal_zone_device *tzdev; + struct mtk_thermal_zone *tz; mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) @@ -954,11 +993,30 @@ static int mtk_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mt); - tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt, - &mtk_thermal_ops); - if (IS_ERR(tzdev)) { - ret = PTR_ERR(tzdev); - goto err_disable_clk_peri_therm; + for (i = 0; i < mt->conf->num_sensors + 1; i++) { + tz = kmalloc(sizeof(*tz), GFP_KERNEL); + if (!tz) + return -ENOMEM; + + tz->mt = mt; + tz->id = i; + + tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, i, + tz, (i == 0) ? + &mtk_thermal_ops : &mtk_thermal_sensor_ops); + + if (IS_ERR(tzdev)) { + if (PTR_ERR(tzdev) == -ENODEV) { + dev_warn(&pdev->dev, + "sensor %d not registered in thermal zone in dt\n", + i); + continue; + } + if (IS_ERR(tzdev) != -EACCES) { + ret = PTR_ERR(tzdev); + goto err_disable_clk_peri_therm; + } + } } return 0; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel