[5.4,110/147] usb: host: xhci-plat: keep runtime active when removing host

From: Li Jun <jun.li@nxp.com>

From: Li Jun <jun.li@nxp.com>

commit 1449cb2c2253d37d998c3714aa9b95416d16d379 upstream.

While removing the host (e.g. for USB role switch from host to device),
if runtime pm is enabled by user, below oops occurs on dwc3 and cdns3
platforms.
Keeping the xhci-plat device active during host removal, and disabling
runtime pm before calling pm_runtime_set_suspended() fixes them.

oops1:
Unable to handle kernel NULL pointer dereference at virtual address
0000000000000240
Internal error: Oops: 96000004 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 5 Comm: kworker/0:0 Not tainted 5.4.3-00107-g64d454a-dirty
Hardware name: FSL i.MX8MP EVK (DT)
Workqueue: pm pm_runtime_work
pstate: 60000005 (nZCv daif -PAN -UAO)
pc : xhci_suspend+0x34/0x698
lr : xhci_plat_runtime_suspend+0x2c/0x38
sp : ffff800011ddbbc0
Call trace:
 xhci_suspend+0x34/0x698
 xhci_plat_runtime_suspend+0x2c/0x38
 pm_generic_runtime_suspend+0x28/0x40
 __rpm_callback+0xd8/0x138
 rpm_callback+0x24/0x98
 rpm_suspend+0xe0/0x448
 rpm_idle+0x124/0x140
 pm_runtime_work+0xa0/0xf8
 process_one_work+0x1dc/0x370
 worker_thread+0x48/0x468
 kthread+0xf0/0x120
 ret_from_fork+0x10/0x1c

