Linux 6.6.122
Greg Kroah-Hartman
maintainerI'm announcing the release of the 6.6.122 kernel.
All users of the 6.6 kernel series must upgrade.
The updated 6.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 83 ++- Documentation/netlink/specs/fou.yaml | 2 Makefile | 2 arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 1 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 1 arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 4 arch/arm64/include/asm/hyperv-tlfs.h | 45 -- arch/arm64/include/asm/mshyperv.h | 4 arch/arm64/kernel/hibernate.c | 2 arch/arm64/kernel/signal.c | 4 arch/loongarch/kernel/perf_event.c | 21 arch/x86/events/perf_event.h | 13 arch/x86/hyperv/hv_init.c | 8 arch/x86/include/asm/hyperv-tlfs.h | 145 +++--- arch/x86/include/asm/kfence.h | 29 + arch/x86/include/asm/mshyperv.h | 30 - arch/x86/kernel/cpu/mshyperv.c | 56 +- arch/x86/kernel/cpu/resctrl/core.c | 21 arch/x86/kernel/cpu/resctrl/internal.h | 3 arch/x86/kernel/fpu/core.c | 32 + arch/x86/kvm/x86.c | 9 arch/x86/mm/fault.c | 15 arch/x86/mm/kaslr.c | 10 crypto/authencesn.c | 6 drivers/ata/libata-core.c | 32 + drivers/base/regmap/regmap.c | 4 drivers/block/null_blk/main.c | 12 drivers/clocksource/hyperv_timer.c | 26 - drivers/clocksource/timer-riscv.c | 3 drivers/comedi/comedi_fops.c | 2 drivers/comedi/drivers/dmm32at.c | 32 + drivers/comedi/range.c | 2 drivers/dma/apple-admac.c | 1 drivers/dma/at_hdmac.c | 9 drivers/dma/bcm-sba-raid.c | 6 drivers/dma/dw/rzn1-dmamux.c | 4 drivers/dma/idxd/compat.c | 23 - drivers/dma/lpc18xx-dmamux.c | 19 drivers/dma/qcom/gpi.c | 6 drivers/dma/sh/rz-dmac.c | 5 drivers/dma/stm32-dmamux.c | 22 - drivers/dma/tegra210-adma.c | 10 drivers/dma/ti/dma-crossbar.c | 18 drivers/dma/ti/k3-udma-private.c | 2 drivers/dma/ti/omap-dma.c | 4 drivers/dma/xilinx/xdma-regs.h | 1 drivers/dma/xilinx/xdma.c | 2 drivers/dma/xilinx/xilinx_dma.c | 7 drivers/edac/i3200_edac.c | 11 drivers/edac/x38_edac.c | 9 drivers/firmware/efi/cper.c | 2 drivers/firmware/imx/imx-scu-irq.c | 24 - drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 19 drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 2 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 drivers/gpu/drm/amd/display/dc/link/link_detection.c | 4 drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 23 - drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 1 drivers/gpu/drm/panel/panel-simple.c | 1 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 drivers/hid/usbhid/hid-core.c | 17 drivers/hv/hv.c | 36 - drivers/hv/hv_common.c | 32 - drivers/hwtracing/intel_th/core.c | 19 drivers/i2c/busses/i2c-qcom-geni.c | 11 drivers/iio/accel/st_accel_core.c | 72 +++ drivers/iio/adc/ad7280a.c | 4 drivers/iio/adc/ad9467.c | 2 drivers/iio/adc/at91-sama5d2_adc.c | 1 drivers/iio/adc/exynos_adc.c | 13 drivers/iio/chemical/scd4x.c | 6 drivers/iio/dac/ad5686.c | 6 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 15 drivers/iio/industrialio-core.c | 12 drivers/input/serio/i8042-acpipnpio.h | 18 drivers/interconnect/debugfs-client.c | 5 drivers/irqchip/irq-gic-v3-its.c | 8 drivers/isdn/mISDN/timerdev.c | 13 drivers/leds/led-class.c | 10 drivers/misc/uacce/uacce.c | 48 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 41 + drivers/mmc/host/sdhci-of-dwcmshc.c | 7 drivers/net/bonding/bond_main.c | 11 drivers/net/can/ctucanfd/ctucanfd_base.c | 2 drivers/net/can/usb/ems_usb.c | 8 drivers/net/can/usb/esd_usb.c | 9 drivers/net/can/usb/etas_es58x/es58x_core.c | 2 drivers/net/can/usb/gs_usb.c | 9 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 9 drivers/net/can/usb/mcba_usb.c | 8 drivers/net/can/usb/usb_8dev.c | 8 drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 5 drivers/net/ethernet/emulex/benet/be_cmds.c | 3 drivers/net/ethernet/emulex/benet/be_main.c | 8 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 69 +-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 drivers/net/ethernet/intel/ice/ice_lib.c | 29 - drivers/net/ethernet/intel/igc/igc_ptp.c | 43 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 86 +++- drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 2 drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 7 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 drivers/net/hyperv/netvsc_drv.c | 3 drivers/net/ipvlan/ipvlan.h | 2 drivers/net/ipvlan/ipvlan_core.c | 16 drivers/net/ipvlan/ipvlan_main.c | 49 +- drivers/net/macvlan.c | 20 drivers/net/netdevsim/bpf.c | 6 drivers/net/netdevsim/dev.c | 2 drivers/net/netdevsim/netdevsim.h | 1 drivers/net/phy/phy_device.c | 58 ++ drivers/net/usb/dm9601.c | 4 drivers/net/usb/usbnet.c | 11 drivers/net/veth.c | 8 drivers/net/wireless/ath/ath10k/ce.c | 16 drivers/net/wireless/ath/ath11k/dp_rx.c | 4 drivers/net/wireless/ath/ath12k/ce.c | 12 drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | 6 drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 drivers/nfc/virtual_ncidev.c | 4 drivers/nvme/host/fabrics.c | 15 drivers/nvme/host/fabrics.h | 1 drivers/nvme/host/fc.c | 5 drivers/nvme/host/nvme.h | 14 drivers/nvme/host/pci.c | 41 + drivers/nvme/host/rdma.c | 1 drivers/nvme/host/tcp.c | 1 drivers/nvme/target/tcp.c | 28 - drivers/of/base.c | 8 drivers/of/platform.c | 2 drivers/pci/Kconfig | 6 drivers/phy/broadcom/phy-bcm-ns-usb3.c | 2 drivers/phy/broadcom/phy-bcm-ns2-pcie.c | 2 drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 1 drivers/phy/broadcom/phy-bcm-sr-pcie.c | 2 drivers/phy/broadcom/phy-brcm-sata.c | 2 drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 3 drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 1 drivers/phy/marvell/phy-pxa-usb.c | 1 drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 2 drivers/phy/qualcomm/phy-qcom-m31.c | 2 drivers/phy/qualcomm/phy-qcom-qusb2.c | 18 drivers/phy/qualcomm/phy-qcom-snps-eusb2.c | 256 +++++------- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 41 - drivers/phy/st/phy-stih407-usb.c | 2 drivers/phy/st/phy-stm32-usbphyc.c | 6 drivers/phy/tegra/xusb-tegra186.c | 3 drivers/phy/ti/phy-twl4030-usb.c | 1 drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 8 drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 12 drivers/pmdomain/imx/imx8m-blk-ctrl.c | 11 drivers/pmdomain/qcom/rpmhpd.c | 4 drivers/ptp/ptp_chardev.c | 37 + drivers/ptp/ptp_private.h | 16 drivers/scsi/qla2xxx/qla_isr.c | 7 drivers/scsi/scsi_error.c | 35 + drivers/scsi/scsi_lib.c | 8 drivers/scsi/storvsc_drv.c | 3 drivers/slimbus/core.c | 19 drivers/spi/spi-sprd-adi.c | 63 -- drivers/tty/serial/8250/8250_pci.c | 2 drivers/usb/core/config.c | 5 drivers/usb/core/quirks.c | 3 drivers/usb/dwc3/core.c | 2 drivers/usb/dwc3/core.h | 1 drivers/usb/host/ohci-platform.c | 1 drivers/usb/host/uhci-platform.c | 1 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 2 drivers/usb/serial/option.c | 1 drivers/usb/typec/tcpm/tcpm.c | 2 drivers/w1/slaves/w1_therm.c | 62 -- drivers/w1/w1.c | 2 drivers/xen/xen-scsiback.c | 1 fs/btrfs/block-group.c | 60 +- fs/btrfs/disk-io.c | 2 fs/btrfs/send.c | 2 fs/btrfs/space-info.c | 76 ++- fs/btrfs/space-info.h | 10 fs/btrfs/sysfs.c | 18 fs/btrfs/transaction.c | 11 fs/ext4/xattr.c | 1 fs/gfs2/lops.c | 2 fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 fs/nfsd/nfsctl.c | 17 fs/ntfs3/inode.c | 7 fs/smb/server/mgmt/user_session.c | 20 fs/smb/server/mgmt/user_session.h | 1 include/asm-generic/hyperv-tlfs.h | 32 + include/asm-generic/mshyperv.h | 2 include/dt-bindings/power/qcom,rpmhpd.h | 235 +++++++++++ include/dt-bindings/power/qcom-rpmpd.h | 246 +---------- include/linux/iio/iio-opaque.h | 2 include/linux/kfence.h | 1 include/linux/nvme.h | 3 include/linux/posix-clock.h | 39 + include/linux/textsearch.h | 1 include/linux/usb/quirks.h | 3 include/scsi/scsi_eh.h | 6 include/sound/pcm.h | 2 include/uapi/linux/comedi.h | 2 io_uring/io-wq.c | 2 io_uring/io_uring.c | 8 kernel/time/hrtimer.c | 2 kernel/time/posix-clock.c | 53 +- kernel/trace/trace_events_hist.c | 9 kernel/trace/trace_events_synth.c | 8 mm/Kconfig | 12 mm/damon/sysfs-schemes.c | 11 mm/damon/sysfs.c | 5 mm/kmsan/shadow.c | 2 mm/migrate.c | 12 mm/page_alloc.c | 47 +- mm/rmap.c | 20 net/bpf/test_run.c | 5 net/bridge/br_fdb.c | 35 - net/bridge/br_input.c | 4 net/bridge/br_multicast.c | 9 net/can/j1939/transport.c | 10 net/core/dev.c | 25 - net/core/filter.c | 7 net/dsa/dsa.c | 2 net/ipv4/esp4_offload.c | 4 net/ipv4/fou_core.c | 3 net/ipv4/fou_nl.c | 2 net/ipv4/ip_gre.c | 11 net/ipv6/addrconf.c | 4 net/ipv6/esp6_offload.c | 4 net/ipv6/ip6_tunnel.c | 2 net/ipv6/ndisc.c | 4 net/l2tp/l2tp_core.c | 4 net/netrom/nr_route.c | 13 net/openvswitch/vport.c | 11 net/sched/act_ife.c | 6 net/sched/sch_qfq.c | 8 net/sched/sch_teql.c | 5 net/sctp/sm_statefuns.c | 10 net/vmw_vsock/virtio_transport_common.c | 30 - scripts/kconfig/nconf-cfg.sh | 11 sound/core/oss/pcm_oss.c | 4 sound/core/pcm_native.c | 9 sound/pci/ctxfi/ctamixer.c | 2 sound/soc/codecs/tlv320adcx140.c | 8 sound/soc/codecs/wsa881x.c | 11 sound/soc/codecs/wsa883x.c | 9 sound/soc/codecs/wsa884x.c | 3 sound/usb/mixer.c | 22 - sound/usb/mixer_scarlett2.c | 7 tools/net/ynl/ynl-regen.sh | 2 tools/testing/selftests/bpf/prog_tests/perf_link.c | 15 tools/testing/selftests/net/amt.sh | 7 tools/testing/selftests/net/fib-onlink-tests.sh | 76 +-- tools/testing/selftests/net/toeplitz.c | 4 tools/testing/selftests/ptp/testptp.c | 114 ++++- tools/testing/vsock/util.c | 12 tools/testing/vsock/vsock_test.c | 11 260 files changed, 2727 insertions(+), 1458 deletions(-)
Abdun Nihaal (1):
scsi: xen: scsiback: Fix potential memory leak in scsiback_remove()
Aboorva Devarajan (1):
mm/page_alloc: make percpu_pagelist_high_fraction reads lock-free
Aditya Garg (1):
net: hv_netvsc: reject RSS hash key programming without RX indirection table
Akhil P Oommen (1):
dt-bindings: power: qcom,rpmpd: add Turbo L5 corner
Alex Hung (1):
drm/amd/display: Check dce_hwseq before dereferencing it
Alok Tiwari (1):
octeontx2: cn10k: fix RX flowid TCAM mask handling
Andreas Gruenbacher (1):
Revert "gfs2: Fix use of bio_chain"
Andrew Cooper (1):
x86/kfence: avoid writing L1TF-vulnerable PTEs
Andrew Davis (1):
spi: sprd: adi: Use devm_register_restart_handler()
Andrey Vatoropin (1):
be2net: Fix NULL pointer dereference in be_cmd_get_mac_from_list
Andy Shevchenko (1):
iio: core: add missing mutex_destroy in iio_dev_release()
Anthony Brandon (1):
dmaengine: xilinx: xdma: Fix regmap max_register
Arkadiusz Kozdra (1):
kconfig: fix static linking of nconf
Arnaud Ferraris (1):
tcpm: allow looking for role_sw device in the main node
Arnd Bergmann (1):
irqchip/gic-v3-its: Avoid truncating memory addresses
Arun Raghavan (1):
ALSA: usb: Increase volume range that triggers a warning
Bagas Sanjaya (2):
textsearch: describe @list member in ts_ops search mm, kfence: describe @slab parameter in __kfence_obj_info()
Bartlomiej Kubik (1):
fs/ntfs3: Initialize allocated memory before use
Benjamin Tissoires (1):
HID: usbhid: paper over wrong bNumDescriptor field
Berk Cem Goksel (1):
ALSA: usb-audio: Fix use-after-free in snd_usb_mixer_free()
Biju Das (1):
dmaengine: sh: rz-dmac: Fix rz_dmac_terminate_all()
Boris Burkov (1):
btrfs: store fs_info in space_info
Brian Kao (1):
scsi: core: Fix error handler encryption support
Cedric Xing (1):
x86: make page fault handling disable interrupts properly
Cheng-Yu Lee (1):
regmap: Fix race condition in hwspinlock irqsave routine
Chenghai Huang (2):
uacce: fix isolate sysfs check condition
uacce: ensure safe queue release with state management
Chwee-Lin Choong (1):
igc: fix race condition in TX timestamp read for register 0
Damien Le Moal (1):
ata: libata-core: Introduce ata_dev_config_lpm()
Dan Carpenter (2):
phy: stm32-usphyc: Fix off by one in probe()
wifi: mwifiex: Fix a loop in mwifiex_update_ampdu_rxwinsize()
Dan Williams (1):
x86/kaslr: Recognize all ZONE_DEVICE users as physaddr consumers
Daniel Borkmann (1):
bpf: Do not let BPF test infra emit invalid GSO types to stack
Daniel Wagner (1):
nvme-fc: rename free_ctrl callback to match name pattern
Danila Tikhonov (1):
dt-bindings: power: qcom,rpmpd: Add SM7150
Dave Ertman (1):
ice: Avoid detrimental cleanup for bond during interface stop
David Hildenbrand (Red Hat) (1):
mm/rmap: fix two comments related to huge_pmd_unshare()
David Jeffery (1):
scsi: core: Wake up the error handler when final completions race against each other
David Yang (4):
veth: fix data race in veth_get_ethtool_stats
net: hns3: fix data race in hns3_fetch_stats
be2net: fix data race in be_get_new_eqd
net: openvswitch: fix data race in ovs_vport_get_upcall_stats
Dmitry Baryshkov (1):
dt-bindings: power: qcom-rpmpd: split RPMh domains definitions
Dmitry Skorodumov (1):
ipvlan: Make the addrs_lock be per port
Dragan Simic (1):
phy: phy-rockchip-inno-usb2: Use dev_err_probe() in the probe path
Emil Svendsen (2):
ASoC: tlv320adcx140: fix null pointer
ASoC: tlv320adcx140: fix word length
Eric Dumazet (12):
net: bridge: annotate data-races around fdb->{updated,used}
ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()
net: update netdev_lock_{type,name}
macvlan: fix possible UAF in macvlan_forward_source()
ipv4: ip_gre: make ipgre_header() robust
net/sched: sch_qfq: do not free existing class in qfq_change_class()
bonding: limit BOND_MODE_8023AD to Ethernet devices
l2tp: avoid one data-race in l2tp_tunnel_del_work()
mISDN: annotate data-race around dev->work
ipv6: annotate data-race in ndisc_router_discovery()
bonding: provide a net pointer to __skb_flow_dissect() net/sched: act_ife: avoid possible NULL deref
Ethan Nelson-Moore (2):
USB: serial: ftdi_sio: add support for PICAXE AXE027 cable
net: usb: dm9601: remove broken SR9700 support
Felix Gu (1):
spi: spi-sprd-adi: Fix double free in probe error path
Fernand Sieber (1):
perf/x86/intel: Do not enable BTS for guests
Fiona Klute (1):
iio: chemical: scd4x: fix reported channel endianness
Francesco Lavra (1):
iio: imu: st_lsm6dsx: fix iio_chan_spec for sensors without event detection
Gal Pressman (1):
selftests: drv-net: fix RPS mask handling for high CPU numbers
Georgi Djakov (1):
interconnect: debugfs: initialize src_node and dst_node to empty strings
Geraldo Nascimento (2):
arm64: dts: rockchip: remove dangerous max-link-speed from helios64
arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s
Greg Kroah-Hartman (1):
Linux 6.6.122
Hangbin Liu (1):
selftests/net: convert fib-onlink-tests.sh to run it in unique namespace
Hans de Goede (1):
leds: led-class: Only Add LED to leds_list when it is fully ready
Haotian Zhang (1):
dmaengine: omap-dma: fix dma_pool resource leak in error paths
Haoxiang Li (5):
EDAC/x38: Fix a resource leak in x38_probe1() EDAC/i3200: Fix a resource leak in i3200_probe1() drm/amdkfd: fix a memory leak in device_queue_manager_init() drm/vmwgfx: Fix an error return check in vmw_compat_shader_add()
w1: fix redundant counter decrement in w1_attach_slave_device()
Huacai Chen (1):
USB: OHCI/UHCI: Add soft dependencies on ehci_platform
Ian Abbott (2):
comedi: dmm32at: serialize use of paged registers
comedi: Fix getting range information for subdevices 16 to 255
Ido Schimmel (1):
bridge: mcast: Fix use-after-free during router port configuration
Ihor Solodrai (1):
selftests/bpf: Check for timeout in perf_link test
Ilikara Zheng (1):
nvme-pci: disable secondary temp for Wodposit WPBSNM8
Ivaylo Ivanov (1):
phy: phy-snps-eusb2: refactor constructs names
Jacob Keller (1):
ice: initialize ring_stats->syncp
Jamal Hadi Salim (2):
net/sched: Enforce that teql can only be used as root qdisc
net/sched: qfq: Use cl_is_active to determine whether class is active in qfq_rm_from_ag
Janne Grunau (1):
dmaengine: apple-admac: Add "apple,t8103-admac" compatible
Jaroslav Kysela (1):
ALSA: pcm: Improve the fix for race of buffer access at PCM OSS layer
Jens Axboe (1):
io_uring/io-wq: check IO_WQ_BIT_EXIT inside work run loop
Jeongjun Park (1):
netrom: fix double-free in nr_route_frame()
Jianbo Liu (1):
xfrm: Fix inner mode lookup in tunnel mode GSO segmentation
Jiasheng Jiang (2):
btrfs: fix memory leaks in create_space_info() error paths
scsi: qla2xxx: Sanitize payload size to prevent member overflow
Jijie Shao (2):
net: hns3: fix wrong GENMASK() for HCLGE_FD_AD_COUNTER_NUM_M
net: hns3: fix the HCLGE_FD_AD_NXT_KEY error setting issue
Johan Hovold (18):
ASoC: codecs: wsa884x: fix codec initialisation
phy: drop probe registration printks
dmaengine: at_hdmac: fix device leak on of_dma_xlate()
dmaengine: bcm-sba-raid: fix device leak on probe
dmaengine: dw: dmamux: fix OF node leak on route allocation failure
dmaengine: idxd: fix device leaks on compat bind and unbind
dmaengine: lpc18xx-dmamux: fix device leak on route allocation
dmaengine: ti: dma-crossbar: fix device leak on dra7x route allocation
dmaengine: ti: dma-crossbar: fix device leak on am335x route allocation
dmaengine: ti: k3-udma: fix device leak on udma lookup
slimbus: core: fix runtime PM imbalance on report present
slimbus: core: fix device reference leak on report present
intel_th: fix device leak on output open()
iio: adc: exynos_adc: fix OF populate on driver rebind
dmaengine: stm32: dmamux: fix device leak on route allocation
dmaengine: stm32: dmamux: fix OF node leak on route allocation failure
ASoC: codecs: wsa881x: fix unnecessary initialisation
ASoC: codecs: wsa883x: fix unnecessary initialisation
Johannes Brüderl (1):
usb: core: add USB_QUIRK_NO_BOS for devices that hang on BOS descriptor
Johannes Nixdorf (1):
net: bridge: Set BR_FDB_ADDED_BY_USER early in fdb_add_entry
Keith Busch (1):
nvme-pci: do not directly handle subsys reset fallout
Konrad Dybcio (3):
arm64: dts: qcom: sc8280xp: Add missing VDD_MXC links
dt-bindings: power: qcom,rpmpd: Add SC8280XP_MXC_AO
pmdomain: qcom: rpmhpd: Add MXC to SC8280XP
Krzysztof Kozlowski (2):
phy: broadcom: ns-usb3: Fix Wvoid-pointer-to-enum-cast warning (again)
ASoC: codecs: wsa881x: Drop unused version readout
Kuniyuki Iwashima (4):
ipv6: Fix use-after-free in inet6_addr_del().
gue: Fix skb memleak with inner IP protocol 0.
tools: ynl: Specify --no-line-number in ynl-regen.sh.
fou: Don't allow 0 for FOU_ATTR_IPPROTO.
Kübrich, Andreas (1):
iio: dac: ad5686: add AD5695R to ad5686_chip_info_tbl
Laurent Vivier (1):
usbnet: limit max_mtu based on device's hard_mtu
Linus Torvalds (1):
Fix memory leak in posix_clock_open()
Lisa Robinson (1):
LoongArch: Fix PMU counter allocation for mixed-type event groups
Loic Poulain (1):
phy: qcom-qusb2: Fix NULL pointer dereference on early suspend
Long Li (1):
scsi: storvsc: Process unsupported MODE_SENSE_10
Louis Chauvet (1):
phy: rockchip: inno-usb2: fix disconnection in gadget mode
Luca Ceresoli (1):
phy: rockchip: inno-usb2: fix communication disruption in gadget mode
Lyude Paul (1):
drm/nouveau/disp/nv50-: Set lock_core in curs507a_prepare
Mahesh Bandewar (1):
selftest/ptp: update ptp selftest to exercise the gettimex options
Maninder Singh (1):
NFSD: fix race between nfsd registration and exports_proc
Marc Kleine-Budde (7):
can: gs_usb: gs_usb_receive_bulk_callback(): fix URB memory leak
can: gs_usb: gs_usb_receive_bulk_callback(): unanchor URL on usb_submit_urb() error
can: ems_usb: ems_usb_read_bulk_callback(): fix URB memory leak
can: kvaser_usb: kvaser_usb_read_bulk_callback(): fix URB memory leak
can: mcba_usb: mcba_usb_read_bulk_callback(): fix URB memory leak
can: usb_8dev: usb_8dev_read_bulk_callback(): fix URB memory leak
can: esd_usb: esd_usb_read_bulk_callback(): fix URB memory leak
Marek Vasut (2):
drm/panel-simple: fix connector type for DataImage SCF0700C48GGU18 panel
wifi: rsi: Fix memory corruption due to not set vif driver data size
Mario Limonciello (4):
drm/amd/display: Bump the HDMI clock to 340MHz platform/x86: hp-bioscfg: Fix kobject warnings for empty attribute names platform/x86: hp-bioscfg: Fix kernel panic in GET_INSTANCE_ID macro platform/x86: hp-bioscfg: Fix automatic module loading
Mario Limonciello (AMD) (1):
drm/amd: Clean up kfd node on surprise disconnect
Mark Harmstone (1):
btrfs: fix missing fields in superblock backup with BLOCK_GROUP_TREE
Mark Rutland (1):
arm64/fpsimd: signal: Allocate SSVE storage when restoring ZA
Markus Koeniger (1):
iio: accel: iis328dq: fix gain values
Marnix Rijnart (1):
serial: 8250_pci: Fix broken RS485 for F81504/508/512
Matthew Schwartz (1):
mmc: rtsx_pci_sdmmc: implement sdmmc_card_busy function
Matthew Wilcox (Oracle) (1):
migrate: correct lock ordering for hugetlb file folios
Maurizio Lombardi (1):
nvmet-tcp: remove boilerplate code
Melbin K Mathew (2):
vsock/virtio: fix potential underflow in virtio_transport_get_credit() vsock/virtio: cap TX credit to local buffer size
Miaoqian Lin (1):
dmaengine: qcom: gpi: Fix memory leak in gpi_peripheral_config()
Michael Kelley (1):
Drivers: hv: Always do Hyper-V panic notification in hv_kmsg_dump()
Ming Lei (1):
io_uring: move local task_work in exit cancel loop
Ming Qian (1):
pmdomain: imx8m-blk-ctrl: Remove separate rst and clk mask for 8mq vpu
Morduan Zang (1):
efi/cper: Fix cper_bits_to_str buffer handling and return value
Namjae Jeon (1):
ksmbd: fix use-after-free in ksmbd_session_rpc_open
Naohiko Shimizu (1):
riscv: clocksource: Fix stimecmp update hazard on RV32
Naohiro Aota (3):
btrfs: factor out init_space_info() from create_space_info()
btrfs: factor out check_removing_space_info() from btrfs_free_block_groups()
btrfs: introduce btrfs_space_info sub-group
Neil Armstrong (2):
i2c: qcom-geni: make sure I2C hub controllers can't use SE DMA
dt-bindings: power: qcom,rpmpd: document the SM8650 RPMh Power Domains
Niklas Cassel (3):
ata: libata: Add cpr_log to ata_dev_print_features() early return
ata: libata: Call ata_dev_config_lpm() for ATAPI devices
ata: libata: Print features also for ATAPI devices
Nilay Shroff (2):
null_blk: fix kmemleak by releasing references to fault configfs items
nvme: fix PCIe subsystem reset controller state transition
Nuno Das Neves (1):
hyperv-tlfs: Change prefix of generic HV_REGISTER_* MSRs to HV_MSR_*
Ondrej Ille (1):
can: ctucanfd: fix SSP_SRC in cases when bit-rate is higher than 1 MBit.
Ondrej Jirman (1):
arm64: dts: rockchip: Fix voltage threshold for volume keys for Pinephone Pro
Otto Pflüger (1):
dt-bindings: power: rpmpd: Add MSM8917, MSM8937 and QM215
P Praneesh (1):
wifi: ath11k: fix RCU stall while reaping monitor destination ring
Pavel Zhigulin (1):
iio: adc: ad7280a: handle spi_setup() errors in probe()
Pei Xiao (1):
iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver
Peng Fan (1):
firmware: imx: scu-irq: Set mu_resource_id before get handle
Philip Yang (1):
drm/amdgpu: csa unmap use uninterruptible lock
Qu Wenruo (1):
btrfs: send: check for inline extents in range_is_hole_in_parent()
Rafael Beims (1):
phy: freescale: imx8m-pcie: assert phy reset during power on
Raju Rangoju (1):
amd-xgbe: avoid misleading per-packet error log
Rasmus Villemoes (1):
iio: core: add separate lockdep class for info_exist_lock
Ratheesh Kannoth (1):
octeontx2-af: Fix error handling
Ricardo B. Marlière (1):
selftests: net: fib-onlink-tests: Convert to use namespaces by default
Rob Herring (Arm) (1):
of: platform: Use default match table for /firmware
Robbie Ko (1):
btrfs: fix deadlock in wait_current_trans() due to ignored transaction type
Russell King (Oracle) (1):
net: phy: fix phy_uses_state_machine()
Ryan Roberts (1):
mm: kmsan: fix poisoning of high-order non-compound pages
Saeed Mahameed (1):
net/mlx5e: Restore destroying state bit after profile cleanup
Samasth Norway Ananda (1):
ALSA: scarlett2: Fix buffer overflow in config retrieval
Sean Christopherson (1):
x86/fpu: Clear XSTATE_BV[i] in guest XSAVE state whenever XFD[i]=1
SeongJae Park (3):
mm/damon/sysfs: cleanup attrs subdirs on context dir setup failure mm/damon/sysfs-scheme: cleanup access_pattern subdirs on scheme dir setup failure mm/damon/sysfs-scheme: cleanup quotas subdirs on scheme dir setup failure
Shawn Lin (1):
mmc: sdhci-of-dwcmshc: Prevent illegal clock reduction in HS200/HS400 mode
Sheetal (1):
dmaengine: tegra-adma: Fix use-after-free
Shivam Kumar (1):
nvme-tcp: fix NULL pointer dereferences in nvmet_tcp_build_pdu_iovec
Sibi Sankar (1):
dt-bindings: power: rpmpd: Update part number to X1E80100
Stefano Garzarella (2):
vsock/test: add a final full barrier after run all tests vsock/test: fix seqpacket message bounds test
Stefano Radaelli (1):
phy: fsl-imx8mq-usb: Clear the PCS_TX_SWING_FULL field before using it
Steven Rostedt (1):
tracing: Fix crash on synthetic stacktrace field usage
Suraj Gupta (1):
dmaengine: xilinx_dma: Fix uninitialized addr_width when "xlnx,addrwidth" property is missing
Szymon Wilczek (1):
can: etas_es58x: allow partial RX URB allocation to succeed
Taehee Yoo (1):
selftests: net: amt: wait longer for connection before sending packets
Taeyang Lee (1):
crypto: authencesn - reject too-short AAD (assoclen<8) to match ESP/ESN spec
Takashi Iwai (1):
ALSA: ctxfi: Fix potential OOB access in audio mixer handling
Taniya Das (1):
dt-bindings: power: qcom,rpmpd: document the SM8750 RPMh Power Domains
Tetsuo Handa (1):
net: can: j1939: j1939_xtp_rx_rts_session_active(): deactivate session upon receiving the second rts
Thadeu Lima de Souza Cascardo (1):
Revert "nfc/nci: Add the inconsistency check between the input data length and count"
Thinh Nguyen (1):
usb: dwc3: Check for USB4 IP_NAME
Thomas Fourier (3):
wifi: ath10k: fix dma_free_coherent() pointer
wifi: ath12k: fix dma_free_coherent() pointer
octeontx2: Fix otx2_dma_map_page() error return code
Thomas Weißschuh (1):
hrtimer: Fix softirq base check in update_needs_ipi()
Thorsten Blum (1):
w1: therm: Fix off-by-one buffer overflow in alarms_store
Timur Kristóf (2):
drm/amd/pm: Don't clear SI SMC table when setting power limit drm/amd/pm: Workaround SI powertune issue on Radeon 430 (v2)
Tomas Melin (1):
iio: adc: ad9467: fix ad9434 vref mask
Ulrich Mohr (1):
USB: serial: option: add Telit LE910 MBIM composition
Vladimir Oltean (3):
net: dsa: fix off-by-one in maximum bridge ID determination
net: phy: move phy_link_change() prior to mdio_bus_phy_may_suspend()
net: phy: allow MDIO bus PM ops to start/stop state machine for phylink-controlled PHY
Vlastimil Babka (1):
mm/page_alloc: prevent pcp corruption with SMP=n
Wayne Chang (1):
phy: tegra: xusb: Explicitly configure HS_DISCON_LEVEL to 0x7
Weigang He (1):
of: fix reference count leak in of_alias_scan()
Wenkai Lin (1):
uacce: fix cdev handling in the cleanup path
Wentao Liang (1):
phy: rockchip: inno-usb2: Fix a double free bug in rockchip_usb2phy_probe()
Wojtek Wasko (3):
posix-clock: Store file pointer in struct posix_clock_context
ptp: Add PHC file mode checks. Allow RO adjtime() without FMODE_WRITE.
testptp: Add option to open PHC in readonly mode
Xabier Marquiegui (2):
posix-clock: introduce posix_clock_context concept
ptp: add testptp mask test
Xiaochen Shen (2):
x86/resctrl: Add missing resctrl initialization for Hygon x86/resctrl: Fix memory bandwidth counter width for Hygon
Xin Long (1):
sctp: move SCTP_CMD_ASSOC_SHKEY right after SCTP_CMD_PEER_INIT
Yang Erkun (1):
ext4: fix iloc.bh leak in ext4_xattr_inode_update_ref
Yang Shen (1):
uacce: implement mremap in uacce_vm_ops to return -EPERM
Yang Yingliang (1):
spi: sprd-adi: switch to use spi_alloc_host()
Yun Lu (1):
netdevsim: fix a race issue related to the operation on bpf_bound_progs list
Zhaoyang Huang (1):
arm64: Set __nocfi on swsusp_arch_resume()
Zilin Guan (1):
pnfs/flexfiles: Fix memory leak in nfs4_ff_alloc_deviceid_node()
Zqiang (1):
usbnet: Fix using smp_processor_id() in preemptible code warnings
feng (1):
Input: i8042 - add quirk for ASUS Zenbook UX425QA_UM425QA
gongqi (1):
Input: i8042 - add quirks for MECHREVO Wujie 15X Pro
Greg Kroah-Hartman
maintainerDocumentation/devicetree/bindings/power/qcom,rpmpd.yaml +47 -36
@@ -15,42 +15,53 @@ description: properties: compatible: - enum: - - qcom,mdm9607-rpmpd - - qcom,msm8226-rpmpd - - qcom,msm8909-rpmpd - - qcom,msm8916-rpmpd - - qcom,msm8939-rpmpd - - qcom,msm8953-rpmpd - - qcom,msm8976-rpmpd - - qcom,msm8994-rpmpd - - qcom,msm8996-rpmpd - - qcom,msm8998-rpmpd - - qcom,qcm2290-rpmpd - - qcom,qcs404-rpmpd - - qcom,qdu1000-rpmhpd - - qcom,sa8155p-rpmhpd - - qcom,sa8540p-rpmhpd - - qcom,sa8775p-rpmhpd - - qcom,sdm660-rpmpd - - qcom,sc7180-rpmhpd - - qcom,sc7280-rpmhpd - - qcom,sc8180x-rpmhpd - - qcom,sc8280xp-rpmhpd - - qcom,sdm670-rpmhpd - - qcom,sdm845-rpmhpd - - qcom,sdx55-rpmhpd - - qcom,sdx65-rpmhpd - - qcom,sdx75-rpmhpd - - qcom,sm6115-rpmpd - - qcom,sm6125-rpmpd - - qcom,sm6350-rpmhpd - - qcom,sm6375-rpmpd - - qcom,sm8150-rpmhpd - - qcom,sm8250-rpmhpd - - qcom,sm8350-rpmhpd - - qcom,sm8450-rpmhpd - - qcom,sm8550-rpmhpd + oneOf: + - enum: + - qcom,mdm9607-rpmpd + - qcom,msm8226-rpmpd + - qcom,msm8909-rpmpd + - qcom,msm8916-rpmpd + - qcom,msm8917-rpmpd + - qcom,msm8939-rpmpd + - qcom,msm8953-rpmpd + - qcom,msm8976-rpmpd + - qcom,msm8994-rpmpd + - qcom,msm8996-rpmpd + - qcom,msm8998-rpmpd + - qcom,qcm2290-rpmpd + - qcom,qcs404-rpmpd + - qcom,qdu1000-rpmhpd + - qcom,qm215-rpmpd + - qcom,sa8155p-rpmhpd + - qcom,sa8540p-rpmhpd + - qcom,sa8775p-rpmhpd + - qcom,sc7180-rpmhpd + - qcom,sc7280-rpmhpd + - qcom,sc8180x-rpmhpd + - qcom,sc8280xp-rpmhpd + - qcom,sdm660-rpmpd + - qcom,sdm670-rpmhpd + - qcom,sdm845-rpmhpd + - qcom,sdx55-rpmhpd + - qcom,sdx65-rpmhpd + - qcom,sdx75-rpmhpd + - qcom,sm6115-rpmpd + - qcom,sm6125-rpmpd + - qcom,sm6350-rpmhpd + - qcom,sm6375-rpmpd + - qcom,sm7150-rpmhpd + - qcom,sm8150-rpmhpd + - qcom,sm8250-rpmhpd + - qcom,sm8350-rpmhpd + - qcom,sm8450-rpmhpd + - qcom,sm8550-rpmhpd + - qcom,sm8650-rpmhpd + - qcom,sm8750-rpmhpd + - qcom,x1e80100-rpmhpd + - items: + - enum: + - qcom,msm8937-rpmpd + - const: qcom,msm8917-rpmpd '#power-domain-cells': const: 1
Documentation/netlink/specs/fou.yaml +2 -0
@@ -39,6 +39,8 @@ attribute-sets: - name: ipproto type: u8 + checks: + min: 1 - name: type type: u8
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 6 -SUBLEVEL = 121 +SUBLEVEL = 122 EXTRAVERSION = NAME = Pinguïn Aangedreven
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +12 -4
@@ -4412,8 +4412,12 @@ remoteproc_nsp0: remoteproc@1b300000 { clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "xo"; - power-domains = <&rpmhpd SC8280XP_NSP>; - power-domain-names = "nsp"; + power-domains = <&rpmhpd SC8280XP_NSP>, + <&rpmhpd SC8280XP_CX>, + <&rpmhpd SC8280XP_MXC>; + power-domain-names = "nsp", + "cx", + "mxc"; memory-region = <&pil_nsp0_mem>;
@@ -4543,8 +4547,12 @@ remoteproc_nsp1: remoteproc@21300000 { clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "xo"; - power-domains = <&rpmhpd SC8280XP_NSP>; - power-domain-names = "nsp"; + power-domains = <&rpmhpd SC8280XP_NSP>, + <&rpmhpd SC8280XP_CX>, + <&rpmhpd SC8280XP_MXC>; + power-domain-names = "nsp", + "cx", + "mxc"; memory-region = <&pil_nsp1_mem>;
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +0 -1
@@ -427,7 +427,6 @@ &pcie_phy { &pcie0 { ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - max-link-speed = <2>; num-lanes = <2>; pinctrl-names = "default"; status = "okay";
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +0 -1
@@ -73,7 +73,6 @@ &i2c4 { }; &pcie0 { - max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; };
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +2 -2
@@ -40,13 +40,13 @@ adc-keys { button-up { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; - press-threshold-microvolt = <100000>; + press-threshold-microvolt = <2000>; }; button-down { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; - press-threshold-microvolt = <600000>; + press-threshold-microvolt = <300000>; }; };
arch/arm64/include/asm/hyperv-tlfs.h +19 -26
61 lines not on this page · raw message
arch/arm64/include/asm/mshyperv.h +2 -2
@@ -31,12 +31,12 @@ void hv_set_vpreg(u32 reg, u64 value);u64 hv_get_vpreg (u32 reg);void hv_get_vpreg_128 (u32 reg,struct hv_get_vp_registers_output *result); -static inline void hv_set_register (unsigned int reg,u64 value) +static inline void hv_set_msr (unsigned int reg,u64 value) {hv_set_vpreg (reg, value); } -static inline u64 hv_get_register (unsigned int reg) +static inline u64 hv_get_msr (unsigned int reg) {return hv_get_vpreg (reg); }
arch/arm64/kernel/hibernate.c +1 -1
@@ -396,7 +396,7 @@ int swsusp_arch_suspend(void)* Memory allocated by get_safe_page() will be dealt with by the hibernate code, * we don't need to free it here. */ -int swsusp_arch_resume (void ) +int __nocfi swsusp_arch_resume(void) {int rc;void *zero_page;
arch/arm64/kernel/signal.c +4 -0
@@ -475,6 +475,10 @@ static int restore_za_context(struct user_ctxs *user)fpsimd_flush_task_state (current);/* From now, fpsimd_thread_switch() won't touch thread.sve_state */ +sve_alloc (current, false); +if (!current->thread.sve_state) +return -ENOMEM ; +sme_alloc (current, true);if (!current->thread.sme_state) { current->thread.svcr &= ~SVCR_ZA_MASK ;
arch/loongarch/kernel/perf_event.c +18 -3
@@ -637,6 +637,18 @@ static const struct loongarch_perf_event *loongarch_pmu_map_cache_event(u64 confreturn pev; } +static inline bool loongarch_pmu_event_requires_counter (const struct perf_event *event) +{ +switch (event->attr.type) { +case PERF_TYPE_HARDWARE : +case PERF_TYPE_HW_CACHE : +case PERF_TYPE_RAW : +return true; +default : +return false; + } +} +static int validate_group (struct perf_event *event) {struct cpu_hw_events fake_cpuc;
@@ -644,15 +656,18 @@ static int validate_group(struct perf_event *event)memset (&fake_cpuc,0 ,sizeof (fake_cpuc)); -if (loongarch_pmu_alloc_counter (&fake_cpuc, &leader->hw) <0 ) +if (loongarch_pmu_event_requires_counter (leader) && +loongarch_pmu_alloc_counter (&fake_cpuc, &leader->hw) <0 )return -EINVAL ;for_each_sibling_event (sibling, leader) { -if (loongarch_pmu_alloc_counter (&fake_cpuc, &sibling->hw) <0 ) +if (loongarch_pmu_event_requires_counter (sibling) && +loongarch_pmu_alloc_counter (&fake_cpuc, &sibling->hw) <0 )return -EINVAL ; } -if (loongarch_pmu_alloc_counter (&fake_cpuc, &event->hw) <0 ) +if (loongarch_pmu_event_requires_counter (event) && +loongarch_pmu_alloc_counter (&fake_cpuc, &event->hw) <0 )return -EINVAL ;return 0 ;
arch/x86/events/perf_event.h +11 -2
@@ -1423,13 +1423,22 @@ static inline bool intel_pmu_has_bts_period(struct perf_event *event, u64 periodstruct hw_perf_event *hwc = &event->hw;unsigned int hw_event, bts_event; -if (event->attr.freq) +/* +* Only use BTS for fixed rate period==1 events. +*/ +if (event->attr.freq || period !=1 ) +return false; + +/* +* BTS doesn't virtualize. +*/ +if (event->attr.exclude_host)return false; hw_event = hwc->config &INTEL_ARCH_EVENT_MASK ; bts_event = x86_pmu.event_map (PERF_COUNT_HW_BRANCH_INSTRUCTIONS ); -return hw_event == bts_event && period ==1 ; +return hw_event == bts_event; }static inline bool intel_pmu_has_bts (struct perf_event *event)
arch/x86/hyperv/hv_init.c +4 -4
@@ -664,14 +664,14 @@ void hyperv_cleanup(void) hv_hypercall_pg =NULL ;/* Reset the hypercall page */ - hypercall_msr.as_uint64 =hv_get_register (HV_X64_MSR_HYPERCALL ); + hypercall_msr.as_uint64 =hv_get_msr (HV_X64_MSR_HYPERCALL ); hypercall_msr.enable =0 ; -hv_set_register (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64); +hv_set_msr (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64);/* Reset the TSC page */ - tsc_msr.as_uint64 =hv_get_register (HV_X64_MSR_REFERENCE_TSC ); + tsc_msr.as_uint64 =hv_get_msr (HV_X64_MSR_REFERENCE_TSC ); tsc_msr.enable =0 ; -hv_set_register (HV_X64_MSR_REFERENCE_TSC , tsc_msr.as_uint64); +hv_set_msr (HV_X64_MSR_REFERENCE_TSC , tsc_msr.as_uint64); }void hyperv_report_panic (struct pt_regs *regs,long err,bool in_die)
arch/x86/include/asm/hyperv-tlfs.h +76 -69
185 lines not on this page · raw message
arch/x86/include/asm/kfence.h +24 -5
@@ -42,10 +42,34 @@ static inline bool kfence_protect_page(unsigned long addr, bool protect) {unsigned int level;pte_t *pte =lookup_address (addr, &level); +pteval_t val;if (WARN_ON (!pte || level !=PG_LEVEL_4K ))return false; + val =pte_val (*pte); + +/* +* protect requires making the page not-present. If the PTE is +* already in the right state, there's nothing to do. +*/ +if (protect != !!(val & _PAGE_PRESENT)) +return true; + +/* +* Otherwise, invert the entire PTE. This avoids writing out an +* L1TF-vulnerable PTE (not present, without the high address bits +* set). +*/ +set_pte (pte,__pte (~val)); + +/* +* If the page was protected (non-present) and we're making it +* present, there is no need to flush the TLB at all. +*/ +if (!protect) +return true; +/* * We need to avoid IPIs, as we may get KFENCE allocations or faults * with interrupts disabled. Therefore, the below is best-effort, and
@@ -53,11 +77,6 @@ static inline bool kfence_protect_page(unsigned long addr, bool protect)* lazy fault handling takes care of faults after the page is PRESENT. */ -if (protect) -set_pte (pte,__pte (pte_val (*pte) & ~_PAGE_PRESENT)); -else -set_pte (pte,__pte (pte_val (*pte) | _PAGE_PRESENT)); -/* * Flush this CPU's TLB, assuming whoever did the allocation/free is * likely to continue running on this CPU.
arch/x86/include/asm/mshyperv.h +15 -15
@@ -292,24 +292,24 @@ static inline void hv_ivm_msr_write(u64 msr, u64 value) {}static inline void hv_ivm_msr_read (u64 msr,u64 *value) {}#endif -static inline bool hv_is_synic_reg (unsigned int reg) +static inline bool hv_is_synic_msr (unsigned int reg) { -return (reg >=HV_REGISTER_SCONTROL ) && - (reg <=HV_REGISTER_SINT15 ); +return (reg >=HV_X64_MSR_SCONTROL ) && + (reg <=HV_X64_MSR_SINT15 ); } -static inline bool hv_is_sint_reg (unsigned int reg) +static inline bool hv_is_sint_msr (unsigned int reg) { -return (reg >=HV_REGISTER_SINT0 ) && - (reg <=HV_REGISTER_SINT15 ); +return (reg >=HV_X64_MSR_SINT0 ) && + (reg <=HV_X64_MSR_SINT15 ); } -u64 hv_get_register (unsigned int reg); -void hv_set_register (unsigned int reg,u64 value); -u64 hv_get_non_nested_register (unsigned int reg); -void hv_set_non_nested_register (unsigned int reg,u64 value); +u64 hv_get_msr (unsigned int reg); +void hv_set_msr (unsigned int reg,u64 value); +u64 hv_get_non_nested_msr (unsigned int reg); +void hv_set_non_nested_msr (unsigned int reg,u64 value); -static __always_inline u64 hv_raw_get_register(unsigned int reg) +static __always_inline u64 hv_raw_get_msr(unsigned int reg) {return __rdmsr (reg); }
@@ -330,10 +330,10 @@ static inline int hyperv_flush_guest_mapping_range(u64 as, {return -1 ; } -static inline void hv_set_register (unsigned int reg,u64 value) { } -static inline u64 hv_get_register (unsigned int reg) {return 0 ; } -static inline void hv_set_non_nested_register (unsigned int reg,u64 value) { } -static inline u64 hv_get_non_nested_register (unsigned int reg) {return 0 ; } +static inline void hv_set_msr (unsigned int reg,u64 value) { } +static inline u64 hv_get_msr (unsigned int reg) {return 0 ; } +static inline void hv_set_non_nested_msr (unsigned int reg,u64 value) { } +static inline u64 hv_get_non_nested_msr (unsigned int reg) {return 0 ; }#endif /* CONFIG_HYPERV */
arch/x86/kernel/cpu/mshyperv.c +28 -28
98 lines not on this page · raw message
arch/x86/kernel/cpu/resctrl/core.c +17 -4
@@ -755,7 +755,8 @@ static __init bool get_mem_config(void)if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL )return __get_mem_config_intel (&hw_res->r_resctrl); -else if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON )return __rdt_get_mem_config_amd (&hw_res->r_resctrl);return false;
@@ -907,7 +908,8 @@ static __init void rdt_init_res_defs(void) {if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL )rdt_init_res_defs_intel (); -else if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON )rdt_init_res_defs_amd (); }
@@ -938,8 +940,19 @@ void resctrl_cpu_detect(struct cpuinfo_x86 *c) c->x86_cache_occ_scale = ebx; c->x86_cache_mbm_width_offset = eax &0xff ; -if (c->x86_vendor ==X86_VENDOR_AMD && !c->x86_cache_mbm_width_offset) - c->x86_cache_mbm_width_offset =MBM_CNTR_WIDTH_OFFSET_AMD ; +if (!c->x86_cache_mbm_width_offset) { +switch (c->x86_vendor) { +case X86_VENDOR_AMD : + c->x86_cache_mbm_width_offset =MBM_CNTR_WIDTH_OFFSET_AMD ; +break ; +case X86_VENDOR_HYGON : + c->x86_cache_mbm_width_offset =MBM_CNTR_WIDTH_OFFSET_HYGON ; +break ; +default : +/* Leave c->x86_cache_mbm_width_offset as 0 */ +break ; + } + } } }
arch/x86/kernel/cpu/resctrl/internal.h +3 -0
@@ -20,6 +20,9 @@#define MBA_IS_LINEAR 0x4#define MBM_CNTR_WIDTH_OFFSET_AMD 20 +/* Hygon MBM counter width as an offset from MBM_CNTR_WIDTH_BASE */ +#define MBM_CNTR_WIDTH_OFFSET_HYGON 8 +#define RMID_VAL_ERROR BIT_ULL(63)#define RMID_VAL_UNAVAIL BIT_ULL(62)/*
arch/x86/kernel/fpu/core.c +29 -3
@@ -294,10 +294,29 @@ EXPORT_SYMBOL_GPL(fpu_enable_guest_xfd_features);#ifdef CONFIG_X86_64 void fpu_update_guest_xfd (struct fpu_guest *guest_fpu,u64 xfd) { +struct fpstate *fpstate = guest_fpu->fpstate; +fpregs_lock (); - guest_fpu->fpstate->xfd = xfd; -if (guest_fpu->fpstate->in_use) -xfd_update_state (guest_fpu->fpstate); + +/* +* KVM's guest ABI is that setting XFD[i]=1 *can* immediately revert the +* save state to its initial configuration. Likewise, KVM_GET_XSAVE does +* the same as XSAVE and returns XSTATE_BV[i]=0 whenever XFD[i]=1. +* +* If the guest's FPU state is in hardware, just update XFD: the XSAVE +* in fpu_swap_kvm_fpstate will clear XSTATE_BV[i] whenever XFD[i]=1. +* +* If however the guest's FPU state is NOT resident in hardware, clear +* disabled components in XSTATE_BV now, or a subsequent XRSTOR will +* attempt to load disabled components and generate #NM _in the host_. +*/ +if (xfd &&test_thread_flag (TIF_NEED_FPU_LOAD )) + fpstate->regs.xsave.header.xfeatures &= ~xfd; + + fpstate->xfd = xfd; +if (fpstate->in_use) +xfd_update_state (fpstate); +fpregs_unlock (); }EXPORT_SYMBOL_GPL (fpu_update_guest_xfd);
@@ -405,6 +424,13 @@ int fpu_copy_uabi_to_guest_fpstate(struct fpu_guest *gfpu, const void *buf,if (ustate->xsave.header.xfeatures & ~xcr0)return -EINVAL ; +/* +* Disabled features must be in their initial state, otherwise XRSTOR +* causes an exception. +*/ +if (WARN_ON_ONCE (ustate->xsave.header.xfeatures & kstate->xfd)) +return -EINVAL ; +/* * Nullify @vpkru to preserve its current value if PKRU's bit isn't set * in the header. KVM's odd ABI is to leave PKRU untouched in this
arch/x86/kvm/x86.c +9 -0
@@ -5432,9 +5432,18 @@ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,static int kvm_vcpu_ioctl_x86_set_xsave (struct kvm_vcpu *vcpu,struct kvm_xsave *guest_xsave) { +union fpregs_state *xstate = (union fpregs_state *)guest_xsave->region; +if (fpstate_is_confidential (&vcpu->arch.guest_fpu))return 0 ; +/* +* For backwards compatibility, do not expect disabled features to be in +* their initial state. XSTATE_BV[i] must still be cleared whenever +* XFD[i]=1, or XRSTOR would cause a #NM. +*/ + xstate->xsave.header.xfeatures &= ~vcpu->arch.guest_fpu.fpstate->xfd; + return fpu_copy_uabi_to_guest_fpstate(&vcpu->arch.guest_fpu, guest_xsave->region, kvm_caps.supported_xcr0,
arch/x86/mm/fault.c +5 -10
@@ -815,8 +815,6 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,force_sig_pkuerr ((void __user *)address, pkey); else force_sig_fault(SIGSEGV, si_code, (void __user *)address); - -local_irq_disable (); }static noinline void
@@ -1463,15 +1461,12 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code,do_kern_addr_fault (regs, error_code, address); }else {do_user_addr_fault (regs, error_code, address); -/* -* User address page fault handling might have reenabled -* interrupts. Fixing up all potential exit points of -* do_user_addr_fault() and its leaf functions is just not -* doable w/o creating an unholy mess or turning the code -* upside down. -*/ -local_irq_disable (); } +/* +* page fault handling might have reenabled interrupts, +* make sure to disable them again. +*/ +local_irq_disable (); }DEFINE_IDTENTRY_RAW_ERRORCODE (exc_page_fault)
arch/x86/mm/kaslr.c +5 -5
@@ -111,12 +111,12 @@ void __init kernel_randomize_memory(void)/* * Adapt physical memory region size based on available memory, -* except when CONFIG_PCI_P2PDMA is enabled. P2PDMA exposes the -* device BAR space assuming the direct map space is large enough -* for creating a ZONE_DEVICE mapping in the direct map corresponding -* to the physical BAR address. +* except when CONFIG_ZONE_DEVICE is enabled. ZONE_DEVICE wants to map +* any physical address into the direct-map. KASLR wants to reliably +* steal some physical address bits. Those design choices are in direct +* conflict. */ -if (!IS_ENABLED (CONFIG_PCI_P2PDMA ) && (memory_tb < kaslr_regions[0 ].size_tb)) +if (!IS_ENABLED (CONFIG_ZONE_DEVICE ) && (memory_tb < kaslr_regions[0 ].size_tb)) kaslr_regions[0 ].size_tb = memory_tb;/*
crypto/authencesn.c +6 -0
@@ -189,6 +189,9 @@ static int crypto_authenc_esn_encrypt(struct aead_request *req)struct scatterlist *src, *dst;int err; +if (assoclen <8 ) +return -EINVAL ; +sg_init_table (areq_ctx->src,2 ); src =scatterwalk_ffwd (areq_ctx->src, req->src, assoclen); dst = src;
@@ -281,6 +284,9 @@ static int crypto_authenc_esn_decrypt(struct aead_request *req)u32 tmp[2 ];int err; +if (assoclen <8 ) +return -EINVAL ; + cryptlen -= authsize;if (req->src != dst) {
drivers/ata/libata-core.c +31 -1
@@ -2780,9 +2780,33 @@ static void ata_dev_config_cpr(struct ata_device *dev)kfree (buf); } +/* +* Configure features related to link power management. +*/ +static void ata_dev_config_lpm (struct ata_device *dev) +{ +struct ata_port *ap = dev->link->ap; +unsigned int err_mask; + +/* +* Device Initiated Power Management (DIPM) is normally disabled by +* default on a device. However, DIPM may have been enabled and that +* setting kept even after COMRESET because of the Software Settings +* Preservation feature. So if the port does not support DIPM and the +* device does, disable DIPM on the device. +*/ +if (ap->flags &ATA_FLAG_NO_DIPM &&ata_id_has_dipm (dev->id)) { + err_mask =ata_dev_set_feature (dev, +SETFEATURES_SATA_DISABLE ,SATA_DIPM ); +if (err_mask && err_mask !=AC_ERR_DEV ) +ata_dev_err (dev,"Disable DIPM failed, Emask 0x%x\n" , + err_mask); + } +} +static void ata_dev_print_features (struct ata_device *dev) { -if (!(dev->flags &ATA_DFLAG_FEATURES_MASK )) +if (!(dev->flags &ATA_DFLAG_FEATURES_MASK ) && !dev->cpr_log)return ; ata_dev_info(dev,
@@ -2949,6 +2973,7 @@ int ata_dev_configure(struct ata_device *dev)ata_dev_config_chs (dev); } +ata_dev_config_lpm (dev);ata_dev_config_fua (dev);ata_dev_config_devslp (dev);ata_dev_config_sense_reporting (dev);
@@ -3022,6 +3047,11 @@ int ata_dev_configure(struct ata_device *dev)ata_mode_string (xfer_mask), cdb_intr_string, atapi_an_string, dma_dir_string); + +ata_dev_config_lpm (dev); + +if (print_info) +ata_dev_print_features (dev); }/* determine max_sectors */
drivers/base/regmap/regmap.c +3 -1
@@ -408,9 +408,11 @@ static void regmap_lock_hwlock_irq(void *__map)static void regmap_lock_hwlock_irqsave (void *__map) {struct regmap *map = __map; +unsigned long flags =0 ;hwspin_lock_timeout_irqsave (map->hwlock,UINT_MAX , - &map->spinlock_flags); + &flags); + map->spinlock_flags = flags; }static void regmap_unlock_hwlock (void *__map)
drivers/block/null_blk/main.c +11 -1
@@ -622,12 +622,22 @@ static void nullb_add_fault_config(struct nullb_device *dev)configfs_add_default_group (&dev->init_hctx_fault_config.group, &dev->group); } +static void nullb_del_fault_config (struct nullb_device *dev) +{ +config_item_put (&dev->init_hctx_fault_config.group.cg_item); +config_item_put (&dev->requeue_config.group.cg_item); +config_item_put (&dev->timeout_config.group.cg_item); +} +#else static void nullb_add_fault_config (struct nullb_device *dev) { } +static void nullb_del_fault_config (struct nullb_device *dev) +{ +}#endif static struct
@@ -659,7 +669,7 @@ nullb_group_drop_item(struct config_group *group, struct config_item *item)null_del_dev (dev->nullb);mutex_unlock (&lock); } - +nullb_del_fault_config (dev);config_item_put (item); }
drivers/clocksource/hyperv_timer.c +13 -13
@@ -82,14 +82,14 @@ static int hv_ce_set_next_event(unsigned long delta, current_tick =hv_read_reference_counter (); current_tick += delta; -hv_set_register (HV_REGISTER_STIMER0_COUNT , current_tick); +hv_set_msr (HV_MSR_STIMER0_COUNT , current_tick);return 0 ; }static int hv_ce_shutdown (struct clock_event_device *evt) { -hv_set_register (HV_REGISTER_STIMER0_COUNT ,0 ); -hv_set_register (HV_REGISTER_STIMER0_CONFIG ,0 ); +hv_set_msr (HV_MSR_STIMER0_COUNT ,0 ); +hv_set_msr (HV_MSR_STIMER0_CONFIG ,0 );if (direct_mode_enabled && stimer0_irq >=0 )disable_percpu_irq (stimer0_irq);
@@ -120,7 +120,7 @@ static int hv_ce_set_oneshot(struct clock_event_device *evt) timer_cfg.direct_mode =0 ; timer_cfg.sintx = stimer0_message_sint; } -hv_set_register (HV_REGISTER_STIMER0_CONFIG , timer_cfg.as_uint64); +hv_set_msr (HV_MSR_STIMER0_CONFIG , timer_cfg.as_uint64);return 0 ; }
@@ -373,11 +373,11 @@ static __always_inline u64 read_hv_clock_msr(void)* is set to 0 when the partition is created and is incremented in 100 * nanosecond units. * -* Use hv_raw_get_register() because this function is used from -* noinstr. Notable; while HV_REGISTER_TIME_REF_COUNT is a synthetic +* Use hv_raw_get_msr() because this function is used from +* noinstr. Notable; while HV_MSR_TIME_REF_COUNT is a synthetic * register it doesn't need the GHCB path. */ -return hv_raw_get_register (HV_REGISTER_TIME_REF_COUNT ); +return hv_raw_get_msr (HV_MSR_TIME_REF_COUNT ); }/*
@@ -440,9 +440,9 @@ static void suspend_hv_clock_tsc(struct clocksource *arg)union hv_reference_tsc_msr tsc_msr;/* Disable the TSC page */ - tsc_msr.as_uint64 =hv_get_register (HV_REGISTER_REFERENCE_TSC ); + tsc_msr.as_uint64 =hv_get_msr (HV_MSR_REFERENCE_TSC ); tsc_msr.enable =0 ; -hv_set_register (HV_REGISTER_REFERENCE_TSC , tsc_msr.as_uint64); +hv_set_msr (HV_MSR_REFERENCE_TSC , tsc_msr.as_uint64); }
@@ -451,10 +451,10 @@ static void resume_hv_clock_tsc(struct clocksource *arg)union hv_reference_tsc_msr tsc_msr;/* Re-enable the TSC page */ - tsc_msr.as_uint64 =hv_get_register (HV_REGISTER_REFERENCE_TSC ); + tsc_msr.as_uint64 =hv_get_msr (HV_MSR_REFERENCE_TSC ); tsc_msr.enable =1 ; tsc_msr.pfn = tsc_pfn; -hv_set_register (HV_REGISTER_REFERENCE_TSC , tsc_msr.as_uint64); +hv_set_msr (HV_MSR_REFERENCE_TSC , tsc_msr.as_uint64); }/*
@@ -567,14 +567,14 @@ static void __init hv_init_tsc_clocksource(void)* thus TSC clocksource will work even without the real TSC page * mapped. */ - tsc_msr.as_uint64 =hv_get_register (HV_REGISTER_REFERENCE_TSC ); + tsc_msr.as_uint64 =hv_get_msr (HV_MSR_REFERENCE_TSC );if (hv_root_partition) tsc_pfn = tsc_msr.pfn;else tsc_pfn =HVPFN_DOWN (virt_to_phys (tsc_page)); tsc_msr.enable =1 ; tsc_msr.pfn = tsc_pfn; -hv_set_register (HV_REGISTER_REFERENCE_TSC , tsc_msr.as_uint64); +hv_set_msr (HV_MSR_REFERENCE_TSC , tsc_msr.as_uint64);clocksource_register_hz (&hyperv_cs_tsc,NSEC_PER_SEC /100 );
drivers/clocksource/timer-riscv.c +2 -1
@@ -39,8 +39,9 @@ static int riscv_clock_next_event(unsigned long delta,csr_set (CSR_IE ,IE_TIE );if (static_branch_likely (&riscv_sstc_available)) {#if defined(CONFIG_32BIT ) -csr_write (CSR_STIMECMP , next_tval &0xFFFFFFFF ); +csr_write (CSR_STIMECMP ,ULONG_MAX );csr_write (CSR_STIMECMPH , next_tval >>32 ); +csr_write (CSR_STIMECMP , next_tval &0xFFFFFFFF );#else csr_write (CSR_STIMECMP , next_tval);#endif
drivers/comedi/comedi_fops.c +1 -1
@@ -1099,7 +1099,7 @@ static int do_chaninfo_ioctl(struct comedi_device *dev,for (i =0 ; i < s->n_chan; i++) {int x; - x = (dev->minor <<28 ) | (it->subdev <<24 ) | (i <<16 ) | + x = (it->subdev <<24 ) | (i <<16 ) | (s->range_table_list[i]->length);if (put_user (x, it->rangelist + i))return -EFAULT ;
drivers/comedi/drivers/dmm32at.c +30 -2
@@ -330,6 +330,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,static void dmm32at_setaitimer (struct comedi_device *dev,unsigned int nansec) { +unsigned long irq_flags;unsigned char lo1, lo2, hi2;unsigned short both2;
@@ -342,6 +343,9 @@ static void dmm32at_setaitimer(struct comedi_device *dev, unsigned int nansec)/* set counter clocks to 10MHz, disable all aux dio */ outb (0 , dev->iobase +DMM32AT_CTRDIO_CFG_REG ); +/* serialize access to control register and paged registers */ +spin_lock_irqsave (&dev->spinlock, irq_flags); +/* get access to the clock regs */ outb (DMM32AT_CTRL_PAGE_8254 , dev->iobase +DMM32AT_CTRL_REG );
@@ -354,6 +358,8 @@ static void dmm32at_setaitimer(struct comedi_device *dev, unsigned int nansec)outb (lo2, dev->iobase +DMM32AT_CLK2 );outb (hi2, dev->iobase +DMM32AT_CLK2 ); +spin_unlock_irqrestore (&dev->spinlock, irq_flags); +/* enable the ai conversion interrupt and the clock to start scans */ outb(DMM32AT_INTCLK_ADINT | DMM32AT_INTCLK_CLKEN | DMM32AT_INTCLK_CLKSEL,
@@ -363,13 +369,19 @@ static void dmm32at_setaitimer(struct comedi_device *dev, unsigned int nansec)static int dmm32at_ai_cmd (struct comedi_device *dev,struct comedi_subdevice *s) {struct comedi_cmd *cmd = &s->async->cmd; +unsigned long irq_flags;int ret;dmm32at_ai_set_chanspec (dev, s, cmd->chanlist[0 ], cmd->chanlist_len); +/* serialize access to control register and paged registers */ +spin_lock_irqsave (&dev->spinlock, irq_flags); +/* reset the interrupt just in case */ outb (DMM32AT_CTRL_INTRST , dev->iobase +DMM32AT_CTRL_REG ); +spin_unlock_irqrestore (&dev->spinlock, irq_flags); +/* * wait for circuit to settle * we don't have the 'insn' here but it's not needed
@@ -429,8 +441,13 @@ static irqreturn_t dmm32at_isr(int irq, void *d)comedi_handle_events (dev, s); } +/* serialize access to control register and paged registers */ +spin_lock (&dev->spinlock); +/* reset the interrupt */ outb (DMM32AT_CTRL_INTRST , dev->iobase +DMM32AT_CTRL_REG ); + +spin_unlock (&dev->spinlock);return IRQ_HANDLED ; }
@@ -481,14 +498,25 @@ static int dmm32at_ao_insn_write(struct comedi_device *dev,static int dmm32at_8255_io (struct comedi_device *dev,int dir,int port,int data,unsigned long regbase) { +unsigned long irq_flags; +int ret; + +/* serialize access to control register and paged registers */ +spin_lock_irqsave (&dev->spinlock, irq_flags); +/* get access to the DIO regs */ outb (DMM32AT_CTRL_PAGE_8255 , dev->iobase +DMM32AT_CTRL_REG );if (dir) {outb (data, dev->iobase + regbase + port); -return 0 ; + ret =0 ; + }else { + ret =inb (dev->iobase + regbase + port); } -return inb (dev->iobase + regbase + port); + +spin_unlock_irqrestore (&dev->spinlock, irq_flags); + +return ret; }/* Make sure the board is there and put it to a known state */
drivers/comedi/range.c +1 -1
@@ -52,7 +52,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev,const struct comedi_lrange *lr;struct comedi_subdevice *s; - subd = (it->range_type >>24 ) &0xf ; + subd = (it->range_type >>24 ) &0xff ; chan = (it->range_type >>16 ) &0xff ;if (!dev->attached)
drivers/dma/apple-admac.c +1 -0
@@ -938,6 +938,7 @@ static int admac_remove(struct platform_device *pdev) }static const struct of_device_id admac_of_match[] = { + { .compatible ="apple,t8103-admac" , }, { .compatible ="apple,admac" , }, { } };
drivers/dma/at_hdmac.c +7 -2
@@ -1755,6 +1755,7 @@ static int atc_alloc_chan_resources(struct dma_chan *chan)static void atc_free_chan_resources (struct dma_chan *chan) {struct at_dma_chan *atchan =to_at_dma_chan (chan); +struct at_dma_slave *atslave;BUG_ON (atc_chan_is_enabled (atchan));
@@ -1764,8 +1765,12 @@ static void atc_free_chan_resources(struct dma_chan *chan)/* * Free atslave allocated in at_dma_xlate() */ -kfree (chan->private); - chan->private =NULL ; + atslave = chan->private; +if (atslave) { +put_device (atslave->dma_dev); +kfree (atslave); + chan->private =NULL ; + }dev_vdbg (chan2dev (chan),"free_chan_resources: done\n" ); }
drivers/dma/bcm-sba-raid.c +5 -1
@@ -1699,7 +1699,7 @@ static int sba_probe(struct platform_device *pdev)/* Prealloc channel resource */ ret =sba_prealloc_channel_resources (sba);if (ret) - goto fail_free_mchan; + goto fail_put_mbox;/* Check availability of debugfs */ if (!debugfs_initialized ())
@@ -1729,6 +1729,8 @@ static int sba_probe(struct platform_device *pdev) fail_free_resources:debugfs_remove_recursive (sba->root);sba_freeup_channel_resources (sba); +fail_put_mbox: +put_device (sba->mbox_dev); fail_free_mchan:mbox_free_channel (sba->mchan);return ret;
@@ -1744,6 +1746,8 @@ static int sba_remove(struct platform_device *pdev)sba_freeup_channel_resources (sba); +put_device (sba->mbox_dev); +mbox_free_channel (sba->mchan);return 0 ;
drivers/dma/dw/rzn1-dmamux.c +3 -1
@@ -90,7 +90,7 @@ static void *rzn1_dmamux_route_allocate(struct of_phandle_args *dma_spec,if (test_and_set_bit (map->req_idx, dmamux->used_chans)) { ret = -EBUSY ; - goto free_map; + goto put_dma_spec_np; } mask =BIT (map->req_idx);
@@ -103,6 +103,8 @@ static void *rzn1_dmamux_route_allocate(struct of_phandle_args *dma_spec, clear_bitmap:clear_bit (map->req_idx, dmamux->used_chans); +put_dma_spec_np: +of_node_put (dma_spec->np); free_map:kfree (map); put_device:
drivers/dma/idxd/compat.c +19 -4
@@ -21,11 +21,16 @@ static ssize_t unbind_store(struct device_driver *drv, const char *buf, size_t cint rc = -ENODEV ; dev =bus_find_device_by_name (bus,NULL , buf); -if (dev && dev->driver) { +if (!dev) +return -ENODEV ; + +if (dev->driver) {device_driver_detach (dev); rc = count; } +put_device (dev); +return rc; } static DRIVER_ATTR_IGNORE_LOCKDEP(unbind, 0200, NULL, unbind_store);
@@ -39,9 +44,12 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf, size_t coustruct idxd_dev *idxd_dev; dev =bus_find_device_by_name (bus,NULL , buf); -if (!dev || dev->driver || drv != &dsa_drv.drv) +if (!dev)return -ENODEV ; +if (dev->driver || drv != &dsa_drv.drv) + goto err_put_dev; + idxd_dev =confdev_to_idxd_dev (dev);if (is_idxd_dev (idxd_dev)) { alt_drv =driver_find ("idxd" , bus);
@@ -54,13 +62,20 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf, size_t cou alt_drv =driver_find ("user" , bus); }if (!alt_drv) -return -ENODEV ; + goto err_put_dev; rc =device_driver_attach (alt_drv, dev);if (rc <0 ) -return rc; + goto err_put_dev; + +put_device (dev);return count; + +err_put_dev: +put_device (dev); + +return rc; } static DRIVER_ATTR_IGNORE_LOCKDEP(bind, 0200, NULL, bind_store);
drivers/dma/lpc18xx-dmamux.c +14 -5
@@ -57,30 +57,31 @@ static void *lpc18xx_dmamux_reserve(struct of_phandle_args *dma_spec,struct lpc18xx_dmamux_data *dmamux =platform_get_drvdata (pdev);unsigned long flags;unsigned mux; +int ret = -EINVAL ;if (dma_spec->args_count !=3 ) {dev_err (&pdev->dev,"invalid number of dma mux args\n" ); -return ERR_PTR (-EINVAL ); + goto err_put_pdev; } mux = dma_spec->args[0 ];if (mux >= dmamux->dma_master_requests) {dev_err (&pdev->dev,"invalid mux number: %d\n" , dma_spec->args[0 ]); -return ERR_PTR (-EINVAL ); + goto err_put_pdev; }if (dma_spec->args[1 ] >LPC18XX_DMAMUX_MAX_VAL ) {dev_err (&pdev->dev,"invalid dma mux value: %d\n" , dma_spec->args[1 ]); -return ERR_PTR (-EINVAL ); + goto err_put_pdev; }/* The of_node_put() will be done in the core for the node */ dma_spec->np =of_parse_phandle (ofdma->of_node,"dma-masters" ,0 );if (!dma_spec->np) {dev_err (&pdev->dev,"can't get dma master\n" ); -return ERR_PTR (-EINVAL ); + goto err_put_pdev; }spin_lock_irqsave (&dmamux->lock, flags);
@@ -89,7 +90,8 @@ static void *lpc18xx_dmamux_reserve(struct of_phandle_args *dma_spec,dev_err (&pdev->dev,"dma request %u busy with %u.%u\n" , mux, mux, dmamux->muxes[mux].value);of_node_put (dma_spec->np); -return ERR_PTR (-EBUSY ); + ret = -EBUSY ; + goto err_put_pdev; } dmamux->muxes[mux].busy = true;
@@ -106,7 +108,14 @@ static void *lpc18xx_dmamux_reserve(struct of_phandle_args *dma_spec,dev_dbg (&pdev->dev,"mapping dmamux %u.%u to dma request %u\n" , mux, dmamux->muxes[mux].value, mux); +put_device (&pdev->dev); +return &dmamux->muxes[mux]; + +err_put_pdev: +put_device (&pdev->dev); + +return ERR_PTR (ret); }static int lpc18xx_dmamux_probe (struct platform_device *pdev)
drivers/dma/qcom/gpi.c +4 -2
@@ -1621,14 +1621,16 @@ static int gpi_peripheral_config(struct dma_chan *chan, struct dma_slave_config *config) { struct gchan *gchan = to_gchan(chan); +void *new_config;if (!config->peripheral_config)return -EINVAL ; - gchan->config =krealloc (gchan->config, config->peripheral_size,GFP_NOWAIT ); -if (!gchan->config) + new_config =krealloc (gchan->config, config->peripheral_size,GFP_NOWAIT ); +if (!new_config)return -ENOMEM ; + gchan->config = new_config;memcpy (gchan->config, config->peripheral_config, config->peripheral_size);return 0 ;
drivers/dma/sh/rz-dmac.c +5 -0
@@ -533,11 +533,16 @@ rz_dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,static int rz_dmac_terminate_all (struct dma_chan *chan) {struct rz_dmac_chan *channel =to_rz_dmac_chan (chan); +struct rz_lmdesc *lmdesc = channel->lmdesc.base;unsigned long flags; +unsigned int i;LIST_HEAD (head);rz_dmac_disable_hw (channel);spin_lock_irqsave (&channel->vc.lock, flags); +for (i =0 ; i <DMAC_NR_LMDESC ; i++) + lmdesc[i].header =0 ; +list_splice_tail_init (&channel->ld_active, &channel->ld_free);list_splice_tail_init (&channel->ld_queue, &channel->ld_free);spin_unlock_irqrestore (&channel->vc.lock, flags);
drivers/dma/stm32-dmamux.c +15 -7
@@ -90,23 +90,25 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec,struct stm32_dmamux_data *dmamux =platform_get_drvdata (pdev);struct stm32_dmamux *mux;u32 i, min, max; -int ret; +int ret = -EINVAL ;unsigned long flags;if (dma_spec->args_count !=3 ) {dev_err (&pdev->dev,"invalid number of dma mux args\n" ); -return ERR_PTR (-EINVAL ); + goto err_put_pdev; }if (dma_spec->args[0 ] > dmamux->dmamux_requests) {dev_err (&pdev->dev,"invalid mux request number: %d\n" , dma_spec->args[0 ]); -return ERR_PTR (-EINVAL ); + goto err_put_pdev; } mux =kzalloc (sizeof (*mux),GFP_KERNEL ); -if (!mux) -return ERR_PTR (-ENOMEM ); +if (!mux) { + ret = -ENOMEM ; + goto err_put_pdev; + }spin_lock_irqsave (&dmamux->lock, flags); mux->chan_id = find_first_zero_bit(dmamux->dma_inuse,
@@ -133,7 +135,6 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec, dma_spec->np =of_parse_phandle (ofdma->of_node,"dma-masters" , i -1 );if (!dma_spec->np) {dev_err (&pdev->dev,"can't get dma master\n" ); - ret = -EINVAL ; goto error; }
@@ -142,7 +143,7 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec, ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) {spin_unlock_irqrestore (&dmamux->lock, flags); - goto error; + goto err_put_dma_spec_np; }spin_unlock_irqrestore (&dmamux->lock, flags);
@@ -160,13 +161,20 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec,dev_dbg (&pdev->dev,"Mapping DMAMUX(%u) to DMA%u(%u)\n" , mux->request, mux->master, mux->chan_id); +put_device (&pdev->dev); +return mux; +err_put_dma_spec_np: +of_node_put (dma_spec->np); error:clear_bit (mux->chan_id, dmamux->dma_inuse); error_chan_id:kfree (mux); +err_put_pdev: +put_device (&pdev->dev); +return ERR_PTR (ret); }
drivers/dma/tegra210-adma.c +9 -1
@@ -342,10 +342,17 @@ static void tegra_adma_stop(struct tegra_adma_chan *tdc)return ; } -kfree (tdc->desc); +vchan_terminate_vdesc (&tdc->desc->vd); tdc->desc =NULL ; } +static void tegra_adma_synchronize (struct dma_chan *dc) +{ +struct tegra_adma_chan *tdc =to_tegra_adma_chan (dc); + +vchan_synchronize (&tdc->vc); +} +static void tegra_adma_start (struct tegra_adma_chan *tdc) {struct virt_dma_desc *vd =vchan_next_desc (&tdc->vc);
@@ -909,6 +916,7 @@ static int tegra_adma_probe(struct platform_device *pdev) tdma->dma_dev.device_config = tegra_adma_slave_config; tdma->dma_dev.device_tx_status = tegra_adma_tx_status; tdma->dma_dev.device_terminate_all = tegra_adma_terminate_all; + tdma->dma_dev.device_synchronize = tegra_adma_synchronize; tdma->dma_dev.src_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); tdma->dma_dev.dst_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); tdma->dma_dev.directions =BIT (DMA_DEV_TO_MEM ) |BIT (DMA_MEM_TO_DEV );
drivers/dma/ti/dma-crossbar.c +12 -6
@@ -79,34 +79,35 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec, {struct platform_device *pdev =of_find_device_by_node (ofdma->of_node);struct ti_am335x_xbar_data *xbar =platform_get_drvdata (pdev); -struct ti_am335x_xbar_map *map; +struct ti_am335x_xbar_map *map =ERR_PTR (-EINVAL );if (dma_spec->args_count !=3 ) -return ERR_PTR (-EINVAL ); + goto out_put_pdev;if (dma_spec->args[2 ] >= xbar->xbar_events) {dev_err (&pdev->dev,"Invalid XBAR event number: %d\n" , dma_spec->args[2 ]); -return ERR_PTR (-EINVAL ); + goto out_put_pdev; }if (dma_spec->args[0 ] >= xbar->dma_requests) {dev_err (&pdev->dev,"Invalid DMA request line number: %d\n" , dma_spec->args[0 ]); -return ERR_PTR (-EINVAL ); + goto out_put_pdev; }/* The of_node_put() will be done in the core for the node */ dma_spec->np =of_parse_phandle (ofdma->of_node,"dma-masters" ,0 );if (!dma_spec->np) {dev_err (&pdev->dev,"Can't get DMA master\n" ); -return ERR_PTR (-EINVAL ); + goto out_put_pdev; } map =kzalloc (sizeof (*map),GFP_KERNEL );if (!map) {of_node_put (dma_spec->np); -return ERR_PTR (-ENOMEM ); + map =ERR_PTR (-ENOMEM ); + goto out_put_pdev; } map->dma_line = (u16 )dma_spec->args[0 ];
@@ -120,6 +121,9 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec,ti_am335x_xbar_write (xbar->iomem, map->dma_line, map->mux_val); +out_put_pdev: +put_device (&pdev->dev); +return map; }
@@ -288,6 +292,8 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,ti_dra7_xbar_write (xbar->iomem, map->xbar_out, map->xbar_in); +put_device (&pdev->dev); +return map; }
drivers/dma/ti/k3-udma-private.c +1 -1
@@ -42,9 +42,9 @@ struct udma_dev *of_xudma_dev_get(struct device_node *np, const char *property) } ud =platform_get_drvdata (pdev); +put_device (&pdev->dev);if (!ud) {pr_debug ("UDMA has not been probed\n" ); -put_device (&pdev->dev);return ERR_PTR (-EPROBE_DEFER ); }
drivers/dma/ti/omap-dma.c +4 -0
@@ -1809,6 +1809,8 @@ static int omap_dma_probe(struct platform_device *pdev)if (rc) {pr_warn ("OMAP-DMA: failed to register slave DMA engine device: %d\n" , rc); +if (od->ll123_supported) +dma_pool_destroy (od->desc_pool);omap_dma_free (od);return rc; }
@@ -1824,6 +1826,8 @@ static int omap_dma_probe(struct platform_device *pdev)if (rc) {pr_warn ("OMAP-DMA: failed to register DMA controller\n" );dma_async_device_unregister (&od->ddev); +if (od->ll123_supported) +dma_pool_destroy (od->desc_pool);omap_dma_free (od); } }
drivers/dma/xilinx/xdma-regs.h +1 -0
@@ -9,6 +9,7 @@/* The length of register space exposed to host */ #define XDMA_REG_SPACE_LEN 65536 +#define XDMA_MAX_REG_OFFSET (XDMA_REG_SPACE_LEN - 4)/* * maximum number of DMA channels for each direction:
drivers/dma/xilinx/xdma.c +1 -1
@@ -38,7 +38,7 @@ static const struct regmap_config xdma_regmap_config = { .reg_bits = 32, .val_bits = 32, .reg_stride = 4, - .max_register = XDMA_REG_SPACE_LEN, + .max_register = XDMA_MAX_REG_OFFSET, };/**
drivers/dma/xilinx/xilinx_dma.c +5 -2
@@ -128,6 +128,7 @@#define XILINX_MCDMA_MAX_CHANS_PER_DEVICE 0x20#define XILINX_DMA_MAX_CHANS_PER_DEVICE 0x2#define XILINX_CDMA_MAX_CHANS_PER_DEVICE 0x1 +#define XILINX_DMA_DFAULT_ADDRWIDTH 0x20#define XILINX_DMA_DMAXR_ALL_IRQ_MASK \ (XILINX_DMA_DMASR_FRM_CNT_IRQ | \
@@ -3057,7 +3058,7 @@ static int xilinx_dma_probe(struct platform_device *pdev)struct device_node *node = pdev->dev.of_node;struct xilinx_dma_device *xdev;struct device_node *child, *np = pdev->dev.of_node; -u32 num_frames, addr_width, len_width; +u32 num_frames, addr_width =XILINX_DMA_DFAULT_ADDRWIDTH , len_width;int i, err;/* Allocate and initialize the DMA engine structure */
@@ -3131,7 +3132,9 @@ static int xilinx_dma_probe(struct platform_device *pdev) err =of_property_read_u32 (node,"xlnx,addrwidth" , &addr_width);if (err <0 ) -dev_warn (xdev->dev,"missing xlnx,addrwidth property\n" ); +dev_warn (xdev->dev, +"missing xlnx,addrwidth property, using default value %d\n" , +XILINX_DMA_DFAULT_ADDRWIDTH );if (addr_width >32 ) xdev->ext_addr = true;
drivers/edac/i3200_edac.c +6 -5
@@ -358,10 +358,11 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) layers[1 ].type =EDAC_MC_LAYER_CHANNEL ; layers[1 ].size = nr_channels; layers[1 ].is_virt_csrow = false; - mci =edac_mc_alloc (0 ,ARRAY_SIZE (layers), layers, -sizeof (struct i3200_priv )); + + rc = -ENOMEM ; + mci =edac_mc_alloc (0 ,ARRAY_SIZE (layers), layers,sizeof (struct i3200_priv ));if (!mci) -return -ENOMEM ; + goto unmap;edac_dbg (3 ,"MC: init mci\n" );
@@ -421,9 +422,9 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)return 0 ; fail: +edac_mc_free (mci); +unmap:iounmap (window); -if (mci) -edac_mc_free (mci);return rc; }
drivers/edac/x38_edac.c +6 -3
@@ -341,9 +341,12 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx) layers[1 ].type =EDAC_MC_LAYER_CHANNEL ; layers[1 ].size = x38_channel_num; layers[1 ].is_virt_csrow = false; + + + rc = -ENOMEM ; mci =edac_mc_alloc (0 ,ARRAY_SIZE (layers), layers,0 );if (!mci) -return -ENOMEM ; + goto unmap;edac_dbg (3 ,"MC: init mci\n" );
@@ -403,9 +406,9 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)return 0 ; fail: +edac_mc_free (mci); +unmap:iounmap (window); -if (mci) -edac_mc_free (mci);return rc; }
drivers/firmware/efi/cper.c +1 -1
@@ -162,7 +162,7 @@ int cper_bits_to_str(char *buf, int buf_size, unsigned long bits, len -= size; str += size; } -return len - buf_size; +return buf_size - len; }EXPORT_SYMBOL_GPL (cper_bits_to_str);
drivers/firmware/imx/imx-scu-irq.c +12 -12
@@ -203,6 +203,18 @@ int imx_scu_enable_general_irq_channel(struct device *dev)struct mbox_chan *ch;int ret =0 , i =0 ; +if (!of_parse_phandle_with_args (dev->of_node,"mboxes" , +"#mbox-cells" ,0 , &spec)) { + i =of_alias_get_id (spec.np,"mu" ); +of_node_put (spec.np); + } + +/* use mu1 as general mu irq channel if failed */ +if (i <0 ) + i =1 ; + + mu_resource_id =IMX_SC_R_MU_0A + i; + ret =imx_scu_get_handle (&imx_sc_irq_ipc_handle);if (ret)return ret;
@@ -225,18 +237,6 @@ int imx_scu_enable_general_irq_channel(struct device *dev)return ret; } -if (!of_parse_phandle_with_args (dev->of_node,"mboxes" , -"#mbox-cells" ,0 , &spec)) { - i =of_alias_get_id (spec.np,"mu" ); -of_node_put (spec.np); - } - -/* use mu1 as general mu irq channel if failed */ -if (i <0 ) - i =1 ; - - mu_resource_id =IMX_SC_R_MU_0A + i; -/* Create directory under /sysfs/firmware */ wakeup_obj =kobject_create_and_add ("scu_wakeup_source" , firmware_kobj);if (!wakeup_obj) {
drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c +1 -1
@@ -110,7 +110,7 @@ int amdgpu_unmap_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,struct drm_exec exec;int r; -drm_exec_init (&exec,DRM_EXEC_INTERRUPTIBLE_WAIT ); +drm_exec_init (&exec,0 ); drm_exec_until_all_locked(&exec) { r =amdgpu_vm_lock_pd (vm, &exec,0 );if (likely (!r))
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +8 -0
@@ -4029,6 +4029,14 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)/* disable ras feature must before hw fini */ amdgpu_ras_pre_fini (adev); +/* +* device went through surprise hotplug; we need to destroy topology +* before ip_fini_early to prevent kfd locking refcount issues by calling +* amdgpu_amdkfd_suspend() +*/ +if (drm_dev_is_unplugged (adev_to_drm (adev))) +amdgpu_amdkfd_device_fini_sw (adev); +amdgpu_device_ip_fini_early (adev);amdgpu_irq_fini_hw (adev);
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +11 -8
@@ -2446,6 +2446,14 @@ static int allocate_hiq_sdma_mqd(struct device_queue_manager *dqm)return retval; } +static void deallocate_hiq_sdma_mqd (struct kfd_node *dev, +struct kfd_mem_obj *mqd) +{ +WARN (!mqd,"No hiq sdma mqd trunk to free" ); + +amdgpu_amdkfd_free_gtt_mem (dev->adev, &mqd->gtt_mem); +} +struct device_queue_manager *device_queue_manager_init (struct kfd_node *dev) {struct device_queue_manager *dqm;
@@ -2567,19 +2575,14 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_node *dev)return dqm; } +if (!dev->kfd->shared_resources.enable_mes) +deallocate_hiq_sdma_mqd (dev, &dqm->hiq_sdma_mqd); + out_free:kfree (dqm);return NULL ; } -static void deallocate_hiq_sdma_mqd (struct kfd_node *dev, -struct kfd_mem_obj *mqd) -{ -WARN (!mqd,"No hiq sdma mqd trunk to free" ); - -amdgpu_amdkfd_free_gtt_mem (dev->adev, &mqd->gtt_mem); -} -void device_queue_manager_uninit (struct device_queue_manager *dqm) { dqm->ops.stop (dqm);
drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h +1 -1
@@ -41,7 +41,7 @@/* kHZ*/ #define DP_ADAPTOR_DVI_MAX_TMDS_CLK 165000/* kHZ*/ -#define DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK 165000 +#define DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK 340000struct dp_hdmi_dongle_signature_data {int8_t id[15 ];/* "DP-HDMI ADAPTOR"*/
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +1 -1
@@ -1228,7 +1228,7 @@ void dce110_blank_stream(struct pipe_ctx *pipe_ctx)struct dce_hwseq *hws = link->dc->hwseq;if (link->local_sink && link->local_sink->sink_signal ==SIGNAL_TYPE_EDP ) { -if (!link->skip_implict_edp_power_control) +if (!link->skip_implict_edp_power_control && hws) hws->funcs.edp_backlight_control (link, false); link->dc->hwss.set_abm_immediate_disable (pipe_ctx); }
drivers/gpu/drm/amd/display/dc/link/link_detection.c +3 -1
@@ -325,7 +325,7 @@ static void query_dp_dual_mode_adaptor(/* Assume we have no valid DP passive dongle connected */ *dongle =DISPLAY_DONGLE_NONE ; - sink_cap->max_hdmi_pixel_clock =DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK ; + sink_cap->max_hdmi_pixel_clock =DP_ADAPTOR_DVI_MAX_TMDS_CLK ;/* Read DP-HDMI dongle I2c (no response interpreted as DP-DVI dongle)*/ if (!i2c_read(
@@ -381,6 +381,8 @@ static void query_dp_dual_mode_adaptor( } } +if (is_valid_hdmi_signature) + sink_cap->max_hdmi_pixel_clock =DP_ADAPTOR_HDMI_SAFE_MAX_TMDS_CLK ;if (is_type2_dongle) { uint32_t max_tmds_clk =
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +12 -11
@@ -2257,8 +2257,6 @@ static int si_populate_smc_tdp_limits(struct amdgpu_device *adev,if (scaling_factor ==0 )return -EINVAL ; -memset (smc_table,0 ,sizeof (SISLANDS_SMC_STATETABLE )); - ret = si_calculate_adjusted_tdp_limits(adev, false, /* ??? */ adev->pm.dpm.tdp_adjustment,
@@ -2267,6 +2265,12 @@ static int si_populate_smc_tdp_limits(struct amdgpu_device *adev,if (ret)return ret; +if (adev->pdev->device ==0x6611 && adev->pdev->revision ==0x87 ) { +/* Workaround buggy powertune on Radeon 430 and 520. */ + tdp_limit =32 ; + near_tdp_limit =28 ; + } + smc_table->dpm2Params.TDPLimit =cpu_to_be32 (si_scale_power_for_smc (tdp_limit, scaling_factor) *1000 ); smc_table->dpm2Params.NearTDPLimit =
@@ -2312,16 +2316,8 @@ static int si_populate_smc_tdp_limits_2(struct amdgpu_device *adev,if (ni_pi->enable_power_containment) {SISLANDS_SMC_STATETABLE *smc_table = &si_pi->smc_statetable; -u32 scaling_factor =si_get_smc_power_scaling_factor (adev);int ret; -memset (smc_table,0 ,sizeof (SISLANDS_SMC_STATETABLE )); - - smc_table->dpm2Params.NearTDPLimit = -cpu_to_be32 (si_scale_power_for_smc (adev->pm.dpm.near_tdp_limit_adjusted, scaling_factor) *1000 ); - smc_table->dpm2Params.SafePowerLimit = -cpu_to_be32 (si_scale_power_for_smc ((adev->pm.dpm.near_tdp_limit_adjusted *SISLANDS_DPM2_TDP_SAFE_LIMIT_PERCENT ) /100 , scaling_factor) *1000 ); - ret = amdgpu_si_copy_bytes_to_smc(adev, (si_pi->state_table_start + offsetof(SISLANDS_SMC_STATETABLE, dpm2Params) +
@@ -3458,10 +3454,15 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, (adev->pdev->revision ==0x80 ) || (adev->pdev->revision ==0x81 ) || (adev->pdev->revision ==0x83 ) || - (adev->pdev->revision == 0x87) || + (adev->pdev->revision ==0x87 && + adev->pdev->device !=0x6611 ) || (adev->pdev->device ==0x6604 ) || (adev->pdev->device == 0x6605)) { max_sclk = 75000; + }else if (adev->pdev->revision ==0x87 && + adev->pdev->device ==0x6611 ) { +/* Radeon 430 and 520 */ + max_sclk =78000 ; } }
drivers/gpu/drm/nouveau/dispnv50/curs507a.c +1 -0
@@ -84,6 +84,7 @@ curs507a_prepare(struct nv50_wndw *wndw, struct nv50_head_atom *asyh, asyh->curs.handle = handle; asyh->curs.offset = offset; asyh->set.curs = asyh->curs.visible; +nv50_atom (asyh->state.state)->lock_core = true; } }
drivers/gpu/drm/panel/panel-simple.c +1 -0
@@ -1607,6 +1607,7 @@ static const struct panel_desc dataimage_scf0700c48ggu18 = { }, .bus_format = MEDIA_BUS_FMT_RGB888_1X24, .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE, + .connector_type = DRM_MODE_CONNECTOR_DPI, };static const struct display_timing dlc_dlc0700yzg_1_timing = {
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c +3 -1
@@ -923,8 +923,10 @@ int vmw_compat_shader_add(struct vmw_private *dev_priv,ttm_bo_unreserve (&buf->tbo); res =vmw_shader_alloc (dev_priv, buf, size,0 , shader_type); -if (unlikely (ret !=0 )) +if (IS_ERR (res)) { + ret =PTR_ERR (res); goto no_reserve; + } ret = vmw_cmdbuf_res_add(man, vmw_cmdbuf_res_shader, vmw_shader_key(user_key, shader_type),
drivers/hid/usbhid/hid-core.c +16 -1
@@ -983,6 +983,7 @@ static int usbhid_parse(struct hid_device *hid)struct usb_device *dev =interface_to_usbdev (intf);struct hid_descriptor *hdesc;struct hid_class_descriptor *hcdesc; +__u8 fixed_opt_descriptors_size;u32 quirks =0 ;unsigned int rsize =0 ;char *rdesc;
@@ -1013,7 +1014,21 @@ static int usbhid_parse(struct hid_device *hid) (hdesc->bNumDescriptors - 1) * sizeof(*hcdesc)) {dbg_hid ("hid descriptor invalid, bLen=%hhu bNum=%hhu\n" , hdesc->bLength, hdesc->bNumDescriptors); -return -EINVAL ; + +/* +* Some devices may expose a wrong number of descriptors compared +* to the provided length. +* However, we ignore the optional hid class descriptors entirely +* so we can safely recompute the proper field. +*/ +if (hdesc->bLength >=sizeof (*hdesc)) { + fixed_opt_descriptors_size = hdesc->bLength -sizeof (*hdesc); + +hid_warn (intf,"fixing wrong optional hid class descriptors count\n" ); + hdesc->bNumDescriptors = fixed_opt_descriptors_size /sizeof (*hcdesc) +1 ; + }else { +return -EINVAL ; + } } hid->version =le16_to_cpu (hdesc->bcdHID);
drivers/hv/hv.c +16 -20
@@ -270,7 +270,7 @@ void hv_synic_enable_regs(unsigned int cpu)union hv_synic_scontrol sctrl;/* Setup the Synic's message page */ - simp.as_uint64 =hv_get_register (HV_REGISTER_SIMP ); + simp.as_uint64 =hv_get_msr (HV_MSR_SIMP ); simp.simp_enabled =1 ;if (ms_hyperv.paravisor_present || hv_root_partition) {
@@ -286,10 +286,10 @@ void hv_synic_enable_regs(unsigned int cpu) >> HV_HYP_PAGE_SHIFT; } -hv_set_register (HV_REGISTER_SIMP , simp.as_uint64); +hv_set_msr (HV_MSR_SIMP , simp.as_uint64);/* Setup the Synic's event page */ - siefp.as_uint64 =hv_get_register (HV_REGISTER_SIEFP ); + siefp.as_uint64 =hv_get_msr (HV_MSR_SIEFP ); siefp.siefp_enabled =1 ;if (ms_hyperv.paravisor_present || hv_root_partition) {
@@ -305,13 +305,12 @@ void hv_synic_enable_regs(unsigned int cpu) >> HV_HYP_PAGE_SHIFT; } -hv_set_register (HV_REGISTER_SIEFP , siefp.as_uint64); +hv_set_msr (HV_MSR_SIEFP , siefp.as_uint64);/* Setup the shared SINT. */ if (vmbus_irq !=-1 )enable_percpu_irq (vmbus_irq,0 ); - shared_sint.as_uint64 =hv_get_register (HV_REGISTER_SINT0 + -VMBUS_MESSAGE_SINT ); + shared_sint.as_uint64 =hv_get_msr (HV_MSR_SINT0 +VMBUS_MESSAGE_SINT ); shared_sint.vector = vmbus_interrupt; shared_sint.masked = false;
@@ -326,14 +325,13 @@ void hv_synic_enable_regs(unsigned int cpu)#else shared_sint.auto_eoi =0 ;#endif -hv_set_register (HV_REGISTER_SINT0 +VMBUS_MESSAGE_SINT , - shared_sint.as_uint64); +hv_set_msr (HV_MSR_SINT0 +VMBUS_MESSAGE_SINT , shared_sint.as_uint64);/* Enable the global synic bit */ - sctrl.as_uint64 =hv_get_register (HV_REGISTER_SCONTROL ); + sctrl.as_uint64 =hv_get_msr (HV_MSR_SCONTROL ); sctrl.enable =1 ; -hv_set_register (HV_REGISTER_SCONTROL , sctrl.as_uint64); +hv_set_msr (HV_MSR_SCONTROL , sctrl.as_uint64); }int hv_synic_init (unsigned int cpu)
@@ -357,17 +355,15 @@ void hv_synic_disable_regs(unsigned int cpu)union hv_synic_siefp siefp;union hv_synic_scontrol sctrl; - shared_sint.as_uint64 =hv_get_register (HV_REGISTER_SINT0 + -VMBUS_MESSAGE_SINT ); + shared_sint.as_uint64 =hv_get_msr (HV_MSR_SINT0 +VMBUS_MESSAGE_SINT ); shared_sint.masked =1 ;/* Need to correctly cleanup in the case of SMP!!! */ /* Disable the interrupt */ -hv_set_register (HV_REGISTER_SINT0 +VMBUS_MESSAGE_SINT , - shared_sint.as_uint64); +hv_set_msr (HV_MSR_SINT0 +VMBUS_MESSAGE_SINT , shared_sint.as_uint64); - simp.as_uint64 =hv_get_register (HV_REGISTER_SIMP ); + simp.as_uint64 =hv_get_msr (HV_MSR_SIMP );/* * In Isolation VM, sim and sief pages are allocated by * paravisor. These pages also will be used by kdump
@@ -382,9 +378,9 @@ void hv_synic_disable_regs(unsigned int cpu) simp.base_simp_gpa =0 ; } -hv_set_register (HV_REGISTER_SIMP , simp.as_uint64); +hv_set_msr (HV_MSR_SIMP , simp.as_uint64); - siefp.as_uint64 =hv_get_register (HV_REGISTER_SIEFP ); + siefp.as_uint64 =hv_get_msr (HV_MSR_SIEFP ); siefp.siefp_enabled =0 ;if (ms_hyperv.paravisor_present || hv_root_partition) {
@@ -394,12 +390,12 @@ void hv_synic_disable_regs(unsigned int cpu) siefp.base_siefp_gpa =0 ; } -hv_set_register (HV_REGISTER_SIEFP , siefp.as_uint64); +hv_set_msr (HV_MSR_SIEFP , siefp.as_uint64);/* Disable the global synic bit */ - sctrl.as_uint64 =hv_get_register (HV_REGISTER_SCONTROL ); + sctrl.as_uint64 =hv_get_msr (HV_MSR_SCONTROL ); sctrl.enable =0 ; -hv_set_register (HV_REGISTER_SCONTROL , sctrl.as_uint64); +hv_set_msr (HV_MSR_SCONTROL , sctrl.as_uint64);if (vmbus_irq !=-1 )disable_percpu_irq (vmbus_irq);
drivers/hv/hv_common.c +17 -15
@@ -216,31 +216,33 @@ static void hv_kmsg_dump(struct kmsg_dumper *dumper,/* * Write dump contents to the page. No need to synchronize; panic should -* be single-threaded. +* be single-threaded. Ignore failures from kmsg_dump_get_buffer() since +* panic notification should be done even if there is no message data. +* Don't assume bytes_written is set in case of failure, so initialize it. */ kmsg_dump_rewind (&iter); -kmsg_dump_get_buffer (&iter, false, hv_panic_page,HV_HYP_PAGE_SIZE , + bytes_written =0 ; + (void )kmsg_dump_get_buffer (&iter, false, hv_panic_page,HV_HYP_PAGE_SIZE , &bytes_written); -if (!bytes_written) -return ; +/* * P3 to contain the physical address of the panic page & P4 to * contain the size of the panic data in that page. Rest of the * registers are no-op when the NOTIFY_MSG flag is set. */ -hv_set_register (HV_REGISTER_CRASH_P0 ,0 ); -hv_set_register (HV_REGISTER_CRASH_P1 ,0 ); -hv_set_register (HV_REGISTER_CRASH_P2 ,0 ); -hv_set_register (HV_REGISTER_CRASH_P3 ,virt_to_phys (hv_panic_page)); -hv_set_register (HV_REGISTER_CRASH_P4 , bytes_written); +hv_set_msr (HV_MSR_CRASH_P0 ,0 ); +hv_set_msr (HV_MSR_CRASH_P1 ,0 ); +hv_set_msr (HV_MSR_CRASH_P2 ,0 ); +hv_set_msr (HV_MSR_CRASH_P3 , bytes_written ?virt_to_phys (hv_panic_page) :0 ); +hv_set_msr (HV_MSR_CRASH_P4 , bytes_written);/* * Let Hyper-V know there is crash data available along with * the panic message. */ -hv_set_register (HV_REGISTER_CRASH_CTL , - (HV_CRASH_CTL_CRASH_NOTIFY | -HV_CRASH_CTL_CRASH_NOTIFY_MSG )); +hv_set_msr (HV_MSR_CRASH_CTL , + (HV_CRASH_CTL_CRASH_NOTIFY | +HV_CRASH_CTL_CRASH_NOTIFY_MSG )); }static struct kmsg_dumper hv_kmsg_dumper = {
@@ -311,7 +313,7 @@ int __init hv_common_init(void)* Register for panic kmsg callback only if the right * capability is supported by the hypervisor. */ - hyperv_crash_ctl =hv_get_register (HV_REGISTER_CRASH_CTL ); + hyperv_crash_ctl =hv_get_msr (HV_MSR_CRASH_CTL );if (hyperv_crash_ctl &HV_CRASH_CTL_CRASH_NOTIFY_MSG )hv_kmsg_dump_register ();
@@ -410,7 +412,7 @@ int hv_common_cpu_init(unsigned int cpu) *inputarg = mem; } - msr_vp_index =hv_get_register (HV_REGISTER_VP_INDEX ); + msr_vp_index =hv_get_msr (HV_MSR_VP_INDEX ); hv_vp_index[cpu] = msr_vp_index;
@@ -507,7 +509,7 @@ EXPORT_SYMBOL_GPL(hv_is_hibernation_supported);*/ static u64 __hv_read_ref_counter (void ) { -return hv_get_register (HV_REGISTER_TIME_REF_COUNT ); +return hv_get_msr (HV_MSR_TIME_REF_COUNT ); }u64 (*hv_read_reference_counter)(void) = __hv_read_ref_counter;
drivers/hwtracing/intel_th/core.c +16 -3
@@ -810,9 +810,12 @@ static int intel_th_output_open(struct inode *inode, struct file *file)int err; dev =bus_find_device_by_devt (&intel_th_bus, inode->i_rdev); -if (!dev || !dev->driver) { +if (!dev) +return -ENODEV ; + +if (!dev->driver) { err = -ENODEV ; - goto out_no_device; + goto out_put_device; } thdrv =to_intel_th_driver (dev->driver);
@@ -836,12 +839,22 @@ static int intel_th_output_open(struct inode *inode, struct file *file) out_put_device:put_device (dev); -out_no_device: +return err; } +static int intel_th_output_release (struct inode *inode,struct file *file) +{ +struct intel_th_device *thdev = file->private_data; + +put_device (&thdev->dev); + +return 0 ; +} +static const struct file_operations intel_th_output_fops = { .open = intel_th_output_open, + .release = intel_th_output_release, .llseek = noop_llseek, };
drivers/i2c/busses/i2c-qcom-geni.c +7 -4
@@ -97,6 +97,7 @@ struct geni_i2c_dev {dma_addr_t dma_addr;struct dma_chan *tx_c;struct dma_chan *rx_c; +bool no_dma;bool gpi_mode;bool abort_done; };
@@ -411,7 +412,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,size_t len = msg->len;struct i2c_msg *cur; - dma_buf =i2c_get_dma_safe_msg_buf (msg,32 ); + dma_buf = gi2c->no_dma ?NULL :i2c_get_dma_safe_msg_buf (msg,32 );if (dma_buf)geni_se_select_mode (se,GENI_SE_DMA );else
@@ -450,7 +451,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,size_t len = msg->len;struct i2c_msg *cur; - dma_buf =i2c_get_dma_safe_msg_buf (msg,32 ); + dma_buf = gi2c->no_dma ?NULL :i2c_get_dma_safe_msg_buf (msg,32 );if (dma_buf)geni_se_select_mode (se,GENI_SE_DMA );else
@@ -866,10 +867,12 @@ static int geni_i2c_probe(struct platform_device *pdev)return -ENXIO ; } -if (desc && desc->no_dma_support) +if (desc && desc->no_dma_support) { fifo_disable = false; -else + gi2c->no_dma = true; + }else { fifo_disable =readl_relaxed (gi2c->se.base +GENI_IF_DISABLE_RO ) &FIFO_IF_DISABLE ; + }if (fifo_disable) {/* FIFO is disabled, so we can only use GPI DMA */
drivers/iio/accel/st_accel_core.c +71 -1
84 lines not on this page · raw message
drivers/iio/adc/ad7280a.c +3 -1
@@ -1028,7 +1028,9 @@ static int ad7280_probe(struct spi_device *spi) st->spi->max_speed_hz =AD7280A_MAX_SPI_CLK_HZ ; st->spi->mode =SPI_MODE_1 ; -spi_setup (st->spi); + ret =spi_setup (st->spi); +if (ret <0 ) +return ret; st->ctrl_lb =FIELD_PREP (AD7280A_CTRL_LB_ACQ_TIME_MSK , st->acquisition_time) |FIELD_PREP (AD7280A_CTRL_LB_THERMISTOR_MSK , st->thermistor_term_en);
drivers/iio/adc/ad9467.c +1 -1
@@ -90,7 +90,7 @@#define CHIPID_AD9434 0x6A#define AD9434_DEF_OUTPUT_MODE 0x00 -#define AD9434_REG_VREF_MASK 0xC0 +#define AD9434_REG_VREF_MASK GENMASK(4, 0)/* * Analog Devices AD9467 16-Bit, 200/250 MSPS ADC
drivers/iio/adc/at91-sama5d2_adc.c +1 -0
@@ -2504,6 +2504,7 @@ static int at91_adc_remove(struct platform_device *pdev)struct at91_adc_state *st =iio_priv (indio_dev);iio_device_unregister (indio_dev); +cancel_work_sync (&st->touch_st.workq);at91_adc_dma_disable (st);
drivers/iio/adc/exynos_adc.c +2 -11
@@ -721,14 +721,7 @@ static const struct iio_chan_spec exynos_adc_iio_channels[] = { ADC_CHANNEL(9, "adc9"), }; -static int exynos_adc_remove_devices (struct device *dev,void *c) -{ -struct platform_device *pdev =to_platform_device (dev); - -platform_device_unregister (pdev); -return 0 ; -}static int exynos_adc_ts_open (struct input_dev *dev) {
@@ -929,8 +922,7 @@ static int exynos_adc_probe(struct platform_device *pdev)return 0 ; err_of_populate: -device_for_each_child (&indio_dev->dev,NULL , - exynos_adc_remove_devices); +of_platform_depopulate (&indio_dev->dev);if (has_ts) {input_unregister_device (info->input);free_irq (info->tsirq, info);
@@ -959,8 +951,7 @@ static int exynos_adc_remove(struct platform_device *pdev)free_irq (info->tsirq, info);input_unregister_device (info->input); } -device_for_each_child (&indio_dev->dev,NULL , - exynos_adc_remove_devices); +of_platform_depopulate (&indio_dev->dev);iio_device_unregister (indio_dev);free_irq (info->irq, info);if (info->data->exit_hw)
drivers/iio/chemical/scd4x.c +3 -3
@@ -585,7 +585,7 @@ static const struct iio_chan_spec scd4x_channels[] = { .sign = 'u', .realbits = 16, .storagebits = 16, - .endianness = IIO_BE, + .endianness = IIO_CPU, }, }, {
@@ -600,7 +600,7 @@ static const struct iio_chan_spec scd4x_channels[] = { .sign = 'u', .realbits = 16, .storagebits = 16, - .endianness = IIO_BE, + .endianness = IIO_CPU, }, }, {
@@ -613,7 +613,7 @@ static const struct iio_chan_spec scd4x_channels[] = { .sign = 'u', .realbits = 16, .storagebits = 16, - .endianness = IIO_BE, + .endianness = IIO_CPU, }, }, };
drivers/iio/dac/ad5686.c +6 -0
@@ -434,6 +434,12 @@ static const struct ad5686_chip_info ad5686_chip_info_tbl[] = { .num_channels = 4, .regmap_type = AD5686_REGMAP, }, + [ID_AD5695R] = { + .channels = ad5685r_channels, + .int_vref_mv = 2500, + .num_channels = 4, + .regmap_type = AD5686_REGMAP, + }, [ID_AD5696] = { .channels = ad5686_channels, .num_channels = 4,
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +11 -4
@@ -84,6 +84,13 @@ static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(3), }; +static const struct iio_chan_spec st_lsm6ds0_acc_channels[] = { +ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x28 ,IIO_MOD_X ,0 ), +ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2a ,IIO_MOD_Y ,1 ), +ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2c ,IIO_MOD_Z ,2 ), +IIO_CHAN_SOFT_TIMESTAMP (3 ), +}; +static const struct iio_chan_spec st_lsm6dsx_gyro_channels[] = {ST_LSM6DSX_CHANNEL (IIO_ANGL_VEL ,0x22 ,IIO_MOD_X ,0 ),ST_LSM6DSX_CHANNEL (IIO_ANGL_VEL ,0x24 ,IIO_MOD_Y ,1 ),
@@ -125,8 +132,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { }, .channels = { [ST_LSM6DSX_ID_ACC] = { - .chan = st_lsm6dsx_acc_channels, - .len = ARRAY_SIZE(st_lsm6dsx_acc_channels), + .chan = st_lsm6ds0_acc_channels, + .len = ARRAY_SIZE(st_lsm6ds0_acc_channels), }, [ST_LSM6DSX_ID_GYRO] = { .chan = st_lsm6ds0_gyro_channels,
@@ -1428,8 +1435,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { }, .channels = { [ST_LSM6DSX_ID_ACC] = { - .chan = st_lsm6dsx_acc_channels, - .len = ARRAY_SIZE(st_lsm6dsx_acc_channels), + .chan = st_lsm6ds0_acc_channels, + .len = ARRAY_SIZE(st_lsm6ds0_acc_channels), }, [ST_LSM6DSX_ID_GYRO] = { .chan = st_lsm6dsx_gyro_channels,
drivers/iio/industrialio-core.c +9 -3
@@ -1618,6 +1618,10 @@ static void iio_dev_release(struct device *device)iio_device_detach_buffers (indio_dev); +mutex_destroy (&iio_dev_opaque->info_exist_lock); +mutex_destroy (&iio_dev_opaque->mlock); + +lockdep_unregister_key (&iio_dev_opaque->info_exist_key);lockdep_unregister_key (&iio_dev_opaque->mlock_key);ida_free (&iio_ida, iio_dev_opaque->id);
@@ -1663,8 +1667,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) indio_dev->dev.type = &iio_device_type; indio_dev->dev.bus = &iio_bus_type;device_initialize (&indio_dev->dev); -mutex_init (&iio_dev_opaque->mlock); -mutex_init (&iio_dev_opaque->info_exist_lock); +INIT_LIST_HEAD (&iio_dev_opaque->channel_attr_list); iio_dev_opaque->id =ida_alloc (&iio_ida,GFP_KERNEL );
@@ -1685,7 +1688,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)INIT_LIST_HEAD (&iio_dev_opaque->ioctl_handlers);lockdep_register_key (&iio_dev_opaque->mlock_key); -lockdep_set_class (&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key); +lockdep_register_key (&iio_dev_opaque->info_exist_key); + +mutex_init (&iio_dev_opaque->mlock); +mutex_init (&iio_dev_opaque->info_exist_lock);return indio_dev; }
drivers/input/serio/i8042-acpipnpio.h +18 -0
@@ -115,6 +115,17 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { }, .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER) }, + { +/* +* ASUS Zenbook UX425QA_UM425QA +* Some Zenbooks report "Zenbook" with a lowercase b. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Zenbook UX425QA_UM425QA"), + }, + .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER |SERIO_QUIRK_RESET_NEVER ) + }, {/* ASUS ZenBook UX425UA/QA */ .matches = {
@@ -1176,6 +1187,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, + { + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "WUJIE Series-X5SP4NAG"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) + }, /* * A lot of modern Clevo barebones have touchpad and/or keyboard issues * after suspend fixable with the forcenorestore quirk.
drivers/interconnect/debugfs-client.c +5 -0
@@ -150,6 +150,11 @@ int icc_debugfs_client_init(struct dentry *icc_dir)return ret; } + src_node =devm_kstrdup (&pdev->dev,"" ,GFP_KERNEL ); + dst_node =devm_kstrdup (&pdev->dev,"" ,GFP_KERNEL ); +if (!src_node || !dst_node) +return -ENOMEM ; + client_dir =debugfs_create_dir ("test_client" , icc_dir);debugfs_create_str ("src_node" ,0600 , client_dir, &src_node);
drivers/irqchip/irq-gic-v3-its.c +4 -4
@@ -616,7 +616,7 @@ static struct its_collection *its_build_mapd_cmd(struct its_node *its,struct its_cmd_block *cmd, struct its_cmd_desc *desc) { - unsigned long itt_addr; + phys_addr_t itt_addr;u8 size =ilog2 (desc->its_mapd_cmd.dev->nr_ites); itt_addr =virt_to_phys (desc->its_mapd_cmd.dev->itt);
@@ -787,7 +787,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its, struct its_cmd_desc *desc) {struct its_vpe *vpe =valid_vpe (its, desc->its_vmapp_cmd.vpe); -unsigned long vpt_addr, vconf_addr; +phys_addr_t vpt_addr, vconf_addr;u64 target;bool alloc;
@@ -2404,10 +2404,10 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, baser->psz = psz; tmp = indirect ?GITS_LVL1_ENTRY_SIZE : esz; -pr_info ("ITS@%pa: allocated %d %s @%lx (%s, esz %d, psz %dK, shr %d)\n" , +pr_info ("ITS@%pa: allocated %d %s @%llx (%s, esz %d, psz %dK, shr %d)\n" , &its->phys_base, (int )(PAGE_ORDER_TO_SIZE (order) / (int )tmp), its_base_type_string[type], - (unsigned long )virt_to_phys (base), + (u64 )virt_to_phys (base), indirect ?"indirect" :"flat" , (int )esz, psz /SZ_1K , (int )shr >>GITS_BASER_SHAREABILITY_SHIFT );
drivers/isdn/mISDN/timerdev.c +8 -5
@@ -109,14 +109,14 @@ mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off)spin_unlock_irq (&dev->lock);if (filep->f_flags &O_NONBLOCK )return -EAGAIN ; -wait_event_interruptible (dev->wait, (dev->work || +wait_event_interruptible (dev->wait, (READ_ONCE (dev->work) || !list_empty (list)));if (signal_pending (current))return -ERESTARTSYS ;spin_lock_irq (&dev->lock); }if (dev->work) - dev->work =0 ; +WRITE_ONCE (dev->work,0 );if (!list_empty (list)) { timer = list_first_entry(list, struct mISDNtimer, list);list_del (&timer->list);
@@ -141,13 +141,16 @@ mISDN_poll(struct file *filep, poll_table *wait)if (*debug &DEBUG_TIMER )printk (KERN_DEBUG "%s(%p, %p)\n" , __func__, filep, wait);if (dev) { +u32 work; +poll_wait (filep, &dev->wait, wait); mask =0 ; -if (dev->work || !list_empty (&dev->expired)) + work =READ_ONCE (dev->work); +if (work || !list_empty (&dev->expired)) mask |= (EPOLLIN |EPOLLRDNORM );if (*debug &DEBUG_TIMER )printk (KERN_DEBUG "%s work(%d) empty(%d)\n" , __func__, - dev->work,list_empty (&dev->expired)); + work,list_empty (&dev->expired)); }return mask; }
@@ -172,7 +175,7 @@ misdn_add_timer(struct mISDNtimerdev *dev, int timeout)struct mISDNtimer *timer;if (!timeout) { - dev->work =1 ; +WRITE_ONCE (dev->work,1 );wake_up_interruptible (&dev->wait); id =0 ; }else {
drivers/leds/led-class.c +5 -5
@@ -546,11 +546,6 @@ int led_classdev_register_ext(struct device *parent,#ifdef CONFIG_LEDS_BRIGHTNESS_HW_CHANGED led_cdev->brightness_hw_changed =-1 ;#endif -/* add to the list of leds */ -down_write (&leds_list_lock); -list_add_tail (&led_cdev->node, &leds_list); -up_write (&leds_list_lock); -if (!led_cdev->max_brightness) led_cdev->max_brightness =LED_FULL ;
@@ -558,6 +553,11 @@ int led_classdev_register_ext(struct device *parent,led_init_core (led_cdev); +/* add to the list of leds */ +down_write (&leds_list_lock); +list_add_tail (&led_cdev->node, &leds_list); +up_write (&leds_list_lock); +#ifdef CONFIG_LEDS_TRIGGERS led_trigger_set_default (led_cdev);#endif
drivers/misc/uacce/uacce.c +40 -8
100 lines not on this page · raw message
drivers/mmc/host/rtsx_pci_sdmmc.c +41 -0
53 lines not on this page · raw message
drivers/mmc/host/sdhci-of-dwcmshc.c +7 -0
@@ -244,6 +244,13 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clocksdhci_writel (host, extra, reg);if (clock <=52000000 ) { +if (host->mmc->ios.timing ==MMC_TIMING_MMC_HS200 || + host->mmc->ios.timing ==MMC_TIMING_MMC_HS400 ) { +dev_err (mmc_dev (host->mmc), +"Can't reduce the clock below 52MHz in HS200/HS400 mode" ); +return ; + } +/* * Disable DLL and reset both of sample and drive clock. * The bypass bit and start bit need to be set if DLL is not locked.
drivers/net/bonding/bond_main.c +9 -2
@@ -1942,6 +1942,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,*/ if (!bond_has_slaves (bond)) {if (bond_dev->type != slave_dev->type) { +if (slave_dev->type !=ARPHRD_ETHER && +BOND_MODE (bond) ==BOND_MODE_8023AD ) { +SLAVE_NL_ERR (bond_dev, slave_dev, extack, +"8023AD mode requires Ethernet devices" ); +return -EINVAL ; + }slave_dbg (bond_dev, slave_dev,"change device type from %d to %d\n" , bond_dev->type, slave_dev->type);
@@ -4180,8 +4186,9 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb, const vcase BOND_XMIT_POLICY_ENCAP23 :case BOND_XMIT_POLICY_ENCAP34 :memset (fk,0 ,sizeof (*fk)); -return __skb_flow_dissect (NULL , skb, &flow_keys_bonding, - fk, data, l2_proto, nhoff, hlen,0 ); +return __skb_flow_dissect (dev_net (bond->dev), skb, + &flow_keys_bonding, fk, data, + l2_proto, nhoff, hlen,0 );default :break ; }
drivers/net/can/ctucanfd/ctucanfd_base.c +1 -1
@@ -310,7 +310,7 @@ static int ctucan_set_secondary_sample_point(struct net_device *ndev) } ssp_cfg =FIELD_PREP (REG_TRV_DELAY_SSP_OFFSET , ssp_offset); - ssp_cfg |=FIELD_PREP (REG_TRV_DELAY_SSP_SRC ,0x1 ); + ssp_cfg |=FIELD_PREP (REG_TRV_DELAY_SSP_SRC ,0x0 ); }ctucan_write32 (priv,CTUCANFD_TRV_DELAY , ssp_cfg);
drivers/net/can/usb/ems_usb.c +7 -1
@@ -486,11 +486,17 @@ static void ems_usb_read_bulk_callback(struct urb *urb) urb->transfer_buffer,RX_BUFFER_SIZE , ems_usb_read_bulk_callback, dev); +usb_anchor_urb (urb, &dev->rx_submitted); + retval =usb_submit_urb (urb,GFP_ATOMIC ); +if (!retval) +return ; + +usb_unanchor_urb (urb);if (retval == -ENODEV )netif_device_detach (netdev); -else if (retval) +else netdev_err (netdev,"failed resubmitting read bulk urb: %d\n" , retval); }
drivers/net/can/usb/esd_usb.c +8 -1
@@ -539,13 +539,20 @@ static void esd_usb_read_bulk_callback(struct urb *urb) urb->transfer_buffer,ESD_USB_RX_BUFFER_SIZE , esd_usb_read_bulk_callback, dev); +usb_anchor_urb (urb, &dev->rx_submitted); + retval =usb_submit_urb (urb,GFP_ATOMIC ); +if (!retval) +return ; + +usb_unanchor_urb (urb); +if (retval == -ENODEV ) {for (i =0 ; i < dev->net_count; i++) {if (dev->nets[i])netif_device_detach (dev->nets[i]->netdev); } - }else if (retval) { + }else {dev_err (dev->udev->dev.parent,"failed resubmitting read bulk urb: %d\n" , retval); }
drivers/net/can/usb/etas_es58x/es58x_core.c +1 -1
@@ -1736,7 +1736,7 @@ static int es58x_alloc_rx_urbs(struct es58x_device *es58x_dev)dev_dbg (dev,"%s: Allocated %d rx URBs each of size %u\n" , __func__, i, rx_buf_len); -return ret; +return 0 ; }/**
drivers/net/can/usb/gs_usb.c +9 -0
@@ -748,7 +748,13 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) hf, parent->hf_size_rx, gs_usb_receive_bulk_callback, parent); +usb_anchor_urb (urb, &parent->rx_submitted); + rc =usb_submit_urb (urb,GFP_ATOMIC ); +if (!rc) +return ; + +usb_unanchor_urb (urb);/* USB failure take down all interfaces */ if (rc == -ENODEV ) {
@@ -757,6 +763,9 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)if (parent->canch[rc])netif_device_detach (parent->canch[rc]->netdev); } + }else if (rc != -ESHUTDOWN &&net_ratelimit ()) { +netdev_info (netdev,"failed to re-submit IN URB: %pe\n" , +ERR_PTR (urb->status)); } }
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +8 -1
@@ -349,7 +349,14 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb) urb->transfer_buffer,KVASER_USB_RX_BUFFER_SIZE , kvaser_usb_read_bulk_callback, dev); +usb_anchor_urb (urb, &dev->rx_submitted); + err =usb_submit_urb (urb,GFP_ATOMIC ); +if (!err) +return ; + +usb_unanchor_urb (urb); +if (err == -ENODEV ) {for (i =0 ; i < dev->nchannels; i++) {if (!dev->nets[i])
@@ -357,7 +364,7 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)netif_device_detach (dev->nets[i]->netdev); } - }else if (err) { + }else {dev_err (&dev->intf->dev,"Failed resubmitting read bulk urb: %d\n" , err); }
drivers/net/can/usb/mcba_usb.c +7 -1
@@ -608,11 +608,17 @@ static void mcba_usb_read_bulk_callback(struct urb *urb) urb->transfer_buffer,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv); +usb_anchor_urb (urb, &priv->rx_submitted); + retval =usb_submit_urb (urb,GFP_ATOMIC ); +if (!retval) +return ; + +usb_unanchor_urb (urb);if (retval == -ENODEV )netif_device_detach (netdev); -else if (retval) +else netdev_err (netdev,"failed resubmitting read bulk urb: %d\n" , retval); }
drivers/net/can/usb/usb_8dev.c +7 -1
@@ -541,11 +541,17 @@ static void usb_8dev_read_bulk_callback(struct urb *urb) urb->transfer_buffer,RX_BUFFER_SIZE , usb_8dev_read_bulk_callback, priv); +usb_anchor_urb (urb, &priv->rx_submitted); + retval =usb_submit_urb (urb,GFP_ATOMIC ); +if (!retval) +return ; + +usb_unanchor_urb (urb);if (retval == -ENODEV )netif_device_detach (netdev); -else if (retval) +else netdev_err (netdev,"failed resubmitting read bulk urb: %d\n" , retval); }
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -4
@@ -2105,7 +2105,7 @@ static void xgbe_get_stats64(struct net_device *netdev, s->multicast = pstats->rxmulticastframes_g; s->rx_length_errors = pstats->rxlengtherror; s->rx_crc_errors = pstats->rxcrcerror; - s->rx_fifo_errors = pstats->rxfifooverflow; + s->rx_over_errors = pstats->rxfifooverflow; s->tx_packets = pstats->txframecount_gb; s->tx_bytes = pstats->txoctetcount_gb;
@@ -2559,9 +2559,6 @@ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget) goto read_again;if (error || packet->errors) { -if (packet->errors) -netif_err (pdata, rx_err, netdev, -"error in received packet\n" );dev_kfree_skb (skb); goto next_packet; }
drivers/net/ethernet/emulex/benet/be_cmds.c +2 -1
@@ -3797,6 +3797,7 @@ int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac) {int status;bool pmac_valid = false; +u32 pmac_id;eth_zero_addr (mac);
@@ -3809,7 +3810,7 @@ int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac) adapter->if_handle, 0); }else { status =be_cmd_get_mac_from_list (adapter, mac, &pmac_valid, -NULL , adapter->if_handle,0 ); + &pmac_id, adapter->if_handle,0 ); }return status;
drivers/net/ethernet/emulex/benet/be_main.c +5 -3
@@ -2141,7 +2141,7 @@ static int be_get_new_eqd(struct be_eq_obj *eqo)struct be_aic_obj *aic;struct be_rx_obj *rxo;struct be_tx_obj *txo; -u64 rx_pkts =0 , tx_pkts =0 ; +u64 rx_pkts =0 , tx_pkts =0 , pkts;ulong now;u32 pps, delta;int i;
@@ -2157,15 +2157,17 @@ static int be_get_new_eqd(struct be_eq_obj *eqo) for_all_rx_queues_on_eq(adapter, eqo, rxo, i) {do { start =u64_stats_fetch_begin (&rxo->stats.sync); - rx_pkts += rxo->stats.rx_pkts; + pkts = rxo->stats.rx_pkts; }while (u64_stats_fetch_retry (&rxo->stats.sync, start)); + rx_pkts += pkts; } for_all_tx_queues_on_eq(adapter, eqo, txo, i) {do { start =u64_stats_fetch_begin (&txo->stats.sync); - tx_pkts += txo->stats.tx_reqs; + pkts = txo->stats.tx_reqs; }while (u64_stats_fetch_retry (&txo->stats.sync, start)); + tx_pkts += pkts; }/* Skip, if wrapped around or first calculation */
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +36 -33
80 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +1 -1
@@ -731,7 +731,7 @@ struct hclge_fd_tcam_config_3_cmd {#define HCLGE_FD_AD_QID_M GENMASK(11, 2)#define HCLGE_FD_AD_USE_COUNTER_B 12#define HCLGE_FD_AD_COUNTER_NUM_S 13 -#define HCLGE_FD_AD_COUNTER_NUM_M GENMASK(20, 13) +#define HCLGE_FD_AD_COUNTER_NUM_M GENMASK(19, 13)#define HCLGE_FD_AD_NXT_STEP_B 20#define HCLGE_FD_AD_NXT_KEY_S 21#define HCLGE_FD_AD_NXT_KEY_M GENMASK(25, 21)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -5617,7 +5617,7 @@ static int hclge_fd_ad_config(struct hclge_dev *hdev, u8 stage, int loc, HCLGE_FD_AD_COUNTER_NUM_S, action->counter_id);hnae3_set_bit (ad_data,HCLGE_FD_AD_NXT_STEP_B , action->use_next_stage);hnae3_set_field (ad_data,HCLGE_FD_AD_NXT_KEY_M ,HCLGE_FD_AD_NXT_KEY_S , - action->counter_id); + action->next_input_key); req->ad_data =cpu_to_le64 (ad_data); ret =hclge_cmd_send (&hdev->hw, &desc,1 );
drivers/net/ethernet/intel/ice/ice_lib.c +21 -8
@@ -396,6 +396,8 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)if (!ring_stats) goto err_out; +u64_stats_init (&ring_stats->syncp); +WRITE_ONCE (tx_ring_stats[i], ring_stats); }
@@ -415,6 +417,8 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)if (!ring_stats) goto err_out; +u64_stats_init (&ring_stats->syncp); +WRITE_ONCE (rx_ring_stats[i], ring_stats); }
@@ -3893,22 +3897,31 @@ int ice_vsi_add_vlan_zero(struct ice_vsi *vsi)int ice_vsi_del_vlan_zero (struct ice_vsi *vsi) {struct ice_vsi_vlan_ops *vlan_ops =ice_get_compat_vsi_vlan_ops (vsi); +struct ice_pf *pf = vsi->back;struct ice_vlan vlan;int err; - vlan =ICE_VLAN (0 ,0 ,0 );
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/igc/igc_ptp.c +25 -18
43 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +64 -22
86 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +1 -6
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/net/ipvlan/ipvlan_main.c +29 -20
49 lines not on this page · raw message
drivers/net/phy/phy_device.c +43 -15
58 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/dp_rx.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rsi/rsi_91x_mac80211.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/nvme/host/pci.c +41 -0
41 lines not on this page · raw message
drivers/phy/broadcom/phy-bcm-ns2-pcie.c +0 -2
Lines of this file are not shown. View the raw message.
drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c +0 -1
Lines of this file are not shown. View the raw message.
drivers/phy/freescale/phy-fsl-imx8m-pcie.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/phy/freescale/phy-fsl-imx8mq-usb.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c +0 -2
Lines of this file are not shown. View the raw message.
drivers/phy/qualcomm/phy-qcom-snps-eusb2.c +127 -129
256 lines not on this page · raw message
drivers/phy/rockchip/phy-rockchip-inno-usb2.c +19 -22
41 lines not on this page · raw message
drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +8 -0
Lines of this file are not shown. View the raw message.
drivers/platform/x86/hp/hp-bioscfg/bioscfg.h +7 -5
Lines of this file are not shown. View the raw message.
drivers/spi/spi-sprd-adi.c +18 -45
63 lines not on this page · raw message
drivers/w1/slaves/w1_therm.c +20 -42
62 lines not on this page · raw message
fs/btrfs/block-group.c +38 -22
60 lines not on this page · raw message
fs/btrfs/space-info.c +62 -14
76 lines not on this page · raw message
fs/nfs/flexfilelayout/flexfilelayoutdev.c +1 -1
Lines of this file are not shown. View the raw message.
include/dt-bindings/power/qcom,rpmhpd.h +235 -0
235 lines not on this page · raw message
include/dt-bindings/power/qcom-rpmpd.h +22 -224
246 lines not on this page · raw message
kernel/time/posix-clock.c +37 -16
53 lines not on this page · raw message
mm/page_alloc.c +42 -5
47 lines not on this page · raw message
net/vmw_vsock/virtio_transport_common.c +21 -9
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/perf_link.c +13 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/net/fib-onlink-tests.sh +31 -45
76 lines not on this page · raw message
tools/testing/selftests/ptp/testptp.c +96 -18
114 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.