From patchwork Wed Oct 31 23:07:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149916 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp118039ljp; Wed, 31 Oct 2018 16:31:07 -0700 (PDT) X-Google-Smtp-Source: AJdET5fIk0Nxa+FoOnrlhFO/wqESp085hDmDg/m7O3OfK0TWdstuawVODM/iccu8NWraGGQipZzy X-Received: by 2002:a62:2fc1:: with SMTP id v184-v6mr5323311pfv.115.1541028667772; Wed, 31 Oct 2018 16:31:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541028667; cv=none; d=google.com; s=arc-20160816; b=UtF09Grymnt8AtfRishK1VFExj4oCH92R7W6roCjTOsFT9OOQMDfTv0KSj5ioDxt2q n0VOe3rB1gKFZX/nXG7gI3oXqMcdVJw1U/wiz8ncYy5X1tQanAc/MwukyZVepSSJxvls Ds+Id38am/rQd+UmcHX320eJ0aiOyPgStVe7qUbgGOkSoZt6LMS1MpVt0EnRDYbL3aCY T02W652sAak9ddCVFVahSU7hs2bXJz/XCiv2WMBXGv4K1K3YoMgcOJhU3bOJfhmsw1Bo xuB9GPcjNtWcSsCGMu+w2nrtGcEcJS7N1etNNw552NrEYQHTI4dfRPEgcyz6XzUvd0p2 +Bdg== 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=Ttp2nZ8A6kr3ROqdOrutN4CXbimv/QUJ+MAf4qhcvzXFeASGk8/uJdVN6SCnKQfwH8 Vk31JUCnMQKg/my4OIaz7g9l/sVy+SD3kLkiMdkymrVFuS7pWuv0dP8HOsv3Kg2UQbwc ZW3AdmH6M3W9K9cH43VedJdUR1hcVMO3j9QlMPhDCBnE/5zBAgdjx5owDV5w1konviFF 0J+/VQ9Wh0R/s0JqAE11Ll07igalwt6HigqAA/Ye1yv4uthBgvSGa1ZPAEFyaJNYUHeY QiQfJidRPJQtAbwulQ+0f4CPu/isxTPLkk8bEG7JOpWW2SyEljx6/KDG7AnOUIoNuu2y F3cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QUSApSc1; 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 m75-v6si28879385pga.481.2018.10.31.16.31.07; Wed, 31 Oct 2018 16:31:07 -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=QUSApSc1; 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 S1730816AbeKAIbY (ORCPT + 32 others); Thu, 1 Nov 2018 04:31:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:59948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730576AbeKAIJr (ORCPT ); Thu, 1 Nov 2018 04:09:47 -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 EE94D208A3; Wed, 31 Oct 2018 23:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541027375; bh=8YA0vWFhpY+Sn68jT8xm6ghQKKZys++ILysgTsBS9rE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QUSApSc1KYr1LGB3kYPdkpdj8dsDhDDR8CV31v10r8j+8s+X5n3kbjJi5GOZptvrM 72sS14BQGNxieP/UOceTERhR9JyrBfT8OhMOtN5h8wDjS5pSkWlp2muc5Xy2UhDAbo MXbx3kOE9CbJSveJkCfQzBM1qg6hLJ1yxfBJqYC8= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Loic Poulain , Peter Chen , Sasha Levin Subject: [PATCH AUTOSEL 4.18 112/126] usb: chipidea: Prevent unbalanced IRQ disable Date: Wed, 31 Oct 2018 19:07:40 -0400 Message-Id: <20181031230754.29029-112-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031230754.29029-1-sashal@kernel.org> References: <20181031230754.29029-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 */