Skip to contentSkip to conversation

Linux 5.6.5

DISCUSSION Greg KH 1 participant 2 messages Apr 17, 2020 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 5.6.5 kernel.

All users of the 5.6 kernel series must upgrade.

The updated 5.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.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/admin-guide/sysctl/user.rst                 |    6 
 Documentation/sound/hd-audio/index.rst                    |    1 
 Documentation/sound/hd-audio/models.rst                   |    2 
 Documentation/sound/hd-audio/realtek-pc-beep.rst          |  129 +++++++
 Makefile                                                  |    2 
 arch/arm/boot/dts/exynos4210-universal_c210.dts           |    4 
 arch/arm64/Makefile                                       |    4 
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi              |    3 
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi              |    3 
 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts        |    4 
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi                  |    2 
 arch/arm64/kernel/armv8_deprecated.c                      |    2 
 arch/arm64/mm/ptdump_debugfs.c                            |    4 
 arch/mips/cavium-octeon/octeon-irq.c                      |    3 
 arch/mips/mm/tlbex.c                                      |    5 
 arch/powerpc/include/asm/book3s/64/hash-4k.h              |    6 
 arch/powerpc/include/asm/book3s/64/hash-64k.h             |    8 
 arch/powerpc/include/asm/book3s/64/pgtable.h              |    4 
 arch/powerpc/include/asm/book3s/64/radix.h                |    5 
 arch/powerpc/include/asm/drmem.h                          |    4 
 arch/powerpc/include/asm/setjmp.h                         |    6 
 arch/powerpc/kernel/dt_cpu_ftrs.c                         |    1 
 arch/powerpc/kernel/kprobes.c                             |    3 
 arch/powerpc/kernel/paca.c                                |   14 
 arch/powerpc/kernel/setup.h                               |    6 
 arch/powerpc/kernel/setup_64.c                            |   32 +
 arch/powerpc/kernel/signal_64.c                           |    4 
 arch/powerpc/kexec/Makefile                               |    3 
 arch/powerpc/kvm/book3s_hv_uvmem.c                        |    3 
 arch/powerpc/mm/kasan/kasan_init_32.c                     |    2 
 arch/powerpc/mm/nohash/tlb_low.S                          |   12 
 arch/powerpc/platforms/pseries/hotplug-memory.c           |    8 
 arch/powerpc/sysdev/xive/common.c                         |   16 
 arch/powerpc/sysdev/xive/native.c                         |    4 
 arch/powerpc/sysdev/xive/spapr.c                          |    4 
 arch/powerpc/sysdev/xive/xive-internal.h                  |    7 
 arch/powerpc/xmon/Makefile                                |    3 
 arch/s390/kernel/diag.c                                   |    2 
 arch/s390/kvm/vsie.c                                      |    1 
 arch/s390/mm/gmap.c                                       |    6 
 arch/x86/boot/compressed/head_32.S                        |    2 
 arch/x86/boot/compressed/head_64.S                        |    4 
 arch/x86/entry/entry_32.S                                 |    1 
 arch/x86/include/asm/kvm_host.h                           |    2 
 arch/x86/include/asm/pgtable.h                            |    7 
 arch/x86/include/asm/pgtable_types.h                      |    2 
 arch/x86/kernel/acpi/boot.c                               |    2 
 arch/x86/kernel/tsc_msr.c                                 |  128 ++++++-
 arch/x86/kvm/svm.c                                        |    4 
 arch/x86/kvm/vmx/nested.c                                 |   18 -
 arch/x86/kvm/vmx/ops.h                                    |   28 +
 arch/x86/kvm/vmx/vmenter.S                                |   58 +++
 arch/x86/kvm/vmx/vmx.c                                    |   92 ++---
 arch/x86/kvm/x86.c                                        |   21 -
 arch/x86/platform/efi/efi.c                               |    2 
 arch/x86/platform/efi/efi_64.c                            |    4 
 block/bfq-cgroup.c                                        |   14 
 block/bfq-iosched.c                                       |   16 
 block/blk-ioc.c                                           |    7 
 block/blk-mq.c                                            |    1 
 block/blk-settings.c                                      |    3 
 block/blk-zoned.c                                         |    2 
 crypto/rng.c                                              |    8 
 drivers/acpi/acpica/achware.h                             |    2 
 drivers/acpi/acpica/evxfgpe.c                             |   17 -
 drivers/acpi/acpica/hwgpe.c                               |   47 ++
 drivers/acpi/ec.c                                         |   26 +
 drivers/acpi/internal.h                                   |    1 
 drivers/acpi/sleep.c                                      |   19 -
 drivers/ata/libata-pmp.c                                  |    1 
 drivers/ata/libata-scsi.c                                 |    9 
 drivers/base/firmware_loader/fallback.c                   |    2 
 drivers/base/power/domain.c                               |    2 
 drivers/base/power/wakeup.c                               |    4 
 drivers/block/null_blk_main.c                             |   12 
 drivers/block/xen-blkfront.c                              |   17 -
 drivers/char/ipmi/ipmi_msghandler.c                       |    4 
 drivers/char/tpm/eventlog/common.c                        |   12 
 drivers/char/tpm/eventlog/tpm1.c                          |    2 
 drivers/char/tpm/eventlog/tpm2.c                          |    2 
 drivers/char/tpm/tpm-chip.c                               |    4 
 drivers/char/tpm/tpm.h                                    |    2 
 drivers/clk/ingenic/jz4770-cgu.c                          |    4 
 drivers/clk/ingenic/tcu.c                                 |    2 
 drivers/clocksource/timer-microchip-pit64b.c              |    1 
 drivers/cpufreq/imx6q-cpufreq.c                           |   12 
 drivers/cpufreq/powernv-cpufreq.c                         |    6 
 drivers/crypto/caam/caamalg_desc.c                        |   30 +
 drivers/crypto/ccree/cc_buffer_mgr.c                      |   76 ++--
 drivers/crypto/ccree/cc_buffer_mgr.h                      |    1 
 drivers/crypto/mxs-dcp.c                                  |   58 +--
 drivers/edac/edac_mc.c                                    |   21 -
 drivers/firmware/arm_sdei.c                               |   32 -
 drivers/firmware/efi/efi.c                                |    2 
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c                |    5 
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c                     |    2 
 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c |    2 
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c                |   18 +
 drivers/gpu/drm/amd/powerplay/renoir_ppt.h                |    2 
 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c        |    5 
 drivers/gpu/drm/drm_dp_mst_topology.c                     |   20 -
 drivers/gpu/drm/drm_pci.c                                 |   23 -
 drivers/gpu/drm/drm_prime.c                               |   37 +-
 drivers/gpu/drm/etnaviv/etnaviv_perfmon.c                 |   59 +++
 drivers/gpu/drm/i915/Kconfig.profile                      |    4 
 drivers/gpu/drm/i915/display/intel_ddi.c                  |    6 
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c            |    8 
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c                      |   26 +
 drivers/gpu/drm/i915/gt/intel_engine_cs.c                 |   13 
 drivers/gpu/drm/i915/gt/intel_ggtt.c                      |   48 ++
 drivers/gpu/drm/i915/gt/intel_gtt.c                       |   24 -
 drivers/gpu/drm/i915/gt/intel_gtt.h                       |    4 
 drivers/gpu/drm/i915/gt/intel_rps.c                       |   13 
 drivers/gpu/drm/vboxvideo/vbox_drv.c                      |    4 
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c              |    5 
 drivers/input/serio/i8042-x86ia64io.h                     |   11 
 drivers/irqchip/irq-gic-v3-its.c                          |   10 
 drivers/irqchip/irq-versatile-fpga.c                      |   18 -
 drivers/md/dm-clone-metadata.c                            |   15 
 drivers/md/dm-clone-metadata.h                            |    2 
 drivers/md/dm-clone-target.c                              |   66 ++-
 drivers/md/dm-integrity.c                                 |    4 
 drivers/md/dm-verity-fec.c                                |    1 
 drivers/md/dm-writecache.c                                |    6 
 drivers/md/dm-zoned-metadata.c                            |    1 
 drivers/md/md.c                                           |    2 
 drivers/media/i2c/ov5695.c                                |   49 +-
 drivers/media/i2c/video-i2c.c                             |    2 
 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c              |    9 
 drivers/media/platform/mtk-vcodec/vdec_vpu_if.c           |    6 
 drivers/media/platform/mtk-vcodec/venc_vpu_if.c           |   12 
 drivers/media/platform/mtk-vpu/mtk_vpu.c                  |   45 +-
 drivers/media/platform/mtk-vpu/mtk_vpu.h                  |    2 
 drivers/media/platform/qcom/venus/core.h                  |    1 
 drivers/media/platform/qcom/venus/firmware.c              |   10 
 drivers/media/platform/qcom/venus/helpers.c               |   20 -
 drivers/media/platform/qcom/venus/hfi_parser.c            |    1 
 drivers/media/platform/ti-vpe/cal.c                       |   29 -
 drivers/media/platform/vimc/vimc-streamer.c               |    9 
 drivers/media/rc/keymaps/Makefile                         |    1 
 drivers/media/rc/keymaps/rc-videostrong-kii-pro.c         |   83 ++++
 drivers/mfd/dln2.c                                        |    9 
 drivers/mmc/host/mmci_stm32_sdmmc.c                       |    4 
 drivers/mtd/nand/raw/cadence-nand-controller.c            |   13 
 drivers/mtd/nand/spi/core.c                               |   17 -
 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c        |   31 +
 drivers/net/wireless/ath/ath9k/main.c                     |    3 
 drivers/nvme/host/fc.c                                    |   14 
 drivers/nvme/target/fcloop.c                              |    1 
 drivers/nvme/target/tcp.c                                 |    2 
 drivers/pci/controller/dwc/pcie-qcom.c                    |    8 
 drivers/pci/endpoint/pci-epc-mem.c                        |   10 
 drivers/pci/hotplug/pciehp_hpc.c                          |   14 
 drivers/pci/pcie/aspm.c                                   |    4 
 drivers/pci/quirks.c                                      |   80 ++++
 drivers/pci/switch/switchtec.c                            |    2 
 drivers/platform/x86/asus-wmi.c                           |    5 
 drivers/remoteproc/qcom_q6v5_mss.c                        |   54 ++-
 drivers/remoteproc/remoteproc_virtio.c                    |    7 
 drivers/s390/scsi/zfcp_erp.c                              |    2 
 drivers/scsi/lpfc/lpfc.h                                  |    1 
 drivers/scsi/lpfc/lpfc_hbadisc.c                          |   59 ++-
 drivers/scsi/lpfc/lpfc_nvme.c                             |    2 
 drivers/scsi/lpfc/lpfc_scsi.c                             |    4 
 drivers/scsi/mpt3sas/mpt3sas_scsih.c                      |    8 
 drivers/scsi/qla2xxx/qla_nvme.c                           |    1 
 drivers/scsi/sr.c                                         |   22 -
 drivers/scsi/sr.h                                         |    2 
 drivers/scsi/ufs/ufshcd.c                                 |    3 
 drivers/scsi/ufs/ufshcd.h                                 |    6 
 drivers/spi/spi-fsl-dspi.c                                |   25 -
 drivers/staging/media/allegro-dvt/allegro-core.c          |    5 
 drivers/staging/media/hantro/hantro_h1_jpeg_enc.c         |    9 
 drivers/staging/media/hantro/hantro_v4l2.c                |    2 
 drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c     |    9 
 drivers/staging/media/imx/imx7-media-csi.c                |    4 
 drivers/staging/media/imx/imx7-mipi-csis.c                |    2 
 drivers/staging/media/rkisp1/rkisp1-dev.c                 |    3 
 drivers/staging/media/rkisp1/rkisp1-isp.c                 |    4 
 drivers/staging/mt7621-pci/pci-mt7621.c                   |    3 
 drivers/staging/wilc1000/wlan.c                           |    1 
 drivers/thermal/intel/int340x_thermal/int3400_thermal.c   |    2 
 drivers/thermal/intel/int340x_thermal/int3403_thermal.c   |    2 
 drivers/usb/dwc3/core.c                                   |    5 
 drivers/usb/dwc3/core.h                                   |    4 
 drivers/usb/gadget/composite.c                            |    9 
 drivers/usb/gadget/function/f_fs.c                        |    1 
 drivers/usb/host/xhci.c                                   |    4 
 drivers/usb/phy/phy-tegra-usb.c                           |    3 
 drivers/usb/typec/ucsi/ucsi_ccg.c                         |    2 
 drivers/vfio/platform/vfio_platform.c                     |    2 
 fs/btrfs/async-thread.c                                   |    8 
 fs/btrfs/async-thread.h                                   |    1 
 fs/btrfs/delayed-inode.c                                  |   13 
 fs/btrfs/disk-io.c                                        |   27 +
 fs/btrfs/extent_io.c                                      |   35 ++
 fs/btrfs/file.c                                           |   11 
 fs/btrfs/qgroup.c                                         |   11 
 fs/btrfs/relocation.c                                     |   62 +--
 fs/btrfs/space-info.c                                     |   43 ++
 fs/cifs/file.c                                            |    2 
 fs/cifs/inode.c                                           |   23 -
 fs/cifs/smb2ops.c                                         |    4 
 fs/debugfs/file.c                                         |   18 -
 fs/erofs/utils.c                                          |    2 
 fs/exec.c                                                 |    2 
 fs/ext4/inode.c                                           |    2 
 fs/filesystems.c                                          |    4 
 fs/gfs2/glock.c                                           |    3 
 fs/gfs2/glops.c                                           |   27 +
 fs/gfs2/log.c                                             |    2 
 fs/gfs2/log.h                                             |    1 
 fs/hfsplus/attributes.c                                   |    4 
 fs/io_uring.c                                             |   23 -
 fs/nfs/fs_context.c                                       |    5 
 fs/nfs/namespace.c                                        |   12 
 fs/nfs/pagelist.c                                         |   48 +-
 fs/nfs/write.c                                            |    1 
 fs/nfsd/nfsctl.c                                          |    1 
 fs/ocfs2/alloc.c                                          |    4 
 fs/pstore/inode.c                                         |    5 
 fs/pstore/platform.c                                      |    4 
 include/acpi/acpixf.h                                     |    2 
 include/linux/cpu.h                                       |   12 
 include/linux/devfreq_cooling.h                           |    2 
 include/linux/iocontext.h                                 |    1 
 include/linux/nvme-fc-driver.h                            |    4 
 include/linux/pci-epc.h                                   |    3 
 include/linux/sched.h                                     |    4 
 include/linux/xarray.h                                    |    6 
 include/media/rc-map.h                                    |    1 
 include/trace/events/rcu.h                                |    1 
 kernel/bpf/verifier.c                                     |  108 ++++--
 kernel/cpu.c                                              |    4 
 kernel/dma/mapping.c                                      |    2 
 kernel/events/core.c                                      |  150 ++++-----
 kernel/irq/debugfs.c                                      |   11 
 kernel/irq/irqdomain.c                                    |   10 
 kernel/kmod.c                                             |    4 
 kernel/locking/lockdep.c                                  |    4 
 kernel/rcu/tree.c                                         |   36 +-
 kernel/sched/core.c                                       |    1 
 kernel/sched/cputime.c                                    |   41 +-
 kernel/sched/fair.c                                       |   29 +
 kernel/sched/sched.h                                      |    8 
 kernel/seccomp.c                                          |    1 
 kernel/signal.c                                           |    2 
 kernel/time/namespace.c                                   |    1 
 kernel/time/sched_clock.c                                 |    9 
 kernel/trace/trace_kprobe.c                               |    2 
 kernel/ucount.c                                           |    1 
 lib/test_xarray.c                                         |   37 ++
 lib/xarray.c                                              |    4 
 mm/memcontrol.c                                           |    3 
 security/keys/key.c                                       |    2 
 security/keys/keyctl.c                                    |    4 
 sound/core/oss/pcm_plugin.c                               |   32 +
 sound/pci/hda/hda_beep.c                                  |    6 
 sound/pci/hda/hda_intel.c                                 |   16 
 sound/pci/hda/patch_realtek.c                             |  233 +++++++-------
 sound/pci/ice1712/prodigy_hifi.c                          |    4 
 sound/soc/codecs/cs4270.c                                 |   40 ++
 sound/soc/soc-dapm.c                                      |    8 
 sound/soc/soc-ops.c                                       |    4 
 sound/soc/soc-pcm.c                                       |    6 
 sound/soc/soc-topology.c                                  |    2 
 sound/soc/stm/stm32_sai_sub.c                             |    4 
 sound/usb/mixer_maps.c                                    |   28 +
 tools/gpio/Makefile                                       |    2 
 tools/perf/Makefile.config                                |   11 
 tools/testing/radix-tree/Makefile                         |    4 
 tools/testing/radix-tree/iteration_check_2.c              |   87 +++++
 tools/testing/radix-tree/main.c                           |    1 
 tools/testing/radix-tree/test.h                           |    1 
 tools/testing/selftests/powerpc/mm/.gitignore             |    1 
 tools/testing/selftests/powerpc/pmu/ebb/Makefile          |    1 
 tools/testing/selftests/vm/map_hugetlb.c                  |   14 
 tools/testing/selftests/vm/mlock2-tests.c                 |  233 ++------------
 tools/testing/selftests/x86/ptrace_syscall.c              |    8 
 279 files changed, 2731 insertions(+), 1359 deletions(-)

Aaron Liu (1):
drm/amdgpu: unify fw_write_wait for new gfx9 asics

Ahmed S. Darwish (1):
time/sched_clock: Expire timer in hardirq context

Ajay Gupta (1):
usb: ucsi: ccg: disable runtime pm during fw flashing

Ajay Singh (1):

      staging: wilc1000: avoid double unlocking of 'wilc->hif_cs' mutex

Alexander Sverdlin (1):
genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy()

Alexey Dobriyan (2):
null_blk: fix spurious IO errors after failed past-wp access block, zoned: fix integer overflow with BLKRESETZONE et al

Andrei Botila (1):
crypto: caam - update xts sector size for large input length

Andrzej Pietrasiewicz (1):
media: hantro: Read be32 words starting at every fourth byte

Andy Lutomirski (1):
selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault

Andy Shevchenko (1):
mfd: dln2: Fix sanity checking for endpoints

Aneesh Kumar K.V (1):
powerpc/hash64/devmap: Use H_PAGE_THP_HUGE when setting up huge devmap PTE entries

Anshuman Khandual (1):
arm64/mm: Hold memory hotplug lock while walking for kernel page table dump

Anssi Hannula (1):
tools: gpio: Fix out-of-tree build regression

Ard Biesheuvel (1):
efi/x86: Ignore the memory attributes table on i386

Arvind Sankar (1):
x86/boot: Use unsigned comparison for addresses

Bart Van Assche (5):
null_blk: Fix the null_add_dev() error path
blk-mq: Fix a recently introduced regression in blk_mq_realloc_hw_ctxs()
null_blk: Handle null_add_dev() failures properly
null_blk: Suppress an UBSAN complaint triggered when setting 'memory_backed'
scsi: sr: Fix sr_block_release()

