- Linux-stable-mirror - lists.linaro.org

PCI: dwc: Ensure that dw_pcie_wait_for_link() waits 100 ms after link up

by Marek Vasut

Please backport the following commit into Linux v5.4 and newer stable releases: 80dc18a0cba8dea42614f021b20a04354b213d86 The backport will likely depend on macro rename commit: 817f989700fddefa56e5e443e7d138018ca6709d This part of commit description clarifies why this is a fix: " As per PCIe r6.0, sec 6.6.1, a Downstream Port that supports Link speeds greater than 5.0 GT/s, software must wait a minimum of 100 ms after Link training completes before sending a Configuration Request. " In practice, this makes detection of PCIe Gen3 and Gen4 SSDs reliable on Renesas R-Car V4H SoC. Without this commit, the SSDs sporadically do not get detected, or sometimes they link up in Gen1 mode. This fixes commit 886bc5ceb5cc ("PCI: designware: Add generic dw_pcie_wait_for_link()") which is in v4.5-rc1-4-g886bc5ceb5cc3 , so I think this fix should be backported to all currently maintained stable releases, i.e. v5.4+ . Thank you -- Best regards, Marek Vasut

1 day, 23 hours

2
1
0 0

[REGRESSION] stable-rc/linux-5.10.y: (build) ‘struct platform_driver’ has no member named ‘remove_new’; did you...

by KernelCI bot

Hello, New build issue found on stable-rc/linux-5.10.y: --- ‘struct platform_driver’ has no member named ‘remove_new’; did you mean ‘remove’? in drivers/usb/musb/omap2430.o (drivers/usb/musb/omap2430.c) [logspec:kbuild,kbuild.compiler.error] --- - dashboard: https://d.kernelci.org/i/maestro:67bf95f2502a816345830c2bfb96f4a8950ce208 - giturl: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git - commit HEAD: 10b6e479487675365bd106d20fb7dbeec6fb4f60 Log excerpt: ===================================================== drivers/usb/musb/omap2430.c:514:10: error: ‘struct platform_driver’ has no member named ‘remove_new’; did you mean ‘remove’? 514 | .remove_new = omap2430_remove, | ^~~~~~~~~~ | remove drivers/usb/musb/omap2430.c:514:27: error: initialization of ‘int (*)(struct platform_device *)’ from incompatible pointer type ‘void (*)(struct platform_device *)’ [-Werror=incompatible-pointer-types] 514 | .remove_new = omap2430_remove, | ^~~~~~~~~~~~~~~ drivers/usb/musb/omap2430.c:514:27: note: (near initialization for ‘omap2430_driver.remove’) cc1: some warnings being treated as errors ===================================================== # Builds where the incident occurred: ## multi_v7_defconfig on (arm): - compiler: gcc-12 - dashboard: https://d.kernelci.org/build/maestro:68aadff1233e484a3fad599c #kernelci issue maestro:67bf95f2502a816345830c2bfb96f4a8950ce208 Reported-by: kernelci.org bot <bot(a)kernelci.org> -- This is an experimental report format. Please send feedback in! Talk to us at kernelci(a)lists.linux.dev Made with love by the KernelCI team - https://kernelci.org

1 day, 23 hours

2
1
0 0

Linux 6.16.3

by Greg Kroah-Hartman

I'm announcing the release of the 6.16.3 kernel. All users of the 6.16 kernel series that use the ext4 filesystem should upgrade. The updated 6.16.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.16.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 fs/ext4/ext4.h | 2 fs/ext4/extents.c | 6 fs/ext4/inline.c | 6 fs/ext4/inode.c | 323 +++++++++++++++++++++++++++----------------- fs/ext4/move_extent.c | 3 fs/ext4/xattr.c | 2 include/trace/events/ext4.h | 47 +++++- 8 files changed, 250 insertions(+), 141 deletions(-) Greg Kroah-Hartman (1): Linux 6.16.3 Zhang Yi (9): ext4: process folios writeback in bytes ext4: move the calculation of wbc->nr_to_write to mpage_folio_done() ext4: fix stale data if it bail out of the extents mapping loop ext4: refactor the block allocation process of ext4_page_mkwrite() ext4: restart handle if credits are insufficient during allocating blocks ext4: enhance tracepoints during the folios writeback ext4: correct the reserved credits for extent conversion ext4: reserved credits for one extent during the folio writeback ext4: replace ext4_writepage_trans_blocks()

1 day, 23 hours

4
8
0 0

Re: Patch "drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS" has been added to the 5.4-stable tree

by Imre Deak

