From patchwork Wed May 22 12:18:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "kernelci.org bot" X-Patchwork-Id: 164813 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp791785ili; Wed, 22 May 2019 05:19:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqxV1FP2vNEKyNCHXwo0HMohMhEUH4yB/XgJSHRfUX1zwvSRzCBBEWzMAEHbRZKiKaqziwo3 X-Received: by 2002:a17:902:b28b:: with SMTP id u11mr43334315plr.311.1558527541854; Wed, 22 May 2019 05:19:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558527541; cv=none; d=google.com; s=arc-20160816; b=Jw70W0a2Y3qsZmT/a8w8iddQ361wS2imHPiCikp3wgQy+FN0ErPCNVftCn++L7NIjB SL0ezVnVlHhBwU7YlSy5QfCD9W+/IzRo6yA/f5WI53Urc23drZX4D/JGOQcvTj8E0CTV i6Af+vGe+urKOAnxQxN7nW2lxq8yqJO4HIBpH1QhdfjJr+DY6SV3XDacpRt8bSe/4WgJ MT2FZz8vA1oweCvielwKsMnEfOIk6k0t605ozc4ON8wUXn3AR4cV8ZtWgCCWmTxdKdgy xAS2PZ9cp9tEwyNP9Uv0LOY4FDrmziPbcr6ItJ0thmrI8o9XHmOdJEYsJwGGZzvDZ9ov ckjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:from:to:subject :content-transfer-encoding:mime-version:date:message-id :dkim-signature; bh=4lhpOXU5flLHaPgCnlKi/zbwwdvQGy7aO9emZ/m2IY8=; b=O3WL2R2KUtfFNeYoi6qEKGIVoq4Q196248BhavV9r2usxBA0uWHsq/kDxAuZwnrNcI 1tPt1RXnEJG0N0sjC9BebqcC3vGXWqFW7YJH+YaoYJhon2OcUqxRBDTs8UbwmlrDeI7N mz/V2afkfsHwOI992d7vB06GBBim/WHnmRlq2EoUcVLrklzwv6EvOhl/S9oe2fGxeYF9 V22pUui0a42fEebD4N4LluVctd5wsgf08ayVrWQqVSY2g9myvECM7O7wuX02CTsLpf9Y Ub47oQC6X3Vt431uwcRuX3upKvCxgLGWxwGaqOIcSyS9sA3o8P7s23Qdw1FvSDXHbu1e rbBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernelci-org.20150623.gappssmtp.com header.s=20150623 header.b=yIdCRbUR; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t6si24582176plz.36.2019.05.22.05.19.01; Wed, 22 May 2019 05:19:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernelci-org.20150623.gappssmtp.com header.s=20150623 header.b=yIdCRbUR; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729081AbfEVMTB (ORCPT + 11 others); Wed, 22 May 2019 08:19:01 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55574 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728584AbfEVMTA (ORCPT ); Wed, 22 May 2019 08:19:00 -0400 Received: by mail-wm1-f68.google.com with SMTP id x64so1996039wmb.5 for ; Wed, 22 May 2019 05:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernelci-org.20150623.gappssmtp.com; s=20150623; h=message-id:date:mime-version:content-transfer-encoding:subject:to :from:cc; bh=4lhpOXU5flLHaPgCnlKi/zbwwdvQGy7aO9emZ/m2IY8=; b=yIdCRbURcrDlI9SLR+Bvl5oxhZwOZqYKuBTNLSXNcHCWe0u9pHDx+OhZH6o3LcY+b+ EkKg1GZKdYpfmLOLGaeFR9Gnl2TNLApOUF8mF7DAtnAkOaZSVmBPLCJdPbmwc5U38f6p IaylMs4wNHPvKSRP3wKlbWLeL1hed6rRspEw7Rrjp+Uo6Oi5YgM1hN+BZCdhP2M3nY9l LA9qmKEdmYxmu0YsJ9dOR44DgHcpltIyweDimJilw8Dahb70Boms5wtof80Lc1R6HTiZ 0yDNVrGQM4w21BUwbkLZCV6oQb0ir+qEaAXrRCO2vQoOCLX8aVuCNoStXE6aWiHuWNVP +CGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:date:mime-version :content-transfer-encoding:subject:to:from:cc; bh=4lhpOXU5flLHaPgCnlKi/zbwwdvQGy7aO9emZ/m2IY8=; b=NsloHYQjvcNuntPhkFT+HmvY2jFgglYmeC88myPIX/584FFincpcKyhtsJd4iC3M0/ OZ55qzAjxQcGfDewsCbSWiaxB100+vHbmk8cNBSYWkSHF4PR/GsxC/N3CMzvxQkdbZmD VWbe6HN7CqoPIDEJ2BpZ4hKkOnN+DkxATwX6cAVHzPAGCrNbyKaMYitOZF4cnnYPaTvo bunVm8tAVSh60DNo//hxkp1yUdf47HlMIKF3mBwL/5lipHLhw0oAn5+PwpxVm1RRZ3a3 ZNLsKk5QHzAvIkWYcvBYLfDnx/qj5JHgU8FuK3XTQecL/rQzs/iTSYf8iR0cEmUVGM6G vAQQ== X-Gm-Message-State: APjAAAULkxTywipmJVrzzRpoAjbP7Znrp7DGJl0TwhZxpIJY1TZP7iXu F1vWVMbEcqZhe4RSv+qtYDN/wQ== X-Received: by 2002:a1c:9c42:: with SMTP id f63mr7712636wme.23.1558527537756; Wed, 22 May 2019 05:18:57 -0700 (PDT) Received: from [148.251.42.114] ([2a01:4f8:201:9271::2]) by smtp.gmail.com with ESMTPSA id 88sm58288086wrc.33.2019.05.22.05.18.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 05:18:56 -0700 (PDT) Message-ID: <5ce53e30.1c69fb81.887a7.b77c@mx.google.com> Date: Wed, 22 May 2019 05:18:56 -0700 (PDT) MIME-Version: 1.0 X-Kernelci-Report-Type: bisect X-Kernelci-Tree: mainline X-Kernelci-Lab-Name: lab-collabora X-Kernelci-Branch: master X-Kernelci-Kernel: v5.2-rc1-129-g9c7db5004280 Subject: mainline/master boot bisection: v5.2-rc1-129-g9c7db5004280 on rk3288-veyron-jaq To: tomeu.vizoso@collabora.com, guillaume.tucker@collabora.com, mgalka@collabora.com, broonie@kernel.org, matthew.hart@linaro.org, khilman@baylibre.com, enric.balletbo@collabora.com, Elaine Zhang , Eduardo Valentin , Daniel Lezcano From: "kernelci.org bot" Cc: Heiko Stuebner , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Zhang Rui , linux-arm-kernel@lists.infradead.org Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * mainline/master boot bisection: v5.2-rc1-129-g9c7db5004280 on rk3288-veyron-jaq Summary: Start: 9c7db5004280 Merge tag 'selinux-pr-20190521' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux Details: https://kernelci.org/boot/id/5ce4966759b5141df07a362c Plain log: https://storage.kernelci.org//mainline/master/v5.2-rc1-129-g9c7db5004280/arm/multi_v7_defconfig/gcc-8/lab-collabora/boot-rk3288-veyron-jaq.txt HTML log: https://storage.kernelci.org//mainline/master/v5.2-rc1-129-g9c7db5004280/arm/multi_v7_defconfig/gcc-8/lab-collabora/boot-rk3288-veyron-jaq.html Result: 28694e009e51 thermal: rockchip: fix up the tsadc pinctrl setting error Checks: revert: PASS verify: PASS Parameters: Tree: mainline URL: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Branch: master Target: rk3288-veyron-jaq CPU arch: arm Lab: lab-collabora Compiler: gcc-8 Config: multi_v7_defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit 28694e009e512451ead5519dd801f9869acb1f60 Author: Elaine Zhang Date: Tue Apr 30 18:09:44 2019 +0800 thermal: rockchip: fix up the tsadc pinctrl setting error Explicitly use the pinctrl to set/unset the right mode instead of relying on the pinctrl init mode. And it requires setting the tshut polarity before select pinctrl. When the temperature sensor mode is set to 0, it will automatically reset the board via the Clock-Reset-Unit (CRU) if the over temperature threshold is reached. However, when the pinctrl initializes, it does a transition to "otp_out" which may lead the SoC restart all the time. "otp_out" IO may be connected to the RESET circuit on the hardware. If the IO is in the wrong state, it will trigger RESET. (similar to the effect of pressing the RESET button) which will cause the soc to restart all the time. Signed-off-by: Elaine Zhang Reviewed-by: Daniel Lezcano Signed-off-by: Eduardo Valentin ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [83f3ef3de625a5766de2382f9e077d4daafd5bac] Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm git bisect good 83f3ef3de625a5766de2382f9e077d4daafd5bac # bad: [9c7db5004280767566e91a33445bf93aa479ef02] Merge tag 'selinux-pr-20190521' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux git bisect bad 9c7db5004280767566e91a33445bf93aa479ef02 # bad: [dc413a90edbe715bebebe859dc072ef73d490d70] Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc git bisect bad dc413a90edbe715bebebe859dc072ef73d490d70 # good: [b45da609a02460c6a34c395f03f891f1fb2a021a] Merge tag 'imx-bindings-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt git bisect good b45da609a02460c6a34c395f03f891f1fb2a021a # good: [6cbc4d88ad208d6f5b9567bac2fff038e1bbfa77] Merge tag 'bitmain-soc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-bitmain into arm/dt git bisect good 6cbc4d88ad208d6f5b9567bac2fff038e1bbfa77 # bad: [a455eda33faafcaac1effb31d682765b14ef868c] Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal git bisect bad a455eda33faafcaac1effb31d682765b14ef868c # bad: [ffd1b122d3a17783b68cfd03b0479dffedf0d960] thermal: rockchip: Support the PX30 SoC in thermal driver git bisect bad ffd1b122d3a17783b68cfd03b0479dffedf0d960 # good: [3e6a8fb3308419129c7a52de6eb42feef5a919a0] drivers: thermal: tsens: Add new operation to check if a sensor is enabled git bisect good 3e6a8fb3308419129c7a52de6eb42feef5a919a0 # good: [d36e2fa025387567710df740fd4dce1d5001b226] thermal: generic-adc: make lookup table optional git bisect good d36e2fa025387567710df740fd4dce1d5001b226 # good: [42cd9b049829d7facbd45ab503d763a86251e81b] thermal/drivers/cpu_cooling: Fixup the header and copyright git bisect good 42cd9b049829d7facbd45ab503d763a86251e81b # good: [6ec8070b9d48294fbe865535c167a79527eaf357] thermal: Fix build error of missing devm_ioremap_resource on UM git bisect good 6ec8070b9d48294fbe865535c167a79527eaf357 # bad: [28694e009e512451ead5519dd801f9869acb1f60] thermal: rockchip: fix up the tsadc pinctrl setting error git bisect bad 28694e009e512451ead5519dd801f9869acb1f60 # good: [fcc6d4cadadcc977911c6bfcdd95d379f4082c74] thermal: broadcom: Remove ACPI support git bisect good fcc6d4cadadcc977911c6bfcdd95d379f4082c74 # first bad commit: [28694e009e512451ead5519dd801f9869acb1f60] thermal: rockchip: fix up the tsadc pinctrl setting error ------------------------------------------------------------------------------- diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 9c7643d62ed7..6dc7fc516abf 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -172,6 +172,9 @@ struct rockchip_thermal_data { int tshut_temp; enum tshut_mode tshut_mode; enum tshut_polarity tshut_polarity; + struct pinctrl *pinctrl; + struct pinctrl_state *gpio_state; + struct pinctrl_state *otp_state; }; /** @@ -1242,6 +1245,8 @@ static int rockchip_thermal_probe(struct platform_device *pdev) return error; } + thermal->chip->control(thermal->regs, false); + error = clk_prepare_enable(thermal->clk); if (error) { dev_err(&pdev->dev, "failed to enable converter clock: %d\n", @@ -1267,6 +1272,30 @@ static int rockchip_thermal_probe(struct platform_device *pdev) thermal->chip->initialize(thermal->grf, thermal->regs, thermal->tshut_polarity); + if (thermal->tshut_mode == TSHUT_MODE_GPIO) { + thermal->pinctrl = devm_pinctrl_get(&pdev->dev); + if (IS_ERR(thermal->pinctrl)) { + dev_err(&pdev->dev, "failed to find thermal pinctrl\n"); + return PTR_ERR(thermal->pinctrl); + } + + thermal->gpio_state = pinctrl_lookup_state(thermal->pinctrl, + "gpio"); + if (IS_ERR_OR_NULL(thermal->gpio_state)) { + dev_err(&pdev->dev, "failed to find thermal gpio state\n"); + return -EINVAL; + } + + thermal->otp_state = pinctrl_lookup_state(thermal->pinctrl, + "otpout"); + if (IS_ERR_OR_NULL(thermal->otp_state)) { + dev_err(&pdev->dev, "failed to find thermal otpout state\n"); + return -EINVAL; + } + + pinctrl_select_state(thermal->pinctrl, thermal->otp_state); + } + for (i = 0; i < thermal->chip->chn_num; i++) { error = rockchip_thermal_register_sensor(pdev, thermal, &thermal->sensors[i], @@ -1337,8 +1366,8 @@ static int __maybe_unused rockchip_thermal_suspend(struct device *dev) clk_disable(thermal->pclk); clk_disable(thermal->clk); - - pinctrl_pm_select_sleep_state(dev); + if (thermal->tshut_mode == TSHUT_MODE_GPIO) + pinctrl_select_state(thermal->pinctrl, thermal->gpio_state); return 0; } @@ -1383,7 +1412,8 @@ static int __maybe_unused rockchip_thermal_resume(struct device *dev) for (i = 0; i < thermal->chip->chn_num; i++) rockchip_thermal_toggle_sensor(&thermal->sensors[i], true); - pinctrl_pm_select_default_state(dev); + if (thermal->tshut_mode == TSHUT_MODE_GPIO) + pinctrl_select_state(thermal->pinctrl, thermal->otp_state); return 0; }