Skip to contentSkip to conversation

Linux 5.5.9

DISCUSSION Greg KH 1 participant 2 messages Mar 12, 2020 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 5.5.9 kernel.

All users of the 5.5 kernel series must upgrade.

The updated 5.5.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.5.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/devicetree/bindings/arm/fsl.yaml                      |    2 
 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt |    2 
 Makefile                                                            |    2 
 arch/arm/boot/dts/am437x-idk-evm.dts                                |    4 
 arch/arm/boot/dts/dra76x.dtsi                                       |    5 
 arch/arm/boot/dts/dra7xx-clocks.dtsi                                |   12 -
 arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi                   |    1 
 arch/arm/boot/dts/imx7-colibri.dtsi                                 |    1 
 arch/arm/boot/dts/imx7d.dtsi                                        |    6 
 arch/arm/boot/dts/ls1021a.dtsi                                      |    4 
 arch/arm/mach-imx/Makefile                                          |    2 
 arch/arm/mach-imx/common.h                                          |    4 
 arch/arm/mach-imx/resume-imx6.S                                     |   24 ++
 arch/arm/mach-imx/suspend-imx6.S                                    |   14 -
 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts               |    2 
 arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts                    |    1 
 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts                       |    5 
 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi                       |    6 
 arch/csky/Kconfig                                                   |    3 
 arch/csky/abiv1/inc/abi/entry.h                                     |   19 +
 arch/csky/abiv2/inc/abi/entry.h                                     |   11 +
 arch/csky/include/uapi/asm/unistd.h                                 |    3 
 arch/csky/kernel/atomic.S                                           |    8 
 arch/csky/kernel/process.c                                          |    7 
 arch/csky/kernel/smp.c                                              |    2 
 arch/csky/mm/Makefile                                               |    2 
 arch/csky/mm/init.c                                                 |    1 
 arch/powerpc/kernel/cputable.c                                      |    4 
 arch/powerpc/mm/mem.c                                               |    2 
 arch/s390/Makefile                                                  |    2 
 arch/s390/boot/Makefile                                             |    2 
 arch/s390/include/asm/pgtable.h                                     |    6 
 arch/s390/include/asm/qdio.h                                        |    2 
 arch/s390/pci/pci.c                                                 |    4 
 arch/x86/boot/compressed/kaslr_64.c                                 |    3 
 arch/x86/include/asm/io_bitmap.h                                    |    9 
 arch/x86/include/asm/paravirt.h                                     |    7 
 arch/x86/include/asm/paravirt_types.h                               |    4 
 arch/x86/kernel/cpu/common.c                                        |    2 
 arch/x86/kernel/paravirt.c                                          |    5 
 arch/x86/kernel/process.c                                           |    2 
 arch/x86/platform/efi/efi_64.c                                      |   70 ++++--
 arch/x86/xen/enlighten_pv.c                                         |   32 ++-
 block/bfq-cgroup.c                                                  |   14 +
 block/bfq-iosched.c                                                 |   10 
 block/bfq-iosched.h                                                 |    2 
 block/bfq-wf2q.c                                                    |   12 -
 drivers/android/binder.c                                            |    9 
 drivers/android/binder_internal.h                                   |    2 
 drivers/android/binderfs.c                                          |    7 
 drivers/base/core.c                                                 |   23 +-
 drivers/bus/ti-sysc.c                                               |    4 
 drivers/dma-buf/dma-buf.c                                           |    1 
 drivers/dma/coh901318.c                                             |    4 
 drivers/dma/imx-sdma.c                                              |    5 
 drivers/dma/tegra20-apb-dma.c                                       |    6 
 drivers/edac/synopsys_edac.c                                        |   22 --
 drivers/firmware/efi/efi.c                                          |    4 
 drivers/firmware/imx/imx-scu.c                                      |   27 ++
 drivers/firmware/imx/misc.c                                         |    8 
 drivers/firmware/imx/scu-pd.c                                       |    2 
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c                              |   97 ++++-----
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c                          |    2 
 drivers/gpu/drm/amd/powerplay/smu_v12_0.c                           |    3 
 drivers/gpu/drm/drm_client_modeset.c                                |    3 
 drivers/gpu/drm/drm_gem_shmem_helper.c                              |   15 +
 drivers/gpu/drm/drm_modes.c                                         |    7 
 drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h                     |    1 
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c                     |   20 -
 drivers/gpu/drm/i915/display/intel_display_power.c                  |   16 +
 drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c                  |    2 
 drivers/gpu/drm/i915/i915_perf.c                                    |   58 +++--
 drivers/gpu/drm/i915/i915_perf_types.h                              |    3 
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c                         |    1 
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c                           |    4 
 drivers/gpu/drm/msm/dsi/dsi_manager.c                               |    7 
 drivers/gpu/drm/msm/dsi/phy/dsi_phy.c                               |    4 
 drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c                          |    6 
 drivers/gpu/drm/panfrost/panfrost_mmu.c                             |   44 +---
 drivers/gpu/drm/selftests/drm_cmdline_selftests.h                   |    1 
 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c                 |   15 +
 drivers/gpu/drm/sun4i/sun8i_mixer.c                                 |  104 ++++++++--
 drivers/gpu/drm/sun4i/sun8i_mixer.h                                 |   11 +
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c                              |   66 +++++-
 drivers/gpu/drm/ttm/ttm_bo_util.c                                   |    1 
 drivers/gpu/drm/virtio/virtgpu_object.c                             |    5 
 drivers/hwmon/adt7462.c                                             |    2 
 drivers/infiniband/core/cm.c                                        |    1 
 drivers/infiniband/core/cma.c                                       |   15 +
 drivers/infiniband/core/core_priv.h                                 |   15 +
 drivers/infiniband/core/iwcm.c                                      |    4 
 drivers/infiniband/core/nldev.c                                     |    2 
 drivers/infiniband/core/rw.c                                        |   31 +-
 drivers/infiniband/core/security.c                                  |   14 -
 drivers/infiniband/core/umem_odp.c                                  |   24 +-
 drivers/infiniband/core/uverbs_cmd.c                                |   10 
 drivers/infiniband/core/verbs.c                                     |   10 
 drivers/infiniband/hw/hfi1/verbs.c                                  |    4 
 drivers/infiniband/hw/mlx5/mlx5_ib.h                                |    1 
 drivers/infiniband/hw/mlx5/odp.c                                    |   17 -
 drivers/infiniband/hw/qib/qib_verbs.c                               |    2 
 drivers/infiniband/sw/siw/siw_main.c                                |    6 
 drivers/iommu/amd_iommu_init.c                                      |   13 +
 drivers/md/dm-cache-target.c                                        |    4 
 drivers/md/dm-integrity.c                                           |   50 +++-
 drivers/md/dm-thin-metadata.c                                       |    2 
 drivers/md/dm-writecache.c                                          |   14 +
 drivers/md/dm-zoned-target.c                                        |    8 
 drivers/md/dm.c                                                     |   22 +-
 drivers/media/mc/mc-entity.c                                        |    4 
 drivers/media/platform/vicodec/codec-v4l2-fwht.c                    |   34 ---
 drivers/media/v4l2-core/v4l2-mem2mem.c                              |    4 
 drivers/misc/habanalabs/device.c                                    |    5 
 drivers/misc/habanalabs/goya/goya.c                                 |   44 ++++
 drivers/net/dsa/bcm_sf2.c                                           |    3 
 drivers/net/ethernet/aquantia/atlantic/aq_hw.h                      |    2 
 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c           |    4 
 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c        |   19 +
 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c   |   12 +
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c                   |   62 +++++
 drivers/net/ethernet/cavium/thunder/thunder_bgx.h                   |    9 
 drivers/net/ethernet/davicom/dm9000.c                               |    2 
 drivers/net/ethernet/intel/ice/ice_ethtool.c                        |    7 
 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c           |    5 
 drivers/net/ethernet/micrel/ks8851_mll.c                            |   53 -----
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c                   |   13 -
 drivers/nvme/host/core.c                                            |    2 
 drivers/nvme/host/pci.c                                             |   15 +
 drivers/phy/allwinner/phy-sun50i-usb3.c                             |    2 
 drivers/phy/motorola/phy-mapphone-mdm6600.c                         |   27 ++
 drivers/regulator/stm32-vrefbuf.c                                   |    3 
 drivers/s390/cio/blacklist.c                                        |    5 
 drivers/s390/cio/qdio_setup.c                                       |    3 
 drivers/s390/net/qeth_core_main.c                                   |   23 +-
 drivers/scsi/megaraid/megaraid_sas_fusion.c                         |    5 
 drivers/soc/imx/soc-imx-scu.c                                       |    2 
 drivers/spi/atmel-quadspi.c                                         |   11 +
 drivers/spi/spi-bcm63xx-hsspi.c                                     |    1 
 drivers/spi/spidev.c                                                |    5 
 drivers/staging/media/hantro/hantro_drv.c                           |    4 
 drivers/staging/speakup/selection.c                                 |    2 
 drivers/tty/serdev/core.c                                           |   10 
 drivers/tty/serial/8250/8250_exar.c                                 |   33 +++
 drivers/tty/serial/ar933x_uart.c                                    |    8 
 drivers/tty/serial/fsl_lpuart.c                                     |   39 ++-
 drivers/tty/serial/mvebu-uart.c                                     |    2 
 drivers/tty/vt/selection.c                                          |   26 ++
 drivers/tty/vt/vt.c                                                 |    2 
 drivers/usb/cdns3/gadget.c                                          |   19 +
 drivers/usb/core/hub.c                                              |    8 
 drivers/usb/core/port.c                                             |   10 
 drivers/usb/core/quirks.c                                           |    3 
 drivers/usb/dwc3/gadget.c                                           |    9 
 drivers/usb/gadget/composite.c                                      |   24 +-
 drivers/usb/gadget/function/f_fs.c                                  |    5 
 drivers/usb/gadget/function/u_serial.c                              |    4 
 drivers/usb/misc/usb251xb.c                                         |   20 +
 drivers/usb/storage/unusual_devs.h                                  |    6 
 drivers/video/console/vgacon.c                                      |    3 
 drivers/watchdog/da9062_wdt.c                                       |    7 
 fs/btrfs/inode.c                                                    |    4 
 fs/cifs/cifsglob.h                                                  |    7 
 fs/cifs/cifsproto.h                                                 |    5 
 fs/cifs/cifssmb.c                                                   |    3 
 fs/cifs/file.c                                                      |   19 +
 fs/cifs/inode.c                                                     |   12 -
 fs/cifs/smb1ops.c                                                   |    2 
 fs/cifs/smb2inode.c                                                 |    4 
 fs/cifs/smb2ops.c                                                   |    3 
 fs/cifs/smb2pdu.c                                                   |    1 
 fs/fat/inode.c                                                      |   19 -
 include/drm/drm_gem_shmem_helper.h                                  |    5 
 include/linux/mm.h                                                  |    4 
 kernel/sched/fair.c                                                 |    2 
 kernel/trace/blktrace.c                                             |    5 
 mm/huge_memory.c                                                    |    3 
 mm/memory.c                                                         |   35 ++-
 mm/memory_hotplug.c                                                 |    8 
 mm/mprotect.c                                                       |   38 +++
 net/netfilter/xt_hashlimit.c                                        |   36 ---
 security/integrity/platform_certs/load_uefi.c                       |   40 ++-
 sound/hda/ext/hdac_ext_controller.c                                 |    9 
 sound/pci/hda/patch_realtek.c                                       |   31 ++
 sound/soc/codecs/pcm512x.c                                          |    8 
 sound/soc/intel/boards/skl_hda_dsp_generic.c                        |    8 
 sound/soc/intel/skylake/skl-debug.c                                 |   32 +--
 sound/soc/intel/skylake/skl-ssp-clk.c                               |    4 
 sound/soc/soc-component.c                                           |    2 
 sound/soc/soc-dapm.c                                                |    2 
 sound/soc/soc-pcm.c                                                 |   16 -
 sound/soc/soc-topology.c                                            |   17 -
 sound/soc/sof/intel/hda.c                                           |    3 
 sound/soc/sof/ipc.c                                                 |    2 
 tools/perf/arch/arm/util/cs-etm.c                                   |    5 
 tools/perf/arch/arm64/util/arm-spe.c                                |    5 
 tools/perf/arch/x86/util/intel-bts.c                                |    5 
 tools/perf/arch/x86/util/intel-pt.c                                 |    5 
 tools/testing/selftests/lib.mk                                      |   23 +-
 tools/testing/selftests/net/forwarding/mirror_gre.sh                |   25 +-
 tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh           |    6 
 tools/testing/selftests/pidfd/.gitignore                            |    1 
 tools/testing/selftests/tpm2/test_smoke.sh                          |   13 +
 tools/testing/selftests/tpm2/test_space.sh                          |    9 
 203 files changed, 1610 insertions(+), 744 deletions(-)

Aaro Koskinen (1):
net: stmmac: fix notifier registration

Adrian Hunter (1):
perf arm-spe: Fix endless record after being terminated

Ahmad Fatoum (1):
ARM: imx: build v7_cpu_resume() unconditionally

Ahzo (1):
drm/ttm: fix leaking fences via ttm_buffer_object_transfer

Amadeusz Sławiński (1):
ASoC: Intel: Skylake: Fix available clock counter incrementation

Andy Shevchenko (1):
nvme-pci: Use single IRQ vector for old Apple models

Ard Biesheuvel (2):
efi/x86: Align GUIDs to their size in the mixed mode runtime wrapper efi/x86: Handle by-ref arguments covering multiple pages in mixed mode

Artemy Kovalyov (1):
IB/mlx5: Fix implicit ODP race

Aurelien Aptel (1):
cifs: fix rename() by ensuring source handle opened with DELETE bit

Bernard Metzler (2):
RDMA/siw: Fix failure handling during device creation RDMA/iwcm: Fix iwcm work deallocation

Brian Masney (1):
drm/msm/mdp5: rate limit pp done timeout warnings

Cengiz Can (1):
blktrace: fix dereference after null check

Charles Keepax (1):
ASoC: dapm: Correct DAPM handling of active widgets during shutdown

Chris Wilson (1):
drm/i915/perf: Reintroduce wait on OA configuration completion

Christian Brauner (2):
binder: prevent UAF for binderfs devices
binder: prevent UAF for binderfs devices II

Christian Hewitt (1):
arm64: dts: meson: fix gxm-khadas-vim2 wifi

Christian Lachner (1):
ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master

Christophe JAILLET (1):
spi: bcm63xx-hsspi: Really keep pll clk enabled

Christophe Leroy (1):
selftests: pidfd: Add pidfd_fdinfo_test in .gitignore

Cong Wang (2):
netfilter: xt_hashlimit: unregister proc file before releasing mutex
dma-buf: free dmabuf->name in dma_buf_release()

Dan Carpenter (4):
ASoC: SOF: Fix snd_sof_ipc_stream_posn() drm/i915/selftests: Fix return in assert_mmap_offset()
hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()

Dan Lazewatsky (1):
usb: quirks: add NO_LPM quirk for Logitech Screen Share

Daniel Golle (1):
serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE

Dennis Dalessandro (1):
IB/hfi1, qib: Ensure RCU is locked when accessing list

Desnes A. Nunes do Rosario (1):
powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems

Dmitry Osipenko (2):
dmaengine: tegra-apb: Fix use-after-free
dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list

Dragos Tarcatu (2):
ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
ASoC: topology: Fix memleak in soc_tplg_manifest_load()

Egor Pomozov (1):
net: atlantic: ptp gpio adjustments

Eugeniu Rosca (3):
usb: core: hub: fix unhandled return by employing a void function
usb: core: hub: do error out if usb_autopm_get_interface() fails
usb: core: port: do error out if usb_autopm_get_interface() fails

Ezequiel Garcia (1):
media: hantro: Fix broken media controller links

Fabio Estevam (1):
arm64: dts: imx8qxp-mek: Remove unexisting Ethernet PHY

Fabrice Gasnier (1):
regulator: stm32-vrefbuf: fix a possible overshoot when re-enabling

Faiz Abbas (1):
arm: dts: dra76x: Fix mmc3 max-frequency

Florian Fainelli (1):
net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec

Florian Westphal (1):
netfilter: hashlimit: do not use indirect calls during gc

Frieder Schrempf (1):
dmaengine: imx-sdma: Fix the event id check to include RX event for UART6

Gerald Schaefer (1):
s390/mm: fix panic in gup_fast on large pud

Gerd Hoffmann (2):
drm/virtio: fix mmap page attributes drm/shmem: add support for per object caching flags.

Greg Kroah-Hartman (1):

      Linux 5.5.9

Guillaume La Roque (1):
arm64: dts: meson-sm1-sei610: add missing interrupt-names

