February 2022 - Linux-stable-mirror

[PATCH AUTOSEL 5.16 01/34] ARM: OMAP2+: hwmod: Add of_node_put() before break

by Sasha Levin

From: Wan Jiabing <wanjiabing(a)vivo.com> [ Upstream commit 80c469a0a03763f814715f3d12b6f3964c7423e8 ] Fix following coccicheck warning: ./arch/arm/mach-omap2/omap_hwmod.c:753:1-23: WARNING: Function for_each_matching_node should have of_node_put() before break Early exits from for_each_matching_node should decrement the node reference counter. Signed-off-by: Wan Jiabing <wanjiabing(a)vivo.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/mach-omap2/omap_hwmod.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index ccb0e3732c0dc..31d1a21f60416 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -752,8 +752,10 @@ static int __init _init_clkctrl_providers(void) for_each_matching_node(np, ti_clkctrl_match_table) { ret = _setup_clkctrl_provider(np); - if (ret) + if (ret) { + of_node_put(np); break; + } } return ret; -- 2.34.1

3 years, 2 months

2
34
0 0

[PATCH 5.15 000/172] 5.15.24-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.24 release. There are 172 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 16 Feb 2022 09:24:36 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.24-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.24-rc1 Vijayanand Jitta <quic_vjitta(a)quicinc.com> iommu: Fix potential use-after-free during probe Song Liu <song(a)kernel.org> perf: Fix list corruption in perf_cgroup_switch() Alexander Stein <alexander.stein(a)ew.tq-group.com> arm64: dts: imx8mq: fix lcdif port node Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> MIPS: octeon: Fix missed PTR->PTR_WD conversion James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Reduce log messages seen after firmware download James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled Nathan Chancellor <nathan(a)kernel.org> Makefile.extrawarn: Move -Wunaligned-access to W=1 Tadeusz Struk <tadeusz.struk(a)linaro.org> sched/fair: Fix fault in reweight_entity Reinette Chatre <reinette.chatre(a)intel.com> x86/sgx: Silence softlockup detection when releasing large enclaves Armin Wolf <W_Armin(a)gmx.de> hwmon: (dell-smm) Speed up setting of fan speed Slark Xiao <slark_xiao(a)163.com> bus: mhi: pci_generic: Add mru_default for Cinterion MV31-W Slark Xiao <slark_xiao(a)163.com> bus: mhi: pci_generic: Add mru_default for Foxconn SDX55 Vineeth Vijayan <vneethv(a)linux.ibm.com> s390/cio: verify the driver availability for path_event call Kees Cook <keescook(a)chromium.org> signal: HANDLER_EXIT should clear SIGNAL_UNKILLABLE Kees Cook <keescook(a)chromium.org> seccomp: Invalidate seccomp mode to catch death failures Roman Gushchin <guro(a)fb.com> mm: memcg: synchronize objcg lists with a dedicated spinlock Mathias Krause <minipli(a)grsecurity.net> iio: buffer: Fix file related error handling in IIO_BUFFER_GET_FD_IOCTL Kishon Vijay Abraham I <kishon(a)ti.com> phy: ti: Fix missing sentinel for clk_div_table Samuel Thibault <samuel.thibault(a)ens-lyon.org> speakup-dectlk: Restore pitch setting Johan Hovold <johan(a)kernel.org> USB: serial: cp210x: add CPI Bulk Coin Recycler id Johan Hovold <johan(a)kernel.org> USB: serial: cp210x: add NCR Retail IO box id Stephan Brunner <s.brunner(a)stephan-brunner.net> USB: serial: ch341: add support for GW Instek USB2.0-Serial devices Pawel Dembicki <paweldembicki(a)gmail.com> USB: serial: option: add ZTE MF286D modem Cameron Williams <cang1(a)live.co.uk> USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 Jann Horn <jannh(a)google.com> usb: raw-gadget: fix handling of dual-direction-capable endpoints Pavel Hofman <pavel.hofman(a)ivitera.com> usb: gadget: f_uac2: Define specific wTerminalType Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> usb: gadget: rndis: check size of RNDIS_MSG_SET command Szymon Heidrich <szymon.heidrich(a)gmail.com> USB: gadget: validate interface OS descriptor requests Adam Ford <aford173(a)gmail.com> usb: gadget: udc: renesas_usb3: Fix host to USB_ROLE_NONE transition Udipto Goswami <quic_ugoswami(a)quicinc.com> usb: dwc3: gadget: Prevent core from processing stale TRBs Sean Anderson <sean.anderson(a)seco.com> usb: ulpi: Call of_node_put correctly Sean Anderson <sean.anderson(a)seco.com> usb: ulpi: Move of_node_put to ulpi_dev_release Jann Horn <jannh(a)google.com> net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" Fabrice Gasnier <fabrice.gasnier(a)foss.st.com> usb: dwc2: drd: fix soft connect when gadget is unconfigured Jonas Malaco <jonas(a)protocubo.io> eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAX TATSUKAWA KOSUKE (立川江介) <tatsu-ab1(a)nec.com> n_tty: wake up poll(POLLRDNORM) on receiving data Jakob Koschel <jakobkoschel(a)gmail.com> vt_ioctl: add array_index_nospec to VT_ACTIVATE Jakob Koschel <jakobkoschel(a)gmail.com> vt_ioctl: fix array_index_nospec in vt_setactivate Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister Colin Foster <colin.foster(a)in-advantage.com> net: mscc: ocelot: fix mutex lock error during ethtool stats read Dave Ertman <david.m.ertman(a)intel.com> ice: Avoid RTNL lock when re-creating auxiliary device Dave Ertman <david.m.ertman(a)intel.com> ice: Fix KASAN error in LAG NETDEV_UNREGISTER handler Jesse Brandeburg <jesse.brandeburg(a)intel.com> ice: fix IPIP and SIT TSO offload Dan Carpenter <dan.carpenter(a)oracle.com> ice: fix an error code in ice_cfg_phy_fec() Robert-Ionut Alexa <robert-ionut.alexa(a)nxp.com> dpaa2-eth: unregister the netdev before disconnecting from the PHY Kishen Maloor <kishen.maloor(a)intel.com> mptcp: netlink: process IPv6 addrs in creating listening sockets Yang Wang <KevinYang.Wang(a)amd.com> drm/amd/pm: fix hwmon node of power1_label create issue Raju Rangoju <Raju.Rangoju(a)amd.com> net: amd-xgbe: disable interrupts during pci removal Jon Maloy <jmaloy(a)redhat.com> tipc: rate limit warning for received illegal binding update Joel Stanley <joel(a)jms.id.au> net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE Eric Dumazet <edumazet(a)google.com> veth: fix races around rq->rx_notify_masked Antoine Tenart <atenart(a)kernel.org> net: fix a memleak when uncloning an skb dst and its metadata Antoine Tenart <atenart(a)kernel.org> net: do not keep the dst cache when uncloning an skb dst and its metadata Louis Peens <louis.peens(a)corigine.com> nfp: flower: fix ida_idx not being released Eric Dumazet <edumazet(a)google.com> ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: lantiq_gswip: don't use devres for mdiobus Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: mt7530: fix kernel bug in mdiobus_free() when unbinding Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: felix: don't use devres for mdiobus Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: bcm_sf2: don't use devres for mdiobus Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: ar9331: register the mdiobus under devres Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: mv88e6xxx: don't use devres for mdiobus Mahesh Bandewar <maheshb(a)google.com> bonding: pair enable_port with slave_arr_updates Helge Deller <deller(a)gmx.de> fbcon: Avoid 'cap' set but not used warning Niklas Cassel <niklas.cassel(a)wdc.com> gpio: sifive: use the correct register to read output values Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Never return internal error codes to user space Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE Christoph Niedermaier <cniedermaier(a)dh-electronics.com> drm/panel: simple: Assign data from panel_dpi_probe() correctly Samuel Mendoza-Jonas <samjonas(a)amazon.com> ixgbevf: Require large buffers for build_skb on 82599VF Lutz Koschorreck <theleks(a)ko-hh.de> arm64: dts: meson-sm1-odroid: fix boot loop after reboot Dongjin Kim <tobetter(a)gmail.com> arm64: dts: meson-sm1-bananapi-m5: fix wrong GPIO domain for GPIOE_2 Lutz Koschorreck <theleks(a)ko-hh.de> arm64: dts: meson-sm1-odroid: use correct enable-gpio pin for tf-io regulator Dongjin Kim <tobetter(a)gmail.com> arm64: dts: meson-g12b-odroid-n2: fix typo 'dio2133' Florian Westphal <fw(a)strlen.de> netfilter: ctnetlink: disable helper autoassign Steen Hegelund <steen.hegelund(a)microchip.com> net: sparx5: Fix get_stat64 crash in tcpdump Mathias Krause <minipli(a)grsecurity.net> misc: fastrpc: avoid double fput() on failed usercopy Dave Stevenson <dave.stevenson(a)raspberrypi.com> drm/vc4: hdmi: Allow DBLCLK modes even if horz timing is odd. trondmy(a)kernel.org <trondmy(a)kernel.org> NFS: Don't skip directory entries when doing uncached readdir trondmy(a)kernel.org <trondmy(a)kernel.org> NFS: Don't overfill uncached readdir pages Geert Uytterhoeven <geert+renesas(a)glider.be> gpio: aggregator: Fix calling into sleeping GPIO controllers Liu Ying <victor.liu(a)nxp.com> phy: dphy: Correct clk_pre parameter Udipto Goswami <quic_ugoswami(a)quicinc.com> usb: f_fs: Fix use-after-free for epfile Martin Kepplinger <martink(a)posteo.de> arm64: dts: imx8mq: fix mipi_csi bidirectional port numbers Rob Herring <robh(a)kernel.org> ARM: dts: imx7ulp: Fix 'assigned-clocks-parents' typo Dan Carpenter <dan.carpenter(a)oracle.com> phy: stm32: fix a refcount leak in stm32_usbphyc_pll_enable() Robert Hancock <robert.hancock(a)calian.com> phy: xilinx: zynqmp: Fix bus width setting for SGMII Fabio Estevam <festevam(a)gmail.com> ARM: dts: imx6qdl-udoo: Properly describe the SD card detect Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> staging: fbtft: Fix error path in fbtft_driver_module_init() Al Cooper <alcooperx(a)gmail.com> phy: broadcom: Kconfig: Fix PHY_BRCM_USB config option Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM: dts: meson8b: Fix the UART device-tree schema validation Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM: dts: meson8: Fix the UART device-tree schema validation Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM: dts: meson: Fix the UART compatible strings Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix timer regression for beagleboard revision c Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Populate pipe dbuf slices more accurately during readout Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Allow !join_mbus cases for adlp+ dbuf configuration Brian Norris <briannorris(a)chromium.org> drm/rockchip: vop: Correct RK3399 VOP register fields Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/display: change pipe policy for DCN 2.0 Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PM: s2idle: ACPI: Fix wakeup interrupts handling Robin Murphy <robin.murphy(a)arm.com> ACPI/IORT: Check node revision for PMCG resources Sagi Grimberg <sagi(a)grimberg.me> nvme-tcp: fix bogus request completion when failing to send AER Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> ARM: socfpga: fix missing RESET_CONTROLLER Linus Walleij <linus.walleij(a)linaro.org> ARM: dts: Fix boot regression on Skomer Fabio Estevam <festevam(a)gmail.com> ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group Bob Peterson <rpeterso(a)redhat.com> gfs2: Fix gfs2_release for non-writers regression Changbin Du <changbin.du(a)intel.com> riscv: eliminate unreliable __builtin_frame_address(1) Pingfan Liu <kernelfans(a)gmail.com> riscv: cpu-hotplug: clear cpu from numa map when teardown Aurelien Jarno <aurelien(a)aurel32.net> riscv: fix build with binutils 2.38 Jim Mattson <jmattson(a)google.com> KVM: x86: Report deprecated x87 features in supported CPUID Sean Christopherson <seanjc(a)google.com> KVM: VMX: Set vmcs.PENDING_DBG.BS on #DB in STI/MOVSS blocking shadow Sean Christopherson <seanjc(a)google.com> KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermode Vitaly Kuznetsov <vkuznets(a)redhat.com> KVM: nVMX: Also filter MSR_IA32_VMX_TRUE_PINBASED_CTLS when eVMCS Vitaly Kuznetsov <vkuznets(a)redhat.com> KVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER Hou Wenlong <houwenlong93(a)linux.alibaba.com> KVM: eventfd: Fix false positive RCU usage warning Jisheng Zhang <jszhang(a)kernel.org> net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> MIPS: Fix build error due to PTR used in more places Wu Zheng <wu.zheng(a)intel.com> nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs James Clark <james.clark(a)arm.com> perf: Always wake the parent event Amelie Delaunay <amelie.delaunay(a)foss.st.com> usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend Zhan Liu <zhan.liu(a)amd.com> drm/amd/display: Correct MPC split policy for DCN301 Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> PM: hibernate: Remove register_nosave_region_late() Jisheng Zhang <jszhang(a)kernel.org> net: stmmac: reduce unnecessary wakeups from eee sw timer Tong Zhang <ztong0001(a)gmail.com> scsi: myrs: Fix crash in error case Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: Treat link loss as fatal error Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: Use generic error code in ufshcd_set_dev_pwr_mode() John Garry <john.garry(a)huawei.com> scsi: pm8001: Fix bogus FW crash for maxcpus=1 Saurav Kashyap <skashyap(a)marvell.com> scsi: qedf: Change context reset messages to ratelimited Saurav Kashyap <skashyap(a)marvell.com> scsi: qedf: Fix refcount issue when LOGO is received during TMF Saurav Kashyap <skashyap(a)marvell.com> scsi: qedf: Add stag_work to all the vports Xiaoke Wang <xkernel.wang(a)foxmail.com> scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() ZouMingzhe <mingzhe.zou(a)easystack.cn> scsi: target: iscsi: Make sure the np under each tpg is unique Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/fixmap: Fix VM debug warning on unmap Victor Nogueira <victor(a)mojatatu.com> net: sched: Clarify error message when qdisc kind is unknown Raymond Jay Golo <rjgolo(a)gmail.com> drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer Padmanabha Srinivasaiah <treasure4paddy(a)gmail.com> drm/vc4: Fix deadlock on DSI device attach error Peter Zijlstra <peterz(a)infradead.org> sched: Avoid double preemption in __cond_resched_*lock*() Andi Kleen <ak(a)linux.intel.com> x86/perf: Avoid warning for Arch LBR without XSAVE Stephane Eranian <eranian(a)google.com> perf/x86/rapl: fix AMD event handling Sander Vanheule <sander(a)svanheule.net> irqchip/realtek-rtl: Service all pending interrupts Anna Schumaker <Anna.Schumaker(a)Netapp.com> sunrpc: Fix potential race conditions in rpc_sysfs_xprt_state_change() Xiyu Yang <xiyuyang19(a)fudan.edu.cn> net/sunrpc: fix reference count leaks in rpc_sysfs_xprt_state_change Olga Kornievskaia <kolga(a)netapp.com> SUNRPC allow for unspecified transport time in rpc_clnt_add_xprt Olga Kornievskaia <kolga(a)netapp.com> NFSv4 handle port presence in fs_location server string Olga Kornievskaia <kolga(a)netapp.com> NFSv4 expose nfs_parse_server_name function Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1 query for fs_location attr on a new file system Olga Kornievskaia <kolga(a)netapp.com> NFSv4 store server support for fs_location attribute Olga Kornievskaia <kolga(a)netapp.com> NFSv4 remove zero number of fs_locations entries error check Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.1: Fix uninitialised variable in devicenotify Xiaoke Wang <xkernel.wang(a)foxmail.com> nfs: nfs4clinet: check the return value of kstrdup() Olga Kornievskaia <kolga(a)netapp.com> NFSv4 only print the label when its queried NeilBrown <neilb(a)suse.de> NFS: change nfs_access_get_cached to only report the mask Tom Zanussi <zanussi(a)kernel.org> tracing: Propagate is_signed to expression Sumeet Pawnikar <sumeet.r.pawnikar(a)intel.com> thermal/drivers/int340x: Fix RFIM mailbox write commands Arnd Bergmann <arnd(a)arndb.de> thermal: int340x: Limit Kconfig to 64-bit Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> thermal/drivers/int340x: processor_thermal: Suppot 64 bit RFIM responses Antoine Tenart <atenart(a)kernel.org> thermal/drivers/int340x: Improve the tcc offset saving for suspend/resume Chuck Lever <chuck.lever(a)oracle.com> NFSD: Fix the behavior of READ near OFFSET_MAX Chuck Lever <chuck.lever(a)oracle.com> NFSD: Fix offset type in I/O trace points Chuck Lever <chuck.lever(a)oracle.com> NFSD: Clamp WRITE offsets Chuck Lever <chuck.lever(a)oracle.com> NFSD: Fix ia_size underflow Chuck Lever <chuck.lever(a)oracle.com> NFSD: Fix NFSv3 SETATTR/CREATE's handling of large file sizes Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix initialisation of nfs_client cl_flags field Pavel Parkhomenko <Pavel.Parkhomenko(a)baikalelectronics.ru> net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs Pavel Parkhomenko <Pavel.Parkhomenko(a)baikalelectronics.ru> net: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs Oliver Hartkopp <socketcan(a)hartkopp.net> can: isotp: fix error path in isotp_sendmsg() to unlock wait queue Oliver Hartkopp <socketcan(a)hartkopp.net> can: isotp: fix potential CAN frame reception race in isotp_rcv() Andrey Skvortsov <andrej.skvortzov(a)gmail.com> mmc: core: Wait for command setting 'Power Off Notification' bit to complete Jiasheng Jiang <jiasheng(a)iscas.ac.cn> mmc: sdhci-of-esdhc: Check for error num after setting mask Stefan Berger <stefanb(a)linux.ibm.com> ima: Do not print policy rule with inactive LSM labels Roberto Sassu <roberto.sassu(a)huawei.com> ima: Allow template selection with ima_template[_fmt]= after ima_hash= Stefan Berger <stefanb(a)linux.ibm.com> ima: Remove ima_policy file before directory Eric Biggers <ebiggers(a)google.com> ima: fix reference leak in asymmetric_verify() Xiaoke Wang <xkernel.wang(a)foxmail.com> integrity: check the return value of audit_log_start() ------------- Diffstat: .../devicetree/bindings/arm/omap/omap.txt | 3 + Makefile | 4 +- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx23-evk.dts | 1 - arch/arm/boot/dts/imx6qdl-udoo.dtsi | 5 +- arch/arm/boot/dts/imx7ulp.dtsi | 2 +- arch/arm/boot/dts/meson.dtsi | 8 +- arch/arm/boot/dts/meson8.dtsi | 24 +-- arch/arm/boot/dts/meson8b.dtsi | 24 +-- arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 ++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ---- arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 4 - arch/arm/mach-socfpga/Kconfig | 2 + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 +- .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 +- arch/mips/cavium-octeon/octeon-memcpy.S | 2 +- arch/mips/include/asm/asm.h | 4 +- arch/mips/include/asm/ftrace.h | 4 +- arch/mips/include/asm/r4kcache.h | 4 +- arch/mips/include/asm/unaligned-emul.h | 176 ++++++++++----------- arch/mips/kernel/mips-r2-to-r6-emul.c | 104 ++++++------ arch/mips/kernel/r2300_fpu.S | 6 +- arch/mips/kernel/r4k_fpu.S | 2 +- arch/mips/kernel/relocate_kernel.S | 22 +-- arch/mips/kernel/scall32-o32.S | 10 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-n64.S | 2 +- arch/mips/kernel/scall64-o32.S | 10 +- arch/mips/kernel/syscall.c | 8 +- arch/mips/lib/csum_partial.S | 4 +- arch/mips/lib/memcpy.S | 4 +- arch/mips/lib/memset.S | 2 +- arch/mips/lib/strncpy_user.S | 4 +- arch/mips/lib/strnlen_user.S | 2 +- arch/powerpc/include/asm/book3s/32/pgtable.h | 1 + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 + arch/powerpc/include/asm/fixmap.h | 6 +- arch/powerpc/include/asm/nohash/32/pgtable.h | 1 + arch/powerpc/include/asm/nohash/64/pgtable.h | 1 + arch/powerpc/mm/pgtable.c | 9 ++ arch/riscv/Makefile | 6 + arch/riscv/kernel/cpu-hotplug.c | 2 + arch/riscv/kernel/stacktrace.c | 9 +- arch/x86/events/intel/lbr.c | 3 + arch/x86/events/rapl.c | 9 +- arch/x86/kernel/cpu/sgx/encl.c | 2 + arch/x86/kvm/cpuid.c | 13 +- arch/x86/kvm/svm/svm.c | 16 +- arch/x86/kvm/vmx/evmcs.c | 1 + arch/x86/kvm/vmx/evmcs.h | 4 +- arch/x86/kvm/vmx/vmx.c | 25 +++ drivers/accessibility/speakup/speakup_dectlk.c | 1 + drivers/acpi/arm64/iort.c | 14 +- drivers/acpi/ec.c | 10 ++ drivers/acpi/sleep.c | 15 +- drivers/base/power/wakeup.c | 41 ++++- drivers/bus/mhi/pci_generic.c | 2 + drivers/clocksource/timer-ti-dm-systimer.c | 2 +- drivers/gpio/gpio-aggregator.c | 18 ++- drivers/gpio/gpio-sifive.c | 2 +- drivers/gpio/gpiolib-cdev.c | 6 +- drivers/gpio/gpiolib-sysfs.c | 7 +- drivers/gpio/gpiolib.h | 12 ++ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +- drivers/gpu/drm/bridge/nwl-dsi.c | 12 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++ drivers/gpu/drm/i915/intel_pm.c | 75 ++++++--- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 +- drivers/gpu/drm/vc4/vc4_dsi.c | 14 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 + drivers/hwmon/dell-smm-hwmon.c | 12 +- drivers/iio/industrialio-buffer.c | 14 +- drivers/iommu/iommu.c | 9 +- drivers/irqchip/irq-realtek-rtl.c | 8 +- drivers/misc/eeprom/ee1004.c | 3 + drivers/misc/fastrpc.c | 9 +- drivers/mmc/core/sd.c | 8 +- drivers/mmc/host/sdhci-of-esdhc.c | 8 +- drivers/net/bonding/bond_3ad.c | 3 +- drivers/net/dsa/bcm_sf2.c | 7 +- drivers/net/dsa/lantiq_gswip.c | 14 +- drivers/net/dsa/mt7530.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 15 +- drivers/net/dsa/ocelot/felix_vsc9959.c | 4 +- drivers/net/dsa/qca/ar9331.c | 3 +- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 3 + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- drivers/net/ethernet/intel/ice/ice.h | 3 +- drivers/net/ethernet/intel/ice/ice_common.c | 3 +- drivers/net/ethernet/intel/ice/ice_lag.c | 34 +++- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 1 + drivers/net/ethernet/intel/ice/ice_main.c | 28 +++- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 13 +- .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 2 +- drivers/net/ethernet/mscc/ocelot.c | 11 +- .../ethernet/netronome/nfp/flower/tunnel_conf.c | 12 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 +- drivers/net/mdio/mdio-aspeed.c | 1 + drivers/net/phy/marvell.c | 17 +- drivers/net/usb/ax88179_178a.c | 68 ++++---- drivers/net/veth.c | 13 +- drivers/nvme/host/pci.c | 3 +- drivers/nvme/host/tcp.c | 10 +- drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 3 +- drivers/phy/broadcom/Kconfig | 3 +- drivers/phy/phy-core-mipi-dphy.c | 4 +- drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 3 +- drivers/phy/st/phy-stm32-usbphyc.c | 2 +- drivers/phy/ti/phy-j721e-wiz.c | 1 + drivers/phy/xilinx/phy-zynqmp.c | 11 +- drivers/s390/cio/device.c | 2 +- drivers/scsi/lpfc/lpfc.h | 13 +- drivers/scsi/lpfc/lpfc_attr.c | 4 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 8 +- drivers/scsi/myrs.c | 3 +- drivers/scsi/pm8001/pm80xx_hwi.c | 16 +- drivers/scsi/pm8001/pm80xx_hwi.h | 6 +- drivers/scsi/qedf/qedf_io.c | 1 + drivers/scsi/qedf/qedf_main.c | 7 +- drivers/scsi/ufs/ufshcd-pltfrm.c | 7 + drivers/scsi/ufs/ufshcd.c | 9 +- drivers/scsi/ufs/ufshci.h | 3 +- drivers/staging/fbtft/fbtft.h | 5 +- drivers/target/iscsi/iscsi_target_tpg.c | 3 + drivers/thermal/intel/int340x_thermal/Kconfig | 4 +- .../intel/int340x_thermal/int3401_thermal.c | 8 +- .../int340x_thermal/processor_thermal_device.c | 36 ++++- .../int340x_thermal/processor_thermal_device.h | 4 +- .../int340x_thermal/processor_thermal_device_pci.c | 18 ++- .../processor_thermal_device_pci_legacy.c | 8 +- .../intel/int340x_thermal/processor_thermal_mbox.c | 104 +++++++----- .../intel/int340x_thermal/processor_thermal_rfim.c | 23 +-- drivers/tty/n_tty.c | 4 +- drivers/tty/vt/vt_ioctl.c | 3 +- drivers/usb/common/ulpi.c | 10 +- drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc3/gadget.c | 13 ++ drivers/usb/gadget/composite.c | 3 + drivers/usb/gadget/function/f_fs.c | 56 +++++-- drivers/usb/gadget/function/f_uac2.c | 4 +- drivers/usb/gadget/function/rndis.c | 9 +- drivers/usb/gadget/legacy/raw_gadget.c | 2 +- drivers/usb/gadget/udc/renesas_usb3.c | 2 + drivers/usb/serial/ch341.c | 1 + drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 3 + drivers/usb/serial/option.c | 2 + drivers/video/fbdev/core/fbcon.c | 7 +- fs/gfs2/file.c | 7 +- fs/nfs/callback.h | 2 +- fs/nfs/callback_proc.c | 2 +- fs/nfs/callback_xdr.c | 18 +-- fs/nfs/client.c | 9 +- fs/nfs/dir.c | 24 +-- fs/nfs/nfs4_fs.h | 12 +- fs/nfs/nfs4client.c | 5 +- fs/nfs/nfs4namespace.c | 19 ++- fs/nfs/nfs4proc.c | 96 ++++++++--- fs/nfs/nfs4state.c | 6 +- fs/nfs/nfs4xdr.c | 9 +- fs/nfsd/nfs3proc.c | 13 +- fs/nfsd/nfs3xdr.c | 2 +- fs/nfsd/nfs4proc.c | 13 +- fs/nfsd/nfs4xdr.c | 8 +- fs/nfsd/trace.h | 14 +- fs/nfsd/vfs.c | 4 + include/linux/memcontrol.h | 5 +- include/linux/nfs_fs.h | 4 +- include/linux/nfs_fs_sb.h | 2 +- include/linux/nfs_xdr.h | 1 + include/linux/suspend.h | 15 +- include/net/dst_metadata.h | 14 +- include/uapi/linux/netfilter/nf_conntrack_common.h | 2 +- kernel/events/core.c | 16 +- kernel/power/main.c | 5 +- kernel/power/process.c | 2 +- kernel/power/snapshot.c | 21 +-- kernel/power/suspend.c | 2 - kernel/sched/core.c | 23 ++- kernel/seccomp.c | 10 ++ kernel/signal.c | 5 +- kernel/trace/trace_events_hist.c | 3 + mm/memcontrol.c | 10 +- net/can/isotp.c | 29 +++- net/ipv4/ipmr.c | 2 + net/ipv6/ip6mr.c | 2 + net/mptcp/pm_netlink.c | 8 +- net/netfilter/nf_conntrack_netlink.c | 3 +- net/sched/sch_api.c | 2 +- net/sunrpc/clnt.c | 5 +- net/sunrpc/sysfs.c | 41 ++--- net/tipc/name_distr.c | 2 +- scripts/Makefile.extrawarn | 1 + security/integrity/digsig_asymmetric.c | 15 +- security/integrity/ima/ima_fs.c | 2 +- security/integrity/ima/ima_policy.c | 8 + security/integrity/ima/ima_template.c | 10 +- security/integrity/integrity_audit.c | 2 + virt/kvm/eventfd.c | 8 +- 207 files changed, 1472 insertions(+), 797 deletions(-)

