From patchwork Tue Jun 9 17:45:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224649 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 5782AC433E1 for ; Tue, 9 Jun 2020 18:03:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 27578206D5 for ; Tue, 9 Jun 2020 18:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725780; bh=RflnbD7gqZ1jl7ABeffmia6Gt/M0jQeppRlS42Z53+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gW7mjmZ5EChkyYKLbmEweZwOEVTWxpBlPY8etXTDUVWZz8Iap0zQh64ZcBrXX18J1 O05c/CyHBWNS1T+CnPXOhHP3dTJo7eCYlUzS6zFWx4qGo7cC8e0NezCaOPencpvkO7 9YSrPMjvth7R17tFh4ibCoSOIk6RbOfwLAtRRKN0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731479AbgFISCy (ORCPT ); Tue, 9 Jun 2020 14:02:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:43934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733002AbgFIRxI (ORCPT ); Tue, 9 Jun 2020 13:53:08 -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 46A9E207ED; Tue, 9 Jun 2020 17:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725187; bh=RflnbD7gqZ1jl7ABeffmia6Gt/M0jQeppRlS42Z53+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oHSAxmK6qEpUxhGs+46314DrKmZDm9neS33D3Q57HvgBZQFrTDn+nD3gyy+BsNM5D bFnqrLwlj7n7OyRIKkQgVR5NdfFGFU13dF3q5xqERqItFyF80yQywyE5EGrDvs61yp a9HPTrAAFiG1VmWR0Ad341RxA/v3cshZvLCG84m0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bin Liu Subject: [PATCH 5.4 20/34] usb: musb: start session in resume for host port Date: Tue, 9 Jun 2020 19:45:16 +0200 Message-Id: <20200609174055.141154547@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174052.628006868@linuxfoundation.org> References: <20200609174052.628006868@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: Bin Liu commit 7f88a5ac393f39319f69b8b20cc8d5759878d1a1 upstream. Commit 17539f2f4f0b ("usb: musb: fix enumeration after resume") replaced musb_start() in musb_resume() to not override softconnect bit, but it doesn't restart the session for host port which was done in musb_start(). The session could be disabled in musb_suspend(), which leads the host port doesn't stay in host mode. So let's start the session specifically for host port in musb_resume(). Fixes: 17539f2f4f0b ("usb: musb: fix enumeration after resume") Cc: stable@vger.kernel.org Signed-off-by: Bin Liu Link: https://lore.kernel.org/r/20200525025049.3400-3-b-liu@ti.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/musb_core.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2721,6 +2721,13 @@ static int musb_resume(struct device *de musb_enable_interrupts(musb); musb_platform_enable(musb); + /* session might be disabled in suspend */ + if (musb->port_mode == MUSB_HOST && + !(musb->ops->quirks & MUSB_PRESERVE_SESSION)) { + devctl |= MUSB_DEVCTL_SESSION; + musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); + } + spin_lock_irqsave(&musb->lock, flags); error = musb_run_resume_work(musb); if (error)