Hi Sasha, Greg and stable team, please don't backport this patch and drop it from the queues for the 5.4, 5.10, 5.15, 6.1, 6.6, 6.12, 6.16 stable trees. It causes an issue which is described at https://lore.kernel.org/stable/aGaiASySvb3BVXlM@ideak-desk I initially asked not to apply the patch to stable trees - and then it was dropped as I requested - but as I understand now it still got selected/queued automatically. Sorry for the trouble it caused, let me know if there's a better way to avoid auto selecting such patches for stable in the future (for one I can CC Sasha on such requests). Thanks, Imre On Sun, Aug 24, 2025 at 10:49:17AM +0200, gregkh(a)linuxfoundation.org wrote: > > This is a note to let you know that I've just added the patch titled > > drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS > > to the 5.4-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > The filename of the patch is: > drm-dp-change-aux-dpcd-probe-address-from-dpcd_rev-to-lane0_1_status.patch > and it can be found in the queue-5.4 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable(a)vger.kernel.org> know about it. > > > From stable+bounces-172609-greg=kroah.com(a)vger.kernel.org Sat Aug 23 16:46:09 2025 > From: Sasha Levin <sashal(a)kernel.org> > Date: Sat, 23 Aug 2025 10:44:36 -0400 > Subject: drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS > To: stable(a)vger.kernel.org > Cc: "Imre Deak" <imre.deak(a)intel.com>, "Ville Syrjälä" <ville.syrjala(a)linux.intel.com>, "Jani Nikula" <jani.nikula(a)linux.intel.com>, "Jani Nikula" <jani.nikula(a)intel.com>, "Sasha Levin" <sashal(a)kernel.org> > Message-ID: <20250823144436.2255063-1-sashal(a)kernel.org> > > From: Imre Deak <imre.deak(a)intel.com> > > [ Upstream commit a40c5d727b8111b5db424a1e43e14a1dcce1e77f ] > > Reading DPCD registers has side-effects in general. In particular > accessing registers outside of the link training register range > (0x102-0x106, 0x202-0x207, 0x200c-0x200f, 0x2216) is explicitly > forbidden by the DP v2.1 Standard, see > > 3.6.5.1 DPTX AUX Transaction Handling Mandates > 3.6.7.4 128b/132b DP Link Layer LTTPR Link Training Mandates > > Based on my tests, accessing the DPCD_REV register during the link > training of an UHBR TBT DP tunnel sink leads to link training failures. > > Solve the above by using the DP_LANE0_1_STATUS (0x202) register for the > DPCD register access quirk. > > Cc: <stable(a)vger.kernel.org> > Cc: Ville SyrjÃ¤lÃ¤ <ville.syrjala(a)linux.intel.com> > Cc: Jani Nikula <jani.nikula(a)linux.intel.com> > Acked-by: Jani Nikula <jani.nikula(a)intel.com> > Signed-off-by: Imre Deak <imre.deak(a)intel.com> > Link: https://lore.kernel.org/r/20250605082850.65136-2-imre.deak@intel.com > [ Call to drm_dp_dpcd_access() instead of drm_dp_dpcd_probe() ] > Signed-off-by: Sasha Levin <sashal(a)kernel.org> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> > --- > drivers/gpu/drm/drm_dp_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/drivers/gpu/drm/drm_dp_helper.c > +++ b/drivers/gpu/drm/drm_dp_helper.c > @@ -280,7 +280,7 @@ ssize_t drm_dp_dpcd_read(struct drm_dp_a > * We just have to do it before any DPCD access and hope that the > * monitor doesn't power down exactly after the throw away read. > */ > - ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, DP_DPCD_REV, buffer, > + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, DP_LANE0_1_STATUS, buffer, > 1); > if (ret != 1) > goto out; > > > Patches currently in stable-queue which might be from sashal(a)kernel.org are > > queue-5.4/bluetooth-smp-fix-using-hci_error_remote_user_term-o.patch > queue-5.4/pinctrl-stm32-manage-irq-affinity-settings.patch > queue-5.4/scsi-bfa-double-free-fix.patch > queue-5.4/scsi-libiscsi-initialize-iscsi_conn-dd_data-only-if-.patch > queue-5.4/f2fs-fix-to-avoid-out-of-boundary-access-in-devs.pat.patch > queue-5.4/net-ncsi-fix-buffer-overflow-in-fetching-version-id.patch > queue-5.4/tcp-fix-tcp_ofo_queue-to-avoid-including-too-much-du.patch > queue-5.4/kbuild-add-clang_flags-to-as-instr.patch > queue-5.4/watchdog-dw_wdt-fix-default-timeout.patch > queue-5.4/dmaengine-mv_xor-fix-missing-check-after-dma-map-and.patch > queue-5.4/usb-chipidea-udc-fix-sleeping-function-called-from-i.patch > queue-5.4/net-sched-restrict-conditions-for-adding-duplicating.patch > queue-5.4/drm-amdgpu-fix-incorrect-vm-flags-to-map-bo.patch > queue-5.4/pwm-mediatek-fix-duty-and-period-setting.patch > queue-5.4/ethernet-intel-fix-building-with-large-nr_cpus.patch > queue-5.4/usb-chipidea-udc-add-new-api-ci_hdrc_gadget_connect.patch > queue-5.4/hfsplus-remove-mutex_lock-check-in-hfsplus_free_exte.patch > queue-5.4/mmc-rtsx_usb_sdmmc-fix-error-path-in-sd_set_power_mo.patch > queue-5.4/net-thunderx-fix-format-truncation-warning-in-bgx_ac.patch > queue-5.4/cifs-fix-calling-cifsfindfirst-for-root-path-without.patch > queue-5.4/net-appletalk-fix-kerneldoc-warnings.patch > queue-5.4/comedi-fail-comedi_insnlist-ioctl-if-n_insns-is-too-large.patch > queue-5.4/media-usb-hdpvr-disable-zero-length-read-messages.patch > queue-5.4/media-tc358743-return-an-appropriate-colorspace-from.patch > queue-5.4/net-appletalk-fix-use-after-free-in-aarp-proxy-probe.patch > queue-5.4/rtc-hym8563-fix-incorrect-maximum-clock-rate-handlin.patch > queue-5.4/smb-client-let-recv_done-cleanup-before-notifying-th.patch > queue-5.4/rtc-pcf8563-fix-incorrect-maximum-clock-rate-handlin.patch > queue-5.4/pwm-mediatek-implement-.apply-callback.patch > queue-5.4/net-phy-smsc-add-proper-reset-flags-for-lan8710a.patch > queue-5.4/hfsplus-fix-slab-out-of-bounds-read-in-hfsplus_uni2a.patch > queue-5.4/s390-stp-remove-udelay-from-stp_sync_clock.patch > queue-5.4/bluetooth-fix-null-ptr-deref-in-l2cap_sock_resume_cb.patch > queue-5.4/m68k-don-t-unregister-boot-console-needlessly.patch > queue-5.4/net-ipv4-fix-incorrect-mtu-in-broadcast-routes.patch > queue-5.4/cpufreq-cppc-mark-driver-with-need_update_limits-fla.patch > queue-5.4/virtio-net-ensure-the-received-length-does-not-exceed-allocated-size.patch > queue-5.4/netpoll-prevent-hanging-napi-when-netcons-gets-enabl.patch > queue-5.4/fs-buffer-fix-use-after-free-when-call-bh_read-helpe.patch > queue-5.4/media-dvb-frontends-dib7090p-fix-null-ptr-deref-in-d.patch > queue-5.4/usb-hub-don-t-try-to-recover-devices-lost-during-warm-reset.patch > queue-5.4/samples-mei-fix-building-on-musl-libc.patch > queue-5.4/asoc-hdac_hdmi-rate-limit-logging-on-connection-and-.patch > queue-5.4/staging-nvec-fix-incorrect-null-termination-of-batte.patch > queue-5.4/media-dvb-frontends-w7090p-fix-null-ptr-deref-in-w70.patch > queue-5.4/bluetooth-smp-if-an-unallowed-command-is-received-co.patch > queue-5.4/usb-chipidea-add-usb-phy-event.patch > queue-5.4/pnfs-fix-uninited-ptr-deref-in-block-scsi-layout.patch > queue-5.4/net-vlan-replace-bug-with-warn_on_once-in-vlan_dev_-.patch > queue-5.4/crypto-img-hash-fix-dma_unmap_sg-nents-value.patch > queue-5.4/uapi-in6-restore-visibility-of-most-ipv6-socket-opti.patch > queue-5.4/arm-dts-imx6ul-kontron-bl-common-fix-rts-polarity-fo.patch > queue-5.4/hwrng-mtk-handle-devm_pm_runtime_enable-errors.patch > queue-5.4/wifi-iwlwifi-fix-memory-leak-in-iwl_mvm_init.patch > queue-5.4/mtd-fix-possible-integer-overflow-in-erase_xfer.patch > queue-5.4/tracing-add-down_write-trace_event_sem-when-adding-trace-event.patch > queue-5.4/drbd-add-missing-kref_get-in-handle_write_conflicts.patch > queue-5.4/netfilter-xt_nfacct-don-t-assume-acct-name-is-null-t.patch > queue-5.4/mips-include-kbuild_cppflags-in-checkflags-invocation.patch > queue-5.4/wifi-iwlwifi-mvm-fix-scan-request-validation.patch > queue-5.4/x86-mce-amd-add-default-names-for-mca-banks-and-blocks.patch > queue-5.4/usb-xhci-avoid-showing-errors-during-surprise-remova.patch > queue-5.4/wifi-iwlwifi-dvm-fix-potential-overflow-in-rs_fill_l.patch > queue-5.4/benet-fix-bug-when-creating-vfs.patch > queue-5.4/crypto-marvell-cesa-fix-engine-load-inaccuracy.patch > queue-5.4/pci-hotplug-pnv-php-wrap-warnings-in-macro.patch > queue-5.4/soundwire-stream-restore-params-when-prepare-ports-f.patch > queue-5.4/move_mount-allow-to-add-a-mount-into-an-existing-gro.patch > queue-5.4/ice-fix-a-null-pointer-dereference-in-ice_copy_and_init_pkg.patch > queue-5.4/arm64-handle-kcov-__init-vs-inline-mismatches.patch > queue-5.4/pci-pnv_php-work-around-switches-with-broken-presenc.patch > queue-5.4/thermal-sysfs-return-enodata-instead-of-eagain-for-r.patch > queue-5.4/kconfig-lxdialog-replace-strcpy-with-strncpy-in-inpu.patch > queue-5.4/kconfig-lxdialog-fix-space-to-de-select-options.patch > queue-5.4/hfs-fix-slab-out-of-bounds-in-hfs_bnode_read.patch > queue-5.4/et131x-add-missing-check-after-dma-map.patch > queue-5.4/asoc-codecs-rt5640-retry-device_id-verification.patch > queue-5.4/comedi-comedi_test-fix-possible-deletion-of-uninitialized-timers.patch > queue-5.4/usb-typec-fusb302-cache-pd-rx-state.patch > queue-5.4/gpio-tps65912-check-the-return-value-of-regmap_updat.patch > queue-5.4/pptp-fix-pptp_xmit-error-path.patch > queue-5.4/rcu-protect-defer_qs_iw_pending-from-data-race.patch > queue-5.4/mips-don-t-crash-in-stack_top-for-tasks-without-abi-.patch > queue-5.4/net-drop-ufo-packets-in-udp_rcv_segment.patch > queue-5.4/scsi-aacraid-stop-using-pci_irq_affinity.patch > queue-5.4/usb-chipidea-introduce-ci_hdrc_controller_vbus_event.patch > queue-5.4/serial-8250-fix-panic-due-to-pslverr.patch > queue-5.4/power-supply-max14577-handle-null-pdata-when-config_.patch > queue-5.4/kbuild-add-clang_flags-to-kbuild_cppflags.patch > queue-5.4/mm-zsmalloc.c-convert-to-use-kmem_cache_zalloc-in-cache_alloc_zspage.patch > queue-5.4/kconfig-gconf-fix-potential-memory-leak-in-renderer_.patch > queue-5.4/pnfs-fix-stripe-mapping-in-block-scsi-layout.patch > queue-5.4/fbdev-imxfb-check-fb_add_videomode-to-prevent-null-p.patch > queue-5.4/net-fec-allow-disable-coalescing.patch > queue-5.4/mtd-rawnand-atmel-fix-dma_mapping_error-address.patch > queue-5.4/net-dsa-b53-fix-ip_multicast_ctrl-on-bcm5325.patch > queue-5.4/pm-runtime-clear-power.needs_force_resume-in-pm_runt.patch > queue-5.4/hfsplus-don-t-use-bug_on-in-hfsplus_create_attribute.patch > queue-5.4/powerpc-512-fix-possible-dma_unmap_single-on-uniniti.patch > queue-5.4/crypto-qat-fix-seq_file-position-update-in-adf_ring_.patch > queue-5.4/media-uvcvideo-fix-bandwidth-issue-for-alcor-camera.patch > queue-5.4/jfs-truncate-good-inode-pages-when-hard-link-is-0.patch > queue-5.4/selftests-futex-define-sys_futex-on-32-bit-architect.patch > queue-5.4/nfs-fix-up-handling-of-outstanding-layoutcommit-in-nfs_update_inode.patch > queue-5.4/alsa-usb-audio-avoid-precedence-issues-in-mixer_quir.patch > queue-5.4/ext4-do-not-bug-when-inline_data_fl-lacks-system.dat.patch > queue-5.4/clk-sunxi-ng-v3s-fix-de-clock-definition.patch > queue-5.4/usb-xhci-print-xhci-xhc_state-when-queue_command-fai.patch > queue-5.4/be2net-use-correct-byte-order-and-format-string-for-.patch > queue-5.4/net-sched-return-null-when-htb_lookup_leaf-encounter.patch > queue-5.4/scsi-fix-sas_user_scan-to-handle-wildcard-and-multi-.patch > queue-5.4/pnfs-handle-rpc-size-limit-for-layoutcommits.patch > queue-5.4/mtd-rawnand-atmel-set-pmecc-data-setup-time.patch > queue-5.4/pm-sleep-console-fix-the-black-screen-issue.patch > queue-5.4/dmaengine-nbpfaxi-add-missing-check-after-dma-map.patch > queue-5.4/vrf-drop-existing-dst-reference-in-vrf_ip6_input_dst.patch > queue-5.4/wifi-rtl818x-kill-urbs-before-clearing-tx-status-que.patch > queue-5.4/pinctrl-sunxi-fix-memory-leak-on-krealloc-failure.patch > queue-5.4/ipmi-use-dev_warn_ratelimited-for-incorrect-message-.patch > queue-5.4/can-kvaser_pciefd-store-device-channel-index.patch > queue-5.4/nfs-fix-filehandle-bounds-checking-in-nfs_fh_to_dent.patch > queue-5.4/usb-dwc3-qcom-don-t-leave-bcr-asserted.patch > queue-5.4/udp-also-consider-secpath-when-evaluating-ipsec-use-.patch > queue-5.4/net-usbnet-avoid-potential-rcu-stall-on-link_change-event.patch > queue-5.4/drm-dp-change-aux-dpcd-probe-address-from-dpcd_rev-to-lane0_1_status.patch > queue-5.4/alsa-hda-ca0132-fix-buffer-overflow-in-add_tuning_co.patch > queue-5.4/selftests-tracing-use-mutex_unlock-for-testing-glob-.patch > queue-5.4/clk-davinci-add-null-check-in-davinci_lpsc_clk_regis.patch > queue-5.4/mm-kmemleak-turn-kmemleak_lock-and-object-lock-to-raw_spinlock_t.patch > queue-5.4/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch > queue-5.4/caif-reduce-stack-size-again.patch > queue-5.4/bpf-check-flow_dissector-ctx-accesses-are-aligned.patch > queue-5.4/usb-core-usb_submit_urb-downgrade-type-check.patch > queue-5.4/wifi-iwlwifi-fw-fix-possible-memory-leak-in-iwl_fw_d.patch > queue-5.4/wifi-cfg80211-reject-htc-bit-for-management-frames.patch > queue-5.4/udf-verify-partition-map-count.patch > queue-5.4/kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch > queue-5.4/usb-xhci-avoid-showing-warnings-for-dying-controller.patch > queue-5.4/usb-hub-fix-detection-of-high-tier-usb3-devices-behind-suspended-hubs.patch > queue-5.4/bpf-ktls-fix-data-corruption-when-using-bpf_msg_pop_.patch > queue-5.4/iio-hid-sensor-prox-fix-incorrect-offset-calculation.patch > queue-5.4/pptp-ensure-minimal-skb-length-in-pptp_xmit.patch > queue-5.4/xhci-disable-stream-for-xhc-controller-with-xhci_broken_streams.patch > queue-5.4/rtc-ds1307-handle-oscillator-stop-flag-osf-for-ds1341.patch > queue-5.4/net-vlan-fix-vlan-0-refcount-imbalance-of-toggling-f.patch > queue-5.4/media-v4l2-ctrls-always-copy-the-controls-on-completion.patch > queue-5.4/media-tc358743-check-i2c-succeeded-during-probe.patch > queue-5.4/i3c-add-missing-include-to-internal-header.patch > queue-5.4/usb-chipidea-udc-protect-usb-interrupt-enable.patch > queue-5.4/mm-kmemleak-avoid-deadlock-by-moving-pr_warn-outside-kmemleak_lock.patch > queue-5.4/scsi-lpfc-remove-redundant-assignment-to-avoid-memor.patch > queue-5.4/selftests-rtnetlink.sh-remove-esp4_offload-after-tes.patch > queue-5.4/f2fs-fix-to-avoid-uaf-in-f2fs_sync_inode_meta.patch > queue-5.4/usb-hub-avoid-warm-port-reset-during-usb3-disconnect.patch > queue-5.4/nfsd-handle-get_client_locked-failure-in-nfsd4_setclientid_confirm.patch > queue-5.4/cpufreq-exit-governor-when-failed-to-start-old-gover.patch > queue-5.4/vmci-prevent-the-dispatching-of-uninitialized-payloa.patch > queue-5.4/mips-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch > queue-5.4/wifi-brcmfmac-fix-p2p-discovery-failure-in-p2p-peer-.patch > queue-5.4/asoc-soc-dapm-set-bias_level-if-snd_soc_dapm_set_bia.patch > queue-5.4/staging-fbtft-fix-potential-memory-leak-in-fbtft_fra.patch > queue-5.4/usb-phy-mxs-disconnect-line-when-usb-charger-is-atta.patch > queue-5.4/pci-acpi-fix-runtime-pm-ref-imbalance-on-hot-plug-capable-ports.patch > queue-5.4/media-rainshadow-cec-fix-toctou-race-condition-in-rain_interrupt.patch > queue-5.4/module-restore-the-moduleparam-prefix-length-check.patch > queue-5.4/f2fs-fix-to-avoid-out-of-boundary-access-in-dnode-page.patch > queue-5.4/usb-musb-omap2430-convert-to-platform-remove-callback-returning-void.patch > queue-5.4/pci-rockchip-host-fix-unexpected-completion-log-mess.patch > queue-5.4/usb-xhci-set-avg_trb_len-8-for-ep0-during-address-de.patch > queue-5.4/usb-cdc-acm-do-not-log-successful-probe-on-later-errors.patch > queue-5.4/hfsplus-fix-slab-out-of-bounds-in-hfsplus_bnode_read.patch > queue-5.4/net-sched-sch_qfq-avoid-triggering-might_sleep-in-at.patch > queue-5.4/acpi-apei-ghes-add-taint_machine_check-on-ghes-panic.patch > queue-5.4/net-dsa-b53-prevent-switch_ctrl-access-on-bcm5325.patch > queue-5.4/net-sched-sch_qfq-fix-race-condition-on-qfq_aggregat.patch > queue-5.4/perf-tests-bp_account-fix-leaked-file-descriptor.patch > queue-5.4/netfilter-nf_tables-adjust-lockdep-assertions-handli.patch > queue-5.4/hfs-fix-not-erasing-deleted-b-tree-node-issue.patch > queue-5.4/rtc-ds1307-remove-clear-of-oscillator-stop-flag-osf-.patch > queue-5.4/can-kvaser_usb-assign-netdev.dev_port-based-on-devic.patch > queue-5.4/arm-tegra-use-i-o-memcpy-to-write-to-iram.patch > queue-5.4/scsi-ibmvscsi_tgt-fix-dma_unmap_sg-nents-value.patch > queue-5.4/rdma-hfi1-fix-possible-divide-by-zero-in-find_hw_thr.patch > queue-5.4/pwm-mediatek-handle-hardware-enable-and-clock-enable-separately.patch > queue-5.4/jfs-upper-bound-check-of-tree-index-in-dballocag.patch > queue-5.4/alsa-hda-add-missing-nvidia-hda-codec-ids.patch > queue-5.4/bpftool-fix-memory-leak-in-dump_xx_nlmsg-on-realloc-.patch > queue-5.4/x86-fpu-delay-instruction-pointer-fixup-until-after-warning.patch > queue-5.4/usb-net-sierra-check-for-no-status-endpoint.patch > queue-5.4/drm-sched-remove-optimization-that-causes-hang-when-killing-dependent-jobs.patch > queue-5.4/revert-vmci-prevent-the-dispatching-of-uninitialized.patch > queue-5.4/ata-fix-sata_mobile_lpm_policy-description-in-kconfig.patch > queue-5.4/crypto-ccp-fix-crash-when-rebind-ccp-device-for-ccp..patch > queue-5.4/netfilter-ctnetlink-fix-refcount-leak-on-table-dump.patch > queue-5.4/fs-orangefs-allow-2-more-characters-in-do_c_string.patch > queue-5.4/pci-hotplug-pnv-php-improve-error-msg-on-power-state.patch > queue-5.4/btrfs-populate-otime-when-logging-an-inode-item.patch > queue-5.4/drm-amd-pm-powerplay-hwmgr-smu_helper-fix-order-of-m.patch > queue-5.4/bluetooth-l2cap-fix-attempting-to-adjust-outgoing-mt.patch > queue-5.4/ktest.pl-prevent-recursion-of-default-variable-optio.patch > queue-5.4/fs-orangefs-use-snprintf-instead-of-sprintf.patch > queue-5.4/ipv6-reject-malicious-packets-in-ipv6_gso_segment.patch > queue-5.4/nfsv4-fix-nfs4_bitmap_copy_adjust.patch > queue-5.4/scsi-isci-fix-dma_unmap_sg-nents-value.patch > queue-5.4/arch-powerpc-defconfig-drop-obsolete-config_net_cls_.patch > queue-5.4/net-dsa-b53-fix-b53_imp_vlan_setup-for-bcm5325.patch > queue-5.4/s390-time-use-monotonic-clock-in-get_cycles.patch > queue-5.4/asoc-intel-fix-snd_soc_sof-dependencies.patch > queue-5.4/f2fs-fix-to-do-sanity-check-on-ino-and-xnid.patch > queue-5.4/arm-9448-1-use-an-absolute-path-to-unified.h-in-kbuild_aflags.patch > queue-5.4/scsi-mvsas-fix-dma_unmap_sg-nents-value.patch > queue-5.4/media-venus-vdec-clamp-param-smaller-than-1fps-and-bigger-than-240.patch > queue-5.4/kbuild-add-kbuild_cppflags-to-as-option-invocation.patch > queue-5.4/pnfs-fix-disk-addr-range-check-in-block-scsi-layout.patch > queue-5.4/wifi-iwlegacy-check-rate_idx-range-after-addition.patch > queue-5.4/jfs-regular-file-corruption-check.patch > queue-5.4/usb-musb-fix-gadget-state-on-disconnect.patch > queue-5.4/kconfig-gconf-avoid-hardcoding-model2-in-on_treeview.patch > queue-5.4/pps-fix-poll-support.patch > queue-5.4/media-venus-protect-against-spurious-interrupts-during-probe.patch > queue-5.4/alsa-intel8x0-fix-incorrect-codec-index-usage-in-mix.patch > queue-5.4/usb-early-xhci-dbc-fix-early_ioremap-leak.patch > queue-5.4/net-emaclite-fix-missing-pointer-increment-in-aligne.patch > queue-5.4/iwlwifi-add-missing-check-for-alloc_ordered_workqueu.patch > queue-5.4/nfs-fix-the-setting-of-capabilities-when-automounting-a-new-filesystem.patch > queue-5.4/mwl8k-add-missing-check-after-dma-map.patch > queue-5.4/usb-musb-omap2430-fix-device-leak-at-unbind.patch > queue-5.4/scsi-mpt3sas-correctly-handle-ata-device-errors.patch > queue-5.4/f2fs-fix-to-avoid-panic-in-f2fs_evict_inode.patch > queue-5.4/wifi-rtl8xxxu-fix-rx-skb-size-for-aggregation-disabl.patch > queue-5.4/net-ag71xx-add-missing-check-after-dma-map.patch > queue-5.4/pm-cpupower-fix-the-snapshot-order-of-tsc-mperf-cloc.patch > queue-5.4/ipmi-fix-strcpy-source-and-destination-the-same.patch > queue-5.4/wifi-cfg80211-fix-interface-type-validation.patch > queue-5.4/kconfig-nconf-ensure-null-termination-where-strncpy-.patch > queue-5.4/rdma-core-rate-limit-gid-cache-warning-messages.patch > queue-5.4/regulator-core-fix-null-dereference-on-unbind-due-to.patch > queue-5.4/alsa-scarlett2-add-retry-on-eproto-from-scarlett2_usb_tx.patch > queue-5.4/cdc-acm-fix-race-between-initial-clearing-halt-and-open.patch > queue-5.4/netmem-fix-skb_frag_address_safe-with-unreadable-skb.patch > queue-5.4/vhost-fail-early-when-__vhost_add_used-fails.patch > queue-5.4/i3c-don-t-fail-if-gethdrcap-is-unsupported.patch > queue-5.4/media-tc358743-increase-fifo-trigger-level-to-374.patch > queue-5.4/watchdog-ziirave_wdt-check-record-length-in-ziirave_.patch > queue-5.4/pmdomain-governor-consider-cpu-latency-tolerance-from-pm_domain_cpu_gov.patch > queue-5.4/fs-prevent-file-descriptor-table-allocations-exceeding-int_max.patch > queue-5.4/arm-dts-vfxxx-correctly-use-two-tuples-for-timer-add.patch > queue-5.4/rtc-ds1307-fix-incorrect-maximum-clock-rate-handling.patch > queue-5.4/mm-zsmalloc-do-not-pass-__gfp_movable-if-config_compaction-n.patch > queue-5.4/platform-x86-thinkpad_acpi-handle-kcov-__init-vs-inl.patch > queue-5.4/scsi-lpfc-check-for-hdwq-null-ptr-when-cleaning-up-l.patch > queue-5.4/media-venus-hfi-explicitly-release-irq-during-teardown.patch > queue-5.4/reapply-wifi-mac80211-update-skb-s-control-block-key.patch > queue-5.4/securityfs-don-t-pin-dentries-twice-once-is-enough.patch > queue-5.4/soc-qcom-mdt_loader-ensure-we-don-t-read-past-the-elf-header.patch > queue-5.4/acpi-processor-fix-acpi_object-initialization.patch > queue-5.4/arm-rockchip-fix-kernel-hang-during-smp-initializati.patch > queue-5.4/jfs-fix-metapage-reference-count-leak-in-dballocctl.patch > queue-5.4/sctp-linearize-cloned-gso-packets-in-sctp_rcv.patch > queue-5.4/media-qcom-camss-cleanup-media-device-allocated-resource-on-error-path.patch > queue-5.4/comedi-fix-initialization-of-data-for-instructions-that-write-to-subdevice.patch > queue-5.4/media-v4l2-ctrls-don-t-reset-handler-s-error-in-v4l2_ctrl_handler_free.patch > queue-5.4/use-uniform-permission-checks-for-all-mount-propagat.patch > queue-5.4/cpufreq-init-policy-rwsem-before-it-may-be-possibly-.patch > queue-5.4/asoc-ops-dynamically-allocate-struct-snd_ctl_elem_va.patch > queue-5.4/mm-hmm-move-pmd_to_hmm_pfn_flags-to-the-respective-ifdeffery.patch

