Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3086445ybt; Mon, 29 Jun 2020 15:01:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFLZJlSC+GI4pYuWr7LpiR5n09qjI+XHKdOb+SYlkMIlJPQVE9QlyNFqCq2eN1DITuWSN/ X-Received: by 2002:aa7:dacb:: with SMTP id x11mr17557656eds.280.1593468070499; Mon, 29 Jun 2020 15:01:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468070; cv=none; d=google.com; s=arc-20160816; b=n5REsCw6C4iwAwPxWLdbElDcNkdtp6XGIWb+dYM0oZ0ghthZ89mLA6UgeghuKrdz24 ugMITSfXetRSQdTKzSyw3DObbxgETTmQ0vLOEUPvAeEaERPS5as4sPnqk3z/ef6GehST SdXi4ksW2dWR8GQbjPlglhTzcQk6krcKElP0ngyIm2HIkEPzqHNzI+ypu2SSCmf39iKR Q42koYrdEX3XqnyhZP1+36x3t5e0tfKpljXodqccek4ELh8qEWeMOuXn1zPGlVv0NfFn rFCnN4rFM8cHdye/LgravRurJl9cmlKv/n4XIVYS4sRHdyWR1oME+tjwqP9+rQyKpNeu 9Xgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7sZw6VPrfodGjwIxanEdmlEGD5GIrBlaCo0ZsLSGkvU=; b=KtEDHZHxtcpRWq3HmIyUYW09Vfp9sU8pVfU5UHbw5mMi7ASG/dVo7k2eMsS4Dc5oHo irkdhun45S6vNgNNN9gCDQDGMfJwOrhVfUu7PyAHI4xbBl22f3CThJsi5YefdT0/hqW4 XzxMoEG7UU9OBxkLJKAnM2Gmr+/V+aHEFWFxTSPD9NUbU6PNQV/90dDwPGx2bJOeMsge SlrMQtAWUZLG5nKVIIM7dvT4LeCaGJMdC8Dd5jt7afDe09qUTN/YFlPdvx8o4uDyGZCj UFWaiSJJACeJy0met/AzfgGh45oqSVu/3KFy8ls50LcRerbLw8uYhkSdfmTT3bvq1Ixo f47Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZOi5BygW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id lj13si523838ejb.357.2020.06.29.15.00.47; Mon, 29 Jun 2020 15:01:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZOi5BygW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S2404810AbgF2V7q (ORCPT + 99 others); Mon, 29 Jun 2020 17:59:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:56908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726413AbgF2Sf0 (ORCPT ); Mon, 29 Jun 2020 14:35:26 -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 778F82463F; Mon, 29 Jun 2020 15:19:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443964; bh=HYvfElDfnG+Yf63yRLlSta1TK55cTcemPItTmCoDs6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZOi5BygWQ/lBhMwNC2Rgd/b0ey6hgM1QN1Urn3aZNZ6Ffx4f7/HmpU7aH0SsnOCcT EoLUxwIfGdMUQYBDQdvgnMikg3N9H/ohLBfl4hkc9Ejc3RXxMrNh4FowqYrQw1Wa63 oh2BE9xGRNbBTyoFC8nTuMmLrmVYB2SBG78CY+F8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Macpaul Lin , Chunfeng Yun , Mathias Nyman , Greg Kroah-Hartman Subject: [PATCH 5.7 067/265] usb: host: xhci-mtk: avoid runtime suspend when removing hcd Date: Mon, 29 Jun 2020 11:15:00 -0400 Message-Id: <20200629151818.2493727-68-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Macpaul Lin commit a24d5072e87457a14023ee1dd3fc8b1e76f899ef upstream. When runtime suspend was enabled, runtime suspend might happen when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it. Signed-off-by: Macpaul Lin Reviewed-by: Chunfeng Yun Cc: stable@vger.kernel.org Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20200624135949.22611-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index bfbdb3ceed291..4311d4c9b68de 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev) struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct usb_hcd *shared_hcd = xhci->shared_hcd; + pm_runtime_put_noidle(&dev->dev); + pm_runtime_disable(&dev->dev); + usb_remove_hcd(shared_hcd); xhci->shared_hcd = NULL; device_init_wakeup(&dev->dev, false); @@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev) xhci_mtk_sch_exit(mtk); xhci_mtk_clks_disable(mtk); xhci_mtk_ldos_disable(mtk); - pm_runtime_put_sync(&dev->dev); - pm_runtime_disable(&dev->dev); return 0; } -- 2.25.1