Guo Ren (6):
csky/mm: Fixup export invalid_pte_table symbol
csky: Set regs->usp to kernel sp, when the exception is from kernel csky/smp: Fixup boot failed when CONFIG_SMP
csky: Fixup ftrace modify panic
csky: Fixup compile warning for three unimplemented syscalls
csky: Implement copy_thread_tls

H.J. Lu (1):
x86/boot/compressed: Don't declare __force_order in kaslr_64.c

Hamdan Igbaria (1):
net/mlx5: DR, Fix matching on vport gvmi

Hangbin Liu (3):
selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing
selftests: forwarding: vxlan_bridge_1d: fix tos value
selftests: forwarding: vxlan_bridge_1d: use more proper tos value

Hans Verkuil (3):
media: mc-entity.c: use & to check pad flags, not ==
media: vicodec: process all 4 components for RGB32 formats
media: v4l2-mem2mem.c: fix broken links

Harigovindan P (2):
drm/msm/dsi: save pll state before dsi host is powered off drm/msm/dsi/pll: call vco set rate explicitly

Hou Tao (1):
dm: fix congested_fn for request-based device

Huang Ying (1):
mm: fix possible PMD dirty bit lost in set_pmd_migration_entry()

Hui Wang (1):
ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1

Igor Russkikh (1):
net: atlantic: check rpc result and wait for rpc address

Jack Pham (1):
usb: gadget: composite: Support more than 500mA MaxPower

Jaroslav Kysela (1):
ASoC: intel/skl/hda - export number of digital microphones via control components

Jason A. Donenfeld (1):
efi: READ_ONCE rng seed size before munmap

Jason Gunthorpe (2):
RDMA/odp: Ensure the mm is still alive before creating an implicit child RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()

Javier Martinez Canillas (1):
efi: Only print errors about failing to get certs if EFI vars are found

Jay Dolan (1):
serial: 8250_exar: add support for ACCES cards

Jernej Skrabec (3):
drm/sun4i: Add separate DE3 VI layer formats drm/sun4i: Fix DE2 VI layer format support drm/sun4i: de2/de3: Remove unsupported VI layer formats

Jian-Hong Pan (1):
ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294

Jim Lin (1):
usb: storage: Add quirk for Samsung Fit flash

Jiri Benc (1):
selftests: fix too long argument

Jiri Slaby (3):
vt: selection, close sel_buffer race
vt: selection, push console lock down
vt: selection, push sel_lock up

John Bates (1):
drm/virtio: fix resource id creation race

John Stultz (2):
drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
drm: kirin: Revert "Fix for hikey620 display offset problem"

Juergen Gross (1):
x86/ioperm: Add new paravirt function update_io_bitmap()

Julian Wiedmann (1):
s390/qdio: fill SL with absolute addresses

Kai Vehmanen (1):
ALSA: hda: do not override bus codec_mask in link_get()

Kai-Heng Feng (1):
iommu/amd: Disable IOMMU on Stoney Ridge systems

Kailang Yang (2):
ALSA: hda/realtek - Add Headset Mic supported
ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1

Kees Cook (1):
x86/xen: Distribute switch variables for initialization

Keith Busch (1):
nvme: Fix uninitialized-variable warning

Kirill A. Shutemov (1):
mm: avoid data corruption on CoW fault into PFN-mapped VMA

Kuninori Morimoto (1):
ASoC: soc-component: tidyup snd_soc_pcm_component_sync_stop()

Lars-Peter Clausen (1):
usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags

Leonard Crestez (5):
firmware: imx: scu: Ensure sequential TX
firmware: imx: misc: Align imx sc msg structs to 4
firmware: imx: scu-pd: Align imx sc msg structs to 4
firmware: imx: Align imx_sc_msg_req_cpu_start to 4
soc: imx-scu: Align imx sc msg structs to 4

Ley Foon Tan (1):
arm64: dts: socfpga: agilex: Fix gmac compatible

Lukas Wunner (1):
spi: spidev: Fix CS polarity if GPIO descriptors are used

Maor Gottlieb (2):
RDMA/core: Fix pkey and port assignment in get_new_pps RDMA/core: Fix protection fault in ib_mr_pool_destroy

Marco Felsch (3):
watchdog: da9062: do not ping the hw during stop()
usb: usb251xb: fix regulator probe and error handling
ARM: dts: imx6: phycore-som: fix emmc supply

Marek Vasut (3):

      net: ks8851-ml: Remove 8-bit bus accessors
      net: ks8851-ml: Fix 16-bit data access
      net: ks8851-ml: Fix 16-bit IO operation

Mark Zhang (1):
RDMA/nldev: Fix crash when set a QP to a new counter but QPN is missing

Martin Fuzzey (1):
dmaengine: imx-sdma: fix context cache

Masahiro Yamada (1):
s390: make 'install' not depend on vmlinux

Matt Roper (1):
drm/i915: Program MBUS with rmw during initialization

Matthias Reichl (1):
ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path

Max Gurtovoy (1):
RDMA/rw: Fix error flow during RDMA context initialization

Mel Gorman (1):
mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa

Michael Ellerman (1):
powerpc/mm: Fix missing KUAP disable in flush_coherent_icache()

Michael Walle (1):
tty: serial: fsl_lpuart: free IDs allocated by IDA

Michal Swiatkowski (1):
ice: Don't tell the OS that link is going down

Mikulas Patocka (6):
dm integrity: fix recalculation when moving from journal mode to bitmap mode dm integrity: fix a deadlock due to offloading to an incorrect workqueue dm integrity: fix invalid table returned due to argument count mismatch dm cache: fix a crash due to incorrect work item cancelling
dm: report suspended device during destroy
dm writecache: verify watermark during resume

Nathan Chancellor (1):
RDMA/core: Fix use of logical OR in get_new_pps

Nikita Sobolev (1):
Kernel selftests: tpm2: check for tpm support

Niklas Schnelle (1):
s390/pci: Fix unexpected write combine on resource

OGAWA Hirofumi (1):
fat: fix uninit-memory access for partial initialized inode

Oded Gabbay (2):
habanalabs: halt the engines before hard-reset
habanalabs: patched cb equals user cb in device memset

Oleksandr Suvorov (1):
ARM: dts: imx7-colibri: Fix frequency for sd/mmc

Omar Sandoval (1):
btrfs: fix RAID direct I/O reads with alternate csums

Omer Shpigelman (1):
habanalabs: do not halt CoreSight during hard reset

Paolo Valente (4):
block, bfq: get a ref to a group when adding it to a service tree block, bfq: get extra ref to prevent a queue from being freed during a group move block, bfq: do not insert oom queue into position tree
block, bfq: remove ifdefs from around gets/puts of bfq groups

Parav Pandit (1):
Revert "RDMA/cma: Simplify rdma_resolve_addr() error flow"

Paul Cercueil (1):

      net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()

Peng Fan (1):
ARM: dts: imx7d: fix opp-supported-hw

Peter Chen (2):
usb: cdns3: gadget: link trb should point to next request
usb: cdns3: gadget: toggle cycle bit before reset endpoint

Petr Vorel (1):
regulator: qcom_spmi: Fix docs for PM8004

Phong LE (1):
drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly

Pratham Pratap (1):
usb: dwc3: gadget: Update chain bit correctly when using sg list

Prike Liang (1):
drm/amd/powerplay: fix pre-check condition for setting clock range

Randy Dunlap (1):
arch/csky: fix some Kconfig typos

Rikard Falkeborn (1):
phy: allwinner: Fix GENMASK misuse

Ronald Tschalär (1):
serdev: Fix detection of UART devices on Apple machines.

Ronnie Sahlberg (1):
cifs: don't leak -EAGAIN for stat() during reconnect

Saravana Kannan (1):
driver core: Call sync_state() even if supplier has no consumers

Sean Christopherson (1):
x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes

Sergey Organov (1):
usb: gadget: serial: fix Tx stall after buffer overflow

Sherry Sun (1):
EDAC/synopsys: Do not print an error with back-to-back snprintf() calls

Shin'ichiro Kawasaki (1):
dm zoned: Fix reference counter initial value of chunk works

Shyjumon N (1):
nvme/pci: Add sleep quirk for Samsung and Toshiba drives

Stephan Gerhold (2):
drm/modes: Make sure to parse valid rotation value from cmdline drm/modes: Allow DRM_MODE_ROTATE_0 when applying video mode parameters

Suman Anna (2):
ARM: dts: am437x-idk-evm: Fix incorrect OPP node names
ARM: dts: dra7xx-clocks: Fixup IPU1 mux clock parent source

Sébastien Szymanski (1):
dt-bindings: arm: fsl: fix APF6Dev compatible

Takashi Iwai (3):
ASoC: intel: skl: Fix pin debug prints
ASoC: intel: skl: Fix possible buffer overflow in debug outputs
ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output

Theodore Ts'o (1):
dm thin metadata: fix lockdep complaint

Tianci.Yin (1):
drm/amdgpu: disable 3D pipe 1 on Navi1x

Tim Harvey (1):
net: thunderx: workaround BGX TX Underflow issue

Tomas Henzl (1):
scsi: megaraid_sas: silence a warning

Tomeu Vizoso (1):
drm/panfrost: Don't try to map on error faults

Tony Lindgren (3):
phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling
phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval
bus: ti-sysc: Fix 1-wire reset quirk

Tudor Ambarus (1):
spi: atmel-quadspi: fix possible MMIO window size overrun

Vasily Averin (1):
s390/cio: cio_ignore_proc_seq_next should increase position index

Vincent Guittot (1):
sched/fair: Fix statistics for find_idlest_group()

Vladimir Oltean (1):
ARM: dts: ls1021a: Restore MDIO compatible to gianfar

Vlastimil Babka (1):
mm, hotplug: fix page online with DEBUG_PAGEALLOC compiled but not enabled

Wei Li (3):
perf intel-pt: Fix endless record after being terminated perf intel-bts: Fix endless record after being terminated perf cs-etm: Fix endless record after being terminated

Zhang Xiaoxu (1):
vgacon: Fix a UAF in vgacon_invert_region

tangbin (1):
tty:serial:mvebu-uart:fix a wrong return

author maintainer
#1 lore raw
Documentation/devicetree/bindings/arm/fsl.yaml +1 -1
index f79683a628f0..1238e68ac1b4 100644
@@ -139,7 +139,7 @@ properties:
         items:
           - enum:
               - armadeus,imx6dl-apf6      # APF6 (Solo) SoM
-              - armadeus,imx6dl-apf6dldev # APF6 (Solo) SoM on APF6Dev board
+              - armadeus,imx6dl-apf6dev   # APF6 (Solo) SoM on APF6Dev board
               - eckelmann,imx6dl-ci4x10
               - emtrion,emcon-mx6         # emCON-MX6S or emCON-MX6DL SoM
               - emtrion,emcon-mx6-avari   # emCON-MX6S or emCON-MX6DL SoM on Avari Base
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt +1 -1
index f5cdac8b2847..8b005192f6e8 100644
@@ -161,7 +161,7 @@ The regulator node houses sub-nodes for each regulator within the device. Each
 sub-node is identified using the node's name, with valid values listed for each
 of the PMICs below.
 
-pm8005:
+pm8004:
 	s2, s5
 
 pm8005:
Makefile +1 -1
index a1e5190e4721..8b786a8a7289 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 5
-SUBLEVEL = 8
+SUBLEVEL = 9
 EXTRAVERSION =
 NAME = Kleptomaniac Octopus
 