1 day, 23 hours

1
0
0 0

Re: Patch "zynq_fpga: use sgtable-based scatterlist wrappers" has been added to the 6.16-stable tree

by Xu Yilun

On Thu, Aug 21, 2025 at 03:20:18PM +0200, gregkh(a)linuxfoundation.org wrote: > > This is a note to let you know that I've just added the patch titled > > zynq_fpga: use sgtable-based scatterlist wrappers > > to the 6.16-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > The filename of the patch is: > zynq_fpga-use-sgtable-based-scatterlist-wrappers.patch > and it can be found in the queue-6.16 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable(a)vger.kernel.org> know about it. Hi Greg: This patch solves sgtable usage issue but causes AMD fpga driver fail, https://lore.kernel.org/linux-fpga/202508041548.22955.pisa@fel.cvut.cz/ The fix patch should be applied together with this patch: https://lore.kernel.org/linux-fpga/20250806070605.1920909-2-yilun.xu@linux.… Thanks, Yilun > > > From 37e00703228ab44d0aacc32a97809a4f6f58df1b Mon Sep 17 00:00:00 2001 > From: Marek Szyprowski <m.szyprowski(a)samsung.com> > Date: Mon, 16 Jun 2025 14:09:32 +0200 > Subject: zynq_fpga: use sgtable-based scatterlist wrappers > > From: Marek Szyprowski <m.szyprowski(a)samsung.com> > > commit 37e00703228ab44d0aacc32a97809a4f6f58df1b upstream. > > Use common wrappers operating directly on the struct sg_table objects to > fix incorrect use of statterlists related calls. dma_unmap_sg() function > has to be called with the number of elements originally passed to the > dma_map_sg() function, not the one returned in sgtable's nents. > > CC: stable(a)vger.kernel.org > Fixes: 425902f5c8e3 ("fpga zynq: Use the scatterlist interface") > Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> > Reviewed-by: Jason Gunthorpe <jgg(a)nvidia.com> > Reviewed-by: Xu Yilun <yilun.xu(a)intel.com> > Link: https://lore.kernel.org/r/20250616120932.1090614-1-m.szyprowski@samsung.com > Signed-off-by: Xu Yilun <yilun.xu(a)linux.intel.com> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> > --- > drivers/fpga/zynq-fpga.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > --- a/drivers/fpga/zynq-fpga.c > +++ b/drivers/fpga/zynq-fpga.c > @@ -406,7 +406,7 @@ static int zynq_fpga_ops_write(struct fp > } > > priv->dma_nelms = > - dma_map_sg(mgr->dev.parent, sgt->sgl, sgt->nents, DMA_TO_DEVICE); > + dma_map_sgtable(mgr->dev.parent, sgt, DMA_TO_DEVICE, 0); > if (priv->dma_nelms == 0) { > dev_err(&mgr->dev, "Unable to DMA map (TO_DEVICE)\n"); > return -ENOMEM; > @@ -478,7 +478,7 @@ out_clk: > clk_disable(priv->clk); > > out_free: > - dma_unmap_sg(mgr->dev.parent, sgt->sgl, sgt->nents, DMA_TO_DEVICE); > + dma_unmap_sgtable(mgr->dev.parent, sgt, DMA_TO_DEVICE, 0); > return err; > } > > > > Patches currently in stable-queue which might be from m.szyprowski(a)samsung.com are > > queue-6.16/zynq_fpga-use-sgtable-based-scatterlist-wrappers.patch

