Linux 4.16.4
Greg KH
maintainerI'm announcing the release of the 4.16.4 kernel.
All users of the 4.16 kernel series must upgrade.
The updated 4.16.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.16.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/at91sam9g25.dtsi | 2 arch/arm/boot/dts/exynos5250.dtsi | 8 arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 24 + arch/arm/boot/dts/sama5d4.dtsi | 2 arch/arm/mach-exynos/pm.c | 6 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 arch/mips/include/asm/uaccess.h | 11 arch/mips/lib/memset.S | 11 arch/powerpc/include/asm/barrier.h | 3 arch/powerpc/include/asm/opal.h | 3 arch/powerpc/include/asm/synch.h | 4 arch/powerpc/kernel/dt_cpu_ftrs.c | 19 + arch/powerpc/kernel/eeh_driver.c | 68 ++-- arch/powerpc/kernel/eeh_pe.c | 3 arch/powerpc/kernel/kprobes.c | 30 +- arch/powerpc/kernel/machine_kexec_file_64.c | 2 arch/powerpc/lib/feature-fixups.c | 2 arch/powerpc/mm/hash_utils_64.c | 6 arch/powerpc/mm/tlb-radix.c | 5 arch/powerpc/platforms/powernv/opal-nvram.c | 11 arch/powerpc/platforms/pseries/lpar.c | 8 arch/powerpc/sysdev/xive/native.c | 4 arch/s390/Kconfig | 8 arch/s390/hypfs/inode.c | 2 arch/s390/kernel/perf_cpum_cf_events.c | 1 arch/s390/kernel/setup.c | 1 arch/um/os-Linux/file.c | 1 arch/um/os-Linux/signal.c | 3 arch/x86/um/stub_segv.c | 3 arch/x86/xen/enlighten_pv.c | 8 drivers/acpi/nfit/core.c | 59 ++- drivers/acpi/nfit/nfit.h | 5 drivers/acpi/video_detect.c | 9 drivers/base/regmap/regmap.c | 2 drivers/bluetooth/hci_bcm.c | 20 + drivers/char/random.c | 84 ++++- drivers/char/tpm/tpm-interface.c | 4 drivers/clk/bcm/clk-bcm2835.c | 8 drivers/clk/mediatek/clk-mt2701.c | 15 - drivers/clk/mvebu/armada-38x.c | 14 drivers/clk/renesas/clk-sh73a0.c | 6 drivers/clk/tegra/clk-emc.c | 2 drivers/clk/tegra/clk-tegra-periph.c | 2 drivers/clk/tegra/clk-tegra-super-gen4.c | 8 drivers/clk/tegra/clk-tegra114.c | 3 drivers/clk/tegra/clk-tegra124.c | 7 drivers/clk/tegra/clk-tegra20.c | 23 - drivers/clk/tegra/clk-tegra210.c | 3 drivers/clk/tegra/clk-tegra30.c | 14 drivers/cpufreq/armada-37xx-cpufreq.c | 2 drivers/cpufreq/cppc_cpufreq.c | 3 drivers/dax/device.c | 2 drivers/dma/at_xdmac.c | 4 drivers/extcon/extcon-intel-cht-wc.c | 11 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 drivers/gpu/drm/amd/amdgpu/si.c | 67 ++++ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 -- drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 2 drivers/gpu/drm/i915/gvt/gvt.h | 5 drivers/gpu/drm/i915/gvt/mmio_context.c | 210 ++++++++++++-- drivers/gpu/drm/i915/gvt/mmio_context.h | 5 drivers/gpu/drm/i915/gvt/scheduler.c | 5 drivers/gpu/drm/i915/i915_drv.c | 22 - drivers/gpu/drm/i915/i915_drv.h | 2 drivers/gpu/drm/i915/i915_reg.h | 10 drivers/gpu/drm/i915/intel_sprite.c | 81 ++++- drivers/gpu/drm/radeon/radeon_device.c | 4 drivers/gpu/drm/radeon/si_dpm.c | 4 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 23 - drivers/hid/hid-core.c | 10 drivers/hid/hid-ids.h | 3 drivers/hid/hid-input.c | 27 + drivers/hid/hid-multitouch.c | 5 drivers/hid/hid-rmi.c | 4 drivers/hid/hidraw.c | 5 drivers/hid/i2c-hid/i2c-hid.c | 26 + drivers/hid/wacom_sys.c | 4 drivers/hid/wacom_wac.c | 76 +++-- drivers/i2c/busses/i2c-i801.c | 16 - drivers/infiniband/core/ucma.c | 3 drivers/infiniband/core/verbs.c | 12 drivers/infiniband/hw/mlx5/mr.c | 2 drivers/infiniband/sw/rxe/rxe_verbs.c | 5 drivers/infiniband/ulp/srp/ib_srp.c | 18 - drivers/infiniband/ulp/srpt/ib_srpt.c | 16 - drivers/iommu/intel-svm.c | 1 drivers/irqchip/irq-gic-common.c | 9 drivers/md/dm-crypt.c | 66 ++++ drivers/md/dm-raid.c | 3 drivers/md/dm.c | 30 +- drivers/media/common/videobuf2/videobuf2-core.c | 9 drivers/media/platform/vivid/vivid-vid-common.c | 3 drivers/media/platform/vsp1/vsp1_wpf.c | 2 drivers/media/rc/rc-main.c | 6 drivers/misc/cxl/cxllib.c | 85 +++-- drivers/mmc/core/block.c | 1 drivers/mmc/host/jz4740_mmc.c | 2 drivers/mmc/host/sdhci-pci-core.c | 25 + drivers/mmc/host/tmio_mmc_core.c | 2 drivers/mtd/ubi/block.c | 2 drivers/mtd/ubi/build.c | 11 drivers/mtd/ubi/fastmap-wl.c | 1 drivers/nvdimm/dimm.c | 8 drivers/nvdimm/dimm_devs.c | 22 - drivers/nvdimm/namespace_devs.c | 4 drivers/pci/hotplug/acpiphp_glue.c | 23 + drivers/pci/quirks.c | 4 drivers/phy/allwinner/phy-sun4i-usb.c | 10 drivers/pwm/pwm-mediatek.c | 35 ++ drivers/pwm/pwm-rcar.c | 8 drivers/soc/mediatek/mtk-scpsys.c | 2 drivers/spi/spi-atmel.c | 8 drivers/spi/spi.c | 19 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 6 drivers/thermal/imx_thermal.c | 6 drivers/thunderbolt/icm.c | 36 +- drivers/thunderbolt/nhi.c | 1 drivers/thunderbolt/switch.c | 9 drivers/usb/core/generic.c | 9 drivers/usb/dwc3/core.c | 3 drivers/usb/dwc3/dwc3-pci.c | 2 drivers/usb/dwc3/gadget.c | 43 +- drivers/usb/gadget/function/f_midi.c | 3 drivers/usb/gadget/u_f.h | 2 drivers/usb/gadget/udc/core.c | 3 drivers/usb/musb/musb_gadget_ep0.c | 14 drivers/watchdog/f71808e_wdt.c | 2 fs/autofs4/root.c | 2 fs/ceph/inode.c | 10 fs/cifs/Kconfig | 1 fs/cifs/cifsencrypt.c | 85 ----- fs/cifs/cifsfs.c | 1 fs/cifs/cifsglob.h | 8 fs/cifs/cifsproto.h | 5 fs/cifs/inode.c | 33 ++ fs/cifs/link.c | 27 - fs/cifs/misc.c | 54 +++ fs/cifs/smb2misc.c | 64 ++++ fs/cifs/smb2ops.c | 15 - fs/cifs/smb2pdu.c | 38 ++ fs/cifs/smb2pdu.h | 1 fs/cifs/smb2proto.h | 5 fs/cifs/smb2transport.c | 97 ++---- fs/cifs/smbdirect.c | 19 - fs/cifs/smbencrypt.c | 27 - fs/cifs/transport.c | 17 + fs/ext4/balloc.c | 3 fs/ext4/dir.c | 8 fs/ext4/ext4_jbd2.c | 7 fs/ext4/ialloc.c | 47 --- fs/ext4/inode.c | 13 fs/ext4/ioctl.c | 8 fs/ext4/super.c | 21 - fs/ext4/xattr.c | 121 ++++---- fs/ext4/xattr.h | 11 fs/fs-writeback.c | 7 fs/jbd2/journal.c | 30 +- fs/jffs2/super.c | 2 fs/namespace.c | 3 fs/notify/fanotify/fanotify.c | 34 +- fs/orangefs/super.c | 5 fs/reiserfs/journal.c | 2 fs/ubifs/super.c | 14 fs/udf/unicode.c | 6 include/dt-bindings/clock/mt2701-clk.h | 3 include/linux/backing-dev-defs.h | 5 include/linux/backing-dev.h | 30 +- include/linux/blk_types.h | 5 include/linux/compiler-clang.h | 3 include/linux/compiler-gcc.h | 12 include/linux/hid.h | 15 - include/linux/hmm.h | 9 include/linux/mm.h | 1 include/sound/pcm_oss.h | 1 include/uapi/linux/random.h | 3 ipc/shm.c | 23 + kernel/resource.c | 3 kernel/trace/ring_buffer.c | 5 kernel/trace/trace_uprobe.c | 2 lib/swiotlb.c | 2 lib/vsprintf.c | 4 mm/filemap.c | 9 mm/hmm.c | 3 mm/ksm.c | 7 mm/memory-failure.c | 16 + mm/page-writeback.c | 18 - mm/slab.c | 3 net/sunrpc/rpc_pipe.c | 1 net/sunrpc/xprtrdma/rpc_rdma.c | 2 net/sunrpc/xprtrdma/transport.c | 2 net/sunrpc/xprtrdma/verbs.c | 13 net/sunrpc/xprtrdma/xprt_rdma.h | 1 sound/core/oss/pcm_oss.c | 186 ++++++++++-- sound/core/pcm.c | 8 sound/core/rawmidi_compat.c | 18 - sound/pci/hda/hda_intel.c | 3 sound/pci/hda/patch_realtek.c | 3 sound/soc/codecs/ssm2602.c | 19 - sound/soc/soc-topology.c | 23 + sound/usb/line6/midi.c | 2 virt/kvm/arm/vgic/vgic-its.c | 15 - 209 files changed, 2167 insertions(+), 999 deletions(-)
Aaron Armstrong Skomra (1):
HID: wacom: bluetooth: send exit report for recent Bluetooth devices
Aaron Ma (4):
HID: i2c-hid: fix size check and type usage
HID: Fix hid_report_len usage
HID: core: Fix size as type u32
HID: i2c-hid: Fix resume issue on Raydium touchscreen device
Al Viro (5):
jffs2_kill_sb(): deal with failed allocations hypfs_kill_super(): deal with failed allocations orangefs_kill_sb(): deal with allocation failures
rpc_pipefs: fix double-dput()
Don't leak MNT_INTERNAL away from internal mounts
Alex Deucher (4):
drm/amdgpu: Add an ATPX quirk for hybrid laptop drm/amdgpu/sdma: fix mask in emit_pipeline_sync drm/amdgpu: Fix PCIe lane width calculation drm/amdgpu/si: implement get/set pcie_lanes asic callback
Alex Smith (1):
mmc: jz4740: Fix race condition in IRQ mask update
Alexander Kappner (1):
mmc: core: Prevent bus reference leak in mmc_blk_init()
Amir Goldstein (1):
fanotify: fix logic of events on child
Andrew Morton (3):
fs/reiserfs/journal.c: add missing resierfs_warning() arg drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4 drivers/infiniband/ulp/srpt/ib_srpt.c: fix build with gcc-4.4.4
Aniruddha Banerjee (1):
irqchip/gic: Take lock when updating irq type
Arnd Bergmann (1):
clk: fix false-positive Wmaybe-uninitialized warning
Aurelien Aptel (3):
CIFS: refactor crypto shash/sdesc allocation&free
CIFS: add sha512 secmech
CIFS: implement v3.11 preauth integrity
Bart Van Assche (5):
RDMA/rxe: Fix an out-of-bounds read
RDMA/core: Avoid that ib_drain_qp() triggers an out-of-bounds stack access IB/srp: Fix srp_abort()
IB/srp: Fix completion vector assignment algorithm
IB/srpt: Fix an out-of-bounds stack access in srpt_zerolength_write()
Bas Nieuwenhuizen (1):
drm/amdgpu: Fix always_valid bos multiple LRU insertions.
Benjamin Herrenschmidt (1):
powerpc/xive: Fix trying to "push" an already active pool VP
Boris Brezillon (1):
clk: bcm2835: De-assert/assert PLL reset signal when appropriate
Charlene Liu (1):
drm/amd/display: HDMI has no sound after Panel power off/on
Chen-Yu Tsai (1):
phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving VBUS
Chris Chiu (1):
tpm: self test failure should not cause suspend to fail
Chuck Lever (2):
xprtrdma: Fix latency regression on NUMA NFS/RDMA clients
xprtrdma: Fix corner cases when handling device removal
Claudio Imbrenda (1):
mm/ksm.c: fix inconsistent accounting of zero pages
Dan Carpenter (1):
regmap: Fix reversed bounds check in regmap_raw_write()
Dan Williams (6):
acpi, nfit: rework NVDIMM leaf method detection libnvdimm, dimm: fix dpa reservation vs uninitialized label area libnvdimm, namespace: use a safe lookup for dimm device name nfit, address-range-scrub: fix scrub in-progress reporting
nfit: skip region registration for incomplete control regions libnvdimm, dimm: handle EACCES failures from label reads
Daniel Kurtz (1):
mmc: sdhci-pci: Only do AMD tuning for HS200
Dave Jiang (1):
device-dax: allow MAP_SYNC to succeed
David Wang (1):
ALSA: hda - New VIA controller suppor no-snoop path
Dmitry Osipenko (1):
clk: tegra: Mark HCLK, SCLK and EMC as critical
Dmitry Torokhov (1):
HID: input: fix battery level reporting on BT mice
Eric Biggers (2):
ipc/shm: fix use-after-free of shm file via remap_file_pages()
ext4: limit xattr size to INT_MAX
Eryu Guan (1):
ext4: protect i_disksize update by i_data_sem in direct write path
Eugen Hristev (1):
spi: atmel: init FIFOs before spi enable
Fabián Inostroza (1):
ALSA: line6: Use correct endpoint type for midi output
Felipe Balbi (2):
usb: gadget: udc: core: update usb_ep_queue() documentation
usb: dwc3: gadget: never call ->complete() from ->ep_queue()
Frederic Barrat (1):
cxl: Fix possible deadlock when processing page faults from cxllib
George Cherian (1):
cpufreq: CPPC: Use transition_delay_us depending transition_latency
Greg Kroah-Hartman (1):
Linux 4.16.4
Greg Thelen (1):
writeback: safer lock nesting
Gregory CLEMENT (1):
cpufreq: armada-37xx: Fix clock leak
Gustavo A. R. Silva (1):
CIFS: fix sha512 check in cifs_crypto_secmech_release
Hans Verkuil (2):
media: atomisp_fops.c: disable atomisp_compat_ioctl32
media: vivid: check if the cec_adapter is valid
Hans de Goede (3):
Bluetooth: hci_bcm: Add irq_polarity module option
ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E
extcon: intel-cht-wc: Set direction and drv flags for V5 boost GPIO
Harry Wentland (2):
Revert "drm/amd/display: fix dereferencing possible ERR_PTR()" Revert "drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2)"
Heiko Carstens (1):
s390: add support for IBM z14 Model ZR1
Heinrich Schuchardt (1):
usb: musb: gadget: misplaced out of bounds check
Heinz Mauelshagen (1):
dm raid: fix nosync status
Hui Wang (2):
ALSA: hda/realtek - set PINCFG_HEADSET_MIC to parse_flags
ALSA: hda/realtek - adjust the location of one mic
Ian Kent (1):
autofs: mount point create should honour passed in mode
Igor Pylypiv (1):
watchdog: f71808e_wdt: Fix WD_EN register read
Imre Deak (1):
drm/i915: Fix hibernation with ACPI S0 target state
James Kelly (1):
ASoC: ssm2602: Replace reg_default_raw with reg_default
Jan Kara (1):
udf: Fix leak of UTF-16 surrogates into encoded strings
Jarkko Nikula (1):
spi: Fix unregistration of controller with fixed SPI bus number
Jason A. Donenfeld (1):
um: Compile with modern headers
Jason Andryuk (1):
x86/xen: Delay get_cpu_cap until stack canary is established
Jean Delvare (2):
i2c: i801: Save register SMBSLVCMD value only once
i2c: i801: Restore configuration at shutdown
Jerome Brunet (1):
ARM64: dts: meson: reduce odroid-c2 eMMC maximum rate
Jiri Kosina (1):
HID: i2c-hid: fix inverted return value from i2c_hid_command()
Jiri Slaby (1):
ext4: fix offset overflow on 32-bit archs in ext4_iomap_begin()
Jérôme Glisse (2):
mm/hmm: fix header file if/else/endif maze mm/hmm: hmm_pfns_bad() was accessing wrong struct
Kees Cook (1):
task_struct: only use anon struct under randstruct plugin
Kieran Bingham (1):
media: vsp1: Fix BRx conditional path in WPF
Krzysztof Mazur (1):
um: Use POSIX ucontext_t instead of struct ucontext
Leon Romanovsky (1):
RDMA/mlx5: Protect from NULL pointer derefence
Liam Girdwood (1):
ASoC: topology: Fix kcontrol name string handling
Long Li (2):
cifs: smbd: avoid reconnect lockup
cifs: smbd: disconnect transport on RDMA errors
Lu Baolu (1):
iommu/vt-d: Fix a potential memory leak
Marc Zyngier (2):
KVM: arm/arm64: vgic-its: Fix potential overrun in vgic_copy_lpi_list drm/rockchip: Clear all interrupts before requesting the IRQ
Marek Szyprowski (2):
ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210
ARM: dts: exynos: Fix IOMMU support for GScaler devices on Exynos5250
Masaharu Hayakawa (1):
mmc: tmio: Fix error handling when issuing CMD23
Matt Redfearn (4):
MIPS: uaccess: Add micromips clobbers to bzero invocation
MIPS: memset.S: EVA & fault support for small_memset
MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup
MIPS: memset.S: Fix clobber of v1 in last_fixup
Matthew Wilcox (1):
mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
Maxime Chevallier (1):
spi: Fix scatterlist elements size in spi_map_buf
Maxime Jayat (1):
dmaengine: at_xdmac: fix rare residue corruption
Michael Ellerman (2):
powerpc/mm/radix: Fix checkstops caused by invalid tlbiel powerpc/lib: Fix off-by-one in alternate feature patching
Michael Neuling (2):
powerpc/eeh: Fix race with driver un/bind powerpc/eeh: Fix enabling bridge MMIO windows
Mika Westerberg (6):
ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
thunderbolt: Wait a bit longer for ICM to authenticate the active NVM
thunderbolt: Serialize PCIe tunnel creation with PCI rescan
thunderbolt: Resume control channel after hibernation image is created
thunderbolt: Handle connecting device in place of host properly
thunderbolt: Prevent crash when ICM firmware is not running
Mike Snitzer (1):
dm: backfill abnormal IO support to non-splitting IO submission
Mikhail Lappo (1):
thermal: imx: Fix race condition in imx_thermal_probe()
Mikulas Patocka (2):
block: use 32-bit blk_status_t on Alpha dm crypt: limit the number of allocated pages
Naoya Horiguchi (1):
mm: hwpoison: disable memory error handling on 1GB hugepage
Naveen N. Rao (1):
powerpc/kprobes: Fix call trace due to incorrect preempt count
Nicholas Piggin (6):
powerpc/64s: Fix pkey support in dt_cpu_ftrs, add CPU_FTR_PKEY bit powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write() powerpc/64s: Fix dt_cpu_ftrs to have restore_cpu clear unwanted LPCR bits powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops
Nico Sneck (1):
drm/radeon: add PX quirk for Asus K73TK
Nicolas Ferre (1):
ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
Paul Mackerras (1):
powerpc/64: Call H_REGISTER_PROC_TBL when running as a HPT guest on POWER9
Paul Parsons (1):
drm/radeon: Fix PCIe lane width calculation
Ravi Bangoria (1):
trace_uprobe: Use %lx to display offset
Richard Genoud (1):
clk: mvebu: armada-38x: add support for missing clocks
Richard Weinberger (3):
ubifs: Check ubifs_wbuf_sync() return code
ubi: fastmap: Don't flush fastmap work on detach
ubi: Reject MLC NAND
Rodrigo Rivas Costa (1):
HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device
Roger Quadros (1):
usb: dwc3: prevent setting PRTCAP to OTG from debugfs
Roland Dreier (1):
RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device
Romain Izard (1):
ubi: Fix error for write access
Ronnie Sahlberg (2):
cifs: fix memory leak in SMB2_open()
fix smb3-encryption breakage when CONFIG_DEBUG_SG=y
Ryo Kodama (1):
pwm: rcar: Fix a condition to prevent mismatch value setting to duty
Sakari Ailus (1):
media: vb2: core: Finish buffers at the end of the stream
Santiago Esteban (1):
ARM: dts: at91: sama5d4: fix pinctrl compatible string
Sean Wang (6):
arm: dts: mt7623: fix USB initialization fails on bananapi-r2
soc: mediatek: fix the mistaken pointer accessed when subdomains are added
clk: mediatek: fix PWM clock source by adding a fixed-factor clock
pwm: mediatek: Fix up PWM4 and PWM5 malfunction on MT7623
pwm: mediatek: Improve precision in rate calculation
dt-bindings: clock: mediatek: add binding for fixed-factor clock axisel_d4
Sean Young (1):
media: rc: oops in ir_timer_keyup after device unplug
Sinan Kaya (1):
PCI: Mark Broadcom HT1100 and HT2000 Root Port Extended Tags as broken
Steve French (2):
Tree connect for SMB3.1.1 must be signed for non-encrypted shares
smb3: Fix root directory when server returns inode number of zero
Steven Rostedt (VMware) (2):
vsprintf: Do not preprocess non-dereferenced pointers for bprintf (%px and %pK)
ring-buffer: Check if memory is available before allocation
Takashi Iwai (8):
resource: fix integer overflow at reallocation
swiotlb: fix unexpected swiotlb_alloc_coherent failures
ALSA: pcm: Avoid potential races between OSS ioctls and read/write
ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls
ALSA: pcm: Fix UAF at PCM release via PCM timer access
ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
ALSA: rawmidi: Fix missing input substream checks in compat ioctls
Theodore Ts'o (17):
random: use a tighter cap in credit_entropy_bits_safe()
jbd2: if the journal is aborted then don't allow update of the log tail
ext4: shutdown should not prevent get_write_access
ext4: eliminate sleep from shutdown ioctl
ext4: pass -ESHUTDOWN code to jbd2 layer
ext4: don't update checksum of new initialized bitmaps
ext4: fail ext4_iget for root directory if unallocated
ext4: always initialize the crc32c checksum driver
ext4: don't allow r/w mounts if metadata blocks overlap the superblock
ext4: move call to ext4_error() into ext4_xattr_check_block()
ext4: add bounds checking to ext4_xattr_find_entry()
ext4: add extra checks to ext4_xattr_block_get()
ext4: force revalidation of directory pointer after seekdir(2)
random: fix crng_ready() test
random: use a different mixing algorithm for add_device_randomness()
random: crng_reseed() should lock the crng instance that it is modifying
random: add new ioctl RNDRESEEDCRNG
Thiago Jung Bauermann (1):
powerpc/kexec_file: Fix error code when trying to load kdump kernel
Thinh Nguyen (1):
usb: dwc3: pci: Properly cleanup resource
Ville Syrjälä (1):
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Vlastimil Babka (1):
mm, slab: reschedule cache_reap() on the same CPU
Weinan Li (1):
drm/i915/gvt: init mmio by lri command in vgpu inhibit context
Yan, Zheng (1):
ceph: always update atime/mtime/ctime for new inode
Yavuz, Tuba (1):
USB: gadget: f_midi: fixing a possible double-free in f_midi
Zhengjun Xing (1):
USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 16 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Fearless Coyote
arch/arm/boot/dts/at91sam9g25.dtsi +1 -1
@@ -21,7 +21,7 @@ atmel,mux-mask = < /* A B C */ 0xffffffff 0xffe0399f 0xc000001c /* pioA */ - 0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ + 0x0007ffff 0x00047e3f 0x00000000 /* pioB */ 0x80000000 0x07c0ffff 0xb83fffff /* pioC */ 0x003fffff 0x003f8000 0x00000000 /* pioD */ >;
arch/arm/boot/dts/exynos5250.dtsi +4 -4
@@ -655,7 +655,7 @@ power-domains = <&pd_gsc>; clocks = <&clock CLK_GSCL0>; clock-names = "gscl"; - iommu = <&sysmmu_gsc0>; + iommus = <&sysmmu_gsc0>; }; gsc_1: gsc@13e10000 {
@@ -665,7 +665,7 @@ power-domains = <&pd_gsc>; clocks = <&clock CLK_GSCL1>; clock-names = "gscl"; - iommu = <&sysmmu_gsc1>; + iommus = <&sysmmu_gsc1>; }; gsc_2: gsc@13e20000 {
@@ -675,7 +675,7 @@ power-domains = <&pd_gsc>; clocks = <&clock CLK_GSCL2>; clock-names = "gscl"; - iommu = <&sysmmu_gsc2>; + iommus = <&sysmmu_gsc2>; }; gsc_3: gsc@13e30000 {
@@ -685,7 +685,7 @@ power-domains = <&pd_gsc>; clocks = <&clock CLK_GSCL3>; clock-names = "gscl"; - iommu = <&sysmmu_gsc3>; + iommus = <&sysmmu_gsc3>; }; hdmi: hdmi@14530000 {
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +22 -2
@@ -39,6 +39,24 @@ }; }; + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_5v: regulator-5v { + compatible = "regulator-fixed"; + regulator-name = "fixed-5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + gpio_keys { compatible = "gpio-keys"; pinctrl-names = "default";
@@ -468,12 +486,14 @@ }; &usb1 { - vusb33-supply = <&mt6323_vusb_reg>; + vusb33-supply = <®_3p3v>; + vbus-supply = <®_5v>; status = "okay"; }; &usb2 { - vusb33-supply = <&mt6323_vusb_reg>; + vusb33-supply = <®_3p3v>; + vbus-supply = <®_5v>; status = "okay"; };
arch/arm/boot/dts/sama5d4.dtsi +1 -1
@@ -1379,7 +1379,7 @@ pinctrl@fc06a000 { #address-cells = <1>; #size-cells = <1>; - compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus"; + compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus"; ranges = <0xfc068000 0xfc068000 0x100 0xfc06a000 0xfc06a000 0x4000>; /* WARNING: revisit as pin spec has changed */
arch/arm/mach-exynos/pm.c +1 -5
@@ -271,11 +271,7 @@ static int exynos_cpu0_enter_aftr(void) goto fail;call_firmware_op (cpu_boot,1 ); - -if (soc_is_exynos3250 ()) -dsb_sev (); -else -arch_send_wakeup_ipi_mask (cpumask_of (1 )); +dsb_sev (); } } fail:
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +1 -1
@@ -310,7 +310,7 @@ pinctrl-names = "default", "clk-gate"; bus-width = <8>; - max-frequency = <200000000>; + max-frequency = <100000000>; non-removable; disable-wp; cap-mmc-highspeed;
arch/mips/include/asm/uaccess.h +9 -2
@@ -654,6 +654,13 @@ __clear_user(void __user *addr, __kernel_size_t size) {__kernel_size_t res; +#ifdef CONFIG_CPU_MICROMIPS +/* micromips memset / bzero also clobbers t7 & t8 */ +#define bzero_clobbers "$4", "$5", "$6", __UA_t0, __UA_t1, "$15", "$24", "$31" +#else +#define bzero_clobbers "$4", "$5", "$6", __UA_t0, __UA_t1, "$31" +#endif /* CONFIG_CPU_MICROMIPS */ +if (eva_kernel_access ()) { __asm__ __volatile__( "move\t$4, %1\n\t"
@@ -663,7 +670,7 @@ __clear_user(void __user *addr, __kernel_size_t size) "move\t%0, $6" : "=r" (res) : "r" (addr), "r" (size) - : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31"); + : bzero_clobbers); }else {might_fault (); __asm__ __volatile__(
@@ -674,7 +681,7 @@ __clear_user(void __user *addr, __kernel_size_t size) "move\t%0, $6" : "=r" (res) : "r" (addr), "r" (size) - : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31"); + : bzero_clobbers); }return res;
arch/mips/lib/memset.S +8 -3
@@ -219,7 +219,7 @@ 1: PTR_ADDIU a0, 1 /* fill bytewise */ R10KCBARRIER(0(ra)) bne t1, a0, 1b - sb a1, -1(a0) + EX(sb, a1, -1(a0), .Lsmall_fixup\@) 2: jr ra /* done */ move a2, zero
@@ -252,13 +252,18 @@ PTR_L t0, TI_TASK($28) andi a2, STORMASK LONG_L t0, THREAD_BUADDR(t0) - LONG_ADDU a2, t1 + LONG_ADDU a2, a0 jr ra LONG_SUBU a2, t0 .Llast_fixup\@: jr ra - andi v1, a2, STORMASK + nop + +.Lsmall_fixup\@: + PTR_SUBU a2, t1, a0 + jr ra + PTR_ADDIU a2, 1 .endm
arch/powerpc/include/asm/barrier.h +2 -1
@@ -35,7 +35,8 @@#define rmb () __asm__ __volatile__ ("sync" : : : "memory")#define wmb () __asm__ __volatile__ ("sync" : : : "memory") -#ifdef __SUBARCH_HAS_LWSYNC +/* The sub-arch has lwsync */ +#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC )# define SMPWMB LWSYNC#else # define SMPWMB eieio
arch/powerpc/include/asm/opal.h +3 -0
@@ -21,6 +21,9 @@/* We calculate number of sg entries based on PAGE_SIZE */ #define SG_ENTRIES_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct opal_sg_entry)) +/* Default time to sleep or delay between OPAL_BUSY/OPAL_BUSY_EVENT loops */ +#define OPAL_BUSY_DELAY_MS 10 +/* /sys/firmware/opal */ extern struct kobject *opal_kobj;
arch/powerpc/include/asm/synch.h +0 -4
@@ -6,10 +6,6 @@#include <linux/stringify.h> #include <asm/feature-fixups.h> -#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC ) -#define __SUBARCH_HAS_LWSYNC -#endif -#ifndef __ASSEMBLY__extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup; extern void do_lwsync_fixups(unsigned long value, void *fixup_start,
arch/powerpc/kernel/dt_cpu_ftrs.c +16 -3
@@ -84,6 +84,7 @@ static int hv_mode;static struct {u64 lpcr; +u64 lpcr_clear;u64 hfscr;u64 fscr; } system_registers;
@@ -92,6 +93,8 @@ static void (*init_pmu_registers)(void);static void __restore_cpu_cpufeatures (void ) { +u64 lpcr; +/* * LPCR is restored by the power on engine already. It can be changed * after early init e.g., by radix enable, and we have no unified API
@@ -104,8 +107,10 @@ static void __restore_cpu_cpufeatures(void)* The best we can do to accommodate secondary boot and idle restore * for now is "or" LPCR with existing. */ - -mtspr (SPRN_LPCR , system_registers.lpcr |mfspr (SPRN_LPCR )); + lpcr =mfspr (SPRN_LPCR ); + lpcr |= system_registers.lpcr; + lpcr &= ~system_registers.lpcr_clear; +mtspr (SPRN_LPCR , lpcr);if (hv_mode) {mtspr (SPRN_LPID ,0 );mtspr (SPRN_HFSCR , system_registers.hfscr);
@@ -325,8 +330,9 @@ static int __init feat_enable_mmu_hash_v3(struct dt_cpu_feature *f) {u64 lpcr; + system_registers.lpcr_clear |= (LPCR_ISL |LPCR_UPRT |LPCR_HR ); lpcr =mfspr (SPRN_LPCR ); - lpcr &= ~LPCR_ISL ; + lpcr &= ~(LPCR_ISL |LPCR_UPRT |LPCR_HR );mtspr (SPRN_LPCR , lpcr); cur_cpu_spec->mmu_features |=MMU_FTRS_HASH_BASE ;
@@ -658,6 +664,13 @@ static void __init cpufeatures_setup_start(u32 isa) cur_cpu_spec->cpu_features |=CPU_FTR_ARCH_300 ; cur_cpu_spec->cpu_user_features2 |=PPC_FEATURE2_ARCH_3_00 ; } + +/* +* PKEY was not in the initial base or feature node +* specification, but it should become optional in the next +* cpu feature version sequence. +*/ + cur_cpu_spec->cpu_features |=CPU_FTR_PKEY ; }static bool __init cpufeatures_process_feature (struct dt_cpu_feature *f)
arch/powerpc/kernel/eeh_driver.c +42 -26
168 lines not on this page · raw message
arch/powerpc/kernel/eeh_pe.c +2 -1
@@ -807,7 +807,8 @@ static void eeh_restore_bridge_bars(struct eeh_dev *edev) eeh_ops->write_config (pdn,15 *4 ,4 , edev->config_space[15 ]);/* PCI Command: 0x4 */ - eeh_ops->write_config (pdn,PCI_COMMAND ,4 , edev->config_space[1 ]); + eeh_ops->write_config (pdn,PCI_COMMAND ,4 , edev->config_space[1 ] | +PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER );/* Check the PCIe link is ready */ eeh_bridge_check_link (edev);
arch/powerpc/kernel/kprobes.c +17 -13
@@ -455,29 +455,33 @@ static int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) }kretprobe_assert (ri, orig_ret_address, trampoline_address); - regs->nip = orig_ret_address; +/* -* Make LR point to the orig_ret_address. -* When the 'nop' inside the kretprobe_trampoline -* is optimized, we can do a 'blr' after executing the -* detour buffer code. +* We get here through one of two paths: +* 1. by taking a trap -> kprobe_handler() -> here +* 2. by optprobe branch -> optimized_callback() -> opt_pre_handler() -> here +* +* When going back through (1), we need regs->nip to be setup properly +* as it is used to determine the return address from the trap. +* For (2), since nip is not honoured with optprobes, we instead setup +* the link register properly so that the subsequent 'blr' in +* kretprobe_trampoline jumps back to the right instruction. +* +* For nip, we should set the address to the previous instruction since +* we end up emulating it in kprobe_handler(), which increments the nip +* again. */ + regs->nip = orig_ret_address -4 ; regs->link = orig_ret_address; -reset_current_kprobe ();kretprobe_hash_unlock (current, &flags); -preempt_enable_no_resched ();hlist_for_each_entry_safe (ri, tmp, &empty_rp, hlist) {hlist_del (&ri->hlist);kfree (ri); } -/* -* By returning a non-zero value, we are telling -* kprobe_handler() that we don't want the post_handler -* to run (and have re-enabled preemption) -*/ -return 1 ; + +return 0 ; }NOKPROBE_SYMBOL (trampoline_probe_handler);
arch/powerpc/kernel/machine_kexec_file_64.c +1 -1
@@ -43,7 +43,7 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,/* We don't support crash kernels yet. */ if (image->type ==KEXEC_TYPE_CRASH ) -return -ENOTSUPP ; +return -EOPNOTSUPP ;for (i =0 ; i <ARRAY_SIZE (kexec_file_loaders); i++) { fops = kexec_file_loaders[i];
arch/powerpc/lib/feature-fixups.c +1 -1
@@ -55,7 +55,7 @@ static int patch_alt_instruction(unsigned int *src, unsigned int *dest,unsigned int *target = (unsigned int *)branch_target (src);/* Branch within the section doesn't need translating */ -if (target < alt_start || target >= alt_end) { +if (target < alt_start || target > alt_end) { instr =translate_branch (dest, src);if (!instr)return 1 ;
arch/powerpc/mm/hash_utils_64.c +6 -0
@@ -875,6 +875,12 @@ static void __init htab_initialize(void)/* Using a hypervisor which owns the htab */ htab_address =NULL ; _SDR1 =0 ; +/* +* On POWER9, we need to do a H_REGISTER_PROC_TBL hcall +* to inform the hypervisor that we wish to use the HPT. +*/ +if (cpu_has_feature (CPU_FTR_ARCH_300 )) +register_process_table (0 ,0 ,0 );#ifdef CONFIG_FA_DUMP /* * If firmware assisted dump is active firmware preserves
arch/powerpc/mm/tlb-radix.c +2 -3
@@ -33,13 +33,12 @@ static inline void tlbiel_radix_set_isa300(unsigned int set, unsigned int is, {unsigned long rb;unsigned long rs; -unsigned int r =1 ;/* radix format */ rb = (set <<PPC_BITLSHIFT (51 )) | (is <<PPC_BITLSHIFT (53 )); rs = ((unsigned long )pid <<PPC_BITLSHIFT (31 )); - asm volatile(PPC_TLBIEL(%0, %1, %2, %3, %4) - : : "r"(rb), "r"(rs), "i"(ric), "i"(prs), "r"(r) + asm volatile(PPC_TLBIEL(%0, %1, %2, %3, 1) + : : "r"(rb), "r"(rs), "i"(ric), "i"(prs) : "memory"); }
arch/powerpc/platforms/powernv/opal-nvram.c +10 -1
@@ -11,6 +11,7 @@#define DEBUG +#include <linux/delay.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/of.h>
@@ -56,9 +57,17 @@ static ssize_t opal_nvram_write(char *buf, size_t count, loff_t *index)while (rc ==OPAL_BUSY || rc ==OPAL_BUSY_EVENT ) { rc =opal_write_nvram (__pa (buf), count, off); -if (rc ==OPAL_BUSY_EVENT ) +if (rc ==OPAL_BUSY_EVENT ) { +msleep (OPAL_BUSY_DELAY_MS );opal_poll_events (NULL ); + }else if (rc ==OPAL_BUSY ) { +msleep (OPAL_BUSY_DELAY_MS ); + } } + +if (rc) +return -EIO ; + *index += count;return count; }
arch/powerpc/platforms/pseries/lpar.c +6 -2
@@ -726,15 +726,18 @@ static int pseries_lpar_resize_hpt(unsigned long shift)return 0 ; } -/* Actually only used for radix, so far */ static int pseries_lpar_register_process_table (unsigned long base,unsigned long page_size,unsigned long table_size) {long rc; -unsigned long flags =PROC_TABLE_NEW ; +unsigned long flags =0 ; +if (table_size) + flags |=PROC_TABLE_NEW ;if (radix_enabled ()) flags |=PROC_TABLE_RADIX |PROC_TABLE_GTSE ; +else + flags |=PROC_TABLE_HPT_SLB ;for (;;) { rc =plpar_hcall_norets (H_REGISTER_PROC_TBL , flags, base, page_size, table_size);
@@ -760,6 +763,7 @@ void __init hpte_init_pseries(void) mmu_hash_ops.flush_hash_range = pSeries_lpar_flush_hash_range; mmu_hash_ops.hpte_clear_all = pseries_hpte_clear_all; mmu_hash_ops.hugepage_invalidate = pSeries_lpar_hugepage_invalidate; + register_process_table = pseries_lpar_register_process_table;if (firmware_has_feature (FW_FEATURE_HPT_RESIZE )) mmu_hash_ops.resize_hpt = pseries_lpar_resize_hpt;
arch/powerpc/sysdev/xive/native.c +4 -0
@@ -389,6 +389,10 @@ static void xive_native_setup_cpu(unsigned int cpu, struct xive_cpu *xc)if (xive_pool_vps ==XIVE_INVALID_VP )return ; +/* Check if pool VP already active, if it is, pull it */ +if (in_be32 (xive_tima +TM_QW2_HV_POOL +TM_WORD2 ) &TM_QW2W2_VP ) +in_be64 (xive_tima +TM_SPC_PULL_POOL_CTX ); +/* Enable the pool VP */ vp = xive_pool_vps + cpu;pr_debug ("CPU %d setting up pool VP 0x%x\n" , cpu, vp);
arch/s390/Kconfig +4 -4
@@ -289,12 +289,12 @@ config MARCH_Z13 older machines. config MARCH_Z14 - bool "IBM z14" + bool "IBM z14 ZR1 and z14" select HAVE_MARCH_Z14_FEATURES help - Select this to enable optimizations for IBM z14 (3906 series). - The kernel will be slightly faster but will not work on older - machines. + Select this to enable optimizations for IBM z14 ZR1 and z14 (3907 + and 3906 series). The kernel will be slightly faster but will not + work on older machines. endchoice
arch/s390/hypfs/inode.c +1 -1
@@ -320,7 +320,7 @@ static void hypfs_kill_super(struct super_block *sb)if (sb->s_root)hypfs_delete_tree (sb->s_root); -if (sb_info->update_file) +if (sb_info && sb_info->update_file)hypfs_remove (sb_info->update_file);kfree (sb->s_fs_info); sb->s_fs_info =NULL ;
arch/s390/kernel/perf_cpum_cf_events.c +1 -0
@@ -583,6 +583,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void) model = cpumcf_z13_pmu_event_attr;break ;case 0x3906 : +case 0x3907 : model = cpumcf_z14_pmu_event_attr;break ;default :
arch/s390/kernel/setup.c +1 -0
@@ -819,6 +819,7 @@ static int __init setup_hwcaps(void)strcpy (elf_platform,"z13" );break ;case 0x3906 : +case 0x3907 :strcpy (elf_platform,"z14" );break ; }
arch/um/os-Linux/file.c +1 -0
@@ -12,6 +12,7 @@#include <sys/mount.h> #include <sys/socket.h> #include <sys/stat.h> +#include <sys/sysmacros.h> #include <sys/un.h> #include <sys/types.h> #include <os.h>
arch/um/os-Linux/signal.c +2 -1
@@ -16,6 +16,7 @@#include <os.h> #include <sysdep/mcontext.h> #include <um_malloc.h> +#include <sys/ucontext.h> void (*sig_info[NSIG ])(int ,struct siginfo *,struct uml_pt_regs *) = { [SIGTRAP ] = relay_signal,
@@ -159,7 +160,7 @@ static void (*handlers[_NSIG])(int sig, struct siginfo *si, mcontext_t *mc) = {static void hard_handler (int sig,siginfo_t *si,void *p) { -struct ucontext *uc = p; +ucontext_t *uc = p;mcontext_t *mc = &uc->uc_mcontext;unsigned long pending =1UL << sig;
arch/x86/um/stub_segv.c +2 -1
@@ -6,11 +6,12 @@#include <sysdep/stub.h> #include <sysdep/faultinfo.h> #include <sysdep/mcontext.h> +#include <sys/ucontext.h> void __attribute__ ((__section__ (".__syscall_stub" )))stub_segv_handler (int sig,siginfo_t *info,void *p) { -struct ucontext *uc = p; +ucontext_t *uc = p;GET_FAULTINFO_FROM_MC (*((struct faultinfo *)STUB_DATA ), &uc->uc_mcontext);
arch/x86/xen/enlighten_pv.c +4 -4
@@ -1259,10 +1259,6 @@ asmlinkage __visible void __init xen_start_kernel(void)*/ __userpte_alloc_gfp &= ~__GFP_HIGHMEM; -/* Work out if we support NX */ -get_cpu_cap (&boot_cpu_data); -x86_configure_nx (); -/* Get mfn list */ xen_build_dynamic_phys_to_machine ();
@@ -1272,6 +1268,10 @@ asmlinkage __visible void __init xen_start_kernel(void)*/ xen_setup_gdt (0 ); +/* Work out if we support NX */ +get_cpu_cap (&boot_cpu_data); +x86_configure_nx (); +xen_init_irq_ops ();/* Let's presume PV guests always boot on vCPU with id 0. */
drivers/acpi/nfit/core.c +31 -28
122 lines not on this page · raw message
drivers/acpi/nfit/nfit.h +2 -3
@@ -171,9 +171,8 @@ struct nfit_mem {struct resource *flush_wpq;unsigned long dsm_mask;int family; - u32 has_lsi:1; - u32 has_lsr:1; - u32 has_lsw:1; +bool has_lsr; +bool has_lsw; };struct acpi_nfit_desc {
drivers/acpi/video_detect.c +9 -0
@@ -219,6 +219,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { "3570R/370R/470R/450R/510R/4450RV"), }, }, + { +/* https://bugzilla.redhat.com/show_bug.cgi?id=1557060 */ + .callback = video_detect_force_video, + .ident = "SAMSUNG 670Z5E", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"SAMSUNG ELECTRONICS CO., LTD." ), + DMI_MATCH(DMI_PRODUCT_NAME, "670Z5E"), + }, + }, {/* https://bugzilla.redhat.com/show_bug.cgi?id=1094948 */ .callback = video_detect_force_video,
drivers/base/regmap/regmap.c +1 -1
@@ -1831,7 +1831,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,return -EINVAL ;if (val_len % map->format.val_bytes)return -EINVAL ; -if (map->max_raw_write && map->max_raw_write > val_len) +if (map->max_raw_write && map->max_raw_write < val_len)return -E2BIG ; map->lock (map->lock_arg);
drivers/bluetooth/hci_bcm.c +15 -5
@@ -126,6 +126,10 @@ struct bcm_data {static DEFINE_MUTEX (bcm_device_lock);static LIST_HEAD (bcm_device_list); +static int irq_polarity =-1 ; +module_param (irq_polarity, int,0444 ); +MODULE_PARM_DESC (irq_polarity,"IRQ polarity 0: active-high 1: active-low" ); +static inline void host_set_baudrate (struct hci_uart *hu,unsigned int speed) {if (hu->serdev)
@@ -975,11 +979,17 @@ static int bcm_acpi_probe(struct bcm_device *dev) }acpi_dev_free_resource_list (&resources); - dmi_id =dmi_first_match (bcm_active_low_irq_dmi_table); -if (dmi_id) { -dev_warn (dev->dev,"%s: Overwriting IRQ polarity to active low" , - dmi_id->ident); - dev->irq_active_low = true; +if (irq_polarity !=-1 ) { + dev->irq_active_low = irq_polarity; +dev_warn (dev->dev,"Overwriting IRQ polarity to active %s by module-param\n" , + dev->irq_active_low ?"low" :"high" ); + }else { + dmi_id =dmi_first_match (bcm_active_low_irq_dmi_table); +if (dmi_id) { +dev_warn (dev->dev,"%s: Overwriting IRQ polarity to active low" , + dmi_id->ident); + dev->irq_active_low = true; + } }return 0 ;
drivers/char/random.c +71 -13
163 lines not on this page · raw message
drivers/char/tpm/tpm-interface.c +4 -0
@@ -969,6 +969,10 @@ int tpm_do_selftest(struct tpm_chip *chip) loops =jiffies_to_msecs (duration) / delay_msec; rc =tpm_continue_selftest (chip); +if (rc ==TPM_ERR_INVALID_POSTINIT ) { + chip->flags |=TPM_CHIP_FLAG_ALWAYS_POWERED ; +dev_info (&chip->dev,"TPM not ready (%d)\n" , rc); + }/* This may fail if there was no TPM driver during a suspend/resume * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST) */
drivers/clk/bcm/clk-bcm2835.c +5 -3
@@ -602,9 +602,7 @@ static void bcm2835_pll_off(struct clk_hw *hw)const struct bcm2835_pll_data *data = pll->data;spin_lock (&cprman->regs_lock); -cprman_write (cprman, data->cm_ctrl_reg, -cprman_read (cprman, data->cm_ctrl_reg) | -CM_PLL_ANARST ); +cprman_write (cprman, data->cm_ctrl_reg,CM_PLL_ANARST );cprman_write (cprman, data->a2w_ctrl_reg,cprman_read (cprman, data->a2w_ctrl_reg) |A2W_PLL_CTRL_PWRDN );
@@ -640,6 +638,10 @@ static int bcm2835_pll_on(struct clk_hw *hw)cpu_relax (); } +cprman_write (cprman, data->a2w_ctrl_reg, +cprman_read (cprman, data->a2w_ctrl_reg) | +A2W_PLL_CTRL_PRST_DISABLE ); +return 0 ; }
drivers/clk/mediatek/clk-mt2701.c +8 -7
@@ -148,6 +148,7 @@ static const struct mtk_fixed_factor top_fixed_divs[] = {FACTOR (CLK_TOP_CLK26M_D8 ,"clk26m_d8" ,"clk26m" ,1 ,8 ),FACTOR (CLK_TOP_32K_INTERNAL ,"32k_internal" ,"clk26m" ,1 ,793 ),FACTOR (CLK_TOP_32K_EXTERNAL ,"32k_external" ,"rtc32k" ,1 ,1 ), + FACTOR(CLK_TOP_AXISEL_D4, "axisel_d4", "axi_sel", 1, 4), }; static const char * const axi_parents[] = {
@@ -857,13 +858,13 @@ static const struct mtk_gate peri_clks[] = {GATE_PERI0 (CLK_PERI_USB1 ,"usb1_ck" ,"usb20_sel" ,11 ),GATE_PERI0 (CLK_PERI_USB0 ,"usb0_ck" ,"usb20_sel" ,10 ),GATE_PERI0 (CLK_PERI_PWM ,"pwm_ck" ,"axi_sel" ,9 ), -GATE_PERI0 (CLK_PERI_PWM7 ,"pwm7_ck" ,"axi_sel" ,8 ), -GATE_PERI0 (CLK_PERI_PWM6 ,"pwm6_ck" ,"axi_sel" ,7 ), -GATE_PERI0 (CLK_PERI_PWM5 ,"pwm5_ck" ,"axi_sel" ,6 ), -GATE_PERI0 (CLK_PERI_PWM4 ,"pwm4_ck" ,"axi_sel" ,5 ), -GATE_PERI0 (CLK_PERI_PWM3 ,"pwm3_ck" ,"axi_sel" ,4 ), -GATE_PERI0 (CLK_PERI_PWM2 ,"pwm2_ck" ,"axi_sel" ,3 ), -GATE_PERI0 (CLK_PERI_PWM1 ,"pwm1_ck" ,"axi_sel" ,2 ), +GATE_PERI0 (CLK_PERI_PWM7 ,"pwm7_ck" ,"axisel_d4" ,8 ), +GATE_PERI0 (CLK_PERI_PWM6 ,"pwm6_ck" ,"axisel_d4" ,7 ), +GATE_PERI0 (CLK_PERI_PWM5 ,"pwm5_ck" ,"axisel_d4" ,6 ), +GATE_PERI0 (CLK_PERI_PWM4 ,"pwm4_ck" ,"axisel_d4" ,5 ), +GATE_PERI0 (CLK_PERI_PWM3 ,"pwm3_ck" ,"axisel_d4" ,4 ), +GATE_PERI0 (CLK_PERI_PWM2 ,"pwm2_ck" ,"axisel_d4" ,3 ), +GATE_PERI0 (CLK_PERI_PWM1 ,"pwm1_ck" ,"axisel_d4" ,2 ),GATE_PERI0 (CLK_PERI_THERM ,"therm_ck" ,"axi_sel" ,1 ), GATE_PERI0(CLK_PERI_NFI, "nfi_ck", "nfi2x_sel", 0),
drivers/clk/mvebu/armada-38x.c +7 -7
@@ -46,11 +46,11 @@ static u32 __init armada_38x_get_tclk_freq(void __iomem *sar) }static const u32 armada_38x_cpu_frequencies[]__initconst = { -0 ,0 ,0 ,0 , -1066 *1000 *1000 ,0 ,0 ,0 , +666 *1000 *1000 ,0 ,800 *1000 *1000 ,0 , +1066 *1000 *1000 ,0 ,1200 *1000 *1000 ,0 ,1332 *1000 *1000 ,0 ,0 ,0 ,1600 *1000 *1000 ,0 ,0 ,0 , -1866 *1000 *1000 , +1866 *1000 *1000 ,0 ,0 ,2000 *1000 *1000 , };static u32 __init armada_38x_get_cpu_freq (void __iomem *sar)
@@ -76,11 +76,11 @@ static const struct coreclk_ratio armada_38x_coreclk_ratios[] __initconst = { };static const int armada_38x_cpu_l2_ratios[32 ][2 ]__initconst = { - {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, - {1 ,2 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, - {1 ,2 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, + {1 ,2 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, + {1 ,2 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, + {1 ,2 }, {0 ,1 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 },
@@ -91,7 +91,7 @@ static const int armada_38x_cpu_ddr_ratios[32][2] __initconst = { {1, 2}, {0, 1}, {0, 1}, {0, 1}, {1, 2}, {0, 1}, {0, 1}, {0, 1}, {1, 2}, {0, 1}, {0, 1}, {0, 1}, - {1, 2}, {0, 1}, {0, 1}, {0, 1}, + {1, 2}, {0, 1}, {0, 1}, {7, 15}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1},
drivers/clk/renesas/clk-sh73a0.c +3 -3
@@ -46,7 +46,7 @@ struct div4_clk {unsigned int shift; }; -static struct div4_clk div4_clks[] = { +static const struct div4_clk div4_clks[] = { {"zg" ,"pll0" ,CPG_FRQCRA ,16 }, {"m3" ,"pll1" ,CPG_FRQCRA ,12 }, {"b" ,"pll1" ,CPG_FRQCRA ,8 },
@@ -79,7 +79,7 @@ sh73a0_cpg_register_clock(struct device_node *np, struct sh73a0_cpg *cpg, {const struct clk_div_table *table =NULL ;unsigned int shift, reg, width; -const char *parent_name; +const char *parent_name =NULL ;unsigned int mult =1 ;unsigned int div =1 ;
@@ -135,7 +135,7 @@ sh73a0_cpg_register_clock(struct device_node *np, struct sh73a0_cpg *cpg, shift =24 ; width =5 ; }else { -struct div4_clk *c; +const struct div4_clk *c;for (c = div4_clks; c->name; c++) {if (!strcmp (name, c->name)) {
drivers/clk/tegra/clk-emc.c +1 -1
@@ -515,7 +515,7 @@ struct clk *tegra_clk_register_emc(void __iomem *base, struct device_node *np, init.name ="emc" ; init.ops = &tegra_clk_emc_ops; - init.flags =0 ; + init.flags =CLK_IS_CRITICAL ; init.parent_names = emc_parent_clk_names; init.num_parents =ARRAY_SIZE (emc_parent_clk_names);
drivers/clk/tegra/clk-tegra-periph.c +1 -1
@@ -830,7 +830,7 @@ static struct tegra_periph_init_data gate_clks[] = {GATE ("xusb_host" ,"xusb_host_src" ,89 ,0 , tegra_clk_xusb_host,0 ),GATE ("xusb_ss" ,"xusb_ss_src" ,156 ,0 , tegra_clk_xusb_ss,0 ),GATE ("xusb_dev" ,"xusb_dev_src" ,95 ,0 , tegra_clk_xusb_dev,0 ), -GATE ("emc" ,"emc_mux" ,57 ,0 , tegra_clk_emc,CLK_IGNORE_UNUSED ), +GATE ("emc" ,"emc_mux" ,57 ,0 , tegra_clk_emc,CLK_IS_CRITICAL ),GATE ("sata_cold" ,"clk_m" ,129 ,TEGRA_PERIPH_ON_APB , tegra_clk_sata_cold,0 ),GATE ("ispa" ,"isp" ,23 ,0 , tegra_clk_ispa,0 ), GATE("ispb", "isp", 3, 0, tegra_clk_ispb, 0),
drivers/clk/tegra/clk-tegra-super-gen4.c +5 -3
@@ -125,7 +125,8 @@ static void __init tegra_sclk_init(void __iomem *clk_base,/* SCLK */ dt_clk =tegra_lookup_dt_id (tegra_clk_sclk, tegra_clks);if (dt_clk) { - clk =clk_register_divider (NULL ,"sclk" ,"sclk_mux" ,0 , + clk =clk_register_divider (NULL ,"sclk" ,"sclk_mux" , +CLK_IS_CRITICAL , clk_base +SCLK_DIVIDER ,0 ,8 ,0 , &sysrate_lock); *dt_clk = clk;
@@ -137,7 +138,8 @@ static void __init tegra_sclk_init(void __iomem *clk_base, clk =tegra_clk_register_super_mux ("sclk" , gen_info->sclk_parents, gen_info->num_sclk_parents, -CLK_SET_RATE_PARENT , +CLK_SET_RATE_PARENT | +CLK_IS_CRITICAL , clk_base +SCLK_BURST_POLICY ,0 ,4 ,0 ,0 ,NULL ); *dt_clk = clk;
@@ -151,7 +153,7 @@ static void __init tegra_sclk_init(void __iomem *clk_base, clk_base +SYSTEM_CLK_RATE ,4 ,2 ,0 , &sysrate_lock); clk =clk_register_gate (NULL ,"hclk" ,"hclk_div" , -CLK_SET_RATE_PARENT |CLK_IGNORE_UNUSED , +CLK_SET_RATE_PARENT |CLK_IS_CRITICAL , clk_base +SYSTEM_CLK_RATE ,7 ,CLK_GATE_SET_TO_DISABLE , &sysrate_lock); *dt_clk = clk;
drivers/clk/tegra/clk-tegra114.c +1 -2
@@ -955,8 +955,7 @@ static void __init tegra114_pll_init(void __iomem *clk_base,/* PLLM */ clk =tegra_clk_register_pllm ("pll_m" ,"pll_ref" , clk_base, pmc, -CLK_IGNORE_UNUSED |CLK_SET_RATE_GATE , - &pll_m_params,NULL ); +CLK_SET_RATE_GATE , &pll_m_params,NULL ); clks[TEGRA114_CLK_PLL_M ] = clk;/* PLLM_OUT1 */
drivers/clk/tegra/clk-tegra124.c +3 -4
@@ -1089,8 +1089,7 @@ static void __init tegra124_pll_init(void __iomem *clk_base,/* PLLM */ clk =tegra_clk_register_pllm ("pll_m" ,"pll_ref" , clk_base, pmc, -CLK_IGNORE_UNUSED |CLK_SET_RATE_GATE , - &pll_m_params,NULL ); +CLK_SET_RATE_GATE , &pll_m_params,NULL );clk_register_clkdev (clk,"pll_m" ,NULL ); clks[TEGRA124_CLK_PLL_M ] = clk;
@@ -1099,7 +1098,7 @@ static void __init tegra124_pll_init(void __iomem *clk_base, clk_base +PLLM_OUT ,0 ,TEGRA_DIVIDER_ROUND_UP , 8, 8, 1, NULL); clk =tegra_clk_register_pll_out ("pll_m_out1" ,"pll_m_out1_div" , - clk_base +PLLM_OUT ,1 ,0 ,CLK_IGNORE_UNUSED | + clk_base +PLLM_OUT ,1 ,0 ,CLK_SET_RATE_PARENT ,0 ,NULL );clk_register_clkdev (clk,"pll_m_out1" ,NULL ); clks[TEGRA124_CLK_PLL_M_OUT1 ] = clk;
@@ -1272,7 +1271,7 @@ static struct tegra_clk_init_table common_init_table[] __initdata = { { TEGRA124_CLK_HOST1X, TEGRA124_CLK_PLL_P, 136000000, 1 }, { TEGRA124_CLK_DSIALP, TEGRA124_CLK_PLL_P, 68000000, 0 }, { TEGRA124_CLK_DSIBLP, TEGRA124_CLK_PLL_P, 68000000, 0 }, - { TEGRA124_CLK_SCLK, TEGRA124_CLK_PLL_P_OUT2, 102000000, 1 }, + { TEGRA124_CLK_SCLK, TEGRA124_CLK_PLL_P_OUT2, 102000000, 0 }, { TEGRA124_CLK_DFLL_SOC, TEGRA124_CLK_PLL_P, 51000000, 1 }, { TEGRA124_CLK_DFLL_REF, TEGRA124_CLK_PLL_P, 51000000, 1 }, { TEGRA124_CLK_PLL_C, TEGRA124_CLK_CLK_MAX, 768000000, 0 },
drivers/clk/tegra/clk-tegra20.c +10 -13
@@ -576,6 +576,7 @@ static struct tegra_clk tegra20_clks[tegra_clk_max] __initdata = { [tegra_clk_afi] = { .dt_id = TEGRA20_CLK_AFI, .present = true }, [tegra_clk_fuse] = { .dt_id = TEGRA20_CLK_FUSE, .present = true }, [tegra_clk_kfuse] = { .dt_id = TEGRA20_CLK_KFUSE, .present = true }, + [tegra_clk_emc] = { .dt_id = TEGRA20_CLK_EMC, .present = true }, };static unsigned long tegra20_clk_measure_input_freq (void )
@@ -651,8 +652,7 @@ static void tegra20_pll_init(void)/* PLLM */ clk =tegra_clk_register_pll ("pll_m" ,"pll_ref" , clk_base,NULL , -CLK_IGNORE_UNUSED |CLK_SET_RATE_GATE , - &pll_m_params,NULL ); +CLK_SET_RATE_GATE , &pll_m_params,NULL ); clks[TEGRA20_CLK_PLL_M ] = clk;/* PLLM_OUT1 */
@@ -660,7 +660,7 @@ static void tegra20_pll_init(void) clk_base +PLLM_OUT ,0 ,TEGRA_DIVIDER_ROUND_UP , 8, 8, 1, NULL); clk =tegra_clk_register_pll_out ("pll_m_out1" ,"pll_m_out1_div" , - clk_base +PLLM_OUT ,1 ,0 ,CLK_IGNORE_UNUSED | + clk_base +PLLM_OUT ,1 ,0 ,CLK_SET_RATE_PARENT ,0 ,NULL ); clks[TEGRA20_CLK_PLL_M_OUT1 ] = clk;
@@ -723,7 +723,8 @@ static void tegra20_super_clk_init(void)/* SCLK */ clk =tegra_clk_register_super_mux ("sclk" , sclk_parents, -ARRAY_SIZE (sclk_parents),CLK_SET_RATE_PARENT , +ARRAY_SIZE (sclk_parents), +CLK_SET_RATE_PARENT |CLK_IS_CRITICAL , clk_base +SCLK_BURST_POLICY ,0 ,4 ,0 ,0 ,NULL ); clks[TEGRA20_CLK_SCLK ] = clk;
@@ -814,9 +815,6 @@ static void __init tegra20_periph_clk_init(void)CLK_SET_RATE_NO_REPARENT , clk_base +CLK_SOURCE_EMC , 30, 2, 0, &emc_lock); - clk =tegra_clk_register_periph_gate ("emc" ,"emc_mux" ,0 , clk_base,0 , -57 , periph_clk_enb_refcnt); - clks[TEGRA20_CLK_EMC ] = clk; clk =tegra_clk_register_mc ("mc" ,"emc_mux" , clk_base +CLK_SOURCE_EMC , &emc_lock);
@@ -1019,13 +1017,12 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA20_CLK_PLL_P_OUT2, TEGRA20_CLK_CLK_MAX, 48000000, 1 }, { TEGRA20_CLK_PLL_P_OUT3, TEGRA20_CLK_CLK_MAX, 72000000, 1 }, { TEGRA20_CLK_PLL_P_OUT4, TEGRA20_CLK_CLK_MAX, 24000000, 1 }, - { TEGRA20_CLK_PLL_C, TEGRA20_CLK_CLK_MAX, 600000000, 1 }, - { TEGRA20_CLK_PLL_C_OUT1, TEGRA20_CLK_CLK_MAX, 216000000, 1 }, - { TEGRA20_CLK_SCLK, TEGRA20_CLK_PLL_C_OUT1, 0, 1 }, - { TEGRA20_CLK_HCLK, TEGRA20_CLK_CLK_MAX, 0, 1 }, - { TEGRA20_CLK_PCLK, TEGRA20_CLK_CLK_MAX, 60000000, 1 }, + { TEGRA20_CLK_PLL_C, TEGRA20_CLK_CLK_MAX, 600000000, 0 }, + { TEGRA20_CLK_PLL_C_OUT1, TEGRA20_CLK_CLK_MAX, 216000000, 0 }, + { TEGRA20_CLK_SCLK, TEGRA20_CLK_PLL_C_OUT1, 0, 0 }, + { TEGRA20_CLK_HCLK, TEGRA20_CLK_CLK_MAX, 0, 0 }, + { TEGRA20_CLK_PCLK, TEGRA20_CLK_CLK_MAX, 60000000, 0 }, { TEGRA20_CLK_CSITE, TEGRA20_CLK_CLK_MAX, 0, 1 }, - { TEGRA20_CLK_EMC, TEGRA20_CLK_CLK_MAX, 0, 1 }, { TEGRA20_CLK_CCLK, TEGRA20_CLK_CLK_MAX, 0, 1 }, { TEGRA20_CLK_UARTA, TEGRA20_CLK_PLL_P, 0, 0 }, { TEGRA20_CLK_UARTB, TEGRA20_CLK_PLL_P, 0, 0 },
drivers/clk/tegra/clk-tegra210.c +1 -2
@@ -3025,7 +3025,7 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA210_CLK_I2S4, TEGRA210_CLK_PLL_A_OUT0, 11289600, 0 }, { TEGRA210_CLK_HOST1X, TEGRA210_CLK_PLL_P, 136000000, 1 }, { TEGRA210_CLK_SCLK_MUX, TEGRA210_CLK_PLL_P, 0, 1 }, - { TEGRA210_CLK_SCLK, TEGRA210_CLK_CLK_MAX, 102000000, 1 }, + { TEGRA210_CLK_SCLK, TEGRA210_CLK_CLK_MAX, 102000000, 0 }, { TEGRA210_CLK_DFLL_SOC, TEGRA210_CLK_PLL_P, 51000000, 1 }, { TEGRA210_CLK_DFLL_REF, TEGRA210_CLK_PLL_P, 51000000, 1 }, { TEGRA210_CLK_SBC4, TEGRA210_CLK_PLL_P, 12000000, 1 },
@@ -3040,7 +3040,6 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA210_CLK_XUSB_DEV_SRC, TEGRA210_CLK_PLL_P_OUT_XUSB, 102000000, 0 }, { TEGRA210_CLK_SATA, TEGRA210_CLK_PLL_P, 104000000, 0 }, { TEGRA210_CLK_SATA_OOB, TEGRA210_CLK_PLL_P, 204000000, 0 }, - { TEGRA210_CLK_EMC, TEGRA210_CLK_CLK_MAX, 0, 1 }, { TEGRA210_CLK_MSELECT, TEGRA210_CLK_CLK_MAX, 0, 1 }, { TEGRA210_CLK_CSITE, TEGRA210_CLK_CLK_MAX, 0, 1 }, /* TODO find a way to enable this on-demand */
drivers/clk/tegra/clk-tegra30.c +4 -10
@@ -819,6 +819,7 @@ static struct tegra_clk tegra30_clks[tegra_clk_max] __initdata = { [tegra_clk_pll_a] = { .dt_id = TEGRA30_CLK_PLL_A, .present = true }, [tegra_clk_pll_a_out0] = { .dt_id = TEGRA30_CLK_PLL_A_OUT0, .present = true }, [tegra_clk_cec] = { .dt_id = TEGRA30_CLK_CEC, .present = true }, + [tegra_clk_emc] = { .dt_id = TEGRA30_CLK_EMC, .present = true }, };static const char *pll_e_parents[] = {"pll_ref" ,"pll_p" };
@@ -843,8 +844,7 @@ static void __init tegra30_pll_init(void)/* PLLM */ clk =tegra_clk_register_pll ("pll_m" ,"pll_ref" , clk_base, pmc_base, -CLK_IGNORE_UNUSED |CLK_SET_RATE_GATE , - &pll_m_params,NULL ); +CLK_SET_RATE_GATE , &pll_m_params,NULL ); clks[TEGRA30_CLK_PLL_M ] = clk;/* PLLM_OUT1 */
@@ -852,7 +852,7 @@ static void __init tegra30_pll_init(void) clk_base +PLLM_OUT ,0 ,TEGRA_DIVIDER_ROUND_UP , 8, 8, 1, NULL); clk =tegra_clk_register_pll_out ("pll_m_out1" ,"pll_m_out1_div" , - clk_base +PLLM_OUT ,1 ,0 ,CLK_IGNORE_UNUSED | + clk_base +PLLM_OUT ,1 ,0 ,CLK_SET_RATE_PARENT ,0 ,NULL ); clks[TEGRA30_CLK_PLL_M_OUT1 ] = clk;
@@ -990,7 +990,7 @@ static void __init tegra30_super_clk_init(void)/* SCLK */ clk =tegra_clk_register_super_mux ("sclk" , sclk_parents,ARRAY_SIZE (sclk_parents), -CLK_SET_RATE_PARENT , +CLK_SET_RATE_PARENT |CLK_IS_CRITICAL , clk_base +SCLK_BURST_POLICY ,0 ,4 ,0 ,0 ,NULL ); clks[TEGRA30_CLK_SCLK ] = clk;
@@ -1060,9 +1060,6 @@ static void __init tegra30_periph_clk_init(void)CLK_SET_RATE_NO_REPARENT , clk_base +CLK_SOURCE_EMC , 30, 2, 0, &emc_lock); - clk =tegra_clk_register_periph_gate ("emc" ,"emc_mux" ,0 , clk_base,0 , -57 , periph_clk_enb_refcnt); - clks[TEGRA30_CLK_EMC ] = clk; clk =tegra_clk_register_mc ("mc" ,"emc_mux" , clk_base +CLK_SOURCE_EMC , &emc_lock);
@@ -1252,10 +1249,7 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA30_CLK_SDMMC1, TEGRA30_CLK_PLL_P, 48000000, 0 }, { TEGRA30_CLK_SDMMC2, TEGRA30_CLK_PLL_P, 48000000, 0 }, { TEGRA30_CLK_SDMMC3, TEGRA30_CLK_PLL_P, 48000000, 0 }, - { TEGRA30_CLK_PLL_M, TEGRA30_CLK_CLK_MAX, 0, 1 }, - { TEGRA30_CLK_PCLK, TEGRA30_CLK_CLK_MAX, 0, 1 }, { TEGRA30_CLK_CSITE, TEGRA30_CLK_CLK_MAX, 0, 1 }, - { TEGRA30_CLK_EMC, TEGRA30_CLK_CLK_MAX, 0, 1 }, { TEGRA30_CLK_MSELECT, TEGRA30_CLK_CLK_MAX, 0, 1 }, { TEGRA30_CLK_SBC1, TEGRA30_CLK_PLL_P, 100000000, 0 }, { TEGRA30_CLK_SBC2, TEGRA30_CLK_PLL_P, 100000000, 0 },
drivers/cpufreq/armada-37xx-cpufreq.c +2 -0
@@ -202,6 +202,7 @@ static int __init armada37xx_cpufreq_driver_init(void) cur_frequency =clk_get_rate (clk);if (!cur_frequency) {dev_err (cpu_dev,"Failed to get clock rate for CPU\n" ); +clk_put (clk);return -EINVAL ; }
@@ -210,6 +211,7 @@ static int __init armada37xx_cpufreq_driver_init(void)return -EINVAL ;armada37xx_cpufreq_dvfs_setup (nb_pm_base, clk, dvfs->divider); +clk_put (clk);for (load_lvl =ARMADA_37XX_DVFS_LOAD_0 ; load_lvl <LOAD_LEVEL_NR ; load_lvl++) {
drivers/cpufreq/cppc_cpufreq.c +3 -0
@@ -20,6 +20,7 @@#include <linux/cpu.h> #include <linux/cpufreq.h> #include <linux/dmi.h> +#include <linux/time.h> #include <linux/vmalloc.h> #include <asm/unaligned.h>
@@ -162,6 +163,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cpuinfo.max_freq = cppc_dmi_max_khz; policy->cpuinfo.transition_latency =cppc_get_transition_latency (cpu_num); + policy->transition_delay_us =cppc_get_transition_latency (cpu_num) / +NSEC_PER_USEC ; policy->shared_type = cpu->shared_type;if (policy->shared_type ==CPUFREQ_SHARED_TYPE_ANY )
drivers/dax/device.c +2 -0
@@ -19,6 +19,7 @@#include <linux/dax.h> #include <linux/fs.h> #include <linux/mm.h> +#include <linux/mman.h> #include "dax-private.h" #include "dax.h"
@@ -534,6 +535,7 @@ static const struct file_operations dax_fops = { .release = dax_release, .get_unmapped_area = dax_get_unmapped_area, .mmap = dax_mmap, + .mmap_supported_flags = MAP_SYNC, };static void dev_dax_release (struct device *dev)
drivers/dma/at_xdmac.c +2 -2
@@ -1471,10 +1471,10 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,for (retry =0 ; retry <AT_XDMAC_RESIDUE_MAX_RETRIES ; retry++) { check_nda =at_xdmac_chan_read (atchan,AT_XDMAC_CNDA ) &0xfffffffc ;rmb (); - initd = !!(at_xdmac_chan_read (atchan,AT_XDMAC_CC ) &AT_XDMAC_CC_INITD ); -rmb (); cur_ubc =at_xdmac_chan_read (atchan,AT_XDMAC_CUBC );rmb (); + initd = !!(at_xdmac_chan_read (atchan,AT_XDMAC_CC ) &AT_XDMAC_CC_INITD ); +rmb (); cur_nda =at_xdmac_chan_read (atchan,AT_XDMAC_CNDA ) &0xfffffffc ;rmb ();
drivers/extcon/extcon-intel-cht-wc.c +7 -4
@@ -66,6 +66,8 @@#define CHT_WC_VBUS_GPIO_CTLO 0x6e2d#define CHT_WC_VBUS_GPIO_CTLO_OUTPUT BIT(0) +#define CHT_WC_VBUS_GPIO_CTLO_DRV_OD BIT(4) +#define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT BIT(5)enum cht_wc_usb_id {USB_ID_OTG ,
@@ -183,14 +185,15 @@ static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext, {int ret, val; - val = enable ?CHT_WC_VBUS_GPIO_CTLO_OUTPUT :0 ; -/* * The 5V boost converter is enabled through a gpio on the PMIC, since * there currently is no gpio driver we access the gpio reg directly. */ - ret =regmap_update_bits (ext->regmap,CHT_WC_VBUS_GPIO_CTLO , -CHT_WC_VBUS_GPIO_CTLO_OUTPUT , val); + val =CHT_WC_VBUS_GPIO_CTLO_DRV_OD |CHT_WC_VBUS_GPIO_CTLO_DIR_OUT ; +if (enable) + val |=CHT_WC_VBUS_GPIO_CTLO_OUTPUT ; + + ret =regmap_write (ext->regmap,CHT_WC_VBUS_GPIO_CTLO , val);if (ret)dev_err (ext->dev,"Error writing Vbus GPIO CTLO: %d\n" , ret); }
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +1 -0
@@ -569,6 +569,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = { { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX }, + { 0x1002, 0x67DF, 0x1028, 0x0774, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0, 0, 0, 0, 0 }, };
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +4 -2
@@ -233,8 +233,10 @@ void amdgpu_bo_list_get_list(struct amdgpu_bo_list *list,for (i =0 ; i < list->num_entries; i++) {unsigned priority = list->array[i].priority; -list_add_tail (&list->array[i].tv.head, - &bucket[priority]); +if (!list->array[i].robj->parent) +list_add_tail (&list->array[i].tv.head, + &bucket[priority]); + list->array[i].user_pages =NULL ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
@@ -542,7 +542,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,INIT_LIST_HEAD (&duplicates);amdgpu_vm_get_pd_bo (&fpriv->vm, &p->validated, &p->vm_pd); -if (p->uf_entry.robj) +if (p->uf_entry.robj && !p->uf_entry.robj->parent)list_add (&p->uf_entry.tv.head, &p->validated);while (1 ) {
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +1 -1
@@ -866,7 +866,7 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, addr &0xfffffffc );amdgpu_ring_write (ring,upper_32_bits (addr) &0xffffffff );amdgpu_ring_write (ring, seq);/* reference */ -amdgpu_ring_write (ring,0xfffffff );/* mask */ +amdgpu_ring_write (ring,0xffffffff );/* mask */ amdgpu_ring_write (ring, (0xfff <<16 ) |4 );/* retry count, poll interval */ }
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +1 -1
@@ -844,7 +844,7 @@ static void sdma_v2_4_ring_emit_pipeline_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, addr &0xfffffffc );amdgpu_ring_write (ring,upper_32_bits (addr) &0xffffffff );amdgpu_ring_write (ring, seq);/* reference */ -amdgpu_ring_write (ring,0xfffffff );/* mask */ +amdgpu_ring_write (ring,0xffffffff );/* mask */ amdgpu_ring_write (ring,SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT (0xfff ) |SDMA_PKT_POLL_REGMEM_DW5_INTERVAL (4 ));/* retry count, poll interval */ }
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +1 -1
@@ -1110,7 +1110,7 @@ static void sdma_v3_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, addr &0xfffffffc );amdgpu_ring_write (ring,upper_32_bits (addr) &0xffffffff );amdgpu_ring_write (ring, seq);/* reference */ -amdgpu_ring_write (ring,0xfffffff );/* mask */ +amdgpu_ring_write (ring,0xffffffff );/* mask */ amdgpu_ring_write (ring,SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT (0xfff ) |SDMA_PKT_POLL_REGMEM_DW5_INTERVAL (4 ));/* retry count, poll interval */ }
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -1
@@ -1113,7 +1113,7 @@ static void sdma_v4_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, addr &0xfffffffc );amdgpu_ring_write (ring,upper_32_bits (addr) &0xffffffff );amdgpu_ring_write (ring, seq);/* reference */ -amdgpu_ring_write (ring,0xfffffff );/* mask */ +amdgpu_ring_write (ring,0xffffffff );/* mask */ amdgpu_ring_write (ring,SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT (0xfff ) |SDMA_PKT_POLL_REGMEM_DW5_INTERVAL (4 ));/* retry count, poll interval */ }
drivers/gpu/drm/amd/amdgpu/si.c +67 -0
79 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/si_dpm.c +2 -2
@@ -6370,9 +6370,9 @@ static void si_set_pcie_lane_width_in_smc(struct amdgpu_device *adev, {u32 lane_width;u32 new_lane_width = - (amdgpu_new_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ; + ((amdgpu_new_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ) +1 ;u32 current_lane_width = - (amdgpu_current_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ; + ((amdgpu_current_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ) +1 ;if (new_lane_width != current_lane_width) {amdgpu_set_pcie_lanes (adev, new_lane_width);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -31
@@ -4776,33 +4776,6 @@ static int dm_update_planes_state(struct dc *dc,return ret; } -static int dm_atomic_check_plane_state_fb (struct drm_atomic_state *state, -struct drm_crtc *crtc) -{ -struct drm_plane *plane; -struct drm_crtc_state *crtc_state; - -WARN_ON (!drm_atomic_get_new_crtc_state (state, crtc)); - -drm_for_each_plane_mask (plane, state->dev, crtc->state->plane_mask) { -struct drm_plane_state *plane_state = -drm_atomic_get_plane_state (state, plane); - -if (IS_ERR (plane_state)) -return -EDEADLK ; - - crtc_state =drm_atomic_get_crtc_state (plane_state->state, crtc); -if (IS_ERR (crtc_state)) -return PTR_ERR (crtc_state); - -if (crtc->primary == plane && crtc_state->active) { -if (!plane_state->fb) -return -EINVAL ; - } - } -return 0 ; -} -static int amdgpu_dm_atomic_check (struct drm_device *dev,struct drm_atomic_state *state) {
@@ -4826,10 +4799,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, goto fail;for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { - ret =dm_atomic_check_plane_state_fb (state, crtc); -if (ret) - goto fail; -if (!drm_atomic_crtc_needs_modeset (new_crtc_state) && !new_crtc_state->color_mgmt_changed)continue ;
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +2 -0
@@ -736,6 +736,8 @@ static void dce110_stream_encoder_update_hdmi_info_packets(if (info_frame->avi.valid) {const uint32_t *content = (const uint32_t *) &info_frame->avi.sb[0 ]; +/*we need turn on clock before programming AFMT block*/ +REG_UPDATE (AFMT_CNTL ,AFMT_AUDIO_CLOCK_EN ,1 );REG_WRITE (AFMT_AVI_INFO0 , content[0 ]);
drivers/gpu/drm/i915/gvt/gvt.h +4 -1
@@ -308,7 +308,10 @@ struct intel_gvt {wait_queue_head_t service_thread_wq;unsigned long service_request; -struct engine_mmio *engine_mmio_list; +struct { +struct engine_mmio *mmio; +int ctx_mmio_count[I915_NUM_ENGINES ]; + } engine_mmio_list;struct dentry *debugfs_root; };
drivers/gpu/drm/i915/gvt/mmio_context.c +191 -19
292 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/mmio_context.h +5 -0
@@ -49,4 +49,9 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre,void intel_gvt_init_engine_mmio_context (struct intel_gvt *gvt); +bool is_inhibit_context (struct i915_gem_context *ctx,int ring_id); + +int intel_vgpu_restore_inhibit_context (struct intel_vgpu *vgpu, +struct drm_i915_gem_request *req); +#endif
drivers/gpu/drm/i915/gvt/scheduler.c +5 -0
@@ -275,6 +275,11 @@ static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload)struct intel_vgpu *vgpu = workload->vgpu;void *shadow_ring_buffer_va;u32 *cs; +struct drm_i915_gem_request *req = workload->req; + +if (IS_KABYLAKE (req->i915) && +is_inhibit_context (req->ctx, req->engine->id)) +intel_vgpu_restore_inhibit_context (vgpu, req);/* allocate shadow ring buffer */ cs =intel_ring_begin (workload->req, workload->rb_len /sizeof (u32));
drivers/gpu/drm/i915/i915_drv.c +10 -12
@@ -1599,15 +1599,12 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) {struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev = dev_priv->drm.pdev; -bool fw_csr;int ret;disable_rpm_wakeref_asserts (dev_priv);intel_display_set_init_power (dev_priv, false); - fw_csr = !IS_GEN9_LP (dev_priv) && !hibernation && -suspend_to_idle (dev_priv) && dev_priv->csr.dmc_payload;/* * In case of firmware assisted context save/restore don't manually * deinit the power domains. This also means the CSR/DMC firmware will
@@ -1615,8 +1612,11 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)* also enable deeper system power states that would be blocked if the * firmware was inactive. */ -if (!fw_csr) +if (IS_GEN9_LP (dev_priv) || hibernation || !suspend_to_idle (dev_priv) || + dev_priv->csr.dmc_payload ==NULL ) {intel_power_domains_suspend (dev_priv); + dev_priv->power_domains_suspended = true; + } ret =0 ;if (IS_GEN9_LP (dev_priv))
@@ -1628,8 +1628,10 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)if (ret) {DRM_ERROR ("Suspend complete failed: %d\n" , ret); -if (!fw_csr) +if (dev_priv->power_domains_suspended) {intel_power_domains_init_hw (dev_priv, true); + dev_priv->power_domains_suspended = false; + } goto out; }
@@ -1650,8 +1652,6 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)if (!(hibernation &&INTEL_GEN (dev_priv) <6 ))pci_set_power_state (pdev, PCI_D3hot); - dev_priv->suspended_to_idle =suspend_to_idle (dev_priv); - out:enable_rpm_wakeref_asserts (dev_priv);
@@ -1818,8 +1818,7 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_uncore_resume_early (dev_priv);if (IS_GEN9_LP (dev_priv)) { -if (!dev_priv->suspended_to_idle) -gen9_sanitize_dc_state (dev_priv); +gen9_sanitize_dc_state (dev_priv);bxt_disable_dc9 (dev_priv); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {hsw_disable_pc8 (dev_priv);
@@ -1827,8 +1826,7 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_uncore_sanitize (dev_priv); -if (IS_GEN9_LP (dev_priv) || - !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload)) +if (dev_priv->power_domains_suspended)intel_power_domains_init_hw (dev_priv, true);else intel_display_set_init_power (dev_priv, true);
@@ -1838,7 +1836,7 @@ static int i915_drm_resume_early(struct drm_device *dev)enable_rpm_wakeref_asserts (dev_priv); out: - dev_priv->suspended_to_idle = false; + dev_priv->power_domains_suspended = false;return ret; }
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2099,7 +2099,7 @@ struct drm_i915_private {u32 bxt_phy_grc;u32 suspend_count; -bool suspended_to_idle; +bool power_domains_suspended;struct i915_suspend_saved_registers regfile;struct vlv_s0ix_state vlv_s0ix_state;
drivers/gpu/drm/i915/i915_reg.h +10 -0
@@ -6236,6 +6236,12 @@ enum {#define _SPATILEOFF (VLV_DISPLAY_BASE + 0x721a4)#define _SPACONSTALPHA (VLV_DISPLAY_BASE + 0x721a8)#define SP_CONST_ALPHA_ENABLE (1<<31) +#define _SPACLRC0 (VLV_DISPLAY_BASE + 0x721d0) +#define SP_CONTRAST (x) ((x) << 18)/* u3.6 */ +#define SP_BRIGHTNESS (x) ((x) & 0xff)/* s8 */ +#define _SPACLRC1 (VLV_DISPLAY_BASE + 0x721d4) +#define SP_SH_SIN (x) (((x) & 0x7ff) << 16)/* s4.7 */ +#define SP_SH_COS (x) (x)/* u3.7 */ #define _SPAGAMC (VLV_DISPLAY_BASE + 0x721f4)#define _SPBCNTR (VLV_DISPLAY_BASE + 0x72280)
@@ -6249,6 +6255,8 @@ enum {#define _SPBKEYMAXVAL (VLV_DISPLAY_BASE + 0x722a0)#define _SPBTILEOFF (VLV_DISPLAY_BASE + 0x722a4)#define _SPBCONSTALPHA (VLV_DISPLAY_BASE + 0x722a8) +#define _SPBCLRC0 (VLV_DISPLAY_BASE + 0x722d0) +#define _SPBCLRC1 (VLV_DISPLAY_BASE + 0x722d4)#define _SPBGAMC (VLV_DISPLAY_BASE + 0x722f4)#define _MMIO_VLV_SPR (pipe, plane_id, reg_a, reg_b) \
@@ -6265,6 +6273,8 @@ enum {#define SPKEYMAXVAL (pipe, plane_id) _MMIO_VLV_SPR((pipe), (plane_id), _SPAKEYMAXVAL, _SPBKEYMAXVAL)#define SPTILEOFF (pipe, plane_id) _MMIO_VLV_SPR((pipe), (plane_id), _SPATILEOFF, _SPBTILEOFF)#define SPCONSTALPHA (pipe, plane_id) _MMIO_VLV_SPR((pipe), (plane_id), _SPACONSTALPHA, _SPBCONSTALPHA) +#define SPCLRC0 (pipe, plane_id) _MMIO_VLV_SPR((pipe), (plane_id), _SPACLRC0, _SPBCLRC0) +#define SPCLRC1 (pipe, plane_id) _MMIO_VLV_SPR((pipe), (plane_id), _SPACLRC1, _SPBCLRC1)#define SPGAMC (pipe, plane_id) _MMIO_VLV_SPR((pipe), (plane_id), _SPAGAMC, _SPBGAMC)/*
drivers/gpu/drm/i915/intel_sprite.c +63 -18
115 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_device.c +4 -0
@@ -139,6 +139,10 @@ static struct radeon_px_quirk radeon_px_quirk_list[] = {* https://bugs.freedesktop.org/show_bug.cgi?id=101491 */ { PCI_VENDOR_ID_ATI, 0x6741, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX }, +/* Asus K73TK laptop with AMD A6-3420M APU and Radeon 7670m GPU +* https://bugzilla.kernel.org/show_bug.cgi?id=51381#c52 +*/ + { PCI_VENDOR_ID_ATI, 0x6840, 0x1043, 0x2123, RADEON_PX_QUIRK_DISABLE_PX }, { 0, 0, 0, 0, 0 }, };
drivers/gpu/drm/radeon/si_dpm.c +2 -2
@@ -5912,9 +5912,9 @@ static void si_set_pcie_lane_width_in_smc(struct radeon_device *rdev, {u32 lane_width;u32 new_lane_width = - (radeon_new_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ; + ((radeon_new_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ) +1 ;u32 current_lane_width = - (radeon_current_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ; + ((radeon_current_state->caps &ATOM_PPLIB_PCIE_LINK_WIDTH_MASK ) >>ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT ) +1 ;if (new_lane_width != current_lane_width) {radeon_set_pcie_lanes (rdev, new_lane_width);
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +12 -11
@@ -1414,6 +1414,9 @@ static int vop_initial(struct vop *vop)usleep_range (10 ,20 );reset_control_deassert (ahb_rst); +VOP_INTR_SET_TYPE (vop, clear,INTR_MASK ,1 ); +VOP_INTR_SET_TYPE (vop, enable,INTR_MASK ,0 ); +memcpy (vop->regsbak, vop->regs, vop->len);VOP_REG_SET (vop, misc, global_regdone_en,1 );
@@ -1569,17 +1572,9 @@ static int vop_bind(struct device *dev, struct device *master, void *data)mutex_init (&vop->vsync_mutex); - ret =devm_request_irq (dev, vop->irq, vop_isr, -IRQF_SHARED ,dev_name (dev), vop); -if (ret) -return ret; - -/* IRQ is initially disabled; it gets enabled in power_on */ -disable_irq (vop->irq); - ret =vop_create_crtc (vop);if (ret) - goto err_enable_irq; +return ret;pm_runtime_enable (&pdev->dev);
@@ -1590,13 +1585,19 @@ static int vop_bind(struct device *dev, struct device *master, void *data) goto err_disable_pm_runtime; } + ret =devm_request_irq (dev, vop->irq, vop_isr, +IRQF_SHARED ,dev_name (dev), vop); +if (ret) + goto err_disable_pm_runtime; + +/* IRQ is initially disabled; it gets enabled in power_on */ +disable_irq (vop->irq); +return 0 ; err_disable_pm_runtime:pm_runtime_disable (&pdev->dev);vop_destroy_crtc (vop); -err_enable_irq: -enable_irq (vop->irq);/* To balance out the disable_irq above */ return ret; }
drivers/hid/hid-core.c +5 -5
@@ -1365,7 +1365,7 @@ u8 *hid_alloc_report_buf(struct hid_report *report, gfp_t flags)* of implement() working on 8 byte chunks */ -int len =hid_report_len (report) +7 ; +u32 len =hid_report_len (report) +7 ;return kmalloc (len, flags); }
@@ -1430,7 +1430,7 @@ void __hid_request(struct hid_device *hid, struct hid_report *report, {char *buf;int ret; -int len; +u32 len; buf =hid_alloc_report_buf (report,GFP_KERNEL );if (!buf)
@@ -1456,14 +1456,14 @@ void __hid_request(struct hid_device *hid, struct hid_report *report, }EXPORT_SYMBOL_GPL (__hid_request); -int hid_report_raw_event (struct hid_device *hid,int type,u8 *data,int size, +int hid_report_raw_event (struct hid_device *hid,int type,u8 *data,u32 size,int interrupt) {struct hid_report_enum *report_enum = hid->report_enum + type;struct hid_report *report;struct hid_driver *hdrv;unsigned int a; -int rsize, csize = size; +u32 rsize, csize = size;u8 *cdata = data;int ret =0 ;
@@ -1521,7 +1521,7 @@ EXPORT_SYMBOL_GPL(hid_report_raw_event);* * This is data entry for lower layers. */ -int hid_input_report (struct hid_device *hid,int type,u8 *data,int size,int interrupt) +int hid_input_report (struct hid_device *hid,int type,u8 *data,u32 size,int interrupt) {struct hid_report_enum *report_enum;struct hid_driver *hdrv;
drivers/hid/hid-ids.h +3 -0
@@ -519,6 +519,9 @@#define I2C_VENDOR_ID_HANTICK 0x0911#define I2C_PRODUCT_ID_HANTICK_5288 0x5288 +#define I2C_VENDOR_ID_RAYD 0x2386 +#define I2C_PRODUCT_ID_RAYD_3118 0x3118 +#define USB_VENDOR_ID_HANWANG 0x0b57#define USB_DEVICE_ID_HANWANG_TABLET_FIRST 0x5000#define USB_DEVICE_ID_HANWANG_TABLET_LAST 0x8fff
drivers/hid/hid-input.c +19 -8
@@ -387,7 +387,8 @@ static int hidinput_get_battery_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_CAPACITY : -if (dev->battery_report_type ==HID_FEATURE_REPORT ) { +if (dev->battery_status !=HID_BATTERY_REPORTED && + !dev->battery_avoid_query) { value =hidinput_query_battery_capacity (dev);if (value <0 )return value;
@@ -403,17 +404,17 @@ static int hidinput_get_battery_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_STATUS : -if (!dev->battery_reported && - dev->battery_report_type ==HID_FEATURE_REPORT ) { +if (dev->battery_status !=HID_BATTERY_REPORTED && + !dev->battery_avoid_query) { value =hidinput_query_battery_capacity (dev);if (value <0 )return value; dev->battery_capacity = value; - dev->battery_reported = true; + dev->battery_status =HID_BATTERY_QUERIED ; } -if (!dev->battery_reported) +if (dev->battery_status ==HID_BATTERY_UNKNOWN ) val->intval =POWER_SUPPLY_STATUS_UNKNOWN ;else if (dev->battery_capacity ==100 ) val->intval =POWER_SUPPLY_STATUS_FULL ;
@@ -486,6 +487,14 @@ static int hidinput_setup_battery(struct hid_device *dev, unsigned report_type, dev->battery_report_type = report_type; dev->battery_report_id = field->report->id; +/* +* Stylus is normally not connected to the device and thus we +* can't query the device and get meaningful battery strength. +* We have to wait for the device to report it on its own. +*/ + dev->battery_avoid_query = report_type ==HID_INPUT_REPORT && + field->physical ==HID_DG_STYLUS ; + dev->battery =power_supply_register (&dev->dev, psy_desc, &psy_cfg);if (IS_ERR (dev->battery)) { error =PTR_ERR (dev->battery);
@@ -530,9 +539,10 @@ static void hidinput_update_battery(struct hid_device *dev, int value) capacity =hidinput_scale_battery_capacity (dev, value); -if (!dev->battery_reported || capacity != dev->battery_capacity) { +if (dev->battery_status !=HID_BATTERY_REPORTED || + capacity != dev->battery_capacity) { dev->battery_capacity = capacity; - dev->battery_reported = true; + dev->battery_status =HID_BATTERY_REPORTED ;power_supply_changed (dev->battery); } }
@@ -1368,7 +1378,8 @@ static void hidinput_led_worker(struct work_struct *work) led_work);struct hid_field *field;struct hid_report *report; -int len, ret; +int ret; +u32 len;__u8 *buf; field =hidinput_get_led_field (hid);
drivers/hid/hid-multitouch.c +3 -2
@@ -370,7 +370,8 @@ static const struct attribute_group mt_attribute_group = {static void mt_get_feature (struct hid_device *hdev,struct hid_report *report) {struct mt_device *td =hid_get_drvdata (hdev); -int ret, size =hid_report_len (report); +int ret; +u32 size =hid_report_len (report);u8 *buf;/*
@@ -1183,7 +1184,7 @@ static void mt_set_input_mode(struct hid_device *hdev)struct hid_report_enum *re;struct mt_class *cls = &td->mtclass;char *buf; -int report_len; +u32 report_len;if (td->inputmode <0 )return ;
drivers/hid/hid-rmi.c +2 -2
@@ -89,8 +89,8 @@ struct rmi_data {u8 *writeReport;u8 *readReport; -int input_report_size; -int output_report_size; +u32 input_report_size; +u32 output_report_size;unsigned long flags;
drivers/hid/hidraw.c +5 -0
@@ -192,6 +192,11 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_tint ret =0 , len;unsigned char report_number; +if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { + ret = -ENODEV ; + goto out; + } + dev = hidraw_table[minor]->hid;if (!dev->ll_driver->raw_request) {
drivers/hid/i2c-hid/i2c-hid.c +20 -6
@@ -47,6 +47,7 @@/* quirks to control the device */ #define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0)#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET BIT(1) +#define I2C_HID_QUIRK_RESEND_REPORT_DESCR BIT(2)/* flags */ #define I2C_HID_STARTED 0
@@ -144,10 +145,10 @@ struct i2c_hid {* register of the HID * descriptor. */ unsigned int bufsize;/* i2c buffer size */ -char *inbuf;/* Input buffer */ -char *rawbuf;/* Raw Input buffer */ -char *cmdbuf;/* Command buffer */ -char *argsbuf;/* Command arguments buffer */ +u8 *inbuf;/* Input buffer */ +u8 *rawbuf;/* Raw Input buffer */ +u8 *cmdbuf;/* Command buffer */ +u8 *argsbuf;/* Command arguments buffer */ unsigned long flags;/* device flags */ unsigned long quirks;/* Various quirks */
@@ -171,6 +172,8 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV }, {I2C_VENDOR_ID_HANTICK ,I2C_PRODUCT_ID_HANTICK_5288 , I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, + { I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_3118, + I2C_HID_QUIRK_RESEND_REPORT_DESCR }, { 0, 0 } };
@@ -455,7 +458,8 @@ static int i2c_hid_hwreset(struct i2c_client *client)static void i2c_hid_get_input (struct i2c_hid *ihid) { -int ret, ret_size; +int ret; +u32 ret_size;int size =le16_to_cpu (ihid->hdesc.wMaxInputLength);if (size > ihid->bufsize)
@@ -480,7 +484,7 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)return ; } -if (ret_size > size) { +if ((ret_size > size) || (ret_size <=2 )) {dev_err (&ihid->client->dev,"%s: incomplete report (%d/%d)\n" , __func__, size, ret_size);return ;
@@ -1219,6 +1223,16 @@ static int i2c_hid_resume(struct device *dev)if (ret)return ret; +/* RAYDIUM device (2386:3118) need to re-send report descr cmd +* after resume, after this it will be back normal. +* otherwise it issues too many incomplete reports. +*/ +if (ihid->quirks &I2C_HID_QUIRK_RESEND_REPORT_DESCR ) { + ret =i2c_hid_command (client, &hid_report_descr_cmd,NULL ,0 ); +if (ret) +return ret; + } +if (hid->driver && hid->driver->reset_resume) { ret = hid->driver->reset_resume (hid);return ret;
drivers/hid/wacom_sys.c +2 -2
@@ -219,7 +219,7 @@ static void wacom_feature_mapping(struct hid_device *hdev,unsigned int equivalent_usage =wacom_equivalent_usage (usage->hid);u8 *data;int ret; -int n; +u32 n;switch (equivalent_usage) {case HID_DG_CONTACTMAX :
@@ -519,7 +519,7 @@ static int wacom_set_device_mode(struct hid_device *hdev,u8 *rep_data;struct hid_report *r;struct hid_report_enum *re; -int length; +u32 length;int error = -ENOMEM , limit =0 ;if (wacom_wac->mode_report <0 )
drivers/hid/wacom_wac.c +46 -30
94 lines not on this page · raw message
drivers/i2c/busses/i2c-i801.c +14 -2
@@ -966,8 +966,6 @@ static void i801_enable_host_notify(struct i2c_adapter *adapter)if (!(priv->features &FEATURE_HOST_NOTIFY ))return ; - priv->original_slvcmd =inb_p (SMBSLVCMD (priv)); -if (!(SMBSLVCMD_HST_NTFY_INTREN & priv->original_slvcmd))outb_p (SMBSLVCMD_HST_NTFY_INTREN | priv->original_slvcmd,SMBSLVCMD (priv));
@@ -1615,6 +1613,10 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)outb_p (inb_p (SMBAUXCTL (priv)) & ~(SMBAUXCTL_CRC |SMBAUXCTL_E32B ),SMBAUXCTL (priv)); +/* Remember original Host Notify setting */ +if (priv->features &FEATURE_HOST_NOTIFY ) + priv->original_slvcmd =inb_p (SMBSLVCMD (priv)); +/* Default timeout in interrupt mode: 200 ms */ priv->adapter.timeout =HZ /5 ;
@@ -1699,6 +1701,15 @@ static void i801_remove(struct pci_dev *dev)*/ } +static void i801_shutdown (struct pci_dev *dev) +{ +struct i801_priv *priv =pci_get_drvdata (dev); + +/* Restore config registers to avoid hard hang on some systems */ +i801_disable_host_notify (priv); +pci_write_config_byte (dev,SMBHSTCFG , priv->original_hstcfg); +} +#ifdef CONFIG_PM static int i801_suspend (struct device *dev) {
@@ -1728,6 +1739,7 @@ static struct pci_driver i801_driver = { .id_table = i801_ids, .probe = i801_probe, .remove = i801_remove, + .shutdown = i801_shutdown, .driver = { .pm = &i801_pm_ops, },
drivers/infiniband/core/ucma.c +3 -0
@@ -1241,6 +1241,9 @@ static int ucma_set_ib_path(struct ucma_context *ctx,if (!optlen)return -EINVAL ; +if (!ctx->cm_id->device) +return -EINVAL ; +memset (&sa_path,0 ,sizeof (sa_path)); sa_path.rec_type =SA_PATH_REC_TYPE_IB ;
drivers/infiniband/core/verbs.c +9 -3
@@ -2194,7 +2194,14 @@ static void __ib_drain_sq(struct ib_qp *qp)struct ib_cq *cq = qp->send_cq;struct ib_qp_attr attr = { .qp_state =IB_QPS_ERR };struct ib_drain_cqe sdrain; -struct ib_send_wr swr = {}, *bad_swr; +struct ib_send_wr *bad_swr; +struct ib_rdma_wr swr = { + .wr = { + .next =NULL , + { .wr_cqe = &sdrain.cqe, }, + .opcode =IB_WR_RDMA_WRITE , + }, + };int ret; ret =ib_modify_qp (qp, &attr,IB_QP_STATE );
@@ -2203,11 +2210,10 @@ static void __ib_drain_sq(struct ib_qp *qp)return ; } - swr.wr_cqe = &sdrain.cqe; sdrain.cqe.done = ib_drain_qp_done;init_completion (&sdrain.done); - ret =ib_post_send (qp, &swr, &bad_swr); + ret =ib_post_send (qp, &swr.wr, &bad_swr);if (ret) {WARN_ONCE (ret,"failed to drain send queue: %d\n" , ret);return ;
drivers/infiniband/hw/mlx5/mr.c +2 -0
@@ -1223,6 +1223,8 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,return ERR_PTR (-EINVAL ); mr =mlx5_ib_alloc_implicit_mr (to_mpd (pd), access_flags); +if (IS_ERR (mr)) +return ERR_CAST (mr); return &mr->ibmr; }#endif
drivers/infiniband/sw/rxe/rxe_verbs.c +2 -3
@@ -711,9 +711,8 @@ static int init_send_wqe(struct rxe_qp *qp, struct ib_send_wr *ibwr,memcpy (wqe->dma.sge, ibwr->sg_list, num_sge *sizeof (struct ib_sge )); - wqe->iova = (mask &WR_ATOMIC_MASK ) ? -atomic_wr (ibwr)->remote_addr : -rdma_wr (ibwr)->remote_addr; + wqe->iova = mask &WR_ATOMIC_MASK ?atomic_wr (ibwr)->remote_addr : + mask &WR_READ_OR_WRITE_MASK ?rdma_wr (ibwr)->remote_addr :0 ; wqe->mask = mask; wqe->dma.length = length; wqe->dma.resid = length;
drivers/infiniband/ulp/srp/ib_srp.c +9 -9
@@ -2974,9 +2974,11 @@ static int srp_abort(struct scsi_cmnd *scmnd) ret =FAST_IO_FAIL ; else ret =FAILED ; -srp_free_req (ch, req, scmnd,0 ); - scmnd->result =DID_ABORT <<16 ; - scmnd->scsi_done (scmnd); +if (ret ==SUCCESS ) { +srp_free_req (ch, req, scmnd,0 ); + scmnd->result =DID_ABORT <<16 ; + scmnd->scsi_done (scmnd); + }return ret; }
@@ -3871,12 +3873,10 @@ static ssize_t srp_create_target(struct device *dev, num_online_nodes());const int ch_end = ((node_idx +1 ) * target->ch_count /num_online_nodes ()); -const int cv_start = (node_idx * ibdev->num_comp_vectors / -num_online_nodes () + target->comp_vector) - % ibdev->num_comp_vectors; -const int cv_end = ((node_idx +1 ) * ibdev->num_comp_vectors / -num_online_nodes () + target->comp_vector) - % ibdev->num_comp_vectors; +const int cv_start = node_idx * ibdev->num_comp_vectors / +num_online_nodes (); +const int cv_end = (node_idx +1 ) * ibdev->num_comp_vectors / +num_online_nodes ();int cpu_idx =0 ;for_each_online_cpu (cpu) {
drivers/infiniband/ulp/srpt/ib_srpt.c +10 -6
@@ -838,16 +838,20 @@ static int srpt_post_recv(struct srpt_device *sdev, struct srpt_rdma_ch *ch,*/ static int srpt_zerolength_write (struct srpt_rdma_ch *ch) { -struct ib_send_wr wr, *bad_wr; +struct ib_send_wr *bad_wr; +struct ib_rdma_wr wr = { + .wr = { + .next =NULL , + { .wr_cqe = &ch->zw_cqe, }, + .opcode =IB_WR_RDMA_WRITE , + .send_flags =IB_SEND_SIGNALED , + } + };pr_debug ("%s-%d: queued zerolength write\n" , ch->sess_name, ch->qp->qp_num); -memset (&wr,0 ,sizeof (wr)); - wr.opcode =IB_WR_RDMA_WRITE ; - wr.wr_cqe = &ch->zw_cqe; - wr.send_flags =IB_SEND_SIGNALED ; -return ib_post_send (ch->qp, &wr, &bad_wr); +return ib_post_send (ch->qp, &wr.wr, &bad_wr); }static void srpt_zerolength_write_done (struct ib_cq *cq,struct ib_wc *wc)
drivers/iommu/intel-svm.c +1 -0
@@ -396,6 +396,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ pasid_max - 1, GFP_KERNEL);if (ret <0 ) {kfree (svm); +kfree (sdev); goto out; } svm->pasid = ret;
drivers/irqchip/irq-gic-common.c +8 -1
@@ -21,6 +21,8 @@#include "irq-gic-common.h" +static DEFINE_RAW_SPINLOCK (irq_controller_lock); +static const struct gic_kvm_info *gic_kvm_info;const struct gic_kvm_info *gic_get_kvm_info (void )
@@ -53,11 +55,13 @@ int gic_configure_irq(unsigned int irq, unsigned int type,u32 confoff = (irq /16 ) *4 ;u32 val, oldval;int ret =0 ; +unsigned long flags;/* * Read current configuration register, and insert the config * for "irq", depending on "type". */ +raw_spin_lock_irqsave (&irq_controller_lock, flags); val = oldval =readl_relaxed (base +GIC_DIST_CONFIG + confoff);if (type &IRQ_TYPE_LEVEL_MASK ) val &= ~confmask;
@@ -65,8 +69,10 @@ int gic_configure_irq(unsigned int irq, unsigned int type, val |= confmask;/* If the current configuration is the same, then we are done */ -if (val == oldval) +if (val == oldval) { +raw_spin_unlock_irqrestore (&irq_controller_lock, flags);return 0 ; + }/* * Write back the new configuration, and possibly re-enable
@@ -84,6 +90,7 @@ int gic_configure_irq(unsigned int irq, unsigned int type,pr_warn ("GIC: PPI%d is secure or misconfigured\n" , irq -16 ); } +raw_spin_unlock_irqrestore (&irq_controller_lock, flags);if (sync_access)sync_access ();
drivers/md/dm-crypt.c +65 -1
108 lines not on this page · raw message
drivers/md/dm-raid.c +2 -1
@@ -3408,7 +3408,8 @@ static sector_t rs_get_progress(struct raid_set *rs, unsigned long recovery,set_bit (RT_FLAG_RS_IN_SYNC , &rs->runtime_flags); }else { -if (!test_bit (MD_RECOVERY_INTR , &recovery) && +if (!test_bit (__CTR_FLAG_NOSYNC, &rs->ctr_flags) && + !test_bit (MD_RECOVERY_INTR , &recovery) && (test_bit (MD_RECOVERY_NEEDED , &recovery) ||test_bit (MD_RECOVERY_RESHAPE , &recovery) ||test_bit (MD_RECOVERY_RUNNING , &recovery)))
drivers/md/dm.c +23 -7
@@ -1477,6 +1477,23 @@ static int __send_write_zeroes(struct clone_info *ci, struct dm_target *ti)return __send_changing_extent_only (ci, ti, get_num_write_zeroes_bios,NULL ); } +static bool __process_abnormal_io (struct clone_info *ci,struct dm_target *ti, +int *result) +{ +struct bio *bio = ci->bio; + +if (bio_op (bio) ==REQ_OP_DISCARD ) + *result =__send_discard (ci, ti); +else if (bio_op (bio) ==REQ_OP_WRITE_SAME ) + *result =__send_write_same (ci, ti); +else if (bio_op (bio) ==REQ_OP_WRITE_ZEROES ) + *result =__send_write_zeroes (ci, ti); +else +return false; + +return true; +} +/* * Select the correct strategy for processing a non-flush bio. */
@@ -1491,12 +1508,8 @@ static int __split_and_process_non_flush(struct clone_info *ci)if (!dm_target_is_valid (ti))return -EIO ; -if (unlikely (bio_op (bio) ==REQ_OP_DISCARD )) -return __send_discard (ci, ti); -else if (unlikely (bio_op (bio) ==REQ_OP_WRITE_SAME )) -return __send_write_same (ci, ti); -else if (unlikely (bio_op (bio) ==REQ_OP_WRITE_ZEROES )) -return __send_write_zeroes (ci, ti); +if (unlikely (__process_abnormal_io (ci, ti, &r))) +return r;if (bio_op (bio) ==REQ_OP_ZONE_REPORT ) len = ci->sector_count;
@@ -1617,9 +1630,12 @@ static blk_qc_t __process_bio(struct mapped_device *md, goto out; } - tio =alloc_tio (&ci, ti,0 ,GFP_NOIO ); ci.bio = bio; ci.sector_count =bio_sectors (bio); +if (unlikely (__process_abnormal_io (&ci, ti, &error))) + goto out; + + tio =alloc_tio (&ci, ti,0 ,GFP_NOIO ); ret =__clone_and_map_simple_bio (&ci, tio,NULL ); } out:
drivers/media/common/videobuf2/videobuf2-core.c +9 -0
@@ -1696,6 +1696,15 @@ static void __vb2_queue_cancel(struct vb2_queue *q)for (i =0 ; i < q->num_buffers; ++i) {struct vb2_buffer *vb = q->bufs[i]; +if (vb->state ==VB2_BUF_STATE_PREPARED || + vb->state ==VB2_BUF_STATE_QUEUED ) { +unsigned int plane; + +for (plane =0 ; plane < vb->num_planes; ++plane) +call_void_memop (vb, finish, + vb->planes[plane].mem_priv); + } +if (vb->state !=VB2_BUF_STATE_DEQUEUED ) { vb->state =VB2_BUF_STATE_PREPARED ;call_void_vb_qop (vb, buf_finish, vb);
drivers/media/platform/vivid/vivid-vid-common.c +2 -1
@@ -874,7 +874,8 @@ int vidioc_g_edid(struct file *file, void *_fh,return -EINVAL ;if (edid->start_block + edid->blocks > dev->edid_blocks) edid->blocks = dev->edid_blocks - edid->start_block; -cec_set_edid_phys_addr (dev->edid, dev->edid_blocks *128 , adap->phys_addr); +if (adap) +cec_set_edid_phys_addr (dev->edid, dev->edid_blocks *128 , adap->phys_addr);memcpy (edid->edid, dev->edid + edid->start_block *128 , edid->blocks *128 );return 0 ; }
drivers/media/platform/vsp1/vsp1_wpf.c +1 -1
@@ -452,7 +452,7 @@ static void wpf_configure(struct vsp1_entity *entity, : VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index); } -if (pipe->bru || pipe->num_inputs >1 ) +if (pipe->bru) srcrpf |= pipe->bru->type ==VSP1_ENTITY_BRU ?VI6_WPF_SRCRPF_VIRACT_MST :VI6_WPF_SRCRPF_VIRACT2_MST ;
drivers/media/rc/rc-main.c +3 -3
@@ -1929,12 +1929,12 @@ void rc_unregister_device(struct rc_dev *dev)if (!dev)return ; -del_timer_sync (&dev->timer_keyup); -del_timer_sync (&dev->timer_repeat); -if (dev->driver_type ==RC_DRIVER_IR_RAW )ir_raw_event_unregister (dev); +del_timer_sync (&dev->timer_keyup); +del_timer_sync (&dev->timer_repeat); +rc_free_rx_device (dev);mutex_lock (&dev->lock);
drivers/misc/cxl/cxllib.c +55 -30
26 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c +6 -0
Lines of this file are not shown. View the raw message.
drivers/usb/dwc3/gadget.c +25 -18
43 lines not on this page · raw message
fs/cifs/cifsencrypt.c +14 -71
85 lines not on this page · raw message
fs/cifs/misc.c +54 -0
54 lines not on this page · raw message
fs/cifs/smb2misc.c +64 -0
64 lines not on this page · raw message
fs/cifs/smb2transport.c +41 -56
97 lines not on this page · raw message
fs/ext4/ialloc.c +3 -44
47 lines not on this page · raw message
fs/ext4/xattr.c +68 -53
121 lines not on this page · raw message
sound/core/oss/pcm_oss.c +150 -36
186 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.