Benoit Parrot (2):
media: ti-vpe: cal: fix disable_irqs to only the intended target
media: ti-vpe: cal: fix a kernel oops when unloading module

Bjorn Andersson (2):
PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM
remoteproc: qcom_q6v5_mss: Don't reassign mpss region on shutdown

Bob Liu (1):
dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone()

Bob Peterson (2):
gfs2: Do log_flush in gfs2_ail_empty_gl even if ail list is empty
gfs2: Don't demote a glock until its revokes are written

Boqun Feng (1):
locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps()

Changwei Ge (1):
ocfs2: no need try to truncate file beyond i_size

Chris Wilson (5):
sched/vtime: Prevent unstable evaluation of WARN(vtime->state) drm/i915/gem: Flush all the reloc_gpu batch
drm: Remove PageReserved manipulation from drm_pci_alloc drm/i915/gt: Treat idling as a RPS downclock event drm/i915/gt: Fill all the unused space in the GGTT

Christian Gmeiner (1):
drm/etnaviv: rework perfmon query infrastructure

Christoph Niedermaier (1):
cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL

Christophe Leroy (4):
selftests/vm: fix map_hugetlb length used for testing read and write selftests/powerpc: Add tlbie_test in .gitignore powerpc/kprobes: Ignore traps that happened in real mode powerpc/kasan: Fix kasan_remap_early_shadow_ro()

Claudiu Beznea (1):
clocksource/drivers/timer-microchip-pit64b: Fix rate for gck

Clement Courbet (1):
powerpc: Make setjmp/longjmp signature standard

Cédric Le Goater (2):
powerpc/xive: Use XIVE_BAD_IRQ instead of zero to catch non configured IPIs powerpc/xive: Fix xmon support on the PowerNV platform

Dafna Hirschfeld (1):
media: vimc: streamer: fix memory leak in vimc subdevs if kthread_run fails

Dan Carpenter (1):
crypto: rng - Fix a refcounting bug in crypto_rng_reset()

Daniel Axtens (1):
powerpc/64: Setup a paca before parsing device tree etc.

Daniele Ceraolo Spurio (1):
drm/i915/ggtt: do not set bits 1-11 in gen12 ptes

Dave Gerlach (1):
arm64: dts: ti: k3-am65: Add clocks to dwc3 nodes

David Hildenbrand (2):
KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks
KVM: s390: vsie: Fix delivery of addressing exceptions

Dmitry Safonov (1):
time/namespace: Add max_time_namespaces ucount

Dongchun Zhu (1):
media: i2c: ov5695: Fix power on and off sequences

Eric Auger (1):
vfio: platform: Switch to platform_get_irq_optional()

Eric Biggers (2):
fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
kmod: make request_module() return an error when autoloading is disabled

Eric W. Biederman (1):
signal: Extend exec_id to 64bits

Fabiano Rosas (1):
KVM: PPC: Book3S HV: Skip kvmppc_uvmem_free if Ultravisor is not supported

Filipe Manana (2):
Btrfs: fix crash during unmount due to race with delayed inode workers
btrfs: fix missing file extent item for hole after ranged fsync

Fredrik Strupe (1):
arm64: armv8_deprecated: Fix undef_hook mask for thumb setend

Frieder Schrempf (2):
mtd: spinand: Stop using spinand->oobbuf for buffering bad block markers
mtd: spinand: Do not erase the block before writing a bad block marker

Gao Xiang (1):
erofs: correct the remaining shrink objects

Gary Lin (1):
efi/x86: Fix the deletion of variables in mixed mode

Gayatri Kammela (1):

      thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs

Gilad Ben-Yossef (3):
crypto: ccree - protect against empty or NULL scatterlists
crypto: ccree - only try to map auth tag if needed
crypto: ccree - dec auth tag size from cryptlen map

Greg Kroah-Hartman (1):

      Linux 5.6.5

Guoqing Jiang (1):
md: check arrays is suspended in mddev_detach before call quiesce operations

Gustavo A. R. Silva (1):
MIPS: OCTEON: irq: Fix potential NULL pointer dereference

Hans de Goede (6):
ALSA: hda/realtek - Add quirk for Lenovo Carbon X1 8th gen x86/tsc_msr: Use named struct initializers
x86/tsc_msr: Fix MSR_FSB_FREQ mask for Cherry Trail devices x86/tsc_msr: Make MSR derived TSC frequency more accurate drm/vboxvideo: Add missing remove_conflicting_pci_framebuffers call, v2
Input: i8042 - add Acer Aspire 5738z to nomux list

Helen Koike (2):
media: staging: rkisp1: use consistent bus_info string for media_dev
media: staging: rkisp1: isp: do not set invalid mbus code for pad

Horia Geantă (1):
crypto: caam/qi2 - fix chacha20 data size error

Hsin-Yi Wang (1):
media: mtk-vpu: avoid unaligned access to DTCM buffer.

Huacai Chen (1):
MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3

Hui Wang (1):
ALSA: hda/realtek - a fake key event is triggered by running shutup

Imre Deak (1):
drm/i915/icl+: Don't enable DDI IO power on a TypeC port in TBT mode

J. Bruce Fields (1):
nfsd: fsnotify on rmdir under nfsd/clients/

Jakub Kicinski (1):
mm, memcg: do not high throttle allocators based on wraparound

James Morse (1):
firmware: arm_sdei: fix double-lock on hibernate with shared events

James Smart (3):
nvme-fc: Revert "add module to ops template to allow module references"
scsi: lpfc: Fix lpfc_io_buf resource leak in lpfc_get_scsi_buf_s4 error path
scsi: lpfc: Fix broken Credit Recovery after driver load

Jan Engelhardt (1):
acpi/x86: ignore unspecified bit positions in the ACPI global lock field

Jann Horn (1):
bpf: Fix tnum constraints for 32-bit comparisons

Jens Axboe (3):
io_uring: ensure openat sets O_LARGEFILE if needed
io_uring: remove bogus RLIMIT_NOFILE check in file registration
io_uring: honor original task RLIMIT_FSIZE

John Garry (1):
libata: Remove extra scsi_host_put() in ata_scsi_add_hosts()

Josef Bacik (9):
btrfs: remove a BUG_ON() from merge_reloc_roots()
btrfs: restart relocate_tree_blocks properly
btrfs: track reloc roots based on their commit root bytenr
btrfs: fix btrfs_calc_reclaim_metadata_size calculation
btrfs: reloc: clean dirty subvols if we fail to start a transaction
btrfs: set update the uuid generation as soon as possible
btrfs: drop block from cache on error in relocation
btrfs: unset reloc control if we fail to recover
btrfs: use nofs allocations for running delayed items

Juergen Gross (1):
xen/blkfront: fix memory allocation flags in blkfront_setup_indirect()

Julia Lawall (1):
ASoC: stm32: sai: Add missing cleanup

Junyong Sun (1):
firmware: fix a double abort case with fw_load_sysfs_fallback

Kai-Heng Feng (2):
ALSA: hda/realtek: Enable mute LED on an HP system
libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set

Kishon Vijay Abraham I (1):
PCI: endpoint: Fix for concurrent memory allocation in OB address region

Konstantin Khlebnikov (1):

      block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices

Kristian Klausen (1):
platform/x86: asus-wmi: Support laptops where the first battery is named BATT

Krzysztof Kozlowski (1):
usb: phy: tegra: Include proper GPIO consumer header to fix compile testing

Laurent Pinchart (2):
media: imx: imx7_mipi_csis: Power off the source when stopping streaming
media: imx: imx7-media-csi: Fix video field handling

Laurentiu Tudor (1):
powerpc/fsl_booke: Avoid creating duplicate tlb1 entry

Libor Pechacek (1):
powerpc/pseries: Avoid NULL pointer dereference when drmem is unavailable

Logan Gunthorpe (1):
PCI/switchtec: Fix init_completion race condition with poll_wait()

Lorenzo Bianconi (1):
iio: imu: st_lsm6dsx: check return value from st_lsm6dsx_sensor_set_enable

Ludovic Barre (1):
mmc: mmci_sdmmc: Fix clear busyd0end irq flag

Lukas Wunner (1):
PCI: pciehp: Fix indefinite wait on sysfs requests

Lyude Paul (2):
Revert "drm/dp_mst: Remove VCPI while disabling topology mgr" drm/dp_mst: Fix clearing payload state on topology disable

Marc Zyngier (2):
irqchip/gic-v4.1: Skip absent CPUs while iterating over redistributors irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency

Marek Szyprowski (2):
ARM: dts: exynos: Fix polarity of the LCD SPI bus on UniversalC210 board drm/prime: fix extracting of the DMA addresses from a scatterlist

Mark Brown (1):
arm64: Always force a branch protection mode when the compiler has one

Martin Blumenstingl (1):
thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n

Masami Hiramatsu (1):
ftrace/kprobe: Show the maxactive number on kprobe_events

Mathias Nyman (1):
xhci: bail out early if driver can't accress host in resume

Matt Ranostay (1):
media: i2c: video-i2c: fix build errors due to 'imply hwmon'

Matthew Garrett (1):
tpm: Don't make log failures fatal

Matthew Wilcox (Oracle) (2):
XArray: Fix xas_pause for large multi-index entries
xarray: Fix early termination of xas_for_each_marked

Maxime Ripard (2):
arm64: dts: allwinner: h6: Fix PMU compatible
arm64: dts: allwinner: h5: Fix PMU compatible

Merlijn Wajer (1):
scsi: sr: get rid of sr global mutex

Michael Ellerman (3):
selftests/powerpc: Fix try-run when source tree is not writable powerpc/64/tm: Don't let userspace set regs->trap via sigreturn powerpc/64: Prevent stack protection in early boot

Michael Kerrisk (man-pages) (1):
time/namespace: Fix time_for_children symlink

Michael Mueller (1):
s390/diag: fix display of diagnose call statistics

Michael Strauss (1):
drm/amd/display: Check for null fclk voltage when parsing clock table

Michael Tretter (1):
media: allegro: fix type of gop_length in channel_create message

Michael Wang (1):
sched: Avoid scale real weight down to zero

Michal Hocko (1):
selftests: vm: drop dependencies on page flags from mlock2 tests

Mike Willard (1):
ASoC: cs4270: pull reset GPIO low then high

Mikulas Patocka (2):
dm writecache: add cond_resched to avoid CPU hangs dm integrity: fix a crash with unusually large tag size

Mohammad Rasim (2):
media: rc: add keymap for Videostrong KII Pro
media: arm64: dts: amlogic: add rc-videostrong-kii-pro keymap

Murphy Zhou (1):
CIFS: check new file size when extending file by fallocate

Neeraj Upadhyay (1):
PM: sleep: wakeup: Skip wakeup_source_sysfs_remove() if device is not there

Neil Armstrong (1):
usb: dwc3: core: add support for disabling SS instances in park mode

Nikita Shubin (1):
remoteproc: Fix NULL pointer dereference in rproc_virtio_notify

Nikos Tsironis (4):
dm clone: Fix handling of partial region discards
dm clone: Add overflow check for number of regions
dm clone: Add missing casts to prevent overflows and data corruption dm clone metadata: Fix return type of dm_clone_nr_of_hydrated_regions()

Oliver O'Halloran (1):
cpufreq: powernv: Fix use-after-free

Paolo Valente (1):
block, bfq: move forward the getting of an extra ref in bfq_bfqq_move

Paul Cercueil (2):
clk: ingenic/jz4770: Exit with error if CGU init failed
clk: ingenic/TCU: Fix round_rate returning error

Paul E. McKenney (1):
rcu: Make rcu_barrier() account for offline no-CBs CPUs

Pavel Begunkov (1):
io_uring: fix ctx refcounting in io_submit_sqes()

Peng Fan (1):
cpufreq: imx6q: fix error handling

Peter Zijlstra (3):
perf/core: Unify {pinned,flexible}_sched_in() perf/core: Fix event cgroup tracking perf/core: Remove 'struct sched_in_data'

Philipp Zabel (1):
media: hantro: fix extra MV/MC sync space calculation

Piotr Sroka (3):
mtd: rawnand: cadence: fix the calculation of the avaialble OOB size
mtd: rawnand: cadence: change bad block marker size
mtd: rawnand: cadence: reinit completion before executing a new command

Prike Liang (2):
drm/amd/powerplay: implement the is_dpm_running() drm/amdgpu: fix gfx hang during suspend with video playback (v2)

Qian Cai (1):

      ext4: fix a data race at inode->i_blocks

Qu Wenruo (2):
btrfs: qgroup: ensure qgroup_rescan_running is only set when the worker is at least queued
btrfs: Don't submit any btree write bio if the fs has errors

Rafael J. Wysocki (4):
ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()
ACPI: EC: Avoid printing confusing messages in acpi_ec_setup()
ACPICA: Allow acpi_any_gpe_status_set() to skip one GPE
ACPI: PM: s2idle: Refine active GPEs check

Remi Pommarel (1):
ath9k: Handle txpower changes even when TPC is disabled

Robbie Ko (1):
btrfs: fix missing semaphore unlock in btrfs_sync_file

Robert Richter (1):
EDAC/mc: Report "unknown memory" on too many DIMM labels found

Rosioru Dragos (1):
crypto: mxs-dcp - fix scatterlist linearization for hash

Sagi Grimberg (1):
nvmet-tcp: fix maxh2cdata icresp parameter

Sahitya Tummala (1):
block: Fix use-after-free issue accessing struct io_cq

Sam Lunt (1):
perf tools: Support Python 3.8+ in Makefile

Scott Mayhew (1):
NFS: Fix a few constant_table array definitions

Scott Wood (1):
sched/core: Remove duplicate assignment in sched_tick_remote()

Sean Christopherson (5):
KVM: nVMX: Properly handle userspace interrupt window request
KVM: x86: Allocate new rmap and large page tracking when moving memslot
KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support
KVM: x86: Gracefully handle __vmalloc() failure during VM allocation
KVM: VMX: Add a trampoline to fix VMREAD error handling

Sean V Kelley (1):
PCI: Add boot interrupt quirk mechanism for Xeon chipsets

Sergio Paracuellos (1):
staging: mt7621-pci: avoid to poweroff the phy for slot one

Shetty, Harshini X (EXT-Sony Mobile) (1):
dm verity fec: fix memory leak in verity_fec_dtr

Sibi Sankar (1):
remoteproc: qcom_q6v5_mss: Reload the mba region on coredump

Simon Gander (1):
hfsplus: fix crash and filesystem corruption when deleting files

Sreekanth Reddy (1):
scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug

Sriharsha Allenki (1):
usb: gadget: f_fs: Fix use after free issue as part of queue failure

Stanimir Varbanov (2):
media: venus: cache vb payload to be used by clock scaling
media: venus: firmware: Ignore secure call error on first resume

Stanley Chu (1):
scsi: ufs: fix Auto-Hibern8 error detection

Steffen Maier (1):
scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point

Stephan Gerhold (1):
media: venus: hfi_parser: Ignore HEVC encoding for V1

Steve French (1):
smb3: fix performance regression with setting mtime

Subash Abhinov Kasiviswanathan (1):
net: qualcomm: rmnet: Allow configuration updates to existing devices

Sungbo Eo (2):
irqchip/versatile-fpga: Handle chained IRQs properly irqchip/versatile-fpga: Apply clear-mask earlier

Sven Schnelle (1):
seccomp: Add missing compat_ioctl for notify

Taehee Yoo (1):
debugfs: Check module state before warning in {full/open}_proxy_open()

Takashi Iwai (6):
ALSA: usb-audio: Add mixer workaround for TRX40 and co
ALSA: hda: Add driver blacklist
ALSA: hda: Fix potential access overflow in beep helper
ALSA: ice1724: Fix invalid access for enumerated ctl items
ALSA: pcm: oss: Fix regression by buffer overflow fix
ALSA: hda/realtek - Add quirk for MSI GL63

Tao Zhou (1):
sched/fair: Fix condition of avg_load calculation

Thinh Nguyen (1):
usb: gadget: composite: Inform controller driver of self-powered

Thomas Gleixner (3):
cpu/hotplug: Ignore pm_wakeup_pending() for disable_nonboot_cpus() genirq/debugfs: Add missing sanity checks to interrupt injection x86/entry/32: Add missing ASM_CLAC to general_protection entry

Thomas Hebb (3):
ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256
ALSA: hda/realtek - Set principled PC Beep configuration for ALC256
ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups

Thomas Hellstrom (2):
x86: Don't let pgprot_modify() change the page encryption bit
dma-mapping: Fix dma_pgprot() for unencrypted coherent pages

Tom Lendacky (1):
efi/x86: Add TPM related EFI tables to unencrypted mapping checks

Torsten Duwe (1):
drm/bridge: analogix-anx78xx: Fix drm_dp_link helper removal

Trond Myklebust (3):
NFS: Fix use-after-free issues in nfs_pageio_add_request()
NFS: Fix a page leak in nfs_destroy_unlinked_subrequests()
NFS: finish_automount() requires us to hold 2 refs to the mount record

Tvrtko Ursulin (1):
drm/i915/gen12: Disable preemption timeout

Ulf Hansson (1):
PM / Domains: Allow no domain-idle-states DT property in genpd when parsing

Vasily Averin (3):
tpm: tpm1_bios_measurements_next should increase position index
tpm: tpm2_bios_measurements_next should increase position index
pstore: pstore_ftrace_seq_next should increase position index

Vincent Guittot (1):
sched/fair: Fix enqueue_task_fair warning

Vitaly Kuznetsov (1):
KVM: VMX: fix crash cleanup when KVM wasn't used

Vladimir Oltean (2):
spi: spi-fsl-dspi: Avoid NULL pointer in dspi_slave_abort for non-DMA mode
spi: spi-fsl-dspi: Replace interruptible wait queue with a simple completion

Wen Yang (1):
ipmi: fix hung processes in __get_guid()

Yang Xu (1):
KEYS: reaching the keys quotas correctly

Yicong Yang (1):
PCI/ASPM: Clear the correct bits when enabling L1 substates

Yilu Lin (1):
CIFS: Fix bug which the return value by asynchronous read is error

Yuxian Dai (1):
drm/amdgpu/powerplay: using the FCLK DPM table to set the MCLK

Zhiqiang Liu (1):
block, bfq: fix use-after-free in bfq_idle_slice_timer_body

chenqiwu (1):
pstore/platform: fix potential mem leak if pstore_init_fs failed

이경택 (4):
ASoC: fix regwmask
ASoC: dapm: connect virtual mux with default value
ASoC: dpcm: allow start or stop during pause for backend
ASoC: topology: use name_prefix for new kcontrol

author maintainer
#1 lore raw
Documentation/admin-guide/sysctl/user.rst +6 -0
index 650eaa03f15e..c45824589339 100644
@@ -65,6 +65,12 @@ max_pid_namespaces
   The maximum number of pid namespaces that any user in the current
   user namespace may create.
 
+max_time_namespaces
+===================
+
+  The maximum number of time namespaces that any user in the current
+  user namespace may create.
+
 max_user_namespaces
 ===================
 