arch/arm/boot/dts/am437x-idk-evm.dts +2 -2
index f3ced6df0c9b..9f66f96d09c9 100644
@@ -526,11 +526,11 @@ &cpu0_opp_table {
 	 * Supply voltage supervisor on board will not allow opp50 so
 	 * disable it and set opp100 as suspend OPP.
 	 */
-	opp50@300000000 {
+	opp50-300000000 {
 		status = "disabled";
 	};
 
-	opp100@600000000 {
+	opp100-600000000 {
 		opp-suspend;
 	};
 };
arch/arm/boot/dts/dra76x.dtsi +5 -0
index cdcba3f561c4..9f6fbe4c1fee 100644
@@ -86,3 +86,8 @@ &rtctarget {
 &usb4_tm {
 	status = "disabled";
 };
+
+&mmc3 {
+	/* dra76x is not affected by i887 */
+	max-frequency = <96000000>;
+};
arch/arm/boot/dts/dra7xx-clocks.dtsi +2 -10
index 93e1eb83bed9..d7d98d2069df 100644
@@ -796,16 +796,6 @@ video2_div_clk: video2_div_clk {
 		clock-div = <1>;
 	};
 
-	ipu1_gfclk_mux: ipu1_gfclk_mux@520 {
-		#clock-cells = <0>;
-		compatible = "ti,mux-clock";
-		clocks = <&dpll_abe_m2x2_ck>, <&dpll_core_h22x2_ck>;
-		ti,bit-shift = <24>;
-		reg = <0x0520>;
-		assigned-clocks = <&ipu1_gfclk_mux>;
-		assigned-clock-parents = <&dpll_core_h22x2_ck>;
-	};
-
 	dummy_ck: dummy_ck {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
@@ -1564,6 +1554,8 @@ ipu1_clkctrl: ipu1-clkctrl@20 {
 			compatible = "ti,clkctrl";
 			reg = <0x20 0x4>;
 			#clock-cells = <2>;
+			assigned-clocks = <&ipu1_clkctrl DRA7_IPU1_MMU_IPU1_CLKCTRL 24>;
+			assigned-clock-parents = <&dpll_core_h22x2_ck>;
 		};
 
 		ipu_clkctrl: ipu-clkctrl@50 {
arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +0 -1
index 6486df3e2942..881cea0b61ba 100644
@@ -183,7 +183,6 @@ &usdhc4 {
 	pinctrl-0 = <&pinctrl_usdhc4>;
 	bus-width = <8>;
 	non-removable;
-	vmmc-supply = <&vdd_emmc_1p8>;
 	status = "disabled";
 };
 
arch/arm/boot/dts/imx7-colibri.dtsi +0 -1
index d05be3f0e2a7..04717cf69db0 100644
@@ -336,7 +336,6 @@ &usdhc3 {
 	assigned-clock-rates = <400000000>;
 	bus-width = <8>;
 	fsl,tuning-step = <2>;
-	max-frequency = <100000000>;
 	vmmc-supply = <&reg_module_3v3>;
 	vqmmc-supply = <&reg_DCDC3>;
 	non-removable;
arch/arm/boot/dts/imx7d.dtsi +3 -3
index d8acd7cc7918..497434f0629e 100644
@@ -44,7 +44,7 @@ opp-792000000 {
 			opp-hz = /bits/ 64 <792000000>;
 			opp-microvolt = <1000000>;
 			clock-latency-ns = <150000>;
-			opp-supported-hw = <0xd>, <0xf>;
+			opp-supported-hw = <0xd>, <0x7>;
 			opp-suspend;
 		};
 
@@ -52,7 +52,7 @@ opp-996000000 {
 			opp-hz = /bits/ 64 <996000000>;
 			opp-microvolt = <1100000>;
 			clock-latency-ns = <150000>;
-			opp-supported-hw = <0xc>, <0xf>;
+			opp-supported-hw = <0xc>, <0x7>;
 			opp-suspend;
 		};
 
@@ -60,7 +60,7 @@ opp-1200000000 {
 			opp-hz = /bits/ 64 <1200000000>;
 			opp-microvolt = <1225000>;
 			clock-latency-ns = <150000>;
-			opp-supported-hw = <0x8>, <0xf>;
+			opp-supported-hw = <0x8>, <0x3>;
 			opp-suspend;
 		};
 	};
arch/arm/boot/dts/ls1021a.dtsi +2 -2
index 2f6977ada447..63d9f4a066e3 100644
@@ -728,7 +728,7 @@ dcu: dcu@2ce0000 {
 		};
 
 		mdio0: mdio@2d24000 {
-			compatible = "fsl,etsec2-mdio";
+			compatible = "gianfar";
 			device_type = "mdio";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -737,7 +737,7 @@ mdio0: mdio@2d24000 {
 		};
 
 		mdio1: mdio@2d64000 {
-			compatible = "fsl,etsec2-mdio";
+			compatible = "gianfar";
 			device_type = "mdio";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm/mach-imx/Makefile +2 -0
index 35ff620537e6..03506ce46149 100644
@@ -91,6 +91,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
 obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
 obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
 endif
+AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a
+obj-$(CONFIG_SOC_IMX6) += resume-imx6.o
 obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
 
 obj-$(CONFIG_SOC_IMX1) += mach-imx1.o
arch/arm/mach-imx/common.h +2 -2
index 912aeceb4ff8..5aa5796cff0e 100644
@@ -109,17 +109,17 @@ void imx_cpu_die(unsigned int cpu);
 int imx_cpu_kill(unsigned int cpu);
 
 #ifdef CONFIG_SUSPEND
-void v7_cpu_resume(void);
 void imx53_suspend(void __iomem *ocram_vbase);
 extern const u32 imx53_suspend_sz;
 void imx6_suspend(void __iomem *ocram_vbase);
 #else
-static inline void v7_cpu_resume(void) {}
 static inline void imx53_suspend(void __iomem *ocram_vbase) {}
 static const u32 imx53_suspend_sz;
 static inline void imx6_suspend(void __iomem *ocram_vbase) {}
 #endif
 
+void v7_cpu_resume(void);
+
 void imx6_pm_ccm_init(const char *ccm_compat);
 void imx6q_pm_init(void);
 void imx6dl_pm_init(void);
arch/arm/mach-imx/resume-imx6.S new file +24 -0
new file mode 100644
index 000000000000..5bd1ba7ef15b
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright 2014 Freescale Semiconductor, Inc.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/asm-offsets.h>
+#include <asm/hardware/cache-l2x0.h>
+#include "hardware.h"
+
+/*
+ * The following code must assume it is running from physical address
+ * where absolute virtual addresses to the data section have to be
+ * turned into relative ones.
+ */
+
+ENTRY(v7_cpu_resume)
+	bl	v7_invalidate_l1
+#ifdef CONFIG_CACHE_L2X0
+	bl	l2c310_early_resume
+#endif
+	b	cpu_resume
+ENDPROC(v7_cpu_resume)
arch/arm/mach-imx/suspend-imx6.S +0 -14
index 062391ff13da..1eabf2d2834b 100644
@@ -327,17 +327,3 @@ resume:
 
 	ret	lr
 ENDPROC(imx6_suspend)
-
-/*
- * The following code must assume it is running from physical address
- * where absolute virtual addresses to the data section have to be
- * turned into relative ones.
- */
-
-ENTRY(v7_cpu_resume)
-	bl	v7_invalidate_l1
-#ifdef CONFIG_CACHE_L2X0
-	bl	l2c310_early_resume
-#endif
-	b	cpu_resume
-ENDPROC(v7_cpu_resume)
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +1 -1
index f82f25c1a5f9..d5dc12878dfe 100644
@@ -327,7 +327,7 @@ &sd_emmc_a {
 	#size-cells = <0>;
 
 	bus-width = <4>;
-	max-frequency = <50000000>;
+	max-frequency = <60000000>;
 
 	non-removable;
 	disable-wp;
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +1 -0
index a8bb3fa9fec9..cb1b48f5b8b1 100644
@@ -593,6 +593,7 @@ bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		interrupt-parent = <&gpio_intc>;
 		interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "host-wakeup";
 		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
 		max-speed = <2000000>;
 		clocks = <&wifi32k>;
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0 -5
index d3d26cca7d52..13460a360c6a 100644
@@ -52,11 +52,6 @@ ethphy0: ethernet-phy@0 {
 			compatible = "ethernet-phy-ieee802.3-c22";
 			reg = <0>;
 		};
-
-		ethphy1: ethernet-phy@1 {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			reg = <1>;
-		};
 	};
 };
 
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +3 -3
index d43e1299c8ef..b47f2ce160a4 100644
@@ -102,7 +102,7 @@ base_fpga_region {
 		};
 
 		gmac0: ethernet@ff800000 {
-			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
+			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
 			reg = <0xff800000 0x2000>;
 			interrupts = <0 90 4>;
 			interrupt-names = "macirq";
@@ -117,7 +117,7 @@ gmac0: ethernet@ff800000 {
 		};
 
 		gmac1: ethernet@ff802000 {
-			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
+			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
 			reg = <0xff802000 0x2000>;
 			interrupts = <0 91 4>;
 			interrupt-names = "macirq";
@@ -132,7 +132,7 @@ gmac1: ethernet@ff802000 {
 		};
 
 		gmac2: ethernet@ff804000 {
-			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
+			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
 			reg = <0xff804000 0x2000>;
 			interrupts = <0 92 4>;
 			interrupt-names = "macirq";
arch/csky/Kconfig +2 -1
index da09c884cc30..f00b394988a2 100644
@@ -37,6 +37,7 @@ config CSKY
 	select GX6605S_TIMER if CPU_CK610
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_AUDITSYSCALL
+	select HAVE_COPY_THREAD_TLS
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_TRACER
 	select HAVE_FUNCTION_GRAPH_TRACER
@@ -75,7 +76,7 @@ config CPU_HAS_TLBI
 config CPU_HAS_LDSTEX
 	bool
 	help
-	  For SMP, CPU needs "ldex&stex" instrcutions to atomic operations.
+	  For SMP, CPU needs "ldex&stex" instructions for atomic operations.
 
 config CPU_NEED_TLBSYNC
 	bool
arch/csky/abiv1/inc/abi/entry.h +14 -5
index 7ab78bd0f3b1..f35a9f3315ee 100644
@@ -16,14 +16,16 @@
 #define LSAVE_A4	40
 #define LSAVE_A5	44
 
+#define usp ss1
+
 .macro USPTOKSP
-	mtcr	sp, ss1
+	mtcr	sp, usp
 	mfcr	sp, ss0
 .endm
 
 .macro KSPTOUSP
 	mtcr	sp, ss0
-	mfcr	sp, ss1
+	mfcr	sp, usp
 .endm
 
 .macro	SAVE_ALL epc_inc
@@ -45,7 +47,13 @@
 	add	lr, r13
 	stw     lr, (sp, 8)
 
+	mov	lr, sp
+	addi	lr, 32
+	addi	lr, 32
+	addi	lr, 16
+	bt	2f
 	mfcr	lr, ss1
+2:
 	stw     lr, (sp, 16)
 
 	stw     a0, (sp, 20)
@@ -79,9 +87,10 @@
 	ldw     a0, (sp, 12)
 	mtcr    a0, epsr
 	btsti   a0, 31
+	bt      1f
 	ldw     a0, (sp, 16)
 	mtcr	a0, ss1
-
+1:
 	ldw     a0, (sp, 24)
 	ldw     a1, (sp, 28)
 	ldw     a2, (sp, 32)
@@ -102,9 +111,9 @@
 	addi	sp, 32
 	addi	sp, 8
 
-	bt      1f
+	bt      2f
 	KSPTOUSP
-1:
+2:
 	rte
 .endm
 
arch/csky/abiv2/inc/abi/entry.h +11 -0
index 9897a16b45e5..94a7a58765df 100644
@@ -31,7 +31,13 @@
 
 	mfcr	lr, epsr
 	stw	lr, (sp, 12)
+	btsti   lr, 31
+	bf      1f
+	addi    lr, sp, 152
+	br	2f
+1:
 	mfcr	lr, usp
+2:
 	stw	lr, (sp, 16)
 
 	stw     a0, (sp, 20)
@@ -64,8 +70,10 @@
 	mtcr	a0, epc
 	ldw	a0, (sp, 12)
 	mtcr	a0, epsr
+	btsti   a0, 31
 	ldw	a0, (sp, 16)
 	mtcr	a0, usp
+	mtcr	a0, ss0
 
 #ifdef CONFIG_CPU_HAS_HILO
 	ldw	a0, (sp, 140)
@@ -86,6 +94,9 @@
 	addi    sp, 40
 	ldm     r16-r30, (sp)
 	addi    sp, 72
+	bf	1f
+	mfcr	sp, ss0
+1:
 	rte
 .endm
 
arch/csky/include/uapi/asm/unistd.h +3 -0
index 211c983c7282..ba4018929733 100644
@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
 
+#define __ARCH_WANT_STAT64
+#define __ARCH_WANT_NEW_STAT
 #define __ARCH_WANT_SYS_CLONE
+#define __ARCH_WANT_SYS_CLONE3
 #define __ARCH_WANT_SET_GET_RLIMIT
 #define __ARCH_WANT_TIME32_SYSCALLS
 #include <asm-generic/unistd.h>
arch/csky/kernel/atomic.S +6 -2
index 5b84f11485ae..3821ef9b7567 100644
@@ -17,10 +17,12 @@ ENTRY(csky_cmpxchg)
 	mfcr	a3, epc
 	addi	a3, TRAP0_SIZE
 
-	subi    sp, 8
+	subi    sp, 16
 	stw     a3, (sp, 0)
 	mfcr    a3, epsr
 	stw     a3, (sp, 4)
+	mfcr	a3, usp
+	stw     a3, (sp, 8)
 
 	psrset	ee
 #ifdef CONFIG_CPU_HAS_LDSTEX
@@ -47,7 +49,9 @@ ENTRY(csky_cmpxchg)
 	mtcr	a3, epc
 	ldw     a3, (sp, 4)
 	mtcr	a3, epsr
-	addi	sp, 8
+	ldw     a3, (sp, 8)
+	mtcr	a3, usp
+	addi	sp, 16
 	KSPTOUSP
 	rte
 END(csky_cmpxchg)
arch/csky/kernel/process.c +4 -3
index f320d9248a22..397962e11bd1 100644
@@ -34,10 +34,11 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 	return sw->r15;
 }
 
-int copy_thread(unsigned long clone_flags,
+int copy_thread_tls(unsigned long clone_flags,
 		unsigned long usp,
 		unsigned long kthread_arg,
-		struct task_struct *p)
+		struct task_struct *p,
+		unsigned long tls)
 {
 	struct switch_stack *childstack;
 	struct pt_regs *childregs = task_pt_regs(p);
@@ -64,7 +65,7 @@ int copy_thread(unsigned long clone_flags,
 			childregs->usp = usp;
 		if (clone_flags & CLONE_SETTLS)
 			task_thread_info(p)->tp_value = childregs->tls
-						      = childregs->regs[0];
+						      = tls;
 
 		childregs->a0 = 0;
 		childstack->r15 = (unsigned long) ret_from_fork;
arch/csky/kernel/smp.c +1 -1
index b753d382e4ce..0bb0954d5570 100644
@@ -120,7 +120,7 @@ void __init setup_smp_ipi(void)
 	int rc;
 
 	if (ipi_irq == 0)
-		panic("%s IRQ mapping failed\n", __func__);
+		return;
 
 	rc = request_percpu_irq(ipi_irq, handle_ipi, "IPI Interrupt",
 				&ipi_dummy_dev);
arch/csky/mm/Makefile +2 -0
index c94ef6481098..efb7ebab342b 100644
@@ -1,8 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 ifeq ($(CONFIG_CPU_HAS_CACHEV2),y)
 obj-y +=			cachev2.o
+CFLAGS_REMOVE_cachev2.o = $(CC_FLAGS_FTRACE)
 else
 obj-y +=			cachev1.o
+CFLAGS_REMOVE_cachev1.o = $(CC_FLAGS_FTRACE)
 endif
 
 obj-y +=			dma-mapping.o
arch/csky/mm/init.c +1 -0
index d4c2292ea46b..00e96278b377 100644
@@ -31,6 +31,7 @@
 
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
 pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss;
+EXPORT_SYMBOL(invalid_pte_table);
 unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
 						__page_aligned_bss;
 EXPORT_SYMBOL(empty_zero_page);
arch/powerpc/kernel/cputable.c +3 -1
index e745abc5457a..245be4fafe13 100644
@@ -2193,11 +2193,13 @@ static struct cpu_spec * __init setup_cpu_spec(unsigned long offset,
 		 * oprofile_cpu_type already has a value, then we are
 		 * possibly overriding a real PVR with a logical one,
 		 * and, in that case, keep the current value for
-		 * oprofile_cpu_type.
+		 * oprofile_cpu_type. Futhermore, let's ensure that the
+		 * fix for the PMAO bug is enabled on compatibility mode.
 		 */
 		if (old.oprofile_cpu_type != NULL) {
 			t->oprofile_cpu_type = old.oprofile_cpu_type;
 			t->oprofile_type = old.oprofile_type;
+			t->cpu_features |= old.cpu_features & CPU_FTR_PMAO_BUG;
 		}
 	}
 
arch/powerpc/mm/mem.c +2 -0
index f5535eae637f..ab81a727e273 100644
@@ -369,7 +369,9 @@ static inline bool flush_coherent_icache(unsigned long addr)
 	 */
 	if (cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) {
 		mb(); /* sync */
+		allow_read_from_user((const void __user *)addr, L1_CACHE_BYTES);
 		icbi((void *)addr);
+		prevent_read_from_user((const void __user *)addr, L1_CACHE_BYTES);
 		mb(); /* sync */
 		isync();
 		return true;
arch/s390/Makefile +1 -1
index e0e3a465bbfd..8dfa2cf1f05c 100644
@@ -146,7 +146,7 @@ all: bzImage
 #KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg...
 KBUILD_IMAGE	:= $(boot)/bzImage
 
-install: vmlinux
+install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 bzImage: vmlinux
arch/s390/boot/Makefile +1 -1
index e2c47d3a1c89..0ff9261c915e 100644
@@ -70,7 +70,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
 $(obj)/startup.a: $(OBJECTS) FORCE
 	$(call if_changed,ar)
 
-install: $(CONFIGURE) $(obj)/bzImage
+install:
 	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
 	      System.map "$(INSTALL_PATH)"
 
arch/s390/include/asm/pgtable.h +6 -0
index 7b03037a8475..9c578ad5409e 100644
@@ -750,6 +750,12 @@ static inline int pmd_write(pmd_t pmd)
 	return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0;
 }
 
+#define pud_write pud_write
+static inline int pud_write(pud_t pud)
+{
+	return (pud_val(pud) & _REGION3_ENTRY_WRITE) != 0;
+}
+
 static inline int pmd_dirty(pmd_t pmd)
 {
 	return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
arch/s390/include/asm/qdio.h +1 -1
index 71e3f0146cda..7870cf834533 100644
@@ -227,7 +227,7 @@ struct qdio_buffer {
  * @sbal: absolute SBAL address
  */
 struct sl_element {
-	unsigned long sbal;
+	u64 sbal;
 } __attribute__ ((packed));
 
 /**
arch/s390/pci/pci.c +2 -2
index bc61ea18e88d..60716d18ce5a 100644
@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev)
 
 		if (zpci_use_mio(zdev))
 			pdev->resource[i].start =
-				(resource_size_t __force) zdev->bars[i].mio_wb;
+				(resource_size_t __force) zdev->bars[i].mio_wt;
 		else
 			pdev->resource[i].start = (resource_size_t __force)
 				pci_iomap_range_fh(pdev, i, 0, 0);
@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,
 			flags |= IORESOURCE_MEM_64;
 
 		if (zpci_use_mio(zdev))
-			addr = (unsigned long) zdev->bars[i].mio_wb;
+			addr = (unsigned long) zdev->bars[i].mio_wt;
 		else
 			addr = ZPCI_ADDR(entry);
 		size = 1UL << zdev->bars[i].size;
arch/x86/boot/compressed/kaslr_64.c +0 -3
index 748456c365f4..9557c5a15b91 100644
@@ -29,9 +29,6 @@
 #define __PAGE_OFFSET __PAGE_OFFSET_BASE
 #include "../../mm/ident_map.c"
 
-/* Used by pgtable.h asm code to force instruction serialization. */
-unsigned long __force_order;
-
 /* Used to track our page table allocation area. */
 struct alloc_pgt_data {
 	unsigned char *pgt_buf;
arch/x86/include/asm/io_bitmap.h +8 -1
index 02c6ef8f7667..07344d82e88e 100644
@@ -19,7 +19,14 @@ struct task_struct;
 void io_bitmap_share(struct task_struct *tsk);
 void io_bitmap_exit(void);
 
-void tss_update_io_bitmap(void);
+void native_tss_update_io_bitmap(void);
+
+#ifdef CONFIG_PARAVIRT_XXL
+#include <asm/paravirt.h>
+#else
+#define tss_update_io_bitmap native_tss_update_io_bitmap
+#endif
+
 #else
 static inline void io_bitmap_share(struct task_struct *tsk) { }
 static inline void io_bitmap_exit(void) { }
arch/x86/include/asm/paravirt.h +7 -0
index 86e7317eb31f..694d8daf4983 100644
@@ -295,6 +295,13 @@ static inline void write_idt_entry(gate_desc *dt, int entry, const gate_desc *g)
 	PVOP_VCALL3(cpu.write_idt_entry, dt, entry, g);
 }
 
+#ifdef CONFIG_X86_IOPL_IOPERM
+static inline void tss_update_io_bitmap(void)
+{
+	PVOP_VCALL0(cpu.update_io_bitmap);
+}
+#endif
+
 static inline void paravirt_activate_mm(struct mm_struct *prev,
 					struct mm_struct *next)
 {
arch/x86/include/asm/paravirt_types.h +4 -0
index 84812964d3dd..732f62e04ddb 100644
@@ -140,6 +140,10 @@ struct pv_cpu_ops {
 
 	void (*load_sp0)(unsigned long sp0);
 
+#ifdef CONFIG_X86_IOPL_IOPERM
+	void (*update_io_bitmap)(void);
+#endif
+
 	void (*wbinvd)(void);
 
 	/* cpuid emulation, mostly so that caps bits can be disabled */
arch/x86/kernel/cpu/common.c +1 -1
index 2e4d90294fe6..9761e9c56756 100644
@@ -462,7 +462,7 @@ static __always_inline void setup_pku(struct cpuinfo_x86 *c)
 	 * cpuid bit to be set.  We need to ensure that we
 	 * update that bit in this CPU's "cpu_info".
 	 */
-	get_cpu_cap(c);
+	set_cpu_cap(c, X86_FEATURE_OSPKE);
 }
 
 #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
arch/x86/kernel/paravirt.c +5 -0
index 789f5e4f89de..c131ba4e70ef 100644
@@ -30,6 +30,7 @@
 #include <asm/timer.h>
 #include <asm/special_insns.h>
 #include <asm/tlb.h>
+#include <asm/io_bitmap.h>
 
 /*
  * nop stub, which must not clobber anything *including the stack* to
@@ -341,6 +342,10 @@ struct paravirt_patch_template pv_ops = {
 	.cpu.iret		= native_iret,
 	.cpu.swapgs		= native_swapgs,
 
+#ifdef CONFIG_X86_IOPL_IOPERM
+	.cpu.update_io_bitmap	= native_tss_update_io_bitmap,
+#endif
+
 	.cpu.start_context_switch	= paravirt_nop,
 	.cpu.end_context_switch		= paravirt_nop,
 
arch/x86/kernel/process.c +1 -1
index 61e93a318983..3363e71589dd 100644
@@ -374,7 +374,7 @@ static void tss_copy_io_bitmap(struct tss_struct *tss, struct io_bitmap *iobm)
 /**
  * tss_update_io_bitmap - Update I/O bitmap before exiting to usermode
  */
-void tss_update_io_bitmap(void)
+void native_tss_update_io_bitmap(void)
 {
 	struct tss_struct *tss = this_cpu_ptr(&cpu_tss_rw);
 	struct thread_struct *t = &current->thread;
arch/x86/platform/efi/efi_64.c +47 -23

149 lines not on this page · raw message

arch/x86/xen/enlighten_pv.c +29 -3
index 1f756ffffe8b..507f4fb88fa7 100644
@@ -72,6 +72,9 @@
 #include <asm/mwait.h>
 #include <asm/pci_x86.h>
 #include <asm/cpu.h>
+#ifdef CONFIG_X86_IOPL_IOPERM
+#include <asm/io_bitmap.h>
+#endif
 
 #ifdef CONFIG_ACPI
 #include <linux/acpi.h>
@@ -837,6 +840,25 @@ static void xen_load_sp0(unsigned long sp0)
 	this_cpu_write(cpu_tss_rw.x86_tss.sp0, sp0);
 }
 
+#ifdef CONFIG_X86_IOPL_IOPERM
+static void xen_update_io_bitmap(void)
+{
+	struct physdev_set_iobitmap iobitmap;
+	struct tss_struct *tss = this_cpu_ptr(&cpu_tss_rw);
+
+	native_tss_update_io_bitmap();
+
+	iobitmap.bitmap = (uint8_t *)(&tss->x86_tss) +
+			  tss->x86_tss.io_bitmap_base;
+	if (tss->x86_tss.io_bitmap_base == IO_BITMAP_OFFSET_INVALID)
+		iobitmap.nr_ports = 0;
+	else
+		iobitmap.nr_ports = IO_BITMAP_BITS;
+
+	HYPERVISOR_physdev_op(PHYSDEVOP_set_iobitmap, &iobitmap);
+}
+#endif
+
 static void xen_io_delay(void)
 {
 }
@@ -896,14 +918,15 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err)
 static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
 {
 	int ret;
+#ifdef CONFIG_X86_64
+	unsigned int which;
+	u64 base;
+#endif
 
 	ret = 0;
 
 	switch (msr) {
 #ifdef CONFIG_X86_64
-		unsigned which;
-		u64 base;
-
 	case MSR_FS_BASE:		which = SEGBASE_FS; goto set;
 	case MSR_KERNEL_GS_BASE:	which = SEGBASE_GS_USER; goto set;
 	case MSR_GS_BASE:		which = SEGBASE_GS_KERNEL; goto set;
@@ -1046,6 +1069,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
 	.write_idt_entry = xen_write_idt_entry,
 	.load_sp0 = xen_load_sp0,
 
+#ifdef CONFIG_X86_IOPL_IOPERM
+	.update_io_bitmap = xen_update_io_bitmap,
+#endif
 	.io_delay = xen_io_delay,
 
 	/* Xen takes care of %gs when switching to usermode for us */
block/bfq-cgroup.c +13 -1
index e1419edde2ec..5a64607ce774 100644
@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)
 		kfree(bfqg);
 }
 
-static void bfqg_and_blkg_get(struct bfq_group *bfqg)
+void bfqg_and_blkg_get(struct bfq_group *bfqg)
 {
 	/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */
 	bfqg_get(bfqg);
@@ -651,6 +651,12 @@ 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)
@@ -670,6 +676,8 @@ 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 */
+	bfq_put_queue(bfqq);
 }
 
 /**
@@ -1398,6 +1406,10 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
 	return bfqq->bfqd->root_group;
 }
 
+void bfqg_and_blkg_get(struct bfq_group *bfqg) {}
+
+void bfqg_and_blkg_put(struct bfq_group *bfqg) {}
+
 struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
 {
 	struct bfq_group *bfqg;
block/bfq-iosched.c +5 -5
index 5c239c540c47..8fe4b6919511 100644
@@ -614,6 +614,10 @@ bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)
 		bfqq->pos_root = NULL;
 	}
 
+	/* oom_bfqq does not participate in queue merging */
+	if (bfqq == &bfqd->oom_bfqq)
+		return;
+
 	/*
 	 * bfqq cannot be merged any longer (see comments in
 	 * bfq_setup_cooperator): no point in adding bfqq into the
@@ -4822,9 +4826,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)
 {
 	struct bfq_queue *item;
 	struct hlist_node *n;
-#ifdef CONFIG_BFQ_GROUP_IOSCHED
 	struct bfq_group *bfqg = bfqq_group(bfqq);
-#endif
 
 	if (bfqq->bfqd)
 		bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d",
@@ -4897,9 +4899,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)
 		bfqq->bfqd->last_completed_rq_bfqq = NULL;
 
 	kmem_cache_free(bfq_pool, bfqq);
-#ifdef CONFIG_BFQ_GROUP_IOSCHED
 	bfqg_and_blkg_put(bfqg);
-#endif
 }
 
 static void bfq_put_cooperator(struct bfq_queue *bfqq)
@@ -6387,10 +6387,10 @@ static void bfq_exit_queue(struct elevator_queue *e)
 
 	hrtimer_cancel(&bfqd->idle_slice_timer);
 
-#ifdef CONFIG_BFQ_GROUP_IOSCHED
 	/* release oom-queue reference to root group */
 	bfqg_and_blkg_put(bfqd->root_group);
 
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
 	blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq);
 #else
 	spin_lock_irq(&bfqd->lock);
block/bfq-iosched.h +2 -0
index 8526f20c53bc..355b8bbd1033 100644
@@ -921,6 +921,7 @@ struct bfq_group {
 
 #else
 struct bfq_group {
+	struct bfq_entity entity;
 	struct bfq_sched_data sched_data;
 
 	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
@@ -984,6 +985,7 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,
 struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg);
 struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
 struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node);
+void bfqg_and_blkg_get(struct bfq_group *bfqg);
 void bfqg_and_blkg_put(struct bfq_group *bfqg);
 
 #ifdef CONFIG_BFQ_GROUP_IOSCHED
block/bfq-wf2q.c +10 -2
index 05f0bf4a1144..44079147e396 100644
@@ -536,7 +536,9 @@ static void bfq_get_entity(struct bfq_entity *entity)
 		bfqq->ref++;
 		bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",
 			     bfqq, bfqq->ref);
-	}
+	} else
+		bfqg_and_blkg_get(container_of(entity, struct bfq_group,
+					       entity));
 }
 
 /**
@@ -650,8 +652,14 @@ static void bfq_forget_entity(struct bfq_service_tree *st,
 
 	entity->on_st = false;
 	st->wsum -= entity->weight;
-	if (bfqq && !is_in_service)
+	if (is_in_service)
+		return;
+
+	if (bfqq)
 		bfq_put_queue(bfqq);
+	else
+		bfqg_and_blkg_put(container_of(entity, struct bfq_group,
+					       entity));
 }
 
 /**
drivers/android/binder.c +9 -0
index 9fcc761031d8..59b217ffeb59 100644
@@ -5226,6 +5226,7 @@ static int binder_open(struct inode *nodp, struct file *filp)
 		binder_dev = container_of(filp->private_data,
 					  struct binder_device, miscdev);
 	}
+	refcount_inc(&binder_dev->ref);
 	proc->context = &binder_dev->context;
 	binder_alloc_init(&proc->alloc);
 
@@ -5403,6 +5404,7 @@ static int binder_node_release(struct binder_node *node, int refs)
 static void binder_deferred_release(struct binder_proc *proc)
 {
 	struct binder_context *context = proc->context;
+	struct binder_device *device;
 	struct rb_node *n;
 	int threads, nodes, incoming_refs, outgoing_refs, active_transactions;
 
@@ -5419,6 +5421,12 @@ static void binder_deferred_release(struct binder_proc *proc)
 		context->binder_context_mgr_node = NULL;
 	}
 	mutex_unlock(&context->context_mgr_node_lock);
+	device = container_of(proc->context, struct binder_device, context);
+	if (refcount_dec_and_test(&device->ref)) {
+		kfree(context->name);
+		kfree(device);
+	}
+	proc->context = NULL;
 	binder_inner_proc_lock(proc);
 	/*
 	 * Make sure proc stays alive after we
@@ -6075,6 +6083,7 @@ static int __init init_binder_device(const char *name)
 	binder_device->miscdev.minor = MISC_DYNAMIC_MINOR;
 	binder_device->miscdev.name = name;
 
+	refcount_set(&binder_device->ref, 1);
 	binder_device->context.binder_context_mgr_uid = INVALID_UID;
 	binder_device->context.name = name;
 	mutex_init(&binder_device->context.context_mgr_node_lock);
drivers/android/binder_internal.h +2 -0
index ae991097d14d..283d3cb9c16e 100644
@@ -8,6 +8,7 @@
 #include <linux/list.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
+#include <linux/refcount.h>
 #include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/uidgid.h>
@@ -33,6 +34,7 @@ struct binder_device {
 	struct miscdevice miscdev;
 	struct binder_context context;
 	struct inode *binderfs_inode;
+	refcount_t ref;
 };
 
 /**
drivers/android/binderfs.c +5 -2
index e2580e5316a2..110e41f920c2 100644
@@ -154,6 +154,7 @@ static int binderfs_binder_device_create(struct inode *ref_inode,
 	if (!name)
 		goto err;
 
+	refcount_set(&device->ref, 1);
 	device->binderfs_inode = inode;
 	device->context.binder_context_mgr_uid = INVALID_UID;
 	device->context.name = name;
@@ -257,8 +258,10 @@ static void binderfs_evict_inode(struct inode *inode)
 	ida_free(&binderfs_minors, device->miscdev.minor);
 	mutex_unlock(&binderfs_minors_mutex);
 
-	kfree(device->context.name);
-	kfree(device);
+	if (refcount_dec_and_test(&device->ref)) {
+		kfree(device->context.name);
+		kfree(device);
+	}
 }
 
 /**
drivers/base/core.c +17 -6
index 42a672456432..3306d5ae92a6 100644
@@ -745,25 +745,31 @@ static void __device_links_queue_sync_state(struct device *dev,
 /**
  * device_links_flush_sync_list - Call sync_state() on a list of devices
  * @list: List of devices to call sync_state() on
+ * @dont_lock_dev: Device for which lock is already held by the caller
  *
  * Calls sync_state() on all the devices that have been queued for it. This
- * function is used in conjunction with __device_links_queue_sync_state().
+ * function is used in conjunction with __device_links_queue_sync_state(). The
+ * @dont_lock_dev parameter is useful when this function is called from a
+ * context where a device lock is already held.
  */
-static void device_links_flush_sync_list(struct list_head *list)
+static void device_links_flush_sync_list(struct list_head *list,
+					 struct device *dont_lock_dev)
 {
 	struct device *dev, *tmp;
 
 	list_for_each_entry_safe(dev, tmp, list, links.defer_sync) {
 		list_del_init(&dev->links.defer_sync);
 
-		device_lock(dev);
+		if (dev != dont_lock_dev)
+			device_lock(dev);
 
 		if (dev->bus->sync_state)
 			dev->bus->sync_state(dev);
 		else if (dev->driver && dev->driver->sync_state)
 			dev->driver->sync_state(dev);
 
-		device_unlock(dev);
+		if (dev != dont_lock_dev)
+			device_unlock(dev);
 
 		put_device(dev);
 	}
@@ -801,7 +807,7 @@ void device_links_supplier_sync_state_resume(void)
 out:
 	device_links_write_unlock();
 
-	device_links_flush_sync_list(&sync_list);
+	device_links_flush_sync_list(&sync_list, NULL);
 }
 
 static int sync_state_resume_initcall(void)
@@ -865,6 +871,11 @@ void device_links_driver_bound(struct device *dev)
 			driver_deferred_probe_add(link->consumer);
 	}
 
+	if (defer_sync_state_count)
+		__device_links_supplier_defer_sync(dev);
+	else
+		__device_links_queue_sync_state(dev, &sync_list);
+
 	list_for_each_entry(link, &dev->links.suppliers, c_node) {
 		if (!(link->flags & DL_FLAG_MANAGED))
 			continue;
@@ -883,7 +894,7 @@ void device_links_driver_bound(struct device *dev)
 
 	device_links_write_unlock();
 
-	device_links_flush_sync_list(&sync_list);
+	device_links_flush_sync_list(&sync_list, dev);
 }
 
 static void device_link_drop_managed(struct device_link *link)
drivers/bus/ti-sysc.c +2 -2
index 3d79b074f958..c42447d5d5a8 100644
@@ -1406,7 +1406,7 @@ static void sysc_init_revision_quirks(struct sysc *ddata)
 }
 
 /* 1-wire needs module's internal clocks enabled for reset */
-static void sysc_clk_enable_quirk_hdq1w(struct sysc *ddata)
+static void sysc_pre_reset_quirk_hdq1w(struct sysc *ddata)
 {
 	int offset = 0x0c;	/* HDQ_CTRL_STATUS */
 	u16 val;
@@ -1494,7 +1494,7 @@ static void sysc_init_module_quirks(struct sysc *ddata)
 		return;
 
 	if (ddata->cfg.quirks & SYSC_MODULE_QUIRK_HDQ1W) {
-		ddata->clk_enable_quirk = sysc_clk_enable_quirk_hdq1w;
+		ddata->clk_disable_quirk = sysc_pre_reset_quirk_hdq1w;
 
 		return;
 	}
drivers/dma-buf/dma-buf.c +1 -0
index ce41cd9b758a..2427398ff22a 100644
@@ -108,6 +108,7 @@ static int dma_buf_release(struct inode *inode, struct file *file)
 		dma_resv_fini(dmabuf->resv);
 
 	module_put(dmabuf->owner);
+	kfree(dmabuf->name);
 	kfree(dmabuf);
 	return 0;
 }
drivers/dma/coh901318.c +0 -4
index e51d836afcc7..1092d4ce723e 100644
@@ -1947,8 +1947,6 @@ static void dma_tc_handle(struct coh901318_chan *cohc)
 		return;
 	}
 
-	spin_lock(&cohc->lock);
-
 	/*
 	 * When we reach this point, at least one queue item
 	 * should have been moved over from cohc->queue to
@@ -1969,8 +1967,6 @@ static void dma_tc_handle(struct coh901318_chan *cohc)
 	if (coh901318_queue_start(cohc) == NULL)
 		cohc->busy = 0;
 
-	spin_unlock(&cohc->lock);
-
 	/*
 	 * This tasklet will remove items from cohc->active
 	 * and thus terminates them.
drivers/dma/imx-sdma.c +3 -2
index c27e206a764c..67736c801f3c 100644
@@ -1328,13 +1328,14 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
 
 	sdma_channel_synchronize(chan);
 
-	if (sdmac->event_id0)
+	if (sdmac->event_id0 >= 0)
 		sdma_event_disable(sdmac, sdmac->event_id0);
 	if (sdmac->event_id1)
 		sdma_event_disable(sdmac, sdmac->event_id1);
 
 	sdmac->event_id0 = 0;
 	sdmac->event_id1 = 0;
+	sdmac->context_loaded = false;
 
 	sdma_set_channel_priority(sdmac, 0);
 
@@ -1628,7 +1629,7 @@ static int sdma_config(struct dma_chan *chan,
 	memcpy(&sdmac->slave_config, dmaengine_cfg, sizeof(*dmaengine_cfg));
 
 	/* Set ENBLn earlier to make sure dma request triggered after that */
-	if (sdmac->event_id0) {
+	if (sdmac->event_id0 >= 0) {
 		if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events)
 			return -EINVAL;
 		sdma_event_enable(sdmac, sdmac->event_id0);
drivers/dma/tegra20-apb-dma.c +1 -5
index 3a45079d11ec..4a750e29bfb5 100644
@@ -281,7 +281,7 @@ static struct tegra_dma_desc *tegra_dma_desc_get(
 
 	/* Do not allocate if desc are waiting for ack */
 	list_for_each_entry(dma_desc, &tdc->free_dma_desc, node) {
-		if (async_tx_test_ack(&dma_desc->txd)) {
+		if (async_tx_test_ack(&dma_desc->txd) && !dma_desc->cb_count) {
 			list_del(&dma_desc->node);
 			spin_unlock_irqrestore(&tdc->lock, flags);
 			dma_desc->txd.flags = 0;
@@ -756,10 +756,6 @@ static int tegra_dma_terminate_all(struct dma_chan *dc)
 	bool was_busy;
 
 	spin_lock_irqsave(&tdc->lock, flags);
-	if (list_empty(&tdc->pending_sg_req)) {
-		spin_unlock_irqrestore(&tdc->lock, flags);
-		return 0;
-	}
 
 	if (!tdc->busy)
 		goto skip_dma_stop;
drivers/edac/synopsys_edac.c +7 -15
index 2d263382d797..880ffd833718 100644
@@ -479,20 +479,14 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p)
 		pinf = &p->ceinfo;
 		if (!priv->p_data->quirks) {
 			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "DDR ECC error type:%s Row %d Bank %d Col %d ",
-				  "CE", pinf->row, pinf->bank, pinf->col);
-			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "Bit Position: %d Data: 0x%08x\n",
+				 "DDR ECC error type:%s Row %d Bank %d Col %d Bit Position: %d Data: 0x%08x",
+				 "CE", pinf->row, pinf->bank, pinf->col,
 				 pinf->bitpos, pinf->data);
 		} else {
 			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "DDR ECC error type:%s Row %d Bank %d Col %d ",
-				  "CE", pinf->row, pinf->bank, pinf->col);
-			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "BankGroup Number %d Block Number %d ",
-				 pinf->bankgrpnr, pinf->blknr);
-			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "Bit Position: %d Data: 0x%08x\n",
+				 "DDR ECC error type:%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d Bit Position: %d Data: 0x%08x",
+				 "CE", pinf->row, pinf->bank, pinf->col,
+				 pinf->bankgrpnr, pinf->blknr,
 				 pinf->bitpos, pinf->data);
 		}
 
@@ -509,10 +503,8 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p)
 				"UE", pinf->row, pinf->bank, pinf->col);
 		} else {
 			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "DDR ECC error type :%s Row %d Bank %d Col %d ",
-				 "UE", pinf->row, pinf->bank, pinf->col);
-			snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-				 "BankGroup Number %d Block Number %d",
+				 "DDR ECC error type :%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d",
+				 "UE", pinf->row, pinf->bank, pinf->col,
 				 pinf->bankgrpnr, pinf->blknr);
 		}
 
