From patchwork Tue Jun 23 19:58:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223359 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=-10.0 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,URIBL_BLOCKED,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 BF333C433E0 for ; Tue, 23 Jun 2020 20:52:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9200820738 for ; Tue, 23 Jun 2020 20:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945532; bh=c8EQf6Mt8k002eIOKOK2hYMBzjY4PKJdxObRTjKoV8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0qUg+naINBSGghAI1bAhoFEiD9U6L8FQvzdQwgy2p3HM4XNzrUvky31c9PDwopBKf 6byqc/Vc+3rINB/gWduVeWjmoGZdJDqO5PrLpL6/W0CRU/2BXlrC7GgWYjcyY4KQHf Va9EKc2Nyvj2tVvwlVNmTYdCOIXWExDNmFmNy7dg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392512AbgFWUwG (ORCPT ); Tue, 23 Jun 2020 16:52:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:46218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392896AbgFWUrj (ORCPT ); Tue, 23 Jun 2020 16:47:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 95E6721548; Tue, 23 Jun 2020 20:47:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945260; bh=c8EQf6Mt8k002eIOKOK2hYMBzjY4PKJdxObRTjKoV8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tisR+KIfGZfvBt/89PKSWolbiAUJFaEVemSKmK4uaq9FzwdUcLsa+2VoxYnPTGfDG bFl3w7XeQJP3x/DzbqmVABHxZAQVAWMZ25V4ea5E94t1sLzKyLmO/O77oUMHlqNf/G gTH9yeMLd6WvD/+6SIJb2OBziWohSVLxo4/Z+90U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Minas Harutyunyan , Fabrice Gasnier , Felipe Balbi , Sasha Levin Subject: [PATCH 4.14 071/136] usb: dwc2: gadget: move gadget resume after the core is in L0 state Date: Tue, 23 Jun 2020 21:58:47 +0200 Message-Id: <20200623195307.249399069@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Fabrice Gasnier [ Upstream commit 8c935deacebb8fac8f41378701eb79d12f3c2e2d ] When the remote wakeup interrupt is triggered, lx_state is resumed from L2 to L0 state. But when the gadget resume is called, lx_state is still L2. This prevents the resume callback to queue any request. Any attempt to queue a request from resume callback will result in: - "submit request only in active state" debug message to be issued - dwc2_hsotg_ep_queue() returns -EAGAIN Call the gadget resume routine after the core is in L0 state. Fixes: f81f46e1f530 ("usb: dwc2: implement hibernation during bus suspend/resume") Acked-by: Minas Harutyunyan Signed-off-by: Fabrice Gasnier Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc2/core_intr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c index b8bcb007c92a9..e3e0a3ab31daa 100644 --- a/drivers/usb/dwc2/core_intr.c +++ b/drivers/usb/dwc2/core_intr.c @@ -364,10 +364,13 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) if (ret && (ret != -ENOTSUPP)) dev_err(hsotg->dev, "exit hibernation failed\n"); + /* Change to L0 state */ + hsotg->lx_state = DWC2_L0; call_gadget(hsotg, resume); + } else { + /* Change to L0 state */ + hsotg->lx_state = DWC2_L0; } - /* Change to L0 state */ - hsotg->lx_state = DWC2_L0; } else { if (hsotg->params.hibernation) return;