Documentation/sound/hd-audio/index.rst +1 -0
index f8a72ffffe66..6e12de9fc34e 100644
@@ -8,3 +8,4 @@ HD-Audio
    models
    controls
    dp-mst
+   realtek-pc-beep
Documentation/sound/hd-audio/models.rst +0 -2
index 11298f0ce44d..0ea967d34583 100644
@@ -216,8 +216,6 @@ alc298-dell-aio
     ALC298 fixups on Dell AIO machines
 alc275-dell-xps
     ALC275 fixups on Dell XPS models
-alc256-dell-xps13
-    ALC256 fixups on Dell XPS13
 lenovo-spk-noise
     Workaround for speaker noise on Lenovo machines
 lenovo-hotkey
Documentation/sound/hd-audio/realtek-pc-beep.rst new file +129 -0

129 lines not on this page · raw message

Makefile +1 -1
index 0a7e41471838..0d7098842d56 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 6
-SUBLEVEL = 4
+SUBLEVEL = 5
 EXTRAVERSION =
 NAME = Kleptomaniac Octopus
 
arch/arm/boot/dts/exynos4210-universal_c210.dts +1 -3
index a1bdf7830a87..9dda6bdb9253 100644
@@ -115,7 +115,7 @@ spi-lcd {
 		gpio-sck = <&gpy3 1 GPIO_ACTIVE_HIGH>;
 		gpio-mosi = <&gpy3 3 GPIO_ACTIVE_HIGH>;
 		num-chipselects = <1>;
-		cs-gpios = <&gpy4 3 GPIO_ACTIVE_HIGH>;
+		cs-gpios = <&gpy4 3 GPIO_ACTIVE_LOW>;
 
 		lcd@0 {
 			compatible = "samsung,ld9040";
@@ -124,8 +124,6 @@ lcd@0 {
 			vci-supply = <&ldo17_reg>;
 			reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
 			spi-max-frequency = <1200000>;
-			spi-cpol;
-			spi-cpha;
 			power-on-delay = <10>;
 			reset-delay = <10>;
 			panel-width-mm = <90>;
arch/arm64/Makefile +4 -0
index dca1a97751ab..4e6ce2d9196e 100644
@@ -65,6 +65,10 @@ stack_protector_prepare: prepare0
 					include/generated/asm-offsets.h))
 endif
 
+# Ensure that if the compiler supports branch protection we default it
+# off.
+KBUILD_CFLAGS += $(call cc-option,-mbranch-protection=none)
+
 ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
 KBUILD_CPPFLAGS	+= -mbig-endian
 CHECKFLAGS	+= -D__AARCH64EB__
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +1 -2
index 9893aa64dd0b..4462a68c0681 100644
@@ -38,8 +38,7 @@ cpu3: cpu@3 {
 	};
 
 	pmu {
-		compatible = "arm,cortex-a53-pmu",
-			     "arm,armv8-pmuv3";
+		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -2
index 3329283e38ab..06363c1bea3f 100644
@@ -70,8 +70,7 @@ ext_osc32k: ext_osc32k_clk {
 	};
 
 	pmu {
-		compatible = "arm,cortex-a53-pmu",
-			     "arm,armv8-pmuv3";
+		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +4 -0
index 2f1f829450a2..6c9cc45fb417 100644
@@ -76,3 +76,7 @@ eth_phy0: ethernet-phy@0 {
 		};
 	};
 };
+
+&ir {
+	linux,rc-map-name = "rc-videostrong-kii-pro";
+};
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +2 -0
index e5df20a2d2f9..d86c5c7b82fc 100644
@@ -296,6 +296,7 @@ dwc3_0: dwc3@4000000 {
 		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
 		dma-coherent;
 		power-domains = <&k3_pds 151 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 151 2>, <&k3_clks 151 7>;
 		assigned-clocks = <&k3_clks 151 2>, <&k3_clks 151 7>;
 		assigned-clock-parents = <&k3_clks 151 4>,	/* set REF_CLK to 20MHz i.e. PER0_PLL/48 */
 					 <&k3_clks 151 9>;	/* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */
@@ -335,6 +336,7 @@ dwc3_1: dwc3@4020000 {
 		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
 		dma-coherent;
 		power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 152 2>;
 		assigned-clocks = <&k3_clks 152 2>;
 		assigned-clock-parents = <&k3_clks 152 4>;	/* set REF_CLK to 20MHz i.e. PER0_PLL/48 */
 
arch/arm64/kernel/armv8_deprecated.c +1 -1
index 7832b3216370..950864bb0f9a 100644
@@ -601,7 +601,7 @@ static struct undef_hook setend_hooks[] = {
 	},
 	{
 		/* Thumb mode */
-		.instr_mask	= 0x0000fff7,
+		.instr_mask	= 0xfffffff7,
 		.instr_val	= 0x0000b650,
 		.pstate_mask	= (PSR_AA32_T_BIT | PSR_AA32_MODE_MASK),
 		.pstate_val	= (PSR_AA32_T_BIT | PSR_AA32_MODE_USR),
arch/arm64/mm/ptdump_debugfs.c +4 -0
index 1f2eae3e988b..d29d722ec3ec 100644
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/debugfs.h>
+#include <linux/memory_hotplug.h>
 #include <linux/seq_file.h>
 
 #include <asm/ptdump.h>
@@ -7,7 +8,10 @@
 static int ptdump_show(struct seq_file *m, void *v)
 {
 	struct ptdump_info *info = m->private;
+
+	get_online_mems();
 	ptdump_walk(m, info);
+	put_online_mems();
 	return 0;
 }
 DEFINE_SHOW_ATTRIBUTE(ptdump);
arch/mips/cavium-octeon/octeon-irq.c +3 -0
index 6bd1e97effdf..6501a842c41a 100644
@@ -2199,6 +2199,9 @@ static int octeon_irq_cib_map(struct irq_domain *d,
 	}
 
 	cd = kzalloc(sizeof(*cd), GFP_KERNEL);
+	if (!cd)
+		return -ENOMEM;
+
 	cd->host_data = host_data;
 	cd->bit = hw;
 
arch/mips/mm/tlbex.c +4 -1
index 344e6e9ea43b..da407cdc2135 100644
@@ -1480,6 +1480,7 @@ static void build_r4000_tlb_refill_handler(void)
 
 static void setup_pw(void)
 {
+	unsigned int pwctl;
 	unsigned long pgd_i, pgd_w;
 #ifndef __PAGETABLE_PMD_FOLDED
 	unsigned long pmd_i, pmd_w;
@@ -1506,6 +1507,7 @@ static void setup_pw(void)
 
 	pte_i = ilog2(_PAGE_GLOBAL);
 	pte_w = 0;
+	pwctl = 1 << 30; /* Set PWDirExt */
 
 #ifndef __PAGETABLE_PMD_FOLDED
 	write_c0_pwfield(pgd_i << 24 | pmd_i << 12 | pt_i << 6 | pte_i);
@@ -1516,8 +1518,9 @@ static void setup_pw(void)
 #endif
 
 #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
-	write_c0_pwctl(1 << 6 | psn);
+	pwctl |= (1 << 6 | psn);
 #endif
+	write_c0_pwctl(pwctl);
 	write_c0_kpgd((long)swapper_pg_dir);
 	kscratch_used_mask |= (1 << 7); /* KScratch6 is used for KPGD */
 }
arch/powerpc/include/asm/book3s/64/hash-4k.h +6 -0
index 8fd8599c9395..3f9ae3585ab9 100644
@@ -156,6 +156,12 @@ extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,
 extern int hash__has_transparent_hugepage(void);
 #endif
 
+static inline pmd_t hash__pmd_mkdevmap(pmd_t pmd)
+{
+	BUG();
+	return pmd;
+}
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* _ASM_POWERPC_BOOK3S_64_HASH_4K_H */
arch/powerpc/include/asm/book3s/64/hash-64k.h +7 -1
index d1d9177d9ebd..0729c034e56f 100644
@@ -246,7 +246,7 @@ static inline void mark_hpte_slot_valid(unsigned char *hpte_slot_array,
  */
 static inline int hash__pmd_trans_huge(pmd_t pmd)
 {
-	return !!((pmd_val(pmd) & (_PAGE_PTE | H_PAGE_THP_HUGE)) ==
+	return !!((pmd_val(pmd) & (_PAGE_PTE | H_PAGE_THP_HUGE | _PAGE_DEVMAP)) ==
 		  (_PAGE_PTE | H_PAGE_THP_HUGE));
 }
 
@@ -272,6 +272,12 @@ extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,
 				       unsigned long addr, pmd_t *pmdp);
 extern int hash__has_transparent_hugepage(void);
 #endif /*  CONFIG_TRANSPARENT_HUGEPAGE */
+
+static inline pmd_t hash__pmd_mkdevmap(pmd_t pmd)
+{
+	return __pmd(pmd_val(pmd) | (_PAGE_PTE | H_PAGE_THP_HUGE | _PAGE_DEVMAP));
+}
+
 #endif	/* __ASSEMBLY__ */
 
 #endif /* _ASM_POWERPC_BOOK3S_64_HASH_64K_H */
arch/powerpc/include/asm/book3s/64/pgtable.h +3 -1
index 201a69e6a355..368b136517e0 100644
@@ -1303,7 +1303,9 @@ extern void serialize_against_pte_lookup(struct mm_struct *mm);
 
 static inline pmd_t pmd_mkdevmap(pmd_t pmd)
 {
-	return __pmd(pmd_val(pmd) | (_PAGE_PTE | _PAGE_DEVMAP));
+	if (radix_enabled())
+		return radix__pmd_mkdevmap(pmd);
+	return hash__pmd_mkdevmap(pmd);
 }
 
 static inline int pmd_devmap(pmd_t pmd)
arch/powerpc/include/asm/book3s/64/radix.h +5 -0
index d97db3ad9aae..a1c60d5b50af 100644
@@ -263,6 +263,11 @@ static inline int radix__has_transparent_hugepage(void)
 }
 #endif
 
+static inline pmd_t radix__pmd_mkdevmap(pmd_t pmd)
+{
+	return __pmd(pmd_val(pmd) | (_PAGE_PTE | _PAGE_DEVMAP));
+}
+
 extern int __meminit radix__vmemmap_create_mapping(unsigned long start,
 					     unsigned long page_size,
 					     unsigned long phys);
arch/powerpc/include/asm/drmem.h +2 -2
index 3d76e1c388c2..28c3d936fdf3 100644
@@ -27,12 +27,12 @@ struct drmem_lmb_info {
 extern struct drmem_lmb_info *drmem_info;
 
 #define for_each_drmem_lmb_in_range(lmb, start, end)		\
-	for ((lmb) = (start); (lmb) <= (end); (lmb)++)
+	for ((lmb) = (start); (lmb) < (end); (lmb)++)
 
 #define for_each_drmem_lmb(lmb)					\
 	for_each_drmem_lmb_in_range((lmb),			\
 		&drmem_info->lmbs[0],				\
-		&drmem_info->lmbs[drmem_info->n_lmbs - 1])
+		&drmem_info->lmbs[drmem_info->n_lmbs])
 
 /*
  * The of_drconf_cell_v1 struct defines the layout of the LMB data
arch/powerpc/include/asm/setjmp.h +4 -2
index e9f81bb3f83b..f798e80e4106 100644
@@ -7,7 +7,9 @@
 
 #define JMP_BUF_LEN    23
 
-extern long setjmp(long *) __attribute__((returns_twice));
-extern void longjmp(long *, long) __attribute__((noreturn));
+typedef long jmp_buf[JMP_BUF_LEN];
+
+extern int setjmp(jmp_buf env) __attribute__((returns_twice));
+extern void longjmp(jmp_buf env, int val) __attribute__((noreturn));
 
 #endif /* _ASM_POWERPC_SETJMP_H */
arch/powerpc/kernel/dt_cpu_ftrs.c +0 -1
index 182b4047c1ef..36bc0d5c4f3a 100644
@@ -139,7 +139,6 @@ static void __init cpufeatures_setup_cpu(void)
 	/* Initialize the base environment -- clear FSCR/HFSCR.  */
 	hv_mode = !!(mfmsr() & MSR_HV);
 	if (hv_mode) {
-		/* CPU_FTR_HVMODE is used early in PACA setup */
 		cur_cpu_spec->cpu_features |= CPU_FTR_HVMODE;
 		mtspr(SPRN_HFSCR, 0);
 	}
arch/powerpc/kernel/kprobes.c +3 -0
index 2d27ec4feee4..9b340af02c38 100644
@@ -264,6 +264,9 @@ int kprobe_handler(struct pt_regs *regs)
 	if (user_mode(regs))
 		return 0;
 
+	if (!(regs->msr & MSR_IR) || !(regs->msr & MSR_DR))
+		return 0;
+
 	/*
 	 * We don't want to be preempted for the entire
 	 * duration of kprobe processing
arch/powerpc/kernel/paca.c +9 -5
index 949eceb254d8..3f91ccaa9c74 100644
@@ -176,7 +176,7 @@ static struct slb_shadow * __init new_slb_shadow(int cpu, unsigned long limit)
 struct paca_struct **paca_ptrs __read_mostly;
 EXPORT_SYMBOL(paca_ptrs);
 
-void __init initialise_paca(struct paca_struct *new_paca, int cpu)
+void __init __nostackprotector initialise_paca(struct paca_struct *new_paca, int cpu)
 {
 #ifdef CONFIG_PPC_PSERIES
 	new_paca->lppaca_ptr = NULL;
@@ -205,7 +205,7 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu)
 }
 
 /* Put the paca pointer into r13 and SPRG_PACA */
-void setup_paca(struct paca_struct *new_paca)
+void __nostackprotector setup_paca(struct paca_struct *new_paca)
 {
 	/* Setup r13 */
 	local_paca = new_paca;
@@ -214,11 +214,15 @@ void setup_paca(struct paca_struct *new_paca)
 	/* On Book3E, initialize the TLB miss exception frames */
 	mtspr(SPRN_SPRG_TLB_EXFRAME, local_paca->extlb);
 #else
-	/* In HV mode, we setup both HPACA and PACA to avoid problems
+	/*
+	 * In HV mode, we setup both HPACA and PACA to avoid problems
 	 * if we do a GET_PACA() before the feature fixups have been
-	 * applied
+	 * applied.
+	 *
+	 * Normally you should test against CPU_FTR_HVMODE, but CPU features
+	 * are not yet set up when we first reach here.
 	 */
-	if (early_cpu_has_feature(CPU_FTR_HVMODE))
+	if (mfmsr() & MSR_HV)
 		mtspr(SPRN_SPRG_HPACA, local_paca);
 #endif
 	mtspr(SPRN_SPRG_PACA, local_paca);
arch/powerpc/kernel/setup.h +6 -0
index 2dd0d9cb5a20..2ec835574cc9 100644
@@ -8,6 +8,12 @@
 #ifndef __ARCH_POWERPC_KERNEL_SETUP_H
 #define __ARCH_POWERPC_KERNEL_SETUP_H
 
+#ifdef CONFIG_CC_IS_CLANG
+#define __nostackprotector
+#else
+#define __nostackprotector __attribute__((__optimize__("no-stack-protector")))
+#endif
+
 void initialize_cache_info(void);
 void irqstack_early_init(void);
 
arch/powerpc/kernel/setup_64.c +25 -7
index e05e6dd67ae6..438a9befce41 100644
@@ -279,24 +279,42 @@ void __init record_spr_defaults(void)
  * device-tree is not accessible via normal means at this point.
  */
 
-void __init early_setup(unsigned long dt_ptr)
+void __init __nostackprotector early_setup(unsigned long dt_ptr)
 {
 	static __initdata struct paca_struct boot_paca;
 
 	/* -------- printk is _NOT_ safe to use here ! ------- */
 
-	/* Try new device tree based feature discovery ... */
-	if (!dt_cpu_ftrs_init(__va(dt_ptr)))
-		/* Otherwise use the old style CPU table */
-		identify_cpu(0, mfspr(SPRN_PVR));
-
-	/* Assume we're on cpu 0 for now. Don't write to the paca yet! */
+	/*
+	 * Assume we're on cpu 0 for now.
+	 *
+	 * We need to load a PACA very early for a few reasons.
+	 *
+	 * The stack protector canary is stored in the paca, so as soon as we
+	 * call any stack protected code we need r13 pointing somewhere valid.
+	 *
+	 * If we are using kcov it will call in_task() in its instrumentation,
+	 * which relies on the current task from the PACA.
+	 *
+	 * dt_cpu_ftrs_init() calls into generic OF/fdt code, as well as
+	 * printk(), which can trigger both stack protector and kcov.
+	 *
+	 * percpu variables and spin locks also use the paca.
+	 *
+	 * So set up a temporary paca. It will be replaced below once we know
+	 * what CPU we are on.
+	 */
 	initialise_paca(&boot_paca, 0);
 	setup_paca(&boot_paca);
 	fixup_boot_paca();
 
 	/* -------- printk is now safe to use ------- */
 
+	/* Try new device tree based feature discovery ... */
+	if (!dt_cpu_ftrs_init(__va(dt_ptr)))
+		/* Otherwise use the old style CPU table */
+		identify_cpu(0, mfspr(SPRN_PVR));
+
 	/* Enable early debugging if any specified (see udbg.h) */
 	udbg_early_init();
 
arch/powerpc/kernel/signal_64.c +3 -1
index 84ed2e77ef9c..adfde59cf4ba 100644
@@ -473,8 +473,10 @@ static long restore_tm_sigcontexts(struct task_struct *tsk,
 	err |= __get_user(tsk->thread.ckpt_regs.ccr,
 			  &sc->gp_regs[PT_CCR]);
 
+	/* Don't allow userspace to set the trap value */
+	regs->trap = 0;
+
 	/* These regs are not checkpointed; they can go in 'regs'. */
-	err |= __get_user(regs->trap, &sc->gp_regs[PT_TRAP]);
 	err |= __get_user(regs->dar, &sc->gp_regs[PT_DAR]);
 	err |= __get_user(regs->dsisr, &sc->gp_regs[PT_DSISR]);
 	err |= __get_user(regs->result, &sc->gp_regs[PT_RESULT]);
arch/powerpc/kexec/Makefile +0 -3
index 378f6108a414..86380c69f5ce 100644
@@ -3,9 +3,6 @@
 # Makefile for the linux kernel.
 #
 
-# Avoid clang warnings around longjmp/setjmp declarations
-CFLAGS_crash.o += -ffreestanding
-
 obj-y				+= core.o crash.o core_$(BITS).o
 
 obj-$(CONFIG_PPC32)		+= relocate_32.o
arch/powerpc/kvm/book3s_hv_uvmem.c +3 -0
index 79b1202b1c62..9d26614b2a77 100644
@@ -806,6 +806,9 @@ int kvmppc_uvmem_init(void)
 
 void kvmppc_uvmem_free(void)
 {
+	if (!kvmppc_uvmem_bitmap)
+		return;
+
 	memunmap_pages(&kvmppc_uvmem_pgmap);
 	release_mem_region(kvmppc_uvmem_pgmap.res.start,
 			   resource_size(&kvmppc_uvmem_pgmap.res));
arch/powerpc/mm/kasan/kasan_init_32.c +1 -1
index d2bed3fcb719..1169ad1b6730 100644
@@ -101,7 +101,7 @@ static void __init kasan_remap_early_shadow_ro(void)
 
 	kasan_populate_pte(kasan_early_shadow_pte, prot);
 
-	for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {
+	for (k_cur = k_start & PAGE_MASK; k_cur != k_end; k_cur += PAGE_SIZE) {
 		pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);
 		pte_t *ptep = pte_offset_kernel(pmd, k_cur);
 
arch/powerpc/mm/nohash/tlb_low.S +11 -1
index 2ca407cedbe7..eaeee402f96e 100644
@@ -397,7 +397,7 @@ _GLOBAL(set_context)
  * extern void loadcam_entry(unsigned int index)
  *
  * Load TLBCAM[index] entry in to the L2 CAM MMU
- * Must preserve r7, r8, r9, and r10
+ * Must preserve r7, r8, r9, r10 and r11
  */
 _GLOBAL(loadcam_entry)
 	mflr	r5
@@ -433,6 +433,10 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_BIG_PHYS)
  */
 _GLOBAL(loadcam_multi)
 	mflr	r8
+	/* Don't switch to AS=1 if already there */
+	mfmsr	r11
+	andi.	r11,r11,MSR_IS
+	bne	10f
 
 	/*
 	 * Set up temporary TLB entry that is the same as what we're
@@ -458,6 +462,7 @@ _GLOBAL(loadcam_multi)
 	mtmsr	r6
 	isync
 
+10:
 	mr	r9,r3
 	add	r10,r3,r4
 2:	bl	loadcam_entry
@@ -466,6 +471,10 @@ _GLOBAL(loadcam_multi)
 	mr	r3,r9
 	blt	2b
 
+	/* Don't return to AS=0 if we were in AS=1 at function start */
+	andi.	r11,r11,MSR_IS
+	bne	3f
+
 	/* Return to AS=0 and clear the temporary entry */
 	mfmsr	r6
 	rlwinm.	r6,r6,0,~(MSR_IS|MSR_DS)
@@ -481,6 +490,7 @@ _GLOBAL(loadcam_multi)
 	tlbwe
 	isync
 
+3:
 	mtlr	r8
 	blr
 #endif
arch/powerpc/platforms/pseries/hotplug-memory.c +4 -4
index a4d40a3ceea3..fd22ec41c008 100644
@@ -223,7 +223,7 @@ static int get_lmb_range(u32 drc_index, int n_lmbs,
 			 struct drmem_lmb **end_lmb)
 {
 	struct drmem_lmb *lmb, *start, *end;
-	struct drmem_lmb *last_lmb;
+	struct drmem_lmb *limit;
 
 	start = NULL;
 	for_each_drmem_lmb(lmb) {
@@ -236,10 +236,10 @@ static int get_lmb_range(u32 drc_index, int n_lmbs,
 	if (!start)
 		return -EINVAL;
 
-	end = &start[n_lmbs - 1];
+	end = &start[n_lmbs];
 
-	last_lmb = &drmem_info->lmbs[drmem_info->n_lmbs - 1];
-	if (end > last_lmb)
+	limit = &drmem_info->lmbs[drmem_info->n_lmbs];
+	if (end > limit)
 		return -EINVAL;
 
 	*start_lmb = start;
arch/powerpc/sysdev/xive/common.c +7 -9
index 9651ca061828..fe8d396e2301 100644
@@ -68,13 +68,6 @@ static u32 xive_ipi_irq;
 /* Xive state for each CPU */
 static DEFINE_PER_CPU(struct xive_cpu *, xive_cpu);
 
-/*
- * A "disabled" interrupt should never fire, to catch problems
- * we set its logical number to this
- */
-#define XIVE_BAD_IRQ		0x7fffffff
-#define XIVE_MAX_IRQ		(XIVE_BAD_IRQ - 1)
-
 /* An invalid CPU target */
 #define XIVE_INVALID_TARGET	(-1)
 
@@ -265,11 +258,15 @@ notrace void xmon_xive_do_dump(int cpu)
 
 int xmon_xive_get_irq_config(u32 hw_irq, struct irq_data *d)
 {
+	struct irq_chip *chip = irq_data_get_irq_chip(d);
 	int rc;
 	u32 target;
 	u8 prio;
 	u32 lirq;
 
+	if (!is_xive_irq(chip))
+		return -EINVAL;
+
 	rc = xive_ops->get_irq_config(hw_irq, &target, &prio, &lirq);
 	if (rc) {
 		xmon_printf("IRQ 0x%08x : no config rc=%d\n", hw_irq, rc);
@@ -1150,7 +1147,7 @@ static int xive_setup_cpu_ipi(unsigned int cpu)
 	xc = per_cpu(xive_cpu, cpu);
 
 	/* Check if we are already setup */
-	if (xc->hw_ipi != 0)
+	if (xc->hw_ipi != XIVE_BAD_IRQ)
 		return 0;
 
 	/* Grab an IPI from the backend, this will populate xc->hw_ipi */
@@ -1187,7 +1184,7 @@ static void xive_cleanup_cpu_ipi(unsigned int cpu, struct xive_cpu *xc)
 	/* Disable the IPI and free the IRQ data */
 
 	/* Already cleaned up ? */
-	if (xc->hw_ipi == 0)
+	if (xc->hw_ipi == XIVE_BAD_IRQ)
 		return;
 
 	/* Mask the IPI */
@@ -1343,6 +1340,7 @@ static int xive_prepare_cpu(unsigned int cpu)
 		if (np)
 			xc->chip_id = of_get_ibm_chip_id(np);
 		of_node_put(np);
+		xc->hw_ipi = XIVE_BAD_IRQ;
 
 		per_cpu(xive_cpu, cpu) = xc;
 	}
arch/powerpc/sysdev/xive/native.c +2 -2
index 0ff6b739052c..50e1a8e02497 100644
@@ -312,7 +312,7 @@ static void xive_native_put_ipi(unsigned int cpu, struct xive_cpu *xc)
 	s64 rc;
 
 	/* Free the IPI */
-	if (!xc->hw_ipi)
+	if (xc->hw_ipi == XIVE_BAD_IRQ)
 		return;
 	for (;;) {
 		rc = opal_xive_free_irq(xc->hw_ipi);
@@ -320,7 +320,7 @@ static void xive_native_put_ipi(unsigned int cpu, struct xive_cpu *xc)
 			msleep(OPAL_BUSY_DELAY_MS);
 			continue;
 		}
-		xc->hw_ipi = 0;
+		xc->hw_ipi = XIVE_BAD_IRQ;
 		break;
 	}
 }
arch/powerpc/sysdev/xive/spapr.c +2 -2
index 55dc61cb4867..3f15615712b5 100644
@@ -560,11 +560,11 @@ static int xive_spapr_get_ipi(unsigned int cpu, struct xive_cpu *xc)
 
 static void xive_spapr_put_ipi(unsigned int cpu, struct xive_cpu *xc)
 {
-	if (!xc->hw_ipi)
+	if (xc->hw_ipi == XIVE_BAD_IRQ)
 		return;
 
 	xive_irq_bitmap_free(xc->hw_ipi);
-	xc->hw_ipi = 0;
+	xc->hw_ipi = XIVE_BAD_IRQ;
 }
 #endif /* CONFIG_SMP */
 
arch/powerpc/sysdev/xive/xive-internal.h +7 -0
index 59cd366e7933..382980f4de2d 100644
@@ -5,6 +5,13 @@
 #ifndef __XIVE_INTERNAL_H
 #define __XIVE_INTERNAL_H
 
+/*
+ * A "disabled" interrupt should never fire, to catch problems
+ * we set its logical number to this
+ */
+#define XIVE_BAD_IRQ		0x7fffffff
+#define XIVE_MAX_IRQ		(XIVE_BAD_IRQ - 1)
+
 /* Each CPU carry one of these with various per-CPU state */
 struct xive_cpu {
 #ifdef CONFIG_SMP
arch/powerpc/xmon/Makefile +0 -3
index c3842dbeb1b7..6f9cccea54f3 100644
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Makefile for xmon
 
-# Avoid clang warnings around longjmp/setjmp declarations
-subdir-ccflags-y := -ffreestanding
-
 GCOV_PROFILE := n
 KCOV_INSTRUMENT := n
 UBSAN_SANITIZE := n
arch/s390/kernel/diag.c +1 -1
index e9dac9a24d3f..61f2b0412345 100644
@@ -84,7 +84,7 @@ static int show_diag_stat(struct seq_file *m, void *v)
 
 static void *show_diag_stat_start(struct seq_file *m, loff_t *pos)
 {
-	return *pos <= nr_cpu_ids ? (void *)((unsigned long) *pos + 1) : NULL;
+	return *pos <= NR_DIAG_STAT ? (void *)((unsigned long) *pos + 1) : NULL;
 }
 
 static void *show_diag_stat_next(struct seq_file *m, void *v, loff_t *pos)
arch/s390/kvm/vsie.c +1 -0
index 076090f9e666..4f6c22d72072 100644
@@ -1202,6 +1202,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
 		scb_s->iprcc = PGM_ADDRESSING;
 		scb_s->pgmilc = 4;
 		scb_s->gpsw.addr = __rewind_psw(scb_s->gpsw, 4);
+		rc = 1;
 	}
 	return rc;
 }
arch/s390/mm/gmap.c +5 -1
index edcdca97e85e..9d9ab77d02dd 100644
@@ -787,14 +787,18 @@ static void gmap_call_notifier(struct gmap *gmap, unsigned long start,
 static inline unsigned long *gmap_table_walk(struct gmap *gmap,
 					     unsigned long gaddr, int level)
 {
+	const int asce_type = gmap->asce & _ASCE_TYPE_MASK;
 	unsigned long *table;
 
 	if ((gmap->asce & _ASCE_TYPE_MASK) + 4 < (level * 4))
 		return NULL;
 	if (gmap_is_shadow(gmap) && gmap->removed)
 		return NULL;
-	if (gaddr & (-1UL << (31 + ((gmap->asce & _ASCE_TYPE_MASK) >> 2)*11)))
+
+	if (asce_type != _ASCE_TYPE_REGION1 &&
+	    gaddr & (-1UL << (31 + (asce_type >> 2) * 11)))
 		return NULL;
+
 	table = gmap->table;
 	switch (gmap->asce & _ASCE_TYPE_MASK) {
 	case _ASCE_TYPE_REGION1:
arch/x86/boot/compressed/head_32.S +1 -1
index 73f17d0544dd..7f7e8b8518fe 100644
@@ -106,7 +106,7 @@ SYM_FUNC_START(startup_32)
 	notl	%eax
 	andl    %eax, %ebx
 	cmpl	$LOAD_PHYSICAL_ADDR, %ebx
-	jge	1f
+	jae	1f
 #endif
 	movl	$LOAD_PHYSICAL_ADDR, %ebx
 1:
arch/x86/boot/compressed/head_64.S +2 -2
index 1f1f6c8139b3..afde2aa8382e 100644
@@ -106,7 +106,7 @@ SYM_FUNC_START(startup_32)
 	notl	%eax
 	andl	%eax, %ebx
 	cmpl	$LOAD_PHYSICAL_ADDR, %ebx
-	jge	1f
+	jae	1f
 #endif
 	movl	$LOAD_PHYSICAL_ADDR, %ebx
 1:
@@ -296,7 +296,7 @@ SYM_CODE_START(startup_64)
 	notq	%rax
 	andq	%rax, %rbp
 	cmpq	$LOAD_PHYSICAL_ADDR, %rbp
-	jge	1f
+	jae	1f
 #endif
 	movq	$LOAD_PHYSICAL_ADDR, %rbp
 1:
arch/x86/entry/entry_32.S +1 -0
index 7e0560442538..39243df98100 100644
@@ -1694,6 +1694,7 @@ SYM_CODE_START(int3)
 SYM_CODE_END(int3)
 
 SYM_CODE_START(general_protection)
+	ASM_CLAC
 	pushl	$do_general_protection
 	jmp	common_exception
 SYM_CODE_END(general_protection)
arch/x86/include/asm/kvm_host.h +1 -1
index 98959e8cd448..d79b40cd8283 100644
@@ -1180,7 +1180,7 @@ struct kvm_x86_ops {
 	bool (*pt_supported)(void);
 	bool (*pku_supported)(void);
 
-	int (*check_nested_events)(struct kvm_vcpu *vcpu, bool external_intr);
+	int (*check_nested_events)(struct kvm_vcpu *vcpu);
 	void (*request_immediate_exit)(struct kvm_vcpu *vcpu);
 
 	void (*sched_in)(struct kvm_vcpu *kvm, int cpu);
arch/x86/include/asm/pgtable.h +5 -2
index 7e118660bbd9..64a03f226ab7 100644
@@ -627,12 +627,15 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
 	return __pmd(val);
 }
 
-/* mprotect needs to preserve PAT bits when updating vm_page_prot */
+/*
+ * mprotect needs to preserve PAT and encryption bits when updating
+ * vm_page_prot
+ */
 #define pgprot_modify pgprot_modify
 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
 {
 	pgprotval_t preservebits = pgprot_val(oldprot) & _PAGE_CHG_MASK;
-	pgprotval_t addbits = pgprot_val(newprot);
+	pgprotval_t addbits = pgprot_val(newprot) & ~_PAGE_CHG_MASK;
 	return __pgprot(preservebits | addbits);
 }
 
arch/x86/include/asm/pgtable_types.h +1 -1
index 0239998d8cdc..65c2ecd730c5 100644
@@ -118,7 +118,7 @@
  */
 #define _PAGE_CHG_MASK	(PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT |		\
 			 _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY |	\
-			 _PAGE_SOFT_DIRTY | _PAGE_DEVMAP)
+			 _PAGE_SOFT_DIRTY | _PAGE_DEVMAP | _PAGE_ENC)
 #define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE)
 
 /*
arch/x86/kernel/acpi/boot.c +1 -1
index 04205ce127a1..f9e84a0e2fa2 100644
@@ -1740,7 +1740,7 @@ int __acpi_acquire_global_lock(unsigned int *lock)
 		new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
 		val = cmpxchg(lock, old, new);
 	} while (unlikely (val != old));
-	return (new < 3) ? -1 : 0;
+	return ((new & 0x3) < 3) ? -1 : 0;
 }
 
 int __acpi_release_global_lock(unsigned int *lock)
arch/x86/kernel/tsc_msr.c +112 -16

190 lines not on this page · raw message

arch/x86/kvm/svm.c +4 -0
index 50d1ebafe0b3..451377533bcb 100644
@@ -1943,6 +1943,10 @@ static struct kvm *svm_vm_alloc(void)
 	struct kvm_svm *kvm_svm = __vmalloc(sizeof(struct kvm_svm),
 					    GFP_KERNEL_ACCOUNT | __GFP_ZERO,
 					    PAGE_KERNEL);
+
+	if (!kvm_svm)
+		return NULL;
+
 	return &kvm_svm->kvm;
 }
 
arch/x86/kvm/vmx/nested.c +4 -14
index 9750e590c89d..eec7b2d93104 100644
@@ -3604,7 +3604,7 @@ static void nested_vmx_update_pending_dbg(struct kvm_vcpu *vcpu)
 			    vcpu->arch.exception.payload);
 }
 
-static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)
+static int vmx_check_nested_events(struct kvm_vcpu *vcpu)
 {
 	struct vcpu_vmx *vmx = to_vmx(vcpu);
 	unsigned long exit_qual;
@@ -3680,8 +3680,7 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)
 		return 0;
 	}
 
-	if ((kvm_cpu_has_interrupt(vcpu) || external_intr) &&
-	    nested_exit_on_intr(vcpu)) {
+	if (kvm_cpu_has_interrupt(vcpu) && nested_exit_on_intr(vcpu)) {
 		if (block_nested_events)
 			return -EBUSY;
 		nested_vmx_vmexit(vcpu, EXIT_REASON_EXTERNAL_INTERRUPT, 0, 0);
@@ -4329,17 +4328,8 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
 	vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
 
 	if (likely(!vmx->fail)) {
-		/*
-		 * TODO: SDM says that with acknowledge interrupt on
-		 * exit, bit 31 of the VM-exit interrupt information
-		 * (valid interrupt) is always set to 1 on
-		 * EXIT_REASON_EXTERNAL_INTERRUPT, so we shouldn't
-		 * need kvm_cpu_has_interrupt().  See the commit
-		 * message for details.
-		 */
-		if (nested_exit_intr_ack_set(vcpu) &&
-		    exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT &&
-		    kvm_cpu_has_interrupt(vcpu)) {
+		if (exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT &&
+		    nested_exit_intr_ack_set(vcpu)) {
 			int irq = kvm_cpu_get_interrupt(vcpu);
 			WARN_ON(irq < 0);
 			vmcs12->vm_exit_intr_info = irq |
arch/x86/kvm/vmx/ops.h +21 -7
index 45eaedee2ac0..09b0937d56b1 100644
@@ -12,7 +12,8 @@
 
 #define __ex(x) __kvm_handle_fault_on_reboot(x)
 
-asmlinkage void vmread_error(unsigned long field, bool fault);
+__attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
+							 bool fault);
 void vmwrite_error(unsigned long field, unsigned long value);
 void vmclear_error(struct vmcs *vmcs, u64 phys_addr);
 void vmptrld_error(struct vmcs *vmcs, u64 phys_addr);
@@ -70,15 +71,28 @@ static __always_inline unsigned long __vmcs_readl(unsigned long field)
 	asm volatile("1: vmread %2, %1\n\t"
 		     ".byte 0x3e\n\t" /* branch taken hint */
 		     "ja 3f\n\t"
-		     "mov %2, %%" _ASM_ARG1 "\n\t"
-		     "xor %%" _ASM_ARG2 ", %%" _ASM_ARG2 "\n\t"
-		     "2: call vmread_error\n\t"
-		     "xor %k1, %k1\n\t"
+
+		     /*
+		      * VMREAD failed.  Push '0' for @fault, push the failing
+		      * @field, and bounce through the trampoline to preserve
+		      * volatile registers.
+		      */
+		     "push $0\n\t"
+		     "push %2\n\t"
+		     "2:call vmread_error_trampoline\n\t"
+
+		     /*
+		      * Unwind the stack.  Note, the trampoline zeros out the
+		      * memory for @fault so that the result is '0' on error.
+		      */
+		     "pop %2\n\t"
+		     "pop %1\n\t"
 		     "3:\n\t"
 
+		     /* VMREAD faulted.  As above, except push '1' for @fault. */
 		     ".pushsection .fixup, \"ax\"\n\t"
-		     "4: mov %2, %%" _ASM_ARG1 "\n\t"
-		     "mov $1, %%" _ASM_ARG2 "\n\t"
+		     "4: push $1\n\t"
+		     "push %2\n\t"
 		     "jmp 2b\n\t"
 		     ".popsection\n\t"
 		     _ASM_EXTABLE(1b, 4b)
arch/x86/kvm/vmx/vmenter.S +58 -0

61 lines not on this page · raw message

arch/x86/kvm/vmx/vmx.c +34 -58

162 lines not on this page · raw message

arch/x86/kvm/x86.c +16 -5
index cf95c36cb4f4..17650bda4331 100644
@@ -7635,7 +7635,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
 	kvm_x86_ops->update_cr8_intercept(vcpu, tpr, max_irr);
 }
 
-static int inject_pending_event(struct kvm_vcpu *vcpu, bool req_int_win)
+static int inject_pending_event(struct kvm_vcpu *vcpu)
 {
 	int r;
 
@@ -7671,7 +7671,7 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool req_int_win)
 	 * from L2 to L1.
 	 */
 	if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events) {
-		r = kvm_x86_ops->check_nested_events(vcpu, req_int_win);
+		r = kvm_x86_ops->check_nested_events(vcpu);
 		if (r != 0)
 			return r;
 	}
@@ -7733,7 +7733,7 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool req_int_win)
 		 * KVM_REQ_EVENT only on certain events and not unconditionally?
 		 */
 		if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events) {
-			r = kvm_x86_ops->check_nested_events(vcpu, req_int_win);
+			r = kvm_x86_ops->check_nested_events(vcpu);
 			if (r != 0)
 				return r;
 		}
@@ -8266,7 +8266,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
 			goto out;
 		}
 
-		if (inject_pending_event(vcpu, req_int_win) != 0)
+		if (inject_pending_event(vcpu) != 0)
 			req_immediate_exit = true;
 		else {
 			/* Enable SMI/NMI/IRQ window open exits if needed.
@@ -8496,7 +8496,7 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu)
 static inline bool kvm_vcpu_running(struct kvm_vcpu *vcpu)
 {
 	if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)
-		kvm_x86_ops->check_nested_events(vcpu, false);
+		kvm_x86_ops->check_nested_events(vcpu);
 
 	return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&
 		!vcpu->arch.apf.halted);
@@ -9873,6 +9873,13 @@ int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
 {
 	int i;
 
+	/*
+	 * Clear out the previous array pointers for the KVM_MR_MOVE case.  The
+	 * old arrays will be freed by __kvm_set_memory_region() if installing
+	 * the new memslot is successful.
+	 */
+	memset(&slot->arch, 0, sizeof(slot->arch));
+
 	for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
 		struct kvm_lpage_info *linfo;
 		unsigned long ugfn;
@@ -9954,6 +9961,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 				const struct kvm_userspace_memory_region *mem,
 				enum kvm_mr_change change)
 {
+	if (change == KVM_MR_MOVE)
+		return kvm_arch_create_memslot(kvm, memslot,
+					       mem->memory_size >> PAGE_SHIFT);
+
 	return 0;
 }
 
arch/x86/platform/efi/efi.c +2 -0
index ae923ee8e2b4..bfe4b0fb6f71 100644
@@ -85,6 +85,8 @@ static const unsigned long * const efi_tables[] = {
 #ifdef CONFIG_EFI_RCI2_TABLE
 	&rci2_table_phys,
 #endif
+	&efi.tpm_log,
+	&efi.tpm_final_log,
 };
 
 u64 efi_setup;		/* efi setup_data physical address */
arch/x86/platform/efi/efi_64.c +2 -2
index d19a2edd63cb..a47294063882 100644
@@ -641,7 +641,7 @@ efi_thunk_set_variable(efi_char16_t *name, efi_guid_t *vendor,
 	phys_vendor = virt_to_phys_or_null(vnd);
 	phys_data = virt_to_phys_or_null_size(data, data_size);
 
-	if (!phys_name || !phys_data)
+	if (!phys_name || (data && !phys_data))
 		status = EFI_INVALID_PARAMETER;
 	else
 		status = efi_thunk(set_variable, phys_name, phys_vendor,
@@ -672,7 +672,7 @@ efi_thunk_set_variable_nonblocking(efi_char16_t *name, efi_guid_t *vendor,
 	phys_vendor = virt_to_phys_or_null(vnd);
 	phys_data = virt_to_phys_or_null_size(data, data_size);
 
-	if (!phys_name || !phys_data)
+	if (!phys_name || (data && !phys_data))
 		status = EFI_INVALID_PARAMETER;
 	else
 		status = efi_thunk(set_variable, phys_name, phys_vendor,
block/bfq-cgroup.c +7 -7
index f0ff6654af28..9d963ed518d1 100644
@@ -642,6 +642,12 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 {
 	struct bfq_entity *entity = &bfqq->entity;
 
+	/*
+	 * Get extra reference to prevent bfqq from being freed in
+	 * next possible expire or deactivate.
+	 */
+	bfqq->ref++;
+
 	/* If bfqq is empty, then bfq_bfqq_expire also invokes
 	 * bfq_del_bfqq_busy, thereby removing bfqq and its entity
 	 * from data structures related to current group. Otherwise we
@@ -652,12 +658,6 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 		bfq_bfqq_expire(bfqd, bfqd->in_service_queue,
 				false, BFQQE_PREEMPTED);
 
-	/*
-	 * get extra reference to prevent bfqq from being freed in
-	 * next possible deactivate
-	 */
-	bfqq->ref++;
-
 	if (bfq_bfqq_busy(bfqq))
 		bfq_deactivate_bfqq(bfqd, bfqq, false, false);
 	else if (entity->on_st_or_in_serv)
@@ -677,7 +677,7 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 
 	if (!bfqd->in_service_queue && !bfqd->rq_in_driver)
 		bfq_schedule_dispatch(bfqd);
-	/* release extra ref taken above */
+	/* release extra ref taken above, bfqq may happen to be freed now */
 	bfq_put_queue(bfqq);
 }
 
block/bfq-iosched.c +12 -4
index 8c436abfaf14..4a44c7f19435 100644
@@ -6215,20 +6215,28 @@ static struct bfq_queue *bfq_init_rq(struct request *rq)
 	return bfqq;
 }
 
-static void bfq_idle_slice_timer_body(struct bfq_queue *bfqq)
+static void
+bfq_idle_slice_timer_body(struct bfq_data *bfqd, struct bfq_queue *bfqq)
 {
-	struct bfq_data *bfqd = bfqq->bfqd;
 	enum bfqq_expiration reason;
 	unsigned long flags;
 
 	spin_lock_irqsave(&bfqd->lock, flags);
-	bfq_clear_bfqq_wait_request(bfqq);
 
+	/*
+	 * Considering that bfqq may be in race, we should firstly check
+	 * whether bfqq is in service before doing something on it. If
+	 * the bfqq in race is not in service, it has already been expired
+	 * through __bfq_bfqq_expire func and its wait_request flags has
+	 * been cleared in __bfq_bfqd_reset_in_service func.
+	 */
 	if (bfqq != bfqd->in_service_queue) {
 		spin_unlock_irqrestore(&bfqd->lock, flags);
 		return;
 	}
 
+	bfq_clear_bfqq_wait_request(bfqq);
+
 	if (bfq_bfqq_budget_timeout(bfqq))
 		/*
 		 * Also here the queue can be safely expired
@@ -6273,7 +6281,7 @@ static enum hrtimer_restart bfq_idle_slice_timer(struct hrtimer *timer)
 	 * early.
 	 */
 	if (bfqq)
-		bfq_idle_slice_timer_body(bfqq);
+		bfq_idle_slice_timer_body(bfqd, bfqq);
 
 	return HRTIMER_NORESTART;
 }
block/blk-ioc.c +7 -0
index 5ed59ac6ae58..9df50fb507ca 100644
@@ -84,6 +84,7 @@ static void ioc_destroy_icq(struct io_cq *icq)
 	 * making it impossible to determine icq_cache.  Record it in @icq.
 	 */
 	icq->__rcu_icq_cache = et->icq_cache;
+	icq->flags |= ICQ_DESTROYED;
 	call_rcu(&icq->__rcu_head, icq_free_icq_rcu);
 }
 
@@ -212,15 +213,21 @@ static void __ioc_clear_queue(struct list_head *icq_list)
 {
 	unsigned long flags;
 
+	rcu_read_lock();
 	while (!list_empty(icq_list)) {
 		struct io_cq *icq = list_entry(icq_list->next,
 						struct io_cq, q_node);
 		struct io_context *ioc = icq->ioc;
 
 		spin_lock_irqsave(&ioc->lock, flags);
+		if (icq->flags & ICQ_DESTROYED) {
+			spin_unlock_irqrestore(&ioc->lock, flags);
+			continue;
+		}
 		ioc_destroy_icq(icq);
 		spin_unlock_irqrestore(&ioc->lock, flags);
 	}
+	rcu_read_unlock();
 }
 
 /**
block/blk-mq.c +0 -1
index d4bd9b961726..37ff8dfb8ab9 100644
@@ -2824,7 +2824,6 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
 			memcpy(new_hctxs, hctxs, q->nr_hw_queues *
 			       sizeof(*hctxs));
 		q->queue_hw_ctx = new_hctxs;
-		q->nr_hw_queues = set->nr_hw_queues;
 		kfree(hctxs);
 		hctxs = new_hctxs;
 	}
block/blk-settings.c +3 -0
index c8eda2e7b91e..be1dca0103a4 100644
@@ -664,6 +664,9 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev,
 		printk(KERN_NOTICE "%s: Warning: Device %s is misaligned\n",
 		       top, bottom);
 	}
+
+	t->backing_dev_info->io_pages =
+		t->limits.max_sectors >> (PAGE_SHIFT - 9);
 }
 EXPORT_SYMBOL(disk_stack_limits);
 
block/blk-zoned.c +1 -1
index 05741c6f618b..6b442ae96499 100644
@@ -173,7 +173,7 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_opf op,
 	if (!op_is_zone_mgmt(op))
 		return -EOPNOTSUPP;
 
-	if (!nr_sectors || end_sector > capacity)
+	if (end_sector <= sector || end_sector > capacity)
 		/* Out of range */
 		return -EINVAL;
 
crypto/rng.c +6 -2
index 1e21231f71c9..1490d210f1a1 100644
@@ -37,12 +37,16 @@ int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen)
 	crypto_stats_get(alg);
 	if (!seed && slen) {
 		buf = kmalloc(slen, GFP_KERNEL);
-		if (!buf)
+		if (!buf) {
+			crypto_alg_put(alg);
 			return -ENOMEM;
+		}
 
 		err = get_random_bytes_wait(buf, slen);
-		if (err)
+		if (err) {
+			crypto_alg_put(alg);
 			goto out;
+		}
 		seed = buf;
 	}
 
drivers/acpi/acpica/achware.h +1 -1
index 6ad0517553d5..ebf6453d0e21 100644
@@ -101,7 +101,7 @@ acpi_status acpi_hw_enable_all_runtime_gpes(void);
 
 acpi_status acpi_hw_enable_all_wakeup_gpes(void);
 
-u8 acpi_hw_check_all_gpes(void);
+u8 acpi_hw_check_all_gpes(acpi_handle gpe_skip_device, u32 gpe_skip_number);
 
 acpi_status
 acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
drivers/acpi/acpica/evxfgpe.c +12 -5
index f2de66bfd8a7..3be60673e461 100644
@@ -799,17 +799,19 @@ ACPI_EXPORT_SYMBOL(acpi_enable_all_wakeup_gpes)
  *
  * FUNCTION:    acpi_any_gpe_status_set
  *
- * PARAMETERS:  None
+ * PARAMETERS:  gpe_skip_number      - Number of the GPE to skip
  *
  * RETURN:      Whether or not the status bit is set for any GPE
  *
- * DESCRIPTION: Check the status bits of all enabled GPEs and return TRUE if any
- *              of them is set or FALSE otherwise.
+ * DESCRIPTION: Check the status bits of all enabled GPEs, except for the one
+ *              represented by the "skip" argument, and return TRUE if any of
+ *              them is set or FALSE otherwise.
  *
  ******************************************************************************/
-u32 acpi_any_gpe_status_set(void)
+u32 acpi_any_gpe_status_set(u32 gpe_skip_number)
 {
 	acpi_status status;
+	acpi_handle gpe_device;
 	u8 ret;
 
 	ACPI_FUNCTION_TRACE(acpi_any_gpe_status_set);
@@ -819,7 +821,12 @@ u32 acpi_any_gpe_status_set(void)
 		return (FALSE);
 	}
 
-	ret = acpi_hw_check_all_gpes();
+	status = acpi_get_gpe_device(gpe_skip_number, &gpe_device);
+	if (ACPI_FAILURE(status)) {
+		gpe_device = NULL;
+	}
+
+	ret = acpi_hw_check_all_gpes(gpe_device, gpe_skip_number);
 	(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
 
 	return (ret);
drivers/acpi/acpica/hwgpe.c +38 -9

93 lines not on this page · raw message

drivers/acpi/ec.c +19 -7
index d1f1cf5d4bf0..29b8fa618a02 100644
@@ -1584,14 +1584,19 @@ static int acpi_ec_setup(struct acpi_ec *ec, struct acpi_device *device,
 		return ret;
 
 	/* First EC capable of handling transactions */
-	if (!first_ec) {
+	if (!first_ec)
 		first_ec = ec;
-		acpi_handle_info(first_ec->handle, "Used as first EC\n");
+
+	pr_info("EC_CMD/EC_SC=0x%lx, EC_DATA=0x%lx\n", ec->command_addr,
+		ec->data_addr);
+
+	if (test_bit(EC_FLAGS_EVENT_HANDLER_INSTALLED, &ec->flags)) {
+		if (ec->gpe >= 0)
+			pr_info("GPE=0x%x\n", ec->gpe);
+		else
+			pr_info("IRQ=%d\n", ec->irq);
 	}
 
-	acpi_handle_info(ec->handle,
-			 "GPE=0x%x, IRQ=%d, EC_CMD/EC_SC=0x%lx, EC_DATA=0x%lx\n",
-			 ec->gpe, ec->irq, ec->command_addr, ec->data_addr);
 	return ret;
 }
 
@@ -1641,7 +1646,6 @@ static int acpi_ec_add(struct acpi_device *device)
 
 		if (boot_ec && ec->command_addr == boot_ec->command_addr &&
 		    ec->data_addr == boot_ec->data_addr) {
-			boot_ec_is_ecdt = false;
 			/*
 			 * Trust PNP0C09 namespace location rather than
 			 * ECDT ID. But trust ECDT GPE rather than _GPE
@@ -1661,9 +1665,12 @@ static int acpi_ec_add(struct acpi_device *device)
 
 	if (ec == boot_ec)
 		acpi_handle_info(boot_ec->handle,
-				 "Boot %s EC used to handle transactions and events\n",
+				 "Boot %s EC initialization complete\n",
 				 boot_ec_is_ecdt ? "ECDT" : "DSDT");
 
+	acpi_handle_info(ec->handle,
+			 "EC: Used to handle transactions and events\n");
+
 	device->driver_data = ec;
 
 	ret = !!request_region(ec->data_addr, 1, "EC data");
@@ -2037,6 +2044,11 @@ void acpi_ec_set_gpe_wake_mask(u8 action)
 		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
 }
 
+bool acpi_ec_other_gpes_active(void)
+{
+	return acpi_any_gpe_status_set(first_ec ? first_ec->gpe : U32_MAX);
+}
+
 bool acpi_ec_dispatch_gpe(void)
 {
 	u32 ret;
drivers/acpi/internal.h +1 -0
index 3616daec650b..d44c591c4ee4 100644
@@ -202,6 +202,7 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);
 
 #ifdef CONFIG_PM_SLEEP
 void acpi_ec_flush_work(void);
+bool acpi_ec_other_gpes_active(void);
 bool acpi_ec_dispatch_gpe(void);
 #endif
 
drivers/acpi/sleep.c +10 -9
index ce49cbfa941b..f4dbdfafafe3 100644
@@ -1017,18 +1017,19 @@ static bool acpi_s2idle_wake(void)
 			return true;
 
 		/*
-		 * If there are no EC events to process and at least one of the
-		 * other enabled GPEs is active, the wakeup is regarded as a
-		 * genuine one.
-		 *
-		 * Note that the checks below must be carried out in this order
-		 * to avoid returning prematurely due to a change of the EC GPE
-		 * status bit from unset to set between the checks with the
-		 * status bits of all the other GPEs unset.
+		 * If the status bit is set for any enabled GPE other than the
+		 * EC one, the wakeup is regarded as a genuine one.
 		 */
-		if (acpi_any_gpe_status_set() && !acpi_ec_dispatch_gpe())
+		if (acpi_ec_other_gpes_active())
 			return true;
 
+		/*
+		 * If the EC GPE status bit has not been set, the wakeup is
+		 * regarded as a spurious one.
+		 */
+		if (!acpi_ec_dispatch_gpe())
+			return false;
+
 		/*
 		 * Cancel the wakeup and process all pending events in case
 		 * there are any wakeup ones in there.
drivers/ata/libata-pmp.c +1 -0
index 3ff14071617c..79f2aeeb482a 100644
@@ -763,6 +763,7 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
 
 	if (dev->flags & ATA_DFLAG_DETACH) {
 		detach = 1;
+		rc = -ENODEV;
 		goto fail;
 	}
 
drivers/ata/libata-scsi.c +3 -6
index eb2eb599e602..061eebf85e6d 100644
@@ -4562,22 +4562,19 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
 		 */
 		shost->max_host_blocked = 1;
 
-		rc = scsi_add_host_with_dma(ap->scsi_host,
-						&ap->tdev, ap->host->dev);
+		rc = scsi_add_host_with_dma(shost, &ap->tdev, ap->host->dev);
 		if (rc)
-			goto err_add;
+			goto err_alloc;
 	}
 
 	return 0;
 
- err_add:
-	scsi_host_put(host->ports[i]->scsi_host);
  err_alloc:
 	while (--i >= 0) {
 		struct Scsi_Host *shost = host->ports[i]->scsi_host;
 
+		/* scsi_host_put() is in ata_devres_release() */
 		scsi_remove_host(shost);
-		scsi_host_put(shost);
 	}
 	return rc;
 }
drivers/base/firmware_loader/fallback.c +1 -1
index 8704e1bae175..1e9c96e3ed63 100644
@@ -525,7 +525,7 @@ static int fw_load_sysfs_fallback(struct fw_sysfs *fw_sysfs,
 	}
 
 	retval = fw_sysfs_wait_timeout(fw_priv, timeout);
-	if (retval < 0) {
+	if (retval < 0 && retval != -ENOENT) {
 		mutex_lock(&fw_lock);
 		fw_load_abort(fw_sysfs);
 		mutex_unlock(&fw_lock);
drivers/base/power/domain.c +1 -1
index 959d6d5eb000..0a01df608849 100644
@@ -2653,7 +2653,7 @@ static int genpd_iterate_idle_states(struct device_node *dn,
 
 	ret = of_count_phandle_with_args(dn, "domain-idle-states", NULL);
 	if (ret <= 0)
-		return ret;
+		return ret == -ENOENT ? 0 : ret;
 
 	/* Loop over the phandles until all the requested entry is found */
 	of_for_each_phandle(&it, ret, dn, "domain-idle-states", NULL, 0) {
drivers/base/power/wakeup.c +3 -1
index 27f3e60608e5..6dffcb71b86c 100644
@@ -241,7 +241,9 @@ void wakeup_source_unregister(struct wakeup_source *ws)
 {
 	if (ws) {
 		wakeup_source_remove(ws);
-		wakeup_source_sysfs_remove(ws);
+		if (ws->dev)
+			wakeup_source_sysfs_remove(ws);
+
 		wakeup_source_destroy(ws);
 	}
 }
drivers/block/null_blk_main.c +10 -2
index 133060431dbd..d6a8d66e9803 100644
@@ -276,7 +276,7 @@ nullb_device_##NAME##_store(struct config_item *item, const char *page,	\
 {									\
 	int (*apply_fn)(struct nullb_device *dev, TYPE new_value) = APPLY;\
 	struct nullb_device *dev = to_nullb_device(item);		\
-	TYPE uninitialized_var(new_value);				\
+	TYPE new_value = 0;						\
 	int ret;							\
 									\
 	ret = nullb_device_##TYPE##_attr_store(&new_value, page, count);\
@@ -605,6 +605,7 @@ static struct nullb_cmd *__alloc_cmd(struct nullb_queue *nq)
 	if (tag != -1U) {
 		cmd = &nq->cmds[tag];
 		cmd->tag = tag;
+		cmd->error = BLK_STS_OK;
 		cmd->nq = nq;
 		if (nq->dev->irqmode == NULL_IRQ_TIMER) {
 			hrtimer_init(&cmd->timer, CLOCK_MONOTONIC,
@@ -1385,6 +1386,7 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,
 		cmd->timer.function = null_cmd_timer_expired;
 	}
 	cmd->rq = bd->rq;
+	cmd->error = BLK_STS_OK;
 	cmd->nq = nq;
 
 	blk_mq_start_request(bd->rq);
@@ -1432,7 +1434,12 @@ static void cleanup_queues(struct nullb *nullb)
 
 static void null_del_dev(struct nullb *nullb)
 {
-	struct nullb_device *dev = nullb->dev;
+	struct nullb_device *dev;
+
+	if (!nullb)
+		return;
+
+	dev = nullb->dev;
 
 	ida_simple_remove(&nullb_indexes, nullb->index);
 
@@ -1788,6 +1795,7 @@ static int null_add_dev(struct nullb_device *dev)
 	cleanup_queues(nullb);
 out_free_nullb:
 	kfree(nullb);
+	dev->nullb = NULL;
 out:
 	return rv;
 }
drivers/block/xen-blkfront.c +12 -5
index 9df516a56bb2..b32877e0b384 100644
@@ -47,6 +47,7 @@
 #include <linux/bitmap.h>
 #include <linux/list.h>
 #include <linux/workqueue.h>
+#include <linux/sched/mm.h>
 
 #include <xen/xen.h>
 #include <xen/xenbus.h>
@@ -2189,10 +2190,12 @@ static void blkfront_setup_discard(struct blkfront_info *info)
 
 static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
 {
-	unsigned int psegs, grants;
+	unsigned int psegs, grants, memflags;
 	int err, i;
 	struct blkfront_info *info = rinfo->dev_info;
 
+	memflags = memalloc_noio_save();
+
 	if (info->max_indirect_segments == 0) {
 		if (!HAS_EXTRA_REQ)
 			grants = BLKIF_MAX_SEGMENTS_PER_REQUEST;
@@ -2224,7 +2227,7 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
 
 		BUG_ON(!list_empty(&rinfo->indirect_pages));
 		for (i = 0; i < num; i++) {
-			struct page *indirect_page = alloc_page(GFP_NOIO);
+			struct page *indirect_page = alloc_page(GFP_KERNEL);
 			if (!indirect_page)
 				goto out_of_memory;
 			list_add(&indirect_page->lru, &rinfo->indirect_pages);
@@ -2235,15 +2238,15 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
 		rinfo->shadow[i].grants_used =
 			kvcalloc(grants,
 				 sizeof(rinfo->shadow[i].grants_used[0]),
-				 GFP_NOIO);
+				 GFP_KERNEL);
 		rinfo->shadow[i].sg = kvcalloc(psegs,
 					       sizeof(rinfo->shadow[i].sg[0]),
-					       GFP_NOIO);
+					       GFP_KERNEL);
 		if (info->max_indirect_segments)
 			rinfo->shadow[i].indirect_grants =
 				kvcalloc(INDIRECT_GREFS(grants),
 					 sizeof(rinfo->shadow[i].indirect_grants[0]),
-					 GFP_NOIO);
+					 GFP_KERNEL);
 		if ((rinfo->shadow[i].grants_used == NULL) ||
 			(rinfo->shadow[i].sg == NULL) ||
 		     (info->max_indirect_segments &&
@@ -2252,6 +2255,7 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
 		sg_init_table(rinfo->shadow[i].sg, psegs);
 	}
 
+	memalloc_noio_restore(memflags);
 
 	return 0;
 
@@ -2271,6 +2275,9 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
 			__free_page(indirect_page);
 		}
 	}
+
+	memalloc_noio_restore(memflags);
+
 	return -ENOMEM;
 }
 
drivers/char/ipmi/ipmi_msghandler.c +2 -2
index cad9563f8f48..4c51f794d04c 100644
@@ -3188,8 +3188,8 @@ static void __get_guid(struct ipmi_smi *intf)
 	if (rv)
 		/* Send failed, no GUID available. */
 		bmc->dyn_guid_set = 0;
-
-	wait_event(intf->waitq, bmc->dyn_guid_set != 2);
+	else
+		wait_event(intf->waitq, bmc->dyn_guid_set != 2);
 
 	/* dyn_guid_set makes the guid data available. */
 	smp_rmb();
drivers/char/tpm/eventlog/common.c +4 -8
index 7a0fca659b6a..7460f230bae4 100644
@@ -99,11 +99,8 @@ static int tpm_read_log(struct tpm_chip *chip)
  *
  * If an event log is found then the securityfs files are setup to
  * export it to userspace, otherwise nothing is done.
- *
- * Returns -ENODEV if the firmware has no event log or securityfs is not
- * supported.
  */
-int tpm_bios_log_setup(struct tpm_chip *chip)
+void tpm_bios_log_setup(struct tpm_chip *chip)
 {
 	const char *name = dev_name(&chip->dev);
 	unsigned int cnt;
@@ -112,7 +109,7 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
 
 	rc = tpm_read_log(chip);
 	if (rc < 0)
-		return rc;
+		return;
 	log_version = rc;
 
 	cnt = 0;
@@ -158,13 +155,12 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
 		cnt++;
 	}
 
-	return 0;
+	return;
 
 err:
-	rc = PTR_ERR(chip->bios_dir[cnt]);
 	chip->bios_dir[cnt] = NULL;
 	tpm_bios_log_teardown(chip);
-	return rc;
+	return;
 }
 
 void tpm_bios_log_teardown(struct tpm_chip *chip)
drivers/char/tpm/eventlog/tpm1.c +1 -1
index 739b1d9d16b6..2c96977ad080 100644
@@ -115,6 +115,7 @@ static void *tpm1_bios_measurements_next(struct seq_file *m, void *v,
 	u32 converted_event_size;
 	u32 converted_event_type;
 
+	(*pos)++;
 	converted_event_size = do_endian_conversion(event->event_size);
 
 	v += sizeof(struct tcpa_event) + converted_event_size;
@@ -132,7 +133,6 @@ static void *tpm1_bios_measurements_next(struct seq_file *m, void *v,
 	    ((v + sizeof(struct tcpa_event) + converted_event_size) > limit))
 		return NULL;
 
-	(*pos)++;
 	return v;
 }
 
drivers/char/tpm/eventlog/tpm2.c +1 -1
index b9aeda1cbcd7..e741b1157525 100644
@@ -94,6 +94,7 @@ static void *tpm2_bios_measurements_next(struct seq_file *m, void *v,
 	size_t event_size;
 	void *marker;
 
+	(*pos)++;
 	event_header = log->bios_event_log;
 
 	if (v == SEQ_START_TOKEN) {
@@ -118,7 +119,6 @@ static void *tpm2_bios_measurements_next(struct seq_file *m, void *v,
 	if (((v + event_size) >= limit) || (event_size == 0))
 		return NULL;
 
-	(*pos)++;
 	return v;
 }
 
drivers/char/tpm/tpm-chip.c +1 -3
index 3d6d394a8661..58073836b555 100644
@@ -596,9 +596,7 @@ int tpm_chip_register(struct tpm_chip *chip)
 
 	tpm_sysfs_add_device(chip);
 
-	rc = tpm_bios_log_setup(chip);
-	if (rc != 0 && rc != -ENODEV)
-		return rc;
+	tpm_bios_log_setup(chip);
 
 	tpm_add_ppi(chip);
 
drivers/char/tpm/tpm.h +1 -1
index 5620747da0cf..2b2c225e1190 100644
@@ -235,7 +235,7 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u8 *cmd,
 int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, void *buf,
 		      size_t *bufsiz);
 
-int tpm_bios_log_setup(struct tpm_chip *chip);
+void tpm_bios_log_setup(struct tpm_chip *chip);
 void tpm_bios_log_teardown(struct tpm_chip *chip);
 int tpm_dev_common_init(void);
 void tpm_dev_common_exit(void);
drivers/clk/ingenic/jz4770-cgu.c +3 -1
index 956dd653a43d..c051ecba5cf8 100644
@@ -432,8 +432,10 @@ static void __init jz4770_cgu_init(struct device_node *np)
 
 	cgu = ingenic_cgu_new(jz4770_cgu_clocks,
 			      ARRAY_SIZE(jz4770_cgu_clocks), np);
-	if (!cgu)
+	if (!cgu) {
 		pr_err("%s: failed to initialise CGU\n", __func__);
+		return;
+	}
 
 	retval = ingenic_cgu_register_clocks(cgu);
 	if (retval)
drivers/clk/ingenic/tcu.c +1 -1
index ad7daa494fd4..cd537c3db782 100644
@@ -189,7 +189,7 @@ static long ingenic_tcu_round_rate(struct clk_hw *hw, unsigned long req_rate,
 	u8 prescale;
 
 	if (req_rate > rate)
-		return -EINVAL;
+		return rate;
 
 	prescale = ingenic_tcu_get_prescale(rate, req_rate);
 
drivers/clocksource/timer-microchip-pit64b.c +1 -0
index bd63d3484838..59e11ca8ee73 100644
@@ -264,6 +264,7 @@ static int __init mchp_pit64b_init_mode(struct mchp_pit64b_timer *timer,
 
 	if (!best_diff) {
 		timer->mode |= MCHP_PIT64B_MR_SGCLK;
+		clk_set_rate(timer->gclk, gclk_round);
 		goto done;
 	}
 
drivers/cpufreq/imx6q-cpufreq.c +8 -4
index 648a09a1778a..edef3399c979 100644
@@ -280,6 +280,9 @@ static int imx6ul_opp_check_speed_grading(struct device *dev)
 		void __iomem *base;
 
 		np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-ocotp");
+		if (!np)
+			np = of_find_compatible_node(NULL, NULL,
+						     "fsl,imx6ull-ocotp");
 		if (!np)
 			return -ENOENT;
 
@@ -378,23 +381,24 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
 		goto put_reg;
 	}
 
+	/* Because we have added the OPPs here, we must free them */
+	free_opp = true;
+
 	if (of_machine_is_compatible("fsl,imx6ul") ||
 	    of_machine_is_compatible("fsl,imx6ull")) {
 		ret = imx6ul_opp_check_speed_grading(cpu_dev);
 		if (ret) {
 			if (ret == -EPROBE_DEFER)
-				goto put_node;
+				goto out_free_opp;
 
 			dev_err(cpu_dev, "failed to read ocotp: %d\n",
 				ret);
-			goto put_node;
+			goto out_free_opp;
 		}
 	} else {
 		imx6q_opp_check_speed_grading(cpu_dev);
 	}
 
-	/* Because we have added the OPPs here, we must free them */
-	free_opp = true;
 	num = dev_pm_opp_get_opp_count(cpu_dev);
 	if (num < 0) {
 		ret = num;
drivers/cpufreq/powernv-cpufreq.c +6 -0
index 56f4bc0d209e..1806b1da4366 100644
@@ -1080,6 +1080,12 @@ static int init_chip_info(void)
 
 static inline void clean_chip_info(void)
 {
+	int i;
+
+	/* flush any pending work items */
+	if (chips)
+		for (i = 0; i < nr_chips; i++)
+			cancel_work_sync(&chips[i].throttle);
 	kfree(chips);
 }
 
drivers/crypto/caam/caamalg_desc.c +24 -6
index aa9ccca67045..d6c58184bb57 100644
@@ -1379,6 +1379,9 @@ void cnstr_shdsc_skcipher_encap(u32 * const desc, struct alginfo *cdata,
 				const u32 ctx1_iv_off)
 {
 	u32 *key_jump_cmd;
+	u32 options = cdata->algtype | OP_ALG_AS_INIT | OP_ALG_ENCRYPT;
+	bool is_chacha20 = ((cdata->algtype & OP_ALG_ALGSEL_MASK) ==
+			    OP_ALG_ALGSEL_CHACHA20);
 
 	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);
 	/* Skip if already shared */
@@ -1417,14 +1420,15 @@ void cnstr_shdsc_skcipher_encap(u32 * const desc, struct alginfo *cdata,
 				      LDST_OFFSET_SHIFT));
 
 	/* Load operation */
-	append_operation(desc, cdata->algtype | OP_ALG_AS_INIT |
-			 OP_ALG_ENCRYPT);
+	if (is_chacha20)
+		options |= OP_ALG_AS_FINALIZE;
+	append_operation(desc, options);
 
 	/* Perform operation */
 	skcipher_append_src_dst(desc);
 
 	/* Store IV */
-	if (ivsize)
+	if (!is_chacha20 && ivsize)
 		append_seq_store(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT |
 				 LDST_CLASS_1_CCB | (ctx1_iv_off <<
 				 LDST_OFFSET_SHIFT));
@@ -1451,6 +1455,8 @@ void cnstr_shdsc_skcipher_decap(u32 * const desc, struct alginfo *cdata,
 				const u32 ctx1_iv_off)
 {
 	u32 *key_jump_cmd;
+	bool is_chacha20 = ((cdata->algtype & OP_ALG_ALGSEL_MASK) ==
+			    OP_ALG_ALGSEL_CHACHA20);
 
 	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);
 	/* Skip if already shared */
@@ -1499,7 +1505,7 @@ void cnstr_shdsc_skcipher_decap(u32 * const desc, struct alginfo *cdata,
 	skcipher_append_src_dst(desc);
 
 	/* Store IV */
-	if (ivsize)
+	if (!is_chacha20 && ivsize)
 		append_seq_store(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT |
 				 LDST_CLASS_1_CCB | (ctx1_iv_off <<
 				 LDST_OFFSET_SHIFT));
@@ -1518,7 +1524,13 @@ EXPORT_SYMBOL(cnstr_shdsc_skcipher_decap);
  */
 void cnstr_shdsc_xts_skcipher_encap(u32 * const desc, struct alginfo *cdata)
 {
-	__be64 sector_size = cpu_to_be64(512);
+	/*
+	 * Set sector size to a big value, practically disabling
+	 * sector size segmentation in xts implementation. We cannot
+	 * take full advantage of this HW feature with existing
+	 * crypto API / dm-crypt SW architecture.
+	 */
+	__be64 sector_size = cpu_to_be64(BIT(15));
 	u32 *key_jump_cmd;
 
 	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);
@@ -1571,7 +1583,13 @@ EXPORT_SYMBOL(cnstr_shdsc_xts_skcipher_encap);
  */
 void cnstr_shdsc_xts_skcipher_decap(u32 * const desc, struct alginfo *cdata)
 {
-	__be64 sector_size = cpu_to_be64(512);
+	/*
+	 * Set sector size to a big value, practically disabling
+	 * sector size segmentation in xts implementation. We cannot
+	 * take full advantage of this HW feature with existing
+	 * crypto API / dm-crypt SW architecture.
+	 */
+	__be64 sector_size = cpu_to_be64(BIT(15));
 	u32 *key_jump_cmd;
 
 	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);
drivers/crypto/ccree/cc_buffer_mgr.c +37 -39

137 lines not on this page · raw message

drivers/crypto/ccree/cc_buffer_mgr.h +1 -0
index af434872c6ff..827b6cb1236e 100644
@@ -25,6 +25,7 @@ enum cc_sg_cpy_direct {
 
 struct cc_mlli {
 	cc_sram_addr_t sram_addr;
+	unsigned int mapped_nents;
 	unsigned int nents; //sg nents
 	unsigned int mlli_nents; //mlli nents might be different than the above
 };
drivers/crypto/mxs-dcp.c +28 -30

83 lines not on this page · raw message

drivers/edac/edac_mc.c +11 -10
index 69e0d90460e6..2349f2ad946b 100644
@@ -1180,20 +1180,21 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
 		 * channel/memory controller/...  may be affected.
 		 * Also, don't show errors for empty DIMM slots.
 		 */
-		if (!e->enable_per_layer_report || !dimm->nr_pages)
+		if (!dimm->nr_pages)
 			continue;
 
-		if (n_labels >= EDAC_MAX_LABELS) {
-			e->enable_per_layer_report = false;
-			break;
-		}
 		n_labels++;
-		if (p != e->label) {
-			strcpy(p, OTHER_LABEL);
-			p += strlen(OTHER_LABEL);
+		if (n_labels > EDAC_MAX_LABELS) {
+			p = e->label;
+			*p = '\0';
+		} else {
+			if (p != e->label) {
+				strcpy(p, OTHER_LABEL);
+				p += strlen(OTHER_LABEL);
+			}
+			strcpy(p, dimm->label);
+			p += strlen(p);
 		}
-		strcpy(p, dimm->label);
-		p += strlen(p);
 
 		/*
 		 * get csrow/channel of the DIMM, in order to allow
drivers/firmware/arm_sdei.c +15 -17
index a479023fa036..77eaa9a2fd15 100644
@@ -491,11 +491,6 @@ static int _sdei_event_unregister(struct sdei_event *event)
 {
 	lockdep_assert_held(&sdei_events_lock);
 
-	spin_lock(&sdei_list_lock);
-	event->reregister = false;
-	event->reenable = false;
-	spin_unlock(&sdei_list_lock);
-
 	if (event->type == SDEI_EVENT_TYPE_SHARED)
 		return sdei_api_event_unregister(event->event_num);
 
@@ -518,6 +513,11 @@ int sdei_event_unregister(u32 event_num)
 			break;
 		}
 
+		spin_lock(&sdei_list_lock);
+		event->reregister = false;
+		event->reenable = false;
+		spin_unlock(&sdei_list_lock);
+
 		err = _sdei_event_unregister(event);
 		if (err)
 			break;
@@ -585,26 +585,15 @@ static int _sdei_event_register(struct sdei_event *event)
 
 	lockdep_assert_held(&sdei_events_lock);
 
-	spin_lock(&sdei_list_lock);
-	event->reregister = true;
-	spin_unlock(&sdei_list_lock);
-
 	if (event->type == SDEI_EVENT_TYPE_SHARED)
 		return sdei_api_event_register(event->event_num,
 					       sdei_entry_point,
 					       event->registered,
 					       SDEI_EVENT_REGISTER_RM_ANY, 0);
 
-
 	err = sdei_do_cross_call(_local_event_register, event);
-	if (err) {
-		spin_lock(&sdei_list_lock);
-		event->reregister = false;
-		event->reenable = false;
-		spin_unlock(&sdei_list_lock);
-
+	if (err)
 		sdei_do_cross_call(_local_event_unregister, event);
-	}
 
 	return err;
 }
@@ -632,8 +621,17 @@ int sdei_event_register(u32 event_num, sdei_event_callback *cb, void *arg)
 			break;
 		}
 
+		spin_lock(&sdei_list_lock);
+		event->reregister = true;
+		spin_unlock(&sdei_list_lock);
+
 		err = _sdei_event_register(event);
 		if (err) {
+			spin_lock(&sdei_list_lock);
+			event->reregister = false;
+			event->reenable = false;
+			spin_unlock(&sdei_list_lock);
+
 			sdei_event_destroy(event);
 			pr_warn("Failed to register event %u: %d\n", event_num,
 				err);
drivers/firmware/efi/efi.c +1 -1
index 21ea99f65113..77cb95f70ed6 100644
@@ -570,7 +570,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 		}
 	}
 
-	if (efi_enabled(EFI_MEMMAP))
+	if (!IS_ENABLED(CONFIG_X86_32) && efi_enabled(EFI_MEMMAP))
 		efi_memattr_init();
 
 	efi_tpm_eventlog_init();
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -2
index b8975857d60d..48e2863461b7 100644
@@ -2285,8 +2285,6 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
 {
 	int i, r;
 
-	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
-	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);
 
 	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
 		if (!adev->ip_blocks[i].status.valid)
@@ -3309,6 +3307,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
 		}
 	}
 
+	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
+	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);
+
 	amdgpu_amdkfd_suspend(adev);
 
 	amdgpu_ras_suspend(adev);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -0
index 889154a78c4a..5d5bd34eb4a7 100644
@@ -1158,6 +1158,8 @@ static void gfx_v9_0_check_fw_write_wait(struct amdgpu_device *adev)
 			adev->gfx.mec_fw_write_wait = true;
 		break;
 	default:
+		adev->gfx.me_fw_write_wait = true;
+		adev->gfx.mec_fw_write_wait = true;
 		break;
 	}
 }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +1 -1
index 9ef3f7b91a1d..abdf29afa2f2 100644
@@ -643,7 +643,7 @@ static void rn_clk_mgr_helper_populate_bw_params(struct clk_bw_params *bw_params
 	/* Find lowest DPM, FCLK is filled in reverse order*/
 
 	for (i = PP_SMU_NUM_FCLK_DPM_LEVELS - 1; i >= 0; i--) {
-		if (clock_table->FClocks[i].Freq != 0) {
+		if (clock_table->FClocks[i].Freq != 0 && clock_table->FClocks[i].Vol != 0) {
 			j = i;
 			break;
 		}
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +18 -0
index 3ad0f4aa3aa3..f7a1ce37227c 100644
@@ -240,6 +240,7 @@ static int renoir_print_clk_levels(struct smu_context *smu,
 	uint32_t cur_value = 0, value = 0, count = 0, min = 0, max = 0;
 	DpmClocks_t *clk_table = smu->smu_table.clocks_table;
 	SmuMetrics_t metrics;
+	bool cur_value_match_level = false;
 
 	if (!clk_table || clk_type >= SMU_CLK_COUNT)
 		return -EINVAL;
@@ -298,8 +299,13 @@ static int renoir_print_clk_levels(struct smu_context *smu,
 		GET_DPM_CUR_FREQ(clk_table, clk_type, i, value);
 		size += sprintf(buf + size, "%d: %uMhz %s\n", i, value,
 				cur_value == value ? "*" : "");
+		if (cur_value == value)
+			cur_value_match_level = true;
 	}
 
+	if (!cur_value_match_level)
+		size += sprintf(buf + size, "   %uMhz *\n", cur_value);
+
 	return size;
 }
 
@@ -881,6 +887,17 @@ static int renoir_read_sensor(struct smu_context *smu,
 	return ret;
 }
 
+static bool renoir_is_dpm_running(struct smu_context *smu)
+{
+	/*
+	 * Util now, the pmfw hasn't exported the interface of SMU
+	 * feature mask to APU SKU so just force on all the feature
+	 * at early initial stage.
+	 */
+	return true;
+
+}
+
 static const struct pptable_funcs renoir_ppt_funcs = {
 	.get_smu_msg_index = renoir_get_smu_msg_index,
 	.get_smu_clk_index = renoir_get_smu_clk_index,
@@ -922,6 +939,7 @@ static const struct pptable_funcs renoir_ppt_funcs = {
 	.mode2_reset = smu_v12_0_mode2_reset,
 	.set_soft_freq_limited_range = smu_v12_0_set_soft_freq_limited_range,
 	.set_driver_table_location = smu_v12_0_set_driver_table_location,
+	.is_dpm_running = renoir_is_dpm_running,
 };
 
 void renoir_set_ppt_funcs(struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/renoir_ppt.h +1 -1
index 2a390ddd37dd..89cd6da118a3 100644
@@ -37,7 +37,7 @@ extern void renoir_set_ppt_funcs(struct smu_context *smu);
 			freq = table->SocClocks[dpm_level].Freq;	\
 			break;						\
 		case SMU_MCLK:						\
-			freq = table->MemClocks[dpm_level].Freq;	\
+			freq = table->FClocks[dpm_level].Freq;	\
 			break;						\
 		case SMU_DCEFCLK:					\
 			freq = table->DcfClocks[dpm_level].Freq;	\
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +2 -3
index 41867be03751..864423f59d66 100644
@@ -722,10 +722,9 @@ static int anx78xx_dp_link_training(struct anx78xx *anx78xx)
 	if (err)
 		return err;
 
-	dpcd[0] = drm_dp_max_link_rate(anx78xx->dpcd);
-	dpcd[0] = drm_dp_link_rate_to_bw_code(dpcd[0]);
 	err = regmap_write(anx78xx->map[I2C_IDX_TX_P0],
-			   SP_DP_MAIN_LINK_BW_SET_REG, dpcd[0]);
+			   SP_DP_MAIN_LINK_BW_SET_REG,
+			   anx78xx->dpcd[DP_MAX_LINK_RATE]);
 	if (err)
 		return err;
 
drivers/gpu/drm/drm_dp_mst_topology.c +6 -14
index ed0fea2ac322..7b7f0da01346 100644
@@ -3504,9 +3504,9 @@ static int drm_dp_get_vc_payload_bw(u8 dp_link_bw, u8  dp_link_count)
 int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool mst_state)
 {
 	int ret = 0;
-	int i = 0;
 	struct drm_dp_mst_branch *mstb = NULL;
 
+	mutex_lock(&mgr->payload_lock);
 	mutex_lock(&mgr->lock);
 	if (mst_state == mgr->mst_state)
 		goto out_unlock;
@@ -3565,27 +3565,19 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
 		/* this can fail if the device is gone */
 		drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, 0);
 		ret = 0;
-		mutex_lock(&mgr->payload_lock);
-		memset(mgr->payloads, 0, mgr->max_payloads * sizeof(struct drm_dp_payload));
+		memset(mgr->payloads, 0,
+		       mgr->max_payloads * sizeof(mgr->payloads[0]));
+		memset(mgr->proposed_vcpis, 0,
+		       mgr->max_payloads * sizeof(mgr->proposed_vcpis[0]));
 		mgr->payload_mask = 0;
 		set_bit(0, &mgr->payload_mask);
-		for (i = 0; i < mgr->max_payloads; i++) {
-			struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i];
-
-			if (vcpi) {
-				vcpi->vcpi = 0;
-				vcpi->num_slots = 0;
-			}
-			mgr->proposed_vcpis[i] = NULL;
-		}
 		mgr->vcpi_mask = 0;
-		mutex_unlock(&mgr->payload_lock);
-
 		mgr->payload_id_table_cleared = false;
 	}
 
 out_unlock:
 	mutex_unlock(&mgr->lock);
+	mutex_unlock(&mgr->payload_lock);
 	if (mstb)
 		drm_dp_mst_topology_put_mstb(mstb);
 	return ret;
drivers/gpu/drm/drm_pci.c +2 -21
index f2e43d341980..d16dac4325f9 100644
@@ -51,8 +51,6 @@
 drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
 {
 	drm_dma_handle_t *dmah;
-	unsigned long addr;
-	size_t sz;
 
 	/* pci_alloc_consistent only guarantees alignment to the smallest
 	 * PAGE_SIZE order which is greater than or equal to the requested size.
@@ -68,20 +66,13 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
 	dmah->size = size;
 	dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size,
 					 &dmah->busaddr,
-					 GFP_KERNEL | __GFP_COMP);
+					 GFP_KERNEL);
 
 	if (dmah->vaddr == NULL) {
 		kfree(dmah);
 		return NULL;
 	}
 
-	/* XXX - Is virt_to_page() legal for consistent mem? */
-	/* Reserve */
-	for (addr = (unsigned long)dmah->vaddr, sz = size;
-	     sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
-		SetPageReserved(virt_to_page((void *)addr));
-	}
-
 	return dmah;
 }
 
@@ -94,19 +85,9 @@ EXPORT_SYMBOL(drm_pci_alloc);
  */
 void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
 {
-	unsigned long addr;
-	size_t sz;
-
-	if (dmah->vaddr) {
-		/* XXX - Is virt_to_page() legal for consistent mem? */
-		/* Unreserve */
-		for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
-		     sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
-			ClearPageReserved(virt_to_page((void *)addr));
-		}
+	if (dmah->vaddr)
 		dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
 				  dmah->busaddr);
-	}
 }
 
 /**
drivers/gpu/drm/drm_prime.c +25 -12
index 1de2cde2277c..282774e469ac 100644
@@ -962,27 +962,40 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
 	unsigned count;
 	struct scatterlist *sg;
 	struct page *page;
-	u32 len, index;
+	u32 page_len, page_index;
 	dma_addr_t addr;
+	u32 dma_len, dma_index;
 
-	index = 0;
+	/*
+	 * Scatterlist elements contains both pages and DMA addresses, but
+	 * one shoud not assume 1:1 relation between them. The sg->length is
+	 * the size of the physical memory chunk described by the sg->page,
+	 * while sg_dma_len(sg) is the size of the DMA (IO virtual) chunk
+	 * described by the sg_dma_address(sg).
+	 */
+	page_index = 0;
+	dma_index = 0;
 	for_each_sg(sgt->sgl, sg, sgt->nents, count) {
-		len = sg_dma_len(sg);
+		page_len = sg->length;
 		page = sg_page(sg);
+		dma_len = sg_dma_len(sg);
 		addr = sg_dma_address(sg);
 
-		while (len > 0) {
-			if (WARN_ON(index >= max_entries))
+		while (pages && page_len > 0) {
+			if (WARN_ON(page_index >= max_entries))
 				return -1;
-			if (pages)
-				pages[index] = page;
-			if (addrs)
-				addrs[index] = addr;
-
+			pages[page_index] = page;
 			page++;
+			page_len -= PAGE_SIZE;
+			page_index++;
+		}
+		while (addrs && dma_len > 0) {
+			if (WARN_ON(dma_index >= max_entries))
+				return -1;
+			addrs[dma_index] = addr;
 			addr += PAGE_SIZE;
-			len -= PAGE_SIZE;
-			index++;
+			dma_len -= PAGE_SIZE;
+			dma_index++;
 		}
 	}
 	return 0;
drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +52 -7

108 lines not on this page · raw message

drivers/gpu/drm/i915/Kconfig.profile +4 -0
index c280b6ae38eb..3b39998b7210 100644
@@ -35,6 +35,10 @@ config DRM_I915_PREEMPT_TIMEOUT
 
 	  May be 0 to disable the timeout.
 
+	  The compiled in default may get overridden at driver probe time on
+	  certain platforms and certain engines which will be reflected in the
+	  sysfs control.
+
 config DRM_I915_SPIN_REQUEST
 	int "Busywait for request completion (us)"
 	default 5 # microseconds
drivers/gpu/drm/i915/display/intel_ddi.c +5 -1
index d9a61f341070..2fe594952748 100644
@@ -2225,7 +2225,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
 		return;
 
 	dig_port = enc_to_dig_port(encoder);
-	intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
+
+	if (!intel_phy_is_tc(dev_priv, phy) ||
+	    dig_port->tc_mode != TC_PORT_TBT_ALT)
+		intel_display_power_get(dev_priv,
+					dig_port->ddi_io_power_domain);
 
 	/*
 	 * AUX power is only needed for (e)DP mode, and for HDMI mode on TC
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +5 -3
index 7643a30ba4cd..2b8681bfecc3 100644
@@ -914,11 +914,13 @@ static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)
 
 static void reloc_gpu_flush(struct reloc_cache *cache)
 {
-	GEM_BUG_ON(cache->rq_size >= cache->rq->batch->obj->base.size / sizeof(u32));
+	struct drm_i915_gem_object *obj = cache->rq->batch->obj;
+
+	GEM_BUG_ON(cache->rq_size >= obj->base.size / sizeof(u32));
 	cache->rq_cmd[cache->rq_size] = MI_BATCH_BUFFER_END;
 
-	__i915_gem_object_flush_map(cache->rq->batch->obj, 0, cache->rq_size);
-	i915_gem_object_unpin_map(cache->rq->batch->obj);
+	__i915_gem_object_flush_map(obj, 0, sizeof(u32) * (cache->rq_size + 1));
+	i915_gem_object_unpin_map(obj);
 
 	intel_gt_chipset_flush(cache->rq->engine->gt);
 
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +26 -0
index 4d1de2d97d5c..9aabc5815d38 100644
@@ -25,6 +25,30 @@ static u64 gen8_pde_encode(const dma_addr_t addr,
 	return pde;
 }
 
+static u64 gen8_pte_encode(dma_addr_t addr,
+			   enum i915_cache_level level,
+			   u32 flags)
+{
+	gen8_pte_t pte = addr | _PAGE_PRESENT | _PAGE_RW;
+
+	if (unlikely(flags & PTE_READ_ONLY))
+		pte &= ~_PAGE_RW;
+
+	switch (level) {
+	case I915_CACHE_NONE:
+		pte |= PPAT_UNCACHED;
+		break;
+	case I915_CACHE_WT:
+		pte |= PPAT_DISPLAY_ELLC;
+		break;
+	default:
+		pte |= PPAT_CACHED;
+		break;
+	}
+
+	return pte;
+}
+
 static void gen8_ppgtt_notify_vgt(struct i915_ppgtt *ppgtt, bool create)
 {
 	struct drm_i915_private *i915 = ppgtt->vm.i915;
@@ -706,6 +730,8 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt)
 	ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc;
 	ppgtt->vm.clear_range = gen8_ppgtt_clear;
 
+	ppgtt->vm.pte_encode = gen8_pte_encode;
+
 	if (intel_vgpu_active(gt->i915))
 		gen8_ppgtt_notify_vgt(ppgtt, true);
 
drivers/gpu/drm/i915/gt/intel_engine_cs.c +9 -4
index 06ff7695fa29..4e8ba1dadb02 100644
@@ -274,6 +274,7 @@ static void intel_engine_sanitize_mmio(struct intel_engine_cs *engine)
 static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
 {
 	const struct engine_info *info = &intel_engines[id];
+	struct drm_i915_private *i915 = gt->i915;
 	struct intel_engine_cs *engine;
 
 	BUILD_BUG_ON(MAX_ENGINE_CLASS >= BIT(GEN11_ENGINE_CLASS_WIDTH));
@@ -300,11 +301,11 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
 	engine->id = id;
 	engine->legacy_idx = INVALID_ENGINE;
 	engine->mask = BIT(id);
-	engine->i915 = gt->i915;
+	engine->i915 = i915;
 	engine->gt = gt;
 	engine->uncore = gt->uncore;
 	engine->hw_id = engine->guc_id = info->hw_id;
-	engine->mmio_base = __engine_mmio_base(gt->i915, info->mmio_bases);
+	engine->mmio_base = __engine_mmio_base(i915, info->mmio_bases);
 
 	engine->class = info->class;
 	engine->instance = info->instance;
@@ -319,11 +320,15 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
 	engine->props.timeslice_duration_ms =
 		CONFIG_DRM_I915_TIMESLICE_DURATION;
 
+	/* Override to uninterruptible for OpenCL workloads. */
+	if (INTEL_GEN(i915) == 12 && engine->class == RENDER_CLASS)
+		engine->props.preempt_timeout_ms = 0;
+
 	engine->context_size = intel_engine_context_size(gt, engine->class);
 	if (WARN_ON(engine->context_size > BIT(20)))
 		engine->context_size = 0;
 	if (engine->context_size)
-		DRIVER_CAPS(gt->i915)->has_logical_contexts = true;
+		DRIVER_CAPS(i915)->has_logical_contexts = true;
 
 	/* Nothing to do here, execute in order of dependencies */
 	engine->schedule = NULL;
@@ -339,7 +344,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
 	gt->engine_class[info->class][info->instance] = engine;
 	gt->engine[id] = engine;
 
-	gt->i915->engine[id] = engine;
+	i915->engine[id] = engine;
 
 	return 0;
 }
drivers/gpu/drm/i915/gt/intel_ggtt.c +36 -12

64 lines not on this page · raw message

drivers/gpu/drm/i915/gt/intel_gtt.c +0 -24
index 16acdc5d6734..f6fcf05d54f3 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/i915/gt/intel_gtt.h +0 -4
index 7da7681c20b1..7db9f3ac9aed 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/i915/gt/intel_rps.c +13 -0
index d2a3d935d186..b2d245963d9f 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/vboxvideo/vbox_drv.c +4 -0
index 8512d970a09f..ac8f75db2ecd 100644

Lines of this file are not shown. View the raw message.

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +3 -2
index eea555617d4a..95ddd19d1aa7 100644

Lines of this file are not shown. View the raw message.

drivers/input/serio/i8042-x86ia64io.h +11 -0
index dc974c288e88..08e919dbeb5d 100644

Lines of this file are not shown. View the raw message.

drivers/irqchip/irq-gic-v3-its.c +10 -0
index 83b1186ffcad..7c8f65c9c32d 100644

Lines of this file are not shown. View the raw message.

drivers/irqchip/irq-versatile-fpga.c +13 -5
index 928858dada75..f1386733d3bc 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-clone-metadata.c +14 -1
index c05b12110456..17712456fa63 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-clone-metadata.h +1 -1
index 14af1ebd853f..d848b8799c07 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-clone-target.c +47 -19

66 lines not on this page · raw message

drivers/md/dm-integrity.c +2 -2
index 2f03fecd312d..fc0c5f4f6b70 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-verity-fec.c +1 -0
index 3ceeb6b404ed..49147e634046 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-writecache.c +5 -1
index a09bdc000e64..d3b17a654917 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-zoned-metadata.c +0 -1
index 516c7b671d25..369de15c4e80 100644

Lines of this file are not shown. View the raw message.

drivers/md/md.c +1 -1
index 469f551863be..0b30ada971c1 100644

Lines of this file are not shown. View the raw message.

drivers/media/i2c/ov5695.c +31 -18

49 lines not on this page · raw message

drivers/media/i2c/video-i2c.c +1 -1
index 078141712c88..0b977e73ceb2 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c +5 -4
index 6720d11f50cf..b065ccd06914 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +3 -3
index 70abfd4cd4b9..948a12fd9d46 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/mtk-vcodec/venc_vpu_if.c +6 -6
index 3e931b0ed096..9540709c1905 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/mtk-vpu/mtk_vpu.c +23 -22

45 lines not on this page · raw message

drivers/media/platform/mtk-vpu/mtk_vpu.h +1 -1
index d4453b4bcee9..ee7c552ce928 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/venus/core.h +1 -0
index 11585fb3cae3..2f661af7f873 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/venus/firmware.c +8 -2
index d3d1748a7ef6..33f70e1def94 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/venus/helpers.c +13 -7
index a172f1ac0b35..32f8fb8d7f33 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/venus/hfi_parser.c +1 -0
index 2293d936e49c..7f515a4b9bd1 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/ti-vpe/cal.c +16 -13
index be54806180a5..3d3535ff5c5a 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/vimc/vimc-streamer.c +7 -2
index cd6b55433c9e..43e494df61d8 100644

Lines of this file are not shown. View the raw message.

drivers/media/rc/keymaps/Makefile +1 -0
index 63261ef6380a..aaa1bf81d00d 100644

Lines of this file are not shown. View the raw message.

drivers/media/rc/keymaps/rc-videostrong-kii-pro.c new file +83 -0

83 lines not on this page · raw message

drivers/mfd/dln2.c +7 -2
index 7841c11411d0..4faa8d2e5d04 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/host/mmci_stm32_sdmmc.c +2 -2
index a4f7e8e689d3..01f222758910 100644

Lines of this file are not shown. View the raw message.

drivers/mtd/nand/raw/cadence-nand-controller.c +6 -7
index f6c7102a1e32..664a8db1ecd7 100644

Lines of this file are not shown. View the raw message.

drivers/mtd/nand/spi/core.c +7 -10
index 89f6beefb01c..5750c45019d8 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +19 -12
index fbf4cbcf1a65..02cdbb22d335 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/main.c +3 -0
index 0548aa3702e3..ef2b856670e1 100644

Lines of this file are not shown. View the raw message.

drivers/nvme/host/fc.c +2 -12
index 5a70ac395d53..c0c4b1587ba0 100644

Lines of this file are not shown. View the raw message.

drivers/nvme/target/fcloop.c +0 -1
index 1c50af6219f3..b50b53db3746 100644

Lines of this file are not shown. View the raw message.

drivers/nvme/target/tcp.c +1 -1
index 5bb5342b8d0c..5b535f2e7161 100644

Lines of this file are not shown. View the raw message.

drivers/pci/controller/dwc/pcie-qcom.c +7 -1
index 5ea527a6bd9f..138e1a2d21cc 100644

Lines of this file are not shown. View the raw message.

drivers/pci/endpoint/pci-epc-mem.c +8 -2
index d2b174ce15de..abfac1109a13 100644

Lines of this file are not shown. View the raw message.

drivers/pci/hotplug/pciehp_hpc.c +7 -7
index 8a2cb1764386..14e6dccae8f1 100644

Lines of this file are not shown. View the raw message.

drivers/pci/pcie/aspm.c +2 -2
index 0dcd44308228..c2596e79ec63 100644

Lines of this file are not shown. View the raw message.

drivers/pci/quirks.c +73 -7

80 lines not on this page · raw message

drivers/pci/switch/switchtec.c +1 -1
index a823b4b8ef8a..81dc7ac01381 100644

Lines of this file are not shown. View the raw message.

drivers/platform/x86/asus-wmi.c +4 -1
index 612ef5526226..01becbe2a9a8 100644

Lines of this file are not shown. View the raw message.

drivers/remoteproc/qcom_q6v5_mss.c +42 -12

54 lines not on this page · raw message

drivers/remoteproc/remoteproc_virtio.c +7 -0
index 8c07cb2ca8ba..31a62a0b470e 100644

Lines of this file are not shown. View the raw message.

drivers/s390/scsi/zfcp_erp.c +1 -1
index 93655b85b73f..18a6751299f9 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc.h +1 -0
index 04d73e2be373..3f2cb17c4574 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_hbadisc.c +39 -20

59 lines not on this page · raw message

drivers/scsi/lpfc/lpfc_nvme.c +0 -2
index f6c8963c915d..db4a04a207ec 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_scsi.c +3 -1
index 2c7e0b22db2f..96ac4a154c58 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/mpt3sas/mpt3sas_scsih.c +4 -4
index c597d544eb39..a8ec1caf9c77 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla2xxx/qla_nvme.c +0 -1
index bfcd02fdf2b8..941aa53363f5 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/sr.c +13 -9
index e4240e4ae8bb..d2fe3fa470f9 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/sr.h +2 -0
index a2bb7b8bace5..339c624e04d8 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ufs/ufshcd.c +2 -1
index 2d705694636c..06758a5d9eb1 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ufs/ufshcd.h +6 -0
index 2ae6c7c8528c..81c71a3e3474 100644

Lines of this file are not shown. View the raw message.

drivers/spi/spi-fsl-dspi.c +10 -15
index 6ec2dcb8c57a..1305030379e8 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/allegro-dvt/allegro-core.c +4 -1
index 3be41698df4c..8d8d144f40ac 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/hantro/hantro_h1_jpeg_enc.c +7 -2
index 0d8afc3e5d71..4f72d92cd98f 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/hantro/hantro_v4l2.c +1 -1
index 0198bcda26b7..f4ae2cee0f18 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c +7 -2
index 4c2d43fb6fd1..a85c4f9fd10a 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/imx/imx7-media-csi.c +4 -0
index db30e2c70f2f..f45920b3137e 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/imx/imx7-mipi-csis.c +1 -1
index 383abecb3bec..0053e8b0b88e 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/rkisp1/rkisp1-dev.c +1 -2
index 558126e66465..9b47f41b36e9 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/rkisp1/rkisp1-isp.c +2 -2
index 328c7ea60971..db892620a567 100644

Lines of this file are not shown. View the raw message.

drivers/staging/mt7621-pci/pci-mt7621.c +2 -1
index 3633c924848e..a1dafec0890a 100644

Lines of this file are not shown. View the raw message.

drivers/staging/wilc1000/wlan.c +0 -1
index 601e4d1345d2..05b8adfe001d 100644

Lines of this file are not shown. View the raw message.

drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1 -1
index efae0c02d898..6cad15eb9cf4 100644

Lines of this file are not shown. View the raw message.

drivers/thermal/intel/int340x_thermal/int3403_thermal.c +1 -1
index aeece1e136a5..f86cbb125e2f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/core.c +5 -0
index 1d85c42b9c67..43bd5b1ea9e2 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/core.h +4 -0
index 77c4a9abe365..3ecc69c5b150 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/composite.c +9 -0
index 223f72d4d9ed..cb4950cf1cdc 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_fs.c +1 -0
index 571917677d35..767f30b86645 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci.c +3 -1
index dbac0fa9748d..fe38275363e0 100644

Lines of this file are not shown. View the raw message.

drivers/usb/phy/phy-tegra-usb.c +1 -2
index 6153cc35aba0..cffe2aced488 100644

Lines of this file are not shown. View the raw message.

drivers/usb/typec/ucsi/ucsi_ccg.c +2 -0
index a5b8530490db..2658cda5da11 100644

Lines of this file are not shown. View the raw message.

drivers/vfio/platform/vfio_platform.c +1 -1
index ae1a5eb98620..1e2769010089 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/async-thread.c +8 -0
index 1d32a07bb2d1..309516e6a968 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/async-thread.h +1 -0
index a4434301d84d..3204daa51b95 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/delayed-inode.c +13 -0
index d3e15e1d4a91..18509746208b 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/disk-io.c +25 -2
index c6c9a6a8e6c8..29fc96dfa508 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/extent_io.c +34 -1
index c0f202741e09..a4128dedbbf4 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/file.c +11 -0
index a16da274c9aa..3aa31bd7d4ad 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/qgroup.c +9 -2
index ff1870ff3474..afc9752e984c 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/relocation.c +33 -29

62 lines not on this page · raw message

fs/btrfs/space-info.c +34 -9

43 lines not on this page · raw message

fs/cifs/file.c +1 -1
index 8f9d849a0012..5920820bfbd0 100644

Lines of this file are not shown. View the raw message.

fs/cifs/inode.c +12 -11
index b16f8d23e97b..9458b1582342 100644

Lines of this file are not shown. View the raw message.

fs/cifs/smb2ops.c +4 -0
index cfe9b800ea8c..788344b5949e 100644

Lines of this file are not shown. View the raw message.

fs/debugfs/file.c +14 -4
index db987b5110a9..f34757e8f25f 100644

Lines of this file are not shown. View the raw message.

fs/erofs/utils.c +1 -1
index fddc5059c930..df42ea552a44 100644

Lines of this file are not shown. View the raw message.

fs/exec.c +1 -1
index db17be51b112..a58625f27652 100644

Lines of this file are not shown. View the raw message.

fs/ext4/inode.c +1 -1
index fa0ff78dc033..c5d05564cd29 100644

Lines of this file are not shown. View the raw message.

fs/filesystems.c +3 -1
index 77bf5f95362d..90b8d879fbaf 100644

Lines of this file are not shown. View the raw message.

fs/gfs2/glock.c +3 -0
index d0eceaff3cea..19ebc6cd0f2b 100644

Lines of this file are not shown. View the raw message.

fs/gfs2/glops.c +26 -1
index 061d22e1ceb6..efc899a3876b 100644

Lines of this file are not shown. View the raw message.

fs/gfs2/log.c +1 -1
index 00a2e721a374..08dd6a430234 100644

Lines of this file are not shown. View the raw message.

fs/gfs2/log.h +1 -0
index c0a65e5a126b..c1cd6ae17659 100644

Lines of this file are not shown. View the raw message.

fs/hfsplus/attributes.c +4 -0
index e6d554476db4..eeebe80c6be4 100644

Lines of this file are not shown. View the raw message.

fs/io_uring.c +15 -8
index bdcffd78fbb9..a46de2cfc28e 100644

Lines of this file are not shown. View the raw message.

fs/nfs/fs_context.c +4 -1
index e113fcb4bb4c..1c8d8bedf34e 100644

Lines of this file are not shown. View the raw message.

fs/nfs/namespace.c +7 -5
index f3ece8ed3203..4c943b890995 100644

Lines of this file are not shown. View the raw message.

fs/nfs/pagelist.c +24 -24

48 lines not on this page · raw message

fs/nfs/write.c +1 -0
index c478b772cc49..38abd130528a 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfsctl.c +1 -0
index e109a1007704..3bb2db947d29 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/alloc.c +4 -0
index 88534eb0e7c2..3d5b6b989db2 100644

Lines of this file are not shown. View the raw message.

fs/pstore/inode.c +4 -1
index 7fbe8f058220..d99b5d39aa90 100644

Lines of this file are not shown. View the raw message.

fs/pstore/platform.c +2 -2
index d896457e7c11..408277ee3cdb 100644

Lines of this file are not shown. View the raw message.

include/acpi/acpixf.h +1 -1
index 8e8be989c2a6..a50d6dea44c3 100644

Lines of this file are not shown. View the raw message.

include/linux/cpu.h +9 -3
index 1ca2baf817ed..94cda8c3b5d1 100644

Lines of this file are not shown. View the raw message.

include/linux/devfreq_cooling.h +1 -1
index 4635f95000a4..79a6e37a1d6f 100644

Lines of this file are not shown. View the raw message.

include/linux/iocontext.h +1 -0
index dba15ca8e60b..1dcd9198beb7 100644

Lines of this file are not shown. View the raw message.

include/linux/nvme-fc-driver.h +0 -4
index 6d0d70f3219c..10f81629b9ce 100644

Lines of this file are not shown. View the raw message.

include/linux/pci-epc.h +3 -0
index 56f1846b9d39..c8e39607dbb7 100644

Lines of this file are not shown. View the raw message.

include/linux/sched.h +2 -2
index 04278493bf15..0323e4f0982a 100644

Lines of this file are not shown. View the raw message.

include/linux/xarray.h +5 -1
index f73e1775ded0..51bc10d5f6a8 100644

Lines of this file are not shown. View the raw message.

include/media/rc-map.h +1 -0
index f99575a0d29c..d22810dcd85c 100644

Lines of this file are not shown. View the raw message.

include/trace/events/rcu.h +1 -0
index 5e49b06e8104..d56d54c17497 100644

Lines of this file are not shown. View the raw message.

kernel/bpf/verifier.c +72 -36

108 lines not on this page · raw message

kernel/cpu.c +2 -2
index 9c706af713fb..c8e661ee26d3 100644

Lines of this file are not shown. View the raw message.

kernel/dma/mapping.c +2 -0
index 12ff766ec1fa..98e3d873792e 100644

Lines of this file are not shown. View the raw message.

kernel/events/core.c +68 -82

150 lines not on this page · raw message

kernel/irq/debugfs.c +9 -2
index a949bd39e343..d44c8fd17609 100644

Lines of this file are not shown. View the raw message.

kernel/irq/irqdomain.c +5 -5
index 7527e5ef6fe5..64507c663563 100644

Lines of this file are not shown. View the raw message.

kernel/kmod.c +2 -2
index bc6addd9152b..a2de58de6ab6 100644

Lines of this file are not shown. View the raw message.

kernel/locking/lockdep.c +4 -0
index 32406ef0d6a2..5142a6b11bf5 100644

Lines of this file are not shown. View the raw message.

kernel/rcu/tree.c +24 -12
index d91c9156fab2..c0a9865b1f6a 100644

Lines of this file are not shown. View the raw message.

kernel/sched/core.c +0 -1
index 1a9983da4408..da8a19470218 100644

Lines of this file are not shown. View the raw message.

kernel/sched/cputime.c +22 -19

41 lines not on this page · raw message

kernel/sched/fair.c +24 -5
index c1217bfe5e81..c76a20648b72 100644

Lines of this file are not shown. View the raw message.

kernel/sched/sched.h +7 -1
index 9ea647835fd6..b056149c228b 100644

Lines of this file are not shown. View the raw message.

kernel/seccomp.c +1 -0
index b6ea3dcb57bf..683c81e4861e 100644

Lines of this file are not shown. View the raw message.

kernel/signal.c +1 -1
index 5b2396350dd1..e58a6c619824 100644

Lines of this file are not shown. View the raw message.

kernel/time/namespace.c +1 -0
index 12858507d75a..6477c6d0e1a6 100644

Lines of this file are not shown. View the raw message.

kernel/time/sched_clock.c +5 -4
index e4332e3e2d56..fa3f800d7d76 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace_kprobe.c +2 -0
index 362cca52f5de..d0568af4a0ef 100644

Lines of this file are not shown. View the raw message.

kernel/ucount.c +1 -0
index a53cc2b4179c..29c60eb4ec9b 100644

Lines of this file are not shown. View the raw message.

lib/test_xarray.c +37 -0
index 8c7d7a8468b8..d4f97925dbd8 100644

Lines of this file are not shown. View the raw message.

lib/xarray.c +3 -1
index acd1fad2e862..08d71c7b7599 100644

Lines of this file are not shown. View the raw message.

mm/memcontrol.c +3 -0
index 7ddf91c4295f..615d73acd0da 100644

Lines of this file are not shown. View the raw message.

security/keys/key.c +1 -1
index 718bf7217420..e959b3c96b48 100644

Lines of this file are not shown. View the raw message.

security/keys/keyctl.c +2 -2
index 9b898c969558..d1a3dea58dee 100644

Lines of this file are not shown. View the raw message.

sound/core/oss/pcm_plugin.c +24 -8
index 752d078908e9..50c35ecc8953 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_beep.c +5 -1
index f5fd62ed4df5..841523f6b88d 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_intel.c +16 -0
index 92a042e34d3e..bd093593f8fb 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_realtek.c +130 -103

233 lines not on this page · raw message

sound/pci/ice1712/prodigy_hifi.c +2 -2
index 91f83cef0e56..9aa12a67d370 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/cs4270.c +35 -5
index 5f25b9f872bd..8a02791e44ad 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-dapm.c +7 -1
index 9fb54e6fe254..17962564866d 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-ops.c +2 -2
index 652657dc6809..55ffb34be95e 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-pcm.c +4 -2
index 2c59b3688ca0..8f6f0ad50288 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-topology.c +1 -1
index 575da6aba807..a152409e8746 100644

Lines of this file are not shown. View the raw message.

sound/soc/stm/stm32_sai_sub.c +3 -1
index 10eb4b8e8e7e..d3259de43712 100644

Lines of this file are not shown. View the raw message.

sound/usb/mixer_maps.c +28 -0
index 5ebca8013840..72b575c34860 100644

Lines of this file are not shown. View the raw message.

tools/gpio/Makefile +1 -1
index 6080de58861f..6289b8d20dff 100644

Lines of this file are not shown. View the raw message.

tools/perf/Makefile.config +10 -1
index 80e55e796be9..5da344dc2cf3 100644

Lines of this file are not shown. View the raw message.

tools/testing/radix-tree/Makefile +2 -2
index 397d6b612502..aa6abfe0749c 100644

Lines of this file are not shown. View the raw message.

tools/testing/radix-tree/iteration_check_2.c new file +87 -0

87 lines not on this page · raw message

tools/testing/radix-tree/main.c +1 -0
index 7a22d6e3732e..f2cbc8e5b97c 100644

Lines of this file are not shown. View the raw message.

tools/testing/radix-tree/test.h +1 -0
index 1ee4b2c0ad10..34dab4d18744 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/powerpc/mm/.gitignore +1 -0
index 0ebeaea22641..97f7922c52c5 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/powerpc/pmu/ebb/Makefile +1 -0
index 417306353e07..ca35dd8848b0 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/vm/map_hugetlb.c +7 -7
index 5a2d7b8efc40..6af951900aa3 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/vm/mlock2-tests.c +37 -196

233 lines not on this page · raw message

tools/testing/selftests/x86/ptrace_syscall.c +6 -2
index 6f22238f3217..12aaa063196e 100644

Lines of this file are not shown. View the 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.