2 days

2
3
0 0

[PATCH 6.16.y 1/2] devlink: let driver opt out of automatic phys_port_name generation

by Calvin Owens

From: Jedrzej Jagielski <jedrzej.jagielski(a)intel.com> [ Upstream commit c5ec7f49b480db0dfc83f395755b1c2a7c979920 ] Currently when adding devlink port, phys_port_name is automatically generated within devlink port initialization flow. As a result adding devlink port support to driver may result in forced changes of interface names, which breaks already existing network configs. This is an expected behavior but in some scenarios it would not be preferable to provide such limitation for legacy driver not being able to keep 'pre-devlink' interface name. Add flag no_phys_port_name to devlink_port_attrs struct which indicates if devlink should not alter name of interface. Suggested-by: Jiri Pirko <jiri(a)resnulli.us> Link: https://lore.kernel.org/all/nbwrfnjhvrcduqzjl4a2jafnvvud6qsbxlvxaxilnryglf4… Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski(a)intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen(a)intel.com> Cc: stable(a)vger.kernel.org # 6.16 Tested-By: Calvin Owens <calvin(a)wbinvd.org> Signed-off-by: Calvin Owens <calvin(a)wbinvd.org> --- include/net/devlink.h | 6 +++++- net/devlink/port.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index 0091f23a40f7..af3fd45155dd 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -78,6 +78,9 @@ struct devlink_port_pci_sf_attrs { * @flavour: flavour of the port * @split: indicates if this is split port * @splittable: indicates if the port can be split. + * @no_phys_port_name: skip automatic phys_port_name generation; for + * compatibility only, newly added driver/port instance + * should never set this. * @lanes: maximum number of lanes the port supports. 0 value is not passed to netlink. * @switch_id: if the port is part of switch, this is buffer with ID, otherwise this is NULL * @phys: physical port attributes @@ -87,7 +90,8 @@ struct devlink_port_pci_sf_attrs { */ struct devlink_port_attrs { u8 split:1, - splittable:1; + splittable:1, + no_phys_port_name:1; u32 lanes; enum devlink_port_flavour flavour; struct netdev_phys_item_id switch_id; diff --git a/net/devlink/port.c b/net/devlink/port.c index 939081a0e615..cb8d4df61619 100644 --- a/net/devlink/port.c +++ b/net/devlink/port.c @@ -1519,7 +1519,7 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port, struct devlink_port_attrs *attrs = &devlink_port->attrs; int n = 0; - if (!devlink_port->attrs_set) + if (!devlink_port->attrs_set || devlink_port->attrs.no_phys_port_name) return -EOPNOTSUPP; switch (attrs->flavour) { -- 2.47.2