drivers/firmware/efi/efi.c +2 -2
index 2b02cb165f16..a9778591341b 100644
@@ -552,7 +552,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 
 		seed = early_memremap(efi.rng_seed, sizeof(*seed));
 		if (seed != NULL) {
-			size = seed->size;
+			size = READ_ONCE(seed->size);
 			early_memunmap(seed, sizeof(*seed));
 		} else {
 			pr_err("Could not map UEFI random seed!\n");
@@ -562,7 +562,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 					      sizeof(*seed) + size);
 			if (seed != NULL) {
 				pr_notice("seeding entropy pool\n");
-				add_bootloader_randomness(seed->bits, seed->size);
+				add_bootloader_randomness(seed->bits, size);
 				early_memunmap(seed, sizeof(*seed) + size);
 			} else {
 				pr_err("Could not map UEFI random seed!\n");
drivers/firmware/imx/imx-scu.c +27 -0
index 03b43b7a6d1d..f71eaa5bf52d 100644
@@ -29,6 +29,7 @@ struct imx_sc_chan {
 	struct mbox_client cl;
 	struct mbox_chan *ch;
 	int idx;
+	struct completion tx_done;
 };
 
 struct imx_sc_ipc {
@@ -100,6 +101,14 @@ int imx_scu_get_handle(struct imx_sc_ipc **ipc)
 }
 EXPORT_SYMBOL(imx_scu_get_handle);
 
+/* Callback called when the word of a message is ack-ed, eg read by SCU */
+static void imx_scu_tx_done(struct mbox_client *cl, void *mssg, int r)
+{
+	struct imx_sc_chan *sc_chan = container_of(cl, struct imx_sc_chan, cl);
+
+	complete(&sc_chan->tx_done);
+}
+
 static void imx_scu_rx_callback(struct mbox_client *c, void *msg)
 {
 	struct imx_sc_chan *sc_chan = container_of(c, struct imx_sc_chan, cl);
@@ -149,6 +158,19 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
 
 	for (i = 0; i < hdr->size; i++) {
 		sc_chan = &sc_ipc->chans[i % 4];
+
+		/*
+		 * SCU requires that all messages words are written
+		 * sequentially but linux MU driver implements multiple
+		 * independent channels for each register so ordering between
+		 * different channels must be ensured by SCU API interface.
+		 *
+		 * Wait for tx_done before every send to ensure that no
+		 * queueing happens at the mailbox channel level.
+		 */
+		wait_for_completion(&sc_chan->tx_done);
+		reinit_completion(&sc_chan->tx_done);
+
 		ret = mbox_send_message(sc_chan->ch, &data[i]);
 		if (ret < 0)
 			return ret;
@@ -247,6 +269,11 @@ static int imx_scu_probe(struct platform_device *pdev)
 		cl->knows_txdone = true;
 		cl->rx_callback = imx_scu_rx_callback;
 
+		/* Initial tx_done completion as "done" */
+		cl->tx_done = imx_scu_tx_done;
+		init_completion(&sc_chan->tx_done);
+		complete(&sc_chan->tx_done);
+
 		sc_chan->sc_ipc = sc_ipc;
 		sc_chan->idx = i % 4;
 		sc_chan->ch = mbox_request_channel_byname(cl, chan_name);
drivers/firmware/imx/misc.c +4 -4
index 4b56a587dacd..d073cb3ce699 100644
@@ -16,7 +16,7 @@ struct imx_sc_msg_req_misc_set_ctrl {
 	u32 ctrl;
 	u32 val;
 	u16 resource;
-} __packed;
+} __packed __aligned(4);
 
 struct imx_sc_msg_req_cpu_start {
 	struct imx_sc_rpc_msg hdr;
@@ -24,18 +24,18 @@ struct imx_sc_msg_req_cpu_start {
 	u32 address_lo;
 	u16 resource;
 	u8 enable;
-} __packed;
+} __packed __aligned(4);
 
 struct imx_sc_msg_req_misc_get_ctrl {
 	struct imx_sc_rpc_msg hdr;
 	u32 ctrl;
 	u16 resource;
-} __packed;
+} __packed __aligned(4);
 
 struct imx_sc_msg_resp_misc_get_ctrl {
 	struct imx_sc_rpc_msg hdr;
 	u32 val;
-} __packed;
+} __packed __aligned(4);
 
 /*
  * This function sets a miscellaneous control value.
drivers/firmware/imx/scu-pd.c +1 -1
index b556612207e5..af3ae0087de4 100644
@@ -61,7 +61,7 @@ struct imx_sc_msg_req_set_resource_power_mode {
 	struct imx_sc_rpc_msg hdr;
 	u16 resource;
 	u8 mode;
-} __packed;
+} __packed __aligned(4);
 
 #define IMX_SCU_PD_NAME_SIZE 20
 struct imx_sc_pm_domain {
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +51 -46

129 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
index 9b415f6569a2..04fea3cc0cfa 100644
@@ -222,7 +222,7 @@ int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
 {
 	int ret = 0;
 
-	if (min <= 0 && max <= 0)
+	if (min < 0 && max < 0)
 		return -EINVAL;
 
 	if (!smu_clk_dpm_is_enabled(smu, clk_type))
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0 -3
index 094cfc46adac..29c11694406d 100644
@@ -373,9 +373,6 @@ int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_
 {
 	int ret = 0;
 
-	if (max < min)
-		return -EINVAL;
-
 	switch (clk_type) {
 	case SMU_GFXCLK:
 	case SMU_SCLK:
drivers/gpu/drm/drm_client_modeset.c +2 -1
index 6d4a29e99ae2..3035584f6dc7 100644
@@ -951,7 +951,8 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation)
 	 * depending on the hardware this may require the framebuffer
 	 * to be in a specific tiling format.
 	 */