3 years, 2 months

11
183
0 0

[PATCH AUTOSEL 4.9 1/3] ata: libata-core: Disable TRIM on M88V29

by Sasha Levin

From: Zoltán Böszörményi <zboszor(a)gmail.com> [ Upstream commit c8ea23d5fa59f28302d4e3370c75d9c308e64410 ] This device is a CF card, or possibly an SSD in CF form factor. It supports NCQ and high speed DMA. While it also advertises TRIM support, I/O errors are reported when the discard mount option fstrim is used. TRIM also fails when disabling NCQ and not just as an NCQ command. TRIM must be disabled for this device. Signed-off-by: Zoltán Böszörményi <zboszor(a)gmail.com> Signed-off-by: Damien Le Moal <damien.lemoal(a)opensource.wdc.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/ata/libata-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index a92cbe1aa72a2..35db918a1de56 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4486,6 +4486,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { /* devices that don't properly handle TRIM commands */ { "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, }, + { "M88V29*", NULL, ATA_HORKAGE_NOTRIM, }, /* * As defined, the DRAT (Deterministic Read After Trim) and RZAT -- 2.34.1

3 years, 2 months

1
2
0 0

[PATCH AUTOSEL 4.14 1/5] ARM: OMAP2+: hwmod: Add of_node_put() before break

by Sasha Levin

From: Wan Jiabing <wanjiabing(a)vivo.com> [ Upstream commit 80c469a0a03763f814715f3d12b6f3964c7423e8 ] Fix following coccicheck warning: ./arch/arm/mach-omap2/omap_hwmod.c:753:1-23: WARNING: Function for_each_matching_node should have of_node_put() before break Early exits from for_each_matching_node should decrement the node reference counter. Signed-off-by: Wan Jiabing <wanjiabing(a)vivo.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/mach-omap2/omap_hwmod.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 9274a484c6a39..f6afd866e4cf9 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -768,8 +768,10 @@ static int _init_clkctrl_providers(void) for_each_matching_node(np, ti_clkctrl_match_table) { ret = _setup_clkctrl_provider(np); - if (ret) + if (ret) { + of_node_put(np); break; + } } return ret; -- 2.34.1

3 years, 2 months

1
4
0 0

[PATCH AUTOSEL 5.4 01/17] ARM: OMAP2+: hwmod: Add of_node_put() before break

by Sasha Levin

From: Wan Jiabing <wanjiabing(a)vivo.com> [ Upstream commit 80c469a0a03763f814715f3d12b6f3964c7423e8 ] Fix following coccicheck warning: ./arch/arm/mach-omap2/omap_hwmod.c:753:1-23: WARNING: Function for_each_matching_node should have of_node_put() before break Early exits from for_each_matching_node should decrement the node reference counter. Signed-off-by: Wan Jiabing <wanjiabing(a)vivo.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/mach-omap2/omap_hwmod.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 6289b288d60a6..202b740adee0e 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -782,8 +782,10 @@ static int __init _init_clkctrl_providers(void) for_each_matching_node(np, ti_clkctrl_match_table) { ret = _setup_clkctrl_provider(np); - if (ret) + if (ret) { + of_node_put(np); break; + } } return ret; -- 2.34.1

3 years, 2 months

1
16
0 0

[PATCH AUTOSEL 5.15 01/33] ARM: OMAP2+: hwmod: Add of_node_put() before break

by Sasha Levin

From: Wan Jiabing <wanjiabing(a)vivo.com> [ Upstream commit 80c469a0a03763f814715f3d12b6f3964c7423e8 ] Fix following coccicheck warning: ./arch/arm/mach-omap2/omap_hwmod.c:753:1-23: WARNING: Function for_each_matching_node should have of_node_put() before break Early exits from for_each_matching_node should decrement the node reference counter. Signed-off-by: Wan Jiabing <wanjiabing(a)vivo.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/mach-omap2/omap_hwmod.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 0c2936c7a3799..a5e9cffcac10c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -752,8 +752,10 @@ static int __init _init_clkctrl_providers(void) for_each_matching_node(np, ti_clkctrl_match_table) { ret = _setup_clkctrl_provider(np); - if (ret) + if (ret) { + of_node_put(np); break; + } } return ret; -- 2.34.1

3 years, 2 months

1
32
0 0

Re: [PATCH mips-fixes] MIPS: smp: fill in sibling and core maps earlier

by Alexander Lobakin

From: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Date: Mon, 14 Feb 2022 20:00:12 +0100 > On 12/2/22 23:21, Alexander Lobakin wrote: > > After enabling CONFIG_SCHED_CORE (landed during 5.14 cycle), > > 2-core 2-thread-per-core interAptiv (CPS-driven) started emitting > > the following: > > --- 8< --- > > > > [ 0.048433] CPU: 1, smt_mask: 0-1 > > > > [0] https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=7… > > Isn't it worth Cc'ing stable(a)vger.kernel.org here? Probably. It doesn't have any Fixes tag (this is a fix, but the bug is caused not by a particular commit, rather by a combination of changes and code flows from the past), but it still can be backported, right. Thomas, should I queue a v2 with this tag added? Cc: stable(a)vger.kernel.org # 5.14+ Or it can be picked up automatically? > > > Signed-off-by: Alexander Lobakin <alobakin(a)pm.me> > > --- > > arch/mips/kernel/smp.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Thanks! Al

3 years, 2 months

1
0
0 0

[PATCH v2] arm64: Correct wrong label in macro __init_el2_gicv3

by Joakim Tjernlund

In commit: 114945d84a30a5fe ("arm64: Fix labels in el2_setup macros") We renamed a label from '1' to '.Lskip_gicv3_\@', but failed to update a branch to it, which now targets a later label also called '1'. The branch is taken rarely, when GICv3 is present but SRE is disabled at EL3, causing a boot-time crash. Update the caller to the new label name. Fixes: 114945d84a30a5fe ("arm64: Fix labels in el2_setup macros") Cc: stable(a)vger.kernel.org Signed-off-by: Joakim Tjernlund <joakim.tjernlund(a)infinera.com> --- - v2: fix commit msg arch/arm64/include/asm/el2_setup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index 3198acb2aad8..7f3c87f7a0ce 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -106,7 +106,7 @@ msr_s SYS_ICC_SRE_EL2, x0 isb // Make sure SRE is now set mrs_s x0, SYS_ICC_SRE_EL2 // Read SRE back, - tbz x0, #0, 1f // and check that it sticks + tbz x0, #0, .Lskip_gicv3_\@ // and check that it sticks msr_s SYS_ICH_HCR_EL2, xzr // Reset ICC_HCR_EL2 to defaults .Lskip_gicv3_\@: .endm -- 2.32.0

3 years, 2 months

2
1
0 0

[char-misc 1/4] mei: me: disable driver on the ign firmware

by Tomas Winkler

From: Alexander Usyskin <alexander.usyskin(a)intel.com> Add a quirk to disable MEI interface on Intel PCH Ignition (IGN) as the IGN firmware doesn't support the protocol. Cc: <stable(a)vger.kernel.org> Signed-off-by: Alexander Usyskin <alexander.usyskin(a)intel.com> Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> --- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/hw-me.c | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 67bb6a25fd0a..888c27bc3f1a 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -120,6 +120,7 @@ #define PCI_CFG_HFS_2 0x48 #define PCI_CFG_HFS_3 0x60 # define PCI_CFG_HFS_3_FW_SKU_MSK 0x00000070 +# define PCI_CFG_HFS_3_FW_SKU_IGN 0x00000000 # define PCI_CFG_HFS_3_FW_SKU_SPS 0x00000060 #define PCI_CFG_HFS_4 0x64 #define PCI_CFG_HFS_5 0x68 diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index d3a6c0728645..fbc4c9581864 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -1405,16 +1405,16 @@ static bool mei_me_fw_type_sps_4(const struct pci_dev *pdev) .quirk_probe = mei_me_fw_type_sps_4 /** - * mei_me_fw_type_sps() - check for sps sku + * mei_me_fw_type_sps_ign() - check for sps or ign sku * - * Read ME FW Status register to check for SPS Firmware. - * The SPS FW is only signaled in pci function 0 + * Read ME FW Status register to check for SPS or IGN Firmware. + * The SPS/IGN FW is only signaled in pci function 0 * * @pdev: pci device * - * Return: true in case of SPS firmware + * Return: true in case of SPS/IGN firmware */ -static bool mei_me_fw_type_sps(const struct pci_dev *pdev) +static bool mei_me_fw_type_sps_ign(const struct pci_dev *pdev) { u32 reg; u32 fw_type; @@ -1427,14 +1427,15 @@ static bool mei_me_fw_type_sps(const struct pci_dev *pdev) dev_dbg(&pdev->dev, "fw type is %d\n", fw_type); - return fw_type == PCI_CFG_HFS_3_FW_SKU_SPS; + return fw_type == PCI_CFG_HFS_3_FW_SKU_IGN || + fw_type == PCI_CFG_HFS_3_FW_SKU_SPS; } #define MEI_CFG_KIND_ITOUCH \ .kind = "itouch" -#define MEI_CFG_FW_SPS \ - .quirk_probe = mei_me_fw_type_sps +#define MEI_CFG_FW_SPS_IGN \ + .quirk_probe = mei_me_fw_type_sps_ign #define MEI_CFG_FW_VER_SUPP \ .fw_ver_supported = 1 @@ -1535,7 +1536,7 @@ static const struct mei_cfg mei_me_pch12_sps_cfg = { MEI_CFG_PCH8_HFS, MEI_CFG_FW_VER_SUPP, MEI_CFG_DMA_128, - MEI_CFG_FW_SPS, + MEI_CFG_FW_SPS_IGN, }; /* Cannon Lake itouch with quirk for SPS 5.0 and newer Firmware exclusion @@ -1545,7 +1546,7 @@ static const struct mei_cfg mei_me_pch12_itouch_sps_cfg = { MEI_CFG_KIND_ITOUCH, MEI_CFG_PCH8_HFS, MEI_CFG_FW_VER_SUPP, - MEI_CFG_FW_SPS, + MEI_CFG_FW_SPS_IGN, }; /* Tiger Lake and newer devices */ @@ -1562,7 +1563,7 @@ static const struct mei_cfg mei_me_pch15_sps_cfg = { MEI_CFG_FW_VER_SUPP, MEI_CFG_DMA_128, MEI_CFG_TRC, - MEI_CFG_FW_SPS, + MEI_CFG_FW_SPS_IGN, }; /* -- 2.34.1

3 years, 2 months

3
2
0 0

[PATCH v6] xhci: re-initialize the HC during resume if HCE was set

by Puma Hsu

When HCE(Host Controller Error) is set, it means an internal error condition has been detected. Software needs to re-initialize the HC, so add this check in xhci resume. Cc: stable(a)vger.kernel.org Signed-off-by: Puma Hsu <pumahsu(a)google.com> --- v2: Follow Sergey Shtylyov <s.shtylyov(a)omp.ru>'s comment. v3: Add stable(a)vger.kernel.org for stable release. v4: Refine the commit message. v5: Add a debug log. Follow Mathias Nyman <mathias.nyman(a)linux.intel.com>'s comment. v6: Fix the missing declaration for str. drivers/usb/host/xhci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index dc357cabb265..6f1198068004 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1091,6 +1091,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) int retval = 0; bool comp_timer_running = false; bool pending_portevent = false; + char str[XHCI_MSG_MAX]; if (!hcd->state) return 0; @@ -1146,8 +1147,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) temp = readl(&xhci->op_regs->status); } - /* If restore operation fails, re-initialize the HC during resume */ - if ((temp & STS_SRE) || hibernated) { + /* If restore operation fails or HC error is detected, re-initialize the HC during resume */ + if ((temp & (STS_SRE | STS_HCE)) || hibernated) { + xhci_warn(xhci, "re-initialize HC during resume, USBSTS:%s\n", + xhci_decode_usbsts(str, temp)); if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) && !(xhci_all_ports_seen_u0(xhci))) { -- 2.35.0.rc2.247.g8bbb082509-goog

3 years, 2 months

2
5
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror February 2022