2 days, 3 hours

1
1
0 0

FAILED: patch "[PATCH] usb: typec: maxim_contaminant: disable low power mode when" failed to apply to 6.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x cabb6c5f4d9e7f49bdf8c0a13c74bd93ee35f45a # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2025082341-salami-darkroom-6913@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cabb6c5f4d9e7f49bdf8c0a13c74bd93ee35f45a Mon Sep 17 00:00:00 2001 From: Amit Sunil Dhamne <amitsd(a)google.com> Date: Fri, 15 Aug 2025 11:31:51 -0700 Subject: [PATCH] usb: typec: maxim_contaminant: disable low power mode when reading comparator values Low power mode is enabled when reading CC resistance as part of `max_contaminant_read_resistance_kohm()` and left in that state. However, it's supposed to work with 1uA current source. To read CC comparator values current source is changed to 80uA. This causes a storm of CC interrupts as it (falsely) detects a potential contaminant. To prevent this, disable low power mode current sourcing before reading comparator values. Fixes: 02b332a06397 ("usb: typec: maxim_contaminant: Implement check_contaminant callback") Cc: stable <stable(a)kernel.org> Signed-off-by: Amit Sunil Dhamne <amitsd(a)google.com> Reviewed-by: Badhri Jagan Sridharan <badhri(a)google.com> Rule: add Link: https://lore.kernel.org/stable/20250814-fix-upstream-contaminant-v1-1-801ce… Link: https://lore.kernel.org/r/20250815-fix-upstream-contaminant-v2-1-6c8d6c3ada… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c index 0cdda06592fd..818cfe226ac7 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -188,6 +188,11 @@ static int max_contaminant_read_comparators(struct max_tcpci_chip *chip, u8 *ven if (ret < 0) return ret; + /* Disable low power mode */ + ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL, + FIELD_PREP(CCLPMODESEL, + LOW_POWER_MODE_DISABLE)); + /* Sleep to allow comparators settle */ usleep_range(5000, 6000); ret = regmap_update_bits(regmap, TCPC_TCPC_CTRL, TCPC_TCPC_CTRL_ORIENTATION, PLUG_ORNT_CC1); diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/tcpci_maxim.h index 76270d5c2838..b33540a42a95 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.h +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h @@ -21,6 +21,7 @@ #define CCOVPDIS BIT(6) #define SBURPCTRL BIT(5) #define CCLPMODESEL GENMASK(4, 3) +#define LOW_POWER_MODE_DISABLE 0 #define ULTRA_LOW_POWER_MODE 1 #define CCRPCTRL GENMASK(2, 0) #define UA_1_SRC 1

