From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9185C433EF for ; Thu, 3 Feb 2022 20:42:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242937AbiBCUmQ (ORCPT ); Thu, 3 Feb 2022 15:42:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238476AbiBCUju (ORCPT ); Thu, 3 Feb 2022 15:39:50 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15974C061222; Thu, 3 Feb 2022 12:36:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A344CB835AD; Thu, 3 Feb 2022 20:36:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6A97C340F0; Thu, 3 Feb 2022 20:36:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643920589; bh=+4UDzhaXehTdGVEq5N8CE9X04U1EUpCRfvJYtC9LNkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gOUvuOdldyZ6IJPmxFK2BHNfZj15vSB+h40WwRtdQ3Z0rtpyFzPJlG3hvtZU3c/bH I2ufWryj2nUgDsRF3LdH5pXgmfZpUpUe9qgW1liIYkmlyEDzwWt93c3EZr/eT5rQdy YaNVt5ddyrHojwLVWyi6P+ykzpf+lzx4vEJxjBxngTENi3pGlVTMXGnCc5vs7G34ej T8f8DdA6hAsLeztbDmvtvMHJSgTALejnUt41WAxppl1sl+WXRLFD/t2Oelaai/Jf03 TOiRzo8TThPLFGEoLFexxHdqlUXY8Gcn2WQwxV8ia+EmI7JbZfmkFeWCLmwvk/o6jQ 2bKxY6Ssw0x0Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Amelie Delaunay , Minas Harutyunyan , Greg Kroah-Hartman , Sasha Levin , hminas@synopsys.com, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 09/10] usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend Date: Thu, 3 Feb 2022 15:36:12 -0500 Message-Id: <20220203203613.4165-9-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203203613.4165-1-sashal@kernel.org> References: <20220203203613.4165-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Amelie Delaunay [ Upstream commit ac55d163855924aa5af9f1560977da8f346963c8 ] Calling dwc2_hsotg_ep_disable on ep0 (in/out) will lead to the following logs before returning -EINVAL: dwc2 49000000.usb-otg: dwc2_hsotg_ep_disable: called for ep0 dwc2 49000000.usb-otg: dwc2_hsotg_ep_disable: called for ep0 To avoid these two logs while suspending, start disabling the endpoint from the index 1, as done in dwc2_hsotg_udc_stop: /* all endpoints should be shutdown */ for (ep = 1; ep < hsotg->num_of_eps; ep++) { if (hsotg->eps_in[ep]) dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep); if (hsotg->eps_out[ep]) dwc2_hsotg_ep_disable_lock(&hsotg->eps_out[ep]->ep); } Acked-by: Minas Harutyunyan Signed-off-by: Amelie Delaunay Link: https://lore.kernel.org/r/20211207130101.270314-1-amelie.delaunay@foss.st.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/dwc2/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index b405c8ac8984b..1e46005929e44 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4818,7 +4818,7 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg) hsotg->gadget.speed = USB_SPEED_UNKNOWN; spin_unlock_irqrestore(&hsotg->lock, flags); - for (ep = 0; ep < hsotg->num_of_eps; ep++) { + for (ep = 1; ep < hsotg->num_of_eps; ep++) { if (hsotg->eps_in[ep]) dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep); if (hsotg->eps_out[ep]) -- 2.34.1