-	if ((*rotation & DRM_MODE_ROTATE_MASK) != DRM_MODE_ROTATE_180 ||
+	if (((*rotation & DRM_MODE_ROTATE_MASK) != DRM_MODE_ROTATE_0 &&
+	     (*rotation & DRM_MODE_ROTATE_MASK) != DRM_MODE_ROTATE_180) ||
 	    !plane->rotation_property)
 		return false;
 
drivers/gpu/drm/drm_gem_shmem_helper.c +11 -4
index 0810d3ef6961..6c35407a50eb 100644
@@ -254,11 +254,16 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem)
 	if (ret)
 		goto err_zero_use;
 
-	if (obj->import_attach)
+	if (obj->import_attach) {
 		shmem->vaddr = dma_buf_vmap(obj->import_attach->dmabuf);
-	else
+	} else {
+		pgprot_t prot = PAGE_KERNEL;
+
+		if (!shmem->map_cached)
+			prot = pgprot_writecombine(prot);
 		shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT,
-				    VM_MAP, pgprot_writecombine(PAGE_KERNEL));
+				    VM_MAP, prot);
+	}
 
 	if (!shmem->vaddr) {
 		DRM_DEBUG_KMS("Failed to vmap pages\n");
@@ -537,7 +542,9 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 	}
 
 	vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
-	vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	if (!shmem->map_cached)
+		vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
 	vma->vm_ops = &drm_gem_shmem_vm_ops;
 
drivers/gpu/drm/drm_modes.c +7 -0
index 88232698d7a0..3fd35e6b9d53 100644
@@ -1672,6 +1672,13 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len,
 		}
 	}
 
+	if (!(rotation & DRM_MODE_ROTATE_MASK))
+		rotation |= DRM_MODE_ROTATE_0;
+
+	/* Make sure there is exactly one rotation defined */
+	if (!is_power_of_2(rotation & DRM_MODE_ROTATE_MASK))
+		return -EINVAL;
+
 	mode->rotation_reflection = rotation;
 
 	return 0;
drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h +0 -1
index 0da860200410..e2ac09894a6d 100644
@@ -83,7 +83,6 @@
 #define VSIZE_OFST			20
 #define LDI_INT_EN			0x741C
 #define FRAME_END_INT_EN_OFST		1
-#define UNDERFLOW_INT_EN_OFST		2
 #define LDI_CTRL			0x7420
 #define BPP_OFST			3
 #define DATA_GATE_EN			BIT(2)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +0 -20
index 73cd28a6ea07..86000127d4ee 100644
@@ -46,7 +46,6 @@ struct ade_hw_ctx {
 	struct clk *media_noc_clk;
 	struct clk *ade_pix_clk;
 	struct reset_control *reset;
-	struct work_struct display_reset_wq;
 	bool power_on;
 	int irq;
 
@@ -136,7 +135,6 @@ static void ade_init(struct ade_hw_ctx *ctx)
 	 */
 	ade_update_bits(base + ADE_CTRL, FRM_END_START_OFST,
 			FRM_END_START_MASK, REG_EFFECTIVE_IN_ADEEN_FRMEND);
-	ade_update_bits(base + LDI_INT_EN, UNDERFLOW_INT_EN_OFST, MASK(1), 1);
 }
 
 static bool ade_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -304,17 +302,6 @@ static void ade_crtc_disable_vblank(struct drm_crtc *crtc)
 			MASK(1), 0);
 }
 
-static void drm_underflow_wq(struct work_struct *work)
-{
-	struct ade_hw_ctx *ctx = container_of(work, struct ade_hw_ctx,
-					      display_reset_wq);
-	struct drm_device *drm_dev = ctx->crtc->dev;
-	struct drm_atomic_state *state;
-
-	state = drm_atomic_helper_suspend(drm_dev);
-	drm_atomic_helper_resume(drm_dev, state);
-}
-
 static irqreturn_t ade_irq_handler(int irq, void *data)
 {
 	struct ade_hw_ctx *ctx = data;
@@ -331,12 +318,6 @@ static irqreturn_t ade_irq_handler(int irq, void *data)
 				MASK(1), 1);
 		drm_crtc_handle_vblank(crtc);
 	}
-	if (status & BIT(UNDERFLOW_INT_EN_OFST)) {
-		ade_update_bits(base + LDI_INT_CLR, UNDERFLOW_INT_EN_OFST,
-				MASK(1), 1);
-		DRM_ERROR("LDI underflow!");
-		schedule_work(&ctx->display_reset_wq);
-	}
 
 	return IRQ_HANDLED;
 }
@@ -919,7 +900,6 @@ static void *ade_hw_ctx_alloc(struct platform_device *pdev,
 	if (ret)
 		return ERR_PTR(-EIO);
 
-	INIT_WORK(&ctx->display_reset_wq, drm_underflow_wq);
 	ctx->crtc = crtc;
 
 	return ctx;
drivers/gpu/drm/i915/display/intel_display_power.c +11 -5
index 12ba74788cce..597e45977349 100644
@@ -4471,13 +4471,19 @@ static void icl_dbuf_disable(struct drm_i915_private *dev_priv)
 
 static void icl_mbus_init(struct drm_i915_private *dev_priv)
 {
-	u32 val;
+	u32 mask, val;
 
-	val = MBUS_ABOX_BT_CREDIT_POOL1(16) |
-	      MBUS_ABOX_BT_CREDIT_POOL2(16) |
-	      MBUS_ABOX_B_CREDIT(1) |
-	      MBUS_ABOX_BW_CREDIT(1);
+	mask = MBUS_ABOX_BT_CREDIT_POOL1_MASK |
+		MBUS_ABOX_BT_CREDIT_POOL2_MASK |
+		MBUS_ABOX_B_CREDIT_MASK |
+		MBUS_ABOX_BW_CREDIT_MASK;
 
+	val = I915_READ(MBUS_ABOX_CTL);
+	val &= ~mask;
+	val |= MBUS_ABOX_BT_CREDIT_POOL1(16) |
+		MBUS_ABOX_BT_CREDIT_POOL2(16) |
+		MBUS_ABOX_B_CREDIT(1) |
+		MBUS_ABOX_BW_CREDIT(1);
 	I915_WRITE(MBUS_ABOX_CTL, val);
 }
 
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +1 -1
index 29b2077b73d2..e81c2726f7fd 100644
@@ -567,7 +567,7 @@ static bool assert_mmap_offset(struct drm_i915_private *i915,
 
 	obj = i915_gem_object_create_internal(i915, size);
 	if (IS_ERR(obj))
-		return PTR_ERR(obj);
+		return false;
 
 	err = create_mmap_offset(obj);
 	i915_gem_object_put(obj);
drivers/gpu/drm/i915/i915_perf.c +41 -17

141 lines not on this page · raw message

drivers/gpu/drm/i915/i915_perf_types.h +2 -1
index 74ddc20a0d37..171f95a97ef6 100644
@@ -339,7 +339,8 @@ struct i915_oa_ops {
 	 * counter reports being sampled. May apply system constraints such as
 	 * disabling EU clock gating as required.
 	 */
-	int (*enable_metric_set)(struct i915_perf_stream *stream);
+	struct i915_request *
+		(*enable_metric_set)(struct i915_perf_stream *stream);
 
 	/**
 	 * @disable_metric_set: Remove system constraints associated with using
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1 -0
index 7f21307cda75..c26b2faa15cf 100644
@@ -358,6 +358,7 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
 	/* Only DMA capable components need the LARB property */
 	comp->larb_dev = NULL;
 	if (type != MTK_DISP_OVL &&
+	    type != MTK_DISP_OVL_2L &&
 	    type != MTK_DISP_RDMA &&
 	    type != MTK_DISP_WDMA)
 		return 0;
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +2 -2
index 05cc04f729d6..e1cc541e0ef2 100644
@@ -1109,8 +1109,8 @@ static void mdp5_crtc_wait_for_pp_done(struct drm_crtc *crtc)
 	ret = wait_for_completion_timeout(&mdp5_crtc->pp_completion,
 						msecs_to_jiffies(50));
 	if (ret == 0)
-		dev_warn(dev->dev, "pp done time out, lm=%d\n",
-			 mdp5_cstate->pipeline.mixer->lm);
+		dev_warn_ratelimited(dev->dev, "pp done time out, lm=%d\n",
+				     mdp5_cstate->pipeline.mixer->lm);
 }
 
 static void mdp5_crtc_wait_for_flush_done(struct drm_crtc *crtc)
drivers/gpu/drm/msm/dsi/dsi_manager.c +6 -1
index 271aa7bbca92..73127948f54d 100644
@@ -336,7 +336,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)
 	return num;
 }
 
