6.0.7-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 6.0.7-rc1 review
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +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/v6.x/stable-review/patch-6.0.7-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.0.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.0.7-rc1
Kuniyuki Iwashima <[email protected]>
tcp/udp: Fix memory leak in ipv6_renew_options().
D Scott Phillips <[email protected]>
arm64: Add AMPERE1 to the Spectre-BHB affected list
Conor Dooley <[email protected]>
riscv: fix detection of toolchain Zihintpause support
Conor Dooley <[email protected]>
riscv: fix detection of toolchain Zicbom support
Qinglin Pan <[email protected]>
riscv: mm: add missing memcpy in kasan_init
Vladimir Oltean <[email protected]>
net: enetc: survive memory pressure without crashing
Eric Dumazet <[email protected]>
kcm: do not sense pfmemalloc status in kcm_sendpage()
Eric Dumazet <[email protected]>
net: do not sense pfmemalloc status in skb_append_pagefrags()
Suresh Devarakonda <[email protected]>
net/mlx5: Fix crash during sync firmware reset
Roy Novich <[email protected]>
net/mlx5: Update fw fatal reporter state on PCI handlers successful recover
Ariel Levkovich <[email protected]>
net/mlx5e: TC, Reject forwarding from internal port to internal port
Tariq Toukan <[email protected]>
net/mlx5: Fix possible use-after-free in async command interface
Saeed Mahameed <[email protected]>
net/mlx5: ASO, Create the ASO SQ with the correct timestamp format
Paul Blakey <[email protected]>
net/mlx5e: Update restore chain id for slow path packets
Aya Levin <[email protected]>
net/mlx5e: Extend SKB room check to include PTP-SQ
Rongwei Liu <[email protected]>
net/mlx5: DR, Fix matcher disconnect error flow
Moshe Shemesh <[email protected]>
net/mlx5: Wait for firmware to enable CRS before pci_restore_state
Hyong Youb Kim <[email protected]>
net/mlx5e: Do not increment ESN when updating IPsec ESN state
Zhengchao Shao <[email protected]>
netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed
Zhengchao Shao <[email protected]>
netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed
Zhengchao Shao <[email protected]>
netdevsim: fix memory leak in nsim_bus_dev_new()
Rafał Miłecki <[email protected]>
net: broadcom: bcm4908_enet: update TX stats after actual transmission
Nicolas Dichtel <[email protected]>
nh: fix scope used to find saddr when adding non gw nh
Florian Fainelli <[email protected]>
net: bcmsysport: Indicate MAC is in charge of PHY PM
Yang Yingliang <[email protected]>
net: ehea: fix possible memory leak in ehea_register_port()
Aaron Conole <[email protected]>
openvswitch: switch from WARN to pr_warn
Takashi Iwai <[email protected]>
ALSA: aoa: Fix I2S device accounting
Yang Yingliang <[email protected]>
ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev()
Kunihiko Hayashi <[email protected]>
net: ethernet: ave: Fix MAC to be in charge of PHY PM
Juergen Borleis <[email protected]>
net: fec: limit register access on i.MX6UL
Shang XiaoJing <[email protected]>
perf vendor events arm64: Fix incorrect Hisi hip08 L3 metrics
Sudeep Holla <[email protected]>
PM: domains: Fix handling of unavailable/disabled idle states
Jisheng Zhang <[email protected]>
riscv: jump_label: mark arguments as const to satisfy asm constraints
Yang Yingliang <[email protected]>
net: ksz884x: fix missing pci_disable_device() on error in pcidev_init()
Slawomir Laba <[email protected]>
i40e: Fix flow-type by setting GL_HASH_INSET registers
Sylwester Dziedziuch <[email protected]>
i40e: Fix VF hang when reset is triggered on another VF
Slawomir Laba <[email protected]>
i40e: Fix ethtool rx-flow-hash setting for X722
Eric Dumazet <[email protected]>
ipv6: ensure sane device mtu in tunnels
Thomas Richter <[email protected]>
perf list: Fix PMU name pai_crypto in perf list on s390
Kajol Jain <[email protected]>
perf vendor events power10: Fix hv-24x7 metric events
Hans Verkuil <[email protected]>
media: vivid: set num_in/outputs to 0 if not supported
Hans Verkuil <[email protected]>
media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check 'interlaced'
Hans Verkuil <[email protected]>
media: v4l2-dv-timings: add sanity checks for blanking values
Hans Verkuil <[email protected]>
media: vivid: dev->bitmap_cap wasn't freed in all cases
Hans Verkuil <[email protected]>
media: vivid: s_fbuf: add more sanity checks
Mario Limonciello <[email protected]>
PM: hibernate: Allow hybrid sleep to work with s2idle
Dongliang Mu <[email protected]>
can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path
Dongliang Mu <[email protected]>
can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
Paolo Abeni <[email protected]>
mptcp: set msk local address earlier
Horatiu Vultur <[email protected]>
net: lan966x: Stop replacing tx dcbs and dcbs_buf when changing MTU
Rafael Mendonca <[email protected]>
drm/amdkfd: Fix memory leak in kfd_mem_dmamap_userptr()
Jakub Kicinski <[email protected]>
net-memcg: avoid stalls when under memory pressure
Neal Cardwell <[email protected]>
tcp: fix indefinite deferral of RTO with SACK reneging
Lu Wei <[email protected]>
tcp: fix a signed-integer-overflow bug in tcp_add_backlog()
Zhang Changzhong <[email protected]>
net: lantiq_etop: don't free skb when returning NETDEV_TX_BUSY
Zhengchao Shao <[email protected]>
net: fix UAF issue in nfqnl_nf_hook_drop() when ops_init() failed
Eric Dumazet <[email protected]>
kcm: annotate data-races around kcm->rx_wait
Eric Dumazet <[email protected]>
kcm: annotate data-races around kcm->rx_psock
Íñigo Huguet <[email protected]>
atlantic: fix deadlock at aq_nic_stop
Ankit Nautiyal <[email protected]>
drm/i915/dp: Reset frl trained flag before restarting FRL training
Anshuman Gupta <[email protected]>
drm/i915/dgfx: Keep PCI autosuspend control 'on' by default on all dGPU
Raju Rangoju <[email protected]>
amd-xgbe: add the bit rate quirk for Molex cables
Raju Rangoju <[email protected]>
amd-xgbe: fix the SFP compliance codes check for DAC cables
Raju Rangoju <[email protected]>
amd-xgbe: Yellow carp devices do not need rrc
Chang S. Bae <[email protected]>
x86/fpu: Fix copy_xstate_to_uabi() to copy init states correctly
Douglas Anderson <[email protected]>
drm/bridge: ps8640: Add back the 50 ms mystery delay after HPD
Chen Zhongjin <[email protected]>
x86/unwind/orc: Fix unreliable stack dump with gcov
Anup Patel <[email protected]>
RISC-V: KVM: Fix kvm_riscv_vcpu_timer_pending() for Sstc
Andrew Jones <[email protected]>
RISC-V: Fix compilation without RISCV_ISA_ZICBOM
Andrew Jones <[email protected]>
RISC-V: KVM: Provide UAPI for Zicbom block size
Shang XiaoJing <[email protected]>
nfc: virtual_ncidev: Fix memory leak in virtual_nci_send()
Sergiu Moga <[email protected]>
net: macb: Specify PHY PM management done by MAC
Zhengchao Shao <[email protected]>
net: hinic: fix the issue of double release MBOX callback of VF
Zhengchao Shao <[email protected]>
net: hinic: fix the issue of CMDQ memory leaks
Zhengchao Shao <[email protected]>
net: hinic: fix memory leak when reading function table
Zhengchao Shao <[email protected]>
net: hinic: fix incorrect assignment issue in hinic_set_interrupt_cfg()
Benjamin Poirier <[email protected]>
selftests: net: Fix netdev name mismatch in cleanup
Benjamin Poirier <[email protected]>
selftests: net: Fix cross-tree inclusion of scripts
Horatiu Vultur <[email protected]>
net: lan966x: Fix the rx drop counter
Yang Yingliang <[email protected]>
net: netsec: fix error handling in netsec_register_mdio()
Xin Long <[email protected]>
tipc: fix a null-ptr-deref in tipc_topsrv_accept
Paul E. McKenney <[email protected]>
rcu: Keep synchronize_rcu() from enabling irqs in early boot
Maxim Levitsky <[email protected]>
perf/x86/intel/lbr: Use setup_clear_cpu_cap() instead of clear_cpu_cap()
Yang Yingliang <[email protected]>
ALSA: ac97: fix possible memory leak in snd_ac97_dev_register()
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor
Kai Vehmanen <[email protected]>
ASoC: SOF: Intel: pci-tgl: use RPL specific firmware definitions
Kai Vehmanen <[email protected]>
ASoC: Intel: common: add ACPI matching tables for Raptor Lake
Srinivasa Rao Mandadapu <[email protected]>
ASoC: qcom: lpass-cpu: Mark HDMI TX parity register as volatile
Cédric Le Goater <[email protected]>
spi: aspeed: Fix window offset of CE1
Sven Schnelle <[email protected]>
selftests/ftrace: fix dynamic_events dependency check
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: pci-mtl: fix firmware name
Geert Uytterhoeven <[email protected]>
ASoC: codecs: tlv320adc3xxx: Wrap adc3xxx_i2c_remove() in __exit_p()
Horatiu Vultur <[email protected]>
pinctrl: ocelot: Fix incorrect trigger of the interrupt.
Yang Yingliang <[email protected]>
mtd: rawnand: intel: Add missing of_node_put() in ebu_nand_probe()
Martin Blumenstingl <[email protected]>
mtd: rawnand: intel: Use devm_platform_ioremap_resource_byname()
Martin Blumenstingl <[email protected]>
mtd: rawnand: intel: Remove unused nand_pa member from ebu_nand_cs
Rafał Miłecki <[email protected]>
mtd: core: add missing of_node_get() in dynamic partitions code
Randy Dunlap <[email protected]>
arc: iounmap() arg is volatile
Stanislav Fomichev <[email protected]>
bpf: prevent decl_tag from being referenced in func_proto
Lin Shengwang <[email protected]>
sched/core: Fix comparison in sched_group_cookie_match()
Peter Zijlstra <[email protected]>
perf: Fix missing SIGTRAPs
Chang S. Bae <[email protected]>
x86/fpu: Exclude dynamic states from init_fpstate
Chang S. Bae <[email protected]>
x86/fpu: Fix the init_fpstate size check with the actual size
Chang S. Bae <[email protected]>
x86/fpu: Configure init_fpstate attributes orderly
Robert Marko <[email protected]>
spi: qup: support using GPIO as chip select line
Douglas Anderson <[email protected]>
pinctrl: qcom: Avoid glitching lines when we first mux to output
Gao Xiang <[email protected]>
erofs: fix up inplace decompression success rate
Yue Hu <[email protected]>
erofs: fix illegal unmapped accesses in z_erofs_fill_inode_lazy()
Rob Clark <[email protected]>
drm/msm/a6xx: Fix kvzalloc vs state_kcalloc usage
Srinivasa Rao Mandadapu <[email protected]>
ASoC: qcom: lpass-cpu: mark HDMI TX registers as volatile
Gavin Shan <[email protected]>
KVM: selftests: Fix number of pages for memory slot in memslot_modification_stress_test
Randy Dunlap <[email protected]>
ASoC: codec: tlv320adc3xxx: add GPIOLIB dependency
Kuogee Hsieh <[email protected]>
drm/msm/dp: cleared DP_DOWNSPREAD_CTRL register before start link training
Nathan Huckleberry <[email protected]>
drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
Kuogee Hsieh <[email protected]>
drm/msm/dp: add atomic_check to bridge ops
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Replace kcalloc() with kvzalloc()
Paul Kocialkowski <[email protected]>
media: cedrus: Add a Kconfig dependency on RESET_CONTROLLER
Paul Kocialkowski <[email protected]>
media: sun8i-rotate: Add a Kconfig dependency on RESET_CONTROLLER
Paul Kocialkowski <[email protected]>
media: sun8i-di: Add a Kconfig dependency on RESET_CONTROLLER
Paul Kocialkowski <[email protected]>
media: sun4i-csi: Add a Kconfig dependency on RESET_CONTROLLER
Paul Kocialkowski <[email protected]>
media: sun6i-csi: Add a Kconfig dependency on RESET_CONTROLLER
Paul Kocialkowski <[email protected]>
media: sun8i-a83t-mipi-csi2: Add a Kconfig dependency on RESET_CONTROLLER
Paul Kocialkowski <[email protected]>
media: sun6i-mipi-csi2: Add a Kconfig dependency on RESET_CONTROLLER
Christophe JAILLET <[email protected]>
media: sunxi: Fix some error handling path of sun6i_mipi_csi2_probe()
Christophe JAILLET <[email protected]>
media: sunxi: Fix some error handling path of sun8i_a83t_mipi_csi2_probe()
Dan Carpenter <[email protected]>
media: atomisp: prevent integer overflow in sh_css_set_black_frame()
Sakari Ailus <[email protected]>
media: sun6i-mipi-csi2: Depend on PHY_SUN6I_MIPI_DPHY
Christophe JAILLET <[email protected]>
media: ov8865: Fix an error handling path in ov8865_probe()
Sakari Ailus <[email protected]>
media: ar0521: Fix return value check in writing initial registers
Yang Yingliang <[email protected]>
media: ar0521: fix error return code in ar0521_power_on()
Alexander Stein <[email protected]>
media: v4l2: Fix v4l2_i2c_subdev_set_name function documentation
Ming Qian <[email protected]>
media: amphion: release m2m ctx when releasing vpu instance
Wei Yongjun <[email protected]>
net: ieee802154: fix error return code in dgram_bind()
Nicholas Piggin <[email protected]>
powerpc/64s/interrupt: Fix clear of PACA_IRQS_HARD_DIS when returning to soft-masked context
Manank Patel <[email protected]>
ACPI: PCC: Fix unintentional integer overflow
Michał Mirosław <[email protected]>
fbdev/core: Avoid uninitialized read in aperture_remove_conflicting_pci_device()
Xin Long <[email protected]>
ethtool: eeprom: fix null-deref on genl_info in dump
Heiko Carstens <[email protected]>
s390/pci: add missing EX_TABLE entries to __pcistg_mio_inuser()/__pcilg_mio_inuser()
Heiko Carstens <[email protected]>
s390/futex: add missing EX_TABLE entry to __futex_atomic_op()
Heiko Carstens <[email protected]>
s390/uaccess: add missing EX_TABLE entries to __clear_user()
Peter Oberparleiter <[email protected]>
s390/cio: fix out-of-bounds access on cio_ignore free
Peter Oberparleiter <[email protected]>
s390/boot: add secure boot trailer
Adrian Hunter <[email protected]>
perf auxtrace: Fix address filter symbol name match for modules
Pavel Kozlov <[email protected]>
ARC: mm: fix leakage of memory allocated for PTE
Sai Krishna Potthuri <[email protected]>
Revert "pinctrl: pinctrl-zynqmp: Add support for output-enable and bias-high-impedance"
Siarhei Volkau <[email protected]>
pinctrl: Ingenic: JZ4755 bug fixes
Sai Krishna Potthuri <[email protected]>
Revert "dt-bindings: pinctrl-zynqmp: Add output-enable configuration"
Christian A. Ehrhardt <[email protected]>
kernfs: fix use-after-free in __kernfs_remove
Hugh Dickins <[email protected]>
mm: prep_compound_tail() clear page->private
Mel Gorman <[email protected]>
mm/huge_memory: do not clobber swp_entry_t during THP split
Waiman Long <[email protected]>
mm/kmemleak: prevent soft lockup in kmemleak_scan()'s object iteration loops
Rik van Riel <[email protected]>
mm,madvise,hugetlb: fix unexpected data loss with MADV_DONTNEED on hugetlbfs
Baolin Wang <[email protected]>
mm: migrate: fix return value if all subpages of THPs are migrated successfully
Peter Xu <[email protected]>
mm/uffd: fix vma check on userfault for wp
William Breathitt Gray <[email protected]>
counter: 104-quad-8: Fix race getting function mode and direction
William Breathitt Gray <[email protected]>
counter: microchip-tcb-capture: Handle Signal1 read and Synapse
Sascha Hauer <[email protected]>
mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit bus
Patrick Thompson <[email protected]>
mmc: sdhci-pci-core: Disable ES for ASUS BIOS on Jasper Lake
Vincent Whitchurch <[email protected]>
mmc: core: Fix WRITE_ZEROES CQE handling
Matthew Ma <[email protected]>
mmc: core: Fix kernel panic when remove non-standard SDIO card
Christian Löhle <[email protected]>
mmc: queue: Cancel recovery work on cleanup
Christian Löhle <[email protected]>
mmc: block: Remove error check of hw_reset on reset
Brian Norris <[email protected]>
mmc: sdhci_am654: 'select', not 'depends' REGMAP_MMIO
James Clark <[email protected]>
coresight: cti: Fix hang in cti_disable_hw()
Jean-Philippe Brucker <[email protected]>
random: use arch_get_random*_early() in random_init()
Nathan Huckleberry <[email protected]>
crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned
Johan Hovold <[email protected]>
drm/msm/dp: fix bridge lifetime
Johan Hovold <[email protected]>
drm/msm/dp: fix IRQ lifetime
Johan Hovold <[email protected]>
drm/msm/dp: fix aux-bus EP lifetime
Johan Hovold <[email protected]>
drm/msm/dp: fix memory corruption with too many bridges
Johan Hovold <[email protected]>
drm/msm/hdmi: fix IRQ lifetime
Johan Hovold <[email protected]>
drm/msm/hdmi: fix memory corruption with too many bridges
Johan Hovold <[email protected]>
drm/msm/dsi: fix memory corruption with too many bridges
Johan Hovold <[email protected]>
drm/msm: fix use-after-free on probe deferral
Jesse Zhang <[email protected]>
drm/amdkfd: correct the cache info for gfx1036
Prike Liang <[email protected]>
drm/amdkfd: update gfx1037 Lx cache setting
Joaquín Ignacio Aramendía <[email protected]>
drm/amd/display: Revert logic for plane modifiers
Chengming Gui <[email protected]>
drm/amdgpu: fix pstate setting issue
Prike Liang <[email protected]>
drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resume
Lijo Lazar <[email protected]>
drm/amdgpu: Remove ATC L2 access for MMHUB 2.1.x
José Roberto de Souza <[email protected]>
drm/i915: Extend Wa_1607297627 to Alderlake-P
Arunpravin Paneer Selvam <[email protected]>
drm/amdgpu: Fix for BO move issue
Arunpravin Paneer Selvam <[email protected]>
drm/amdgpu: Fix VRAM BO swap issue
Manish Rangankar <[email protected]>
scsi: qla2xxx: Use transport-defined speed mask for supported_speeds
Miquel Raynal <[email protected]>
mac802154: Fix LQI recording
Bernd Edlinger <[email protected]>
exec: Copy oldsighand->action under spin-lock
Li Zetao <[email protected]>
fs/binfmt_elf: Fix memory leak in load_elf_binary()
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: hybrid: Use known scaling factor for P-cores
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Read all MSRs on the target CPU
Hyunwoo Kim <[email protected]>
fbdev: smscufx: Fix several use-after-free bugs
Helge Deller <[email protected]>
fbdev: stifb: Fall back to cfb_fillrect() on 32-bit HCRX cards
Matti Vaittinen <[email protected]>
iio: adxl367: Fix unsafe buffer attributes
Matti Vaittinen <[email protected]>
iio: adxl372: Fix unsafe buffer attributes
Cosmin Tanislav <[email protected]>
iio: temperature: ltc2983: allocate iio channels once
Shreeya Patel <[email protected]>
iio: light: tsl2583: Fix module unloading
Matti Vaittinen <[email protected]>
tools: iio: iio_utils: fix digit calculation
Mathias Nyman <[email protected]>
xhci: Remove device endpoints from bandwidth list when freeing the device
Mario Limonciello <[email protected]>
xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devices
Mathias Nyman <[email protected]>
xhci: Add quirk to reset host back to default state at shutdown
Phillip Lougher <[email protected]>
squashfs: fix buffer release race condition in readahead code
Phillip Lougher <[email protected]>
squashfs: fix extending readahead beyond end of file
Phillip Lougher <[email protected]>
squashfs: fix read regression introduced in readahead code
Tony O'Brien <[email protected]>
mtd: rawnand: marvell: Use correct logic for nand-keep-config
Linus Walleij <[email protected]>
mtd: parsers: bcm47xxpart: Fix halfblock reads
Mika Westerberg <[email protected]>
mtd: spi-nor: core: Ignore -ENOTSUPP in spi_nor_init()
Zhang Qilong <[email protected]>
mtd: rawnand: tegra: Fix PM disable depth imbalance in probe
Jens Glathe <[email protected]>
usb: xhci: add XHCI_SPURIOUS_SUCCESS to ASM1042 despite being a V0.96 controller
Justin Chen <[email protected]>
usb: bdc: change state when port disconnected
Andrey Smirnov <[email protected]>
usb: dwc3: Don't switch OTG -> peripheral if extcon is present
Patrice Chotard <[email protected]>
usb: dwc3: st: Rely on child's compatible instead of name
Heikki Krogerus <[email protected]>
usb: typec: ucsi: acpi: Implement resume callback
Heikki Krogerus <[email protected]>
usb: typec: ucsi: Check the connection on resume
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't delay End Transfer on delayed_status
Wesley Cheng <[email protected]>
usb: dwc3: gadget: Force sending delayed status during soft disconnect
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't set IMI for no_interrupt
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Stop processing more requests on IMI
Joel Stanley <[email protected]>
usb: gadget: aspeed: Fix probe regression
Jeff Vanhoof <[email protected]>
usb: gadget: uvc: fix sg handling during video encode
Dan Vacura <[email protected]>
usb: gadget: uvc: fix sg handling in error case
Dan Vacura <[email protected]>
usb: gadget: uvc: fix dropped frame after missed isoc
Greg Kroah-Hartman <[email protected]>
Revert "usb: gadget: uvc: limit isoc_sg to super speed gadgets"
Michael Grzeschik <[email protected]>
usb: gadget: uvc: limit isoc_sg to super speed gadgets
Hannu Hartikainen <[email protected]>
USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM
Jason A. Donenfeld <[email protected]>
ALSA: rme9652: use explicitly signed char
Jason A. Donenfeld <[email protected]>
ALSA: au88x0: use explicitly signed char
Maciej S. Szmigiero <[email protected]>
ALSA: ca0106: Use snd_ctl_rename() to rename a control
Maciej S. Szmigiero <[email protected]>
ALSA: usb-audio: Use snd_ctl_rename() to rename a control
Maciej S. Szmigiero <[email protected]>
ALSA: ac97: Use snd_ctl_rename() to rename a control
Maciej S. Szmigiero <[email protected]>
ALSA: emu10k1: Use snd_ctl_rename() to rename a control
Maciej S. Szmigiero <[email protected]>
ALSA: hda/realtek: Use snd_ctl_rename() to rename a control
Maciej S. Szmigiero <[email protected]>
ALSA: control: add snd_ctl_rename()
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add another HP ZBook G9 model quirks
Takashi Iwai <[email protected]>
ALSA: usb-audio: Add quirks for M-Audio Fast Track C400/600
Stefan Binding <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41
Steven Rostedt (Google) <[email protected]>
ALSA: Use del_timer_sync() before freeing timer
Biju Das <[email protected]>
can: rcar_canfd: fix channel specific IRQ handling for RZ/G2L
Biju Das <[email protected]>
can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive
Anssi Hannula <[email protected]>
can: kvaser_usb: Fix possible completions during init_completion
Yang Yingliang <[email protected]>
can: j1939: transport: j1939_session_skb_drop_old(): spin_unlock_irqrestore() before kfree_skb()
Shyam Sundar S K <[email protected]>
platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks
-------------
Diffstat:
.../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 -
Makefile | 4 +-
arch/arc/include/asm/io.h | 2 +-
arch/arc/include/asm/pgtable-levels.h | 2 +-
arch/arc/mm/ioremap.c | 2 +-
arch/arm64/include/asm/cputype.h | 4 +
arch/arm64/kernel/proton-pack.c | 6 +
arch/powerpc/kernel/interrupt_64.S | 13 +-
arch/riscv/Kconfig | 17 ++-
arch/riscv/Makefile | 6 +-
arch/riscv/include/asm/cacheflush.h | 8 --
arch/riscv/include/asm/jump_label.h | 8 +-
arch/riscv/include/asm/kvm_vcpu_timer.h | 1 +
arch/riscv/include/asm/vdso/processor.h | 2 +-
arch/riscv/include/uapi/asm/kvm.h | 1 +
arch/riscv/kvm/vcpu.c | 11 ++
arch/riscv/kvm/vcpu_timer.c | 17 ++-
arch/riscv/mm/cacheflush.c | 38 ++++++
arch/riscv/mm/dma-noncoherent.c | 39 ------
arch/riscv/mm/kasan_init.c | 7 +-
arch/s390/boot/vmlinux.lds.S | 13 +-
arch/s390/include/asm/futex.h | 3 +-
arch/s390/lib/uaccess.c | 6 +-
arch/s390/pci/pci_mmio.c | 8 +-
arch/x86/crypto/polyval-clmulni_glue.c | 19 ++-
arch/x86/events/intel/lbr.c | 2 +-
arch/x86/kernel/fpu/init.c | 8 --
arch/x86/kernel/fpu/xstate.c | 42 +++---
arch/x86/kernel/unwind_orc.c | 2 +-
drivers/acpi/acpi_pcc.c | 2 +-
drivers/base/power/domain.c | 4 +
drivers/char/random.c | 4 +-
drivers/counter/104-quad-8.c | 64 ++++++---
drivers/counter/microchip-tcb-capture.c | 18 ++-
drivers/cpufreq/intel_pstate.c | 133 +++++++-----------
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 +++
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 20 ++-
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 28 ++--
drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 106 ++++++++++++++-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +------
drivers/gpu/drm/bridge/parade-ps8640.c | 25 +++-
drivers/gpu/drm/i915/display/intel_dp.c | 2 +
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +-
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 7 +-
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +-
.../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +-
drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +-
drivers/gpu/drm/msm/dp/dp_display.c | 23 +++-
drivers/gpu/drm/msm/dp/dp_drm.c | 34 +++++
drivers/gpu/drm/msm/dp/dp_parser.c | 6 +-
drivers/gpu/drm/msm/dp/dp_parser.h | 5 +-
drivers/gpu/drm/msm/dsi/dsi.c | 6 +
drivers/gpu/drm/msm/hdmi/hdmi.c | 7 +-
drivers/gpu/drm/msm/msm_drv.c | 1 +
drivers/hwtracing/coresight/coresight-cti-core.c | 5 -
drivers/iio/accel/adxl367.c | 23 +++-
drivers/iio/accel/adxl372.c | 23 +++-
drivers/iio/light/tsl2583.c | 2 +-
drivers/iio/temperature/ltc2983.c | 13 +-
drivers/media/i2c/ar0521.c | 8 +-
drivers/media/i2c/ov8865.c | 10 +-
drivers/media/platform/amphion/vpu_v4l2.c | 11 +-
drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +-
drivers/media/platform/sunxi/sun6i-csi/Kconfig | 2 +-
.../media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 4 +-
.../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 ++-
.../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +-
.../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +++-
drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +-
drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +-
drivers/media/test-drivers/vivid/vivid-core.c | 38 +++++-
drivers/media/test-drivers/vivid/vivid-core.h | 2 +
drivers/media/test-drivers/vivid/vivid-vid-cap.c | 27 +++-
drivers/media/v4l2-core/v4l2-dv-timings.c | 14 ++
drivers/mmc/core/block.c | 44 +++---
drivers/mmc/core/queue.c | 8 ++
drivers/mmc/core/sdio_bus.c | 3 +-
drivers/mmc/host/Kconfig | 3 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 14 +-
drivers/mmc/host/sdhci-pci-core.c | 14 +-
drivers/mtd/mtdcore.c | 2 +-
drivers/mtd/nand/raw/intel-nand-controller.c | 35 ++---
drivers/mtd/nand/raw/marvell_nand.c | 2 +-
drivers/mtd/nand/raw/tegra_nand.c | 4 +-
drivers/mtd/parsers/bcm47xxpart.c | 4 +-
drivers/mtd/spi-nor/core.c | 4 +-
drivers/net/can/mscan/mpc5xxx_can.c | 8 +-
drivers/net/can/rcar/rcar_canfd.c | 24 ++--
drivers/net/can/spi/mcp251x.c | 5 +-
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 +-
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 4 +-
drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 5 +
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 19 ++-
drivers/net/ethernet/amd/xgbe/xgbe.h | 1 +
drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 96 +++++++++----
drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 +
drivers/net/ethernet/broadcom/bcm4908_enet.c | 12 +-
drivers/net/ethernet/broadcom/bcmsysport.c | 3 +
drivers/net/ethernet/cadence/macb_main.c | 1 +
drivers/net/ethernet/freescale/enetc/enetc.c | 5 +
drivers/net/ethernet/freescale/fec_main.c | 46 ++++++-
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 18 ++-
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 +-
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 +-
drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1 -
drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 +
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 100 ++++++++------
drivers/net/ethernet/intel/i40e/i40e_type.h | 4 +
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 43 ++++--
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 +
drivers/net/ethernet/lantiq_etop.c | 1 -
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 10 +-
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 9 ++
.../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 2 +
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 +
.../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 -
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 74 +++++++++-
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 17 +++
drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 7 +
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 6 +-
drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +
.../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 3 +-
drivers/net/ethernet/micrel/ksz884x.c | 2 +-
.../ethernet/microchip/lan966x/lan966x_ethtool.c | 10 +-
.../net/ethernet/microchip/lan966x/lan966x_fdma.c | 24 +---
drivers/net/ethernet/socionext/netsec.c | 2 +
drivers/net/ethernet/socionext/sni_ave.c | 6 +
drivers/net/netdevsim/bus.c | 9 +-
drivers/net/netdevsim/dev.c | 31 +++--
drivers/nfc/virtual_ncidev.c | 3 +
drivers/pinctrl/pinctrl-ingenic.c | 4 +-
drivers/pinctrl/pinctrl-ocelot.c | 17 ++-
drivers/pinctrl/pinctrl-zynqmp.c | 9 --
drivers/pinctrl/qcom/pinctrl-msm.c | 21 +++
drivers/platform/x86/amd/pmc.c | 12 --
drivers/s390/cio/css.c | 8 +-
drivers/scsi/qla2xxx/qla_attr.c | 28 +++-
drivers/spi/spi-aspeed-smc.c | 2 +-
drivers/spi/spi-qup.c | 2 +
drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +-
drivers/staging/media/sunxi/cedrus/Kconfig | 1 +
drivers/usb/core/quirks.c | 9 ++
drivers/usb/dwc3/core.c | 49 ++++++-
drivers/usb/dwc3/drd.c | 50 -------
drivers/usb/dwc3/dwc3-st.c | 2 +-
drivers/usb/dwc3/gadget.c | 21 ++-
drivers/usb/gadget/function/uvc_queue.c | 8 +-
drivers/usb/gadget/function/uvc_video.c | 25 +++-
drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 +
drivers/usb/gadget/udc/bdc/bdc_udc.c | 1 +
drivers/usb/host/xhci-mem.c | 20 +--
drivers/usb/host/xhci-pci.c | 44 ++----
drivers/usb/host/xhci.c | 10 +-
drivers/usb/host/xhci.h | 1 +
drivers/usb/typec/ucsi/ucsi.c | 42 ++++--
drivers/usb/typec/ucsi/ucsi_acpi.c | 10 ++
drivers/video/aperture.c | 5 +-
drivers/video/fbdev/smscufx.c | 55 ++++----
drivers/video/fbdev/stifb.c | 3 +-
fs/binfmt_elf.c | 3 +-
fs/erofs/zdata.c | 6 +-
fs/erofs/zmap.c | 17 +--
fs/exec.c | 4 +-
fs/kernfs/dir.c | 5 +-
fs/squashfs/file.c | 23 ++--
fs/squashfs/page_actor.c | 3 +
fs/squashfs/page_actor.h | 6 +-
include/linux/mlx5/driver.h | 2 +-
include/linux/perf_event.h | 19 ++-
include/linux/userfaultfd_k.h | 6 +-
include/media/v4l2-common.h | 3 +-
include/net/sock.h | 2 +-
include/sound/control.h | 1 +
include/sound/soc-acpi-intel-match.h | 2 +
include/uapi/linux/videodev2.h | 3 +-
kernel/bpf/btf.c | 5 +
kernel/events/core.c | 151 +++++++++++++++------
kernel/events/ring_buffer.c | 2 +-
kernel/power/hibernate.c | 2 +-
kernel/rcu/tree.c | 10 +-
kernel/sched/sched.h | 18 +--
mm/huge_memory.c | 11 +-
mm/kmemleak.c | 61 ++++++---
mm/madvise.c | 12 +-
mm/migrate.c | 7 +
mm/page_alloc.c | 1 +
net/can/j1939/transport.c | 4 +-
net/core/net_namespace.c | 7 +
net/core/skbuff.c | 2 +-
net/ethtool/eeprom.c | 2 +-
net/ieee802154/socket.c | 4 +-
net/ipv4/nexthop.c | 2 +-
net/ipv4/tcp_input.c | 3 +-
net/ipv4/tcp_ipv4.c | 4 +-
net/ipv6/ip6_gre.c | 12 +-
net/ipv6/ip6_tunnel.c | 11 +-
net/ipv6/ipv6_sockglue.c | 7 +
net/ipv6/sit.c | 8 +-
net/kcm/kcmsock.c | 25 ++--
net/mac802154/rx.c | 5 +-
net/mptcp/protocol.c | 3 +-
net/mptcp/protocol.h | 1 +
net/mptcp/subflow.c | 7 +
net/openvswitch/datapath.c | 3 +-
net/tipc/topsrv.c | 16 ++-
sound/aoa/soundbus/i2sbus/core.c | 7 +-
sound/core/control.c | 23 ++++
sound/pci/ac97/ac97_codec.c | 33 +++--
sound/pci/au88x0/au88x0.h | 6 +-
sound/pci/au88x0/au88x0_core.c | 2 +-
sound/pci/ca0106/ca0106_mixer.c | 2 +-
sound/pci/emu10k1/emumixer.c | 2 +-
sound/pci/hda/patch_realtek.c | 5 +-
sound/pci/rme9652/hdsp.c | 26 ++--
sound/pci/rme9652/rme9652.c | 22 +--
sound/soc/codecs/Kconfig | 1 +
sound/soc/codecs/tlv320adc3xxx.c | 2 +-
sound/soc/intel/common/Makefile | 2 +-
sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 51 +++++++
sound/soc/qcom/lpass-cpu.c | 10 ++
sound/soc/sof/intel/pci-mtl.c | 2 +-
sound/soc/sof/intel/pci-tgl.c | 92 ++++++++++++-
sound/synth/emux/emux.c | 7 +-
sound/usb/implicit.c | 2 +
sound/usb/mixer.c | 2 +-
tools/iio/iio_utils.c | 4 +
.../arch/arm64/hisilicon/hip08/metrics.json | 6 +-
.../arch/powerpc/power10/nest_metrics.json | 72 +++++-----
.../arch/s390/cf_z16/{pai.json => pai_crypto.json} | 0
tools/perf/util/auxtrace.c | 10 +-
.../testing/selftests/drivers/net/bonding/Makefile | 4 +-
.../drivers/net/bonding/dev_addr_lists.sh | 2 +-
.../drivers/net/bonding/net_forwarding_lib.sh | 1 +
.../drivers/net/dsa/test_bridge_fdb_stress.sh | 4 +-
tools/testing/selftests/drivers/net/team/Makefile | 4 +
.../selftests/drivers/net/team/dev_addr_lists.sh | 6 +-
.../testing/selftests/drivers/net/team/lag_lib.sh | 1 +
.../drivers/net/team/net_forwarding_lib.sh | 1 +
.../ftrace/test.d/dynevent/test_duplicates.tc | 2 +-
.../inter-event/trigger-synthetic-eprobe.tc | 2 +-
.../kvm/memslot_modification_stress_test.c | 2 +-
tools/testing/selftests/lib.mk | 4 +-
246 files changed, 2260 insertions(+), 1058 deletions(-)Greg Kroah-Hartman
maintainerPATCH 1/240 platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks
From: Shyam Sundar S K <[email protected]>
commit b37fe34c83099ba5105115f8287c5546af1f0a05 upstream.
Since linux/debugfs.h already has the stubs for the used debugfs functions when debugfs is not enabled, remove the #ifdef CONFIG_DEBUG_FS checks.
--- drivers/platform/x86/amd/pmc.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/platform/x86/amd/pmc.c +0 -12
@@ -151,9 +151,7 @@ struct amd_pmc_dev {struct device *dev;struct pci_dev *rdev;struct mutex lock;/* generic mutex lock */ -#if IS_ENABLED (CONFIG_DEBUG_FS )struct dentry *dbgfs_dir; -#endif /* CONFIG_DEBUG_FS */ };static bool enable_stb;
@@ -369,7 +367,6 @@ static void amd_pmc_validate_deepest(str }#endif -#ifdef CONFIG_DEBUG_FS static int smu_fw_info_show (struct seq_file *s,void *unused) {struct amd_pmc_dev *dev = s->private;
@@ -504,15 +501,6 @@ static void amd_pmc_dbgfs_register(struc &amd_pmc_stb_debugfs_fops); } } -#else -static inline void amd_pmc_dbgfs_register (struct amd_pmc_dev *dev) -{ -} - -static inline void amd_pmc_dbgfs_unregister (struct amd_pmc_dev *dev) -{ -} -#endif /* CONFIG_DEBUG_FS */ static void amd_pmc_dump_registers (struct amd_pmc_dev *dev) {
Greg Kroah-Hartman
maintainerPATCH 2/240 can: j1939: transport: j1939_session_skb_drop_old(): spin_unlock_irqrestore() before kfree_skb()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
commit c3c06c61890da80494bb196f75d89b791adda87f upstream.
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. The skb is unlinked from the queue, so it can be freed after spin_unlock_irqrestore().
--- net/can/j1939/transport.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/can/j1939/transport.c +3 -1
@@ -342,10 +342,12 @@ static void j1939_session_skb_drop_old(s__skb_unlink (do_skb, &session->skb_queue);/* drop ref taken in j1939_session_skb_queue() */ skb_unref (do_skb); +spin_unlock_irqrestore (&session->skb_queue.lock, flags);kfree_skb (do_skb); + }else { +spin_unlock_irqrestore (&session->skb_queue.lock, flags); } -spin_unlock_irqrestore (&session->skb_queue.lock, flags); } void j1939_session_skb_queue(struct j1939_session *session,
Greg Kroah-Hartman
maintainerPATCH 3/240 can: kvaser_usb: Fix possible completions during init_completion
In reply to Greg Kroah-HartmanFrom: Anssi Hannula <[email protected]>
commit 2871edb32f4622c3a25ce4b3977bad9050b91974 upstream.
kvaser_usb uses completions to signal when a response event is received for outgoing commands.
However, it uses init_completion() to reinitialize the start_comp and stop_comp completions before sending the start/stop commands.
In case the device sends the corresponding response just before the actual command is sent, complete() may be called concurrently with init_completion() which is not safe.
This might be triggerable even with a properly functioning device by stopping the interface (CMD_STOP_CHIP) just after it goes bus-off (which also causes the driver to send CMD_STOP_CHIP when restart-ms is off), but that was not tested.
Fix the issue by using reinit_completion() instead.
--- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 ++-- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +2 -2
@@ -1875,7 +1875,7 @@ static int kvaser_usb_hydra_start_chip(s {int err; -init_completion (&priv->start_comp); +reinit_completion (&priv->start_comp); err =kvaser_usb_hydra_send_simple_cmd (priv->dev,CMD_START_CHIP_REQ , priv->channel);
@@ -1893,7 +1893,7 @@ static int kvaser_usb_hydra_stop_chip(st {int err; -init_completion (&priv->stop_comp); +reinit_completion (&priv->stop_comp);/* Make sure we do not report invalid BUS_OFF from CMD_CHIP_STATE_EVENT * see comment in kvaser_usb_hydra_update_state()
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +2 -2
@@ -1320,7 +1320,7 @@ static int kvaser_usb_leaf_start_chip(st {int err; -init_completion (&priv->start_comp); +reinit_completion (&priv->start_comp); err =kvaser_usb_leaf_send_simple_cmd (priv->dev,CMD_START_CHIP , priv->channel);
@@ -1338,7 +1338,7 @@ static int kvaser_usb_leaf_stop_chip(str {int err; -init_completion (&priv->stop_comp); +reinit_completion (&priv->stop_comp); err =kvaser_usb_leaf_send_simple_cmd (priv->dev,CMD_STOP_CHIP , priv->channel);
Greg Kroah-Hartman
maintainerPATCH 4/240 can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
commit 702de2c21eed04c67cefaaedc248ef16e5f6b293 upstream.
We are seeing an IRQ storm on the global receive IRQ line under heavy CAN bus load conditions with both CAN channels enabled.
Conditions:
The global receive IRQ line is shared between can0 and can1, either of the channels can trigger interrupt while the other channel's IRQ line is disabled (RFIE).
When global a receive IRQ interrupt occurs, we mask the interrupt in the IRQ handler. Clearing and unmasking of the interrupt is happening in rx_poll(). There is a race condition where rx_poll() unmasks the interrupt, but the next IRQ handler does not mask the IRQ due to NAPIF_STATE_MISSED flag (e.g.: can0 RX FIFO interrupt is disabled and can1 is triggering RX interrupt, the delay in rx_poll() processing results in setting NAPIF_STATE_MISSED flag) leading to an IRQ storm.
This patch fixes the issue by checking IRQ active and enabled before handling the IRQ on a particular channel.
--- drivers/net/can/rcar/rcar_canfd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/can/rcar/rcar_canfd.c +4 -2
@@ -1157,11 +1157,13 @@ static void rcar_canfd_handle_global_rec {struct rcar_canfd_channel *priv = gpriv->ch[ch];u32 ridx = ch +RCANFD_RFFIFO_IDX ; -u32 sts; +u32 sts, cc;/* Handle Rx interrupts */ sts =rcar_canfd_read (priv->base,RCANFD_RFSTS (gpriv, ridx)); -if (likely (sts &RCANFD_RFSTS_RFIF )) { + cc =rcar_canfd_read (priv->base,RCANFD_RFCC (gpriv, ridx)); +if (likely (sts &RCANFD_RFSTS_RFIF && + cc &RCANFD_RFCC_RFIE )) {if (napi_schedule_prep (&priv->napi)) {/* Disable Rx FIFO interrupts */ rcar_canfd_clear_bit(priv->base,
Greg Kroah-Hartman
maintainerPATCH 5/240 can: rcar_canfd: fix channel specific IRQ handling for RZ/G2L
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
commit d887087c896881715c1a82f1d4f71fbfe5344ffd upstream.
RZ/G2L has separate channel specific IRQs for transmit and error interrupts. But the IRQ handler processes both channels, even if there no interrupt occurred on one of the channels.
This patch fixes the issue by passing a channel specific context parameter instead of global one for the IRQ register and the IRQ handler, it just handles the channel which is triggered the interrupt.
--- drivers/net/can/rcar/rcar_canfd.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/net/can/rcar/rcar_canfd.c +7 -11
@@ -1246,11 +1246,9 @@ static void rcar_canfd_handle_channel_txstatic irqreturn_t rcar_canfd_channel_tx_interrupt (int irq,void *dev_id) { -struct rcar_canfd_global *gpriv = dev_id; -u32 ch; +struct rcar_canfd_channel *priv = dev_id; -for_each_set_bit (ch, &gpriv->channels_mask, gpriv->max_channels) -rcar_canfd_handle_channel_tx (gpriv, ch); +rcar_canfd_handle_channel_tx (priv->gpriv, priv->channel);return IRQ_HANDLED ; }
@@ -1278,11 +1276,9 @@ static void rcar_canfd_handle_channel_erstatic irqreturn_t rcar_canfd_channel_err_interrupt (int irq,void *dev_id) { -struct rcar_canfd_global *gpriv = dev_id; -u32 ch; +struct rcar_canfd_channel *priv = dev_id; -for_each_set_bit (ch, &gpriv->channels_mask, gpriv->max_channels) -rcar_canfd_handle_channel_err (gpriv, ch); +rcar_canfd_handle_channel_err (priv->gpriv, priv->channel);return IRQ_HANDLED ; }
@@ -1723,6 +1719,7 @@ static int rcar_canfd_channel_probe(stru priv->ndev = ndev; priv->base = gpriv->base; priv->channel = ch; + priv->gpriv = gpriv; priv->can.clock.freq = fcan_freq;dev_info (&pdev->dev,"can_clk rate is %u\n" , priv->can.clock.freq);
@@ -1751,7 +1748,7 @@ static int rcar_canfd_channel_probe(stru } err =devm_request_irq (&pdev->dev, err_irq, rcar_canfd_channel_err_interrupt,0 , - irq_name, gpriv); + irq_name, priv);if (err) {dev_err (&pdev->dev,"devm_request_irq CH Err(%d) failed, error %d\n" , err_irq, err);
@@ -1765,7 +1762,7 @@ static int rcar_canfd_channel_probe(stru } err =devm_request_irq (&pdev->dev, tx_irq, rcar_canfd_channel_tx_interrupt,0 , - irq_name, gpriv); + irq_name, priv);if (err) {dev_err (&pdev->dev,"devm_request_irq Tx (%d) failed, error %d\n" , tx_irq, err);
@@ -1791,7 +1788,6 @@ static int rcar_canfd_channel_probe(stru priv->can.do_set_mode = rcar_canfd_do_set_mode; priv->can.do_get_berr_counter = rcar_canfd_get_berr_counter; - priv->gpriv = gpriv;SET_NETDEV_DEV (ndev, &pdev->dev); netif_napi_add_weight(ndev, &priv->napi, rcar_canfd_rx_poll,
Greg Kroah-Hartman
maintainerPATCH 6/240 ALSA: Use del_timer_sync() before freeing timer
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
commit f0a868788fcbf63cdab51f5adcf73b271ede8164 upstream.
The current code for freeing the emux timer is extremely dangerous:
CPU0 CPU1
---- ----snd_emux_timer_callback()
snd_emux_free() spin_lock(&emu->voice_lock) del_timer(&emu->tlist); <-- returns immediately spin_unlock(&emu->voice_lock); [..] kfree(emu);
spin_lock(&emu->voice_lock);
[BOOM!]
Instead just use del_timer_sync() which will wait for the timer to finish before continuing. No need to check if the timer is active or not when doing so.
This doesn't fix the race of a possible re-arming of the timer, but at least it won't use the data that has just been freed.
[ Fixed unused variable warning by tiwai ]
--- sound/synth/emux/emux.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
sound/synth/emux/emux.c +1 -6
@@ -126,15 +126,10 @@ EXPORT_SYMBOL(snd_emux_register);*/ int snd_emux_free (struct snd_emux *emu) { -unsigned long flags; -if (! emu)return -EINVAL ; -spin_lock_irqsave (&emu->voice_lock, flags); -if (emu->timer_active) -del_timer (&emu->tlist); -spin_unlock_irqrestore (&emu->voice_lock, flags); +del_timer_sync (&emu->tlist);snd_emux_proc_free (emu);snd_emux_delete_virmidi (emu);
Greg Kroah-Hartman
maintainerPATCH 7/240 ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41
In reply to Greg Kroah-HartmanFrom: Stefan Binding <[email protected]>
commit 491a4ccd8a0258392900c80c6b2b622c7115fc23 upstream.
This Asus Zenbook laptop use Realtek HDA codec combined with 2xCS35L41 Amplifiers using SPI with External Boost.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9405,6 +9405,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1ccd ,"ASUS X555UB" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x1d42 ,"ASUS Zephyrus G14 2022" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1d4e ,"ASUS TM420" ,ALC256_FIXUP_ASUS_HPE ), +SND_PCI_QUIRK (0x1043 ,0x1e02 ,"ASUS UX3402" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x1e11 ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA502 ),SND_PCI_QUIRK (0x1043 ,0x1e51 ,"ASUS Zephyrus M15" ,ALC294_FIXUP_ASUS_GU502_PINS ), SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
Greg Kroah-Hartman
maintainerPATCH 8/240 ALSA: usb-audio: Add quirks for M-Audio Fast Track C400/600
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 794814529384721ce8f4d34228dc599cc010353d upstream.
M-Audio Fast Track C400 and C600 devices (0763:2030 and 0763:2031, respectively) seem requiring the explicit setup for the implicit feedback mode. This patch adds the quirk entries for those.
--- sound/usb/implicit.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/implicit.c +2 -0
@@ -47,6 +47,8 @@ struct snd_usb_implicit_fb_match {static const struct snd_usb_implicit_fb_match playback_implicit_fb_quirks[] = {/* Fixed EP */ /* FIXME: check the availability of generic matching */ +IMPLICIT_FB_FIXED_DEV (0x0763 ,0x2030 ,0x81 ,3 ),/* M-Audio Fast Track C400 */ +IMPLICIT_FB_FIXED_DEV (0x0763 ,0x2031 ,0x81 ,3 ),/* M-Audio Fast Track C600 */ IMPLICIT_FB_FIXED_DEV (0x0763 ,0x2080 ,0x81 ,2 ),/* M-Audio FastTrack Ultra */ IMPLICIT_FB_FIXED_DEV (0x0763 ,0x2081 ,0x81 ,2 ),/* M-Audio FastTrack Ultra */ IMPLICIT_FB_FIXED_DEV (0x2466 ,0x8010 ,0x81 ,2 ),/* Fractal Audio Axe-Fx III */
Greg Kroah-Hartman
maintainerPATCH 9/240 ALSA: hda/realtek: Add another HP ZBook G9 model quirks
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit f86bfeb689f2c4ebe12782ef0578ef778fb1a050 upstream.
HP ZBook Firefly 16 G9 (103c:896d) and HP ZBook Power 15.6 G9 (103c:89c0) require the same quirk for enabling CS35L41 speaker amps.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9333,6 +9333,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8898 ,"HP EliteBook 845 G8 Notebook PC" ,ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x103c ,0x88d0 ,"HP Pavilion 15-eh1xxx (mainboard 88D0)" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8902 ,"HP OMEN 16" ,ALC285_FIXUP_HP_MUTE_LED ), +SND_PCI_QUIRK (0x103c ,0x896d ,"HP ZBook Firefly 16 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x896e ,"HP EliteBook x360 830 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8971 ,"HP EliteBook 830 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8972, "HP EliteBook 840 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -9351,6 +9352,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x89aa ,"HP EliteBook 630 G9" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x89ac ,"HP EliteBook 640 G9" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x89ae ,"HP EliteBook 650 G9" ,ALC236_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x89c0 ,"HP ZBook Power 15.6 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x89c3 ,"Zbook Studio G9" ,ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x89c6 ,"Zbook Fury 17 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
Greg Kroah-Hartman
maintainerPATCH 10/240 ALSA: control: add snd_ctl_rename()
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
commit 966f015fe4329199cc49084ee2886cfb626b34d3 upstream.
Add a snd_ctl_rename() function that takes care of updating the control hash entries for callers that already have the relevant struct snd_kcontrol at hand and hold the control write lock (or simply haven't registered the card yet).
--- include/sound/control.h | 1 + sound/core/control.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)
include/sound/control.h +1 -0
@@ -138,6 +138,7 @@ int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);int snd_ctl_replace (struct snd_card *card,struct snd_kcontrol *kcontrol,bool add_on_replace);int snd_ctl_remove_id (struct snd_card * card,struct snd_ctl_elem_id *id);int snd_ctl_rename_id (struct snd_card * card,struct snd_ctl_elem_id *src_id,struct snd_ctl_elem_id *dst_id); +void snd_ctl_rename (struct snd_card *card,struct snd_kcontrol *kctl,const char *name);int snd_ctl_activate_id (struct snd_card *card,struct snd_ctl_elem_id *id,int active);struct snd_kcontrol *snd_ctl_find_numid (struct snd_card * card,unsigned int numid);struct snd_kcontrol *snd_ctl_find_id (struct snd_card * card,struct snd_ctl_elem_id *id);
sound/core/control.c +23 -0
@@ -753,6 +753,29 @@ int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id, }EXPORT_SYMBOL (snd_ctl_rename_id); +/** +* snd_ctl_rename - rename the control on the card +* @card: the card instance +* @kctl: the control to rename +* @name: the new name +* +* Renames the specified control on the card to the new name. +* +* Make sure to take the control write lock - down_write(&card->controls_rwsem). +*/ +void snd_ctl_rename (struct snd_card *card,struct snd_kcontrol *kctl, +const char *name) +{ +remove_hash_entries (card, kctl); + +if (strscpy (kctl->id.name, name,sizeof (kctl->id.name)) <0 ) +pr_warn ("ALSA: Renamed control new name '%s' truncated to '%s'\n" , + name, kctl->id.name); + +add_hash_entries (card, kctl); +} +EXPORT_SYMBOL (snd_ctl_rename); +#ifndef CONFIG_SND_CTL_FAST_LOOKUP static struct snd_kcontrol *snd_ctl_find_numid_slow (struct snd_card *card,unsigned int numid)
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 11/240 ALSA: hda/realtek: Use snd_ctl_rename() to rename a control
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
commit b51c225376a684d02fb58b49cf0ce3d693b6f14b upstream.
With the recent addition of hashed controls lookup it's not enough to just update the control name field, the hash entries for the modified control have to be updated too.
snd_ctl_rename() takes care of that, so use it instead of directly modifying the control name.
--- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +1 -1
@@ -2141,7 +2141,7 @@ static void rename_ctl(struct hda_codec kctl =snd_hda_find_mixer_ctl (codec, oldname);if (kctl) -strcpy (kctl->id.name, newname); +snd_ctl_rename (codec->card, kctl, newname); } static void alc1220_fixup_gb_dual_codecs(struct hda_codec *codec,
Greg Kroah-Hartman
maintainerPATCH 12/240 ALSA: emu10k1: Use snd_ctl_rename() to rename a control
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
commit 36476b81b2b5db1de5adb8ced1f71b8972a9d4dd upstream.
With the recent addition of hashed controls lookup it's not enough to just update the control name field, the hash entries for the modified control have to be updated too.
snd_ctl_rename() takes care of that, so use it instead of directly modifying the control name.
--- sound/pci/emu10k1/emumixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/emu10k1/emumixer.c +1 -1
@@ -1767,7 +1767,7 @@ static int rename_ctl(struct snd_card *card, const char *src, const char *dst) {struct snd_kcontrol *kctl =ctl_find (card, src);if (kctl) { -strcpy (kctl->id.name, dst); +snd_ctl_rename (card, kctl, dst);return 0 ; }return -ENOENT ;
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 13/240 ALSA: ac97: Use snd_ctl_rename() to rename a control
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
commit 52d256cc71f546f67037100c64eb4fa3ae5e4704 upstream.
With the recent addition of hashed controls lookup it's not enough to just update the control name field, the hash entries for the modified control have to be updated too.
snd_ctl_rename() takes care of that, so use it instead of directly modifying the control name.
While we are at it, check also that the new control name doesn't accidentally overwrite the available buffer space.
--- sound/pci/ac97/ac97_codec.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
sound/pci/ac97/ac97_codec.c +24 -8
@@ -2655,11 +2655,18 @@ EXPORT_SYMBOL(snd_ac97_resume);*/ static void set_ctl_name (char *dst,const char *src,const char *suffix) { -if (suffix) -sprintf (dst,"%s %s" , src, suffix); -else -strcpy (dst, src); -} +const size_t msize =SNDRV_CTL_ELEM_ID_NAME_MAXLEN ; + +if (suffix) { +if (snprintf (dst, msize,"%s %s" , src, suffix) >= msize) +pr_warn ("ALSA: AC97 control name '%s %s' truncated to '%s'\n" , + src, suffix, dst); + }else { +if (strscpy (dst, src, msize) <0 ) +pr_warn ("ALSA: AC97 control name '%s' truncated to '%s'\n" , + src, dst); + } +}/* remove the control with the given name and optional suffix */ static int snd_ac97_remove_ctl(struct snd_ac97 *ac97, const char *name,
@@ -2686,8 +2693,11 @@ static int snd_ac97_rename_ctl(struct sn const char *dst, const char *suffix) { struct snd_kcontrol *kctl = ctl_find(ac97, src, suffix); +char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ]; +if (kctl) { -set_ctl_name (kctl->id.name, dst, suffix); +set_ctl_name (name, dst, suffix); +snd_ctl_rename (ac97->bus->card, kctl, name);return 0 ; }return -ENOENT ;
@@ -2706,11 +2716,17 @@ static int snd_ac97_swap_ctl(struct snd_ const char *s2, const char *suffix) { struct snd_kcontrol *kctl1, *kctl2; +char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ]; + kctl1 =ctl_find (ac97, s1, suffix); kctl2 =ctl_find (ac97, s2, suffix);if (kctl1 && kctl2) { -set_ctl_name (kctl1->id.name, s2, suffix); -set_ctl_name (kctl2->id.name, s1, suffix); +set_ctl_name (name, s2, suffix); +snd_ctl_rename (ac97->bus->card, kctl1, name); + +set_ctl_name (name, s1, suffix); +snd_ctl_rename (ac97->bus->card, kctl2, name); +return 0 ; }return -ENOENT ;
Greg Kroah-Hartman
maintainerPATCH 14/240 ALSA: usb-audio: Use snd_ctl_rename() to rename a control
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
commit 0b4f0debb34754002cee295441c9ca89ba8cdfcc upstream.
With the recent addition of hashed controls lookup it's not enough to just update the control name field, the hash entries for the modified control have to be updated too.
snd_ctl_rename() takes care of that, so use it instead of directly modifying the control name.
--- sound/usb/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/mixer.c +1 -1
@@ -1631,7 +1631,7 @@ static void check_no_speaker_on_headset(struct snd_kcontrol *kctl,if (!found)return ; -strscpy (kctl->id.name,"Headphone" ,sizeof (kctl->id.name)); +snd_ctl_rename (card, kctl,"Headphone" ); }static const struct usb_feature_control_info *get_feature_control_info (int control)
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 15/240 ALSA: ca0106: Use snd_ctl_rename() to rename a control
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
commit 957ccc434c398a88a332ae92d70790c186a18a1c upstream.
With the recent addition of hashed controls lookup it's not enough to just update the control name field, the hash entries for the modified control have to be updated too.
snd_ctl_rename() takes care of that, so use it instead of directly modifying the control name.
--- sound/pci/ca0106/ca0106_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/ca0106/ca0106_mixer.c +1 -1
@@ -720,7 +720,7 @@ static int rename_ctl(struct snd_card *card, const char *src, const char *dst) {struct snd_kcontrol *kctl =ctl_find (card, src);if (kctl) { -strcpy (kctl->id.name, dst); +snd_ctl_rename (card, kctl, dst);return 0 ; }return -ENOENT ;
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 16/240 ALSA: au88x0: use explicitly signed char
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit ee03c0f200eb0d9f22dd8732d9fb7956d91019c2 upstream.
With char becoming unsigned by default, and with char alone being ambiguous and based on architecture, signed chars need to be marked explicitly as such. This fixes warnings like:
sound/pci/au88x0/au88x0_core.c:2029 vortex_adb_checkinout() warn: signedness bug returning '(-22)' sound/pci/au88x0/au88x0_core.c:2046 vortex_adb_checkinout() warn: signedness bug returning '(-12)' sound/pci/au88x0/au88x0_core.c:2125 vortex_adb_allocroute() warn: 'vortex_adb_checkinout(vortex, (0), en, 0)' is unsigned sound/pci/au88x0/au88x0_core.c:2170 vortex_adb_allocroute() warn: 'vortex_adb_checkinout(vortex, stream->resources, en, 4)' is unsigned
As well, since one function returns errnos, return an int rather than a signed char.
--- sound/pci/au88x0/au88x0.h | 6 +++--- sound/pci/au88x0/au88x0_core.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
sound/pci/au88x0/au88x0.h +3 -3
@@ -141,7 +141,7 @@ struct snd_vortex {#ifndef CHIP_AU8810 stream_t dma_wt[NR_WT ];wt_voice_t wt_voice[NR_WT ];/* WT register cache. */ -char mixwt[(NR_WT /NR_WTPB ) *6 ];/* WT mixin objects */ +s8 mixwt[(NR_WT /NR_WTPB ) *6 ];/* WT mixin objects */ #endif /* Global resources */
@@ -235,8 +235,8 @@ static int vortex_alsafmt_aspfmt(snd_pcmstatic void vortex_connect_default (vortex_t * vortex,int en);static int vortex_adb_allocroute (vortex_t * vortex,int dma,int nr_ch,int dir,int type,int subdev); -static char vortex_adb_checkinout (vortex_t * vortex,int resmap[],int out, -int restype); +static int vortex_adb_checkinout (vortex_t * vortex,int resmap[],int out, +int restype);#ifndef CHIP_AU8810 static int vortex_wt_allocroute (vortex_t * vortex,int dma,int nr_ch);static void vortex_wt_connect (vortex_t * vortex,int en);
sound/pci/au88x0/au88x0_core.c +1 -1
@@ -1998,7 +1998,7 @@ static const int resnum[VORTEX_RESOURCE_out: Mean checkout if != 0. Else mean Checkin resource. restype: Indicates type of resource to be checked in or out. */ -static char +static int vortex_adb_checkinout (vortex_t * vortex,int resmap[],int out,int restype) {int i, qty = resnum[restype], resinuse =0 ;
Greg Kroah-Hartman
maintainerPATCH 17/240 ALSA: rme9652: use explicitly signed char
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit 50895a55bcfde8ac6f22a37c6bc8cff506b3c7c6 upstream.
With char becoming unsigned by default, and with char alone being ambiguous and based on architecture, signed chars need to be marked explicitly as such. This fixes warnings like:
sound/pci/rme9652/hdsp.c:3953 hdsp_channel_buffer_location() warn: 'hdsp->channel_map[channel]' is unsigned sound/pci/rme9652/hdsp.c:4153 snd_hdsp_channel_info() warn: impossible condition '(hdsp->channel_map[channel] < 0) => (0-255 < 0)' sound/pci/rme9652/rme9652.c:1833 rme9652_channel_buffer_location() warn: 'rme9652->channel_map[channel]' is unsigned
--- sound/pci/rme9652/hdsp.c | 26 +++++++++++++------------- sound/pci/rme9652/rme9652.c | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-)
sound/pci/rme9652/hdsp.c +13 -13
@@ -433,7 +433,7 @@ struct hdsp_midi {struct snd_rawmidi *rmidi;struct snd_rawmidi_substream *input;struct snd_rawmidi_substream *output; -char istimer;/* timer in use */ +signed char istimer;/* timer in use */ struct timer_list timer;spinlock_t lock;int pending;
@@ -480,7 +480,7 @@ struct hdsp {pid_t playback_pid;int running;int system_sample_rate; -const char *channel_map; +const signed char *channel_map;int dev;int irq;unsigned long port;
@@ -502,7 +502,7 @@ struct hdsp {where the data for that channel can be read/written from/to. */ -static const char channel_map_df_ss[HDSP_MAX_CHANNELS ] = { +static const signed char channel_map_df_ss[HDSP_MAX_CHANNELS ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,16 ,17 ,18 ,19 ,20 ,21 ,22 ,23 ,24 ,25 };
@@ -517,7 +517,7 @@ static const char channel_map_mf_ss[HDSP-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 }; -static const char channel_map_ds[HDSP_MAX_CHANNELS ] = { +static const signed char channel_map_ds[HDSP_MAX_CHANNELS ] = {/* ADAT channels are remapped */ 1 ,3 ,5 ,7 ,9 ,11 ,13 ,15 ,17 ,19 ,21 ,23 , /* channels 12 and 13 are S/PDIF */
@@ -526,7 +526,7 @@ static const char channel_map_ds[HDSP_MA-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 }; -static const char channel_map_H9632_ss[HDSP_MAX_CHANNELS ] = { +static const signed char channel_map_H9632_ss[HDSP_MAX_CHANNELS ] = {/* ADAT channels */ 0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 , /* SPDIF */
@@ -540,7 +540,7 @@ static const char channel_map_H9632_ss[H-1 ,-1 }; -static const char channel_map_H9632_ds[HDSP_MAX_CHANNELS ] = { +static const signed char channel_map_H9632_ds[HDSP_MAX_CHANNELS ] = {/* ADAT */ 1 ,3 ,5 ,7 , /* SPDIF */
@@ -554,7 +554,7 @@ static const char channel_map_H9632_ds[H-1 ,-1 ,-1 ,-1 ,-1 ,-1 }; -static const char channel_map_H9632_qs[HDSP_MAX_CHANNELS ] = { +static const signed char channel_map_H9632_qs[HDSP_MAX_CHANNELS ] = {/* ADAT is disabled in this mode */ /* SPDIF */ 8, 9,
@@ -3939,7 +3939,7 @@ static snd_pcm_uframes_t snd_hdsp_hw_poireturn hdsp_hw_pointer (hdsp); } -static char *hdsp_channel_buffer_location (struct hdsp *hdsp, +static signed char *hdsp_channel_buffer_location (struct hdsp *hdsp,int stream,int channel)
@@ -3964,7 +3964,7 @@ static int snd_hdsp_playback_copy(struct void __user *src, unsigned long count) {struct hdsp *hdsp =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf;if (snd_BUG_ON (pos + count >HDSP_CHANNEL_BUFFER_BYTES ))return -EINVAL ;
@@ -3982,7 +3982,7 @@ static int snd_hdsp_playback_copy_kernel void *src, unsigned long count) {struct hdsp *hdsp =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf; channel_buf =hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);if (snd_BUG_ON (!channel_buf))
@@ -3996,7 +3996,7 @@ static int snd_hdsp_capture_copy(struct void __user *dst, unsigned long count) {struct hdsp *hdsp =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf;if (snd_BUG_ON (pos + count >HDSP_CHANNEL_BUFFER_BYTES ))return -EINVAL ;
@@ -4014,7 +4014,7 @@ static int snd_hdsp_capture_copy_kernel( void *dst, unsigned long count) {struct hdsp *hdsp =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf; channel_buf =hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);if (snd_BUG_ON (!channel_buf))
@@ -4028,7 +4028,7 @@ static int snd_hdsp_hw_silence(struct sn unsigned long count) {struct hdsp *hdsp =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf; channel_buf =hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);if (snd_BUG_ON (!channel_buf))
sound/pci/rme9652/rme9652.c +11 -11
@@ -230,7 +230,7 @@ struct snd_rme9652 {int last_spdif_sample_rate;/* so that we can catch externally ... */ int last_adat_sample_rate;/* ... induced rate changes */ -const char *channel_map; +const signed char *channel_map;struct snd_card *card;struct snd_pcm *pcm;
@@ -247,12 +247,12 @@ struct snd_rme9652 {where the data for that channel can be read/written from/to. */ -static const char channel_map_9652_ss[26 ] = { +static const signed char channel_map_9652_ss[26 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,16 ,17 ,18 ,19 ,20 ,21 ,22 ,23 ,24 ,25 }; -static const char channel_map_9636_ss[26 ] = { +static const signed char channel_map_9636_ss[26 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,/* channels 16 and 17 are S/PDIF */ 24 ,25 ,
@@ -260,7 +260,7 @@ static const char channel_map_9636_ss[26-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 }; -static const char channel_map_9652_ds[26 ] = { +static const signed char channel_map_9652_ds[26 ] = {/* ADAT channels are remapped */ 1 ,3 ,5 ,7 ,9 ,11 ,13 ,15 ,17 ,19 ,21 ,23 , /* channels 12 and 13 are S/PDIF */
@@ -269,7 +269,7 @@ static const char channel_map_9652_ds[26-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 }; -static const char channel_map_9636_ds[26 ] = { +static const signed char channel_map_9636_ds[26 ] = {/* ADAT channels are remapped */ 1 ,3 ,5 ,7 ,9 ,11 ,13 ,15 , /* channels 8 and 9 are S/PDIF */
@@ -1819,7 +1819,7 @@ static snd_pcm_uframes_t snd_rme9652_hw_return rme9652_hw_pointer (rme9652); } -static char *rme9652_channel_buffer_location (struct snd_rme9652 *rme9652, +static signed char *rme9652_channel_buffer_location (struct snd_rme9652 *rme9652,int stream,int channel)
@@ -1847,7 +1847,7 @@ static int snd_rme9652_playback_copy(str void __user *src, unsigned long count) {struct snd_rme9652 *rme9652 =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf;if (snd_BUG_ON (pos + count >RME9652_CHANNEL_BUFFER_BYTES ))return -EINVAL ;
@@ -1867,7 +1867,7 @@ static int snd_rme9652_playback_copy_ker void *src, unsigned long count) {struct snd_rme9652 *rme9652 =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf; channel_buf = rme9652_channel_buffer_location(rme9652, substream->pstr->stream,
@@ -1883,7 +1883,7 @@ static int snd_rme9652_capture_copy(stru void __user *dst, unsigned long count) {struct snd_rme9652 *rme9652 =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf;if (snd_BUG_ON (pos + count >RME9652_CHANNEL_BUFFER_BYTES ))return -EINVAL ;
@@ -1903,7 +1903,7 @@ static int snd_rme9652_capture_copy_kern void *dst, unsigned long count) {struct snd_rme9652 *rme9652 =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf; channel_buf = rme9652_channel_buffer_location(rme9652, substream->pstr->stream,
@@ -1919,7 +1919,7 @@ static int snd_rme9652_hw_silence(struct unsigned long count) {struct snd_rme9652 *rme9652 =snd_pcm_substream_chip (substream); -char *channel_buf; +signed char *channel_buf; channel_buf = rme9652_channel_buffer_location (rme9652, substream->pstr->stream,
Greg Kroah-Hartman
maintainerPATCH 18/240 USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM
In reply to Greg Kroah-HartmanFrom: Hannu Hartikainen <[email protected]>
commit fc4ade55c617dc73c7e9756b57f3230b4ff24540 upstream.
NVIDIA Jetson devices in Force Recovery mode (RCM) do not support suspending, ie. flashing fails if the device has been suspended. The devices are still visible in lsusb and seem to work otherwise, making the issue hard to debug. This has been discovered in various forum posts, eg. [1].
The patch has been tested on NVIDIA Jetson AGX Xavier, but I'm adding all the Jetson models listed in [2] on the assumption that they all behave similarly.
[1]: https://forums.developer.nvidia.com/t/flashing-not-working/72365
[2]: https://docs.nvidia.com/jetson/archives/l4t-archived/l4t-3271/index.html#page/Tegra%20Linux%20Driver%20Package%20Development%20Guide/quick_start.html
--- drivers/usb/core/quirks.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/core/quirks.c +9 -0
@@ -388,6 +388,15 @@ static const struct usb_device_id usb_quirk_list[] = {/* Kingston DataTraveler 3.0 */ { USB_DEVICE(0x0951, 0x1666), .driver_info = USB_QUIRK_NO_LPM }, + /* NVIDIA Jetson devices in Force Recovery mode */ + { USB_DEVICE(0x0955, 0x7018), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x0955, 0x7019), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x0955, 0x7418), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x0955, 0x7721), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x0955, 0x7c18), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x0955, 0x7e19), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x0955, 0x7f21), .driver_info = USB_QUIRK_RESET_RESUME }, + /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */ { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 19/240 usb: gadget: uvc: limit isoc_sg to super speed gadgets
In reply to Greg Kroah-HartmanFrom: Michael Grzeschik <[email protected]>
commit 19905240aef0181d1e6944070eb85fce75f75bcd upstream.
The overhead of preparing sg data is high for transfers with limited payload. When transferring isoc over high-speed usb the maximum payload is rather small which is a good argument no to use sg. This patch is changing the uvc_video_encode_isoc_sg encode function only to be used for super speed gadgets.
--- drivers/usb/gadget/function/uvc_queue.c | 9 +++------ drivers/usb/gadget/function/uvc_video.c | 9 +++++++-- 2 files changed, 10 insertions(+), 8 deletions(-)
drivers/usb/gadget/function/uvc_queue.c +3 -6
@@ -84,12 +84,9 @@ static int uvc_buffer_prepare(struct vb2return -ENODEV ; buf->state =UVC_BUF_STATE_QUEUED ; -if (queue->use_sg) { - buf->sgt =vb2_dma_sg_plane_desc (vb,0 ); - buf->sg = buf->sgt->sgl; - }else { - buf->mem =vb2_plane_vaddr (vb,0 ); - } + buf->sgt =vb2_dma_sg_plane_desc (vb,0 ); + buf->sg = buf->sgt->sgl; + buf->mem =vb2_plane_vaddr (vb,0 ); buf->length =vb2_plane_size (vb,0 );if (vb->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE ) buf->bytesused =0 ;
drivers/usb/gadget/function/uvc_video.c +7 -2
@@ -448,6 +448,9 @@ static void uvcg_video_pump(struct work_*/ int uvcg_video_enable (struct uvc_video *video,int enable) { +struct uvc_device *uvc = video->uvc; +struct usb_composite_dev *cdev = uvc->func.config->cdev; +struct usb_gadget *gadget = cdev->gadget;unsigned int i;int ret;
@@ -479,9 +482,11 @@ int uvcg_video_enable(struct uvc_video *if (video->max_payload_size) { video->encode = uvc_video_encode_bulk; video->payload_size =0 ; - }else - video->encode = video->queue.use_sg ? + }else { + video->encode = (video->queue.use_sg && + !(gadget->speed <=USB_SPEED_HIGH )) ? uvc_video_encode_isoc_sg : uvc_video_encode_isoc; + } video->req_int_count =0 ;
Greg Kroah-Hartman
maintainerPATCH 20/240 Revert "usb: gadget: uvc: limit isoc_sg to super speed gadgets"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 88c8e05ed5c0f05a637e654bbe4e49a1ebe7013c upstream.
This reverts commit 19905240aef0181d1e6944070eb85fce75f75bcd.
It was a new feature, and it doesn't even work properly yet, so revert it from this branch as it is not needed for 6.1-final.
--- drivers/usb/gadget/function/uvc_queue.c | 9 ++++++--- drivers/usb/gadget/function/uvc_video.c | 9 ++------- 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/usb/gadget/function/uvc_queue.c +6 -3
@@ -84,9 +84,12 @@ static int uvc_buffer_prepare(struct vb2return -ENODEV ; buf->state =UVC_BUF_STATE_QUEUED ; - buf->sgt =vb2_dma_sg_plane_desc (vb,0 ); - buf->sg = buf->sgt->sgl; - buf->mem =vb2_plane_vaddr (vb,0 ); +if (queue->use_sg) { + buf->sgt =vb2_dma_sg_plane_desc (vb,0 ); + buf->sg = buf->sgt->sgl; + }else { + buf->mem =vb2_plane_vaddr (vb,0 ); + } buf->length =vb2_plane_size (vb,0 );if (vb->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE ) buf->bytesused =0 ;
drivers/usb/gadget/function/uvc_video.c +2 -7
@@ -448,9 +448,6 @@ static void uvcg_video_pump(struct work_*/ int uvcg_video_enable (struct uvc_video *video,int enable) { -struct uvc_device *uvc = video->uvc; -struct usb_composite_dev *cdev = uvc->func.config->cdev; -struct usb_gadget *gadget = cdev->gadget;unsigned int i;int ret;
@@ -482,11 +479,9 @@ int uvcg_video_enable(struct uvc_video *if (video->max_payload_size) { video->encode = uvc_video_encode_bulk; video->payload_size =0 ; - }else { - video->encode = (video->queue.use_sg && - !(gadget->speed <=USB_SPEED_HIGH )) ? + }else + video->encode = video->queue.use_sg ? uvc_video_encode_isoc_sg : uvc_video_encode_isoc; - } video->req_int_count =0 ;
Greg Kroah-Hartman
maintainerPATCH 21/240 usb: gadget: uvc: fix dropped frame after missed isoc
In reply to Greg Kroah-HartmanFrom: Dan Vacura <[email protected]>
commit 8e8e923a49967b798e7d69f1ce9eff1dd2533547 upstream.
With the re-use of the previous completion status in 0d1c407b1a749 ("usb: dwc3: gadget: Return proper request status") it could be possible that the next frame would also get dropped if the current frame has a missed isoc error. Ensure that an interrupt is requested for the start of a new frame.
--- drivers/usb/gadget/function/uvc_video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/function/uvc_video.c +2 -1
@@ -431,7 +431,8 @@ static void uvcg_video_pump(struct work_/* Endpoint now owns the request */ req =NULL ; - video->req_int_count++; +if (buf->state !=UVC_BUF_STATE_DONE ) + video->req_int_count++; }if (!req)
Greg Kroah-Hartman
maintainerPATCH 22/240 usb: gadget: uvc: fix sg handling in error case
In reply to Greg Kroah-HartmanFrom: Dan Vacura <[email protected]>
commit 0a0a2760b04814428800d48281a447a7522470ad upstream.
If there is a transmission error the buffer will be returned too early, causing a memory fault as subsequent requests for that buffer are still queued up to be sent. Refactor the error handling to wait for the final request to come in before reporting back the buffer to userspace for all transfer types (bulk/isoc/isoc_sg). This ensures userspace knows if the frame was successfully sent.
--- drivers/usb/gadget/function/uvc_queue.c | 8 +++++--- drivers/usb/gadget/function/uvc_video.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-)
drivers/usb/gadget/function/uvc_queue.c +5 -3
@@ -304,6 +304,7 @@ int uvcg_queue_enable(struct uvc_video_q queue->sequence =0 ; queue->buf_used =0 ; + queue->flags &= ~UVC_QUEUE_DROP_INCOMPLETE ; }else { ret =vb2_streamoff (&queue->queue, queue->queue.type);if (ret <0 )
@@ -329,10 +330,11 @@ int uvcg_queue_enable(struct uvc_video_qvoid uvcg_complete_buffer (struct uvc_video_queue *queue,struct uvc_buffer *buf) { -if ((queue->flags &UVC_QUEUE_DROP_INCOMPLETE ) && - buf->length != buf->bytesused) { - buf->state =UVC_BUF_STATE_QUEUED ; +if (queue->flags &UVC_QUEUE_DROP_INCOMPLETE ) { + queue->flags &= ~UVC_QUEUE_DROP_INCOMPLETE ; + buf->state =UVC_BUF_STATE_ERROR ;vb2_set_plane_payload (&buf->buf.vb2_buf,0 ,0 ); +vb2_buffer_done (&buf->buf.vb2_buf,VB2_BUF_STATE_ERROR );return ; }
drivers/usb/gadget/function/uvc_video.c +14 -4
@@ -88,6 +88,7 @@ uvc_video_encode_bulk(struct usb_request struct uvc_buffer *buf) {void *mem = req->buf; +struct uvc_request *ureq = req->context;int len = video->req_size;int ret;
@@ -113,13 +114,14 @@ uvc_video_encode_bulk(struct usb_request video->queue.buf_used =0 ; buf->state =UVC_BUF_STATE_DONE ;list_del (&buf->queue); -uvcg_complete_buffer (&video->queue, buf); video->fid ^=UVC_STREAM_FID ; + ureq->last_buf = buf; video->payload_size =0 ; }if (video->payload_size == video->max_payload_size || + video->queue.flags &UVC_QUEUE_DROP_INCOMPLETE || buf->bytesused == video->queue.buf_used) video->payload_size =0 ; }
@@ -180,7 +182,8 @@ uvc_video_encode_isoc_sg(struct usb_requ req->length -= len; video->queue.buf_used += req->length - header_len; -if (buf->bytesused == video->queue.buf_used || !buf->sg) { +if (buf->bytesused == video->queue.buf_used || !buf->sg || + video->queue.flags &UVC_QUEUE_DROP_INCOMPLETE ) { video->queue.buf_used =0 ; buf->state =UVC_BUF_STATE_DONE ; buf->offset =0 ;
@@ -195,6 +198,7 @@ uvc_video_encode_isoc(struct usb_request struct uvc_buffer *buf) {void *mem = req->buf; +struct uvc_request *ureq = req->context;int len = video->req_size;int ret;
@@ -209,12 +213,13 @@ uvc_video_encode_isoc(struct usb_request req->length = video->req_size - len; -if (buf->bytesused == video->queue.buf_used) { +if (buf->bytesused == video->queue.buf_used || + video->queue.flags &UVC_QUEUE_DROP_INCOMPLETE ) { video->queue.buf_used =0 ; buf->state =UVC_BUF_STATE_DONE ;list_del (&buf->queue); -uvcg_complete_buffer (&video->queue, buf); video->fid ^=UVC_STREAM_FID ; + ureq->last_buf = buf; } }
@@ -255,6 +260,11 @@ uvc_video_complete(struct usb_ep *ep, stcase 0 :break ; +case -EXDEV : +uvcg_dbg (&video->uvc->func,"VS request missed xfer.\n" ); + queue->flags |=UVC_QUEUE_DROP_INCOMPLETE ; +break ; +case -ESHUTDOWN :/* disconnect from host. */ uvcg_dbg (&video->uvc->func,"VS request cancelled.\n" );uvcg_queue_cancel (queue,1 );
Greg Kroah-Hartman
maintainerPATCH 23/240 usb: gadget: uvc: fix sg handling during video encode
In reply to Greg Kroah-HartmanFrom: Jeff Vanhoof <[email protected]>
commit b57b08e6f431348363adffa5b6643fe3ec9dc7fe upstream.
In uvc_video_encode_isoc_sg, the uvc_request's sg list is incorrectly being populated leading to corrupt video being received by the remote end. When building the sg list the usage of buf->sg's 'dma_length' field is not correct and instead its 'length' field should be used.
--- drivers/usb/gadget/function/uvc_video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/uvc_video.c +2 -2
@@ -157,10 +157,10 @@ uvc_video_encode_isoc_sg(struct usb_requ sg =sg_next (sg);for_each_sg (sg, iter, ureq->sgt.nents -1 , i) { -if (!len || !buf->sg || !sg_dma_len (buf->sg)) +if (!len || !buf->sg || !buf->sg->length)break ; - sg_left =sg_dma_len (buf->sg) - buf->offset; + sg_left = buf->sg->length - buf->offset; part = min_t(unsigned int, len, sg_left);sg_set_page (iter,sg_page (buf->sg), part, buf->offset);
Greg Kroah-Hartman
maintainerPATCH 24/240 usb: gadget: aspeed: Fix probe regression
In reply to Greg Kroah-HartmanFrom: Joel Stanley <[email protected]>
commit 48ed32482c4100069d0c0eebdc6b198c6ae5f71f upstream.
Since commit fc274c1e9973 ("USB: gadget: Add a new bus for gadgets"), the gadget devices are proper driver core devices, which caused each device to request pinmux settings:
aspeed_vhub 1e6a0000.usb-vhub: Initialized virtual hub in USB2 mode
aspeed-g5-pinctrl 1e6e2080.pinctrl: pin A7 already requested by 1e6a0000.usb-vhub; cannot claim for gadget.0 aspeed-g5-pinctrl 1e6e2080.pinctrl: pin-232 (gadget.0) status -22
aspeed-g5-pinctrl 1e6e2080.pinctrl: could not request pin 232 (A7) from group USB2AD on device aspeed-g5-pinctrl g_mass_storage gadget.0: Error applying setting, reverse things back
The vhub driver has already claimed the pins, so prevent the gadgets from requesting them too by setting the magic of_node_reused flag. This causes the driver core to skip the mux request.
--- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/udc/aspeed-vhub/dev.c +1 -0
@@ -591,6 +591,7 @@ int ast_vhub_init_dev(struct ast_vhub *v d->gadget.max_speed =USB_SPEED_HIGH ; d->gadget.speed =USB_SPEED_UNKNOWN ; d->gadget.dev.of_node = vhub->pdev->dev.of_node; + d->gadget.dev.of_node_reused = true; rc =usb_add_gadget_udc (d->port_dev, &d->gadget);if (rc !=0 )
Greg Kroah-Hartman
maintainerPATCH 25/240 usb: dwc3: gadget: Stop processing more requests on IMI
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit f78961f8380b940e0cfc7e549336c21a2ad44f4d upstream.
When servicing a transfer completion event, the dwc3 driver will reclaim TRBs of started requests up to the request associated with the interrupt event. Currently we don't check for interrupt due to missed isoc, and the driver may attempt to reclaim TRBs beyond the associated event. This causes invalid memory access when the hardware still owns the TRB. If there's a missed isoc TRB with IMI (interrupt on missed isoc), make sure to stop servicing further.
Note that only the last TRB of chained TRBs has its status updated with missed isoc.
--- drivers/usb/dwc3/gadget.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/dwc3/gadget.c +4 -0
@@ -3215,6 +3215,10 @@ static int dwc3_gadget_ep_reclaim_compleif (event->status &DEPEVT_STATUS_SHORT && !chain)return 1 ; +if ((trb->ctrl &DWC3_TRB_CTRL_ISP_IMI ) && +DWC3_TRB_SIZE_TRBSTS (trb->size) ==DWC3_TRBSTS_MISSED_ISOC ) +return 1 ; +if ((trb->ctrl &DWC3_TRB_CTRL_IOC ) || (trb->ctrl &DWC3_TRB_CTRL_LST ))return 1 ;
Greg Kroah-Hartman
maintainerPATCH 26/240 usb: dwc3: gadget: Dont set IMI for no_interrupt
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 308c316d16cbad99bb834767382baa693ac42169 upstream.
The gadget driver may have a certain expectation of how the request completion flow should be from to its configuration. Make sure the controller driver respect that. That is, don't set IMI (Interrupt on Missed Isoc) when usb_request->no_interrupt is set. Also, the driver should only set IMI to the last TRB of a chain.
--- drivers/usb/dwc3/gadget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +2 -2
@@ -1277,8 +1277,8 @@ static void dwc3_prepare_one_trb(struct trb->ctrl =DWC3_TRBCTL_ISOCHRONOUS ; } -/* always enable Interrupt on Missed ISOC */ - trb->ctrl |=DWC3_TRB_CTRL_ISP_IMI ; +if (!no_interrupt && !chain) + trb->ctrl |=DWC3_TRB_CTRL_ISP_IMI ;break ;case USB_ENDPOINT_XFER_BULK :
Greg Kroah-Hartman
maintainerPATCH 27/240 usb: dwc3: gadget: Force sending delayed status during soft disconnect
In reply to Greg Kroah-HartmanFrom: Wesley Cheng <[email protected]>
commit e1ee843488d58099a89979627ef85d5bd6c5cacd upstream.
If any function drivers request for a delayed status phase, this leads to a SETUP transfer timeout error, since the function may take longer to process the DATA stage. This eventually results in end transfer timeouts, as there is a pending SETUP transaction.
In addition, allow the DWC3_EP_DELAY_STOP to be set for if there is a delayed status requested. Ocasionally, a host may abort the current SETUP transaction, by issuing a subsequent SETUP token. In those situations, it would result in an endxfer timeout as well.
--- drivers/usb/dwc3/gadget.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +4 -1
@@ -2501,6 +2501,9 @@ static int dwc3_gadget_soft_disconnect(sif (dwc->ep0state !=EP0_SETUP_PHASE ) {int ret; +if (dwc->delayed_status) +dwc3_ep0_send_delayed_status (dwc); +reinit_completion (&dwc->ep0_in_setup);spin_unlock_irqrestore (&dwc->lock, flags);
@@ -3699,7 +3702,7 @@ void dwc3_stop_active_transfer(struct dw* timeout. Delay issuing the End Transfer command until the Setup TRB is * prepared. */ -if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) { +if (dwc->ep0state !=EP0_SETUP_PHASE ) { dep->flags |=DWC3_EP_DELAY_STOP ;return ; }
Greg Kroah-Hartman
maintainerPATCH 28/240 usb: dwc3: gadget: Dont delay End Transfer on delayed_status
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 4db0fbb601361767144e712beb96704b966339f5 upstream.
The gadget driver may wait on the request completion when it sets the USB_GADGET_DELAYED_STATUS. Make sure that the End Transfer command can go through if the dwc->delayed_status is set so that the request can complete. When the delayed_status is set, the Setup packet is already processed, and the next phase should be either Data or Status. It's unlikely that the host would cancel the control transfer and send a new Setup packet during End Transfer command. But if that's the case, we can try again when ep0state returns to EP0_SETUP_PHASE.
--- drivers/usb/dwc3/gadget.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +11 -1
@@ -1683,6 +1683,16 @@ static int __dwc3_stop_active_transfer(s cmd |=DWC3_DEPCMD_PARAM (dep->resource_index);memset (¶ms,0 ,sizeof (params)); ret =dwc3_send_gadget_ep_cmd (dep, cmd, ¶ms); +/* +* If the End Transfer command was timed out while the device is +* not in SETUP phase, it's possible that an incoming Setup packet +* may prevent the command's completion. Let's retry when the +* ep0state returns to EP0_SETUP_PHASE. +*/ +if (ret == -ETIMEDOUT && dep->dwc->ep0state !=EP0_SETUP_PHASE ) { + dep->flags |=DWC3_EP_DELAY_STOP ; +return 0 ; + }WARN_ON_ONCE (ret); dep->resource_index =0 ;
@@ -3702,7 +3712,7 @@ void dwc3_stop_active_transfer(struct dw* timeout. Delay issuing the End Transfer command until the Setup TRB is * prepared. */ -if (dwc->ep0state !=EP0_SETUP_PHASE ) { +if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) { dep->flags |=DWC3_EP_DELAY_STOP ;return ; }
Greg Kroah-Hartman
maintainerPATCH 29/240 usb: typec: ucsi: Check the connection on resume
In reply to Greg Kroah-HartmanFrom: Heikki Krogerus <[email protected]>
commit 99f6d43611135bd6f211dec9e88bb41e4167e304 upstream.
Checking the connection status of every port on resume. This fixes an issue where the partner device is not unregistered properly after resume if it was unplugged while the system was suspended.
The function ucsi_check_connection() is also modified so that it can be used also for registering the connection on top of unregistering it.
--- drivers/usb/typec/ucsi/ucsi.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +29 -13
@@ -183,16 +183,6 @@ out: }EXPORT_SYMBOL_GPL (ucsi_send_command); -int ucsi_resume (struct ucsi *ucsi) -{ -u64 command; - -/* Restore UCSI notification enable mask after system resume */ - command =UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; - -return ucsi_send_command (ucsi, command,NULL ,0 ); -} -EXPORT_SYMBOL_GPL (ucsi_resume);/* -------------------------------------------------------------------------- */ struct ucsi_work {
@@ -744,6 +734,7 @@ static void ucsi_partner_change(struct ustatic int ucsi_check_connection (struct ucsi_connector *con) { +u8 prev_flags = con->status.flags;u64 command;int ret;
@@ -754,10 +745,13 @@ static int ucsi_check_connection(structreturn ret; } +if (con->status.flags == prev_flags) +return 0 ; +if (con->status.flags &UCSI_CONSTAT_CONNECTED ) { -if (UCSI_CONSTAT_PWR_OPMODE (con->status.flags) == -UCSI_CONSTAT_PWR_OPMODE_PD ) -ucsi_partner_task (con, ucsi_check_altmodes,30 ,0 ); +ucsi_register_partner (con); +ucsi_pwr_opmode_change (con); +ucsi_partner_change (con); }else {ucsi_partner_change (con);ucsi_port_psy_changed (con);
@@ -1276,6 +1270,28 @@ err:return ret; } +int ucsi_resume (struct ucsi *ucsi) +{ +struct ucsi_connector *con; +u64 command; +int ret; + +/* Restore UCSI notification enable mask after system resume */ + command =UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; + ret =ucsi_send_command (ucsi, command,NULL ,0 ); +if (ret <0 ) +return ret; + +for (con = ucsi->connector; con->port; con++) { +mutex_lock (&con->lock); +ucsi_check_connection (con); +mutex_unlock (&con->lock); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (ucsi_resume); +static void ucsi_init_work (struct work_struct *work) { struct ucsi *ucsi = container_of(work, struct ucsi, work.work);
Greg Kroah-Hartman
maintainerPATCH 30/240 usb: typec: ucsi: acpi: Implement resume callback
In reply to Greg Kroah-HartmanFrom: Heikki Krogerus <[email protected]>
commit 4e3a50293c2b21961f02e1afa2f17d3a1a90c7c8 upstream.
The ACPI driver needs to resume the interface by calling ucsi_resume(). Otherwise we may fail to detect connections and disconnections that happen while the system is suspended.
--- drivers/usb/typec/ucsi/ucsi_acpi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/typec/ucsi/ucsi_acpi.c +10 -0
@@ -185,6 +185,15 @@ static int ucsi_acpi_remove(struct platfreturn 0 ; } +static int ucsi_acpi_resume (struct device *dev) +{ +struct ucsi_acpi *ua =dev_get_drvdata (dev); + +return ucsi_resume (ua->ucsi); +} + +static DEFINE_SIMPLE_DEV_PM_OPS(ucsi_acpi_pm_ops, NULL, ucsi_acpi_resume); +static const struct acpi_device_id ucsi_acpi_match[] = { {"PNP0CA0" ,0 }, { },
@@ -194,6 +203,7 @@ MODULE_DEVICE_TABLE(acpi, ucsi_acpi_matcstatic struct platform_driver ucsi_acpi_platform_driver = { .driver = { .name ="ucsi_acpi" , + .pm =pm_ptr (&ucsi_acpi_pm_ops), .acpi_match_table =ACPI_PTR (ucsi_acpi_match), }, .probe = ucsi_acpi_probe,
Greg Kroah-Hartman
maintainerPATCH 31/240 usb: dwc3: st: Rely on childs compatible instead of name
In reply to Greg Kroah-HartmanFrom: Patrice Chotard <[email protected]>
commit 3f53c329b31d53b2a2e7992819242fc0d4f883e0 upstream.
To ensure that child node is found, don't rely on child's node name which can take different value, but on child's compatible name.
--- drivers/usb/dwc3/dwc3-st.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-st.c +1 -1
@@ -251,7 +251,7 @@ static int st_dwc3_probe(struct platform/* Manage SoftReset */ reset_control_deassert (dwc3_data->rstc_rst); - child =of_get_child_by_name (node,"usb" ); + child =of_get_compatible_child (node,"snps,dwc3" );if (!child) {dev_err (&pdev->dev,"failed to find dwc3 core node\n" ); ret = -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 32/240 usb: dwc3: Dont switch OTG -> peripheral if extcon is present
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
commit d182c2e1bc92084c038b44c618f29589a4de9f66 upstream.
If the extcon device exists, get the mode from the extcon device. If the controller is DRD and the driver is unable to determine the mode, only then default the dr_mode to USB_DR_MODE_PERIPHERAL.
--- drivers/usb/dwc3/core.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- drivers/usb/dwc3/drd.c | 50 ------------------------------------------------ 2 files changed, 48 insertions(+), 51 deletions(-)
drivers/usb/dwc3/core.c +48 -1
@@ -23,6 +23,7 @@#include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/of.h> +#include <linux/of_graph.h> #include <linux/acpi.h> #include <linux/pinctrl/consumer.h> #include <linux/reset.h>
@@ -85,7 +86,7 @@ static int dwc3_get_dr_mode(struct dwc3* mode. If the controller supports DRD but the dr_mode is not * specified or set to OTG, then set the mode to peripheral. */ -if (mode ==USB_DR_MODE_OTG && +if (mode ==USB_DR_MODE_OTG && !dwc->edev && (!IS_ENABLED (CONFIG_USB_ROLE_SWITCH ) || !device_property_read_bool (dwc->dev,"usb-role-switch" )) && !DWC3_VER_IS_PRIOR(DWC3, 330A))
@@ -1690,6 +1691,46 @@ static void dwc3_check_params(struct dwc } } +static struct extcon_dev *dwc3_get_extcon (struct dwc3 *dwc) +{ +struct device *dev = dwc->dev; +struct device_node *np_phy; +struct extcon_dev *edev =NULL ; +const char *name; + +if (device_property_read_bool (dev,"extcon" )) +return extcon_get_edev_by_phandle (dev,0 ); + +/* +* Device tree platforms should get extcon via phandle. +* On ACPI platforms, we get the name from a device property. +* This device property is for kernel internal use only and +* is expected to be set by the glue code. +*/ +if (device_property_read_string (dev,"linux,extcon-name" , &name) ==0 ) +return extcon_get_extcon_dev (name); + +/* +* Try to get an extcon device from the USB PHY controller's "port" +* node. Check if it has the "port" node first, to avoid printing the +* error message from underlying code, as it's a valid case: extcon +* device (and "port" node) may be missing in case of "usb-role-switch" +* or OTG mode. +*/ + np_phy =of_parse_phandle (dev->of_node,"phys" ,0 ); +if (of_graph_is_present (np_phy)) { +struct device_node *np_conn; + + np_conn =of_graph_get_remote_node (np_phy,-1 ,-1 ); +if (np_conn) + edev =extcon_find_edev_by_node (np_conn); +of_node_put (np_conn); + } +of_node_put (np_phy); + +return edev; +} +static int dwc3_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -1840,6 +1881,12 @@ static int dwc3_probe(struct platform_de goto err2; } + dwc->edev =dwc3_get_extcon (dwc); +if (IS_ERR (dwc->edev)) { + ret =dev_err_probe (dwc->dev,PTR_ERR (dwc->edev),"failed to get extcon\n" ); + goto err3; + } + ret =dwc3_get_dr_mode (dwc);if (ret) goto err3;
drivers/usb/dwc3/drd.c +0 -50
68 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 33/240 usb: bdc: change state when port disconnected
In reply to Greg Kroah-HartmanFrom: Justin Chen <[email protected]>
commit fb8f60dd1b67520e0e0d7978ef17d015690acfc1 upstream.
When port is connected and then disconnected, the state stays as configured. Which is incorrect as the port is no longer configured, but in a not attached state.
--- drivers/usb/gadget/udc/bdc/bdc_udc.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/udc/bdc/bdc_udc.c +1 -0
@@ -151,6 +151,7 @@ static void bdc_uspc_disconnected(struct bdc->delayed_status = false; bdc->reinit = reinit; bdc->test_mode = false; +usb_gadget_set_state (&bdc->gadget,USB_STATE_NOTATTACHED ); }/* TNotify wkaeup timer */
Greg Kroah-Hartman
maintainerPATCH 34/240 usb: xhci: add XHCI_SPURIOUS_SUCCESS to ASM1042 despite being a V0.96 controller
In reply to Greg Kroah-HartmanFrom: Jens Glathe <[email protected]>
commit 4f547472380136718b56064ea5689a61e135f904 upstream.
This appears to fix the error:
"xhci_hcd <address>; ERROR Transfer event TRB DMA ptr not part of current TD ep_index 2 comp_code 13" that appear spuriously (or pretty often) when using a r8152 USB3 ethernet adapter with integrated hub.
ASM1042 reports as a 0.96 controller, but appears to behave more like 1.0
Inspired by this email thread: https://markmail.org/thread/7vzqbe7t6du6qsw3
--- drivers/usb/host/xhci-pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +7 -1
@@ -306,8 +306,14 @@ static void xhci_pci_quirks(struct devic }if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && - pdev->device ==PCI_DEVICE_ID_ASMEDIA_1042_XHCI ) + pdev->device ==PCI_DEVICE_ID_ASMEDIA_1042_XHCI ) { +/* +* try to tame the ASMedia 1042 controller which reports 0.96 +* but appears to behave more like 1.0 +*/ + xhci->quirks |=XHCI_SPURIOUS_SUCCESS ; xhci->quirks |=XHCI_BROKEN_STREAMS ; + }if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && pdev->device ==PCI_DEVICE_ID_ASMEDIA_1042A_XHCI ) { xhci->quirks |=XHCI_TRUST_TX_LENGTH ;
Greg Kroah-Hartman
maintainerPATCH 35/240 mtd: rawnand: tegra: Fix PM disable depth imbalance in probe
In reply to Greg Kroah-HartmanFrom: Zhang Qilong <[email protected]>
commit 3ada71310d2c68eebb57772df6bb1f5f033ae802 upstream.
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context.
--- drivers/mtd/nand/raw/tegra_nand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/tegra_nand.c +3 -1
@@ -1181,7 +1181,7 @@ static int tegra_nand_probe(struct platfpm_runtime_enable (&pdev->dev); err =pm_runtime_resume_and_get (&pdev->dev);if (err) -return err; + goto err_dis_pm; err =reset_control_reset (rst);if (err) {
@@ -1215,6 +1215,8 @@ static int tegra_nand_probe(struct platf err_put_pm:pm_runtime_put_sync_suspend (ctrl->dev);pm_runtime_force_suspend (ctrl->dev); +err_dis_pm: +pm_runtime_disable (&pdev->dev);return err; }
Greg Kroah-Hartman
maintainerPATCH 36/240 mtd: spi-nor: core: Ignore -ENOTSUPP in spi_nor_init()
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 69d04ca999499bccb6ca849fa2bfc5e6448f7233 upstream.
The Intel SPI-NOR controller does not support the 4-byte address opcode so ->set_4byte_addr_mode() ends up returning -ENOTSUPP and the SPI flash chip probe fail like this:
[ 12.291082] spi-nor: probe of spi0.0 failed with error -524
Whereas previously before commit 08412e72afba ("mtd: spi-nor: core:
Return error code from set_4byte_addr_mode()") it worked just fine.
Fix this by ignoring -ENOTSUPP in spi_nor_init().
--- drivers/mtd/spi-nor/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +3 -1
@@ -2724,7 +2724,9 @@ static int spi_nor_init(struct spi_nor **/ WARN_ONCE (nor->flags &SNOR_F_BROKEN_RESET ,"enabling reset hack; may not recover from unexpected reboots\n" ); -return nor->params->set_4byte_addr_mode (nor, true); + err = nor->params->set_4byte_addr_mode (nor, true); +if (err && err != -ENOTSUPP ) +return err; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 37/240 mtd: parsers: bcm47xxpart: Fix halfblock reads
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
commit 05e258c6ec669d6d18c494ea03d35962d6f5b545 upstream.
There is some code in the parser that tries to read 0x8000 bytes into a block to "read in the middle" of the block. Well that only works if the block is also 0x10000 bytes all the time, else we get these parse errors as we reach the end of the flash:
spi-nor spi0.0: mx25l1606e (2048 Kbytes) mtd_read error while parsing (offset: 0x200000): -22 mtd_read error while parsing (offset: 0x201000): -22 (...)
Fix the code to do what I think was intended.
--- drivers/mtd/parsers/bcm47xxpart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/parsers/bcm47xxpart.c +2 -2
@@ -233,11 +233,11 @@ static int bcm47xxpart_parse(struct mtd_ }/* Read middle of the block */ - err =mtd_read (master, offset +0x8000 ,0x4 , &bytes_read, + err =mtd_read (master, offset + (blocksize /2 ),0x4 , &bytes_read, (uint8_t *)buf);if (err && !mtd_is_bitflip (err)) {pr_err ("mtd_read error while parsing (offset: 0x%X): %d\n" , - offset +0x8000 , err); + offset + (blocksize /2 ), err);continue ; }
Greg Kroah-Hartman
maintainerPATCH 38/240 mtd: rawnand: marvell: Use correct logic for nand-keep-config
In reply to Greg Kroah-HartmanFrom: Tony O'Brien <[email protected]>
commit ce107713b722af57c4b7f2477594d445b496420e upstream.
Originally the absence of the marvell,nand-keep-config property caused the setup_data_interface function to be provided. However when setup_data_interface was moved into nand_controller_ops the logic was unintentionally inverted. Update the logic so that only if the marvell,nand-keep-config property is present the bootloader NAND config kept.
--- drivers/mtd/nand/raw/marvell_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/marvell_nand.c +1 -1
@@ -2672,7 +2672,7 @@ static int marvell_nand_chip_init(struct chip->controller = &nfc->controller;nand_set_flash_node (chip, np); -if (!of_property_read_bool (np,"marvell,nand-keep-config" )) +if (of_property_read_bool (np,"marvell,nand-keep-config" )) chip->options |=NAND_KEEP_TIMINGS ; mtd =nand_to_mtd (chip);
Greg Kroah-Hartman
maintainerPATCH 39/240 squashfs: fix read regression introduced in readahead code
In reply to Greg Kroah-HartmanFrom: Phillip Lougher <[email protected]>
commit 9ef8eb6104527bfe9ed31f7a4ffa721390adf9a8 upstream.
Patch series "squashfs: fix some regressions introduced in the readahead code".
This patchset fixes 3 regressions introduced by the recent readahead code changes. The first regression is causing "snaps" to randomly fail after a couple of hours or days, which how the regression came to light.
This patch (of 3):
If a file isn't a whole multiple of the page size, the last page will have trailing bytes unfilled.
There was a mistake in the readahead code which did this. In particular it incorrectly assumed that the last page in the readahead page array (page[nr_pages - 1]) will always contain the last page in the block, which if we're at file end, will be the page that needs to be zero filled.
But the readahead code may not return the last page in the block, which means it is unmapped and will be skipped by the decompressors (a temporary buffer used).
In this case the zero filling code will zero out the wrong page, leading to data corruption.
Fix this by by extending the "page actor" to return the last page if present, or NULL if a temporary buffer was used.
--- fs/squashfs/file.c | 7 ++++--- fs/squashfs/page_actor.c | 3 +++ fs/squashfs/page_actor.h | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-)
fs/squashfs/file.c +4 -3
@@ -557,6 +557,7 @@ static void squashfs_readahead(struct reint res, bsize;u64 block =0 ;unsigned int expected; +struct page *last_page; nr_pages =__readahead_batch (ractl, pages, max_pages);if (!nr_pages)
@@ -593,15 +594,15 @@ static void squashfs_readahead(struct re res =squashfs_read_data (inode->i_sb, block, bsize,NULL , actor); -squashfs_page_actor_free (actor); + last_page =squashfs_page_actor_free (actor);if (res == expected) {int bytes;/* Last page (if present) may have trailing bytes not filled */ bytes = res %PAGE_SIZE ; -if (pages[nr_pages -1 ]->index == file_end && bytes) -memzero_page (pages[nr_pages -1 ], bytes, +if (index == file_end && bytes && last_page) +memzero_page (last_page, bytes,PAGE_SIZE - bytes);for (i =0 ; i < nr_pages; i++) {
fs/squashfs/page_actor.c +3 -0
@@ -71,11 +71,13 @@ static void *handle_next_page(struct squ (actor->next_index != actor->page[actor->next_page]->index)) { actor->next_index++; actor->returned_pages++; + actor->last_page =NULL ;return actor->alloc_buffer ? actor->tmp_buffer :ERR_PTR (-ENOMEM ); } actor->next_index++; actor->returned_pages++; + actor->last_page = actor->page[actor->next_page];return actor->pageaddr =kmap_local_page (actor->page[actor->next_page++]); }
@@ -125,6 +127,7 @@ struct squashfs_page_actor *squashfs_pag actor->returned_pages =0 ; actor->next_index = page[0 ]->index & ~((1 << (msblk->block_log -PAGE_SHIFT )) -1 ); actor->pageaddr =NULL ; + actor->last_page =NULL ; actor->alloc_buffer = msblk->decompressor->alloc_buffer; actor->squashfs_first_page = direct_first_page; actor->squashfs_next_page = direct_next_page;
fs/squashfs/page_actor.h +5 -1
@@ -16,6 +16,7 @@ struct squashfs_page_actor {void *(*squashfs_first_page)(struct squashfs_page_actor *);void *(*squashfs_next_page)(struct squashfs_page_actor *);void (*squashfs_finish_page)(struct squashfs_page_actor *); +struct page *last_page;int pages;int length;int next_page;
@@ -29,10 +30,13 @@ extern struct squashfs_page_actor *squasextern struct squashfs_page_actor *squashfs_page_actor_init_special (struct squashfs_sb_info *msblk,struct page **page,int pages,int length); -static inline void squashfs_page_actor_free (struct squashfs_page_actor *actor) +static inline struct page *squashfs_page_actor_free (struct squashfs_page_actor *actor) { +struct page *last_page = actor->last_page; +kfree (actor->tmp_buffer);kfree (actor); +return last_page; }static inline void *squashfs_first_page (struct squashfs_page_actor *actor) {
Greg Kroah-Hartman
maintainerPATCH 40/240 squashfs: fix extending readahead beyond end of file
In reply to Greg Kroah-HartmanFrom: Phillip Lougher <[email protected]>
commit c9199de82bad03bceb94ec3c5195c879d7e11911 upstream.
The readahead code will try to extend readahead to the entire size of the Squashfs data block.
But, it didn't take into account that the last block at the end of the file may not be a whole block. In this case, the code would extend readahead to beyond the end of the file, leaving trailing pages.
Fix this by only requesting the expected number of pages.
--- fs/squashfs/file.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/squashfs/file.c +7 -4
@@ -559,6 +559,12 @@ static void squashfs_readahead(struct readahead_control *ractl)unsigned int expected;struct page *last_page; + expected = start >> msblk->block_log == file_end ? + (i_size_read (inode) & (msblk->block_size -1 )) : + msblk->block_size; + + max_pages = (expected +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + nr_pages =__readahead_batch (ractl, pages, max_pages);if (!nr_pages)break ;
@@ -567,13 +573,10 @@ static void squashfs_readahead(struct readahead_control *ractl) goto skip_pages; index = pages[0 ]->index >> shift; +if ((pages[nr_pages -1 ]->index >> shift) != index) goto skip_pages; - expected = index == file_end ? - (i_size_read (inode) & (msblk->block_size -1 )) : - msblk->block_size; -if (index == file_end &&squashfs_i (inode)->fragment_block !=SQUASHFS_INVALID_BLK ) { res = squashfs_readahead_fragment(pages, nr_pages,
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 41/240 squashfs: fix buffer release race condition in readahead code
In reply to Greg Kroah-HartmanFrom: Phillip Lougher <[email protected]>
commit e11c4e088be4c39d17f304fcf331670891905f42 upstream.
Fix a buffer release race condition, where the error value was used after release.
--- fs/squashfs/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/squashfs/file.c +3 -2
@@ -506,8 +506,9 @@ static int squashfs_readahead_fragment(struct page **page, squashfs_i(inode)->fragment_size);struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;unsigned int n, mask = (1 << (msblk->block_log -PAGE_SHIFT )) -1 ; +int error = buffer->error; -if (buffer->error) +if (error) goto out; expected +=squashfs_i (inode)->fragment_offset;
@@ -529,7 +530,7 @@ static int squashfs_readahead_fragment(struct page **page, out:squashfs_cache_put (buffer); -return buffer->error; +return error; }static void squashfs_readahead (struct readahead_control *ractl)
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 42/240 xhci: Add quirk to reset host back to default state at shutdown
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 34cd2db408d591bc15771cbcc90939ade0a99a21 upstream.
Systems based on Alder Lake P see significant boot time delay if boot firmware tries to control usb ports in unexpected link states.
This is seen with self-powered usb devices that survive in U3 link suspended state over S5.
A more generic solution to power off ports at shutdown was attempted in commit 83810f84ecf1 ("xhci: turn off port power in shutdown") but it caused regression.
Add host specific XHCI_RESET_TO_DEFAULT quirk which will reset host and ports back to default state in shutdown.
--- drivers/usb/host/xhci-pci.c | 4 ++++ drivers/usb/host/xhci.c | 10 ++++++++-- drivers/usb/host/xhci.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-pci.c +4 -0
@@ -258,6 +258,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |=XHCI_MISSING_CAS ;if (pdev->vendor ==PCI_VENDOR_ID_INTEL && + pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI ) + xhci->quirks |=XHCI_RESET_TO_DEFAULT ; + + if (pdev->vendor == PCI_VENDOR_ID_INTEL && (pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI || pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI || pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_LP_XHCI ||
drivers/usb/host/xhci.c +8 -2
@@ -810,9 +810,15 @@ void xhci_shutdown(struct usb_hcd *hcd)spin_lock_irq (&xhci->lock);xhci_halt (xhci); -/* Workaround for spurious wakeups at shutdown with HSW */ -if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) + +/* +* Workaround for spurious wakeps at shutdown with HSW, and for boot +* firmware delay in ADL-P PCH if port are left in U3 at shutdown +*/ +if (xhci->quirks &XHCI_SPURIOUS_WAKEUP || + xhci->quirks &XHCI_RESET_TO_DEFAULT )xhci_reset (xhci,XHCI_RESET_SHORT_USEC ); +spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
drivers/usb/host/xhci.h +1 -0
@@ -1900,6 +1900,7 @@ struct xhci_hcd {#define XHCI_BROKEN_D3COLD BIT_ULL(41)#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43) +#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)unsigned int num_active_eps;unsigned int limit_active_eps;
Greg Kroah-Hartman
maintainerPATCH 43/240 xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devices
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
commit a611bf473d1f77b70f7188b5577542cb39b4701b upstream.
For optimal power consumption of USB4 routers the XHCI PCIe endpoint used for tunneling must be in D3. Historically this is accomplished by a long list of PCIe IDs that correspond to these endpoints because the xhci_hcd driver will not default to allowing runtime PM for all devices.
As both AMD and Intel have released new products with new XHCI controllers this list continues to grow. In reviewing the XHCI specification v1.2 on page 607 there is already a requirement that the PCI power management states D3hot and D3cold must be supported.
In the quirk list, use this to indicate that runtime PM should be allowed on XHCI controllers. The following controllers are known to be xHC 1.2 and dropped explicitly:
* AMD Yellow Carp
* Intel Alder Lake
* Intel Meteor Lake
* Intel Raptor Lake
[keep PCI ID for Alder Lake PCH for recently added quirk -Mathias]
--- drivers/usb/host/xhci-pci.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-)
drivers/usb/host/xhci-pci.c +4 -28
@@ -58,25 +58,13 @@#define PCI_DEVICE_ID_INTEL_CML_XHCI 0xa3af#define PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI 0x9a13#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI 0x1138 -#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI 0x461e -#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI 0x464e -#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed -#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI 0xa71e -#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI 0x7ec0 +#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed#define PCI_DEVICE_ID_AMD_RENOIR_XHCI 0x1639#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba#define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb#define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 0x161a -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 0x161b -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 0x161d -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 0x161e -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 0x15d6 -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 0x15d7 -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_7 0x161c -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_8 0x161f#define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142
@@ -272,12 +260,7 @@ static void xhci_pci_quirks(struct devic pdev->device ==PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI || - pdev->device ==PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI || - pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI || - pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI || - pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI || - pdev->device ==PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI)) + pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI)) xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
@@ -346,15 +329,8 @@ static void xhci_pci_quirks(struct devic pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4)) xhci->quirks |= XHCI_NO_SOFT_RETRY; -if (pdev->vendor ==PCI_VENDOR_ID_AMD && - (pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_7 || - pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_8 )) +/* xHC spec requires PCI devices to support D3hot and D3cold */ +if (xhci->hci_version >=0x120 ) xhci->quirks |=XHCI_DEFAULT_PM_RUNTIME_ALLOW ;if (xhci->quirks &XHCI_RESET_ON_RESUME )
Greg Kroah-Hartman
maintainerPATCH 44/240 xhci: Remove device endpoints from bandwidth list when freeing the device
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 5aed5b7c2430ce318a8e62f752f181e66f0d1053 upstream.
Endpoints are normally deleted from the bandwidth list when they are dropped, before the virt device is freed.
If xHC host is dying or being removed then the endpoints aren't dropped cleanly due to functions returning early to avoid interacting with a non-accessible host controller.
So check and delete endpoints that are still on the bandwidth list when freeing the virt device.
Solves a list_del corruption kernel crash when unbinding xhci-pci, caused by xhci_mem_cleanup() when it later tried to delete already freed endpoints from the bandwidth list.
This only affects hosts that use software bandwidth checking, which currenty is only the xHC in intel Panther Point PCH (Ivy Bridge)
--- drivers/usb/host/xhci-mem.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/usb/host/xhci-mem.c +12 -8
@@ -889,15 +889,19 @@ void xhci_free_virt_device(struct xhci_hif (dev->eps[i].stream_info)xhci_free_stream_info (xhci, dev->eps[i].stream_info); -/* Endpoints on the TT/root port lists should have been removed -* when usb_disable_device() was called for the device. -* We can't drop them anyway, because the udev might have gone -* away by this point, and we can't tell what speed it was. +/* +* Endpoints are normally deleted from the bandwidth list when +* endpoints are dropped, before device is freed. +* If host is dying or being removed then endpoints aren't +* dropped cleanly, so delete the endpoint from list here. +* Only applicable for hosts with software bandwidth checking. */ -if (!list_empty (&dev->eps[i].bw_endpoint_list)) -xhci_warn (xhci,"Slot %u endpoint %u " -"not removed from BW list!\n" , - slot_id, i); + +if (!list_empty (&dev->eps[i].bw_endpoint_list)) { +list_del_init (&dev->eps[i].bw_endpoint_list); +xhci_dbg (xhci,"Slot %u endpoint %u not removed from BW list!\n" , + slot_id, i); + } }/* If this is a hub, free the TT(s) from the TT list */ xhci_free_tt_info (xhci, dev, slot_id);
Greg Kroah-Hartman
maintainerPATCH 45/240 tools: iio: iio_utils: fix digit calculation
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
commit 72b2aa38191bcba28389b0e20bf6b4f15017ff2b upstream.
The iio_utils uses a digit calculation in order to know length of the file name containing a buffer number. The digit calculation does not work for number 0.
This leads to allocation of one character too small buffer for the file-name when file name contains value '0'. (Eg. buffer0).
Fix digit calculation by returning one digit to be present for number '0'.
--- tools/iio/iio_utils.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/iio/iio_utils.c +4 -0
@@ -547,6 +547,10 @@ static int calc_digits(int num) {int count =0 ; +/* It takes a digit to represent zero */ +if (!num) +return 1 ; +while (num !=0 ) { num /=10 ; count++;
Greg Kroah-Hartman
maintainerPATCH 46/240 iio: light: tsl2583: Fix module unloading
In reply to Greg Kroah-HartmanFrom: Shreeya Patel <[email protected]>
commit 0dec4d2f2636b9e54d9d29f17afc7687c5407f78 upstream.
tsl2583 probe() uses devm_iio_device_register() and calling iio_device_unregister() causes the unregister to occur twice. s Switch to iio_device_register() instead of devm_iio_device_register() in probe to avoid the device managed cleanup.
--- drivers/iio/light/tsl2583.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/light/tsl2583.c +1 -1
@@ -858,7 +858,7 @@ static int tsl2583_probe(struct i2c_clie TSL2583_POWER_OFF_DELAY_MS);pm_runtime_use_autosuspend (&clientp->dev); - ret =devm_iio_device_register (indio_dev->dev.parent, indio_dev); + ret =iio_device_register (indio_dev);if (ret) {dev_err (&clientp->dev,"%s: iio registration failed\n" , __func__);
Greg Kroah-Hartman
maintainerPATCH 47/240 iio: temperature: ltc2983: allocate iio channels once
In reply to Greg Kroah-HartmanFrom: Cosmin Tanislav <[email protected]>
commit 4132f19173211856d35180958d2754f5c56d520a upstream.
Currently, every time the device wakes up from sleep, the iio_chan array is reallocated, leaking the previous one until the device is removed (basically never).
Move the allocation to the probe function to avoid this.
--- drivers/iio/temperature/ltc2983.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/iio/temperature/ltc2983.c +6 -7
@@ -1385,13 +1385,6 @@ static int ltc2983_setup(struct ltc2983_return ret; } - st->iio_chan =devm_kzalloc (&st->spi->dev, - st->iio_channels *sizeof (*st->iio_chan), -GFP_KERNEL ); - -if (!st->iio_chan) -return -ENOMEM ; - ret =regmap_update_bits (st->regmap,LTC2983_GLOBAL_CONFIG_REG ,LTC2983_NOTCH_FREQ_MASK ,LTC2983_NOTCH_FREQ (st->filter_notch_freq));
@@ -1514,6 +1507,12 @@ static int ltc2983_probe(struct spi_devigpiod_set_value_cansleep (gpio,0 ); } + st->iio_chan =devm_kzalloc (&spi->dev, + st->iio_channels *sizeof (*st->iio_chan), +GFP_KERNEL ); +if (!st->iio_chan) +return -ENOMEM ; + ret =ltc2983_setup (st, true);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 48/240 iio: adxl372: Fix unsafe buffer attributes
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
commit ab0ee36e90f611f32c3a53afe9dc743de48138e2 upstream.
The iio_triggered_buffer_setup_ext() was changed by
commit 15097c7a1adc ("iio: buffer: wrap all buffer attributes into iio_dev_attr") to silently expect that all attributes given in buffer_attrs array are device-attributes. This expectation was not forced by the API - and some drivers did register attributes created by IIO_CONST_ATTR().
The added attribute "wrapping" does not copy the pointer to stored string constant and when the sysfs file is read the kernel will access to invalid location.
Change the IIO_CONST_ATTRs from the driver to IIO_DEVICE_ATTR in order to prevent the invalid memory access.
--- drivers/iio/accel/adxl372.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/iio/accel/adxl372.c +18 -5
@@ -998,17 +998,30 @@ static ssize_t adxl372_get_fifo_watermarreturn sprintf (buf,"%d\n" , st->watermark); } -static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); -static IIO_CONST_ATTR(hwfifo_watermark_max, - __stringify(ADXL372_FIFO_SIZE)); +static ssize_t hwfifo_watermark_min_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +return sysfs_emit (buf,"%s\n" ,"1" ); +} + +static ssize_t hwfifo_watermark_max_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +return sysfs_emit (buf,"%s\n" ,__stringify (ADXL372_FIFO_SIZE )); +} + +static IIO_DEVICE_ATTR_RO(hwfifo_watermark_min, 0); +static IIO_DEVICE_ATTR_RO(hwfifo_watermark_max, 0); static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, adxl372_get_fifo_watermark, NULL, 0); static IIO_DEVICE_ATTR(hwfifo_enabled, 0444, adxl372_get_fifo_enabled, NULL, 0);static const struct attribute *adxl372_fifo_attributes[] = { - &iio_const_attr_hwfifo_watermark_min.dev_attr.attr, - &iio_const_attr_hwfifo_watermark_max.dev_attr.attr, + &iio_dev_attr_hwfifo_watermark_min.dev_attr.attr, + &iio_dev_attr_hwfifo_watermark_max.dev_attr.attr, &iio_dev_attr_hwfifo_watermark.dev_attr.attr, &iio_dev_attr_hwfifo_enabled.dev_attr.attr,NULL ,
Greg Kroah-Hartman
maintainerPATCH 49/240 iio: adxl367: Fix unsafe buffer attributes
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
commit 5e23b33d1e84f04c80da6f1d89cbb3d3a3f81e01 upstream.
The devm_iio_kfifo_buffer_setup_ext() was changed by
commit 15097c7a1adc ("iio: buffer: wrap all buffer attributes into iio_dev_attr") to silently expect that all attributes given in buffer_attrs array are device-attributes. This expectation was not forced by the API - and some drivers did register attributes created by IIO_CONST_ATTR().
The added attribute "wrapping" does not copy the pointer to stored string constant and when the sysfs file is read the kernel will access to invalid location.
Change the IIO_CONST_ATTRs from the driver to IIO_DEVICE_ATTR in order to prevent the invalid memory access.
--- drivers/iio/accel/adxl367.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/iio/accel/adxl367.c +18 -5
@@ -1185,17 +1185,30 @@ static ssize_t adxl367_get_fifo_watermarreturn sysfs_emit (buf,"%d\n" , fifo_watermark); } -static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); -static IIO_CONST_ATTR(hwfifo_watermark_max, - __stringify(ADXL367_FIFO_MAX_WATERMARK)); +static ssize_t hwfifo_watermark_min_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +return sysfs_emit (buf,"%s\n" ,"1" ); +} + +static ssize_t hwfifo_watermark_max_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +return sysfs_emit (buf,"%s\n" ,__stringify (ADXL367_FIFO_MAX_WATERMARK )); +} + +static IIO_DEVICE_ATTR_RO(hwfifo_watermark_min, 0); +static IIO_DEVICE_ATTR_RO(hwfifo_watermark_max, 0); static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, adxl367_get_fifo_watermark, NULL, 0); static IIO_DEVICE_ATTR(hwfifo_enabled, 0444, adxl367_get_fifo_enabled, NULL, 0);static const struct attribute *adxl367_fifo_attributes[] = { - &iio_const_attr_hwfifo_watermark_min.dev_attr.attr, - &iio_const_attr_hwfifo_watermark_max.dev_attr.attr, + &iio_dev_attr_hwfifo_watermark_min.dev_attr.attr, + &iio_dev_attr_hwfifo_watermark_max.dev_attr.attr, &iio_dev_attr_hwfifo_watermark.dev_attr.attr, &iio_dev_attr_hwfifo_enabled.dev_attr.attr,NULL ,
Greg Kroah-Hartman
maintainerPATCH 50/240 fbdev: stifb: Fall back to cfb_fillrect() on 32-bit HCRX cards
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 776d875fd4cbb3884860ea7f63c3958f02b0c80e upstream.
When the text console is scrolling text upwards it calls the fillrect() function to empty the new line. The current implementation doesn't seem to work correctly on HCRX cards in 32-bit mode and leave garbage in that line instead. Fix it by falling back to standard cfb_fillrect() in that case.
--- drivers/video/fbdev/stifb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/video/fbdev/stifb.c +2 -1
@@ -1055,7 +1055,8 @@ stifb_fillrect(struct fb_info *info, con { struct stifb_info *fb = container_of(info, struct stifb_info, info); -if (rect->rop !=ROP_COPY ) +if (rect->rop !=ROP_COPY || + (fb->id ==S9000_ID_HCRX && fb->info.var.bits_per_pixel ==32 ))return cfb_fillrect (info, rect);SETUP_HW (fb);
Greg Kroah-Hartman
maintainerPATCH 51/240 fbdev: smscufx: Fix several use-after-free bugs
In reply to Greg Kroah-HartmanFrom: Hyunwoo Kim <[email protected]>
commit cc67482c9e5f2c80d62f623bcc347c29f9f648e1 upstream.
Several types of UAFs can occur when physically removing a USB device.
Adds ufx_ops_destroy() function to .fb_destroy of fb_ops, and in this function, there is kref_put() that finally calls ufx_free().
This fix prevents multiple UAFs.
--- drivers/video/fbdev/smscufx.c | 55 ++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 25 deletions(-)
drivers/video/fbdev/smscufx.c +30 -25
@@ -97,7 +97,6 @@ struct ufx_data {struct kref kref;int fb_count;bool virtualized;/* true when physical usb device not present */ -struct delayed_work free_framebuffer_work;atomic_t usb_active;/* 0 = update virtual buffer, but no usb traffic */ atomic_t lost_pixels;/* 1 = a render op failed. Need screen refresh */ u8 *edid;/* null until we read edid from hw or get from sysfs */
@@ -1117,15 +1116,24 @@ static void ufx_free(struct kref *kref) { struct ufx_data *dev = container_of(kref, struct ufx_data, kref); -/* this function will wait for all in-flight urbs to complete */ -if (dev->urbs.count >0 ) -ufx_free_urb_list (dev); +kfree (dev); +} -pr_debug ("freeing ufx_data %p" , dev); +static void ufx_ops_destory (struct fb_info *info) +{ +struct ufx_data *dev = info->par; +int node = info->node; -kfree (dev); +/* Assume info structure is freed after this point */ +framebuffer_release (info); + +pr_debug ("fb_info for /dev/fb%d has been freed" , node); + +/* release reference taken by kref_init in probe() */ +kref_put (&dev->kref, ufx_free); } +static void ufx_release_urb_work (struct work_struct *work) { struct urb_node *unode = container_of(work, struct urb_node,
@@ -1134,14 +1142,9 @@ static void ufx_release_urb_work(structup (&unode->dev->urbs.limit_sem); } -static void ufx_free_framebuffer_work (struct work_struct *work) +static void ufx_free_framebuffer (struct ufx_data *dev) { - struct ufx_data *dev = container_of(work, struct ufx_data, - free_framebuffer_work.work);struct fb_info *info = dev->info; -int node = info->node; - -unregister_framebuffer (info);if (info->cmap.len !=0 )fb_dealloc_cmap (&info->cmap);
@@ -1153,11 +1156,6 @@ static void ufx_free_framebuffer_work(st dev->info =NULL ; -/* Assume info structure is freed after this point */ -framebuffer_release (info); - -pr_debug ("fb_info for /dev/fb%d has been freed" , node); -/* ref taken in probe() as part of registering framebfufer */ kref_put (&dev->kref, ufx_free); }
@@ -1169,11 +1167,13 @@ static int ufx_ops_release(struct fb_inf {struct ufx_data *dev = info->par; +mutex_lock (&disconnect_mutex); + dev->fb_count--;/* We can't free fb_info here - fbmem will touch it when we return */ if (dev->virtualized && (dev->fb_count ==0 )) -schedule_delayed_work (&dev->free_framebuffer_work,HZ ); +ufx_free_framebuffer (dev);if ((dev->fb_count ==0 ) && (info->fbdefio)) {fb_deferred_io_cleanup (info);
@@ -1186,6 +1186,8 @@ static int ufx_ops_release(struct fb_infkref_put (&dev->kref, ufx_free); +mutex_unlock (&disconnect_mutex); +return 0 ; }
@@ -1292,6 +1294,7 @@ static const struct fb_ops ufx_ops = { .fb_blank = ufx_ops_blank, .fb_check_var = ufx_ops_check_var, .fb_set_par = ufx_ops_set_par, + .fb_destroy = ufx_ops_destory, };/* Assumes &info->lock held by caller
@@ -1673,9 +1676,6 @@ static int ufx_usb_probe(struct usb_inte goto destroy_modedb; } -INIT_DELAYED_WORK (&dev->free_framebuffer_work, - ufx_free_framebuffer_work); - retval =ufx_reg_read (dev,0x3000 , &id_rev);check_warn_goto_error (retval,"error %d reading 0x3000 register from device" , retval);dev_dbg (dev->gdev,"ID_REV register value 0x%08x" , id_rev);
@@ -1748,10 +1748,12 @@ e_nomem:static void ufx_usb_disconnect (struct usb_interface *interface) {struct ufx_data *dev; +struct fb_info *info;mutex_lock (&disconnect_mutex); dev =usb_get_intfdata (interface); + info = dev->info;pr_debug ("USB disconnect starting\n" );
@@ -1765,12 +1767,15 @@ static void ufx_usb_disconnect(struct us/* if clients still have us open, will be freed on last close */ if (dev->fb_count ==0 ) -schedule_delayed_work (&dev->free_framebuffer_work,0 ); +ufx_free_framebuffer (dev); -/* release reference taken by kref_init in probe() */ -kref_put (&dev->kref, ufx_free); +/* this function will wait for all in-flight urbs to complete */ +if (dev->urbs.count >0 ) +ufx_free_urb_list (dev); -/* consider ufx_data freed */ +pr_debug ("freeing ufx_data %p" , dev); + +unregister_framebuffer (info);mutex_unlock (&disconnect_mutex); }
Greg Kroah-Hartman
maintainerPATCH 52/240 cpufreq: intel_pstate: Read all MSRs on the target CPU
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 8dbab94d45fb1094cefac7956b7fb987a36e2b12 upstream.
Some of the MSR accesses in intel_pstate are carried out on the CPU that is running the code, but the values coming from them are used for the performance scaling of the other CPUs.
This is problematic, for example, on hybrid platforms where MSR_TURBO_RATIO_LIMIT for P-cores and E-cores is different, so the values read from it on a P-core are generally not applicable to E-cores and the other way around.
For this reason, make the driver access all MSRs on the target CPU on platforms using the "core" pstate_funcs callbacks which is the case for all of the hybrid platforms released to date. For this purpose, pass a CPU argument to the ->get_max(), ->get_max_physical(), ->get_min() and ->get_turbo() pstate_funcs callbacks and from there pass it to rdmsrl_on_cpu() or rdmsrl_safe_on_cpu() to access the MSR on the target CPU.
--- drivers/cpufreq/intel_pstate.c | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-)
drivers/cpufreq/intel_pstate.c +33 -33
@@ -280,10 +280,10 @@ static struct cpudata **all_cpu_data;* structure is used to store those callbacks. */ struct pstate_funcs { -int (*get_max)(void ); -int (*get_max_physical)(void ); -int (*get_min)(void ); -int (*get_turbo)(void ); +int (*get_max)(int cpu); +int (*get_max_physical)(int cpu); +int (*get_min)(int cpu); +int (*get_turbo)(int cpu);int (*get_scaling)(void );int (*get_cpu_scaling)(int cpu);int (*get_aperf_mperf_shift)(void );
@@ -531,12 +531,12 @@ static void intel_pstate_hybrid_hwp_adju {int perf_ctl_max_phys = cpu->pstate.max_pstate_physical;int perf_ctl_scaling = cpu->pstate.perf_ctl_scaling; -int perf_ctl_turbo = pstate_funcs.get_turbo (); +int perf_ctl_turbo = pstate_funcs.get_turbo (cpu->cpu);int turbo_freq = perf_ctl_turbo * perf_ctl_scaling;int scaling = cpu->pstate.scaling;pr_debug ("CPU%d: perf_ctl_max_phys = %d\n" , cpu->cpu, perf_ctl_max_phys); -pr_debug ("CPU%d: perf_ctl_max = %d\n" , cpu->cpu, pstate_funcs.get_max ()); +pr_debug ("CPU%d: perf_ctl_max = %d\n" , cpu->cpu, pstate_funcs.get_max (cpu->cpu));pr_debug ("CPU%d: perf_ctl_turbo = %d\n" , cpu->cpu, perf_ctl_turbo);pr_debug ("CPU%d: perf_ctl_scaling = %d\n" , cpu->cpu, perf_ctl_scaling);pr_debug ("CPU%d: HWP_CAP guaranteed = %d\n" , cpu->cpu, cpu->pstate.max_pstate);
@@ -1740,7 +1740,7 @@ static void intel_pstate_hwp_enable(struintel_pstate_update_epp_defaults (cpudata); } -static int atom_get_min_pstate (void ) +static int atom_get_min_pstate (int not_used) {u64 value;
@@ -1748,7 +1748,7 @@ static int atom_get_min_pstate(void)return (value >>8 ) &0x7F ; } -static int atom_get_max_pstate (void ) +static int atom_get_max_pstate (int not_used) {u64 value;
@@ -1756,7 +1756,7 @@ static int atom_get_max_pstate(void)return (value >>16 ) &0x7F ; } -static int atom_get_turbo_pstate (void ) +static int atom_get_turbo_pstate (int not_used) {u64 value;
@@ -1834,23 +1834,23 @@ static void atom_get_vid(struct cpudata cpudata->vid.turbo = value &0x7f ; } -static int core_get_min_pstate (void ) +static int core_get_min_pstate (int cpu) {u64 value; -rdmsrl (MSR_PLATFORM_INFO , value); +rdmsrl_on_cpu (cpu,MSR_PLATFORM_INFO , &value);return (value >>40 ) &0xFF ; } -static int core_get_max_pstate_physical (void ) +static int core_get_max_pstate_physical (int cpu) {u64 value; -rdmsrl (MSR_PLATFORM_INFO , value); +rdmsrl_on_cpu (cpu,MSR_PLATFORM_INFO , &value);return (value >>8 ) &0xFF ; } -static int core_get_tdp_ratio (u64 plat_info) +static int core_get_tdp_ratio (int cpu,u64 plat_info) {/* Check how many TDP levels present */ if (plat_info &0x600000000 ) {
@@ -1860,13 +1860,13 @@ static int core_get_tdp_ratio(u64 plat_iint err;/* Get the TDP level (0, 1, 2) to get ratios */ - err =rdmsrl_safe (MSR_CONFIG_TDP_CONTROL , &tdp_ctrl); + err =rdmsrl_safe_on_cpu (cpu,MSR_CONFIG_TDP_CONTROL , &tdp_ctrl);if (err)return err;/* TDP MSR are continuous starting at 0x648 */ tdp_msr =MSR_CONFIG_TDP_NOMINAL + (tdp_ctrl &0x03 ); - err =rdmsrl_safe (tdp_msr, &tdp_ratio); + err =rdmsrl_safe_on_cpu (cpu, tdp_msr, &tdp_ratio);if (err)return err;
@@ -1883,7 +1883,7 @@ static int core_get_tdp_ratio(u64 plat_ireturn -ENXIO ; } -static int core_get_max_pstate (void ) +static int core_get_max_pstate (int cpu) {u64 tar;u64 plat_info;
@@ -1891,10 +1891,10 @@ static int core_get_max_pstate(void)int tdp_ratio;int err; -rdmsrl (MSR_PLATFORM_INFO , plat_info); +rdmsrl_on_cpu (cpu,MSR_PLATFORM_INFO , &plat_info); max_pstate = (plat_info >>8 ) &0xFF ; - tdp_ratio =core_get_tdp_ratio (plat_info); + tdp_ratio =core_get_tdp_ratio (cpu, plat_info);if (tdp_ratio <=0 )return max_pstate;
@@ -1903,7 +1903,7 @@ static int core_get_max_pstate(void)return tdp_ratio; } - err =rdmsrl_safe (MSR_TURBO_ACTIVATION_RATIO , &tar); + err =rdmsrl_safe_on_cpu (cpu,MSR_TURBO_ACTIVATION_RATIO , &tar);if (!err) {int tar_levels;
@@ -1918,13 +1918,13 @@ static int core_get_max_pstate(void)return max_pstate; } -static int core_get_turbo_pstate (void ) +static int core_get_turbo_pstate (int cpu) {u64 value;int nont, ret; -rdmsrl (MSR_TURBO_RATIO_LIMIT , value); - nont =core_get_max_pstate (); +rdmsrl_on_cpu (cpu,MSR_TURBO_RATIO_LIMIT , &value); + nont =core_get_max_pstate (cpu); ret = (value) &255 ;if (ret <= nont) ret = nont;
@@ -1952,13 +1952,13 @@ static int knl_get_aperf_mperf_shift(voireturn 10 ; } -static int knl_get_turbo_pstate (void ) +static int knl_get_turbo_pstate (int cpu) {u64 value;int nont, ret; -rdmsrl (MSR_TURBO_RATIO_LIMIT , value); - nont =core_get_max_pstate (); +rdmsrl_on_cpu (cpu,MSR_TURBO_RATIO_LIMIT , &value); + nont =core_get_max_pstate (cpu); ret = (((value) >>8 ) &0xFF );if (ret <= nont) ret = nont;
@@ -2025,10 +2025,10 @@ static void intel_pstate_max_within_limistatic void intel_pstate_get_cpu_pstates (struct cpudata *cpu) { -int perf_ctl_max_phys = pstate_funcs.get_max_physical (); +int perf_ctl_max_phys = pstate_funcs.get_max_physical (cpu->cpu);int perf_ctl_scaling = pstate_funcs.get_scaling (); - cpu->pstate.min_pstate = pstate_funcs.get_min (); + cpu->pstate.min_pstate = pstate_funcs.get_min (cpu->cpu); cpu->pstate.max_pstate_physical = perf_ctl_max_phys; cpu->pstate.perf_ctl_scaling = perf_ctl_scaling;
@@ -2044,8 +2044,8 @@ static void intel_pstate_get_cpu_pstates } }else { cpu->pstate.scaling = perf_ctl_scaling; - cpu->pstate.max_pstate = pstate_funcs.get_max (); - cpu->pstate.turbo_pstate = pstate_funcs.get_turbo (); + cpu->pstate.max_pstate = pstate_funcs.get_max (cpu->cpu); + cpu->pstate.turbo_pstate = pstate_funcs.get_turbo (cpu->cpu); }if (cpu->pstate.scaling == perf_ctl_scaling) {
@@ -3221,9 +3221,9 @@ static unsigned int force_load __initdatstatic int __init intel_pstate_msrs_not_valid (void ) { -if (!pstate_funcs.get_max () || - !pstate_funcs.get_min () || - !pstate_funcs.get_turbo ()) +if (!pstate_funcs.get_max (0 ) || + !pstate_funcs.get_min (0 ) || + !pstate_funcs.get_turbo (0 ))return -ENODEV ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 53/240 cpufreq: intel_pstate: hybrid: Use known scaling factor for P-cores
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit f5c8cf2a4992dd929fa0c2f25c09ee69b8dcbce1 upstream.
Commit 46573fd6369f ("cpufreq: intel_pstate: hybrid: Rework HWP calibration") attempted to use the information from CPPC (the nominal performance in particular) to obtain the scaling factor allowing the frequency to be computed if the HWP performance level of the given CPU is known or vice versa.
However, it turns out that on some platforms this doesn't work, because the CPPC information on them does not align with the contents of the MSR_HWP_CAPABILITIES registers.
This basically means that the only way to make intel_pstate work on all of the hybrid platforms to date is to use the observation that on all of them the scaling factor between the HWP performance levels and frequency for P-cores is 78741 (approximately 100000/1.27). For E-cores it is 100000, which is the same as for all of the non-hybrid "core" platforms and does not require any changes.
Accordingly, make intel_pstate use 78741 as the scaling factor between HWP performance levels and frequency for P-cores on all hybrid platforms and drop the dependency of the HWP calibration code on CPPC.
--- drivers/cpufreq/intel_pstate.c | 69 ++++++++--------------------------------- 1 file changed, 15 insertions(+), 54 deletions(-)
drivers/cpufreq/intel_pstate.c +15 -54
@@ -27,6 +27,7 @@#include <linux/pm_qos.h> #include <trace/events/power.h> +#include <asm/cpu.h> #include <asm/div64.h> #include <asm/msr.h> #include <asm/cpu_device_id.h>
@@ -398,16 +399,6 @@ static int intel_pstate_get_cppc_guarant return cppc_perf.nominal_perf; } - -static u32 intel_pstate_cppc_nominal (int cpu) -{ -u64 nominal_perf; - -if (cppc_get_nominal_perf (cpu, &nominal_perf)) -return 0 ; - -return nominal_perf; -}#else /* CONFIG_ACPI_CPPC_LIB */ static inline void intel_pstate_set_itmt_prio (int cpu) {
@@ -532,34 +523,17 @@ static void intel_pstate_hybrid_hwp_adjuint perf_ctl_max_phys = cpu->pstate.max_pstate_physical;int perf_ctl_scaling = cpu->pstate.perf_ctl_scaling;int perf_ctl_turbo = pstate_funcs.get_turbo (cpu->cpu); -int turbo_freq = perf_ctl_turbo * perf_ctl_scaling;int scaling = cpu->pstate.scaling;pr_debug ("CPU%d: perf_ctl_max_phys = %d\n" , cpu->cpu, perf_ctl_max_phys); -pr_debug ("CPU%d: perf_ctl_max = %d\n" , cpu->cpu, pstate_funcs.get_max (cpu->cpu));pr_debug ("CPU%d: perf_ctl_turbo = %d\n" , cpu->cpu, perf_ctl_turbo);pr_debug ("CPU%d: perf_ctl_scaling = %d\n" , cpu->cpu, perf_ctl_scaling);pr_debug ("CPU%d: HWP_CAP guaranteed = %d\n" , cpu->cpu, cpu->pstate.max_pstate);pr_debug ("CPU%d: HWP_CAP highest = %d\n" , cpu->cpu, cpu->pstate.turbo_pstate);pr_debug ("CPU%d: HWP-to-frequency scaling factor: %d\n" , cpu->cpu, scaling); -/* -* If the product of the HWP performance scaling factor and the HWP_CAP -* highest performance is greater than the maximum turbo frequency -* corresponding to the pstate_funcs.get_turbo() return value, the -* scaling factor is too high, so recompute it to make the HWP_CAP -* highest performance correspond to the maximum turbo frequency. -*/ - cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * scaling; -if (turbo_freq < cpu->pstate.turbo_freq) { - cpu->pstate.turbo_freq = turbo_freq; - scaling =DIV_ROUND_UP (turbo_freq, cpu->pstate.turbo_pstate); - cpu->pstate.scaling = scaling; - -pr_debug ("CPU%d: refined HWP-to-frequency scaling factor: %d\n" , - cpu->cpu, scaling); - } - + cpu->pstate.turbo_freq =rounddown (cpu->pstate.turbo_pstate * scaling, + perf_ctl_scaling); cpu->pstate.max_freq =rounddown (cpu->pstate.max_pstate * scaling, perf_ctl_scaling);
@@ -1965,37 +1939,24 @@ static int knl_get_turbo_pstate(int cpu)return ret; } -#ifdef CONFIG_ACPI_CPPC_LIB -static u32 hybrid_ref_perf; - -static int hybrid_get_cpu_scaling (int cpu) +static void hybrid_get_type (void *data) { -return DIV_ROUND_UP (core_get_scaling () * hybrid_ref_perf, -intel_pstate_cppc_nominal (cpu)); +u8 *cpu_type = data; + + *cpu_type =get_this_hybrid_cpu_type (); } -static void intel_pstate_cppc_set_cpu_scaling (void ) +static int hybrid_get_cpu_scaling (int cpu) { -u32 min_nominal_perf =U32_MAX ; -int cpu; +u8 cpu_type =0 ; -for_each_present_cpu (cpu) { -u32 nominal_perf =intel_pstate_cppc_nominal (cpu); +smp_call_function_single (cpu, hybrid_get_type, &cpu_type,1 ); +/* P-cores have a smaller perf level-to-freqency scaling factor. */ +if (cpu_type ==0x40 ) +return 78741 ; -if (nominal_perf && nominal_perf < min_nominal_perf) - min_nominal_perf = nominal_perf; - } - -if (min_nominal_perf <U32_MAX ) { - hybrid_ref_perf = min_nominal_perf; - pstate_funcs.get_cpu_scaling = hybrid_get_cpu_scaling; - } +return core_get_scaling (); } -#else -static inline void intel_pstate_cppc_set_cpu_scaling (void ) -{ -} -#endif /* CONFIG_ACPI_CPPC_LIB */ static void intel_pstate_set_pstate (struct cpudata *cpu,int pstate) {
@@ -3450,7 +3411,7 @@ static int __init intel_pstate_init(void default_driver = &intel_pstate;if (boot_cpu_has (X86_FEATURE_HYBRID_CPU )) -intel_pstate_cppc_set_cpu_scaling (); + pstate_funcs.get_cpu_scaling = hybrid_get_cpu_scaling; goto hwp_cpu_matched; }
Greg Kroah-Hartman
maintainerPATCH 54/240 fs/binfmt_elf: Fix memory leak in load_elf_binary()
In reply to Greg Kroah-HartmanFrom: Li Zetao <[email protected]>
commit 594d2a14f2168c09b13b114c3d457aa939403e52 upstream.
There is a memory leak reported by kmemleak:
unreferenced object 0xffff88817104ef80 (size 224):
comm "xfs_admin", pid 47165, jiffies 4298708825 (age 1333.476s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
60 a8 b3 00 81 88 ff ff a8 10 5a 00 81 88 ff ff `.........Z.....
backtrace:
[<ffffffff819171e1>] __alloc_file+0x21/0x250
[<ffffffff81918061>] alloc_empty_file+0x41/0xf0
[<ffffffff81948cda>] path_openat+0xea/0x3d30
[<ffffffff8194ec89>] do_filp_open+0x1b9/0x290
[<ffffffff8192660e>] do_open_execat+0xce/0x5b0
[<ffffffff81926b17>] open_exec+0x27/0x50
[<ffffffff81a69250>] load_elf_binary+0x510/0x3ed0
[<ffffffff81927759>] bprm_execve+0x599/0x1240
[<ffffffff8192a997>] do_execveat_common.isra.0+0x4c7/0x680
[<ffffffff8192b078>] __x64_sys_execve+0x88/0xb0
[<ffffffff83bbf0a5>] do_syscall_64+0x35/0x80If "interp_elf_ex" fails to allocate memory in load_elf_binary(), the program will take the "out_free_ph" error handing path, resulting in "interpreter" file resource is not released.
Fix it by adding an error handing path "out_free_file", which will release the file resource when "interp_elf_ex" failed to allocate memory.
--- fs/binfmt_elf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/binfmt_elf.c +2 -1
@@ -911,7 +911,7 @@ static int load_elf_binary(struct linux_ interp_elf_ex =kmalloc (sizeof (*interp_elf_ex),GFP_KERNEL );if (!interp_elf_ex) { retval = -ENOMEM ; - goto out_free_ph; + goto out_free_file; }/* Get the exec headers */
@@ -1354,6 +1354,7 @@ out: out_free_dentry:kfree (interp_elf_ex);kfree (interp_elf_phdata); +out_free_file:allow_write_access (interpreter);if (interpreter)fput (interpreter);
Greg Kroah-Hartman
maintainerPATCH 55/240 exec: Copy oldsighand->action under spin-lock
In reply to Greg Kroah-HartmanFrom: Bernd Edlinger <[email protected]>
commit 5bf2fedca8f59379025b0d52f917b9ddb9bfe17e upstream.
unshare_sighand should only access oldsighand->action while holding oldsighand->siglock, to make sure that newsighand->action is in a consistent state.
--- fs/exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/exec.c +2 -2
@@ -1196,11 +1196,11 @@ static int unshare_sighand(struct task_sreturn -ENOMEM ;refcount_set (&newsighand->count,1 ); -memcpy (newsighand->action, oldsighand->action, -sizeof (newsighand->action));write_lock_irq (&tasklist_lock);spin_lock (&oldsighand->siglock); +memcpy (newsighand->action, oldsighand->action, +sizeof (newsighand->action));rcu_assign_pointer (me->sighand, newsighand);spin_unlock (&oldsighand->siglock);write_unlock_irq (&tasklist_lock);
Greg Kroah-Hartman
maintainerPATCH 56/240 mac802154: Fix LQI recording
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 5a5c4e06fd03b595542d5590f2bc05a6b7fc5c2b upstream.
Back in 2014, the LQI was saved in the skb control buffer (skb->cb, or mac_cb(skb)) without any actual reset of this area prior to its use.
As part of a useful rework of the use of this region, 32edc40ae65c ("ieee802154: change _cb handling slightly") introduced mac_cb_init() to basically memset the cb field to 0. In particular, this new function got called at the beginning of mac802154_parse_frame_start(), right before the location where the buffer got actually filled.
What went through unnoticed however, is the fact that the very first helper called by device drivers in the receive path already used this area to save the LQI value for later extraction. Resetting the cb field "so late" led to systematically zeroing the LQI.
If we consider the reset of the cb field needed, we can make it as soon as we get an skb from a device driver, right before storing the LQI, as is the very first time we need to write something there.
--- net/mac802154/rx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/mac802154/rx.c +3 -2
@@ -132,7 +132,7 @@ static int ieee802154_parse_frame_start(struct sk_buff *skb, struct ieee802154_hdr *hdr) { int hlen; -struct ieee802154_mac_cb *cb =mac_cb_init (skb); +struct ieee802154_mac_cb *cb =mac_cb (skb);skb_reset_mac_header (skb);
@@ -294,8 +294,9 @@ void ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi) { struct ieee802154_local *local = hw_to_local(hw); +struct ieee802154_mac_cb *cb =mac_cb_init (skb); -mac_cb (skb)->lqi = lqi; + cb->lqi = lqi; skb->pkt_type =IEEE802154_RX_MSG ;skb_queue_tail (&local->skb_queue, skb);tasklet_schedule (&local->tasklet);
Greg Kroah-Hartman
maintainerPATCH 57/240 scsi: qla2xxx: Use transport-defined speed mask for supported_speeds
In reply to Greg Kroah-HartmanFrom: Manish Rangankar <[email protected]>
commit 0b863257c17c5f57a41e0a48de140ed026957a63 upstream.
One of the sysfs values reported for supported_speeds was not valid (20Gb/s reported instead of 64Gb/s). Instead of driver internal speed mask definition, use speed mask defined in transport_fc for reporting host->supported_speeds.
--- drivers/scsi/qla2xxx/qla_attr.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +26 -2
@@ -3330,11 +3330,34 @@ struct fc_function_template qla2xxx_tran .bsg_timeout = qla24xx_bsg_timeout, }; +static uint +qla2x00_get_host_supported_speeds (scsi_qla_host_t *vha,uint speeds) +{ +uint supported_speeds =FC_PORTSPEED_UNKNOWN ; + +if (speeds &FDMI_PORT_SPEED_64GB ) + supported_speeds |=FC_PORTSPEED_64GBIT ; +if (speeds &FDMI_PORT_SPEED_32GB ) + supported_speeds |=FC_PORTSPEED_32GBIT ; +if (speeds &FDMI_PORT_SPEED_16GB ) + supported_speeds |=FC_PORTSPEED_16GBIT ; +if (speeds &FDMI_PORT_SPEED_8GB ) + supported_speeds |=FC_PORTSPEED_8GBIT ; +if (speeds &FDMI_PORT_SPEED_4GB ) + supported_speeds |=FC_PORTSPEED_4GBIT ; +if (speeds &FDMI_PORT_SPEED_2GB ) + supported_speeds |=FC_PORTSPEED_2GBIT ; +if (speeds &FDMI_PORT_SPEED_1GB ) + supported_speeds |=FC_PORTSPEED_1GBIT ; + +return supported_speeds; +} +void qla2x00_init_host_attr (scsi_qla_host_t *vha) {struct qla_hw_data *ha = vha->hw; -u32 speeds =FC_PORTSPEED_UNKNOWN ; +u32 speeds =0 , fdmi_speed =0 ;fc_host_dev_loss_tmo (vha->host) = ha->port_down_retry_count;fc_host_node_name (vha->host) =wwn_to_u64 (vha->node_name);
@@ -3344,7 +3367,8 @@ qla2x00_init_host_attr(scsi_qla_host_t *fc_host_max_npiv_vports (vha->host) = ha->max_npiv_vports;fc_host_npiv_vports_inuse (vha->host) = ha->cur_vport_count; - speeds =qla25xx_fdmi_port_speed_capability (ha); + fdmi_speed =qla25xx_fdmi_port_speed_capability (ha); + speeds =qla2x00_get_host_supported_speeds (vha, fdmi_speed);fc_host_supported_speeds (vha->host) = speeds; }
Greg Kroah-Hartman
maintainerPATCH 58/240 drm/amdgpu: Fix VRAM BO swap issue
In reply to Greg Kroah-HartmanFrom: Arunpravin Paneer Selvam <[email protected]>
commit 312b4dc11d4f74bfe03ea25ffe04c1f2fdd13cb9 upstream.
DRM buddy manager allocates the contiguous memory requests in a single block or multiple blocks. So for the ttm move operation (incase of low vram memory) we should consider all the blocks to compute the total memory size which compared with the struct ttm_resource num_pages in order to verify that the blocks are contiguous for the eviction process.
v2: Added a Fixes tag
v3: Rewrite the code to save a bit of calculations and
variables (Christian)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +12 -5
@@ -424,8 +424,9 @@ error:static bool amdgpu_mem_visible (struct amdgpu_device *adev,struct ttm_resource *mem) { -uint64_t mem_size = (u64 )mem->num_pages <<PAGE_SHIFT ; +u64 mem_size = (u64 )mem->num_pages <<PAGE_SHIFT ;struct amdgpu_res_cursor cursor; +u64 end;if (mem->mem_type ==TTM_PL_SYSTEM || mem->mem_type ==TTM_PL_TT )
@@ -434,12 +435,18 @@ static bool amdgpu_mem_visible(struct amreturn false;amdgpu_res_first (mem,0 , mem_size, &cursor); + end = cursor.start + cursor.size; +while (cursor.remaining) { +amdgpu_res_next (&cursor, cursor.size); -/* ttm_resource_ioremap only supports contiguous memory */ -if (cursor.size != mem_size) -return false; +/* ttm_resource_ioremap only supports contiguous memory */ +if (end != cursor.start) +return false; + + end = cursor.start + cursor.size; + } -return cursor.start + cursor.size <= adev->gmc.visible_vram_size; +return end <= adev->gmc.visible_vram_size; }/*
Greg Kroah-Hartman
maintainerPATCH 59/240 drm/amdgpu: Fix for BO move issue
In reply to Greg Kroah-HartmanFrom: Arunpravin Paneer Selvam <[email protected]>
commit 8273b4048664fff356fd10059033f0e2f5a422a1 upstream.
A user reported a bug on CAPE VERDE system where uvd_v3_1 IP component failed to initialize as there is an issue with BO move code from one memory to other.
In function amdgpu_mem_visible() called by amdgpu_bo_move(), when there are no blocks to compare or if we have a single block then break the loop.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -0
@@ -439,6 +439,9 @@ static bool amdgpu_mem_visible(struct amwhile (cursor.remaining) {amdgpu_res_next (&cursor, cursor.size); +if (!cursor.remaining) +break ; +/* ttm_resource_ioremap only supports contiguous memory */ if (end != cursor.start)return false;
Greg Kroah-Hartman
maintainerPATCH 60/240 drm/i915: Extend Wa_1607297627 to Alderlake-P
In reply to Greg Kroah-HartmanFrom: José Roberto de Souza <[email protected]>
commit 1a3abd12a394f5c66943fee75cef533069e831fb upstream.
Workaround 1607297627 was missed for Alderlake-P, so here extending it to it and adding the fixes tag so this WA is backported to all stable kernels.
v2:
- fixed subject
- added Fixes tag
BSpec: 54369
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -2
@@ -2301,11 +2301,11 @@ rcs_engine_wa_init(struct intel_engine_c }if (IS_DG1_GRAPHICS_STEP (i915,STEP_A0 ,STEP_B0 ) || -IS_ROCKETLAKE (i915) ||IS_TIGERLAKE (i915)) { +IS_ROCKETLAKE (i915) ||IS_TIGERLAKE (i915) ||IS_ALDERLAKE_P (i915)) {/* * Wa_1607030317:tgl * Wa_1607186500:tgl -* Wa_1607297627:tgl,rkl,dg1[a0] +* Wa_1607297627:tgl,rkl,dg1[a0],adlp * * On TGL and RKL there are multiple entries for this WA in the * BSpec; some indicate this is an A0-only WA, others indicate
Greg Kroah-Hartman
maintainerPATCH 61/240 drm/amdgpu: Remove ATC L2 access for MMHUB 2.1.x
In reply to Greg Kroah-HartmanFrom: Lijo Lazar <[email protected]>
commit d2c4c1569a7d7d5c8f75963bf2d62d7aeac30e2a upstream.
MMHUB 2.1.x versions don't have ATCL2. Remove accesses to ATCL2 registers.
Since they are non-existing registers, read access will cause a 'Completer Abort' and gets reported when AER is enabled with the below patch. Tagging with the patch so that this is backported along with it.
v2: squash in uninitialized warning fix (Nathan Chancellor)
--- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +8 -20
@@ -32,8 +32,6 @@#include "gc/gc_10_1_0_offset.h" #include "soc15_common.h" -#define mmMM_ATC_L2_MISC_CG_Sienna_Cichlid 0x064d -#define mmMM_ATC_L2_MISC_CG_Sienna_Cichlid_BASE_IDX 0#define mmDAGB0_CNTL_MISC2_Sienna_Cichlid 0x0070#define mmDAGB0_CNTL_MISC2_Sienna_Cichlid_BASE_IDX 0
@@ -574,7 +572,6 @@ static void mmhub_v2_0_update_medium_gracase IP_VERSION (2 ,1 ,0 ):case IP_VERSION (2 ,1 ,1 ):case IP_VERSION (2 ,1 ,2 ): - def = data =RREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG_Sienna_Cichlid); def1 = data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2_Sienna_Cichlid);break ;default :
@@ -608,8 +605,6 @@ static void mmhub_v2_0_update_medium_gracase IP_VERSION (2 ,1 ,0 ):case IP_VERSION (2 ,1 ,1 ):case IP_VERSION (2 ,1 ,2 ): -if (def != data) -WREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG_Sienna_Cichlid, data);if (def1 != data1)WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2_Sienna_Cichlid, data1);break ;
@@ -634,8 +629,8 @@ static void mmhub_v2_0_update_medium_gracase IP_VERSION (2 ,1 ,0 ):case IP_VERSION (2 ,1 ,1 ):case IP_VERSION (2 ,1 ,2 ): - def = data =RREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG_Sienna_Cichlid); -break ; +/* There is no ATCL2 in MMHUB for 2.1.x */ +return ;default : def = data =RREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG);break ;
@@ -646,18 +641,8 @@ static void mmhub_v2_0_update_medium_graelse data &= ~MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ; -if (def != data) { -switch (adev->ip_versions[MMHUB_HWIP ][0 ]) { -case IP_VERSION (2 ,1 ,0 ): -case IP_VERSION (2 ,1 ,1 ): -case IP_VERSION (2 ,1 ,2 ): -WREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG_Sienna_Cichlid, data); -break ; -default : -WREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG, data); -break ; - } - } +if (def != data) +WREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG, data); } static int mmhub_v2_0_set_clockgating(struct amdgpu_device *adev,
@@ -695,7 +680,10 @@ static void mmhub_v2_0_get_clockgating(scase IP_VERSION (2 ,1 ,0 ):case IP_VERSION (2 ,1 ,1 ):case IP_VERSION (2 ,1 ,2 ): - data =RREG32_SOC15 (MMHUB ,0 , mmMM_ATC_L2_MISC_CG_Sienna_Cichlid); +/* There is no ATCL2 in MMHUB for 2.1.x. Keep the status +* based on DAGB +*/ + data =MM_ATC_L2_MISC_CG__ENABLE_MASK ; data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2_Sienna_Cichlid);break ;default :
Greg Kroah-Hartman
maintainerPATCH 62/240 drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resume
In reply to Greg Kroah-HartmanFrom: Prike Liang <[email protected]>
commit d61e1d1d5225a9baeb995bcbdb904f66f70ed87e upstream.
In the S2idle suspend/resume phase the gfxoff is keeping functional so some IP blocks will be likely to reinitialize at gfxoff entry and that will result in failing to program GC registers.Therefore, let disallow gfxoff until AMDGPU IPs reinitialized completely.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +16 -0
@@ -3208,6 +3208,15 @@ static int amdgpu_device_ip_resume_phasereturn r; } adev->ip_blocks[i].status.hw = true; + +if (adev->in_s0ix && adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_SMC ) { +/* disable gfxoff for IP resume. The gfxoff will be re-enabled in +* amdgpu_device_resume() after IP resume. +*/ +amdgpu_gfx_off_ctrl (adev, false); +DRM_DEBUG ("will disable gfxoff for re-initializing other blocks\n" ); + } + }return 0 ;
@@ -4180,6 +4189,13 @@ int amdgpu_device_resume(struct drm_devi/* Make sure IB tests flushed */ flush_delayed_work (&adev->delayed_init_work); +if (adev->in_s0ix) { +/* re-enable gfxoff after IP resume. This re-enables gfxoff after +* it was disabled for IP resume in amdgpu_device_ip_resume_phase2(). +*/ +amdgpu_gfx_off_ctrl (adev, true); +DRM_DEBUG ("will enable gfxoff for the mission mode\n" ); + }if (fbcon)drm_fb_helper_set_suspend_unlocked (adev_to_drm (adev)->fb_helper, false);
Greg Kroah-Hartman
maintainerPATCH 63/240 drm/amdgpu: fix pstate setting issue
In reply to Greg Kroah-HartmanFrom: Chengming Gui <[email protected]>
commit 79610d3041338dc1ef554d6fd8b3b3e23be527f5 upstream.
[WHY]
0, original pstate X
1, ctx_A_create -> ctx_A->stable_pstate = X
2, ctx_A_set_pstate (Y) -> current pstate is Y (PEAK or STANDARD) 3, ctx_B_create -> ctx_B->stable_pstate = Y
4, ctx_A_destroy -> restore pstate to X
5, ctx_B_destroy -> restore pstate to Y
Above sequence will cause final pstate is wrong (Y), should be original X.
[HOW]
When ctx_B create,
if ctx_A touched pstate setting
(not auto, stable_pstate_ctx != NULL),
set ctx_B->stable_pstate the same value as ctx_A saved, if stable_pstate_ctx == NULL,
fetch current pstate to fill ctx_B->stable_pstate.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +4 -1
@@ -327,7 +327,10 @@ static int amdgpu_ctx_init(struct amdgpuif (r)return r; - ctx->stable_pstate = current_stable_pstate; +if (mgr->adev->pm.stable_pstate_ctx) + ctx->stable_pstate = mgr->adev->pm.stable_pstate_ctx->stable_pstate; +else + ctx->stable_pstate = current_stable_pstate;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 64/240 drm/amd/display: Revert logic for plane modifiers
In reply to Greg Kroah-HartmanFrom: Joaquín Ignacio Aramendía <[email protected]>
commit 809734c110548dca410fb0cca52e6b1540319f5e upstream.
This file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f ("drm/amd/display: Create a file dedicated to planes") and the logic in dm_plane_format_mod_supported() function got changed by a switch logic. That change broke drm_plane modifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1]
To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcube
With said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +++---------------- 1 file changed, 7 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +7 -43
@@ -1369,7 +1369,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format); -struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; +int i;enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;
@@ -1386,49 +1386,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 65/240 drm/amdkfd: update gfx1037 Lx cache setting
In reply to Greg Kroah-HartmanFrom: Prike Liang <[email protected]>
commit 9656db1b933caf6ffaaef10322093fe018359090 upstream.
Update the gfx1037 L1/L2 cache setting.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 53 +++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +52 -1
@@ -795,6 +795,54 @@ static struct kfd_gpu_cache_info yellow_ }, }; +static struct kfd_gpu_cache_info gfx1037_cache_info[] = { + { +/* TCP L1 Cache per CU */ + .cache_size =16 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =1 , + }, + { +/* Scalar L1 Instruction Cache per SQC */ + .cache_size =32 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_INST_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* Scalar L1 Data Cache per SQC */ + .cache_size =16 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* GL1 Data Cache per SA */ + .cache_size =128 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* L2 Data Cache per GPU (Total Tex Cache) */ + .cache_size =256 , + .cache_level =2 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, +}; +static void kfd_populated_cu_info_cpu (struct kfd_topology_device *dev,struct crat_subtype_computeunit *cu) {
@@ -1515,10 +1563,13 @@ static int kfd_fill_gpu_cache_info(strucbreak ;case IP_VERSION (10 ,3 ,3 ):case IP_VERSION (10 ,3 ,6 ):/* TODO: Double check these on production silicon */ -case IP_VERSION (10 ,3 ,7 ):/* TODO: Double check these on production silicon */ pcache_info = yellow_carp_cache_info; num_of_cache_types =ARRAY_SIZE (yellow_carp_cache_info);break ; +case IP_VERSION (10 ,3 ,7 ): + pcache_info = gfx1037_cache_info; + num_of_cache_types =ARRAY_SIZE (gfx1037_cache_info); +break ;case IP_VERSION (11 ,0 ,0 ):case IP_VERSION (11 ,0 ,1 ):case IP_VERSION (11 ,0 ,2 ):
Greg Kroah-Hartman
maintainerPATCH 66/240 drm/amdkfd: correct the cache info for gfx1036
In reply to Greg Kroah-HartmanFrom: Jesse Zhang <[email protected]>
commit 969758bbf5e9360b63bbb2328ac3fda46bbbc9f5 upstream.
correct the cache information for gfx1036
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 53 +++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +52 -1
@@ -843,6 +843,54 @@ static struct kfd_gpu_cache_info gfx1037 }, }; +static struct kfd_gpu_cache_info gc_10_3_6_cache_info[] = { + { +/* TCP L1 Cache per CU */ + .cache_size =16 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =1 , + }, + { +/* Scalar L1 Instruction Cache per SQC */ + .cache_size =32 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_INST_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* Scalar L1 Data Cache per SQC */ + .cache_size =16 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* GL1 Data Cache per SA */ + .cache_size =128 , + .cache_level =1 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, + { +/* L2 Data Cache per GPU (Total Tex Cache) */ + .cache_size =256 , + .cache_level =2 , + .flags = (CRAT_CACHE_FLAGS_ENABLED | +CRAT_CACHE_FLAGS_DATA_CACHE | +CRAT_CACHE_FLAGS_SIMD_CACHE ), + .num_cu_shared =2 , + }, +}; +static void kfd_populated_cu_info_cpu (struct kfd_topology_device *dev,struct crat_subtype_computeunit *cu) {
@@ -1562,10 +1610,13 @@ static int kfd_fill_gpu_cache_info(struc num_of_cache_types =ARRAY_SIZE (beige_goby_cache_info);break ;case IP_VERSION (10 ,3 ,3 ): -case IP_VERSION (10 ,3 ,6 ):/* TODO: Double check these on production silicon */ pcache_info = yellow_carp_cache_info; num_of_cache_types =ARRAY_SIZE (yellow_carp_cache_info);break ; +case IP_VERSION (10 ,3 ,6 ): + pcache_info = gc_10_3_6_cache_info; + num_of_cache_types =ARRAY_SIZE (gc_10_3_6_cache_info); +break ;case IP_VERSION (10 ,3 ,7 ): pcache_info = gfx1037_cache_info; num_of_cache_types =ARRAY_SIZE (gfx1037_cache_info);
Greg Kroah-Hartman
maintainerPATCH 67/240 drm/msm: fix use-after-free on probe deferral
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 6808abdb33bf90330e70a687d29f038507e06ebb upstream.
The bridge counter was never reset when tearing down the DRM device so that stale pointers to deallocated structures would be accessed on the next tear down (e.g. after a second late bind deferral).
Given enough bridges and a few probe deferrals this could currently also lead to data beyond the bridge array being corrupted.
Patchwork: https://patchwork.freedesktop.org/patch/502665/
--- drivers/gpu/drm/msm/msm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -241,6 +241,7 @@ static int msm_drm_uninit(struct devicefor (i =0 ; i < priv->num_bridges; i++)drm_bridge_remove (priv->bridges[i]); + priv->num_bridges =0 ;pm_runtime_get_sync (dev);msm_irq_uninstall (ddev);
Greg Kroah-Hartman
maintainerPATCH 68/240 drm/msm/dsi: fix memory corruption with too many bridges
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 2e786eb2f9cebb07e317226b60054df510b60c65 upstream.
Add the missing sanity check on the bridge counter to avoid corrupting data beyond the fixed-sized bridge array in case there are ever more than eight bridges.
Patchwork: https://patchwork.freedesktop.org/patch/502668/
--- drivers/gpu/drm/msm/dsi/dsi.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/msm/dsi/dsi.c +6 -0
@@ -227,6 +227,12 @@ int msm_dsi_modeset_init(struct msm_dsireturn -EINVAL ; priv = dev->dev_private; + +if (priv->num_bridges ==ARRAY_SIZE (priv->bridges)) { +DRM_DEV_ERROR (dev->dev,"too many bridges\n" ); +return -ENOSPC ; + } + msm_dsi->dev = dev; ret =msm_dsi_host_modeset_init (msm_dsi->host, dev);
Greg Kroah-Hartman
maintainerPATCH 69/240 drm/msm/hdmi: fix memory corruption with too many bridges
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 4c1294da6aed1f16d47a417dcfe6602833c3c95c upstream.
Add the missing sanity check on the bridge counter to avoid corrupting data beyond the fixed-sized bridge array in case there are ever more than eight bridges.
Patchwork: https://patchwork.freedesktop.org/patch/502670/
--- drivers/gpu/drm/msm/hdmi/hdmi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/msm/hdmi/hdmi.c +5 -0
@@ -300,6 +300,11 @@ int msm_hdmi_modeset_init(struct hdmi *hstruct platform_device *pdev = hdmi->pdev;int ret; +if (priv->num_bridges ==ARRAY_SIZE (priv->bridges)) { +DRM_DEV_ERROR (dev->dev,"too many bridges\n" ); +return -ENOSPC ; + } + hdmi->dev = dev; hdmi->encoder = encoder;
Greg Kroah-Hartman
maintainerPATCH 70/240 drm/msm/hdmi: fix IRQ lifetime
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 152d394842bb564148e68b92486a87db0bf54859 upstream.
Device-managed resources allocated post component bind must be tied to the lifetime of the aggregate DRM device or they will not necessarily be released when binding of the aggregate device is deferred.
This is specifically true for the HDMI IRQ, which will otherwise remain requested so that the next bind attempt fails when requesting the IRQ a second time.
Fix this by tying the device-managed lifetime of the HDMI IRQ to the DRM device so that it is released when bind fails.
Patchwork: https://patchwork.freedesktop.org/patch/502666/
--- drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/hdmi/hdmi.c +1 -1
@@ -344,7 +344,7 @@ int msm_hdmi_modeset_init(struct hdmi *h goto fail; } - ret =devm_request_irq (&pdev->dev, hdmi->irq, + ret =devm_request_irq (dev->dev, hdmi->irq, msm_hdmi_irq,IRQF_TRIGGER_HIGH ,"hdmi_isr" , hdmi);if (ret <0 ) {
Greg Kroah-Hartman
maintainerPATCH 71/240 drm/msm/dp: fix memory corruption with too many bridges
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 74466e46e7543c7f74f1502181e9ba93f7521374 upstream.
Add the missing sanity check on the bridge counter to avoid corrupting data beyond the fixed-sized bridge array in case there are ever more than eight bridges.
Patchwork: https://patchwork.freedesktop.org/patch/502664/
--- drivers/gpu/drm/msm/dp/dp_display.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/msm/dp/dp_display.c +6 -0
@@ -1597,6 +1597,12 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,return -EINVAL ; priv = dev->dev_private; + +if (priv->num_bridges ==ARRAY_SIZE (priv->bridges)) { +DRM_DEV_ERROR (dev->dev,"too many bridges\n" ); +return -ENOSPC ; + } + dp_display->drm_dev = dev; dp_priv = container_of(dp_display, struct dp_display_private, dp_display);
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 72/240 drm/msm/dp: fix aux-bus EP lifetime
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 2b57f726611e294dc4297dd48eb8c98ef1938e82 upstream.
Device-managed resources allocated post component bind must be tied to the lifetime of the aggregate DRM device or they will not necessarily be released when binding of the aggregate device is deferred.
This can lead resource leaks or failure to bind the aggregate device when binding is later retried and a second attempt to allocate the resources is made.
For the DP aux-bus, an attempt to populate the bus a second time will simply fail ("DP AUX EP device already populated").
Fix this by tying the lifetime of the EP device to the DRM device rather than DP controller platform device.
Patchwork: https://patchwork.freedesktop.org/patch/502672/
--- drivers/gpu/drm/msm/dp/dp_display.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_display.c +12 -1
@@ -1528,6 +1528,11 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor) } } +static void of_dp_aux_depopulate_bus_void (void *data) +{ +of_dp_aux_depopulate_bus (data); +} +static int dp_display_get_next_bridge (struct msm_dp *dp) {int rc;
@@ -1552,10 +1557,16 @@ static int dp_display_get_next_bridge(struct msm_dp *dp)* panel driver is probed asynchronously but is the best we * can do without a bigger driver reorganization. */ - rc =devm_of_dp_aux_populate_ep_devices (dp_priv->aux); + rc =of_dp_aux_populate_bus (dp_priv->aux,NULL );of_node_put (aux_bus);if (rc) goto error; + + rc =devm_add_action_or_reset (dp->drm_dev->dev, + of_dp_aux_depopulate_bus_void, + dp_priv->aux); +if (rc) + goto error; }else if (dp->is_edp) {DRM_ERROR ("eDP aux_bus not found\n" );return -ENODEV ;
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 73/240 drm/msm/dp: fix IRQ lifetime
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a79343dcaba4b11adb57350e0b6426906a9b658e upstream.
Device-managed resources allocated post component bind must be tied to the lifetime of the aggregate DRM device or they will not necessarily be released when binding of the aggregate device is deferred.
This is specifically true for the DP IRQ, which will otherwise remain requested so that the next bind attempt fails when requesting the IRQ a second time.
Since commit c3bf8e21b38a ("drm/msm/dp: Add eDP support via aux_bus") this can happen when the aux-bus panel driver has not yet been loaded so that probe is deferred.
Fix this by tying the device-managed lifetime of the DP IRQ to the DRM device so that it is released when bind fails.
Patchwork: https://patchwork.freedesktop.org/patch/502679/
--- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_display.c +1 -1
@@ -1249,7 +1249,7 @@ int dp_display_request_irq(struct msm_dpreturn -EINVAL ; } - rc =devm_request_irq (&dp->pdev->dev, dp->irq, + rc =devm_request_irq (dp_display->drm_dev->dev, dp->irq, dp_display_irq_handler,IRQF_TRIGGER_HIGH ,"dp_display_isr" , dp);if (rc <0 ) {
Greg Kroah-Hartman
maintainerPATCH 74/240 drm/msm/dp: fix bridge lifetime
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 16194958f888d63839042d1190f7001e5ddec47b upstream.
Device-managed resources allocated post component bind must be tied to the lifetime of the aggregate DRM device or they will not necessarily be released when binding of the aggregate device is deferred.
This can lead resource leaks or failure to bind the aggregate device when binding is later retried and a second attempt to allocate the resources is made.
For the DP bridges, previously allocated bridges will leak on probe deferral.
Fix this by amending the DP parser interface and tying the lifetime of the bridge device to the DRM device rather than DP platform device.
Patchwork: https://patchwork.freedesktop.org/patch/502667/
--- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- drivers/gpu/drm/msm/dp/dp_parser.c | 6 +++--- drivers/gpu/drm/msm/dp/dp_parser.h | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +1 -1
@@ -1579,7 +1579,7 @@ static int dp_display_get_next_bridge(struct msm_dp *dp)* For DisplayPort interfaces external bridges are optional, so * silently ignore an error if one is not present (-ENODEV). */ - rc =dp_parser_find_next_bridge (dp_priv->parser); + rc =devm_dp_parser_find_next_bridge (dp->drm_dev->dev, dp_priv->parser);if (!dp->is_edp && rc == -ENODEV )return 0 ;
drivers/gpu/drm/msm/dp/dp_parser.c +3 -3
@@ -240,12 +240,12 @@ static int dp_parser_clock(struct dp_parser *parser)return 0 ; } -int dp_parser_find_next_bridge (struct dp_parser *parser) +int devm_dp_parser_find_next_bridge (struct device *dev,struct dp_parser *parser) { -struct device *dev = &parser->pdev->dev; +struct platform_device *pdev = parser->pdev;struct drm_bridge *bridge; - bridge =devm_drm_of_get_bridge (dev, dev->of_node,1 ,0 ); + bridge =devm_drm_of_get_bridge (dev, pdev->dev.of_node,1 ,0 );if (IS_ERR (bridge))return PTR_ERR (bridge);
drivers/gpu/drm/msm/dp/dp_parser.h +3 -2
@@ -138,8 +138,9 @@ struct dp_parser {struct dp_parser *dp_parser_get (struct platform_device *pdev);/** -* dp_parser_find_next_bridge() - find an additional bridge to DP +* devm_dp_parser_find_next_bridge() - find an additional bridge to DP * +* @dev: device to tie bridge lifetime to * @parser: dp_parser data from client * * This function is used to find any additional bridge attached to
@@ -147,6 +148,6 @@ struct dp_parser *dp_parser_get(struct platform_device *pdev);* * Return: 0 if able to get the bridge, otherwise negative errno for failure. */ -int dp_parser_find_next_bridge (struct dp_parser *parser); +int devm_dp_parser_find_next_bridge (struct device *dev,struct dp_parser *parser);#endif
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 75/240 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned
In reply to Greg Kroah-HartmanFrom: Nathan Huckleberry <[email protected]>
commit 9f6035af06b526e678808d492fc0830aef6cfbd8 upstream.
crypto_tfm::__crt_ctx is not guaranteed to be 16-byte aligned on x86-64. This causes crashes due to movaps instructions in clmul_polyval_update.
Add logic to align polyval_tfm_ctx to 16 bytes.
--- arch/x86/crypto/polyval-clmulni_glue.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
arch/x86/crypto/polyval-clmulni_glue.c +14 -5
@@ -27,13 +27,17 @@#include <asm/cpu_device_id.h> #include <asm/simd.h> +#define POLYVAL_ALIGN 16 +#define POLYVAL_ALIGN_ATTR __aligned(POLYVAL_ALIGN) +#define POLYVAL_ALIGN_EXTRA ((POLYVAL_ALIGN - 1) & ~(CRYPTO_MINALIGN - 1)) +#define POLYVAL_CTX_SIZE (sizeof(struct polyval_tfm_ctx) + POLYVAL_ALIGN_EXTRA)#define NUM_KEY_POWERS 8struct polyval_tfm_ctx {/* * These powers must be in the order h^8, ..., h^1. */ -u8 key_powers[NUM_KEY_POWERS ][POLYVAL_BLOCK_SIZE ]; + u8 key_powers[NUM_KEY_POWERS][POLYVAL_BLOCK_SIZE] POLYVAL_ALIGN_ATTR; };struct polyval_desc_ctx {
@@ -45,6 +49,11 @@ asmlinkage void clmul_polyval_update(const struct polyval_tfm_ctx *keys, const u8 *in, size_t nblocks, u8 *accumulator); asmlinkage void clmul_polyval_mul(u8 *op1, const u8 *op2); +static inline struct polyval_tfm_ctx *polyval_tfm_ctx (struct crypto_shash *tfm) +{ +return PTR_ALIGN (crypto_shash_ctx (tfm),POLYVAL_ALIGN ); +} +static void internal_polyval_update (const struct polyval_tfm_ctx *keys,const u8 *in,size_t nblocks,u8 *accumulator) {
@@ -72,7 +81,7 @@ static void internal_polyval_mul(u8 *op1, const u8 *op2)static int polyval_x86_setkey (struct crypto_shash *tfm,const u8 *key,unsigned int keylen) { -struct polyval_tfm_ctx *tctx =crypto_shash_ctx (tfm); +struct polyval_tfm_ctx *tctx =polyval_tfm_ctx (tfm);int i;if (keylen !=POLYVAL_BLOCK_SIZE )
@@ -102,7 +111,7 @@ static int polyval_x86_update(struct shash_desc *desc, const u8 *src, unsigned int srclen) {struct polyval_desc_ctx *dctx =shash_desc_ctx (desc); -const struct polyval_tfm_ctx *tctx =crypto_shash_ctx (desc->tfm); +const struct polyval_tfm_ctx *tctx =polyval_tfm_ctx (desc->tfm);u8 *pos;unsigned int nblocks;unsigned int n;
@@ -143,7 +152,7 @@ static int polyval_x86_update(struct shash_desc *desc,static int polyval_x86_final (struct shash_desc *desc,u8 *dst) {struct polyval_desc_ctx *dctx =shash_desc_ctx (desc); -const struct polyval_tfm_ctx *tctx =crypto_shash_ctx (desc->tfm); +const struct polyval_tfm_ctx *tctx =polyval_tfm_ctx (desc->tfm);if (dctx->bytes) { internal_polyval_mul(dctx->buffer,
@@ -167,7 +176,7 @@ static struct shash_alg polyval_alg = { .cra_driver_name = "polyval-clmulni", .cra_priority = 200, .cra_blocksize = POLYVAL_BLOCK_SIZE, - .cra_ctxsize = sizeof(struct polyval_tfm_ctx), + .cra_ctxsize = POLYVAL_CTX_SIZE, .cra_module = THIS_MODULE, }, };
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 76/240 random: use arch_get_random*_early() in random_init()
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
commit f5e4ec155d145002fd9840868453d785fab86d42 upstream.
While reworking the archrandom handling, commit d349ab99eec7 ("random:
handle archrandom with multiple longs") switched to the non-early archrandom helpers in random_init(), which broke initialization of the entropy pool from the arm64 random generator.
Indeed at that point the arm64 CPU features, which verify that all CPUs have compatible capabilities, are not finalized so arch_get_random_seed_longs() is unsuccessful. Instead random_init() should use the _early functions, which check only the boot CPU on arm64. On other architectures the _early functions directly call the normal ones.
--- drivers/char/random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/random.c +2 -2
@@ -793,13 +793,13 @@ int __init random_init(const char *comma#endif for (i =0 , arch_bits =sizeof (entropy) *8 ; i <ARRAY_SIZE (entropy);) { - longs =arch_get_random_seed_longs (entropy,ARRAY_SIZE (entropy) - i); + longs =arch_get_random_seed_longs_early (entropy,ARRAY_SIZE (entropy) - i);if (longs) {_mix_pool_bytes (entropy,sizeof (*entropy) * longs); i += longs;continue ; } - longs =arch_get_random_longs (entropy,ARRAY_SIZE (entropy) - i); + longs =arch_get_random_longs_early (entropy,ARRAY_SIZE (entropy) - i);if (longs) {_mix_pool_bytes (entropy,sizeof (*entropy) * longs); i += longs;
Greg Kroah-Hartman
maintainerPATCH 77/240 coresight: cti: Fix hang in cti_disable_hw()
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
commit 6746eae4bbaddcc16b40efb33dab79210828b3ce upstream.
cti_enable_hw() and cti_disable_hw() are called from an atomic context so shouldn't use runtime PM because it can result in a sleep when communicating with firmware.
Since commit 3c6656337852 ("Revert "firmware: arm_scmi: Add clock management to the SCMI power domain""), this causes a hang on Juno when running the Perf Coresight tests or running this command:
perf record -e cs_etm//u -- ls
This was also missed until the revert commit because pm_runtime_put() was called with the wrong device until commit 692c9a499b28 ("coresight:
cti: Correct the parameter for pm_runtime_put")
With lock and scheduler debugging enabled the following is output:
coresight cti_sys0: cti_enable_hw -- dev:cti_sys0 parent: 20020000.cti
BUG: sleeping function called from invalid context at drivers/base/power/runtime.c:1151
in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 330, name: perf-exec
preempt_count: 2, expected: 0
RCU nest depth: 0, expected: 0
INFO: lockdep is turned off.
irq event stamp: 0
hardirqs last enabled at (0): [<0000000000000000>] 0x0
hardirqs last disabled at (0): [<ffff80000822b394>] copy_process+0xa0c/0x1948
softirqs last enabled at (0): [<ffff80000822b394>] copy_process+0xa0c/0x1948
softirqs last disabled at (0): [<0000000000000000>] 0x0
CPU: 3 PID: 330 Comm: perf-exec Not tainted 6.0.0-00053-g042116d99298 #7
Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Sep 13 2022
Call trace:
dump_backtrace+0x134/0x140
show_stack+0x20/0x58
dump_stack_lvl+0x8c/0xb8
dump_stack+0x18/0x34
__might_resched+0x180/0x228
__might_sleep+0x50/0x88
__pm_runtime_resume+0xac/0xb0
cti_enable+0x44/0x120
coresight_control_assoc_ectdev+0xc0/0x150
coresight_enable_path+0xb4/0x288
etm_event_start+0x138/0x170
etm_event_add+0x48/0x70
event_sched_in.isra.122+0xb4/0x280
merge_sched_in+0x1fc/0x3d0
visit_groups_merge.constprop.137+0x16c/0x4b0
ctx_sched_in+0x114/0x1f0
perf_event_sched_in+0x60/0x90
ctx_resched+0x68/0xb0
perf_event_exec+0x138/0x508
begin_new_exec+0x52c/0xd40
load_elf_binary+0x6b8/0x17d0
bprm_execve+0x360/0x7f8
do_execveat_common.isra.47+0x218/0x238
__arm64_sys_execve+0x48/0x60
invoke_syscall+0x4c/0x110
el0_svc_common.constprop.4+0xfc/0x120
do_el0_svc+0x34/0xc0
el0_svc+0x40/0x98
el0t_64_sync_handler+0x98/0xc0
el0t_64_sync+0x170/0x174Fix the issue by removing the runtime PM calls completely. They are not needed here because it must have already been done when building the path for a trace.
--- drivers/hwtracing/coresight/coresight-cti-core.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/hwtracing/coresight/coresight-cti-core.c +0 -5
@@ -90,11 +90,9 @@ void cti_write_all_hw_regs(struct cti_drstatic int cti_enable_hw (struct cti_drvdata *drvdata) {struct cti_config *config = &drvdata->config; -struct device *dev = &drvdata->csdev->dev;unsigned long flags;int rc =0 ; -pm_runtime_get_sync (dev->parent);spin_lock_irqsave (&drvdata->spinlock, flags);/* no need to do anything if enabled or unpowered*/
@@ -119,7 +117,6 @@ cti_state_unchanged:/* cannot enable due to error */ cti_err_not_enabled:spin_unlock_irqrestore (&drvdata->spinlock, flags); -pm_runtime_put (dev->parent);return rc; }
@@ -153,7 +150,6 @@ cti_hp_not_enabled:static int cti_disable_hw (struct cti_drvdata *drvdata) {struct cti_config *config = &drvdata->config; -struct device *dev = &drvdata->csdev->dev;struct coresight_device *csdev = drvdata->csdev;spin_lock (&drvdata->spinlock);
@@ -175,7 +171,6 @@ static int cti_disable_hw(struct cti_drvcoresight_disclaim_device_unlocked (csdev);CS_LOCK (drvdata->base);spin_unlock (&drvdata->spinlock); -pm_runtime_put (dev->parent);return 0 ;/* not disabled this call */
Greg Kroah-Hartman
maintainerPATCH 78/240 mmc: sdhci_am654: select, not depends REGMAP_MMIO
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 8d280b1df87e0b3d1355aeac7e62b62214b93f1c upstream.
REGMAP_MMIO is not user-configurable, so we can only satisfy this dependency by enabling some other Kconfig symbol that properly 'select's it. Use select like everybody else.
Noticed when trying to enable this driver for compile testing.
--- drivers/mmc/host/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/Kconfig +2 -1
@@ -1074,9 +1074,10 @@ config MMC_SDHCI_OMAP config MMC_SDHCI_AM654 tristate "Support for the SDHCI Controller in TI's AM654 SOCs" - depends on MMC_SDHCI_PLTFM && OF && REGMAP_MMIO + depends on MMC_SDHCI_PLTFM && OF select MMC_SDHCI_IO_ACCESSORS select MMC_CQHCI + select REGMAP_MMIO help This selects the Secure Digital Host Controller Interface (SDHCI) support present in TI's AM654 SOCs. The controller supports
Greg Kroah-Hartman
maintainerPATCH 79/240 mmc: block: Remove error check of hw_reset on reset
In reply to Greg Kroah-HartmanFrom: Christian Löhle <[email protected]>
commit 406e14808ee695cbae1eafa5fd3ac563c29470ab upstream.
Before switching back to the right partition in mmc_blk_reset there used to be a check if hw_reset was even supported. This return value was removed, so there is no reason to check. Furthermore ensure part_curr is not falsely set to a valid value on reset or partition switch error.
As part of this change the code paths of mmc_blk_reset calls were checked to ensure no commands are issued after a failed mmc_blk_reset directly without going through the block layer.
--- drivers/mmc/core/block.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-)
drivers/mmc/core/block.c +26 -18
@@ -134,6 +134,7 @@ struct mmc_blk_data {* track of the current selected device partition. */ unsigned int part_curr; +#define MMC_BLK_PART_INVALID UINT_MAX/* Unknown partition active */ int area_type;/* debugfs files (only in main mmc_blk_data) */
@@ -987,33 +988,39 @@ static unsigned int mmc_blk_data_timeoutreturn ms; } +/* +* Attempts to reset the card and get back to the requested partition. +* Therefore any error here must result in cancelling the block layer +* request, it must not be reattempted without going through the mmc_blk +* partition sanity checks. +*/ static int mmc_blk_reset (struct mmc_blk_data *md,struct mmc_host *host,int type) {int err; +struct mmc_blk_data *main_md =dev_get_drvdata (&host->card->dev);if (md->reset_done & type)return -EEXIST ; md->reset_done |= type; err =mmc_hw_reset (host->card); +/* +* A successful reset will leave the card in the main partition, but +* upon failure it might not be, so set it to MMC_BLK_PART_INVALID +* in that case. +*/ + main_md->part_curr = err ?MMC_BLK_PART_INVALID : main_md->part_type; +if (err) +return err;/* Ensure we switch back to the correct partition */ -if (err) { -struct mmc_blk_data *main_md = -dev_get_drvdata (&host->card->dev); -int part_err; - - main_md->part_curr = main_md->part_type; - part_err =mmc_blk_part_switch (host->card, md->part_type); -if (part_err) { -/* -* We have failed to get back into the correct -* partition, so we need to abort the whole request. -*/ -return -ENODEV ; - } - } -return err; +if (mmc_blk_part_switch (host->card, md->part_type)) +/* +* We have failed to get back into the correct +* partition, so we need to abort the whole request. +*/ +return -ENODEV ; +return 0 ; }static inline void mmc_blk_reset_success (struct mmc_blk_data *md,int type)
@@ -1871,8 +1878,9 @@ static void mmc_blk_mq_rw_recovery(strucreturn ;/* Reset before last retry */ -if (mqrq->retries +1 ==MMC_MAX_RETRIES ) -mmc_blk_reset (md, card->host, type); +if (mqrq->retries +1 ==MMC_MAX_RETRIES && +mmc_blk_reset (md, card->host, type)) +return ;/* Command errors fail fast, so use all MMC_MAX_RETRIES */ if (brq->sbc.error || brq->cmd.error)
Greg Kroah-Hartman
maintainerPATCH 80/240 mmc: queue: Cancel recovery work on cleanup
In reply to Greg Kroah-HartmanFrom: Christian Löhle <[email protected]>
commit 339e3eb1facd18a98ceb1171d70674780e5014a7 upstream.
To prevent any recovery work running after the queue cleanup cancel it. Any recovery running post-cleanup dereferenced mq->card as NULL and was not meaningful to begin with.
--- drivers/mmc/core/queue.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/core/queue.c +7 -0
@@ -493,6 +493,13 @@ void mmc_cleanup_queue(struct mmc_queueif (blk_queue_quiesced (q))blk_mq_unquiesce_queue (q); +/* +* If the recovery completes the last (and only remaining) request in +* the queue, and the card has been removed, we could end up here with +* the recovery not quite finished yet, so cancel it. +*/ +cancel_work_sync (&mq->recovery_work); +blk_mq_free_tag_set (&mq->tag_set);/*
Greg Kroah-Hartman
maintainerPATCH 81/240 mmc: core: Fix kernel panic when remove non-standard SDIO card
In reply to Greg Kroah-HartmanFrom: Matthew Ma <[email protected]>
commit 9972e6b404884adae9eec7463e30d9b3c9a70b18 upstream.
SDIO tuple is only allocated for standard SDIO card, especially it causes memory corruption issues when the non-standard SDIO card has removed, which is because the card device's reference counter does not increase for it at sdio_init_func(), but all SDIO card device reference counter gets decreased at sdio_release_func().
--- drivers/mmc/core/sdio_bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/core/sdio_bus.c +2 -1
@@ -291,7 +291,8 @@ static void sdio_release_func(struct dev {struct sdio_func *func =dev_to_sdio_func (dev); -sdio_free_func_cis (func); +if (!(func->card->quirks &MMC_QUIRK_NONSTD_SDIO )) +sdio_free_func_cis (func);kfree (func->info);kfree (func->tmpbuf);
Greg Kroah-Hartman
maintainerPATCH 82/240 mmc: core: Fix WRITE_ZEROES CQE handling
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
commit 028822b714bd3a159d65416c53f1549345b53d9e upstream.
WRITE_ZEROES requests use TRIM, so mark them as needing to be issued synchronously even when a CQE is being used. Without this, mmc_blk_mq_issue_rq() triggers a WARN_ON_ONCE() and fails the request since we don't have any handling for issuing this asynchronously.
--- drivers/mmc/core/queue.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/core/queue.c +1 -0
@@ -48,6 +48,7 @@ static enum mmc_issue_type mmc_cqe_issue_type(struct mmc_host *host,case REQ_OP_DRV_OUT :case REQ_OP_DISCARD :case REQ_OP_SECURE_ERASE : +case REQ_OP_WRITE_ZEROES :return MMC_ISSUE_SYNC ;case REQ_OP_FLUSH :return mmc_cqe_can_dcmd (host) ?MMC_ISSUE_DCMD :MMC_ISSUE_SYNC ;
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 83/240 mmc: sdhci-pci-core: Disable ES for ASUS BIOS on Jasper Lake
In reply to Greg Kroah-HartmanFrom: Patrick Thompson <[email protected]>
commit 9dc0033e4658d6f9d9952c3c0c6be3ec25bc2985 upstream.
Enhanced Strobe (ES) does not work correctly on the ASUS 1100 series of devices. Jasper Lake eMMCs (pci_id 8086:4dc4) are supposed to support ES. There are also two system families under the series, thus this is being scoped to the ASUS BIOS.
The failing ES prevents the installer from writing to disk. Falling back to HS400 without ES fixes the issue.
--- drivers/mmc/host/sdhci-pci-core.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci-pci-core.c +11 -3
@@ -893,6 +893,12 @@ static bool glk_broken_cqhci(struct sdhc dmi_match(DMI_SYS_VENDOR, "IRBIS")); } +static bool jsl_broken_hs400es (struct sdhci_pci_slot *slot) +{ +return slot->chip->pdev->device ==PCI_DEVICE_ID_INTEL_JSL_EMMC && +dmi_match (DMI_BIOS_VENDOR ,"ASUSTeK COMPUTER INC." ); +} +static int glk_emmc_probe_slot (struct sdhci_pci_slot *slot) {int ret =byt_emmc_probe_slot (slot);
@@ -901,9 +907,11 @@ static int glk_emmc_probe_slot(struct sd slot->host->mmc->caps2 |=MMC_CAP2_CQE ;if (slot->chip->pdev->device !=PCI_DEVICE_ID_INTEL_GLK_EMMC ) { - slot->host->mmc->caps2 |=MMC_CAP2_HS400_ES ; - slot->host->mmc_host_ops.hs400_enhanced_strobe = - intel_hs400_enhanced_strobe; +if (!jsl_broken_hs400es (slot)) { + slot->host->mmc->caps2 |=MMC_CAP2_HS400_ES ; + slot->host->mmc_host_ops.hs400_enhanced_strobe = + intel_hs400_enhanced_strobe; + } slot->host->mmc->caps2 |=MMC_CAP2_CQE_DCMD ; }
Greg Kroah-Hartman
maintainerPATCH 84/240 mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit bus
In reply to Greg Kroah-HartmanFrom: Sascha Hauer <[email protected]>
commit 1ed5c3b22fc78735c539e4767832aea58db6761c upstream.
The core issues the warning "drop HS400 support since no 8-bit bus" when one of the ESDHC_FLAG_HS400* flags is set on a non 8bit capable host. To avoid this warning set these flags only on hosts that actually can do 8bit, i.e. have bus-width = <8> set in the device tree.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +8 -6
@@ -1660,6 +1660,10 @@ static int sdhci_esdhc_imx_probe(struct host->mmc_host_ops.execute_tuning = usdhc_execute_tuning; } + err =sdhci_esdhc_imx_probe_dt (pdev, host, imx_data); +if (err) + goto disable_ahb_clk; +if (imx_data->socdata->flags &ESDHC_FLAG_MAN_TUNING ) sdhci_esdhc_ops.platform_execute_tuning = esdhc_executing_tuning;
@@ -1667,13 +1671,15 @@ static int sdhci_esdhc_imx_probe(structif (imx_data->socdata->flags &ESDHC_FLAG_ERR004536 ) host->quirks |=SDHCI_QUIRK_BROKEN_ADMA ; -if (imx_data->socdata->flags &ESDHC_FLAG_HS400 ) +if (host->caps &MMC_CAP_8_BIT_DATA && + imx_data->socdata->flags &ESDHC_FLAG_HS400 ) host->mmc->caps2 |=MMC_CAP2_HS400 ;if (imx_data->socdata->flags &ESDHC_FLAG_BROKEN_AUTO_CMD23 ) host->quirks2 |=SDHCI_QUIRK2_ACMD23_BROKEN ; -if (imx_data->socdata->flags &ESDHC_FLAG_HS400_ES ) { +if (host->caps &MMC_CAP_8_BIT_DATA && + imx_data->socdata->flags &ESDHC_FLAG_HS400_ES ) { host->mmc->caps2 |=MMC_CAP2_HS400_ES ; host->mmc_host_ops.hs400_enhanced_strobe = esdhc_hs400_enhanced_strobe;
@@ -1695,10 +1701,6 @@ static int sdhci_esdhc_imx_probe(struct goto disable_ahb_clk; } - err =sdhci_esdhc_imx_probe_dt (pdev, host, imx_data); -if (err) - goto disable_ahb_clk; -sdhci_esdhc_imx_hwinit (host); err =sdhci_add_host (host);
Greg Kroah-Hartman
maintainerPATCH 85/240 counter: microchip-tcb-capture: Handle Signal1 read and Synapse
In reply to Greg Kroah-HartmanFrom: William Breathitt Gray <[email protected]>
commit d917a62af81b133f35f627e7936e193c842a7947 upstream.
The signal_read(), action_read(), and action_write() callbacks have been assuming Signal0 is requested without checking. This results in requests for Signal1 returning data for Signal0. This patch fixes these oversights by properly checking for the Signal's id in the respective callbacks and handling accordingly based on the particular Signal requested. The trig_inverted member of the mchp_tc_data is removed as superfluous.
--- drivers/counter/microchip-tcb-capture.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/counter/microchip-tcb-capture.c +14 -4
@@ -28,7 +28,6 @@ struct mchp_tc_data {int qdec_mode;int num_channels;int channel[2 ]; -bool trig_inverted; };static const enum counter_function mchp_tc_count_functions[] = {
@@ -153,7 +152,7 @@ static int mchp_tc_count_signal_read(strregmap_read (priv->regmap,ATMEL_TC_REG (priv->channel[0 ],SR ), &sr); -if (priv->trig_inverted) +if (signal->id ==1 ) sigstatus = (sr &ATMEL_TC_MTIOB );else sigstatus = (sr &ATMEL_TC_MTIOA );
@@ -171,6 +170,17 @@ static int mchp_tc_count_action_read(strstruct mchp_tc_data *const priv =counter_priv (counter);u32 cmr; +if (priv->qdec_mode) { + *action =COUNTER_SYNAPSE_ACTION_BOTH_EDGES ; +return 0 ; + } + +/* Only TIOA signal is evaluated in non-QDEC mode */ +if (synapse->signal->id !=0 ) { + *action =COUNTER_SYNAPSE_ACTION_NONE ; +return 0 ; + } +regmap_read (priv->regmap,ATMEL_TC_REG (priv->channel[0 ],CMR ), &cmr);switch (cmr &ATMEL_TC_ETRGEDG ) {
@@ -199,8 +209,8 @@ static int mchp_tc_count_action_write(ststruct mchp_tc_data *const priv =counter_priv (counter);u32 edge =ATMEL_TC_ETRGEDG_NONE ; -/* QDEC mode is rising edge only */ -if (priv->qdec_mode) +/* QDEC mode is rising edge only; only TIOA handled in non-QDEC mode */ +if (priv->qdec_mode || synapse->signal->id !=0 )return -EINVAL ;switch (action) {
Greg Kroah-Hartman
maintainerPATCH 86/240 counter: 104-quad-8: Fix race getting function mode and direction
In reply to Greg Kroah-HartmanFrom: William Breathitt Gray <[email protected]>
commit d501d37841d3b7f18402d71a9ef057eb9dde127e upstream.
The quad8_action_read() function checks the Count function mode and Count direction without first acquiring a lock. This is a race condition because the function mode could change by the time the direction is checked.
Because the quad8_function_read() already acquires a lock internally, the quad8_function_read() is refactored to spin out the no-lock code to a new quad8_function_get() function.
To resolve the race condition in quad8_action_read(), a lock is acquired before calling quad8_function_get() and quad8_direction_read() in order to get both function mode and direction atomically.
--- drivers/counter/104-quad-8.c | 64 ++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 22 deletions(-)
drivers/counter/104-quad-8.c +42 -22
@@ -231,34 +231,45 @@ static const enum counter_function quad8 COUNTER_FUNCTION_QUADRATURE_X4, }; +static int quad8_function_get (const struct quad8 *const priv,const size_t id, +enum counter_function *const function) +{ +if (!priv->quadrature_mode[id]) { + *function =COUNTER_FUNCTION_PULSE_DIRECTION ; +return 0 ; + } + +switch (priv->quadrature_scale[id]) { +case 0 : + *function =COUNTER_FUNCTION_QUADRATURE_X1_A ; +return 0 ; +case 1 : + *function =COUNTER_FUNCTION_QUADRATURE_X2_A ; +return 0 ; +case 2 : + *function =COUNTER_FUNCTION_QUADRATURE_X4 ; +return 0 ; +default : +/* should never reach this path */ +return -EINVAL ; + } +} +static int quad8_function_read (struct counter_device *counter,struct counter_count *count,enum counter_function *function) {struct quad8 *const priv =counter_priv (counter); -const int id = count->id;unsigned long irqflags; +int retval;spin_lock_irqsave (&priv->lock, irqflags); -if (priv->quadrature_mode[id]) -switch (priv->quadrature_scale[id]) { -case 0 : - *function =COUNTER_FUNCTION_QUADRATURE_X1_A ; -break ; -case 1 : - *function =COUNTER_FUNCTION_QUADRATURE_X2_A ; -break ; -case 2 : - *function =COUNTER_FUNCTION_QUADRATURE_X4 ; -break ; - } -else - *function =COUNTER_FUNCTION_PULSE_DIRECTION ; + retval =quad8_function_get (priv, count->id, function);spin_unlock_irqrestore (&priv->lock, irqflags); -return 0 ; +return retval; } static int quad8_function_write(struct counter_device *counter,
@@ -358,6 +369,7 @@ static int quad8_action_read(struct coun enum counter_synapse_action *action) {struct quad8 *const priv =counter_priv (counter); +unsigned long irqflags;int err;enum counter_function function;const size_t signal_a_id = count->synapses[0 ].signal->id;
@@ -373,9 +385,21 @@ static int quad8_action_read(struct counreturn 0 ; } - err =quad8_function_read (counter, count, &function); -if (err) +spin_lock_irqsave (&priv->lock, irqflags); + +/* Get Count function and direction atomically */ + err =quad8_function_get (priv, count->id, &function); +if (err) { +spin_unlock_irqrestore (&priv->lock, irqflags);return err; + } + err =quad8_direction_read (counter, count, &direction); +if (err) { +spin_unlock_irqrestore (&priv->lock, irqflags); +return err; + } + +spin_unlock_irqrestore (&priv->lock, irqflags);/* Default action mode */ *action =COUNTER_SYNAPSE_ACTION_NONE ;
@@ -388,10 +412,6 @@ static int quad8_action_read(struct counreturn 0 ;case COUNTER_FUNCTION_QUADRATURE_X1_A :if (synapse->signal->id == signal_a_id) { - err =quad8_direction_read (counter, count, &direction); -if (err) -return err; -if (direction ==COUNTER_COUNT_DIRECTION_FORWARD ) *action =COUNTER_SYNAPSE_ACTION_RISING_EDGE ;else
Greg Kroah-Hartman
maintainerPATCH 87/240 mm/uffd: fix vma check on userfault for wp
In reply to Greg Kroah-HartmanFrom: Peter Xu <[email protected]>
commit 67eae54bc227b30dedcce9db68b063ba1adb7838 upstream.
We used to have a report that pte-marker code can be reached even when uffd-wp is not compiled in for file memories, here:
https://lore.kernel.org/all/YzeR+R6b4bwBlBHh@x1n/T/#u
I just got time to revisit this and found that the root cause is we simply messed up with the vma check, so that for !PTE_MARKER_UFFD_WP system, we will allow UFFDIO_REGISTER of MINOR & WP upon shmem as the check was wrong:
if (vm_flags & VM_UFFD_MINOR)
return is_vm_hugetlb_page(vma) || vma_is_shmem(vma);
Where we'll allow anything to pass on shmem as long as minor mode is requested.
Axel did it right when introducing minor mode but I messed it up in b1f9e876862d when moving code around. Fix it.
--- include/linux/userfaultfd_k.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/userfaultfd_k.h +3 -3
@@ -146,9 +146,9 @@ static inline bool userfaultfd_armed(struct vm_area_struct *vma)static inline bool vma_can_userfault (struct vm_area_struct *vma,unsigned long vm_flags) { -if (vm_flags &VM_UFFD_MINOR ) -return is_vm_hugetlb_page (vma) ||vma_is_shmem (vma); - +if ((vm_flags &VM_UFFD_MINOR ) && + (!is_vm_hugetlb_page (vma) && !vma_is_shmem (vma))) +return false;#ifndef CONFIG_PTE_MARKER_UFFD_WP /* * If user requested uffd-wp but not enabled pte markers for
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 88/240 mm: migrate: fix return value if all subpages of THPs are migrated successfully
In reply to Greg Kroah-HartmanFrom: Baolin Wang <[email protected]>
commit 03e5f82ea632af329e32ec03d952b2d99497eeaa upstream.
During THP migration, if THPs are not migrated but they are split and all subpages are migrated successfully, migrate_pages() will still return the number of THP pages that were not migrated. This will confuse the callers of migrate_pages(). For example, the longterm pinning will failed though all pages are migrated successfully.
Thus we should return 0 to indicate that all pages are migrated in this case
--- mm/migrate.c | 7 +++++++ 1 file changed, 7 insertions(+)
mm/migrate.c +7 -0
@@ -1558,6 +1558,13 @@ out:*/ list_splice (&ret_pages, from); +/* +* Return 0 in case all subpages of fail-to-migrate THPs are +* migrated successfully. +*/ +if (list_empty (from)) + rc =0 ; +count_vm_events (PGMIGRATE_SUCCESS , nr_succeeded);count_vm_events (PGMIGRATE_FAIL , nr_failed_pages);count_vm_events (THP_MIGRATION_SUCCESS , nr_thp_succeeded);
Greg Kroah-Hartman
maintainerPATCH 89/240 mm,madvise,hugetlb: fix unexpected data loss with MADV_DONTNEED on hugetlbfs
In reply to Greg Kroah-HartmanFrom: Rik van Riel <[email protected]>
commit 8ebe0a5eaaeb099de03d09ad20f54ed962e2261e upstream.
A common use case for hugetlbfs is for the application to create memory pools backed by huge pages, which then get handed over to some malloc library (eg. jemalloc) for further management.
That malloc library may be doing MADV_DONTNEED calls on memory that is no longer needed, expecting those calls to happen on PAGE_SIZE boundaries.
However, currently the MADV_DONTNEED code rounds up any such requests to HPAGE_PMD_SIZE boundaries. This leads to undesired outcomes when jemalloc expects a 4kB MADV_DONTNEED, but 2MB of memory get zeroed out, instead.
Use of pre-built shared libraries means that user code does not always know the page size of every memory arena in use.
Avoid unexpected data loss with MADV_DONTNEED by rounding up only to PAGE_SIZE (in do_madvise), and rounding down to huge page granularity.
That way programs will only get as much memory zeroed out as they requested.
--- mm/madvise.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
mm/madvise.c +11 -1
@@ -811,7 +811,14 @@ static bool madvise_dontneed_free_valid_if (start & ~huge_page_mask (hstate_vma (vma)))return false; - *end =ALIGN (*end,huge_page_size (hstate_vma (vma))); +/* +* Madvise callers expect the length to be rounded up to PAGE_SIZE +* boundaries, and may be unaware that this VMA uses huge pages. +* Avoid unexpected data loss by rounding down the number of +* huge pages freed. +*/ + *end =ALIGN_DOWN (*end,huge_page_size (hstate_vma (vma))); +return true; }
@@ -826,6 +833,9 @@ static long madvise_dontneed_free(structif (!madvise_dontneed_free_valid_vma (vma, start, &end, behavior))return -EINVAL ; +if (start == end) +return 0 ; +if (!userfaultfd_remove (vma, start, end)) { *prev =NULL ;/* mmap_lock has been dropped, prev is stale */
Greg Kroah-Hartman
maintainerPATCH 90/240 mm/kmemleak: prevent soft lockup in kmemleak_scan()s object iteration loops
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit 984a608377cb623351b8a3670b285f32ebeb2d32 upstream.
Commit 6edda04ccc7c ("mm/kmemleak: prevent soft lockup in first object iteration loop of kmemleak_scan()") adds cond_resched() in the first object iteration loop of kmemleak_scan(). However, it turns that the 2nd objection iteration loop can still cause soft lockup to happen in some cases. So add a cond_resched() call in the 2nd and 3rd loops as well to prevent that and for completeness.
--- mm/kmemleak.c | 61 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 19 deletions(-)
mm/kmemleak.c +42 -19
@@ -1464,6 +1464,27 @@ static void scan_gray_list(void) }/* +* Conditionally call resched() in a object iteration loop while making sure +* that the given object won't go away without RCU read lock by performing a +* get_object() if !pinned. +* +* Return: false if can't do a cond_resched() due to get_object() failure +* true otherwise +*/ +static bool kmemleak_cond_resched (struct kmemleak_object *object,bool pinned) +{ +if (!pinned && !get_object (object)) +return false; + +rcu_read_unlock (); +cond_resched (); +rcu_read_lock (); +if (!pinned) +put_object (object); +return true; +} + +/* * Scan data sections and all the referenced memory blocks allocated via the * kernel's standard allocators. This function must be called with the * scan_mutex held.
@@ -1474,7 +1495,7 @@ static void kmemleak_scan(void)struct zone *zone;int __maybe_unused i;int new_leaks =0 ; -int loop1_cnt =0 ; +int loop_cnt =0 ; jiffies_last_scan = jiffies;
@@ -1483,7 +1504,6 @@ static void kmemleak_scan(void)list_for_each_entry_rcu (object, &object_list, object_list) {bool obj_pinned = false; - loop1_cnt++;raw_spin_lock_irq (&object->lock);#ifdef DEBUG /*
@@ -1517,24 +1537,11 @@ static void kmemleak_scan(void)raw_spin_unlock_irq (&object->lock);/* -* Do a cond_resched() to avoid soft lockup every 64k objects. -* Make sure a reference has been taken so that the object -* won't go away without RCU read lock. +* Do a cond_resched() every 64k objects to avoid soft lockup. */ -if (!(loop1_cnt &0xffff )) { -if (!obj_pinned && !get_object (object)) { -/* Try the next object instead */ - loop1_cnt--; -continue ; - } - -rcu_read_unlock (); -cond_resched (); -rcu_read_lock (); - -if (!obj_pinned) -put_object (object); - } +if (!(++loop_cnt &0xffff ) && + !kmemleak_cond_resched (object, obj_pinned)) + loop_cnt--;/* Try again on next object */ }rcu_read_unlock ();
@@ -1601,8 +1608,16 @@ static void kmemleak_scan(void)* scan and color them gray until the next scan. */ rcu_read_lock (); + loop_cnt =0 ;list_for_each_entry_rcu (object, &object_list, object_list) {/* +* Do a cond_resched() every 64k objects to avoid soft lockup. +*/ +if (!(++loop_cnt &0xffff ) && + !kmemleak_cond_resched (object, false)) + loop_cnt--;/* Try again on next object */ + +/* * This is racy but we can save the overhead of lock/unlock * calls. The missed objects, if any, should be caught in * the next scan.
@@ -1635,8 +1650,16 @@ static void kmemleak_scan(void)* Scanning result reporting. */ rcu_read_lock (); + loop_cnt =0 ;list_for_each_entry_rcu (object, &object_list, object_list) {/* +* Do a cond_resched() every 64k objects to avoid soft lockup. +*/ +if (!(++loop_cnt &0xffff ) && + !kmemleak_cond_resched (object, false)) + loop_cnt--;/* Try again on next object */ + +/* * This is racy but we can save the overhead of lock/unlock * calls. The missed objects, if any, should be caught in * the next scan.
Greg Kroah-Hartman
maintainerPATCH 91/240 mm/huge_memory: do not clobber swp_entry_t during THP split
In reply to Greg Kroah-HartmanFrom: Mel Gorman <[email protected]>
commit 71e2d666ef85d51834d658830f823560c402b8b6 upstream.
The following has been observed when running stressng mmap since commit b653db77350c ("mm: Clear page->private when splitting or migrating a page")
watchdog: BUG: soft lockup - CPU#75 stuck for 26s! [stress-ng:9546]
CPU: 75 PID: 9546 Comm: stress-ng Tainted: G E 6.0.0-revert-b653db77-fix+ #29 0357d79b60fb09775f678e4f3f64ef0579ad1374
Hardware name: SGI.COM C2112-4GP3/X10DRT-P-Series, BIOS 2.0a 05/09/2016
RIP: 0010:xas_descend+0x28/0x80
Code: cc cc 0f b6 0e 48 8b 57 08 48 d3 ea 83 e2 3f 89 d0 48 83 c0 04 48 8b 44 c6 08 48 89 77 18 48 89 c1 83 e1 03 48 83 f9 02 75 08 <48> 3d fd 00 00 00 76 08 88 57 12 c3 cc cc cc cc 48 c1 e8 02 89 c2
RSP: 0018:ffffbbf02a2236a8 EFLAGS: 00000246
RAX: ffff9cab7d6a0002 RBX: ffffe04b0af88040 RCX: 0000000000000002
RDX: 0000000000000030 RSI: ffff9cab60509b60 RDI: ffffbbf02a2236c0
RBP: 0000000000000000 R08: ffff9cab60509b60 R09: ffffbbf02a2236c0
R10: 0000000000000001 R11: ffffbbf02a223698 R12: 0000000000000000
R13: ffff9cab4e28da80 R14: 0000000000039c01 R15: ffff9cab4e28da88
FS: 00007fab89b85e40(0000) GS:ffff9cea3fcc0000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fab84e00000 CR3: 00000040b73a4003 CR4: 00000000003706e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
xas_load+0x3a/0x50
__filemap_get_folio+0x80/0x370
? put_swap_page+0x163/0x360
pagecache_get_page+0x13/0x90
__try_to_reclaim_swap+0x50/0x190
scan_swap_map_slots+0x31e/0x670
get_swap_pages+0x226/0x3c0
folio_alloc_swap+0x1cc/0x240
add_to_swap+0x14/0x70
shrink_page_list+0x968/0xbc0
reclaim_page_list+0x70/0xf0
reclaim_pages+0xdd/0x120
madvise_cold_or_pageout_pte_range+0x814/0xf30
walk_pgd_range+0x637/0xa30
__walk_page_range+0x142/0x170
walk_page_range+0x146/0x170
madvise_pageout+0xb7/0x280
? asm_common_interrupt+0x22/0x40
madvise_vma_behavior+0x3b7/0xac0
? find_vma+0x4a/0x70
? find_vma+0x64/0x70
? madvise_vma_anon_name+0x40/0x40
madvise_walk_vmas+0xa6/0x130
do_madvise+0x2f4/0x360
__x64_sys_madvise+0x26/0x30
do_syscall_64+0x5b/0x80
? do_syscall_64+0x67/0x80
? syscall_exit_to_user_mode+0x17/0x40
? do_syscall_64+0x67/0x80
? syscall_exit_to_user_mode+0x17/0x40
? do_syscall_64+0x67/0x80
? do_syscall_64+0x67/0x80
? common_interrupt+0x8b/0xa0
entry_SYSCALL_64_after_hwframe+0x63/0xcdThe problem can be reproduced with the mmtests config config-workload-stressng-mmap. It does not always happen and when it triggers is variable but it has happened on multiple machines.
The intent of commit b653db77350c patch was to avoid the case where PG_private is clear but folio->private is not-NULL. However, THP tail pages uses page->private for "swp_entry_t if folio_test_swapcache()" as stated in the documentation for struct folio. This patch only clobbers page->private for tail pages if the head page was not in swapcache and warns once if page->private had an unexpected value.
--- mm/huge_memory.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
mm/huge_memory.c +10 -1
@@ -2445,7 +2445,16 @@ static void __split_huge_page_tail(struc page_tail); page_tail->mapping = head->mapping; page_tail->index = head->index + tail; - page_tail->private =0 ; + +/* +* page->private should not be set in tail pages with the exception +* of swap cache pages that store the swp_entry_t in tail pages. +* Fix up and warn once if private is unexpectedly set. +*/ +if (!folio_test_swapcache (page_folio (head))) { +VM_WARN_ON_ONCE_PAGE (page_tail->private !=0 , head); + page_tail->private =0 ; + }/* Page flags must be visible before we make the page non-compound. */ smp_wmb ();
Greg Kroah-Hartman
maintainerPATCH 92/240 mm: prep_compound_tail() clear page->private
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 5aae9265ee1a30cf716d6caf6b29fe99b9d55130 upstream.
Although page allocation always clears page->private in the first page or head page of an allocation, it has never made a point of clearing page->private in the tails (though 0 is often what is already there).
But now commit 71e2d666ef85 ("mm/huge_memory: do not clobber swp_entry_t during THP split") issues a warning when page_tail->private is found to be non-0 (unless it's swapcache).
Change that warning to dump page_tail (which also dumps head), instead of just the head: so far we have seen dead000000000122, dead000000000003, dead000000000001 or 0000000000000002 in the raw output for tail private.
We could just delete the warning, but today's consensus appears to want page->private to be 0, unless there's a good reason for it to be set: so now clear it in prep_compound_tail() (more general than just for THP; but not for high order allocation, which makes no pass down the tails).
--- mm/huge_memory.c | 2 +- mm/page_alloc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
mm/huge_memory.c +1 -1
@@ -2452,7 +2452,7 @@ static void __split_huge_page_tail(struc* Fix up and warn once if private is unexpectedly set. */ if (!folio_test_swapcache (page_folio (head))) { -VM_WARN_ON_ONCE_PAGE (page_tail->private !=0 , head); +VM_WARN_ON_ONCE_PAGE (page_tail->private !=0 , page_tail); page_tail->private =0 ; }
mm/page_alloc.c +1 -0
@@ -804,6 +804,7 @@ static void prep_compound_tail(struct pa p->mapping =TAIL_MAPPING ;set_compound_head (p, head); +set_page_private (p,0 ); }void prep_compound_page (struct page *page,unsigned int order)
Greg Kroah-Hartman
maintainerPATCH 93/240 kernfs: fix use-after-free in __kernfs_remove
In reply to Greg Kroah-HartmanFrom: Christian A. Ehrhardt <[email protected]>
commit 4abc99652812a2ddf932f137515d5c5a04723538 upstream.
Syzkaller managed to trigger concurrent calls to kernfs_remove_by_name_ns() for the same file resulting in a KASAN detected use-after-free. The race occurs when the root node is freed during kernfs_drain().
To prevent this acquire an additional reference for the root of the tree that is removed before calling __kernfs_remove().
Found by syzkaller with the following reproducer (slab_nomerge is required):
syz_mount_image$ext4(0x0, &(0x7f0000000100)='./file0\x00', 0x100000, 0x0, 0x0, 0x0, 0x0)
r0 = openat(0xffffffffffffff9c, &(0x7f0000000080)='/proc/self/exe\x00', 0x0, 0x0)
close(r0)pipe2(&(0x7f0000000140)={0xffffffffffffffff, <r1=>0xffffffffffffffff}, 0x800)
mount$9p_fd(0x0, &(0x7f0000000040)='./file0\x00', &(0x7f00000000c0), 0x408, &(0x7f0000000280)={'trans=fd,', {'rfdno', 0x3d, r0}, 0x2c, {'wfdno', 0x3d, r1}, 0x2c, {[{@cache_loose}, {@mmap}, {@loose}, {@loose}, {@mmap}], [{@mask={'mask', 0x3d, '^MAY_EXEC'}}, {@fsmagic={'fsmagic', 0x3d, 0x10001}}, {@dont_hash}]}})
Sample report:
==================================================================
BUG: KASAN: use-after-free in kernfs_type include/linux/kernfs.h:335 [inline] BUG: KASAN: use-after-free in kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline] BUG: KASAN: use-after-free in __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369 Read of size 2 at addr ffff8880088807f0 by task syz-executor.2/857 CPU: 0 PID: 857 Comm: syz-executor.2 Not tainted 6.0.0-rc3-00363-g7726d4c3e60b #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x6e/0x91 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:317 [inline] print_report.cold+0x5e/0x5e5 mm/kasan/report.c:433 kasan_report+0xa3/0x130 mm/kasan/report.c:495 kernfs_type include/linux/kernfs.h:335 [inline] kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline] __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369 __kernfs_remove fs/kernfs/dir.c:1356 [inline] kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589 sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943 __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899 create_cache mm/slab_common.c:229 [inline] kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335 p9_client_create+0xd4d/0x1190 net/9p/client.c:993 v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408 v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126 legacy_get_tree+0xf1/0x200 fs/fs_context.c:610 vfs_get_tree+0x85/0x2e0 fs/super.c:1530 do_new_mount fs/namespace.c:3040 [inline] path_mount+0x675/0x1d00 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __x64_sys_mount+0x282/0x300 fs/namespace.c:3568 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f725f983aed Code: 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f725f0f7028 EFLAGS: 00000246 ORIG_RAX: 00000000000000a5 RAX: ffffffffffffffda RBX: 00007f725faa3f80 RCX: 00007f725f983aed RDX: 00000000200000c0 RSI: 0000000020000040 RDI: 0000000000000000 RBP: 00007f725f9f419c R08: 0000000020000280 R09: 0000000000000000 R10: 0000000000000408 R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000000006 R14: 00007f725faa3f80 R15: 00007f725f0d7000 </TASK> Allocated by task 855: kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38 kasan_set_track mm/kasan/common.c:45 [inline] set_alloc_info mm/kasan/common.c:437 [inline] __kasan_slab_alloc+0x66/0x80 mm/kasan/common.c:470 kasan_slab_alloc include/linux/kasan.h:224 [inline] slab_post_alloc_hook mm/slab.h:727 [inline] slab_alloc_node mm/slub.c:3243 [inline] slab_alloc mm/slub.c:3251 [inline] __kmem_cache_alloc_lru mm/slub.c:3258 [inline] kmem_cache_alloc+0xbf/0x200 mm/slub.c:3268 kmem_cache_zalloc include/linux/slab.h:723 [inline] __kernfs_new_node+0xd4/0x680 fs/kernfs/dir.c:593 kernfs_new_node fs/kernfs/dir.c:655 [inline] kernfs_create_dir_ns+0x9c/0x220 fs/kernfs/dir.c:1010 sysfs_create_dir_ns+0x127/0x290 fs/sysfs/dir.c:59 create_dir lib/kobject.c:63 [inline] kobject_add_internal+0x24a/0x8d0 lib/kobject.c:223 kobject_add_varg lib/kobject.c:358 [inline] kobject_init_and_add+0x101/0x160 lib/kobject.c:441 sysfs_slab_add+0x156/0x1e0 mm/slub.c:5954 __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899 create_cache mm/slab_common.c:229 [inline] kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335 p9_client_create+0xd4d/0x1190 net/9p/client.c:993 v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408 v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126 legacy_get_tree+0xf1/0x200 fs/fs_context.c:610 vfs_get_tree+0x85/0x2e0 fs/super.c:1530 do_new_mount fs/namespace.c:3040 [inline] path_mount+0x675/0x1d00 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __x64_sys_mount+0x282/0x300 fs/namespace.c:3568 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 857: kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38 kasan_set_track+0x21/0x30 mm/kasan/common.c:45 kasan_set_free_info+0x20/0x40 mm/kasan/generic.c:370 ____kasan_slab_free mm/kasan/common.c:367 [inline] ____kasan_slab_free mm/kasan/common.c:329 [inline] __kasan_slab_free+0x108/0x190 mm/kasan/common.c:375 kasan_slab_free include/linux/kasan.h:200 [inline] slab_free_hook mm/slub.c:1754 [inline] slab_free_freelist_hook mm/slub.c:1780 [inline] slab_free mm/slub.c:3534 [inline] kmem_cache_free+0x9c/0x340 mm/slub.c:3551 kernfs_put.part.0+0x2b2/0x520 fs/kernfs/dir.c:547 kernfs_put+0x42/0x50 fs/kernfs/dir.c:521 __kernfs_remove.part.0+0x72d/0x960 fs/kernfs/dir.c:1407 __kernfs_remove fs/kernfs/dir.c:1356 [inline] kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589 sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943 __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899 create_cache mm/slab_common.c:229 [inline] kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335 p9_client_create+0xd4d/0x1190 net/9p/client.c:993 v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408 v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126 legacy_get_tree+0xf1/0x200 fs/fs_context.c:610 vfs_get_tree+0x85/0x2e0 fs/super.c:1530 do_new_mount fs/namespace.c:3040 [inline] path_mount+0x675/0x1d00 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __x64_sys_mount+0x282/0x300 fs/namespace.c:3568 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd The buggy address belongs to the object at ffff888008880780 which belongs to the cache kernfs_node_cache of size 128
The buggy address is located 112 bytes inside of
128-byte region [ffff888008880780, ffff888008880800)
The buggy address belongs to the physical page:
page:00000000732833f8 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x8880
flags: 0x100000000000200(slab|node=0|zone=1)
raw: 0100000000000200 0000000000000000 dead000000000122 ffff888001147280
raw: 0000000000000000 0000000000150015 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888008880680: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
ffff888008880700: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
>ffff888008880780: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888008880800: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
ffff888008880880: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
==================================================================--- fs/kernfs/dir.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/kernfs/dir.c +4 -1
@@ -1585,8 +1585,11 @@ int kernfs_remove_by_name_ns(struct kerndown_write (&root->kernfs_rwsem); kn =kernfs_find_ns (parent, name, ns); -if (kn) +if (kn) { +kernfs_get (kn);__kernfs_remove (kn); +kernfs_put (kn); + }up_write (&root->kernfs_rwsem);
Greg Kroah-Hartman
maintainerPATCH 94/240 Revert "dt-bindings: pinctrl-zynqmp: Add output-enable configuration"
In reply to Greg Kroah-HartmanFrom: Sai Krishna Potthuri <[email protected]>
commit ff8356060e3a5e126abb5e1f6b6e9931c220dec2 upstream.
This reverts commit 133ad0d9af99bdca90705dadd8d31c20bfc9919f.
On systems with older PMUFW (Xilinx ZynqMP Platform Management Firmware) using these pinctrl properties can cause system hang because there is missing feature autodetection.
When this feature is implemented, support for these two properties should bring back.
--- .../devicetree/bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 ---- 1 file changed, 4 deletions(-)
Documentation/devicetree/bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml +0 -4
@@ -274,10 +274,6 @@ patternProperties: slew-rate: enum: [0, 1] - output-enable: - description: - This will internally disable the tri-state for MIO pins. - drive-strength: description: Selects the drive strength for MIO pins, in mA.
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 95/240 pinctrl: Ingenic: JZ4755 bug fixes
In reply to Greg Kroah-HartmanFrom: Siarhei Volkau <[email protected]>
commit 17747577bbcb496e1b1c4096d64c2fc1e7bc0fef upstream.
Fixes UART1 function bits and MMC groups typo.
For pins 0x97,0x99 function 0 is designated to PWM3/PWM5 respectively, function is 1 designated to the UART1.
Diff from v1:
- sent separately
- added tag Fixes
--- drivers/pinctrl/pinctrl-ingenic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-ingenic.c +2 -2
@@ -667,7 +667,7 @@ static u8 jz4755_lcd_24bit_funcs[] = { 1static const struct group_desc jz4755_groups[] = {INGENIC_PIN_GROUP ("uart0-data" , jz4755_uart0_data,0 ),INGENIC_PIN_GROUP ("uart0-hwflow" , jz4755_uart0_hwflow,0 ), -INGENIC_PIN_GROUP ("uart1-data" , jz4755_uart1_data,0 ), +INGENIC_PIN_GROUP ("uart1-data" , jz4755_uart1_data,1 ),INGENIC_PIN_GROUP ("uart2-data" , jz4755_uart2_data,1 ),INGENIC_PIN_GROUP ("ssi-dt-b" , jz4755_ssi_dt_b,0 ),INGENIC_PIN_GROUP ("ssi-dt-f" , jz4755_ssi_dt_f,0 ),
@@ -721,7 +721,7 @@ static const char *jz4755_ssi_groups[] = "ssi-ce1-b", "ssi-ce1-f", };static const char *jz4755_mmc0_groups[] = {"mmc0-1bit" ,"mmc0-4bit" , }; -static const char *jz4755_mmc1_groups[] = {"mmc0-1bit" ,"mmc0-4bit" , }; +static const char *jz4755_mmc1_groups[] = {"mmc1-1bit" ,"mmc1-4bit" , };static const char *jz4755_i2c_groups[] = {"i2c-data" , };static const char *jz4755_cim_groups[] = {"cim-data" , };static const char *jz4755_lcd_groups[] = {
Greg Kroah-Hartman
maintainerPATCH 96/240 Revert "pinctrl: pinctrl-zynqmp: Add support for output-enable and bias-high-impedance"
In reply to Greg Kroah-HartmanFrom: Sai Krishna Potthuri <[email protected]>
commit 9989bc33c4894e0751679b91fc6eb585772487b9 upstream.
This reverts commit ad2bea79ef0144043721d4893eef719c907e2e63.
On systems with older PMUFW (Xilinx ZynqMP Platform Management Firmware) using these pinctrl properties can cause system hang because there is missing feature autodetection.
When this feature is implemented in the PMUFW, support for these two properties should bring back.
--- drivers/pinctrl/pinctrl-zynqmp.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/pinctrl/pinctrl-zynqmp.c +0 -9
@@ -412,10 +412,6 @@ static int zynqmp_pinconf_cfg_set(struct pinctrl_dev *pctldev,break ;case PIN_CONFIG_BIAS_HIGH_IMPEDANCE : - param =PM_PINCTRL_CONFIG_TRI_STATE ; - arg =PM_PINCTRL_TRI_STATE_ENABLE ; - ret =zynqmp_pm_pinctrl_set_config (pin, param, arg); -break ;case PIN_CONFIG_MODE_LOW_POWER :/* * These cases are mentioned in dts but configurable
@@ -424,11 +420,6 @@ static int zynqmp_pinconf_cfg_set(struct pinctrl_dev *pctldev,*/ ret =0 ;break ; -case PIN_CONFIG_OUTPUT_ENABLE : - param =PM_PINCTRL_CONFIG_TRI_STATE ; - arg =PM_PINCTRL_TRI_STATE_DISABLE ; - ret =zynqmp_pm_pinctrl_set_config (pin, param, arg); -break ;default : dev_warn(pctldev->dev, "unsupported configuration parameter '%u'\n",
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 97/240 ARC: mm: fix leakage of memory allocated for PTE
In reply to Greg Kroah-HartmanFrom: Pavel Kozlov <[email protected]>
commit 4fd9df10cb7a9289fbd22d669f9f98164d95a1ce upstream.
Since commit d9820ff ("ARC: mm: switch pgtable_t back to struct page *") a memory leakage problem occurs. Memory allocated for page table entries not released during process termination. This issue can be reproduced by a small program that allocates a large amount of memory. After several runs, you'll see that the amount of free memory has reduced and will continue to reduce after each run. All ARC CPUs are effected by this issue. The issue was introduced since the kernel stable release v5.15-rc1.
As described in commit d9820ff after switch pgtable_t back to struct page *, a pointer to "struct page" and appropriate functions are used to allocate and free a memory page for PTEs, but the pmd_pgtable macro hasn't changed and returns the direct virtual address from the PMD (PGD) entry. Than this address used as a parameter in the __pte_free() and as a result this function couldn't release memory page allocated for PTEs.
Fix this issue by changing the pmd_pgtable macro and returning pointer to struct page.
--- arch/arc/include/asm/pgtable-levels.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/include/asm/pgtable-levels.h +1 -1
@@ -161,7 +161,7 @@#define pmd_pfn (pmd) ((pmd_val(pmd) & PAGE_MASK) >> PAGE_SHIFT)#define pmd_page (pmd) virt_to_page(pmd_page_vaddr(pmd))#define set_pmd (pmdp, pmd) (*(pmdp) = pmd) -#define pmd_pgtable (pmd) ((pgtable_t) pmd_page_vaddr(pmd)) +#define pmd_pgtable (pmd) ((pgtable_t) pmd_page(pmd))/* * 4th level paging: pte
Greg Kroah-Hartman
maintainerPATCH 98/240 perf auxtrace: Fix address filter symbol name match for modules
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit cba04f3136b658583adb191556f99d087589c1cc upstream.
For modules, names from kallsyms__parse() contain the module name which meant that module symbols did not match exactly by name.
Fix by matching the name string up to the separating tab character.
--- tools/perf/util/auxtrace.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tools/perf/util/auxtrace.c +9 -1
@@ -2308,11 +2308,19 @@ struct sym_args {bool near; }; +static bool kern_sym_name_match (const char *kname,const char *name) +{ +size_t n =strlen (name); + +return !strcmp (kname, name) || + (!strncmp (kname, name, n) && kname[n] =='\t' ); +} +static bool kern_sym_match (struct sym_args *args,const char *name,char type) {/* A function with the same name, and global or the n'th found or any */ return kallsyms__is_function (type) && - !strcmp (name, args->name) && +kern_sym_name_match (name, args->name) && ((args->global &&isupper (type)) || (args->selected && ++(args->cnt) == args->idx) || (!args->global && !args->selected));
Greg Kroah-Hartman
maintainerPATCH 99/240 s390/boot: add secure boot trailer
In reply to Greg Kroah-HartmanFrom: Peter Oberparleiter <[email protected]>
commit aa127a069ef312aca02b730d5137e1778d0c3ba7 upstream.
This patch enhances the kernel image adding a trailer as required for secure boot by future firmware versions.
--- arch/s390/boot/vmlinux.lds.S | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
arch/s390/boot/vmlinux.lds.S +11 -2
@@ -102,8 +102,17 @@ SECTIONS _compressed_start = .; *(.vmlinux.bin.compressed) _compressed_end = .; - FILL(0xff); - . = ALIGN(4096); + } + +#define SB_TRAILER_SIZE 32 + /* Trailer needed for Secure Boot */ + . += SB_TRAILER_SIZE; /* make sure .sb.trailer does not overwrite the previous section */ + . = ALIGN(4096) - SB_TRAILER_SIZE; + .sb.trailer : { + QUAD(0) + QUAD(0) + QUAD(0) + QUAD(0x000000207a49504c) } _end = .;
Greg Kroah-Hartman
maintainerPATCH 100/240 s390/cio: fix out-of-bounds access on cio_ignore free
In reply to Greg Kroah-HartmanFrom: Peter Oberparleiter <[email protected]>
commit 1b6074112742f65ece71b0f299ca5a6a887d2db6 upstream.
The channel-subsystem-driver scans for newly available devices whenever device-IDs are removed from the cio_ignore list using a command such as:
echo free >/proc/cio_ignore
Since an I/O device scan might interfer with running I/Os, commit 172da89ed0ea ("s390/cio: avoid excessive path-verification requests") introduced an optimization to exclude online devices from the scan.
The newly added check for online devices incorrectly assumes that an I/O-subchannel's drvdata points to a struct io_subchannel_private. For devices that are bound to a non-default I/O subchannel driver, such as the vfio_ccw driver, this results in an out-of-bounds read access during each scan.
Fix this by changing the scan logic to rely on a driver-independent online indication. For this we can use struct subchannel->config.ena, which is the driver's requested subchannel-enabled state. Since I/Os can only be started on enabled subchannels, this matches the intent of the original optimization of not scanning devices where I/O might be running.
--- drivers/s390/cio/css.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/s390/cio/css.c +2 -6
@@ -753,13 +753,9 @@ static int __unset_online(struct device {struct idset *set = data;struct subchannel *sch =to_subchannel (dev); -struct ccw_device *cdev; -if (sch->st ==SUBCHANNEL_TYPE_IO ) { - cdev =sch_get_cdev (sch); -if (cdev && cdev->online) -idset_sch_del (set, sch->schid); - } +if (sch->st ==SUBCHANNEL_TYPE_IO && sch->config.ena) +idset_sch_del (set, sch->schid);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 101/240 s390/uaccess: add missing EX_TABLE entries to __clear_user()
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
commit 4e1b5a86a5edfbefc9396d41b0fc1a2ebd0101b6 upstream.
For some exception types the instruction address points behind the instruction that caused the exception. Take that into account and add the missing exception table entries.
--- arch/s390/lib/uaccess.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/lib/uaccess.c +3 -3
@@ -156,7 +156,7 @@ unsigned long __clear_user(void __user * asmvolatile (" lr 0,%[spec]\n" "0: mvcos 0(%1),0(%4),%0\n" -" jz 4f\n" +"6: jz 4f\n" "1: algr %0,%2\n" " slgr %1,%2\n" " j 0b\n"
@@ -166,11 +166,11 @@ unsigned long __clear_user(void __user *" clgr %0,%3\n" /* copy crosses next page boundary? */ " jnh 5f\n" "3: mvcos 0(%1),0(%4),%3\n" -" slgr %0,%3\n" +"7: slgr %0,%3\n" " j 5f\n" "4: slgr %0,%0\n" "5:\n" - EX_TABLE(0b,2b) EX_TABLE(3b,5b) + EX_TABLE(0b,2b) EX_TABLE(6b,2b) EX_TABLE(3b,5b) EX_TABLE(7b,5b) : "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2) : "a" (empty_zero_page), [spec] "d" (spec.val) : "cc", "memory", "0");
Greg Kroah-Hartman
maintainerPATCH 102/240 s390/futex: add missing EX_TABLE entry to __futex_atomic_op()
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
commit a262d3ad6a433e4080cecd0a8841104a5906355e upstream.
For some exception types the instruction address points behind the instruction that caused the exception. Take that into account and add the missing exception table entry.
--- arch/s390/include/asm/futex.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/s390/include/asm/futex.h +2 -1
@@ -17,7 +17,8 @@"3: jl 1b\n" \" lhi %0,0\n" \"4: sacf 768\n" \ - EX_TABLE(0b,4b) EX_TABLE(2b,4b) EX_TABLE(3b,4b) \ + EX_TABLE(0b,4b) EX_TABLE(1b,4b) \ + EX_TABLE(2b,4b) EX_TABLE(3b,4b) \ : "=d" (ret), "=&d" (oldval), "=&d" (newval), \" =m" (*uaddr) \ : "0" (-EFAULT), "d" (oparg), "a" (uaddr), \
Greg Kroah-Hartman
maintainerPATCH 103/240 s390/pci: add missing EX_TABLE entries to __pcistg_mio_inuser()/__pcilg_mio_inuser()
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
commit 6ec803025cf3173a57222e4411097166bd06fa98 upstream.
For some exception types the instruction address points behind the instruction that caused the exception. Take that into account and add the missing exception table entry.
--- arch/s390/pci/pci_mmio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/s390/pci/pci_mmio.c +4 -4
@@ -64,7 +64,7 @@ static inline int __pcistg_mio_inuser( asmvolatile (" sacf 256\n" "0: llgc %[tmp],0(%[src])\n" -" sllg %[val],%[val],8\n" +"4: sllg %[val],%[val],8\n" " aghi %[src],1\n" " ogr %[val],%[tmp]\n" " brctg %[cnt],0b\n"
@@ -72,7 +72,7 @@ static inline int __pcistg_mio_inuser("2: ipm %[cc]\n" " srl %[cc],28\n" "3: sacf 768\n" - EX_TABLE(0b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b) + EX_TABLE(0b, 3b) EX_TABLE(4b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b) : [src] "+a" (src), [cnt] "+d" (cnt), [val] "+d" (val), [tmp] "=d" (tmp),
@@ -215,10 +215,10 @@ static inline int __pcilg_mio_inuser("2: ahi %[shift],-8\n" " srlg %[tmp],%[val],0(%[shift])\n" "3: stc %[tmp],0(%[dst])\n" -" aghi %[dst],1\n" +"5: aghi %[dst],1\n" " brctg %[cnt],2b\n" "4: sacf 768\n" - EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) + EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) EX_TABLE(5b, 4b) : [ioaddr_len] "+&d" (ioaddr_len.pair), [cc] "+d" (cc), [val] "=d" (val),
Greg Kroah-Hartman
maintainerPATCH 104/240 ethtool: eeprom: fix null-deref on genl_info in dump
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit 9d9effca9d7d7cf6341182a7c5cabcbd6fa28063 upstream.
The similar fix as commit 46cdedf2a0fa ("ethtool: pse-pd: fix null-deref on genl_info in dump") is also needed for ethtool eeprom.
--- net/ethtool/eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/eeprom.c +1 -1
@@ -124,7 +124,7 @@ static int eeprom_prepare_data(const strif (ret) goto err_free; - ret =get_module_eeprom_by_page (dev, &page_data, info->extack); + ret =get_module_eeprom_by_page (dev, &page_data, info ? info->extack :NULL );if (ret <0 ) goto err_ops;
Greg Kroah-Hartman
maintainerPATCH 105/240 fbdev/core: Avoid uninitialized read in aperture_remove_conflicting_pci_device()
In reply to Greg Kroah-HartmanFrom: Michał Mirosław <[email protected]>
commit e0ba1a39b8dfe4f005bebdd85daa89e7382e26b7 upstream.
Return on error directly from the BAR-iterating loop instead of break+return.
This is actually a cosmetic fix, since it would be highly unusual to have this called for a PCI device without any memory BARs.
--- drivers/video/aperture.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/video/aperture.c +1 -4
@@ -351,12 +351,9 @@ int aperture_remove_conflicting_pci_devi size =pci_resource_len (pdev, bar); ret =aperture_remove_conflicting_devices (base, size, primary, name);if (ret) -break ; +return ret; } -if (ret) -return ret; -/* * If a driver asked to unregister a platform device registered by * sysfb, then can be assumed that this is a driver for a display
Greg Kroah-Hartman
maintainerPATCH 106/240 ACPI: PCC: Fix unintentional integer overflow
In reply to Greg Kroah-HartmanFrom: Manank Patel <[email protected]>
commit 8338b74a750c534c223e8943cc0ed0e198ece261 upstream.
Fix an unintentional u32 overflow by changing PCC_CMD_WAIT_RETRIES_NUM to 500ULL.
--- drivers/acpi/acpi_pcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/acpi_pcc.c +1 -1
@@ -27,7 +27,7 @@* Arbitrary retries in case the remote processor is slow to respond * to PCC commands */ -#define PCC_CMD_WAIT_RETRIES_NUM 500 +#define PCC_CMD_WAIT_RETRIES_NUM 500ULLstruct pcc_data {struct pcc_mbox_chan *pcc_chan;
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 107/240 powerpc/64s/interrupt: Fix clear of PACA_IRQS_HARD_DIS when returning to soft-masked context
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit 65722736c3baf29e02e964a09e85c9ef71c48e8d upstream.
Commit a4cb3651a1743 ("powerpc/64s/interrupt: Fix lost interrupts when returning to soft-masked context") fixed the problem of pending irqs being cleared when clearing the HARD_DIS bit, but then it didn't clear the bit at all. This change clears HARD_DIS without affecting other bits in the mask.
When an interrupt hits in a soft-masked section that has MSR[EE]=1, it can hard disable and set PACA_IRQS_HARD_DIS, which must be cleared when returning to the EE=1 caller (unless it was set due to a MUST_HARD_MASK interrupt becoming pending). Failure to clear this leaves the returned-to context running with MSR[EE]=1 and PACA_IRQS_HARD_DIS, which confuses irq assertions and could be dangerous for code that might test the flag.
This was observed in a hash MMU kernel where a kernel hash fault hits in a local_irqs_disabled region that has EE=1. The hash fault also runs with EE=1, then as it returns, a decrementer hits in the restart section and the irq restart code hard-masks which sets the PACA_IRQ_HARD_DIS flag, which is not clear when the original context is returned to.
--- arch/powerpc/kernel/interrupt_64.S | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
arch/powerpc/kernel/interrupt_64.S +11 -2
@@ -565,15 +565,24 @@ _ASM_NOKPROBE_SYMBOL(interrupt_return_\s * Returning to soft-disabled context. * Check if a MUST_HARD_MASK interrupt has become pending, in which * case we need to disable MSR[EE] in the return context. + * + * The MSR[EE] check catches among other things the short incoherency + * in hard_irq_disable() between clearing MSR[EE] and setting + * PACA_IRQ_HARD_DIS. */ ld r12,_MSR(r1) andi. r10,r12,MSR_EE beq .Lfast_kernel_interrupt_return_\srr\() // EE already disabled lbz r11,PACAIRQHAPPENED(r13) andi. r10,r11,PACA_IRQ_MUST_HARD_MASK - beq .Lfast_kernel_interrupt_return_\srr\() // No HARD_MASK pending + bne 1f // HARD_MASK is pending + // No HARD_MASK pending, clear possible HARD_DIS set by interrupt + andi. r11,r11,(~PACA_IRQ_HARD_DIS)@l + stb r11,PACAIRQHAPPENED(r13) + b .Lfast_kernel_interrupt_return_\srr\() - /* Must clear MSR_EE from _MSR */ + +1: /* Must clear MSR_EE from _MSR */ #ifdef CONFIG_PPC_BOOK3S li r10,0 /* Clear valid before changing _MSR */
Greg Kroah-Hartman
maintainerPATCH 108/240 net: ieee802154: fix error return code in dgram_bind()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
commit 444d8ad4916edec8a9fc684e841287db9b1e999f upstream.
Fix to return error code -EINVAL from the error handling case instead of 0, as done elsewhere in this function.
--- net/ieee802154/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ieee802154/socket.c +3 -1
@@ -502,8 +502,10 @@ static int dgram_bind(struct sock *sk, sif (err <0 ) goto out; -if (addr->family !=AF_IEEE802154 ) +if (addr->family !=AF_IEEE802154 ) { + err = -EINVAL ; goto out; + }ieee802154_addr_from_sa (&haddr, &addr->addr); dev =ieee802154_get_dev (sock_net (sk), &haddr);
Greg Kroah-Hartman
maintainerPATCH 109/240 media: amphion: release m2m ctx when releasing vpu instance
In reply to Greg Kroah-HartmanFrom: Ming Qian <[email protected]>
[ Upstream commit d91d7bc85062309aae6d8064563ddf17947cb6bc ]
release m2m ctx in the callback function that
release the vpu instance, then there is no need
to add lock around releasing m2m ctx.
--- drivers/media/platform/amphion/vpu_v4l2.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/media/platform/amphion/vpu_v4l2.c +4 -7
@@ -603,6 +603,10 @@ static int vpu_v4l2_release(struct vpu_inst *inst) inst->workqueue =NULL ; } +if (inst->fh.m2m_ctx) { +v4l2_m2m_ctx_release (inst->fh.m2m_ctx); + inst->fh.m2m_ctx =NULL ; + }v4l2_ctrl_handler_free (&inst->ctrl_handler);mutex_destroy (&inst->lock);v4l2_fh_del (&inst->fh);
@@ -685,13 +689,6 @@ int vpu_v4l2_close(struct file *file)vpu_trace (vpu->dev,"tgid = %d, pid = %d, inst = %p\n" , inst->tgid, inst->pid, inst); -vpu_inst_lock (inst); -if (inst->fh.m2m_ctx) { -v4l2_m2m_ctx_release (inst->fh.m2m_ctx); - inst->fh.m2m_ctx =NULL ; - } -vpu_inst_unlock (inst); -call_void_vop (inst, release);vpu_inst_unregister (inst);vpu_inst_put (inst);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/240 media: v4l2: Fix v4l2_i2c_subdev_set_name function documentation
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit bb9ea2c31fa11b789ade4c3abcdda3c5370a76ab ]
The doc says the I²C device's name is used if devname is NULL, but actually the I²C device driver's name is used.
--- include/media/v4l2-common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/media/v4l2-common.h +2 -1
@@ -175,7 +175,8 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,* * @sd: pointer to &struct v4l2_subdev * @client: pointer to struct i2c_client -* @devname: the name of the device; if NULL, the I²C device's name will be used +* @devname: the name of the device; if NULL, the I²C device drivers's name +* will be used * @postfix: sub-device specific string to put right after the I²C device name; * may be NULL */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 111/240 media: ar0521: fix error return code in ar0521_power_on()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b5f8fa876931c1adfd2c5eca5b189fd2be893238 ]
Return error code if ar0521_write_regs() fails in ar0521_power_on().
--- drivers/media/i2c/ar0521.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/i2c/ar0521.c +3 -2
@@ -757,8 +757,9 @@ static int ar0521_power_on(struct device *dev)usleep_range (4500 ,5000 );/* min 45000 clocks */ for (cnt =0 ; cnt <ARRAY_SIZE (initial_regs); cnt++) -if (ar0521_write_regs (sensor, initial_regs[cnt].data, - initial_regs[cnt].count)) + ret =ar0521_write_regs (sensor, initial_regs[cnt].data, + initial_regs[cnt].count); +if (ret) goto off; ret = ar0521_write_reg(sensor, AR0521_REG_SERIAL_FORMAT,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/240 media: ar0521: Fix return value check in writing initial registers
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
commit 54bb7671ca6de58929b3994468c330bedb9a3b7e upstream.
The return value from register writes is ignored apart from the last value. Fix this.
--- drivers/media/i2c/ar0521.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/i2c/ar0521.c +2 -1
@@ -756,11 +756,12 @@ static int ar0521_power_on(struct devicegpiod_set_value (sensor->reset_gpio,0 );usleep_range (4500 ,5000 );/* min 45000 clocks */ -for (cnt =0 ; cnt <ARRAY_SIZE (initial_regs); cnt++) +for (cnt =0 ; cnt <ARRAY_SIZE (initial_regs); cnt++) { ret =ar0521_write_regs (sensor, initial_regs[cnt].data, initial_regs[cnt].count);if (ret) goto off; + } ret = ar0521_write_reg(sensor, AR0521_REG_SERIAL_FORMAT, AR0521_REG_SERIAL_FORMAT_MIPI |
Greg Kroah-Hartman
maintainerPATCH 113/240 media: ov8865: Fix an error handling path in ov8865_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 080e0b7404850406628674b07286f16cc389a892 ]
The commit in Fixes also introduced some new error handling which should goto the existing error handling path.
Otherwise some resources leak.
--- drivers/media/i2c/ov8865.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/media/i2c/ov8865.c +6 -4
@@ -3034,11 +3034,13 @@ static int ov8865_probe(struct i2c_client *client) &rate);if (!ret && sensor->extclk) { ret =clk_set_rate (sensor->extclk, rate); -if (ret) -return dev_err_probe (dev, ret, -"failed to set clock rate\n" ); +if (ret) { +dev_err_probe (dev, ret,"failed to set clock rate\n" ); + goto error_endpoint; + } }else if (ret && !sensor->extclk) { -return dev_err_probe (dev, ret,"invalid clock config\n" ); +dev_err_probe (dev, ret,"invalid clock config\n" ); + goto error_endpoint; } sensor->extclk_rate = rate ? rate :clk_get_rate (sensor->extclk);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 114/240 media: sun6i-mipi-csi2: Depend on PHY_SUN6I_MIPI_DPHY
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit ff37bc8c7099b673e9838bfbd0de78eff740316b ]
PHY_SUN6I_MIPI_DPHY is not a freely selectable option and so may not always be available. Depend on it instead.
--- drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig +1 -1
@@ -4,10 +4,10 @@ config VIDEO_SUN6I_MIPI_CSI2 depends on V4L_PLATFORM_DRIVERS && VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST depends on PM && COMMON_CLK + depends on PHY_SUN6I_MIPI_DPHY select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE - select PHY_SUN6I_MIPI_DPHY select GENERIC_PHY_MIPI_DPHY select REGMAP_MMIO help
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 115/240 media: atomisp: prevent integer overflow in sh_css_set_black_frame()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 3ad290194bb06979367622e47357462836c1d3b4 ]
The "height" and "width" values come from the user so the "height * width" multiplication can overflow.
--- drivers/staging/media/atomisp/pci/sh_css_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/atomisp/pci/sh_css_params.c +2 -2
@@ -950,8 +950,8 @@ sh_css_set_black_frame(struct ia_css_stream *stream, params->fpn_config.data =NULL ; }if (!params->fpn_config.data) { - params->fpn_config.data =kvmalloc (height * width * -sizeof (short ),GFP_KERNEL ); + params->fpn_config.data =kvmalloc (array3_size (height, width,sizeof (short )), +GFP_KERNEL );if (!params->fpn_config.data) {IA_CSS_ERROR ("out of memory" );IA_CSS_LEAVE_ERR_PRIVATE (-ENOMEM );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 116/240 media: sunxi: Fix some error handling path of sun8i_a83t_mipi_csi2_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 466c1e6d05003707e8baa16668e7bc287d875d5e ]
Release some resources in the error handling path of the probe and of sun8i_a83t_mipi_csi2_resources_setup(), as already done in the remove function.
--- .../sun8i_a83t_mipi_csi2.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +18 -5
@@ -719,13 +719,15 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de csi2_dev->clock_mipi =devm_clk_get (dev,"mipi" );if (IS_ERR (csi2_dev->clock_mipi)) {dev_err (dev,"failed to acquire mipi clock\n" ); -return PTR_ERR (csi2_dev->clock_mipi); + ret =PTR_ERR (csi2_dev->clock_mipi); + goto error_clock_rate_exclusive; } csi2_dev->clock_misc =devm_clk_get (dev,"misc" );if (IS_ERR (csi2_dev->clock_misc)) {dev_err (dev,"failed to acquire misc clock\n" ); -return PTR_ERR (csi2_dev->clock_misc); + ret =PTR_ERR (csi2_dev->clock_misc); + goto error_clock_rate_exclusive; }/* Reset */
@@ -733,7 +735,8 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de csi2_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi2_dev->reset)) {dev_err (dev,"failed to get reset controller\n" ); -return PTR_ERR (csi2_dev->reset); + ret =PTR_ERR (csi2_dev->reset); + goto error_clock_rate_exclusive; }/* D-PHY */
@@ -741,7 +744,7 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de ret =sun8i_a83t_dphy_register (csi2_dev);if (ret) {dev_err (dev,"failed to initialize MIPI D-PHY\n" ); -return ret; + goto error_clock_rate_exclusive; }/* Runtime PM */
@@ -749,6 +752,11 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_depm_runtime_enable (dev);return 0 ; + +error_clock_rate_exclusive: +clk_rate_exclusive_put (csi2_dev->clock_mod); + +return ret; } static void
@@ -778,9 +786,14 @@ static int sun8i_a83t_mipi_csi2_probe(struct platform_device *platform_dev) ret =sun8i_a83t_mipi_csi2_bridge_setup (csi2_dev);if (ret) -return ret; + goto error_resources;return 0 ; + +error_resources: +sun8i_a83t_mipi_csi2_resources_cleanup (csi2_dev); + +return ret; }static int sun8i_a83t_mipi_csi2_remove (struct platform_device *platform_dev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 117/240 media: sunxi: Fix some error handling path of sun6i_mipi_csi2_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 51e1440d309a74a3e4e252019a00f9d0df329945 ]
Release some resources in the error handling path of the probe and of sun6i_mipi_csi2_resources_setup(), as already done in the remove function.
--- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +16 -4
@@ -661,7 +661,8 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev, csi2_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi2_dev->reset)) {dev_err (dev,"failed to get reset controller\n" ); -return PTR_ERR (csi2_dev->reset); + ret =PTR_ERR (csi2_dev->reset); + goto error_clock_rate_exclusive; }/* D-PHY */
@@ -669,13 +670,14 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev, csi2_dev->dphy =devm_phy_get (dev,"dphy" );if (IS_ERR (csi2_dev->dphy)) {dev_err (dev,"failed to get MIPI D-PHY\n" ); -return PTR_ERR (csi2_dev->dphy); + ret =PTR_ERR (csi2_dev->dphy); + goto error_clock_rate_exclusive; } ret =phy_init (csi2_dev->dphy);if (ret) {dev_err (dev,"failed to initialize MIPI D-PHY\n" ); -return ret; + goto error_clock_rate_exclusive; }/* Runtime PM */
@@ -683,6 +685,11 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,pm_runtime_enable (dev);return 0 ; + +error_clock_rate_exclusive: +clk_rate_exclusive_put (csi2_dev->clock_mod); + +return ret; } static void
@@ -712,9 +719,14 @@ static int sun6i_mipi_csi2_probe(struct platform_device *platform_dev) ret =sun6i_mipi_csi2_bridge_setup (csi2_dev);if (ret) -return ret; + goto error_resources;return 0 ; + +error_resources: +sun6i_mipi_csi2_resources_cleanup (csi2_dev); + +return ret; }static int sun6i_mipi_csi2_remove (struct platform_device *platform_dev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 118/240 media: sun6i-mipi-csi2: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit d0734dab5480325fd67548aa51ee126570d48574 ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
It also selects PHY_SUN6I_MIPI_DPHY, which depends on RESET_CONTROLLER.
--- drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig +1 -1
@@ -3,7 +3,7 @@ config VIDEO_SUN6I_MIPI_CSI2 tristate "Allwinner A31 MIPI CSI-2 Controller Driver" depends on V4L_PLATFORM_DRIVERS && VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST - depends on PM && COMMON_CLK + depends on PM && COMMON_CLK && RESET_CONTROLLER depends on PHY_SUN6I_MIPI_DPHY select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 119/240 media: sun8i-a83t-mipi-csi2: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 398c479234894c3d3347d83869760db3c406c269 ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
--- drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig +1 -1
@@ -3,7 +3,7 @@ config VIDEO_SUN8I_A83T_MIPI_CSI2 tristate "Allwinner A83T MIPI CSI-2 Controller and D-PHY Driver" depends on V4L_PLATFORM_DRIVERS && VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST - depends on PM && COMMON_CLK + depends on PM && COMMON_CLK && RESET_CONTROLLER select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 120/240 media: sun6i-csi: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 6a720df702db764e2b3bbdaaa217e9d344efcfb2 ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
--- drivers/media/platform/sunxi/sun6i-csi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-csi/Kconfig +1 -1
@@ -2,7 +2,7 @@ config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && RESET_CONTROLLER && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 121/240 media: sun4i-csi: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 140a9b57d3a306ca77a92e903facbdc4a31ccd51 ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
--- drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun4i-csi/Kconfig +1 -1
@@ -3,7 +3,7 @@ config VIDEO_SUN4I_CSI tristate "Allwinner A10 CMOS Sensor Interface Support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && RESET_CONTROLLER && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 122/240 media: sun8i-di: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit c2a46b19f0340e6647168f4ceac4e5e4cb9197d8 ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
--- drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun8i-di/Kconfig +1 -1
@@ -4,7 +4,7 @@ config VIDEO_SUN8I_DEINTERLACE depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST - depends on COMMON_CLK && OF + depends on COMMON_CLK && RESET_CONTROLLER && OF depends on PM select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 123/240 media: sun8i-rotate: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit b9273150b8b7f8b02ac961463057191d243f953d ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
--- drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun8i-rotate/Kconfig +1 -1
@@ -5,7 +5,7 @@ config VIDEO_SUN8I_ROTATE depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST - depends on COMMON_CLK && OF + depends on COMMON_CLK && RESET_CONTROLLER && OF depends on PM select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 124/240 media: cedrus: Add a Kconfig dependency on RESET_CONTROLLER
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 26686b0da9f3fd042578c1093862c853f8e4ff1b ]
The driver relies on the reset controller API to work, so add RESET_CONTROLLER as one of its Kconfig dependencies.
--- drivers/staging/media/sunxi/cedrus/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/staging/media/sunxi/cedrus/Kconfig +1 -0
@@ -2,6 +2,7 @@ config VIDEO_SUNXI_CEDRUS tristate "Allwinner Cedrus VPU driver" depends on VIDEO_DEV + depends on RESET_CONTROLLER depends on HAS_DMA depends on OF select MEDIA_CONTROLLER
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 125/240 drm/msm/a6xx: Replace kcalloc() with kvzalloc()
In reply to Greg Kroah-HartmanFrom: Akhil P Oommen <[email protected]>
[ Upstream commit ec8f1813bf8d0737898f99a8c1c69df0cde0d7dd ]
In order to reduce chance of allocation failure while capturing a6xx gpu state, use kvzalloc() instead of kcalloc() in state_kcalloc().
Indirectly, this patch helps to fix leaking memory allocated for gmu_debug object.
Patchwork: https://patchwork.freedesktop.org/patch/505074/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +3 -9
@@ -91,7 +91,7 @@ struct a6xx_state_memobj {static void *state_kcalloc (struct a6xx_gpu_state *a6xx_state,int nr,size_t objsize) {struct a6xx_state_memobj *obj = -kzalloc ((nr * objsize) +sizeof (*obj),GFP_KERNEL ); +kvzalloc ((nr * objsize) +sizeof (*obj),GFP_KERNEL );if (!obj)return NULL ;
@@ -819,7 +819,7 @@ static struct msm_gpu_state_bo *a6xx_snapshot_gmu_bo( snapshot->iova = bo->iova; snapshot->size = bo->size; - snapshot->data =kvzalloc (snapshot->size,GFP_KERNEL ); + snapshot->data =state_kcalloc (a6xx_state,1 , snapshot->size);if (!snapshot->data)return NULL ;
@@ -1034,14 +1034,8 @@ static void a6xx_gpu_state_destroy(struct kref *kref)struct a6xx_gpu_state *a6xx_state =container_of (state, struct a6xx_gpu_state, base); -if (a6xx_state->gmu_log) -kvfree (a6xx_state->gmu_log->data); - -if (a6xx_state->gmu_hfi) -kvfree (a6xx_state->gmu_hfi->data); -list_for_each_entry_safe (obj, tmp, &a6xx_state->objs, node) -kfree (obj); +kvfree (obj);adreno_gpu_state_destroy (state);kfree (a6xx_state);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 126/240 drm/msm/dp: add atomic_check to bridge ops
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 3a661247967a6f3c99a95a8ba4c8073c5846ea4b ]
DRM commit_tails() will disable downstream crtc/encoder/bridge if both disable crtc is required and crtc->active is set before pushing a new frame downstream.
There is a rare case that user space display manager issue an extra screen update immediately followed by close DRM device while down stream display interface is disabled. This extra screen update will timeout due to the downstream interface is disabled but will cause crtc->active be set. Hence the followed commit_tails() called by drm_release() will pass the disable downstream crtc/encoder/bridge conditions checking even downstream interface is disabled. This cause the crash to happen at dp_bridge_disable() due to it trying to access the main link register to push the idle pattern out while main link clocks is disabled.
This patch adds atomic_check to prevent the extra frame will not be pushed down if display interface is down so that crtc->active will not be set neither. This will fail the conditions checking of disabling down stream crtc/encoder/bridge which prevent drm_release() from calling dp_bridge_disable() so that crash at dp_bridge_disable() prevented.
There is no protection in the DRM framework to check if the display pipeline has been already disabled before trying again. The only check is the crtc_state->active but this is controlled by usermode using UAPI. Hence if the usermode sets this and then crashes, the driver needs to protect against double disable.
SError Interrupt on CPU7, code 0x00000000be000411 -- SError
CPU: 7 PID: 3878 Comm: Xorg Not tainted 5.19.0-stb-cbq #19 Hardware name: Google Lazor (rev3 - 8) (DT) pstate: a04000c9 (NzCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __cmpxchg_case_acq_32+0x14/0x2c lr : do_raw_spin_lock+0xa4/0xdc
sp : ffffffc01092b6a0
x29: ffffffc01092b6a0 x28: 0000000000000028 x27: 0000000000000038
x26: 0000000000000004 x25: ffffffd2973dce48 x24: 0000000000000000
x23: 00000000ffffffff x22: 00000000ffffffff x21: ffffffd2978d0008
x20: ffffffd2978d0008 x19: ffffff80ff759fc0 x18: 0000000000000000
x17: 004800a501260460 x16: 0441043b04600438 x15: 04380000089807d0
x14: 07b0089807800780 x13: 0000000000000000 x12: 0000000000000000
x11: 0000000000000438 x10: 00000000000007d0 x9 : ffffffd2973e09e4 x8 : ffffff8092d53300 x7 : ffffff808902e8b8 x6 : 0000000000000001 x5 : ffffff808902e880 x4 : 0000000000000000 x3 : ffffff80ff759fc0 x2 : 0000000000000001 x1 : 0000000000000000 x0 : ffffff80ff759fc0
Kernel panic - not syncing: Asynchronous SError Interrupt CPU: 7 PID: 3878 Comm: Xorg Not tainted 5.19.0-stb-cbq #19 Hardware name: Google Lazor (rev3 - 8) (DT) Call trace: dump_backtrace.part.0+0xbc/0xe4 show_stack+0x24/0x70 dump_stack_lvl+0x68/0x84 dump_stack+0x18/0x34 panic+0x14c/0x32c nmi_panic+0x58/0x7c arm64_serror_panic+0x78/0x84 do_serror+0x40/0x64 el1h_64_error_handler+0x30/0x48 el1h_64_error+0x68/0x6c __cmpxchg_case_acq_32+0x14/0x2c _raw_spin_lock_irqsave+0x38/0x4c lock_timer_base+0x40/0x78 __mod_timer+0xf4/0x25c schedule_timeout+0xd4/0xfc __wait_for_common+0xac/0x140 wait_for_completion_timeout+0x2c/0x54 dp_ctrl_push_idle+0x40/0x88 dp_bridge_disable+0x24/0x30 drm_atomic_bridge_chain_disable+0x90/0xbc drm_atomic_helper_commit_modeset_disables+0x198/0x444 msm_atomic_commit_tail+0x1d0/0x374 commit_tail+0x80/0x108 drm_atomic_helper_commit+0x118/0x11c drm_atomic_commit+0xb4/0xe0 drm_client_modeset_commit_atomic+0x184/0x224 drm_client_modeset_commit_locked+0x58/0x160 drm_client_modeset_commit+0x3c/0x64 __drm_fb_helper_restore_fbdev_mode_unlocked+0x98/0xac drm_fb_helper_set_par+0x74/0x80 drm_fb_helper_hotplug_event+0xdc/0xe0 __drm_fb_helper_restore_fbdev_mode_unlocked+0x7c/0xac drm_fb_helper_restore_fbdev_mode_unlocked+0x20/0x2c drm_fb_helper_lastclose+0x20/0x2c drm_lastclose+0x44/0x6c drm_release+0x88/0xd4 __fput+0x104/0x220 ____fput+0x1c/0x28 task_work_run+0x8c/0x100 do_exit+0x450/0x8d0 do_group_exit+0x40/0xac __wake_up_parent+0x0/0x38 invoke_syscall+0x84/0x11c el0_svc_common.constprop.0+0xb8/0xe4 do_el0_svc+0x8c/0xb8 el0_svc+0x2c/0x54 el0t_64_sync_handler+0x120/0x1c0 el0t_64_sync+0x190/0x194
SMP: stopping secondary CPUs
Kernel Offset: 0x128e800000 from 0xffffffc008000000PHYS_OFFSET: 0x80000000
CPU features: 0x800,00c2a015,19801c82 Memory Limit: none
Changes in v2:
-- add more commit text
Changes in v3:
-- add comments into dp_bridge_atomic_check()
Changes in v4:
-- rewording the comment into dp_bridge_atomic_check()
Changes in v5:
-- removed quote x at end of commit text
Changes in v6:
-- removed quote x at end of comment in dp_bridge_atomic_check()
Patchwork: https://patchwork.freedesktop.org/patch/505331/
--- drivers/gpu/drm/msm/dp/dp_drm.c | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/msm/dp/dp_drm.c +34 -0
@@ -31,6 +31,36 @@ static enum drm_connector_status dp_bridge_detect(struct drm_bridge *bridge) connector_status_disconnected; } +static int dp_bridge_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state) +{ +struct msm_dp *dp; + + dp =to_dp_bridge (bridge)->dp_display; + +drm_dbg_dp (dp->drm_dev,"is_connected = %s\n" , + (dp->is_connected) ?"true" :"false" ); + +/* +* There is no protection in the DRM framework to check if the display +* pipeline has been already disabled before trying to disable it again. +* Hence if the sink is unplugged, the pipeline gets disabled, but the +* crtc->active is still true. Any attempt to set the mode or manually +* disable this encoder will result in the crash. +* +* TODO: add support for telling the DRM subsystem that the pipeline is +* disabled by the hardware and thus all access to it should be forbidden. +* After that this piece of code can be removed. +*/ +if (bridge->ops &DRM_BRIDGE_OP_HPD ) +return (dp->is_connected) ?0 : -ENOTCONN ; + +return 0 ; +} + +/** * dp_bridge_get_modes - callback to add drm modes via drm_mode_probed_add() * @bridge: Poiner to drm bridge
@@ -61,6 +91,9 @@ static int dp_bridge_get_modes(struct drm_bridge *bridge, struct drm_connector * }static const struct drm_bridge_funcs dp_bridge_ops = { + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, .enable = dp_bridge_enable, .disable = dp_bridge_disable, .post_disable = dp_bridge_post_disable,
@@ -68,6 +101,7 @@ static const struct drm_bridge_funcs dp_bridge_ops = { .mode_valid = dp_bridge_mode_valid, .get_modes = dp_bridge_get_modes, .detect = dp_bridge_detect, + .atomic_check = dp_bridge_atomic_check, }; struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 127/240 drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
In reply to Greg Kroah-HartmanFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit 0b33a33bd15d5bab73b87152b220a8d0153a4587 ]
The mode_valid field in drm_connector_helper_funcs is expected to be of type:
enum drm_mode_status (* mode_valid) (struct drm_connector *connector,
struct drm_display_mode *mode);
The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
The return type of mdp4_lvds_connector_mode_valid should be changed from int to enum drm_mode_status.
Patchwork: https://patchwork.freedesktop.org/patch/502878/
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3 -2
@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 128/240 drm/msm/dp: cleared DP_DOWNSPREAD_CTRL register before start link training
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 70445dee1b4cf44c9fecc580dfa08079011866f1 ]
DOWNSPREAD_CTRL (0x107) shall be cleared to 0 upon power-on reset or an upstream device disconnect. This patch will enforce this rule by always cleared DOWNSPREAD_CTRL register to 0 before start link training. At rare case that DP MSA timing parameters may be mis-interpreted by the sink which causes audio sampling rate be calculated wrongly and cause audio did not work at sink if DOWNSPREAD_CTRL register is not cleared to 0.
Changes in v2:
1) fix spelling at commit text
2) merge ssc variable into encoding[0]
Changes in v3:
-- correct spelling of DOWNSPREAD_CTRL
-- replace err with len of ssize_t
Changes in v4:
-- split into 2 patches
Patchwork: https://patchwork.freedesktop.org/patch/502532/
--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/dp/dp_ctrl.c +5 -8
@@ -1245,8 +1245,7 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl, {int ret =0 ;const u8 *dpcd = ctrl->panel->dpcd; -u8 encoding =DP_SET_ANSI_8B10B ; -u8 ssc; +u8 encoding[] = {0 ,DP_SET_ANSI_8B10B };u8 assr;struct dp_link_info link_info = {0 };
@@ -1258,13 +1257,11 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl,dp_aux_link_configure (ctrl->aux, &link_info); -if (drm_dp_max_downspread (dpcd)) { - ssc =DP_SPREAD_AMP_0_5 ; -drm_dp_dpcd_write (ctrl->aux,DP_DOWNSPREAD_CTRL , &ssc,1 ); - } +if (drm_dp_max_downspread (dpcd)) + encoding[0 ] |=DP_SPREAD_AMP_0_5 ; -drm_dp_dpcd_write (ctrl->aux,DP_MAIN_LINK_CHANNEL_CODING_SET , - &encoding,1 ); +/* config DOWNSPREAD_CTRL and MAIN_LINK_CHANNEL_CODING_SET */ +drm_dp_dpcd_write (ctrl->aux,DP_DOWNSPREAD_CTRL , encoding,2 );if (drm_dp_alternate_scrambler_reset_cap (dpcd)) { assr =DP_ALTERNATE_SCRAMBLER_RESET_ENABLE ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 129/240 ASoC: codec: tlv320adc3xxx: add GPIOLIB dependency
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 551f2994b8ccdbe296e239278531e345d6e94d4d ]
Fix build errors when CONFIG_GPIOLIB is not enabled:
../sound/soc/codecs/tlv320adc3xxx.c: In function 'adc3xxx_i2c_probe':../sound/soc/codecs/tlv320adc3xxx.c:1352:28: error: implicit declaration of function 'devm_gpiod_get'; did you mean 'devm_gpio_free'? [-Werror=implicit-function-declaration]
1352 | adc3xxx->rst_pin = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);../sound/soc/codecs/tlv320adc3xxx.c:1352:57: error: 'GPIOD_OUT_LOW' undeclared (first use in this function); did you mean 'GPIOF_INIT_LOW'?
1352 | adc3xxx->rst_pin = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
CC lib/dynamic_debug.o../sound/soc/codecs/tlv320adc3xxx.c:1400:9: error: implicit declaration of function 'gpiod_set_value_cansleep'; did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration]
1400 | gpiod_set_value_cansleep(adc3xxx->rst_pin, 1);
--- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/Kconfig +1 -0
@@ -1599,6 +1599,7 @@ config SND_SOC_TFA989X config SND_SOC_TLV320ADC3XXX tristate "Texas Instruments TLV320ADC3001/3101 audio ADC" depends on I2C + depends on GPIOLIB help Enable support for Texas Instruments TLV320ADC3001 and TLV320ADC3101 ADCs.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 130/240 KVM: selftests: Fix number of pages for memory slot in memslot_modification_stress_test
In reply to Greg Kroah-HartmanFrom: Gavin Shan <[email protected]>
[ Upstream commit 05c2224d4b049406b0545a10be05280ff4b8ba0a ]
It's required by vm_userspace_mem_region_add() that memory size should be aligned to host page size. However, one guest page is provided by memslot_modification_stress_test. It triggers failure in the scenario of 64KB-page-size-host and 4KB-page-size-guest, as the following messages indicate.
# ./memslot_modification_stress_test
Testing guest mode: PA-bits:40, VA-bits:48, 4K pages
guest physical test memory: [0xffbfff0000, 0xffffff0000)
Finished creating vCPUs
Started all vCPUs
==== Test Assertion Failure ====
lib/kvm_util.c:824: vm_adjust_num_guest_pages(vm->mode, npages) == npages
pid=5712 tid=5712 errno=0 - Success
1 0x0000000000404eeb: vm_userspace_mem_region_add at kvm_util.c:822
2 0x0000000000401a5b: add_remove_memslot at memslot_modification_stress_test.c:82
3 (inlined by) run_test at memslot_modification_stress_test.c:110
4 0x0000000000402417: for_each_guest_mode at guest_modes.c:100
5 0x00000000004016a7: main at memslot_modification_stress_test.c:187
6 0x0000ffffb8cd4383: ?? ??:0
7 0x0000000000401827: _start at :?
Number of guest pages is not compatible with the host. Try npages=16Fix the issue by providing 16 guest pages to the memory slot for this particular combination of 64KB-page-size-host and 4KB-page-size-guest on aarch64.
--- tools/testing/selftests/kvm/memslot_modification_stress_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/memslot_modification_stress_test.c +1 -1
@@ -67,7 +67,7 @@ struct memslot_antagonist_args {static void add_remove_memslot (struct kvm_vm *vm,useconds_t delay,uint64_t nr_modifications) { -const uint64_t pages =1 ; +uint64_t pages =max_t (int, vm->page_size,getpagesize ()) / vm->page_size;uint64_t gpa;int i;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 131/240 ASoC: qcom: lpass-cpu: mark HDMI TX registers as volatile
In reply to Greg Kroah-HartmanFrom: Srinivasa Rao Mandadapu <[email protected]>
[ Upstream commit c9a3545b1d771fb7b06a487796c40288c02c41c5 ]
Update HDMI volatile registers list as DMA, Channel Selection registers, vbit control registers are being reflected by hardware DP port disconnection.
This update is required to fix no display and no sound issue observed after reconnecting TAMA/SANWA DP cables.
Once DP cable is unplugged, DMA control registers are being reset by hardware, however at second plugin, new dma control values does not updated to the dma hardware registers since new register value and cached values at the time of first plugin are same.
--- sound/soc/qcom/lpass-cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/qcom/lpass-cpu.c +8 -0
@@ -782,10 +782,18 @@ static bool lpass_hdmi_regmap_volatile(struct device *dev, unsigned int reg)return true;if (reg ==LPASS_HDMI_TX_LEGACY_ADDR (v))return true; +if (reg ==LPASS_HDMI_TX_VBIT_CTL_ADDR (v)) +return true;for (i =0 ; i < v->hdmi_rdma_channels; ++i) {if (reg ==LPAIF_HDMI_RDMACURR_REG (v, i))return true; +if (reg ==LPASS_HDMI_TX_DMA_ADDR (v, i)) +return true; +if (reg ==LPASS_HDMI_TX_CH_LSB_ADDR (v, i)) +return true; +if (reg ==LPASS_HDMI_TX_CH_MSB_ADDR (v, i)) +return true; }return false; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 132/240 drm/msm/a6xx: Fix kvzalloc vs state_kcalloc usage
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 83d18e9d9c0150d98dc24e3642ea93f5e245322c ]
adreno_show_object() is a trap! It will re-allocate the pointer it is passed on first call, when the data is ascii85 encoded, using kvmalloc/ kvfree(). Which means the data *passed* to it must be kvmalloc'd, ie. we cannot use the state_kcalloc() helper.
This partially reverts commit ec8f1813bf8d ("drm/msm/a6xx: Replace kcalloc() with kvzalloc()"), but adds the missing kvfree() to fix the memory leak that was present previously. And adds a warning comment.
Patchwork: https://patchwork.freedesktop.org/patch/507014/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 11 ++++++++++- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 ++++++- 2 files changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +10 -1
@@ -819,7 +819,7 @@ static struct msm_gpu_state_bo *a6xx_snapshot_gmu_bo( snapshot->iova = bo->iova; snapshot->size = bo->size; - snapshot->data =state_kcalloc (a6xx_state,1 , snapshot->size); + snapshot->data =kvzalloc (snapshot->size,GFP_KERNEL );if (!snapshot->data)return NULL ;
@@ -1034,6 +1034,15 @@ static void a6xx_gpu_state_destroy(struct kref *kref)struct a6xx_gpu_state *a6xx_state =container_of (state, struct a6xx_gpu_state, base); +if (a6xx_state->gmu_log) +kvfree (a6xx_state->gmu_log->data); + +if (a6xx_state->gmu_hfi) +kvfree (a6xx_state->gmu_hfi->data); + +if (a6xx_state->gmu_debug) +kvfree (a6xx_state->gmu_debug->data); +list_for_each_entry_safe (obj, tmp, &a6xx_state->objs, node)kvfree (obj);
drivers/gpu/drm/msm/adreno/adreno_gpu.c +6 -1
@@ -729,7 +729,12 @@ static char *adreno_gpu_ascii85_encode(u32 *src, size_t len)return buf; } -/* len is expected to be in bytes */ +/* len is expected to be in bytes +* +* WARNING: *ptr should be allocated with kvmalloc or friends. It can be free'd +* with kvfree() and replaced with a newly kvmalloc'd buffer on the first call +* when the unencoded raw data is encoded +*/ void adreno_show_object (struct drm_printer *p,void **ptr,int len,bool *encoded) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 133/240 erofs: fix illegal unmapped accesses in z_erofs_fill_inode_lazy()
In reply to Greg Kroah-HartmanFrom: Yue Hu <[email protected]>
[ Upstream commit 664609e49f1c84fc97987b2bf64544e586b8849c ]
Note that we are still accessing 'h_idata_size' and 'h_fragmentoff' after calling erofs_put_metabuf(), that is not correct. Fix it.
--- fs/erofs/zmap.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
fs/erofs/zmap.c +7 -10
@@ -61,8 +61,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode) pos =ALIGN (iloc (EROFS_SB (sb), vi->nid) + vi->inode_isize + vi->xattr_isize,8 ); - kaddr =erofs_read_metabuf (&buf, sb,erofs_blknr (pos), -EROFS_KMAP_ATOMIC ); + kaddr =erofs_read_metabuf (&buf, sb,erofs_blknr (pos),EROFS_KMAP );if (IS_ERR (kaddr)) { err =PTR_ERR (kaddr); goto out_unlock;
@@ -79,7 +78,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)erofs_err (sb,"unknown HEAD%u format %u for nid %llu, please upgrade kernel" , headnr +1 , vi->z_algorithmtype[headnr], vi->nid); err = -EOPNOTSUPP ; - goto unmap_done; + goto out_put_metabuf; } vi->z_logical_clusterbits =LOG_BLOCK_SIZE + (h->h_clusterbits &7 );
@@ -89,7 +88,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)erofs_err (sb,"per-inode big pcluster without sb feature for nid %llu" , vi->nid); err = -EFSCORRUPTED ; - goto unmap_done; + goto out_put_metabuf; }if (vi->datalayout ==EROFS_INODE_FLAT_COMPRESSION && !(vi->z_advise & Z_EROFS_ADVISE_BIG_PCLUSTER_1) ^
@@ -97,12 +96,8 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)erofs_err (sb,"big pcluster head1/2 of compact indexes should be consistent for nid %llu" , vi->nid); err = -EFSCORRUPTED ; - goto unmap_done; + goto out_put_metabuf; } -unmap_done: -erofs_put_metabuf (&buf); -if (err) - goto out_unlock;if (vi->z_advise &Z_EROFS_ADVISE_INLINE_PCLUSTER ) {struct erofs_map_blocks map = {
@@ -121,11 +116,13 @@ static int z_erofs_fill_inode_lazy(struct inode *inode) err = -EFSCORRUPTED ; }if (err <0 ) - goto out_unlock; + goto out_put_metabuf; }/* paired with smp_mb() at the beginning of the function */ smp_mb ();set_bit (EROFS_I_Z_INITED_BIT , &vi->flags); +out_put_metabuf: +erofs_put_metabuf (&buf); out_unlock:clear_and_wake_up_bit (EROFS_I_BL_Z_BIT , &vi->flags);return err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 134/240 erofs: fix up inplace decompression success rate
In reply to Greg Kroah-HartmanFrom: Gao Xiang <[email protected]>
[ Upstream commit e7933278b442f97809b1ea84264586302bd08a03 ]
Partial decompression should be checked after updating length. It's a new regression when introducing multi-reference pclusters.
--- fs/erofs/zdata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/erofs/zdata.c +3 -3
@@ -765,13 +765,13 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,if (fe->pcl->pageofs_out != (map->m_la & ~PAGE_MASK )) fe->pcl->multibases = true; -if ((map->m_flags &EROFS_MAP_FULL_MAPPED ) && - fe->pcl->length == map->m_llen) - fe->pcl->partial = false;if (fe->pcl->length < offset + end - map->m_la) { fe->pcl->length = offset + end - map->m_la; fe->pcl->pageofs_out = map->m_la & ~PAGE_MASK ; } +if ((map->m_flags &EROFS_MAP_FULL_MAPPED ) && + fe->pcl->length == map->m_llen) + fe->pcl->partial = false; next_part:/* shorten the remaining extent to update progress */ map->m_llen = offset + cur - map->m_la;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 135/240 pinctrl: qcom: Avoid glitching lines when we first mux to output
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit d21f4b7ffc22c009da925046b69b15af08de9d75 ]
Back in the description of commit e440e30e26dd ("arm64: dts: qcom:
sc7180: Avoid glitching SPI CS at bootup on trogdor") we described a problem that we were seeing on trogdor devices. I'll re-summarize here but you can also re-read the original commit.
On trogdor devices, the BIOS is setting up the SPI chip select as:
- mux special function (SPI chip select)
- output enable
- output low (unused because we've muxed as special function)
In the kernel, however, we've moved away from using the chip select line as special function. Since the kernel wants to fully control the chip select it's far more efficient to treat the line as a GPIO rather than sending packet-like commands to the GENI firmware every time we want the line to toggle.
When we transition from how the BIOS had the pin configured to how the kernel has the pin configured we end up glitching the line. That's because we _first_ change the mux of the line and then later set its output. This glitch is bad and can confuse the device on the other end of the line.
The old commit e440e30e26dd ("arm64: dts: qcom: sc7180: Avoid glitching SPI CS at bootup on trogdor") fixed the glitch, though the solution was far from elegant. It essentially did the thing that everyone always hates: encoding a sequential program in device tree, even if it's a simple one. It also, unfortunately, got broken by commit b991f8c3622c ("pinctrl: core: Handling pinmux and pinconf separately"). After that commit we did all the muxing _first_ even though the config (set the pin to output high) was listed first. :(
I looked at ideas for how to solve this more properly. My first thought was to use the "init" pinctrl state. In theory the "init" pinctrl state is supposed to be exactly for achieving glitch-free transitions. My dream would have been for the "init" pinctrl to do nothing at all. That would let us delay the automatic pin muxing until the driver could set things up and call pinctrl_init_done(). In other words, my dream was:
/* Request the GPIO; init it 1 (because DT says GPIO_ACTIVE_LOW) */ devm_gpiod_get_index(dev, "cs", GPIOD_OUT_LOW);
/* Output should be right, so we can remux, yay! */ pinctrl_init_done(dev);
Unfortunately, it didn't work out. The primary reason is that the MSM GPIO driver implements gpio_request_enable(). As documented in pinmux.h, that function automatically remuxes a line as a GPIO. ...and it does this remuxing _before_ specifying the output of the pin. You can see in gpiod_get_index() that we call gpiod_request() before gpiod_configure_flags(). gpiod_request() isn't passed any flags so it has no idea what the eventual output will be.
We could have debates about whether or not the automatic remuxing to GPIO for the MSM pinctrl was a good idea or not, but at this point I think there is a plethora of code that's relying on it and I certainly wouldn't suggest changing it.
Alternatively, we could try to come up with a way to pass the initial output state to gpio_request_enable() and plumb all that through. That seems like it would be doable, but we'd have to plumb it through several layers in the stack.
This patch implements yet another alternative. Here, we specifically avoid glitching the first time a pin is muxed to GPIO function if the direction of the pin is output. The idea is that we can read the state of the pin before we set the mux and make sure that the re-mux won't change the state.
NOTES:
- We only do this the first time since later swaps between mux states might want to preserve the old output value. In other words, I wouldn't want to break a driver that did:
gpiod_set_value(g, 1);
pinctrl_select_state(pinctrl, special_state);
pinctrl_select_default_state();
/* We should be driving 1 even if "special_state" made the pin 0 */- It's safe to do this the first time since the driver _couldn't_ have explicitly set a state. In order to even be able to control the GPIO (at least using gpiod) we have to have requested it which would have counted as the first mux.
- In theory, instead of keeping track of the first time a pin was set as a GPIO we could enable the glitch-free behavior only when msm_pinmux_request_gpio() is in the callchain. That works an enables my "dream" implementation above where we use an "init" state to solve this. However, it's nice not to have to do this. By handling just the first transition to GPIO we can simply let the normal "default" remuxing happen and we can be assured that there won't be a glitch.
Before this change I could see the glitch reported on the EC console when booting. It would say this when booting the kernel:
Unexpected state 1 in CSNRE ISR
After this change there is no error reported.
Note that I haven't reproduced the original problem described in e440e30e26dd ("arm64: dts: qcom: sc7180: Avoid glitching SPI CS at bootup on trogdor") but I could believe it might happen in certain timing conditions.
--- drivers/pinctrl/qcom/pinctrl-msm.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/pinctrl/qcom/pinctrl-msm.c +21 -0
@@ -51,6 +51,7 @@* detection. * @skip_wake_irqs: Skip IRQs that are handled by wakeup interrupt controller * @disabled_for_mux: These IRQs were disabled because we muxed away. +* @ever_gpio: This bit is set the first time we mux a pin to gpio_func. * @soc: Reference to soc_data of platform specific data. * @regs: Base addresses for the TLMM tiles. * @phys_base: Physical base address
@@ -72,6 +73,7 @@ struct msm_pinctrl {DECLARE_BITMAP (enabled_irqs,MAX_NR_GPIO );DECLARE_BITMAP (skip_wake_irqs,MAX_NR_GPIO );DECLARE_BITMAP (disabled_for_mux,MAX_NR_GPIO ); +DECLARE_BITMAP (ever_gpio,MAX_NR_GPIO );const struct msm_pinctrl_soc_data *soc;void __iomem *regs[MAX_NR_TILES ];
@@ -218,6 +220,25 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev, val =msm_readl_ctl (pctrl, g); +/* +* If this is the first time muxing to GPIO and the direction is +* output, make sure that we're not going to be glitching the pin +* by reading the current state of the pin and setting it as the +* output. +*/ +if (i == gpio_func && (val &BIT (g->oe_bit)) && + !test_and_set_bit (group, pctrl->ever_gpio)) { +u32 io_val =msm_readl_io (pctrl, g); + +if (io_val &BIT (g->in_bit)) { +if (!(io_val &BIT (g->out_bit))) +msm_writel_io (io_val |BIT (g->out_bit), pctrl, g); + }else { +if (io_val &BIT (g->out_bit)) +msm_writel_io (io_val & ~BIT (g->out_bit), pctrl, g); + } + } +if (egpio_func && i == egpio_func) {if (val &BIT (g->egpio_present)) val &= ~BIT (g->egpio_enable);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 136/240 spi: qup: support using GPIO as chip select line
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit b40af6183b685b0cf7870987b858de0d48db9ea0 ]
Most of the device with QUP SPI adapter are actually using GPIO-s for chip select.
However, this stopped working after ("spi: Retire legacy GPIO handling") as it introduced a check on ->use_gpio_descriptors flag and since spi-qup driver does not set the flag it meant that all of boards using GPIO-s and with QUP adapter SPI devices stopped working.
So, to enable using GPIO-s again set ->use_gpio_descriptors to true and populate ->max_native_cs.
--- drivers/spi/spi-qup.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-qup.c +2 -0
@@ -1057,6 +1057,8 @@ static int spi_qup_probe(struct platform_device *pdev)else master->num_chipselect = num_cs; + master->use_gpio_descriptors = true; + master->max_native_cs =SPI_NUM_CHIPSELECTS ; master->bus_num = pdev->id; master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH |SPI_LOOP ; master->bits_per_word_mask =SPI_BPW_RANGE_MASK (4 ,32 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 137/240 x86/fpu: Configure init_fpstate attributes orderly
In reply to Greg Kroah-HartmanFrom: Chang S. Bae <[email protected]>
[ Upstream commit c32d7cab57e3a77af8ecc17cde7a5761a26483b8 ]
The init_fpstate setup code is spread out and out of order. The init image is recorded before its scoped features and the buffer size are determined.
Determine the scope of init_fpstate components and its size before recording the init state. Also move the relevant code together.
Stable-dep-of: d3e021adac7c ("x86/fpu: Fix the init_fpstate size check with the actual size")
--- arch/x86/kernel/fpu/init.c | 8 -------- arch/x86/kernel/fpu/xstate.c | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-)
arch/x86/kernel/fpu/init.c +0 -8
@@ -210,13 +210,6 @@ static void __init fpu__init_system_xstate_size_legacy(void)fpstate_reset (¤t->thread.fpu); } -static void __init fpu__init_init_fpstate (void ) -{ -/* Bring init_fpstate size and features up to date */ - init_fpstate.size = fpu_kernel_cfg.max_size; - init_fpstate.xfeatures = fpu_kernel_cfg.max_features; -} -/* * Called on the boot CPU once per system bootup, to set up the initial * FPU state that is later cloned into all processes:
@@ -236,5 +229,4 @@ void __init fpu__init_system(struct cpuinfo_x86 *c)fpu__init_system_xstate_size_legacy ();fpu__init_system_xstate (fpu_kernel_cfg.max_size);fpu__init_task_struct_size (); -fpu__init_init_fpstate (); }
arch/x86/kernel/fpu/xstate.c +5 -1
@@ -360,7 +360,7 @@ static void __init setup_init_fpu_buf(void)print_xstate_features (); -xstate_init_xcomp_bv (&init_fpstate.regs.xsave, fpu_kernel_cfg.max_features); +xstate_init_xcomp_bv (&init_fpstate.regs.xsave, init_fpstate.xfeatures);/* * Init all the features state with header.xfeatures being 0x0
@@ -875,6 +875,10 @@ void __init fpu__init_system_xstate(unsigned int legacy_size)update_regset_xstate_info (fpu_user_cfg.max_size, fpu_user_cfg.max_features); +/* Bring init_fpstate size and features up to date */ + init_fpstate.size = fpu_kernel_cfg.max_size; + init_fpstate.xfeatures = fpu_kernel_cfg.max_features; +setup_init_fpu_buf ();/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 138/240 x86/fpu: Fix the init_fpstate size check with the actual size
In reply to Greg Kroah-HartmanFrom: Chang S. Bae <[email protected]>
[ Upstream commit d3e021adac7c51a26d9ede167c789fcc1b878467 ]
The init_fpstate buffer is statically allocated. Thus, the sanity test was established to check whether the pre-allocated buffer is enough for the calculated size or not.
The currently measured size is not strictly relevant. Fix to validate the calculated init_fpstate size with the pre-allocated area.
Also, replace the sanity check function with open code for clarity. The abstraction itself and the function naming do not tend to represent simply what it does.
--- arch/x86/kernel/fpu/xstate.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
arch/x86/kernel/fpu/xstate.c +6 -18
@@ -678,20 +678,6 @@ static unsigned int __init get_xsave_size_user(void)return ebx; } -/* -* Will the runtime-enumerated 'xstate_size' fit in the init -* task's statically-allocated buffer? -*/ -static bool __init is_supported_xstate_size (unsigned int test_xstate_size) -{ -if (test_xstate_size <=sizeof (init_fpstate.regs)) -return true; - -pr_warn ("x86/fpu: xstate buffer too small (%zu < %d), disabling xsave\n" , -sizeof (init_fpstate.regs), test_xstate_size); -return false; -} -static int __init init_xstate_size (void ) {/* Recompute the context size for enabled features: */
@@ -717,10 +703,6 @@ static int __init init_xstate_size(void) kernel_default_size =xstate_calculate_size (fpu_kernel_cfg.default_features, compacted); -/* Ensure we have the space to store all default enabled features. */ -if (!is_supported_xstate_size (kernel_default_size)) -return -EINVAL ; -if (!paranoid_xstate_size_valid (kernel_size))return -EINVAL ;
@@ -879,6 +861,12 @@ void __init fpu__init_system_xstate(unsigned int legacy_size) init_fpstate.size = fpu_kernel_cfg.max_size; init_fpstate.xfeatures = fpu_kernel_cfg.max_features; +if (init_fpstate.size >sizeof (init_fpstate.regs)) { +pr_warn ("x86/fpu: init_fpstate buffer too small (%zu < %d), disabling XSAVE\n" , +sizeof (init_fpstate.regs), init_fpstate.size); + goto out_disable; + } +setup_init_fpu_buf ();/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 139/240 x86/fpu: Exclude dynamic states from init_fpstate
In reply to Greg Kroah-HartmanFrom: Chang S. Bae <[email protected]>
[ Upstream commit a401f45e38754953c9d402f8b3bc965707eecc91 ]
== Background ==
The XSTATE init code initializes all enabled and supported components. Then, the init states are saved in the init_fpstate buffer that is statically allocated in about one page.
The AMX TILE_DATA state is large (8KB) but its init state is zero. And the feature comes only with the compacted format with these established
dependencies: AMX->XFD->XSAVES. So this state is excludable from init_fpstate.
== Problem ==
But the buffer is formatted to include that large state. Then, this can be the cause of a noisy splat like the below.
This came from XRSTORS for the task with init_fpstate in its XSAVE buffer. It is reproducible on AMX systems when the running kernel is built with CONFIG_DEBUG_PAGEALLOC=y and CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y:
Bad FPU state detected at restore_fpregs_from_fpstate+0x57/0xd0, reinitializing FPU registers.
...
RIP: 0010:restore_fpregs_from_fpstate+0x57/0xd0 ? restore_fpregs_from_fpstate+0x45/0xd0 switch_fpu_return+0x4e/0xe0 exit_to_user_mode_prepare+0x17b/0x1b0 syscall_exit_to_user_mode+0x29/0x40 do_syscall_64+0x67/0x80 ? do_syscall_64+0x67/0x80 ? exc_page_fault+0x86/0x180 entry_SYSCALL_64_after_hwframe+0x63/0xcd
== Solution ==
Adjust init_fpstate to exclude dynamic states. XRSTORS from init_fpstate still initializes those states when their bits are set in the requested-feature bitmap.
--- arch/x86/kernel/fpu/xstate.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/fpu/xstate.c +6 -3
@@ -857,9 +857,12 @@ void __init fpu__init_system_xstate(unsigned int legacy_size)update_regset_xstate_info (fpu_user_cfg.max_size, fpu_user_cfg.max_features); -/* Bring init_fpstate size and features up to date */ - init_fpstate.size = fpu_kernel_cfg.max_size; - init_fpstate.xfeatures = fpu_kernel_cfg.max_features; +/* +* init_fpstate excludes dynamic states as they are large but init +* state is zero. +*/ + init_fpstate.size = fpu_kernel_cfg.default_size; + init_fpstate.xfeatures = fpu_kernel_cfg.default_features;if (init_fpstate.size >sizeof (init_fpstate.regs)) { pr_warn("x86/fpu: init_fpstate buffer too small (%zu < %d), disabling XSAVE\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 140/240 perf: Fix missing SIGTRAPs
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit ca6c21327c6af02b7eec31ce4b9a740a18c6c13f ]
Marco reported:
Due to the implementation of how SIGTRAP are delivered if perf_event_attr::sigtrap is set, we've noticed 3 issues:
1. Missing SIGTRAP due to a race with event_sched_out() (more details below).
2. Hardware PMU events being disabled due to returning 1 from perf_event_overflow(). The only way to re-enable the event is for user space to first "properly" disable the event and then re-enable it.
3. The inability to automatically disable an event after a specified number of overflows via PERF_EVENT_IOC_REFRESH.
The worst of the 3 issues is problem (1), which occurs when a pending_disable is "consumed" by a racing event_sched_out(), observed as follows:
CPU0 | CPU1 --------------------------------+--------------------------- __perf_event_overflow() | perf_event_disable_inatomic() | pending_disable = CPU0 | ... | _perf_event_enable() | event_function_call() | task_function_call() | /* sends IPI to CPU0 */ <IPI> | ... __perf_event_enable() +--------------------------- ctx_resched() task_ctx_sched_out() ctx_sched_out() group_sched_out() event_sched_out() pending_disable = -1 </IPI> <IRQ-work> perf_pending_event() perf_pending_event_disable() /* Fails to send SIGTRAP because no pending_disable! */ </IRQ-work>
In the above case, not only is that particular SIGTRAP missed, but also all future SIGTRAPs because 'event_limit' is not reset back to 1.
To fix, rework pending delivery of SIGTRAP via IRQ-work by introduction of a separate 'pending_sigtrap', no longer using 'event_limit' and 'pending_disable' for its delivery.
Additionally; and different to Marco's proposed patch:
- recognise that pending_disable effectively duplicates oncpu for the case where it is set. As such, change the irq_work handler to use ->oncpu to target the event and use pending_* as boolean toggles.
- observe that SIGTRAP targets the ctx->task, so the context switch optimization that carries contexts between tasks is invalid. If the irq_work were delayed enough to hit after a context switch the SIGTRAP would be delivered to the wrong task.
- observe that if the event gets scheduled out (rotation/migration/context-switch/...) the irq-work would be insufficient to deliver the SIGTRAP when the event gets scheduled back in (the irq-work might still be pending on the old CPU).
Therefore have event_sched_out() convert the pending sigtrap into a task_work which will deliver the signal at return_to_user.
--- include/linux/perf_event.h | 19 ++++- kernel/events/core.c | 151 +++++++++++++++++++++++++++--------- kernel/events/ring_buffer.c | 2 +- 3 files changed, 129 insertions(+), 43 deletions(-)
include/linux/perf_event.h +15 -4
@@ -736,11 +736,14 @@ struct perf_event {struct fasync_struct *fasync;/* delayed work for NMIs and such */ -int pending_wakeup; -int pending_kill; -int pending_disable; +unsigned int pending_wakeup; +unsigned int pending_kill; +unsigned int pending_disable; +unsigned int pending_sigtrap;unsigned long pending_addr;/* SIGTRAP */ -struct irq_work pending; +struct irq_work pending_irq; +struct callback_head pending_task; +unsigned int pending_work;atomic_t event_limit;
@@ -857,6 +860,14 @@ struct perf_event_context {#endif void *task_ctx_data;/* pmu specific data */ struct rcu_head rcu_head; + +/* +* Sum (event->pending_sigtrap + event->pending_work) +* +* The SIGTRAP is targeted at ctx->task, as such it won't do changing +* that until the signal is delivered. +*/ +local_t nr_pending; };/*
kernel/events/core.c +113 -38
284 lines not on this page · raw message
kernel/events/ring_buffer.c +1 -1
@@ -22,7 +22,7 @@ static void perf_output_wakeup(struct perf_output_handle *handle)atomic_set (&handle->rb->poll,EPOLLIN ); handle->event->pending_wakeup =1 ; -irq_work_queue (&handle->event->pending); +irq_work_queue (&handle->event->pending_irq); }/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 141/240 sched/core: Fix comparison in sched_group_cookie_match()
In reply to Greg Kroah-HartmanFrom: Lin Shengwang <[email protected]>
[ Upstream commit e705968dd687574b6ca3ebe772683d5642759132 ]
In commit 97886d9dcd86 ("sched: Migration changes for core scheduling"), sched_group_cookie_match() was added to help determine if a cookie matches the core state.
However, while it iterates the SMT group, it fails to actually use the RQ for each of the CPUs iterated, use cpu_rq(cpu) instead of rq to fix things.
--- kernel/sched/sched.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
kernel/sched/sched.h +9 -9
@@ -1197,6 +1197,14 @@ static inline bool is_migration_disabled(struct task_struct *p)#endif } +DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); + +#define cpu_rq (cpu) (&per_cpu(runqueues, (cpu))) +#define this_rq () this_cpu_ptr(&runqueues) +#define task_rq (p) cpu_rq(task_cpu(p)) +#define cpu_curr (cpu) (cpu_rq(cpu)->curr) +#define raw_rq () raw_cpu_ptr(&runqueues) +struct sched_group ;#ifdef CONFIG_SCHED_CORE static inline struct cpumask *sched_group_span (struct sched_group *sg);
@@ -1284,7 +1292,7 @@ static inline bool sched_group_cookie_match(struct rq *rq,return true;for_each_cpu_and (cpu,sched_group_span (group), p->cpus_ptr) { -if (sched_core_cookie_match (rq, p)) +if (sched_core_cookie_match (cpu_rq (cpu), p))return true; }return false;
@@ -1399,14 +1407,6 @@ static inline void update_idle_core(struct rq *rq)static inline void update_idle_core (struct rq *rq) { }#endif -DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); - -#define cpu_rq (cpu) (&per_cpu(runqueues, (cpu))) -#define this_rq () this_cpu_ptr(&runqueues) -#define task_rq (p) cpu_rq(task_cpu(p)) -#define cpu_curr (cpu) (cpu_rq(cpu)->curr) -#define raw_rq () raw_cpu_ptr(&runqueues) -#ifdef CONFIG_FAIR_GROUP_SCHED static inline struct task_struct *task_of (struct sched_entity *se) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 142/240 bpf: prevent decl_tag from being referenced in func_proto
In reply to Greg Kroah-HartmanFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit ea68376c8bed5cd156900852aada20c3a0874d17 ]
Syzkaller was able to hit the following issue:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 3609 at kernel/bpf/btf.c:1946 btf_type_id_size+0x2d5/0x9d0 kernel/bpf/btf.c:1946 Modules linked in: CPU: 0 PID: 3609 Comm: syz-executor361 Not tainted 6.0.0-syzkaller-02734-g0326074ff465 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/22/2022 RIP: 0010:btf_type_id_size+0x2d5/0x9d0 kernel/bpf/btf.c:1946 Code: ef e8 7f 8e e4 ff 41 83 ff 0b 77 28 f6 44 24 10 18 75 3f e8 6d 91 e4 ff 44 89 fe bf 0e 00 00 00 e8 20 8e e4 ff e8 5b 91 e4 ff <0f> 0b 45 31 f6 e9 98 02 00 00 41 83 ff 12 74 18 e8 46 91 e4 ff 44 RSP: 0018:ffffc90003cefb40 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000002 RCX: 0000000000000000 RDX: ffff8880259c0000 RSI: ffffffff81968415 RDI: 0000000000000005 RBP: ffff88801270ca00 R08: 0000000000000005 R09: 000000000000000e R10: 0000000000000011 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000011 R14: ffff888026ee6424 R15: 0000000000000011 FS: 000055555641b300(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000f2e258 CR3: 000000007110e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> btf_func_proto_check kernel/bpf/btf.c:4447 [inline] btf_check_all_types kernel/bpf/btf.c:4723 [inline] btf_parse_type_sec kernel/bpf/btf.c:4752 [inline] btf_parse kernel/bpf/btf.c:5026 [inline] btf_new_fd+0x1926/0x1e70 kernel/bpf/btf.c:6892 bpf_btf_load kernel/bpf/syscall.c:4324 [inline] __sys_bpf+0xb7d/0x4cf0 kernel/bpf/syscall.c:5010 __do_sys_bpf kernel/bpf/syscall.c:5069 [inline] __se_sys_bpf kernel/bpf/syscall.c:5067 [inline] __x64_sys_bpf+0x75/0xb0 kernel/bpf/syscall.c:5067 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f0fbae41c69 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89
f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007ffc8aeb6228 EFLAGS: 00000246 ORIG_RAX: 0000000000000141
RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f0fbae41c69
RDX: 0000000000000020 RSI: 0000000020000140 RDI: 0000000000000012
RBP: 00007f0fbae05e10 R08: 0000000000000000 R09: 0000000000000000
R10: 00000000ffffffff R11: 0000000000000246 R12: 00007f0fbae05ea0
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
</TASK>
Looks like it tries to create a func_proto which return type is decl_tag. For the details, see Martin's spot on analysis in [0].
--- kernel/bpf/btf.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/bpf/btf.c +5 -0
@@ -4436,6 +4436,11 @@ static int btf_func_proto_check(struct btf_verifier_env *env,return -EINVAL ; } +if (btf_type_is_resolve_source_only (ret_type)) { +btf_verifier_log_type (env, t,"Invalid return type" ); +return -EINVAL ; + } +if (btf_type_needs_resolve (ret_type) && !env_type_is_resolved (env, ret_type_id)) { err =btf_resolve (env, ret_type, ret_type_id);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 143/240 arc: iounmap() arg is volatile
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit c44f15c1c09481d50fd33478ebb5b8284f8f5edb ]
Add 'volatile' to iounmap()'s argument to prevent build warnings. This make it the same as other major architectures.
Placates these warnings: (12 such warnings)
../drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe':../drivers/video/fbdev/riva/fbdev.c:2067:42: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers]
2067 | iounmap(default_par->riva.PRAMIN);
--- arch/arc/include/asm/io.h | 2 +- arch/arc/mm/ioremap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arc/include/asm/io.h +1 -1
@@ -32,7 +32,7 @@ static inline void ioport_unmap(void __iomem *addr) { } -extern void iounmap (const void __iomem *addr); +extern void iounmap (const volatile void __iomem *addr);/* * io{read,write}{16,32}be() macros
arch/arc/mm/ioremap.c +1 -1
@@ -94,7 +94,7 @@ void __iomem *ioremap_prot(phys_addr_t paddr, unsigned long size,EXPORT_SYMBOL (ioremap_prot); -void iounmap (const void __iomem *addr) +void iounmap (const volatile void __iomem *addr) {/* weird double cast to handle phys_addr_t > 32 bits */ if (arc_uncached_addr_space ((phys_addr_t )(u32 )addr))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 144/240 mtd: core: add missing of_node_get() in dynamic partitions code
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 12b58961de0bd88b3c7dfa5d21f6d67f4678b780 ]
This fixes unbalanced of_node_put():
[ 1.078910] 6 cmdlinepart partitions found on MTD device gpmi-nand [ 1.085116] Creating 6 MTD partitions on "gpmi-nand": [ 1.090181] 0x000000000000-0x000008000000 : "nandboot" [ 1.096952] 0x000008000000-0x000009000000 : "nandfit" [ 1.103547] 0x000009000000-0x00000b000000 : "nandkernel" [ 1.110317] 0x00000b000000-0x00000c000000 : "nanddtb" [ 1.115525] ------------[ cut here ]------------ [ 1.120141] refcount_t: addition on 0; use-after-free. [ 1.125328] WARNING: CPU: 0 PID: 1 at lib/refcount.c:25 refcount_warn_saturate+0xdc/0x148 [ 1.133528] Modules linked in: [ 1.136589] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.0.0-rc7-next-20220930-04543-g8cf3f7 [ 1.146342] Hardware name: Freescale i.MX8DXL DDR3L EVK (DT) [ 1.151999] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 1.158965] pc : refcount_warn_saturate+0xdc/0x148 [ 1.163760] lr : refcount_warn_saturate+0xdc/0x148 [ 1.168556] sp : ffff800009ddb080 [ 1.171866] x29: ffff800009ddb080 x28: ffff800009ddb35a x27: 0000000000000002 [ 1.179015] x26: ffff8000098b06ad x25: ffffffffffffffff x24: ffff0a00ffffff05 [ 1.186165] x23: ffff00001fdf6470 x22: ffff800009ddb367 x21: 0000000000000000 [ 1.193314] x20: ffff00001fdfebe8 x19: ffff00001fdfec50 x18: ffffffffffffffff [ 1.200464] x17: 0000000000000000 x16: 0000000000000118 x15: 0000000000000004 [ 1.207614] x14: 0000000000000fff x13: ffff800009bca248 x12: 0000000000000003 [ 1.214764] x11: 00000000ffffefff x10: c0000000ffffefff x9 : 4762cb2ccb52de00 [ 1.221914] x8 : 4762cb2ccb52de00 x7 : 205d313431303231 x6 : 312e31202020205b [ 1.229063] x5 : ffff800009d55c1f x4 : 0000000000000001 x3 : 0000000000000000 [ 1.236213] x2 : 0000000000000000 x1 : ffff800009954be6 x0 : 000000000000002a [ 1.243365] Call trace: [ 1.245806] refcount_warn_saturate+0xdc/0x148 [ 1.250253] kobject_get+0x98/0x9c [ 1.253658] of_node_get+0x20/0x34 [ 1.257072] of_fwnode_get+0x3c/0x54 [ 1.260652] fwnode_get_nth_parent+0xd8/0xf4 [ 1.264926] fwnode_full_name_string+0x3c/0xb4 [ 1.269373] device_node_string+0x498/0x5b4 [ 1.273561] pointer+0x41c/0x5d0 [ 1.276793] vsnprintf+0x4d8/0x694 [ 1.280198] vprintk_store+0x164/0x528 [ 1.283951] vprintk_emit+0x98/0x164 [ 1.287530] vprintk_default+0x44/0x6c [ 1.291284] vprintk+0xf0/0x134 [ 1.294428] _printk+0x54/0x7c [ 1.297486] of_node_release+0xe8/0x128 [ 1.301326] kobject_put+0x98/0xfc [ 1.304732] of_node_put+0x1c/0x28 [ 1.308137] add_mtd_device+0x484/0x6d4 [ 1.311977] add_mtd_partitions+0xf0/0x1d0 [ 1.316078] parse_mtd_partitions+0x45c/0x518 [ 1.320439] mtd_device_parse_register+0xb0/0x274 [ 1.325147] gpmi_nand_probe+0x51c/0x650 [ 1.329074] platform_probe+0xa8/0xd0 [ 1.332740] really_probe+0x130/0x334 [ 1.336406] __driver_probe_device+0xb4/0xe0 [ 1.340681] driver_probe_device+0x3c/0x1f8 [ 1.344869] __driver_attach+0xdc/0x1a4 [ 1.348708] bus_for_each_dev+0x80/0xcc [ 1.352548] driver_attach+0x24/0x30 [ 1.356127] bus_add_driver+0x108/0x1f4 [ 1.359967] driver_register+0x78/0x114 [ 1.363807] __platform_driver_register+0x24/0x30 [ 1.368515] gpmi_nand_driver_init+0x1c/0x28 [ 1.372798] do_one_initcall+0xbc/0x238 [ 1.376638] do_initcall_level+0x94/0xb4 [ 1.380565] do_initcalls+0x54/0x94 [ 1.384058] do_basic_setup+0x1c/0x28 [ 1.387724] kernel_init_freeable+0x110/0x188 [ 1.392084] kernel_init+0x20/0x1a0 [ 1.395578] ret_from_fork+0x10/0x20 [ 1.399157] ---[ end trace 0000000000000000 ]--- [ 1.403782] ------------[ cut here ]------------
--- drivers/mtd/mtdcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/mtdcore.c +1 -1
@@ -562,7 +562,7 @@ static void mtd_check_of_node(struct mtd_info *mtd)if (!mtd_is_partition (mtd))return ; parent = mtd->parent; - parent_dn =dev_of_node (&parent->dev); + parent_dn =of_node_get (dev_of_node (&parent->dev));if (!parent_dn)return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 145/240 mtd: rawnand: intel: Remove unused nand_pa member from ebu_nand_cs
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit dbe5f7880fb020f1984f72105189e877bd2c808c ]
The nand_pa member from struct ebu_nand_cs is only written but never read. Remove this unused and unneeded member.
Stable-dep-of: 1f3b494d1fc1 ("mtd: rawnand: intel: Add missing of_node_put() in ebu_nand_probe()")
--- drivers/mtd/nand/raw/intel-nand-controller.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mtd/nand/raw/intel-nand-controller.c +0 -2
@@ -108,7 +108,6 @@struct ebu_nand_cs {void __iomem *chipaddr; -dma_addr_t nand_pa;u32 addr_sel; };
@@ -628,7 +627,6 @@ static int ebu_nand_probe(struct platform_device *pdev) ebu_host->cs[cs].chipaddr =devm_ioremap_resource (dev, res);if (IS_ERR (ebu_host->cs[cs].chipaddr))return PTR_ERR (ebu_host->cs[cs].chipaddr); - ebu_host->cs[cs].nand_pa = res->start; ebu_host->clk =devm_clk_get (dev,NULL );if (IS_ERR (ebu_host->clk))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 146/240 mtd: rawnand: intel: Use devm_platform_ioremap_resource_byname()
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 7471a53ddce54cee9b7a340dc930eb35b02c9eed ]
Switch from open-coded platform_get_resource_byname() and devm_ioremap_resource() to devm_platform_ioremap_resource_byname() where possible to simplify the code.
Stable-dep-of: 1f3b494d1fc1 ("mtd: rawnand: intel: Add missing of_node_put() in ebu_nand_probe()")
--- drivers/mtd/nand/raw/intel-nand-controller.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/mtd/nand/raw/intel-nand-controller.c +4 -6
@@ -595,13 +595,11 @@ static int ebu_nand_probe(struct platform_device *pdev) ebu_host->dev = dev;nand_controller_init (&ebu_host->controller); - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"ebunand" ); - ebu_host->ebu =devm_ioremap_resource (&pdev->dev, res); + ebu_host->ebu =devm_platform_ioremap_resource_byname (pdev,"ebunand" );if (IS_ERR (ebu_host->ebu))return PTR_ERR (ebu_host->ebu); - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"hsnand" ); - ebu_host->hsnand =devm_ioremap_resource (&pdev->dev, res); + ebu_host->hsnand =devm_platform_ioremap_resource_byname (pdev,"hsnand" );if (IS_ERR (ebu_host->hsnand))return PTR_ERR (ebu_host->hsnand);
@@ -623,8 +621,8 @@ static int ebu_nand_probe(struct platform_device *pdev) ebu_host->cs_num = cs; resname =devm_kasprintf (dev,GFP_KERNEL ,"nand_cs%d" , cs); - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , resname); - ebu_host->cs[cs].chipaddr =devm_ioremap_resource (dev, res); + ebu_host->cs[cs].chipaddr =devm_platform_ioremap_resource_byname (pdev, + resname);if (IS_ERR (ebu_host->cs[cs].chipaddr))return PTR_ERR (ebu_host->cs[cs].chipaddr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 147/240 mtd: rawnand: intel: Add missing of_node_put() in ebu_nand_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 1f3b494d1fc18ebb37aaa47107e9b84bf5b54ff7 ]
The 'chip_np' returned by of_get_next_child() with refcount decremented, of_node_put() need be called in error path to decrease the refcount.
--- drivers/mtd/nand/raw/intel-nand-controller.c | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/mtd/nand/raw/intel-nand-controller.c +15 -8
@@ -611,11 +611,12 @@ static int ebu_nand_probe(struct platform_device *pdev) ret =of_property_read_u32 (chip_np,"reg" , &cs);if (ret) {dev_err (dev,"failed to get chip select: %d\n" , ret); -return ret; + goto err_of_node_put; }if (cs >=MAX_CS ) {dev_err (dev,"got invalid chip select: %d\n" , cs); -return -EINVAL ; + ret = -EINVAL ; + goto err_of_node_put; } ebu_host->cs_num = cs;
@@ -623,18 +624,22 @@ static int ebu_nand_probe(struct platform_device *pdev) resname =devm_kasprintf (dev,GFP_KERNEL ,"nand_cs%d" , cs); ebu_host->cs[cs].chipaddr =devm_platform_ioremap_resource_byname (pdev, resname); -if (IS_ERR (ebu_host->cs[cs].chipaddr)) -return PTR_ERR (ebu_host->cs[cs].chipaddr); +if (IS_ERR (ebu_host->cs[cs].chipaddr)) { + ret =PTR_ERR (ebu_host->cs[cs].chipaddr); + goto err_of_node_put; + } ebu_host->clk =devm_clk_get (dev,NULL ); -if (IS_ERR (ebu_host->clk)) -return dev_err_probe (dev,PTR_ERR (ebu_host->clk), -"failed to get clock\n" ); +if (IS_ERR (ebu_host->clk)) { + ret =dev_err_probe (dev,PTR_ERR (ebu_host->clk), +"failed to get clock\n" ); + goto err_of_node_put; + } ret =clk_prepare_enable (ebu_host->clk);if (ret) {dev_err (dev,"failed to enable clock: %d\n" , ret); -return ret; + goto err_of_node_put; } ebu_host->clk_rate =clk_get_rate (ebu_host->clk);
@@ -699,6 +704,8 @@ static int ebu_nand_probe(struct platform_device *pdev)ebu_dma_cleanup (ebu_host); err_disable_unprepare_clk:clk_disable_unprepare (ebu_host->clk); +err_of_node_put: +of_node_put (chip_np);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 148/240 pinctrl: ocelot: Fix incorrect trigger of the interrupt.
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit e9945b2633deccda74a769d94060df49c53ff181 ]
The interrupt controller can detect only link changes. So in case an external device generated a level based interrupt, then the interrupt controller detected correctly the first edge. But the problem was that the interrupt controller was detecting also the edge when the interrupt was cleared. So it would generate another interrupt.
The fix for this is to clear the second interrupt but still check the interrupt line status.
--- drivers/pinctrl/pinctrl-ocelot.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/pinctrl/pinctrl-ocelot.c +13 -4
@@ -1863,19 +1863,28 @@ static void ocelot_irq_unmask_level(struct irq_data *data)if (val & bit) ack = true; +/* Try to clear any rising edges */ +if (!active && ack) +regmap_write_bits (info->map,REG (OCELOT_GPIO_INTR , info, gpio), + bit, bit); +/* Enable the interrupt now */ gpiochip_enable_irq (chip, gpio);regmap_update_bits (info->map,REG (OCELOT_GPIO_INTR_ENA , info, gpio), bit, bit);/* -* In case the interrupt line is still active and the interrupt -* controller has not seen any changes in the interrupt line, then it -* means that there happen another interrupt while the line was active. +* In case the interrupt line is still active then it means that +* there happen another interrupt while the line was active. * So we missed that one, so we need to kick the interrupt again * handler. */ -if (active && !ack) { +regmap_read (info->map,REG (OCELOT_GPIO_IN , info, gpio), &val); +if ((!(val & bit) && trigger_level ==IRQ_TYPE_LEVEL_LOW ) || + (val & bit && trigger_level ==IRQ_TYPE_LEVEL_HIGH )) + active = true; + +if (active) {struct ocelot_irq_work *work; work =kmalloc (sizeof (*work),GFP_ATOMIC );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 149/240 ASoC: codecs: tlv320adc3xxx: Wrap adc3xxx_i2c_remove() in __exit_p()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 4e8ff35878685291978b93543d6b9e9290be770a ]
If CONFIG_SND_SOC_TLV320ADC3XXX=y:
.exit.text' referenced in section .data' of sound/soc/codecs/tlv320adc3xxx.o: defined in discarded section `.exit.text' of sound/soc/codecs/tlv320adc3xxx.o
Fix this by wrapping the adc3xxx_i2c_remove() pointer in __exit_p().
--- sound/soc/codecs/tlv320adc3xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tlv320adc3xxx.c +1 -1
@@ -1450,7 +1450,7 @@ static struct i2c_driver adc3xxx_i2c_driver = { .of_match_table = tlv320adc3xxx_of_match, }, .probe_new = adc3xxx_i2c_probe, - .remove = adc3xxx_i2c_remove, + .remove = __exit_p(adc3xxx_i2c_remove), .id_table = adc3xxx_i2c_id, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 150/240 ASoC: SOF: Intel: pci-mtl: fix firmware name
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 73189c064e11137c8b78a825800a374924ebb7b7 ]
Initial IPC4 tests used the same conventions as previous reference closed-source firmware, but for MeteorLake the convention is the same as previous SOF releases (sof-<platform>.ri). Only the prefix changes to avoid confusions between IPC types.
This change has no impact on users since the firmware has not yet been released.
--- sound/soc/sof/intel/pci-mtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/intel/pci-mtl.c +1 -1
@@ -38,7 +38,7 @@ static const struct sof_dev_desc mtl_desc = { [SOF_INTEL_IPC4 ] ="intel/sof-ace-tplg" , }, .default_fw_filename = { - [SOF_INTEL_IPC4 ] ="dsp_basefw.bin" , + [SOF_INTEL_IPC4 ] ="sof-mtl.ri" , }, .nocodec_tplg_filename = "sof-mtl-nocodec.tplg", .ops = &sof_mtl_ops,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 151/240 selftests/ftrace: fix dynamic_events dependency check
In reply to Greg Kroah-HartmanFrom: Sven Schnelle <[email protected]>
[ Upstream commit cb05c81ada76a30a25a5f79b249375e33473af33 ]
commit 95c104c378dc ("tracing: Auto generate event name when creating a group of events") changed the syntax in the ftrace README file which is used by the selftests to check what features are support. Adjust the string to make test_duplicates.tc and trigger-synthetic-eprobe.tc work again.
--- .../testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc | 2 +- .../test.d/trigger/inter-event/trigger-synthetic-eprobe.tc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: Generic dynamic event - check if duplicate events are caught -# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README +# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README echo 0 > events/enable
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger eprobe on synthetic event -# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README +# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README echo 0 > events/enable
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 152/240 spi: aspeed: Fix window offset of CE1
In reply to Greg Kroah-HartmanFrom: Cédric Le Goater <[email protected]>
[ Upstream commit f8aa6c895d482847c9b799dcdac8bbdb56cb8e04 ]
The offset value of the mapping window in the kernel structure is calculated using the value of the previous window offset. This doesn't reflect how the HW is configured and can lead to erroneous setting of the second flash device (CE1).
--- drivers/spi/spi-aspeed-smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-aspeed-smc.c +1 -1
@@ -398,7 +398,7 @@ static void aspeed_spi_get_windows(struct aspeed_spi *aspi, windows[cs].cs = cs; windows[cs].size = data->segment_end (aspi, reg_val) - data->segment_start (aspi, reg_val); - windows[cs].offset = cs ? windows[cs -1 ].offset + windows[cs -1 ].size :0 ; + windows[cs].offset = data->segment_start (aspi, reg_val) - aspi->ahb_base_phy;dev_vdbg (aspi->dev,"CE%d offset=0x%.8x size=0x%x\n" , cs, windows[cs].offset, windows[cs].size); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 153/240 ASoC: qcom: lpass-cpu: Mark HDMI TX parity register as volatile
In reply to Greg Kroah-HartmanFrom: Srinivasa Rao Mandadapu <[email protected]>
[ Upstream commit 1dd5166102e7ca91e8c5d833110333835e147ddb ]
Update LPASS_HDMI_TX_PARITY_ADDR register as volatile, to fix dp audio failures observed with some of external monitors.
--- sound/soc/qcom/lpass-cpu.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/qcom/lpass-cpu.c +2 -0
@@ -784,6 +784,8 @@ static bool lpass_hdmi_regmap_volatile(struct device *dev, unsigned int reg)return true;if (reg ==LPASS_HDMI_TX_VBIT_CTL_ADDR (v))return true; +if (reg ==LPASS_HDMI_TX_PARITY_ADDR (v)) +return true;for (i =0 ; i < v->hdmi_rdma_channels; ++i) {if (reg ==LPAIF_HDMI_RDMACURR_REG (v, i))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 154/240 ASoC: Intel: common: add ACPI matching tables for Raptor Lake
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 5f3db54cfbc21772d984372fdcc5bb17b57f425f ]
Initial support for RPL w/ RT711
Stable-dep-of: 05de5cf6fb7d ("ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor")
--- include/sound/soc-acpi-intel-match.h | 2 + sound/soc/intel/common/Makefile | 2 +- .../intel/common/soc-acpi-intel-rpl-match.c | 51 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/common/soc-acpi-intel-rpl-match.c
include/sound/soc-acpi-intel-match.h +2 -0
@@ -30,6 +30,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];
@@ -38,6 +39,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[];/*
sound/soc/intel/common/Makefile +1 -1
@@ -9,7 +9,7 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m soc-acpi-intel-cml-match.o soc-acpi-intel-icl-match.o \ soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \ soc-acpi-intel-jsl-match.o soc-acpi-intel-adl-match.o \ - soc-acpi-intel-mtl-match.o \ + soc-acpi-intel-rpl-match.o soc-acpi-intel-mtl-match.o \ soc-acpi-intel-hda-match.o \ soc-acpi-intel-sdw-mockup-match.o
sound/soc/intel/common/soc-acpi-intel-rpl-match.c new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 155/240 ASoC: SOF: Intel: pci-tgl: use RPL specific firmware definitions
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 63d375b9f2a99bb111e3fb5f3e2442a391988949 ]
Split out firmware definitions for Intel Raptor Lake platforms.
Stable-dep-of: 05de5cf6fb7d ("ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor")
--- sound/soc/sof/intel/pci-tgl.c | 62 +++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-)
sound/soc/sof/intel/pci-tgl.c +59 -3
@@ -159,6 +159,62 @@ static const struct sof_dev_desc adl_desc = { .ops_init = sof_tgl_ops_init, }; +static const struct sof_dev_desc rpls_desc = { + .machines = snd_soc_acpi_intel_rpl_machines, + .alt_machines = snd_soc_acpi_intel_rpl_sdw_machines, + .use_acpi_target_states = true, + .resindex_lpe_base =0 , + .resindex_pcicfg_base =-1 , + .resindex_imr_base =-1 , + .irqindex_host_ipc =-1 , + .chip_info = &adls_chip_info, + .ipc_supported_mask =BIT (SOF_IPC ) |BIT (SOF_INTEL_IPC4 ), + .ipc_default =SOF_IPC , + .default_fw_path = { + [SOF_IPC ] ="intel/sof" , + [SOF_INTEL_IPC4 ] ="intel/avs/rpl-s" , + }, + .default_tplg_path = { + [SOF_IPC ] ="intel/sof-tplg" , + [SOF_INTEL_IPC4 ] ="intel/avs-tplg" , + }, + .default_fw_filename = { + [SOF_IPC ] ="sof-rpl-s.ri" , + [SOF_INTEL_IPC4 ] ="dsp_basefw.bin" , + }, + .nocodec_tplg_filename ="sof-rpl-nocodec.tplg" , + .ops = &sof_tgl_ops, + .ops_init = sof_tgl_ops_init, +}; + +static const struct sof_dev_desc rpl_desc = { + .machines = snd_soc_acpi_intel_rpl_machines, + .alt_machines = snd_soc_acpi_intel_rpl_sdw_machines, + .use_acpi_target_states = true, + .resindex_lpe_base =0 , + .resindex_pcicfg_base =-1 , + .resindex_imr_base =-1 , + .irqindex_host_ipc =-1 , + .chip_info = &tgl_chip_info, + .ipc_supported_mask =BIT (SOF_IPC ) |BIT (SOF_INTEL_IPC4 ), + .ipc_default =SOF_IPC , + .default_fw_path = { + [SOF_IPC ] ="intel/sof" , + [SOF_INTEL_IPC4 ] ="intel/avs/rpl" , + }, + .default_tplg_path = { + [SOF_IPC ] ="intel/sof-tplg" , + [SOF_INTEL_IPC4 ] ="intel/avs-tplg" , + }, + .default_fw_filename = { + [SOF_IPC ] ="sof-rpl.ri" , + [SOF_INTEL_IPC4 ] ="dsp_basefw.bin" , + }, + .nocodec_tplg_filename ="sof-rpl-nocodec.tplg" , + .ops = &sof_tgl_ops, + .ops_init = sof_tgl_ops_init, +}; +/* PCI IDs */ static const struct pci_device_id sof_pci_ids[] = { {PCI_DEVICE (0x8086 ,0xa0c8 ),/* TGL-LP */
@@ -172,7 +228,7 @@ static const struct pci_device_id sof_pci_ids[] = { { PCI_DEVICE(0x8086, 0x7ad0), /* ADL-S */ .driver_data = (unsigned long)&adls_desc}, { PCI_DEVICE(0x8086, 0x7a50), /* RPL-S */ - .driver_data = (unsigned long)&adls_desc}, + .driver_data = (unsigned long)&rpls_desc}, { PCI_DEVICE(0x8086, 0x51c8), /* ADL-P */ .driver_data = (unsigned long)&adl_desc}, { PCI_DEVICE(0x8086, 0x51cd), /* ADL-P */
@@ -180,9 +236,9 @@ static const struct pci_device_id sof_pci_ids[] = { { PCI_DEVICE(0x8086, 0x51c9), /* ADL-PS */ .driver_data = (unsigned long)&adl_desc}, { PCI_DEVICE(0x8086, 0x51ca), /* RPL-P */ - .driver_data = (unsigned long)&adl_desc}, + .driver_data = (unsigned long)&rpl_desc}, { PCI_DEVICE(0x8086, 0x51cb), /* RPL-P */ - .driver_data = (unsigned long)&adl_desc}, + .driver_data = (unsigned long)&rpl_desc}, { PCI_DEVICE(0x8086, 0x51cc), /* ADL-M */ .driver_data = (unsigned long)&adl_desc}, { PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 156/240 ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 05de5cf6fb7d73d2bf0a0c882433f31db5c93f63 ]
ADL-N uses a different signing key, which means we can't reuse the regular ADL descriptor used for ADL-P/M/S.
--- sound/soc/sof/intel/pci-tgl.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
sound/soc/sof/intel/pci-tgl.c +29 -1
@@ -159,6 +159,34 @@ static const struct sof_dev_desc adl_desc = { .ops_init = sof_tgl_ops_init, }; +static const struct sof_dev_desc adl_n_desc = { + .machines = snd_soc_acpi_intel_adl_machines, + .alt_machines = snd_soc_acpi_intel_adl_sdw_machines, + .use_acpi_target_states = true, + .resindex_lpe_base =0 , + .resindex_pcicfg_base =-1 , + .resindex_imr_base =-1 , + .irqindex_host_ipc =-1 , + .chip_info = &tgl_chip_info, + .ipc_supported_mask =BIT (SOF_IPC ) |BIT (SOF_INTEL_IPC4 ), + .ipc_default =SOF_IPC , + .default_fw_path = { + [SOF_IPC ] ="intel/sof" , + [SOF_INTEL_IPC4 ] ="intel/avs/adl-n" , + }, + .default_tplg_path = { + [SOF_IPC ] ="intel/sof-tplg" , + [SOF_INTEL_IPC4 ] ="intel/avs-tplg" , + }, + .default_fw_filename = { + [SOF_IPC ] ="sof-adl-n.ri" , + [SOF_INTEL_IPC4 ] ="dsp_basefw.bin" , + }, + .nocodec_tplg_filename ="sof-adl-nocodec.tplg" , + .ops = &sof_tgl_ops, + .ops_init = sof_tgl_ops_init, +}; +static const struct sof_dev_desc rpls_desc = { .machines = snd_soc_acpi_intel_rpl_machines, .alt_machines = snd_soc_acpi_intel_rpl_sdw_machines,
@@ -242,7 +270,7 @@ static const struct pci_device_id sof_pci_ids[] = { { PCI_DEVICE(0x8086, 0x51cc), /* ADL-M */ .driver_data = (unsigned long)&adl_desc}, { PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */ - .driver_data = (unsigned long)&adl_desc}, + .driver_data = (unsigned long)&adl_n_desc}, { 0, } };MODULE_DEVICE_TABLE (pci, sof_pci_ids);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 157/240 ALSA: ac97: fix possible memory leak in snd_ac97_dev_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 4881bda5ea05c8c240fc8afeaa928e2bc43f61fa ]
If device_register() fails in snd_ac97_dev_register(), it should call put_device() to give up reference, or the name allocated in dev_set_name() is leaked.
--- sound/pci/ac97/ac97_codec.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/ac97/ac97_codec.c +1 -0
@@ -2009,6 +2009,7 @@ static int snd_ac97_dev_register(struct snd_device *device) err =device_register (&ac97->dev);if (err <0 ) {ac97_err (ac97,"Can't register ac97 bus\n" ); +put_device (&ac97->dev); ac97->dev.bus =NULL ;return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 158/240 perf/x86/intel/lbr: Use setup_clear_cpu_cap() instead of clear_cpu_cap()
In reply to Greg Kroah-HartmanFrom: Maxim Levitsky <[email protected]>
[ Upstream commit b329f5ddc9ce4b622d9c7aaf5c6df4de52caf91a ]
clear_cpu_cap(&boot_cpu_data) is very similar to setup_clear_cpu_cap() except that the latter also sets a bit in 'cpu_caps_cleared' which later clears the same cap in secondary cpus, which is likely what is meant here.
--- arch/x86/events/intel/lbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/lbr.c +1 -1
@@ -1869,7 +1869,7 @@ void __init intel_pmu_arch_lbr_init(void)return ; clear_arch_lbr: -clear_cpu_cap (&boot_cpu_data,X86_FEATURE_ARCH_LBR ); +setup_clear_cpu_cap (X86_FEATURE_ARCH_LBR ); }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 159/240 rcu: Keep synchronize_rcu() from enabling irqs in early boot
In reply to Greg Kroah-HartmanFrom: Paul E. McKenney <[email protected]>
[ Upstream commit 31d8aaa87fcef1be5932f3813ea369e21bd3b11d ]
Making polled RCU grace periods account for expedited grace periods required acquiring the leaf rcu_node structure's lock during early boot, but after rcu_init() was called. This lock is irq-disabled, but the code incorrectly assumes that irqs are always disabled when invoking synchronize_rcu(). The exception is early boot before the scheduler has started, which means that upon return from synchronize_rcu(), irqs will be incorrectly enabled.
This commit fixes this bug by using irqsave/irqrestore locking primitives.
--- kernel/rcu/tree.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/rcu/tree.c +6 -4
@@ -1402,30 +1402,32 @@ static void rcu_poll_gp_seq_end(unsigned long *snap)// where caller does not hold the root rcu_node structure's lock. static void rcu_poll_gp_seq_start_unlocked (unsigned long *snap) { +unsigned long flags;struct rcu_node *rnp =rcu_get_root ();if (rcu_init_invoked ()) {lockdep_assert_irqs_enabled (); -raw_spin_lock_irq_rcu_node (rnp); +raw_spin_lock_irqsave_rcu_node (rnp, flags); }rcu_poll_gp_seq_start (snap);if (rcu_init_invoked ()) -raw_spin_unlock_irq_rcu_node (rnp); +raw_spin_unlock_irqrestore_rcu_node (rnp, flags); }// Make the polled API aware of the end of a grace period, but where // caller does not hold the root rcu_node structure's lock. static void rcu_poll_gp_seq_end_unlocked (unsigned long *snap) { +unsigned long flags;struct rcu_node *rnp =rcu_get_root ();if (rcu_init_invoked ()) {lockdep_assert_irqs_enabled (); -raw_spin_lock_irq_rcu_node (rnp); +raw_spin_lock_irqsave_rcu_node (rnp, flags); }rcu_poll_gp_seq_end (snap);if (rcu_init_invoked ()) -raw_spin_unlock_irq_rcu_node (rnp); +raw_spin_unlock_irqrestore_rcu_node (rnp, flags); }/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 160/240 tipc: fix a null-ptr-deref in tipc_topsrv_accept
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 82cb4e4612c633a9ce320e1773114875604a3cce ]
syzbot found a crash in tipc_topsrv_accept:
KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] Workqueue: tipc_rcv tipc_topsrv_accept RIP: 0010:kernel_accept+0x22d/0x350 net/socket.c:3487 Call Trace: <TASK> tipc_topsrv_accept+0x197/0x280 net/tipc/topsrv.c:460 process_one_work+0x991/0x1610 kernel/workqueue.c:2289 worker_thread+0x665/0x1080 kernel/workqueue.c:2436 kthread+0x2e4/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306
It was caused by srv->listener that might be set to null by tipc_topsrv_stop() in net .exit whereas it's still used in tipc_topsrv_accept() worker.
srv->listener is protected by srv->idr_lock in tipc_topsrv_stop(), so add a check for srv->listener under srv->idr_lock in tipc_topsrv_accept() to avoid the null-ptr-deref. To ensure the lsock is not released during the tipc_topsrv_accept(), move sock_release() after tipc_topsrv_work_stop() where it's waiting until the tipc_topsrv_accept worker to be done.
Note that sk_callback_lock is used to protect sk->sk_user_data instead of srv->listener, and it should check srv in tipc_topsrv_listener_data_ready() instead. This also ensures that no more tipc_topsrv_accept worker will be started after tipc_conn_close() is called in tipc_topsrv_stop() where it sets sk->sk_user_data to null.
--- net/tipc/topsrv.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
net/tipc/topsrv.c +12 -4
@@ -450,12 +450,19 @@ static void tipc_conn_data_ready(struct sock *sk)static void tipc_topsrv_accept (struct work_struct *work) { struct tipc_topsrv *srv = container_of(work, struct tipc_topsrv, awork); -struct socket *lsock = srv->listener; -struct socket *newsock; +struct socket *newsock, *lsock;struct tipc_conn *con;struct sock *newsk;int ret; +spin_lock_bh (&srv->idr_lock); +if (!srv->listener) { +spin_unlock_bh (&srv->idr_lock); +return ; + } + lsock = srv->listener; +spin_unlock_bh (&srv->idr_lock); +while (1 ) { ret =kernel_accept (lsock, &newsock,O_NONBLOCK );if (ret <0 )
@@ -489,7 +496,7 @@ static void tipc_topsrv_listener_data_ready(struct sock *sk)read_lock_bh (&sk->sk_callback_lock); srv = sk->sk_user_data; -if (srv->listener) +if (srv)queue_work (srv->rcv_wq, &srv->awork);read_unlock_bh (&sk->sk_callback_lock); }
@@ -699,8 +706,9 @@ static void tipc_topsrv_stop(struct net *net)__module_get (lsock->sk->sk_prot_creator->owner); srv->listener =NULL ;spin_unlock_bh (&srv->idr_lock); -sock_release (lsock); +tipc_topsrv_work_stop (srv); +sock_release (lsock);idr_destroy (&srv->conn_idr);kfree (srv); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 161/240 net: netsec: fix error handling in netsec_register_mdio()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 94423589689124e8cd145b38a1034be7f25835b2 ]
If phy_device_register() fails, phy_device_free() need be called to put refcount, so memory of phy device and device name can be freed in callback function.
If get_phy_device() fails, mdiobus_unregister() need be called, or it will cause warning in mdiobus_free() and kobject is leaked.
--- drivers/net/ethernet/socionext/netsec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/socionext/netsec.c +2 -0
@@ -1961,11 +1961,13 @@ static int netsec_register_mdio(struct netsec_priv *priv, u32 phy_addr) ret =PTR_ERR (priv->phydev);dev_err (priv->dev,"get_phy_device err(%d)\n" , ret); priv->phydev =NULL ; +mdiobus_unregister (bus);return -ENODEV ; } ret =phy_device_register (priv->phydev);if (ret) { +phy_device_free (priv->phydev);mdiobus_unregister (bus);dev_err (priv->dev,"phy_device_register err(%d)\n" , ret);
Signature · 1 line
2.35.1