oops2:
usb 2-1: USB disconnect, device number 2
xhci-hcd xhci-hcd.1.auto: remove, state 4
usb usb2: USB disconnect, device number 1
xhci-hcd xhci-hcd.1.auto: USB bus 2 deregistered
xhci-hcd xhci-hcd.1.auto: remove, state 4
usb usb1: USB disconnect, device number 1
Unable to handle kernel NULL pointer dereference at virtual address
0000000000000138
Internal error: Oops: 96000004 [#1] PREEMPT SMP
Modules linked in:
CPU: 2 PID: 7 Comm: kworker/u8:0 Not tainted 5.6.0-rc4-next-20200304-03578
Hardware name: Freescale i.MX8QXP MEK (DT)
Workqueue: 1-0050 tcpm_state_machine_work
pstate: 20000005 (nzCv daif -PAN -UAO)
pc : xhci_free_dev+0x214/0x270
lr : xhci_plat_runtime_resume+0x78/0x88
sp : ffff80001006b5b0
Call trace:
 xhci_free_dev+0x214/0x270
 xhci_plat_runtime_resume+0x78/0x88
 pm_generic_runtime_resume+0x30/0x48
 __rpm_callback+0x90/0x148
 rpm_callback+0x28/0x88
 rpm_resume+0x568/0x758
 rpm_resume+0x260/0x758
 rpm_resume+0x260/0x758
 __pm_runtime_resume+0x40/0x88
 device_release_driver_internal+0xa0/0x1c8
 device_release_driver+0x1c/0x28
 bus_remove_device+0xd4/0x158
 device_del+0x15c/0x3a0
 usb_disable_device+0xb0/0x268
 usb_disconnect+0xcc/0x300
 usb_remove_hcd+0xf4/0x1dc
 xhci_plat_remove+0x78/0xe0
 platform_drv_remove+0x30/0x50
 device_release_driver_internal+0xfc/0x1c8
 device_release_driver+0x1c/0x28
 bus_remove_device+0xd4/0x158
 device_del+0x15c/0x3a0
 platform_device_del.part.0+0x20/0x90
 platform_device_unregister+0x28/0x40
 cdns3_host_exit+0x20/0x40
 cdns3_role_stop+0x60/0x90
 cdns3_role_set+0x64/0xd8
 usb_role_switch_set_role.part.0+0x3c/0x68
 usb_role_switch_set_role+0x20/0x30
 tcpm_mux_set+0x60/0xf8
 tcpm_reset_port+0xa4/0xf0
 tcpm_detach.part.0+0x28/0x50
 tcpm_state_machine_work+0x12ac/0x2360
 process_one_work+0x1c8/0x470
 worker_thread+0x50/0x428
 kthread+0xfc/0x128
 ret_from_fork+0x10/0x18
Code: c8037c02 35ffffa3 17ffe7c3 f9800011 (c85f7c01)
---[ end trace 45b1a173d2679e44 ]---

[minor commit message cleanup  -Mathias]
Cc: Baolin Wang <baolin.wang@linaro.org>
Cc: <stable@vger.kernel.org>
Fixes: b0c69b4bace3 ("usb: host: plat: Enable xHCI plat runtime PM")
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Tested-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200514110432.25564-3-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/usb/host/xhci-plat.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Message ID	20200518173526.874519462@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=DMP2=7A=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Baolin Wang <baolin.wang@linaro.org>, Peter Chen <peter.chen@nxp.com>, Li Jun <jun.li@nxp.com>, Mathias Nyman <mathias.nyman@linux.intel.com> Subject: [PATCH 5.4 110/147] usb: host: xhci-plat: keep runtime active when removing host Date: Mon, 18 May 2020 19:37:13 +0200 Message-Id: <20200518173526.874519462@linuxfoundation.org> In-Reply-To: <20200518173513.009514388@linuxfoundation.org> References: <20200518173513.009514388@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,002/147] shmem: fix possible deadlocks on shmlock_user_lock [5.4,003/147] net: phy: microchip_t1: add lan87xx_phy_init to initialize the lan87xx phy. [5.4,004/147] KVM: arm: vgic: Synchronize the whole guest on GIC{D,R}_I{S,C}ACTIVER read [5.4,007/147] SUNRPC: Fix GSS privacy computation of auth->au_ralign [5.4,011/147] drop_monitor: work around gcc-10 stringop-overflow warning [5.4,013/147] sun6i: dsi: fix gcc-4.8 [5.4,014/147] net_sched: fix tcm_parent in tc filter dump [5.4,016/147] selftests/bpf: fix goto cleanup label not defined [5.4,018/147] dpaa2-eth: properly handle buffer size restrictions [5.4,021/147] net: phy: fix aneg restart in phy_ethtool_set_eee [5.4,023/147] pppoe: only process PADT targeted at local interfaces [5.4,025/147] tcp: fix error recovery in tcp_zerocopy_receive() [5.4,028/147] dpaa2-eth: prevent array underflow in update_cls_rule() [5.4,031/147] net: ipv4: really enforce backoff for redirects [5.4,032/147] netprio_cgroup: Fix unlimited memory leak of v2 cgroups [5.4,035/147] r8169: re-establish support for RTL8401 chip version [5.4,037/147] riscv: fix vdso build with lld [5.4,040/147] dmaengine: mmp_tdma: Reset channel error on release [5.4,041/147] selftests/ftrace: Check the first record for kprobe_args_type.tc [5.4,044/147] drm/amd/powerplay: avoid using pm_en before it is initialized revised [5.4,045/147] drm/amd/display: check if REFCLK_CNTL register is present [5.4,046/147] drm/amd/display: Update downspread percent to match spreadsheet for DCN2.1 [5.4,049/147] drm/amdgpu: invalidate L2 before SDMA IBs (v2) [5.4,050/147] ipc/util.c: sysvipc_find_ipc() incorrectly updates position index [5.4,051/147] ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse [5.4,054/147] IB/hfi1: Fix another case where pq is left on waitlist [5.4,055/147] ACPI: EC: PM: Avoid premature returns from acpi_s2idle_wake() [5.4,056/147] pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H [5.4,058/147] pinctrl: qcom: fix wrong write in update_dual_edge [5.4,060/147] bpf: Fix error return code in map_lookup_and_delete_elem() [5.4,062/147] i40iw: Fix error handling in i40iw_manage_arp_cache() [5.4,064/147] bpf, sockmap: msg_pop_data can incorrecty set an sge length [5.4,066/147] mmc: alcor: Fix a resource leak in the error path for ->probe() [5.4,067/147] mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10 [5.4,070/147] mmc: block: Fix request completion in the CQE timeout path [5.4,071/147] gfs2: More gfs2_find_jhead fixes [5.4,074/147] NFS: Fix fscache super_cookie index_key from changing after umount [5.4,076/147] NFSv4: Fix fscache cookie aux_data to ensure change_attr is included [5.4,078/147] drm/i915/gvt: Fix kernel oops for 3-level ppgtt guest [5.4,080/147] nfs: fix NULL deference in nfs4_get_valid_delegation [5.4,082/147] netfilter: nft_set_rbtree: Introduce and use nft_rbtree_interval_start() [5.4,083/147] netfilter: nft_set_rbtree: Add missing expired checks [5.4,086/147] IB/core: Fix potential NULL pointer dereference in pkey cache [5.4,087/147] RDMA/core: Fix double put of resource [5.4,090/147] s390/ism: fix error return code in ism_probe() [5.4,092/147] NFSv3: fix rpc receive buffer size for MOUNT call [5.4,093/147] pnp: Use list_for_each_entry() instead of open coding [5.4,097/147] gcc-10: disable array-bounds warning for now [5.4,100/147] gcc-10 warnings: fix low-hanging fruit [5.4,101/147] gcc-10: mark more functions __init to avoid section mismatch warnings [5.4,104/147] USB: usbfs: fix mmap dma mismatch [5.4,105/147] ALSA: hda/realtek - Limit int mic boost for Thinkpad T530 [5.4,107/147] ALSA: rawmidi: Fix racy buffer resize under concurrent accesses [5.4,108/147] ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset [5.4,110/147] usb: host: xhci-plat: keep runtime active when removing host [5.4,112/147] USB: gadget: fix illegal array access in binding with UDC [5.4,114/147] Make the "Reducing compressed framebufer size" message be DRM_INFO_ONCE() [5.4,117/147] ARM: dts: imx6dl-yapp4: Fix Ursa board Ethernet connection [5.4,118/147] drm/amd/display: add basic atomic check for cursor plane [5.4,119/147] powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG [5.4,122/147] x86/unwind/orc: Fix error handling in __unwind_start() [5.4,124/147] clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks [5.4,126/147] fanotify: fix merging marks masks with FAN_ONDIR [5.4,128/147] usb: gadget: audio: Fix a missing error return value in audio_bind() [5.4,131/147] Revert "ALSA: hda/realtek: Fix pop noise on ALC225" [5.4,132/147] clk: Unlink clock if failed to prepare or enable [5.4,134/147] arm64: dts: meson-g12-common: fix dwc2 clock names [5.4,139/147] arm64: dts: renesas: r8a77980: Fix IPMMU VIP[01] nodes [5.4,140/147] ARM: dts: r8a7740: Add missing extal2 to CPG node [5.4,142/147] bpf: Fix sk_psock refcnt leak when receiving message [5.4,143/147] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce [5.4,146/147] selftest/bpf: fix backported test_select_reuseport selftest changes [5.4,147/147] bpf: Test_progs, fix test_get_stack_rawtp_err.c build

[5.4,110/147] usb: host: xhci-plat: keep runtime active when removing host

Commit Message

Patch