-static int dsi_mgr_connector_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status dsi_mgr_connector_mode_valid(struct drm_connector *connector,
 				struct drm_display_mode *mode)
 {
 	int id = dsi_mgr_connector_get_id(connector);
@@ -479,6 +479,7 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge)
 	struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1);
 	struct mipi_dsi_host *host = msm_dsi->host;
 	struct drm_panel *panel = msm_dsi->panel;
+	struct msm_dsi_pll *src_pll;
 	bool is_dual_dsi = IS_DUAL_DSI();
 	int ret;
 
@@ -519,6 +520,10 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge)
 								id, ret);
 	}
 
+	/* Save PLL status if it is a clock source */
+	src_pll = msm_dsi_phy_get_pll(msm_dsi->phy);
+	msm_dsi_pll_save_state(src_pll);
+
 	ret = msm_dsi_host_power_off(host);
 	if (ret)
 		pr_err("%s: host %d power off failed,%d\n", __func__, id, ret);
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +0 -4
index b0cfa67d2a57..f509ebd77500 100644
@@ -724,10 +724,6 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy)
 	if (!phy || !phy->cfg->ops.disable)
 		return;
 
-	/* Save PLL status if it is a clock source */
-	if (phy->usecase != MSM_DSI_PHY_SLAVE)
-		msm_dsi_pll_save_state(phy->pll);
-
 	phy->cfg->ops.disable(phy);
 
 	dsi_phy_regulator_disable(phy);
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +6 -0
index 8f6100db90ed..aa9385d5bfff 100644
@@ -411,6 +411,12 @@ static int dsi_pll_10nm_vco_prepare(struct clk_hw *hw)
 	if (pll_10nm->slave)
 		dsi_pll_enable_pll_bias(pll_10nm->slave);
 
+	rc = dsi_pll_10nm_vco_set_rate(hw,pll_10nm->vco_current_rate, 0);
+	if (rc) {
+		pr_err("vco_set_rate failed, rc=%d\n", rc);
+		return rc;
+	}
+
 	/* Start PLL */
 	pll_write(pll_10nm->phy_cmn_mmio + REG_DSI_10nm_PHY_CMN_PLL_CNTRL,
 		  0x01);
drivers/gpu/drm/panfrost/panfrost_mmu.c +19 -25

52 lines not on this page · raw message

drivers/gpu/drm/selftests/drm_cmdline_selftests.h +1 -0
index 6d61a0eb5d64..84e6bc050bf2 100644
@@ -53,6 +53,7 @@ cmdline_test(drm_cmdline_test_rotate_0)
 cmdline_test(drm_cmdline_test_rotate_90)
 cmdline_test(drm_cmdline_test_rotate_180)
 cmdline_test(drm_cmdline_test_rotate_270)
+cmdline_test(drm_cmdline_test_rotate_multiple)
 cmdline_test(drm_cmdline_test_rotate_invalid_val)
 cmdline_test(drm_cmdline_test_rotate_truncated)
 cmdline_test(drm_cmdline_test_hmirror)
drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +13 -2
index 013de9d27c35..035f86c5d648 100644
@@ -856,6 +856,17 @@ static int drm_cmdline_test_rotate_270(void *ignored)
 	return 0;
 }
 
+static int drm_cmdline_test_rotate_multiple(void *ignored)
+{
+	struct drm_cmdline_mode mode = { };
+
+	FAIL_ON(drm_mode_parse_command_line_for_connector("720x480,rotate=0,rotate=90",
+							  &no_connector,
+							  &mode));
+
+	return 0;
+}
+
 static int drm_cmdline_test_rotate_invalid_val(void *ignored)
 {
 	struct drm_cmdline_mode mode = { };
@@ -888,7 +899,7 @@ static int drm_cmdline_test_hmirror(void *ignored)
 	FAIL_ON(!mode.specified);
 	FAIL_ON(mode.xres != 720);
 	FAIL_ON(mode.yres != 480);
-	FAIL_ON(mode.rotation_reflection != DRM_MODE_REFLECT_X);
+	FAIL_ON(mode.rotation_reflection != (DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_X));
 
 	FAIL_ON(mode.refresh_specified);
 
@@ -913,7 +924,7 @@ static int drm_cmdline_test_vmirror(void *ignored)
 	FAIL_ON(!mode.specified);
 	FAIL_ON(mode.xres != 720);
 	FAIL_ON(mode.yres != 480);
-	FAIL_ON(mode.rotation_reflection != DRM_MODE_REFLECT_Y);
+	FAIL_ON(mode.rotation_reflection != (DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y));
 
 	FAIL_ON(mode.refresh_specified);
 
drivers/gpu/drm/sun4i/sun8i_mixer.c +92 -12

170 lines not on this page · raw message

drivers/gpu/drm/sun4i/sun8i_mixer.h +11 -0
index c6cc94057faf..345b28b0a80a 100644
@@ -93,6 +93,10 @@
 #define SUN8I_MIXER_FBFMT_ABGR1555	17
 #define SUN8I_MIXER_FBFMT_RGBA5551	18
 #define SUN8I_MIXER_FBFMT_BGRA5551	19
+#define SUN8I_MIXER_FBFMT_ARGB2101010	20
+#define SUN8I_MIXER_FBFMT_ABGR2101010	21
+#define SUN8I_MIXER_FBFMT_RGBA1010102	22
+#define SUN8I_MIXER_FBFMT_BGRA1010102	23
 
 #define SUN8I_MIXER_FBFMT_YUYV		0
 #define SUN8I_MIXER_FBFMT_UYVY		1
@@ -109,6 +113,13 @@
 /* format 12 is semi-planar YUV411 UVUV */
 /* format 13 is semi-planar YUV411 VUVU */
 #define SUN8I_MIXER_FBFMT_YUV411	14
+/* format 15 doesn't exist */
+/* format 16 is P010 YVU */
+#define SUN8I_MIXER_FBFMT_P010_YUV	17
+/* format 18 is P210 YVU */
+#define SUN8I_MIXER_FBFMT_P210_YUV	19
+/* format 20 is packed YVU444 10-bit */
+/* format 21 is packed YUV444 10-bit */
 
 /*
  * Sub-engines listed bellow are unused for now. The EN registers are here only
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +58 -8

118 lines not on this page · raw message

drivers/gpu/drm/ttm/ttm_bo_util.c +1 -0
index 6b0883a1776e..b40915638e13 100644
@@ -516,6 +516,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
 		fbo->base.base.resv = &fbo->base.base._resv;
 
 	dma_resv_init(&fbo->base.base._resv);
+	fbo->base.base.dev = NULL;
 	ret = dma_resv_trylock(&fbo->base.base._resv);
 	WARN_ON(!ret);
 
drivers/gpu/drm/virtio/virtgpu_object.c +3 -2
index 017a9e0fc3bb..3af7ec80c7da 100644
@@ -42,8 +42,8 @@ static int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev,
 		 * "f91a9dd35715 Fix unlinking resources from hash
 		 * table." (Feb 2019) fixes the bug.
 		 */
-		static int handle;
-		handle++;
+		static atomic_t seqno = ATOMIC_INIT(0);
+		int handle = atomic_inc_return(&seqno);
 		*resid = handle + 1;
 	} else {
 		int handle = ida_alloc(&vgdev->resource_ida, GFP_KERNEL);
@@ -99,6 +99,7 @@ struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev,
 		return NULL;
 
 	bo->base.base.funcs = &virtio_gpu_gem_funcs;
+	bo->base.map_cached = true;
 	return &bo->base.base;
 }
 
drivers/hwmon/adt7462.c +1 -1
index 9632e2e3c4bb..319a0519ebdb 100644
@@ -413,7 +413,7 @@ static int ADT7462_REG_VOLT(struct adt7462_data *data, int which)
 			return 0x95;
 		break;
 	}
-	return -ENODEV;
+	return 0;
 }
 
 /* Provide labels for sysfs */
drivers/infiniband/core/cm.c +1 -0
index 455b3659d84b..4decc1d4cc99 100644
@@ -1202,6 +1202,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,
 			/* Sharing an ib_cm_id with different handlers is not
 			 * supported */
 			spin_unlock_irqrestore(&cm.lock, flags);
+			ib_destroy_cm_id(cm_id);
 			return ERR_PTR(-EINVAL);
 		}
 		refcount_inc(&cm_id_priv->refcount);
drivers/infiniband/core/cma.c +11 -4
index af1afc17b8bd..0b530646f1e5 100644
@@ -3182,19 +3182,26 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
 	int ret;
 
 	id_priv = container_of(id, struct rdma_id_private, id);
+	memcpy(cma_dst_addr(id_priv), dst_addr, rdma_addr_size(dst_addr));
 	if (id_priv->state == RDMA_CM_IDLE) {
 		ret = cma_bind_addr(id, src_addr, dst_addr);
-		if (ret)
+		if (ret) {
+			memset(cma_dst_addr(id_priv), 0,
+			       rdma_addr_size(dst_addr));
 			return ret;
+		}
 	}
 
-	if (cma_family(id_priv) != dst_addr->sa_family)
+	if (cma_family(id_priv) != dst_addr->sa_family) {
+		memset(cma_dst_addr(id_priv), 0, rdma_addr_size(dst_addr));
 		return -EINVAL;
+	}
 
-	if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND, RDMA_CM_ADDR_QUERY))
+	if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND, RDMA_CM_ADDR_QUERY)) {
+		memset(cma_dst_addr(id_priv), 0, rdma_addr_size(dst_addr));
 		return -EINVAL;
+	}
 
-	memcpy(cma_dst_addr(id_priv), dst_addr, rdma_addr_size(dst_addr));
 	if (cma_any_addr(dst_addr)) {
 		ret = cma_resolve_loopback(id_priv);
 	} else {
drivers/infiniband/core/core_priv.h +15 -0
index d657d90e618b..9dc7383eef49 100644
@@ -338,6 +338,21 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev,
 	qp->pd = pd;
 	qp->uobject = uobj;
 	qp->real_qp = qp;
+
+	qp->qp_type = attr->qp_type;
+	qp->qp_context = attr->qp_context;
+	qp->rwq_ind_tbl = attr->rwq_ind_tbl;
+	qp->send_cq = attr->send_cq;
+	qp->recv_cq = attr->recv_cq;
+	qp->srq = attr->srq;
+	qp->rwq_ind_tbl = attr->rwq_ind_tbl;
+	qp->event_handler = attr->event_handler;
+
+	atomic_set(&qp->usecnt, 0);
+	spin_lock_init(&qp->mr_lock);
+	INIT_LIST_HEAD(&qp->rdma_mrs);
+	INIT_LIST_HEAD(&qp->sig_mrs);
+
 	/*
 	 * We don't track XRC QPs for now, because they don't have PD
 	 * and more importantly they are created internaly by driver,
drivers/infiniband/core/iwcm.c +3 -1
index ade71823370f..da8adadf4755 100644
@@ -159,8 +159,10 @@ static void dealloc_work_entries(struct iwcm_id_private *cm_id_priv)
 {
 	struct list_head *e, *tmp;
 
-	list_for_each_safe(e, tmp, &cm_id_priv->work_free_list)
+	list_for_each_safe(e, tmp, &cm_id_priv->work_free_list) {
+		list_del(e);
 		kfree(list_entry(e, struct iwcm_work, free_list));
+	}
 }
 
 static int alloc_work_entries(struct iwcm_id_private *cm_id_priv, int count)
drivers/infiniband/core/nldev.c +2 -0
index cbf6041a5d4a..ba76709897bb 100644
@@ -1756,6 +1756,8 @@ static int nldev_stat_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
 		if (ret)
 			goto err_msg;
 	} else {
+		if (!tb[RDMA_NLDEV_ATTR_RES_LQPN])
+			goto err_msg;
 		qpn = nla_get_u32(tb[RDMA_NLDEV_ATTR_RES_LQPN]);
 		if (tb[RDMA_NLDEV_ATTR_STAT_COUNTER_ID]) {
 			cntn = nla_get_u32(tb[RDMA_NLDEV_ATTR_STAT_COUNTER_ID]);
drivers/infiniband/core/rw.c +20 -11
index 4fad732f9b3c..06e5b6787443 100644
@@ -273,6 +273,23 @@ static int rdma_rw_init_single_wr(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 	return 1;
 }
 
+static void rdma_rw_unmap_sg(struct ib_device *dev, struct scatterlist *sg,
+			     u32 sg_cnt, enum dma_data_direction dir)
+{
+	if (is_pci_p2pdma_page(sg_page(sg)))
+		pci_p2pdma_unmap_sg(dev->dma_device, sg, sg_cnt, dir);
+	else
+		ib_dma_unmap_sg(dev, sg, sg_cnt, dir);
+}
+
+static int rdma_rw_map_sg(struct ib_device *dev, struct scatterlist *sg,
+			  u32 sg_cnt, enum dma_data_direction dir)
+{
+	if (is_pci_p2pdma_page(sg_page(sg)))
+		return pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);
+	return ib_dma_map_sg(dev, sg, sg_cnt, dir);
+}
+
 /**
  * rdma_rw_ctx_init - initialize a RDMA READ/WRITE context
  * @ctx:	context to initialize
@@ -295,11 +312,7 @@ int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 port_num,
 	struct ib_device *dev = qp->pd->device;
 	int ret;
 
-	if (is_pci_p2pdma_page(sg_page(sg)))
-		ret = pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);
-	else
-		ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);
-
+	ret = rdma_rw_map_sg(dev, sg, sg_cnt, dir);
 	if (!ret)
 		return -ENOMEM;
 	sg_cnt = ret;
@@ -338,7 +351,7 @@ int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 port_num,
 	return ret;
 
 out_unmap_sg:
-	ib_dma_unmap_sg(dev, sg, sg_cnt, dir);
+	rdma_rw_unmap_sg(dev, sg, sg_cnt, dir);
 	return ret;
 }
 EXPORT_SYMBOL(rdma_rw_ctx_init);
@@ -588,11 +601,7 @@ void rdma_rw_ctx_destroy(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 port_num,
 		break;
 	}
 
-	if (is_pci_p2pdma_page(sg_page(sg)))
-		pci_p2pdma_unmap_sg(qp->pd->device->dma_device, sg,
-				    sg_cnt, dir);
-	else
-		ib_dma_unmap_sg(qp->pd->device, sg, sg_cnt, dir);
+	rdma_rw_unmap_sg(qp->pd->device, sg, sg_cnt, dir);
 }
 EXPORT_SYMBOL(rdma_rw_ctx_destroy);
 
drivers/infiniband/core/security.c +9 -5
index 2b4d80393bd0..2d5608315dc8 100644
@@ -340,15 +340,19 @@ static struct ib_ports_pkeys *get_new_pps(const struct ib_qp *qp,
 		return NULL;
 
 	if (qp_attr_mask & IB_QP_PORT)
-		new_pps->main.port_num =
-			(qp_pps) ? qp_pps->main.port_num : qp_attr->port_num;
+		new_pps->main.port_num = qp_attr->port_num;
+	else if (qp_pps)
+		new_pps->main.port_num = qp_pps->main.port_num;
+
 	if (qp_attr_mask & IB_QP_PKEY_INDEX)
-		new_pps->main.pkey_index = (qp_pps) ? qp_pps->main.pkey_index :
-						      qp_attr->pkey_index;
+		new_pps->main.pkey_index = qp_attr->pkey_index;
+	else if (qp_pps)
+		new_pps->main.pkey_index = qp_pps->main.pkey_index;
+
 	if ((qp_attr_mask & IB_QP_PKEY_INDEX) && (qp_attr_mask & IB_QP_PORT))
 		new_pps->main.state = IB_PORT_PKEY_VALID;
 
-	if (!(qp_attr_mask & (IB_QP_PKEY_INDEX || IB_QP_PORT)) && qp_pps) {
+	if (!(qp_attr_mask & (IB_QP_PKEY_INDEX | IB_QP_PORT)) && qp_pps) {
 		new_pps->main.port_num = qp_pps->main.port_num;
 		new_pps->main.pkey_index = qp_pps->main.pkey_index;
 		if (qp_pps->main.state != IB_PORT_PKEY_NOT_VALID)
drivers/infiniband/core/umem_odp.c +19 -5
index b9baf7d0a5cb..eb22cb4f26b4 100644
@@ -187,14 +187,28 @@ ib_umem_odp_alloc_child(struct ib_umem_odp *root, unsigned long addr,
 	odp_data->page_shift = PAGE_SHIFT;
 	odp_data->notifier.ops = ops;
 
+	/*
+	 * A mmget must be held when registering a notifier, the owming_mm only
+	 * has a mm_grab at this point.
+	 */
+	if (!mmget_not_zero(umem->owning_mm)) {
+		ret = -EFAULT;
+		goto out_free;
+	}
+
 	odp_data->tgid = get_pid(root->tgid);
 	ret = ib_init_umem_odp(odp_data, ops);
-	if (ret) {
-		put_pid(odp_data->tgid);
-		kfree(odp_data);
-		return ERR_PTR(ret);
-	}
+	if (ret)
+		goto out_tgid;
+	mmput(umem->owning_mm);
 	return odp_data;
+
+out_tgid:
+	put_pid(odp_data->tgid);
+	mmput(umem->owning_mm);
+out_free:
+	kfree(odp_data);
+	return ERR_PTR(ret);
 }
 EXPORT_SYMBOL(ib_umem_odp_alloc_child);
 
