From patchwork Wed Oct 31 23:05:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149893 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp98645ljp; Wed, 31 Oct 2018 16:07:43 -0700 (PDT) X-Google-Smtp-Source: AJdET5e30wZc9SNS3xCiz7YClrVclKI7ChQoMUYw5eInR0rCIE99KLDVCGSG4ibFhFMkzJJ1SDsv X-Received: by 2002:a17:902:30f:: with SMTP id 15-v6mr5269369pld.155.1541027263768; Wed, 31 Oct 2018 16:07:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541027263; cv=none; d=google.com; s=arc-20160816; b=bzFuTThQtOBKXGM8qemw86AEF4j+tpgS1XynIMbVRUrvqPOUdtqJTV69jEMc//kjq+ MusDXCvO7fVR5Y++ez0JyhsaX6fblQTTD4Cx1DkRcb3eveusGa0mXb34KWDJm6feCxbu 7d+Bq0ndPjt7b6Xa7UwCNOH+SjugtLjgTQGsaeE4g68OoQ8BZsMpS2NkK2uFX5Hqdru5 /BO2Dp9ek7nGN+eV3Fb36BJ2/5qkY7i5tqfUpD+64Ei0YFot9ZxGv86D//5M1BPB8FS2 gLn39aKhq52MoJ3GH39/EQziPyDFs3unmdha0CiQSBoke3xJ+a5U6UklucukIuRNjXI5 463w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=yMlD8LXwbhIs2GJ7LmL1+bQOw7qO2HPgxcRlJjJOW4A=; b=XMdG5BAmaKr0cqRxfPycYn3mmpq5bzi5AG5pi7cFBPtyq0kOmTM+WlK9xSqo3NUSSl GuXqUXFzm2tFgwUfzTXNt9WMECxtoR5H23V3g8Lt4HqTsux6NXgHuW23PvHH1DCtd7LG uTk6ylqVCAP4sTyzFtLkxvVgS/ORHEb0o18TVuqyQpoT9DS2nGyyh+eFTpKELyJ9VFbE Dtm0DJ9rGir+vMceoGlI+EeSFq9kgnFuZwTmKfHaNl55SgDRos4mpHxhRB9Ui21krALZ GxGlhVPMXC8vpLqlz4pwE+3cY/GoG++Dy++oJedR/zhjVf/FGmc6Dkl4QCepd9MxE8UE Lgnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yqGot5v2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s132-v6si29801176pgs.492.2018.10.31.16.07.43; Wed, 31 Oct 2018 16:07:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=yqGot5v2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729222AbeKAIHu (ORCPT + 32 others); Thu, 1 Nov 2018 04:07:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:55980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729150AbeKAIHs (ORCPT ); Thu, 1 Nov 2018 04:07:48 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC8D520830; Wed, 31 Oct 2018 23:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541027258; bh=8YA0vWFhpY+Sn68jT8xm6ghQKKZys++ILysgTsBS9rE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yqGot5v2fHi4nTUaHEyg1SHYxD91jCt8nrTNewbBmZhmC0sTnjl7Whg/clZg7Hw3V 19chwncKgQOi6j0Hmqry3YdTZ1NZsgRLlW/zKU3z2zEQx7wAQmUXCg1QpP+VEopeFT Bp+t6VkMrmZYi/95Go8KYp6OfV8u4ymIbWLWYWtw= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Loic Poulain , Peter Chen , Sasha Levin Subject: [PATCH AUTOSEL 4.19 129/146] usb: chipidea: Prevent unbalanced IRQ disable Date: Wed, 31 Oct 2018 19:05:24 -0400 Message-Id: <20181031230541.28822-129-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031230541.28822-1-sashal@kernel.org> References: <20181031230541.28822-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit 8b97d73c4d72a2abf58f8e49062a7ee1e5f1334e ] The ChipIdea IRQ is disabled before scheduling the otg work and re-enabled on otg work completion. However if the job is already scheduled we have to undo the effect of disable_irq int order to balance the IRQ disable-depth value. Fixes: be6b0c1bd0be ("usb: chipidea: using one inline function to cover queue work operations") Signed-off-by: Loic Poulain Signed-off-by: Peter Chen Signed-off-by: Sasha Levin --- drivers/usb/chipidea/otg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h index 7e7428e48bfa..4f8b8179ec96 100644 --- a/drivers/usb/chipidea/otg.h +++ b/drivers/usb/chipidea/otg.h @@ -17,7 +17,8 @@ void ci_handle_vbus_change(struct ci_hdrc *ci); static inline void ci_otg_queue_work(struct ci_hdrc *ci) { disable_irq_nosync(ci->irq); - queue_work(ci->wq, &ci->work); + if (queue_work(ci->wq, &ci->work) == false) + enable_irq(ci->irq); } #endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */