From patchwork Tue Mar 29 11:27:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 8685941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6EBDDC0553 for ; Tue, 29 Mar 2016 11:30:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8C87620103 for ; Tue, 29 Mar 2016 11:30:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 41356201B9 for ; Tue, 29 Mar 2016 11:30:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1akrpN-00044M-F9; Tue, 29 Mar 2016 11:28:53 +0000 Received: from mail-vk0-x232.google.com ([2607:f8b0:400c:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1akror-0003gw-U5 for linux-arm-kernel@lists.infradead.org; Tue, 29 Mar 2016 11:28:23 +0000 Received: by mail-vk0-x232.google.com with SMTP id e185so14184526vkb.1 for ; Tue, 29 Mar 2016 04:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NRDxYnb3e1kCHaFjvz4oKBxPjfNh7jNtgdi9rdSgwDs=; b=SMbu8Nwk3wgEibrMBiYCWQS7mPBrpsUK6o4kU0fJSwOMWKivFPDM6mc9QIRkd+7NJS dU0Aur2bZmtzgtG6ysZnVCDicQ9OiLJRENqdRhSC4fQYqLiaCVxfVtt893yEEQw8jdLJ CPo8C0LC5f19wP/Rcz5R0JvpxHvMu90s+fis4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NRDxYnb3e1kCHaFjvz4oKBxPjfNh7jNtgdi9rdSgwDs=; b=nHwCE/sMJTEPha/ZqQPagZXYBI3U6tVI7XVLfqZeNsCPDajG6RTAsBwGE4yEaRsNz5 ahzyVt26L34FWfNt4LQbVhc/PkHUCj7WHsK/6y9eJeNqTr8GB1YCsBJTVqFYXL5UD9tE KPYTrD/q+vLBV2BlAOhaLBO30xDLlc1+SY7XI+r/+ztV6Uquw4xt8Z5Up2XHjgnuX9Xz 3kau3sAACgp83iYvErygAwrw2s8gurneGt5jJw0oi4yPyAMYDb0SxEZmGV7j1E4j9ZpJ LkRBntwEFGXVv2zmj0GXkFGmZsKx5PRJdi65ilpXgGlWFjL0J+ulCmc9Y5Xf1j5LBoEm 55/Q== X-Gm-Message-State: AD7BkJIJ16o3CG0xwkGWGEVPw+nuk7vsPTQPkwAsoyPLMCdsL5+447nNAg+N0LYuGjg8pyXP X-Received: by 10.31.162.20 with SMTP id l20mr728323vke.137.1459250880549; Tue, 29 Mar 2016 04:28:00 -0700 (PDT) Received: from leoy-linaro.a1.60in.com ([66.155.104.79]) by smtp.gmail.com with ESMTPSA id 97sm4665954uat.9.2016.03.29.04.27.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Mar 2016 04:27:59 -0700 (PDT) From: Leo Yan To: Wei Xu , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Catalin Marinas , Will Deacon , Zhang Rui , Eduardo Valentin Subject: [PATCH v3 2/4] thermal: hisilicon: fix IRQ imbalance enabling Date: Tue, 29 Mar 2016 19:27:13 +0800 Message-Id: <1459250835-25561-3-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459250835-25561-1-git-send-email-leo.yan@linaro.org> References: <1459250835-25561-1-git-send-email-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160329_042822_070731_15CD519D X-CRM114-Status: GOOD ( 15.45 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Leo Yan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When register sensors into thermal zone during initialization phase, it reports error for IRQ imbalance enabling: [ 2.040713] WARNING: at kernel/irq/manage.c:513 [ 2.040719] Modules linked in: [ 2.040721] [ 2.040729] CPU: 1 PID: 804 Comm: irq/33-hisi_the Not tainted 4.5.0-rc4+ #505 [ 2.040732] Hardware name: HiKey Development Board (DT) [ 2.040736] task: ffffffc03ae82580 ti: ffffffc0379c8000 task.ti: ffffffc0379c8000 [ 2.040745] PC is at __enable_irq+0x74/0x84 [ 2.040749] LR is at __enable_irq+0x74/0x84 This warning is for IRQ imbalance enabling, which is caused by enable_irq() twice. During sensor's initialization it tries to enable IRQ, the driver will call thermal_zone_of_sensor_register() to bind sensors and read sensor's temperature. But at this moment the flag "data->irq_enabled" has been not initialized as correct state, so it finally introduces the function enabled_irq() to be called twice. In essentially this is caused by the flag "data->irq_enabled" is inconsistent with real hardware IRQ enabling state. So this patch is to fix this issue, firstly init "irq_enabled" flag before binding sensors to thermal zone. Also change to use the function irq_get_irqchip_state() to read back real interrupt line state. Signed-off-by: Leo Yan --- drivers/thermal/hisi_thermal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 0fed5cf..4fef1b3 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -343,6 +343,10 @@ static int hisi_thermal_probe(struct platform_device *pdev) return ret; } + hisi_thermal_enable_bind_irq_sensor(data); + irq_get_irqchip_state(data->irq, IRQCHIP_STATE_MASKED, + &data->irq_enabled); + for (i = 0; i < HISI_MAX_SENSORS; ++i) { ret = hisi_thermal_register_sensor(pdev, data, &data->sensors[i], i); @@ -353,9 +357,6 @@ static int hisi_thermal_probe(struct platform_device *pdev) hisi_thermal_toggle_sensor(&data->sensors[i], true); } - hisi_thermal_enable_bind_irq_sensor(data); - data->irq_enabled = true; - return 0; }