2 days, 12 hours

2
1
0 0

FAILED: patch "[PATCH] compiler: remove __ADDRESSABLE_ASM{_STR,}() again" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 8ea815399c3fcce1889bd951fec25b5b9a3979c1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2025082220-surfboard-widget-ac5d@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 8ea815399c3fcce1889bd951fec25b5b9a3979c1 Mon Sep 17 00:00:00 2001 From: Jan Beulich <jbeulich(a)suse.com> Date: Mon, 14 Apr 2025 16:41:07 +0200 Subject: [PATCH] compiler: remove __ADDRESSABLE_ASM{_STR,}() again __ADDRESSABLE_ASM_STR() is where the necessary stringification happens. As long as "sym" doesn't contain any odd characters, no quoting is required for its use with .quad / .long. In fact the quotation gets in the way with gas 2.25; it's only from 2.26 onwards that quoted symbols are half-way properly supported. However, assembly being different from C anyway, drop __ADDRESSABLE_ASM_STR() and its helper macro altogether. A simple .global directive will suffice to get the symbol "declared", i.e. into the symbol table. While there also stop open-coding STATIC_CALL_TRAMP() and STATIC_CALL_KEY(). Fixes: 0ef8047b737d ("x86/static-call: provide a way to do very early static-call updates") Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Josh Poimboeuf <jpoimboe(a)kernel.org> Cc: stable(a)vger.kernel.org Signed-off-by: Juergen Gross <jgross(a)suse.com> Message-ID: <609d2c74-de13-4fae-ab1a-1ec44afb948d(a)suse.com> diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 59a62c3780a2..a16d4631547c 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -94,12 +94,13 @@ DECLARE_STATIC_CALL(xen_hypercall, xen_hypercall_func); #ifdef MODULE #define __ADDRESSABLE_xen_hypercall #else -#define __ADDRESSABLE_xen_hypercall __ADDRESSABLE_ASM_STR(__SCK__xen_hypercall) +#define __ADDRESSABLE_xen_hypercall \ + __stringify(.global STATIC_CALL_KEY(xen_hypercall);) #endif #define __HYPERCALL \ __ADDRESSABLE_xen_hypercall \ - "call __SCT__xen_hypercall" + __stringify(call STATIC_CALL_TRAMP(xen_hypercall)) #define __HYPERCALL_ENTRY(x) "a" (x) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 6f04a1d8c720..64ff73c533e5 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -288,14 +288,6 @@ static inline void *offset_to_ptr(const int *off) #define __ADDRESSABLE(sym) \ ___ADDRESSABLE(sym, __section(".discard.addressable")) -#define __ADDRESSABLE_ASM(sym) \ - .pushsection .discard.addressable,"aw"; \ - .align ARCH_SEL(8,4); \ - ARCH_SEL(.quad, .long) __stringify(sym); \ - .popsection; - -#define __ADDRESSABLE_ASM_STR(sym) __stringify(__ADDRESSABLE_ASM(sym)) - /* * This returns a constant expression while determining if an argument is * a constant expression, most importantly without evaluating the argument.