drivers/infiniband/core/uverbs_cmd.c +0 -10
index 86e93ac46d75..c3a67ad82ddd 100644
@@ -1433,17 +1433,7 @@ static int create_qp(struct uverbs_attr_bundle *attrs,
 		if (ret)
 			goto err_cb;
 
-		qp->pd		  = pd;
-		qp->send_cq	  = attr.send_cq;
-		qp->recv_cq	  = attr.recv_cq;
-		qp->srq		  = attr.srq;
-		qp->rwq_ind_tbl	  = ind_tbl;
-		qp->event_handler = attr.event_handler;
-		qp->qp_context	  = attr.qp_context;
-		qp->qp_type	  = attr.qp_type;
-		atomic_set(&qp->usecnt, 0);
 		atomic_inc(&pd->usecnt);
-		qp->port = 0;
 		if (attr.send_cq)
 			atomic_inc(&attr.send_cq->usecnt);
 		if (attr.recv_cq)
drivers/infiniband/core/verbs.c +0 -10
index dd765e176cdd..eb1c68311e52 100644
@@ -1182,16 +1182,6 @@ struct ib_qp *ib_create_qp_user(struct ib_pd *pd,
 	if (ret)
 		goto err;
 
-	qp->qp_type    = qp_init_attr->qp_type;
-	qp->rwq_ind_tbl = qp_init_attr->rwq_ind_tbl;
-
-	atomic_set(&qp->usecnt, 0);
-	qp->mrs_used = 0;
-	spin_lock_init(&qp->mr_lock);
-	INIT_LIST_HEAD(&qp->rdma_mrs);
-	INIT_LIST_HEAD(&qp->sig_mrs);
-	qp->port = 0;
-
 	if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {
 		struct ib_qp *xrc_qp =
 			create_xrc_qp_user(qp, qp_init_attr, udata);
drivers/infiniband/hw/hfi1/verbs.c +3 -1
index 089e201d7550..2f6323ad9c59 100644
@@ -515,10 +515,11 @@ static inline void hfi1_handle_packet(struct hfi1_packet *packet,
 				       opa_get_lid(packet->dlid, 9B));
 		if (!mcast)
 			goto drop;
+		rcu_read_lock();
 		list_for_each_entry_rcu(p, &mcast->qp_list, list) {
 			packet->qp = p->qp;
 			if (hfi1_do_pkey_check(packet))
-				goto drop;
+				goto unlock_drop;
 			spin_lock_irqsave(&packet->qp->r_lock, flags);
 			packet_handler = qp_ok(packet);
 			if (likely(packet_handler))
@@ -527,6 +528,7 @@ static inline void hfi1_handle_packet(struct hfi1_packet *packet,
 				ibp->rvp.n_pkt_drops++;
 			spin_unlock_irqrestore(&packet->qp->r_lock, flags);
 		}
+		rcu_read_unlock();
 		/*
 		 * Notify rvt_multicast_detach() if it is waiting for us
 		 * to finish.
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 -0
index b06f32ff5748..b3561e4c44e8 100644
@@ -629,6 +629,7 @@ struct mlx5_ib_mr {
 
 	/* For ODP and implicit */
 	atomic_t		num_deferred_work;
+	wait_queue_head_t       q_deferred_work;
 	struct xarray		implicit_children;
 	union {
 		struct rcu_head rcu;
drivers/infiniband/hw/mlx5/odp.c +7 -10
index 8247c26a1ce9..443de6fb578b 100644
@@ -197,7 +197,8 @@ static void free_implicit_child_mr(struct mlx5_ib_mr *mr, bool need_imr_xlt)
 	mr->parent = NULL;
 	mlx5_mr_cache_free(mr->dev, mr);
 	ib_umem_odp_release(odp);
-	atomic_dec(&imr->num_deferred_work);
+	if (atomic_dec_and_test(&imr->num_deferred_work))
+		wake_up(&imr->q_deferred_work);
 }
 
 static void free_implicit_child_mr_work(struct work_struct *work)
@@ -516,6 +517,7 @@ struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd,
 	imr->umem = &umem_odp->umem;
 	imr->is_odp_implicit = true;
 	atomic_set(&imr->num_deferred_work, 0);
+	init_waitqueue_head(&imr->q_deferred_work);
 	xa_init(&imr->implicit_children);
 
 	err = mlx5_ib_update_xlt(imr, 0,
@@ -573,10 +575,7 @@ void mlx5_ib_free_implicit_mr(struct mlx5_ib_mr *imr)
 	 * under xa_lock while the child is in the xarray. Thus at this point
 	 * it is only decreasing, and all work holding it is now on the wq.
 	 */
-	if (atomic_read(&imr->num_deferred_work)) {
-		flush_workqueue(system_unbound_wq);
-		WARN_ON(atomic_read(&imr->num_deferred_work));
-	}
+	wait_event(imr->q_deferred_work, !atomic_read(&imr->num_deferred_work));
 
 	/*
 	 * Fence the imr before we destroy the children. This allows us to
@@ -607,10 +606,7 @@ void mlx5_ib_fence_odp_mr(struct mlx5_ib_mr *mr)
 	/* Wait for all running page-fault handlers to finish. */
 	synchronize_srcu(&mr->dev->odp_srcu);
 
-	if (atomic_read(&mr->num_deferred_work)) {
-		flush_workqueue(system_unbound_wq);
-		WARN_ON(atomic_read(&mr->num_deferred_work));
-	}
+	wait_event(mr->q_deferred_work, !atomic_read(&mr->num_deferred_work));
 
 	dma_fence_odp_mr(mr);
 }
@@ -1682,7 +1678,8 @@ static void destroy_prefetch_work(struct prefetch_mr_work *work)
 	u32 i;
 
 	for (i = 0; i < work->num_sge; ++i)
-		atomic_dec(&work->frags[i].mr->num_deferred_work);
+		if (atomic_dec_and_test(&work->frags[i].mr->num_deferred_work))
+			wake_up(&work->frags[i].mr->q_deferred_work);
 	kvfree(work);
 }
 
drivers/infiniband/hw/qib/qib_verbs.c +2 -0
index 33778d451b82..5ef93f8f17a1 100644
@@ -329,8 +329,10 @@ void qib_ib_rcv(struct qib_ctxtdata *rcd, void *rhdr, void *data, u32 tlen)
 		if (mcast == NULL)
 			goto drop;
 		this_cpu_inc(ibp->pmastats->n_multicast_rcv);
+		rcu_read_lock();
 		list_for_each_entry_rcu(p, &mcast->qp_list, list)
 			qib_qp_rcv(rcd, hdr, 1, data, tlen, p->qp);
+		rcu_read_unlock();
 		/*
 		 * Notify rvt_multicast_detach() if it is waiting for us
 		 * to finish.
drivers/infiniband/sw/siw/siw_main.c +3 -3
index c147f0613d95..1e2fdd21ba6e 100644
@@ -388,6 +388,9 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
 		{ .max_segment_size = SZ_2G };
 	base_dev->num_comp_vectors = num_possible_cpus();
 
+	xa_init_flags(&sdev->qp_xa, XA_FLAGS_ALLOC1);
+	xa_init_flags(&sdev->mem_xa, XA_FLAGS_ALLOC1);
+
 	ib_set_device_ops(base_dev, &siw_device_ops);
 	rv = ib_device_set_netdev(base_dev, netdev, 1);
 	if (rv)
@@ -415,9 +418,6 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
 	sdev->attrs.max_srq_wr = SIW_MAX_SRQ_WR;
 	sdev->attrs.max_srq_sge = SIW_MAX_SGE;
 
-	xa_init_flags(&sdev->qp_xa, XA_FLAGS_ALLOC1);
-	xa_init_flags(&sdev->mem_xa, XA_FLAGS_ALLOC1);
-
 	INIT_LIST_HEAD(&sdev->cep_list);
 	INIT_LIST_HEAD(&sdev->qp_list);
 
drivers/iommu/amd_iommu_init.c +12 -1
index d7cbca8bf2cd..b5ae9f7c0510 100644
@@ -2533,6 +2533,7 @@ static int __init early_amd_iommu_init(void)
 	struct acpi_table_header *ivrs_base;
 	acpi_status status;
 	int i, remap_cache_sz, ret = 0;
+	u32 pci_id;
 
 	if (!amd_iommu_detected)
 		return -ENODEV;
@@ -2620,6 +2621,16 @@ static int __init early_amd_iommu_init(void)
 	if (ret)
 		goto out;
 
+	/* Disable IOMMU if there's Stoney Ridge graphics */
+	for (i = 0; i < 32; i++) {
+		pci_id = read_pci_config(0, i, 0, 0);
+		if ((pci_id & 0xffff) == 0x1002 && (pci_id >> 16) == 0x98e4) {
+			pr_info("Disable IOMMU on Stoney Ridge\n");
+			amd_iommu_disabled = true;
+			break;
+		}
+	}
+
 	/* Disable any previously enabled IOMMUs */
 	if (!is_kdump_kernel() || amd_iommu_disabled)
 		disable_iommus();
@@ -2728,7 +2739,7 @@ static int __init state_next(void)
 		ret = early_amd_iommu_init();
 		init_state = ret ? IOMMU_INIT_ERROR : IOMMU_ACPI_FINISHED;
 		if (init_state == IOMMU_ACPI_FINISHED && amd_iommu_disabled) {
-			pr_info("AMD IOMMU disabled on kernel command-line\n");
+			pr_info("AMD IOMMU disabled\n");
 			init_state = IOMMU_CMDLINE_DISABLED;
 			ret = -EINVAL;
 		}
drivers/md/dm-cache-target.c +2 -2
index 2d32821b3a5b..f4be63671233 100644
@@ -2846,8 +2846,8 @@ static void cache_postsuspend(struct dm_target *ti)
 	prevent_background_work(cache);
 	BUG_ON(atomic_read(&cache->nr_io_migrations));
 
-	cancel_delayed_work(&cache->waker);
-	flush_workqueue(cache->wq);
+	cancel_delayed_work_sync(&cache->waker);
+	drain_workqueue(cache->wq);
 	WARN_ON(cache->tracker.in_flight);
 
 	/*
drivers/md/dm-integrity.c +33 -17

150 lines not on this page · raw message

drivers/md/dm-thin-metadata.c +1 -1
index 8bb723f1a569..4cd8868f8004 100644
@@ -960,9 +960,9 @@ int dm_pool_metadata_close(struct dm_pool_metadata *pmd)
 			DMWARN("%s: __commit_transaction() failed, error = %d",
 			       __func__, r);
 	}
+	pmd_write_unlock(pmd);
 	if (!pmd->fail_io)
 		__destroy_persistent_data_objects(pmd);
-	pmd_write_unlock(pmd);
 
 	kfree(pmd);
 	return 0;
drivers/md/dm-writecache.c +11 -3
index 9b0a3bf6a4a1..cd9e4c8a023a 100644
@@ -625,6 +625,12 @@ static void writecache_add_to_freelist(struct dm_writecache *wc, struct wc_entry
 	wc->freelist_size++;
 }
 
+static inline void writecache_verify_watermark(struct dm_writecache *wc)
+{
+	if (unlikely(wc->freelist_size + wc->writeback_size <= wc->freelist_high_watermark))
+		queue_work(wc->writeback_wq, &wc->writeback_work);
+}
+
 static struct wc_entry *writecache_pop_from_freelist(struct dm_writecache *wc)
 {
 	struct wc_entry *e;
@@ -646,8 +652,8 @@ static struct wc_entry *writecache_pop_from_freelist(struct dm_writecache *wc)
 		list_del(&e->lru);
 	}
 	wc->freelist_size--;
-	if (unlikely(wc->freelist_size + wc->writeback_size <= wc->freelist_high_watermark))
-		queue_work(wc->writeback_wq, &wc->writeback_work);
+
+	writecache_verify_watermark(wc);
 
 	return e;
 }
@@ -838,7 +844,7 @@ static void writecache_suspend(struct dm_target *ti)
 	}
 	wc_unlock(wc);
 
-	flush_workqueue(wc->writeback_wq);
+	drain_workqueue(wc->writeback_wq);
 
 	wc_lock(wc);
 	if (flush_on_suspend)
@@ -961,6 +967,8 @@ static void writecache_resume(struct dm_target *ti)
 		writecache_commit_flushed(wc, false);
 	}
 
+	writecache_verify_watermark(wc);
+
 	wc_unlock(wc);
 }
 
drivers/md/dm-zoned-target.c +4 -4
index 70a1063161c0..b1e64cd31647 100644
@@ -533,8 +533,9 @@ static int dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
 
 	/* Get the BIO chunk work. If one is not active yet, create one */
 	cw = radix_tree_lookup(&dmz->chunk_rxtree, chunk);
-	if (!cw) {
-
+	if (cw) {
+		dmz_get_chunk_work(cw);
+	} else {
 		/* Create a new chunk work */
 		cw = kmalloc(sizeof(struct dm_chunk_work), GFP_NOIO);
 		if (unlikely(!cw)) {
@@ -543,7 +544,7 @@ static int dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
 		}
 
 		INIT_WORK(&cw->work, dmz_chunk_work);
-		refcount_set(&cw->refcount, 0);
+		refcount_set(&cw->refcount, 1);
 		cw->target = dmz;
 		cw->chunk = chunk;
 		bio_list_init(&cw->bio_list);
@@ -556,7 +557,6 @@ static int dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
 	}
 
 	bio_list_add(&cw->bio_list, bio);
-	dmz_get_chunk_work(cw);
 
 	dmz_reclaim_bio_acc(dmz->reclaim);
 	if (queue_work(dmz->chunk_wq, &cw->work))
drivers/md/dm.c +11 -11
index b89f07ee2eff..0413018c8305 100644
@@ -1788,7 +1788,8 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
 			 * With request-based DM we only need to check the
 			 * top-level queue for congestion.
 			 */
-			r = md->queue->backing_dev_info->wb.state & bdi_bits;
+			struct backing_dev_info *bdi = md->queue->backing_dev_info;
+			r = bdi->wb.congested->state & bdi_bits;
 		} else {
 			map = dm_get_live_table_fast(md);
 			if (map)
@@ -1854,15 +1855,6 @@ static const struct dax_operations dm_dax_ops;
 
 static void dm_wq_work(struct work_struct *work);
 
-static void dm_init_normal_md_queue(struct mapped_device *md)
-{
-	/*
-	 * Initialize aspects of queue that aren't relevant for blk-mq
-	 */
-	md->queue->backing_dev_info->congested_data = md;
-	md->queue->backing_dev_info->congested_fn = dm_any_congested;
-}
-
 static void cleanup_mapped_device(struct mapped_device *md)
 {
 	if (md->wq)
@@ -2249,6 +2241,12 @@ struct queue_limits *dm_get_queue_limits(struct mapped_device *md)
 }
 EXPORT_SYMBOL_GPL(dm_get_queue_limits);
 
+static void dm_init_congested_fn(struct mapped_device *md)
+{
+	md->queue->backing_dev_info->congested_data = md;
+	md->queue->backing_dev_info->congested_fn = dm_any_congested;
+}
+
 /*
  * Setup the DM device's queue based on md's type
  */
@@ -2265,11 +2263,12 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t)
 			DMERR("Cannot initialize queue for request-based dm-mq mapped device");
 			return r;
 		}
+		dm_init_congested_fn(md);
 		break;
 	case DM_TYPE_BIO_BASED:
 	case DM_TYPE_DAX_BIO_BASED:
 	case DM_TYPE_NVME_BIO_BASED:
-		dm_init_normal_md_queue(md);
+		dm_init_congested_fn(md);
 		break;
 	case DM_TYPE_NONE:
 		WARN_ON_ONCE(true);
@@ -2368,6 +2367,7 @@ static void __dm_destroy(struct mapped_device *md, bool wait)
 	map = dm_get_live_table(md, &srcu_idx);
 	if (!dm_suspended_md(md)) {
 		dm_table_presuspend_targets(map);
+		set_bit(DMF_SUSPENDED, &md->flags);
 		dm_table_postsuspend_targets(map);
 	}
 	/* dm_put_live_table must be before msleep, otherwise deadlock is possible */
drivers/media/mc/mc-entity.c +2 -2
index 7c429ce98bae..668770e9f609 100644
@@ -639,9 +639,9 @@ int media_get_pad_index(struct media_entity *entity, bool is_sink,
 		return -EINVAL;
 
 	for (i = 0; i < entity->num_pads; i++) {
-		if (entity->pads[i].flags == MEDIA_PAD_FL_SINK)
+		if (entity->pads[i].flags & MEDIA_PAD_FL_SINK)
 			pad_is_sink = true;
-		else if (entity->pads[i].flags == MEDIA_PAD_FL_SOURCE)
+		else if (entity->pads[i].flags & MEDIA_PAD_FL_SOURCE)
 			pad_is_sink = false;
 		else
 			continue;	/* This is an error! */
drivers/media/platform/vicodec/codec-v4l2-fwht.c +9 -25
index 3c93d9232c3c..b6e39fbd8ad5 100644
@@ -27,17 +27,17 @@ static const struct v4l2_fwht_pixfmt_info v4l2_fwht_pixfmts[] = {
 	{ V4L2_PIX_FMT_BGR24,   3, 3, 1, 3, 3, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
 	{ V4L2_PIX_FMT_RGB24,   3, 3, 1, 3, 3, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
 	{ V4L2_PIX_FMT_HSV24,   3, 3, 1, 3, 3, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV},
-	{ V4L2_PIX_FMT_BGR32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
-	{ V4L2_PIX_FMT_XBGR32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+	{ V4L2_PIX_FMT_BGR32,   4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
+	{ V4L2_PIX_FMT_XBGR32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
 	{ V4L2_PIX_FMT_ABGR32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
-	{ V4L2_PIX_FMT_RGB32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
-	{ V4L2_PIX_FMT_XRGB32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+	{ V4L2_PIX_FMT_RGB32,   4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
+	{ V4L2_PIX_FMT_XRGB32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
 	{ V4L2_PIX_FMT_ARGB32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
-	{ V4L2_PIX_FMT_BGRX32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+	{ V4L2_PIX_FMT_BGRX32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
 	{ V4L2_PIX_FMT_BGRA32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
-	{ V4L2_PIX_FMT_RGBX32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+	{ V4L2_PIX_FMT_RGBX32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
 	{ V4L2_PIX_FMT_RGBA32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
-	{ V4L2_PIX_FMT_HSV32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV},
+	{ V4L2_PIX_FMT_HSV32,   4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_HSV},
 	{ V4L2_PIX_FMT_GREY,    1, 1, 1, 1, 0, 1, 1, 1, 1, FWHT_FL_PIXENC_RGB},
 };
 
@@ -175,22 +175,14 @@ static int prepare_raw_frame(struct fwht_raw_frame *rf,
 	case V4L2_PIX_FMT_RGB32:
 	case V4L2_PIX_FMT_XRGB32:
 	case V4L2_PIX_FMT_HSV32:
-		rf->cr = rf->luma + 1;
-		rf->cb = rf->cr + 2;
-		rf->luma += 2;
-		break;
-	case V4L2_PIX_FMT_BGR32:
-	case V4L2_PIX_FMT_XBGR32:
-		rf->cb = rf->luma;
-		rf->cr = rf->cb + 2;
-		rf->luma++;
-		break;
 	case V4L2_PIX_FMT_ARGB32:
 		rf->alpha = rf->luma;
 		rf->cr = rf->luma + 1;
 		rf->cb = rf->cr + 2;
 		rf->luma += 2;
 		break;
+	case V4L2_PIX_FMT_BGR32:
+	case V4L2_PIX_FMT_XBGR32:
 	case V4L2_PIX_FMT_ABGR32:
 		rf->cb = rf->luma;
 		rf->cr = rf->cb + 2;
@@ -198,10 +190,6 @@ static int prepare_raw_frame(struct fwht_raw_frame *rf,
 		rf->alpha = rf->cr + 1;
 		break;
 	case V4L2_PIX_FMT_BGRX32:
-		rf->cb = rf->luma + 1;
-		rf->cr = rf->cb + 2;
-		rf->luma += 2;
-		break;
 	case V4L2_PIX_FMT_BGRA32:
 		rf->alpha = rf->luma;
 		rf->cb = rf->luma + 1;
@@ -209,10 +197,6 @@ static int prepare_raw_frame(struct fwht_raw_frame *rf,
 		rf->luma += 2;
 		break;
 	case V4L2_PIX_FMT_RGBX32:
-		rf->cr = rf->luma;
-		rf->cb = rf->cr + 2;
-		rf->luma++;
-		break;
 	case V4L2_PIX_FMT_RGBA32:
 		rf->alpha = rf->luma + 3;
 		rf->cr = rf->luma;
drivers/media/v4l2-core/v4l2-mem2mem.c +2 -2
index 1afd9c6ad908..cc34c5ab7009 100644
@@ -880,12 +880,12 @@ int v4l2_m2m_register_media_controller(struct v4l2_m2m_dev *m2m_dev,
 		goto err_rel_entity1;
 
 	/* Connect the three entities */
-	ret = media_create_pad_link(m2m_dev->source, 0, &m2m_dev->proc, 1,
+	ret = media_create_pad_link(m2m_dev->source, 0, &m2m_dev->proc, 0,
 			MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED);
 	if (ret)
 		goto err_rel_entity2;
 
-	ret = media_create_pad_link(&m2m_dev->proc, 0, &m2m_dev->sink, 0,
+	ret = media_create_pad_link(&m2m_dev->proc, 1, &m2m_dev->sink, 0,
 			MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED);
 	if (ret)
 		goto err_rm_links0;
drivers/misc/habanalabs/device.c +4 -1
index b155e9549076..b680b0caa69b 100644
@@ -598,7 +598,9 @@ int hl_device_set_debug_mode(struct hl_device *hdev, bool enable)
 			goto out;
 		}
 
-		hdev->asic_funcs->halt_coresight(hdev);
+		if (!hdev->hard_reset_pending)
+			hdev->asic_funcs->halt_coresight(hdev);
+
 		hdev->in_debug = 0;
 
 		goto out;
@@ -1189,6 +1191,7 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)
 	if (hdev->asic_funcs->get_hw_state(hdev) == HL_DEVICE_HW_STATE_DIRTY) {
 		dev_info(hdev->dev,
 			"H/W state is dirty, must reset before initializing\n");
+		hdev->asic_funcs->halt_engines(hdev, true);
 		hdev->asic_funcs->hw_fini(hdev, true);
 	}
 
drivers/misc/habanalabs/goya/goya.c +42 -2

61 lines not on this page · raw message

drivers/net/dsa/bcm_sf2.c +1 -2
index d1955543acd1..b0f5280a83cb 100644

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

drivers/net/ethernet/aquantia/atlantic/aq_hw.h +2 -0
index cc70c606b6ef..251767c31f7e 100644

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

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +3 -1
index fce587aaba33..d20d91cdece8 100644

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

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +17 -2
index f547baa6c954..354705f9bc49 100644

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

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +12 -0
index 97ebf849695f..77a4ed64830f 100644

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

drivers/net/ethernet/cavium/thunder/thunder_bgx.c +59 -3

62 lines not on this page · raw message

drivers/net/ethernet/cavium/thunder/thunder_bgx.h +9 -0
index 25888706bdcd..cdea49392185 100644

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

drivers/net/ethernet/davicom/dm9000.c +2 -0
index cce90b5925d9..70060c51854f 100644

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

drivers/net/ethernet/intel/ice/ice_ethtool.c +0 -7
index 9bd166e3dff3..594f6dbb2110 100644

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

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c +4 -1
index c6c7d1defbd7..aade62a9ee5c 100644

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

drivers/net/ethernet/micrel/ks8851_mll.c +9 -44

53 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +8 -5
index 6bc1bdb137ae..caa4d4c687b9 100644

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

drivers/nvme/host/core.c +1 -1
index ada59df642d2..a4d8c90ee7cc 100644

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

drivers/nvme/host/pci.c +14 -1
index bb5e13ad1aff..d3f23d6254e4 100644

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

drivers/phy/allwinner/phy-sun50i-usb3.c +1 -1
index 1169f3e83a6f..b1c04f71a31d 100644

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

drivers/phy/motorola/phy-mapphone-mdm6600.c +24 -3
index f20524f0c21d..94a34cf75eb3 100644

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

drivers/regulator/stm32-vrefbuf.c +2 -1
index bdfaf7edb75a..992bc18101ef 100644

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

drivers/s390/cio/blacklist.c +3 -2
index 2a3f874a21d5..9cebff8e8d74 100644

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

drivers/s390/cio/qdio_setup.c +2 -1
index dc430bd86ade..58eaac70dba7 100644

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

drivers/s390/net/qeth_core_main.c +11 -12
index 10edfd6fc930..4fd7b0ceb4ff 100644

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

drivers/scsi/megaraid/megaraid_sas_fusion.c +3 -2
index 46bc062d873e..d86838801805 100644

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

drivers/soc/imx/soc-imx-scu.c +1 -1
index fb70b8a3f7c5..20d37eaeb5f2 100644

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

drivers/spi/atmel-quadspi.c +11 -0
index fd8007ebb145..13def7f78b9e 100644

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

drivers/spi/spi-bcm63xx-hsspi.c +0 -1
index 7327309ea3d5..6c235306c0e4 100644

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

drivers/spi/spidev.c +5 -0
index 1e217e3e9486..2ab6e782f14c 100644

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

drivers/staging/media/hantro/hantro_drv.c +2 -2
index 26108c96b674..37c7cf6b7d8a 100644

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

drivers/staging/speakup/selection.c +0 -2
index a8b4d0c5ab7e..032f3264fba1 100644

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

drivers/tty/serdev/core.c +10 -0
index ce5309d00280..0f64a10ba51f 100644

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

drivers/tty/serial/8250/8250_exar.c +33 -0
index 108cd55f9c4d..405370c6eee5 100644

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

drivers/tty/serial/ar933x_uart.c +8 -0
index 3bdd56a1021b..ea12f10610b6 100644

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

drivers/tty/serial/fsl_lpuart.c +24 -15
index 4e128d19e0ad..8a69ec282a43 100644

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

drivers/tty/serial/mvebu-uart.c +1 -1
index c12a12556339..4e9a590712cb 100644

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

drivers/tty/vt/selection.c +23 -3
index 44d974d4159f..d7d2e4b844bc 100644

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

drivers/tty/vt/vt.c +0 -2
index 3b4ccc2a30c1..e9e27ba69d5d 100644

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

drivers/usb/cdns3/gadget.c +15 -4
index 02f6ca2cb1ba..f624cc87cbab 100644

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

drivers/usb/core/hub.c +6 -2
index 1d212f82c69b..54cd8ef795ec 100644

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

drivers/usb/core/port.c +8 -2
index bbbb35fa639f..235a7c645503 100644

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

drivers/usb/core/quirks.c +3 -0
index 2b24336a72e5..2dac3e7cdd97 100644

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

drivers/usb/dwc3/gadget.c +8 -1
index e0cb1c2d5675..6ac02ba5e4a1 100644

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

drivers/usb/gadget/composite.c +18 -6
index cd303a3ea680..223f72d4d9ed 100644

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

drivers/usb/gadget/function/f_fs.c +3 -2
index 6f8b67e61771..bdac92d3a8d0 100644

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

drivers/usb/gadget/function/u_serial.c +3 -1
index f986e5c55974..8167d379e115 100644

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

drivers/usb/misc/usb251xb.c +16 -4
index 10c9e7f6273e..29fe5771c21b 100644

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

drivers/usb/storage/unusual_devs.h +6 -0
index 1cd9b6305b06..1880f3e13f57 100644

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

drivers/video/console/vgacon.c +3 -0
index de7b8382aba9..998b0de1812f 100644

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

drivers/watchdog/da9062_wdt.c +0 -7
index e149e66a6ea9..e92f38fcb7a4 100644

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

fs/btrfs/inode.c +3 -1
index e6901744a5be..e47708a9bf8b 100644

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

fs/cifs/cifsglob.h +7 -0
index 239338d57086..af789aac8ef7 100644

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

fs/cifs/cifsproto.h +3 -2
index d6100299458a..3b583150bcd5 100644

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

fs/cifs/cifssmb.c +2 -1
index cc86a67225d1..69c38c379f33 100644

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

fs/cifs/file.c +12 -7
index 043288b5c728..5b1460486535 100644

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

fs/cifs/inode.c +8 -4
index b3f3675e1878..e9a7536c2a5e 100644

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

fs/cifs/smb1ops.c +1 -1
index d70a2bb062df..e523c05a4487 100644

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

fs/cifs/smb2inode.c +2 -2
index 5ef5e97a6d13..bd3669532a09 100644

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

fs/cifs/smb2ops.c +2 -1
index 65f76be0f454..5b62840853ff 100644

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

fs/cifs/smb2pdu.c +1 -0
index 6c9497c18f0b..fc32fe546c1a 100644

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

fs/fat/inode.c +7 -12
index 5f04c5c810fb..d40cbad16659 100644

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

include/drm/drm_gem_shmem_helper.h +5 -0
index e34a7b7f848a..294b2931c4cc 100644

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

include/linux/mm.h +4 -0
index cfaa8feecfe8..70f4278bb193 100644

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

kernel/sched/fair.c +2 -0
index b0ee5eedeccd..0ff2f43ac9cd 100644

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

kernel/trace/blktrace.c +4 -1
index a6d3016410eb..840ef7af20e0 100644

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

mm/huge_memory.c +1 -2
index 54c106bdbafd..c9f8163bd5bf 100644

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

mm/memory.c +27 -8
index 45442d9a4f52..0eba7af05777 100644

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

mm/memory_hotplug.c +7 -1
index 0ddff29079c3..673900faea76 100644

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

mm/mprotect.c +36 -2
index 7a8e84f86831..311c0dadf71c 100644

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

net/netfilter/xt_hashlimit.c +9 -27
index 1b68a131083c..8c835ad63729 100644

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

security/integrity/platform_certs/load_uefi.c +26 -14
index 111898aad56e..f0c908241966 100644

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

sound/hda/ext/hdac_ext_controller.c +6 -3
index cfab60d88c92..09ff209df4a3 100644

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

sound/pci/hda/patch_realtek.c +27 -4
index 7ba3ef6b673d..4436ebbea108 100644

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

sound/soc/codecs/pcm512x.c +5 -3
index 861210f6bf4f..4cbef9affffd 100644

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

sound/soc/intel/boards/skl_hda_dsp_generic.c +8 -0
index 4e45901e3a2f..11eaee9ae41f 100644

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

sound/soc/intel/skylake/skl-debug.c +17 -15
index 3466675f2678..a15aa2ffa681 100644

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

sound/soc/intel/skylake/skl-ssp-clk.c +3 -1
index 1c0e5226cb5b..bd43885f3805 100644

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

sound/soc/soc-component.c +1 -1
index b94680fb26fa..a770e66b233a 100644

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

sound/soc/soc-dapm.c +1 -1
index 935b5375ecc5..ebd785f9aa46 100644

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

sound/soc/soc-pcm.c +8 -8
index 01e7bc03d92f..8de29f48442f 100644

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

sound/soc/soc-topology.c +10 -7
index 0119f07cece6..56a7142f15a0 100644

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

sound/soc/sof/intel/hda.c +2 -1
index 82ecadda886c..a1780259292f 100644

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

sound/soc/sof/ipc.c +1 -1
index dfe429f9e33f..c7a408f36733 100644

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

tools/perf/arch/arm/util/cs-etm.c +4 -1
index ede040cf82ad..20e9a189ad92 100644

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

tools/perf/arch/arm64/util/arm-spe.c +4 -1
index eba6541ec0f1..1d993c27242b 100644

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

tools/perf/arch/x86/util/intel-bts.c +4 -1
index 27d9e214d068..39e363151ad7 100644

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

tools/perf/arch/x86/util/intel-pt.c +4 -1
index 20df442fdf36..be07d6886256 100644

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

tools/testing/selftests/lib.mk +13 -10
index 1c8a1963d03f..3ed0134a764d 100644

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

tools/testing/selftests/net/forwarding/mirror_gre.sh +13 -12
index e6fd7a18c655..0266443601bc 100755

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

tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh +3 -3
index bb10e33690b2..ce6bea9675c0 100755

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

tools/testing/selftests/pidfd/.gitignore +1 -0
index 8d069490e17b..161facf28d6a 100644

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

tools/testing/selftests/tpm2/test_smoke.sh +11 -2
index 8155c2ea7ccb..b630c7b5950a 100755

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

tools/testing/selftests/tpm2/test_space.sh +8 -1
index a6f5e346635e..180b469c53b4 100755

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.