2 days, 12 hours

2
1
0 0

FAILED: patch "[PATCH] usb: xhci: Fix slot_id resource race conflict" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 2eb03376151bb8585caa23ed2673583107bb5193 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2025082308-crafty-citable-521f@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 2eb03376151bb8585caa23ed2673583107bb5193 Mon Sep 17 00:00:00 2001 From: Weitao Wang <WeitaoWang-oc(a)zhaoxin.com> Date: Tue, 19 Aug 2025 15:58:43 +0300 Subject: [PATCH] usb: xhci: Fix slot_id resource race conflict xHC controller may immediately reuse a slot_id after it's disabled, giving it to a new enumerating device before the xhci driver freed all resources related to the disabled device. In such a scenario, device-A with slot_id equal to 1 is disconnecting while device-B is enumerating, device-B will fail to enumerate in the follow sequence. 1.[device-A] send disable slot command 2.[device-B] send enable slot command 3.[device-A] disable slot command completed and wakeup waiting thread 4.[device-B] enable slot command completed with slot_id equal to 1 and wakeup waiting thread 5.[device-B] driver checks that slot_id is still in use (by device-A) in xhci_alloc_virt_device, and fail to enumerate due to this conflict 6.[device-A] xhci->devs[slot_id] set to NULL in xhci_free_virt_device To fix driver's slot_id resources conflict, clear xhci->devs[slot_id] and xhci->dcbba->dev_context_ptrs[slot_id] pointers in the interrupt context when disable slot command completes successfully. Simultaneously, adjust function xhci_free_virt_device to accurately handle device release. [minor smatch warning and commit message fix -Mathias] Cc: stable(a)vger.kernel.org Fixes: 7faac1953ed1 ("xhci: avoid race between disable slot command and host runtime suspend") Signed-off-by: Weitao Wang <WeitaoWang-oc(a)zhaoxin.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> Link: https://lore.kernel.org/r/20250819125844.2042452-2-mathias.nyman@linux.inte… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 92bb84f8132a..b3a59ce1b3f4 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -704,8 +704,7 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci, if (!xhci->devs[i]) continue; - retval = xhci_disable_slot(xhci, i); - xhci_free_virt_device(xhci, i); + retval = xhci_disable_and_free_slot(xhci, i); if (retval) xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n", i, retval); diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 07289333a1e8..81eaad87a3d9 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -865,21 +865,20 @@ int xhci_alloc_tt_info(struct xhci_hcd *xhci, * will be manipulated by the configure endpoint, allocate device, or update * hub functions while this function is removing the TT entries from the list. */ -void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) +void xhci_free_virt_device(struct xhci_hcd *xhci, struct xhci_virt_device *dev, + int slot_id) { - struct xhci_virt_device *dev; int i; int old_active_eps = 0; /* Slot ID 0 is reserved */ - if (slot_id == 0 || !xhci->devs[slot_id]) + if (slot_id == 0 || !dev) return; - dev = xhci->devs[slot_id]; - - xhci->dcbaa->dev_context_ptrs[slot_id] = 0; - if (!dev) - return; + /* If device ctx array still points to _this_ device, clear it */ + if (dev->out_ctx && + xhci->dcbaa->dev_context_ptrs[slot_id] == cpu_to_le64(dev->out_ctx->dma)) + xhci->dcbaa->dev_context_ptrs[slot_id] = 0; trace_xhci_free_virt_device(dev); @@ -920,8 +919,9 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) dev->udev->slot_id = 0; if (dev->rhub_port && dev->rhub_port->slot_id == slot_id) dev->rhub_port->slot_id = 0; - kfree(xhci->devs[slot_id]); - xhci->devs[slot_id] = NULL; + if (xhci->devs[slot_id] == dev) + xhci->devs[slot_id] = NULL; + kfree(dev); } /* @@ -962,7 +962,7 @@ static void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_i out: /* we are now at a leaf device */ xhci_debugfs_remove_slot(xhci, slot_id); - xhci_free_virt_device(xhci, slot_id); + xhci_free_virt_device(xhci, vdev, slot_id); } int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index ecd757d482c5..4f8f5aab109d 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1592,7 +1592,8 @@ static void xhci_handle_cmd_enable_slot(int slot_id, struct xhci_command *comman command->slot_id = 0; } -static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) +static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id, + u32 cmd_comp_code) { struct xhci_virt_device *virt_dev; struct xhci_slot_ctx *slot_ctx; @@ -1607,6 +1608,10 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) if (xhci->quirks & XHCI_EP_LIMIT_QUIRK) /* Delete default control endpoint resources */ xhci_free_device_endpoint_resources(xhci, virt_dev, true); + if (cmd_comp_code == COMP_SUCCESS) { + xhci->dcbaa->dev_context_ptrs[slot_id] = 0; + xhci->devs[slot_id] = NULL; + } } static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id) @@ -1856,7 +1861,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, xhci_handle_cmd_enable_slot(slot_id, cmd, cmd_comp_code); break; case TRB_DISABLE_SLOT: - xhci_handle_cmd_disable_slot(xhci, slot_id); + xhci_handle_cmd_disable_slot(xhci, slot_id, cmd_comp_code); break; case TRB_CONFIG_EP: if (!cmd->completion) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 47151ca527bf..0e03691f03bf 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -3932,8 +3932,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd, * Obtaining a new device slot to inform the xHCI host that * the USB device has been reset. */ - ret = xhci_disable_slot(xhci, udev->slot_id); - xhci_free_virt_device(xhci, udev->slot_id); + ret = xhci_disable_and_free_slot(xhci, udev->slot_id); if (!ret) { ret = xhci_alloc_dev(hcd, udev); if (ret == 1) @@ -4090,7 +4089,7 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) xhci_disable_slot(xhci, udev->slot_id); spin_lock_irqsave(&xhci->lock, flags); - xhci_free_virt_device(xhci, udev->slot_id); + xhci_free_virt_device(xhci, virt_dev, udev->slot_id); spin_unlock_irqrestore(&xhci->lock, flags); } @@ -4139,6 +4138,16 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id) return 0; } +int xhci_disable_and_free_slot(struct xhci_hcd *xhci, u32 slot_id) +{ + struct xhci_virt_device *vdev = xhci->devs[slot_id]; + int ret; + + ret = xhci_disable_slot(xhci, slot_id); + xhci_free_virt_device(xhci, vdev, slot_id); + return ret; +} + /* * Checks if we have enough host controller resources for the default control * endpoint. @@ -4245,8 +4254,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev) return 1; disable_slot: - xhci_disable_slot(xhci, udev->slot_id); - xhci_free_virt_device(xhci, udev->slot_id); + xhci_disable_and_free_slot(xhci, udev->slot_id); return 0; } @@ -4382,8 +4390,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, dev_warn(&udev->dev, "Device not responding to setup %s.\n", act); mutex_unlock(&xhci->mutex); - ret = xhci_disable_slot(xhci, udev->slot_id); - xhci_free_virt_device(xhci, udev->slot_id); + ret = xhci_disable_and_free_slot(xhci, udev->slot_id); if (!ret) { if (xhci_alloc_dev(hcd, udev) == 1) xhci_setup_addressable_virt_dev(xhci, udev); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index a20f4e7cd43a..85d5b964bf1e 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1791,7 +1791,7 @@ void xhci_dbg_trace(struct xhci_hcd *xhci, void (*trace)(struct va_format *), /* xHCI memory management */ void xhci_mem_cleanup(struct xhci_hcd *xhci); int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags); -void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id); +void xhci_free_virt_device(struct xhci_hcd *xhci, struct xhci_virt_device *dev, int slot_id); int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, struct usb_device *udev, gfp_t flags); int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *udev); void xhci_copy_ep0_dequeue_into_input_ctx(struct xhci_hcd *xhci, @@ -1888,6 +1888,7 @@ void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, struct usb_tt *tt, gfp_t mem_flags); int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id); +int xhci_disable_and_free_slot(struct xhci_hcd *xhci, u32 slot_id); int xhci_ext_cap_init(struct xhci_hcd *xhci); int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup);

2 days, 12 hours

2
1
0 0

FAILED: patch "[PATCH] usb: typec: maxim_contaminant: re-enable cc toggle if cc is" failed to apply to 6.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x a381c6d6f646226924809d0ad01a9465786da463 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2025082346-facedown-granddad-9758@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From a381c6d6f646226924809d0ad01a9465786da463 Mon Sep 17 00:00:00 2001 From: Amit Sunil Dhamne <amitsd(a)google.com> Date: Fri, 15 Aug 2025 11:31:52 -0700 Subject: [PATCH] usb: typec: maxim_contaminant: re-enable cc toggle if cc is open and port is clean Presently in `max_contaminant_is_contaminant()` if there's no contaminant detected previously, CC is open & stopped toggling and no contaminant is currently present, TCPC.RC would be programmed to do DRP toggling. However, it didn't actively look for a connection. This would lead to Type-C not detect *any* new connections. Hence, in the above situation, re-enable toggling & program TCPC to look for a new connection. Also, return early if TCPC was looking for connection as this indicates TCPC has neither detected a potential connection nor a change in contaminant state. In addition, once dry detection is complete (port is dry), restart toggling. Fixes: 02b332a06397e ("usb: typec: maxim_contaminant: Implement check_contaminant callback") Cc: stable <stable(a)kernel.org> Signed-off-by: Amit Sunil Dhamne <amitsd(a)google.com> Reviewed-by: Badhri Jagan Sridharan <badhri(a)google.com> Link: https://lore.kernel.org/r/20250815-fix-upstream-contaminant-v2-2-6c8d6c3ada… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c index 818cfe226ac7..af8da6dc60ae 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -329,6 +329,39 @@ static int max_contaminant_enable_dry_detection(struct max_tcpci_chip *chip) return 0; } +static int max_contaminant_enable_toggling(struct max_tcpci_chip *chip) +{ + struct regmap *regmap = chip->data.regmap; + int ret; + + /* Disable dry detection if enabled. */ + ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL, + FIELD_PREP(CCLPMODESEL, + LOW_POWER_MODE_DISABLE)); + if (ret) + return ret; + + ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL1, CCCONNDRY, 0); + if (ret) + return ret; + + ret = max_tcpci_write8(chip, TCPC_ROLE_CTRL, TCPC_ROLE_CTRL_DRP | + FIELD_PREP(TCPC_ROLE_CTRL_CC1, + TCPC_ROLE_CTRL_CC_RD) | + FIELD_PREP(TCPC_ROLE_CTRL_CC2, + TCPC_ROLE_CTRL_CC_RD)); + if (ret) + return ret; + + ret = regmap_update_bits(regmap, TCPC_TCPC_CTRL, + TCPC_TCPC_CTRL_EN_LK4CONN_ALRT, + TCPC_TCPC_CTRL_EN_LK4CONN_ALRT); + if (ret) + return ret; + + return max_tcpci_write8(chip, TCPC_COMMAND, TCPC_CMD_LOOK4CONNECTION); +} + bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnect_while_debounce, bool *cc_handled) { @@ -345,6 +378,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnect if (ret < 0) return false; + if (cc_status & TCPC_CC_STATUS_TOGGLING) { + if (chip->contaminant_state == DETECTED) + return true; + return false; + } + if (chip->contaminant_state == NOT_DETECTED || chip->contaminant_state == SINK) { if (!disconnect_while_debounce) msleep(100); @@ -377,6 +416,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnect max_contaminant_enable_dry_detection(chip); return true; } + + ret = max_contaminant_enable_toggling(chip); + if (ret) + dev_err(chip->dev, + "Failed to enable toggling, ret=%d", + ret); } } else if (chip->contaminant_state == DETECTED) { if (!(cc_status & TCPC_CC_STATUS_TOGGLING)) { @@ -384,6 +429,14 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnect if (chip->contaminant_state == DETECTED) { max_contaminant_enable_dry_detection(chip); return true; + } else { + ret = max_contaminant_enable_toggling(chip); + if (ret) { + dev_err(chip->dev, + "Failed to enable toggling, ret=%d", + ret); + return true; + } } } }

2 days, 14 hours

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror