Linux 5.6.7
Greg KH
maintainerI'm announcing the release of the 5.6.7 kernel.
All users of the 5.6 kernel series must upgrade.
The updated 5.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/kernel-parameters.txt | 2 Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt | 2 Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 9 Makefile | 2 arch/arm/boot/dts/imx6qdl.dtsi | 5 arch/arm/boot/dts/imx6qp.dtsi | 1 arch/arm/boot/dts/rk3188-bqedison2qc.dts | 29 - arch/arm/boot/dts/sun8i-a83t.dtsi | 2 arch/arm/boot/dts/sun8i-r40.dtsi | 2 arch/arm/boot/dts/sun8i-v3s.dtsi | 2 arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 arch/arm/net/bpf_jit_32.c | 52 +-- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 6 arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 1 arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 8 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 111 ++++++ arch/csky/abiv1/inc/abi/entry.h | 5 arch/csky/abiv2/fpu.c | 5 arch/csky/abiv2/inc/abi/entry.h | 7 arch/csky/abiv2/inc/abi/fpu.h | 3 arch/csky/include/asm/processor.h | 1 arch/csky/kernel/head.S | 5 arch/csky/kernel/setup.c | 63 --- arch/csky/kernel/smp.c | 6 arch/csky/kernel/traps.c | 11 arch/csky/mm/fault.c | 7 arch/mips/boot/dts/ingenic/ci20.dts | 5 arch/powerpc/kernel/prom_init.c | 3 arch/powerpc/kvm/book3s_hv.c | 1 arch/powerpc/platforms/maple/setup.c | 34 - arch/s390/crypto/aes_s390.c | 3 arch/s390/kernel/perf_cpum_sf.c | 4 arch/s390/kernel/processor.c | 5 arch/s390/mm/gmap.c | 1 arch/um/drivers/ubd_kern.c | 4 arch/um/os-Linux/file.c | 1 arch/x86/hyperv/hv_init.c | 6 arch/x86/kernel/acpi/cstate.c | 3 arch/x86/kernel/cpu/mshyperv.c | 10 arch/x86/xen/xen-head.S | 8 block/bfq-cgroup.c | 73 ++-- block/bfq-iosched.c | 2 block/bfq-iosched.h | 1 drivers/acpi/acpica/acnamesp.h | 2 drivers/acpi/acpica/dbinput.c | 16 drivers/acpi/acpica/dswexec.c | 33 + drivers/acpi/acpica/dswload.c | 2 drivers/acpi/acpica/dswload2.c | 35 ++ drivers/acpi/acpica/nsnames.c | 6 drivers/acpi/acpica/utdelete.c | 9 drivers/acpi/device_pm.c | 2 drivers/acpi/dptf/dptf_power.c | 2 drivers/acpi/dptf/int340x_thermal.c | 8 drivers/acpi/processor_throttling.c | 7 drivers/block/rbd.c | 27 + drivers/clk/at91/clk-usb.c | 3 drivers/clk/clk.c | 48 +- drivers/clk/imx/clk-pll14xx.c | 2 drivers/clk/tegra/clk-tegra-pmc.c | 12 drivers/crypto/qce/dma.c | 11 drivers/crypto/qce/dma.h | 2 drivers/crypto/qce/skcipher.c | 5 drivers/dma/idxd/device.c | 4 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 8 drivers/gpu/drm/nouveau/nouveau_drm.c | 63 +++ drivers/gpu/drm/nouveau/nouveau_drv.h | 2 drivers/gpu/drm/nouveau/nouveau_svm.c | 6 drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 26 + drivers/gpu/drm/ttm/ttm_bo.c | 4 drivers/gpu/drm/vc4/vc4_hdmi.c | 20 - drivers/hv/channel_mgmt.c | 3 drivers/hv/vmbus_drv.c | 62 ++- drivers/iio/common/st_sensors/st_sensors_core.c | 4 drivers/iio/light/si1133.c | 37 +- drivers/iommu/Kconfig | 1 drivers/iommu/amd_iommu_types.h | 2 drivers/iommu/intel-iommu.c | 3 drivers/iommu/intel-svm.c | 9 drivers/iommu/virtio-iommu.c | 16 drivers/irqchip/irq-mbigen.c | 8 drivers/leds/led-class.c | 2 drivers/memory/tegra/tegra124-emc.c | 5 drivers/memory/tegra/tegra20-emc.c | 5 drivers/memory/tegra/tegra30-emc.c | 5 drivers/mfd/cros_ec_dev.c | 2 drivers/mtd/devices/phram.c | 15 drivers/mtd/lpddr/lpddr_cmds.c | 1 drivers/mtd/nand/raw/nand_base.c | 2 drivers/mtd/nand/spi/core.c | 1 drivers/net/dsa/bcm_sf2_cfp.c | 9 drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 drivers/net/macsec.c | 3 drivers/nvdimm/bus.c | 6 drivers/of/overlay.c | 2 drivers/of/unittest.c | 16 drivers/phy/socionext/phy-uniphier-usb3ss.c | 4 drivers/platform/chrome/cros_ec.c | 30 + drivers/platform/x86/intel-hid.c | 2 drivers/power/supply/axp288_fuel_gauge.c | 4 drivers/power/supply/bq27xxx_battery.c | 5 drivers/rtc/rtc-88pm860x.c | 14 drivers/scsi/sg.c | 4 drivers/soc/imx/gpc.c | 24 - drivers/thermal/Kconfig | 1 drivers/thermal/cpufreq_cooling.c | 6 drivers/thermal/qcom/tsens-common.c | 6 drivers/tty/ehv_bytechan.c | 21 + drivers/video/fbdev/core/fbmem.c | 38 +- drivers/virtio/virtio_balloon.c | 107 ++---- drivers/watchdog/sp805_wdt.c | 4 fs/afs/dir.c | 108 +++--- fs/afs/dir_silly.c | 22 - fs/afs/fsclient.c | 27 - fs/afs/yfsclient.c | 20 - fs/block_dev.c | 4 fs/btrfs/block-group.c | 2 fs/buffer.c | 11 fs/ceph/file.c | 173 +++++----- fs/cifs/smb2misc.c | 14 fs/cifs/transport.c | 28 - fs/ext2/xattr.c | 8 fs/ext4/inode.c | 2 fs/ext4/super.c | 5 fs/f2fs/checkpoint.c | 24 - fs/f2fs/compress.c | 63 ++- fs/f2fs/data.c | 35 +- fs/f2fs/f2fs.h | 102 ++--- fs/f2fs/file.c | 13 fs/f2fs/gc.c | 27 + fs/f2fs/inode.c | 2 fs/f2fs/node.c | 7 fs/f2fs/super.c | 14 fs/gfs2/log.c | 17 fs/nfs/callback_proc.c | 2 fs/nfs/direct.c | 2 fs/nfs/inode.c | 10 fs/nfs/nfs4file.c | 3 fs/nfs/nfsroot.c | 2 fs/nfs/pagelist.c | 17 fs/xfs/libxfs/xfs_alloc.c | 2 fs/xfs/xfs_attr_inactive.c | 2 fs/xfs/xfs_dir2_readdir.c | 12 fs/xfs/xfs_log.c | 13 include/acpi/processor.h | 8 include/asm-generic/mshyperv.h | 2 include/keys/big_key-type.h | 2 include/keys/user-type.h | 3 include/linux/buffer_head.h | 8 include/linux/compiler.h | 2 include/linux/f2fs_fs.h | 1 include/linux/hugetlb.h | 19 - include/linux/key-type.h | 2 include/linux/percpu_counter.h | 4 include/linux/platform_data/cros_ec_proto.h | 4 include/linux/swapops.h | 3 include/trace/bpf_probe.h | 18 - kernel/bpf/syscall.c | 16 kernel/bpf/verifier.c | 45 +- kernel/dma/coherent.c | 13 kernel/dma/debug.c | 9 kernel/locking/locktorture.c | 8 lib/Kconfig.debug | 2 net/dns_resolver/dns_key.c | 2 net/netfilter/nf_tables_api.c | 4 net/netfilter/nft_set_rbtree.c | 23 - net/rxrpc/key.c | 27 - net/sunrpc/auth_gss/auth_gss.c | 80 +++- net/xdp/xdp_umem.c | 5 net/xdp/xsk.c | 5 security/keys/big_key.c | 11 security/keys/encrypted-keys/encrypted.c | 7 security/keys/keyctl.c | 73 +++- security/keys/keyring.c | 6 security/keys/request_key_auth.c | 7 security/keys/trusted-keys/trusted_tpm1.c | 14 security/keys/user_defined.c | 5 sound/pci/hda/hda_intel.c | 23 - tools/lib/bpf/netlink.c | 2 tools/objtool/check.c | 5 tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c | 5 tools/testing/selftests/bpf/progs/test_get_stack_rawtp_err.c | 26 + tools/testing/selftests/bpf/verifier/bpf_get_stack.c | 8 184 files changed, 1754 insertions(+), 923 deletions(-)
Adrian Huang (1):
iommu/amd: Fix the configuration of GCR3 table root pointer
Alan Maguire (1):
um: falloc.h needs to be directly included for older libc
Alex Smith (1):
MIPS: DTS: CI20: add DT node for IR sensor
Alexander Gordeev (1):
s390/cpuinfo: fix wrong output when CPU0 is offline
Alexandre Belloni (1):
rtc: 88pm860x: fix possible race condition
Alexey Kardashevskiy (1):
powerpc/prom_init: Pass the "os-term" message to hypervisor
Amit Kucheria (2):
arm64: dts: marvell: Fix cpu compatible for AP807-quad
drivers: thermal: tsens: Release device in success path
Andrey Ignatov (1):
libbpf: Fix bpf_get_link_xdp_id flags handling
Andrii Nakryiko (2):
bpf: Prevent re-mmap()'ing BPF map as writable for initially r/o mapping
bpf: Reliably preserve btf_trace_xxx types
Anson Huang (1):
clk: imx: pll14xx: Add new frequency entries for pll1443x table
Aurelien Aptel (1):
cifs: ignore cached share root handle closing errors
Aya Levin (1):
net/mlx5e: Enforce setting of a single FEC mode
Ben Skeggs (1):
drm/nouveau/gr/gp107,gp108: implement workaround for HW hanging during init
Bhawanpreet Lakha (1):
drm/amd/display: Don't try hdcp1.4 when content_type is set to type1
Bob Moore (1):
ACPICA: Fixes for acpiExec namespace init file
Bob Peterson (1):
gfs2: clear ail1 list when gfs2 withdraws
Brian Foster (1):
xfs: fix iclog release error check race with shutdown
Chao Yu (11):
f2fs: fix to avoid potential deadlock
f2fs: fix to avoid use-after-free in f2fs_write_multi_pages()
f2fs: fix to show norecovery mount option
f2fs: fix to update f2fs_super_block fields under sb_lock
f2fs: compress: fix to call missing destroy_compress_ctx()
f2fs: fix potential .flags overflow on 32bit architecture
f2fs: fix NULL pointer dereference in f2fs_verity_work()
f2fs: fix NULL pointer dereference in f2fs_write_begin()
f2fs: fix potential deadlock on compressed quota file
f2fs: fix to account compressed blocks in f2fs_compressed_blocks()
f2fs: fix to wait all node page writeback
Christophe Kerello (1):
mtd: rawnand: free the nand_device object
Christophe Leroy (1):
mm/hugetlb: fix build failure with HUGETLB_PAGE but not HUGEBTLBFS
Chuck Lever (1):
sunrpc: Fix gss_unwrap_resp_integ() again
Claudiu Beznea (1):
clk: at91: usb: continue if clk_hw_round_rate() return zero
Colin Ian King (1):
iio: st_sensors: handle memory allocation failure to fix null pointer dereference
Dan Carpenter (3):
libnvdimm: Out of bounds read in __nd_ioctl()
fbdev: potential information leak in do_fb_ioctl()
mtd: lpddr: Fix a double free in probe()
Daniel Borkmann (2):
bpf: fix buggy r0 retval refinement for tracing helpers bpf, test_verifier: switch bpf_get_stack's 0 s> r8 test
Darrick J. Wong (2):
xfs: fix use-after-free when aborting corrupt attr inactivation
xfs: fix incorrect test in xfs_alloc_ag_vextent_lastblock
Dave Jiang (1):
dmaengine: idxd: reflect shadow copy of traffic class programming
David Hildenbrand (2):
KVM: s390: vsie: Fix possible race when shadowing region 3 tables
virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
David Howells (5):
afs: Fix missing XDR advance in xdr_decode_{AFS,YFS}FSFetchStatus()
afs: Fix decoding of inline abort codes from version 1 status records
afs: Fix rename operation status delivery
afs: Fix afs_d_validate() to set the right directory version
afs: Fix race between post-modification dir edit and readdir/d_revalidate
Davide Caratti (1):
macsec: fix NULL dereference in macsec_upd_offload()
Dmitry Osipenko (4):
memory: tegra: Correct debugfs clk rate-range on Tegra20
memory: tegra: Correct debugfs clk rate-range on Tegra30
memory: tegra: Correct debugfs clk rate-range on Tegra124
power: supply: bq27xxx_battery: Silence deferred-probe error
Domenico Andreoli (1):
hibernate: Allow uswsusp to write to swap
Eneas U de Queiroz (1):
crypto: qce - use cryptlen when adding extra sgl
Eric Biggers (1):
f2fs: fix leaking uninitialized memory in compressed clusters
Eric Sandeen (1):
ext4: do not commit super on read-only bdev
Florian Fainelli (1):
net: dsa: bcm_sf2: Fix overflow checks
Frank Rowand (4):
of: unittest: kmemleak on changeset destroy
of: unittest: kmemleak in of_unittest_platform_populate()
of: unittest: kmemleak in of_unittest_overlay_high_level()
of: overlay: kmemleak in dup_and_fixup_symbol_prop()
Frieder Schrempf (1):
mtd: spinand: Explicitly use MTD_OPS_RAW to write the bad block marker to OOB
Gabriel Krisman Bertazi (1):
um: ubd: Prevent buffer overrun on command completion
Gayatri Kammela (2):
platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID
ACPI: Update Tiger Lake ACPI device IDs
Greg Kroah-Hartman (1):
Linux 5.6.7
Grygorii Strashko (1):
dma-debug: fix displaying of dma allocation type
Guo Ren (3):
csky: Fixup cpu speculative execution to IO area
csky: Fixup get wrong psr value from phyical reg
csky: Fixup init_fpu compile warning with __init
Ilya Dryomov (3):
rbd: avoid a deadlock on header_rwsem when flushing notifies
rbd: call rbd_dev_unprobe() after unwatching and flushing notifies
rbd: don't test rbd_dev->opts in rbd_dev_image_release()
Jack Zhang (1):
drm/amdkfd: kfree the wrong pointer
Jacob Pan (3):
iommu/vt-d: Add build dependency on IOASID iommu/vt-d: Fix mm reference leak iommu/vt-d: Fix page request descriptor size
Jaegeuk Kim (2):
f2fs: fix wrong check on F2FS_IOC_FSSETXATTR
f2fs: skip GC when section is full
Jan Kara (1):
ext2: fix debug reference to ext2_xattr_cache
Jean-Philippe Brucker (1):
iommu/virtio: Fix freeing of incomplete domains
Jeffery Miller (1):
power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks.
Jernej Skrabec (2):
arm64: dts: allwinner: a64: Fix display clock register range
ARM: dts: sunxi: Fix DE2 clocks register range
Johan Jonker (2):
ARM: dts: rockchip: fix vqmmc-supply property name for rk3188-bqedison2qc
ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc
John Fastabend (2):
bpf: Test_verifier, bpf_get_stack return value add <0
bpf: Test_progs, add test to catch retval refine error handling
Jon Hunter (1):
arm64: tegra: Fix Tegra194 PCIe compatible string
Jonathan Neuschäfer (1):
docs: Fix path to MTD command line partition parser
Josh Poimboeuf (1):
objtool: Fix switch table detection in .text.unlikely
Juergen Gross (1):
x86/xen: fix booting 32-bit pv guest
Karol Herbst (1):
drm/nouveau: workaround runpm fail by disabling PCI power management on certain intel bridges
Kevin Grandemange (1):
dma-coherent: fix integer overflow in the reserved-memory dma allocation
Kunihiko Hayashi (1):
phy: uniphier-usb3ss: Add Pro5 support
Li Bin (1):
scsi: sg: add sg_remove_request in sg_common_write
Li RongQing (1):
xsk: Fix out of boundary write in __xsk_rcv_memcpy
Liwei Song (1):
nfsroot: set tcp as the default transport protocol
Long Li (1):
cifs: Allocate encryption header through kmalloc
Lucas Stach (1):
soc: imx: gpc: fix power up sequencing
Luis Henriques (1):
ceph: re-org copy_file_range and fix some error paths
Luke Nelson (2):
arm, bpf: Fix offset overflow for BPF_MEM BPF_DW arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0
Madhuparna Bhowmik (1):
btrfs: add RCU locks around block group initialization
Magnus Karlsson (1):
xsk: Add missing check on user supplied headroom size
Martin Fuzzey (1):
ARM: dts: imx6: Use gpc for FEC interrupt controller to fix wake on LAN.
Maxime Roussin-Bélanger (1):
iio: si1133: read 24-bit signed integer for measurement
Michael Roth (1):
KVM: PPC: Book3S HV: Fix H_CEDE return code for nested guests
Michael Walle (1):
watchdog: sp805: fix restart handler
Miroslav Benes (1):
x86/xen: Make the boot CPU idle task reliable
Misono Tomohiro (1):
NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails
Murphy Zhou (1):
NFSv4.2: error out when relink swapfile
Nathan Chancellor (2):
powerpc/maple: Fix declaration made after definition
fbmem: Adjust indentation in fb_prepare_logo and fb_blank
Nicolas Saenz Julienne (1):
drm/vc4: Fix HDMI mode validation
Olga Kornievskaia (1):
SUNRPC: fix krb5p mount to provide large enough buffer in rq_rcvsize
Pablo Neira Ayuso (1):
netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type
Paolo Valente (3):
block, bfq: turn put_queue into release_process_ref in __bfq_bic_change_cgroup block, bfq: make reparent_leaf_entity actually work only on leaf entities block, bfq: invoke flush_idle_tree after reparent_active_queues in pd_offline
Paul E. McKenney (1):
locktorture: Print ratio of acquisitions, not failures
Prashant Malani (1):
mfd: cros_ec: Check DT node for usbpd-notify add
Qian Cai (3):
percpu_counter: fix a data race at vm_committed_as
x86: ACPI: fix CPU hotplug deadlock
iommu/vt-d: Silence RCU-list debugging warning in dmar_find_atsr()
Ralph Campbell (2):
drm/nouveau/svm: check for SVM initialized before migrating drm/nouveau/svm: fix vma range check for migration
Randy Dunlap (1):
ext2: fix empty body warnings when -Wextra is used
Ricardo Ribalda Delgado (1):
leds: core: Fix warning message when init_data
Rob Herring (1):
dt-bindings: thermal: tsens: Fix nvmem-cell-names schema
Roman Gushchin (1):
ext4: use non-movable memory for superblock readahead
Russell King (1):
arm64: dts: clearfog-gt-8k: set gigabit PHY reset deassert delay
Sahitya Tummala (3):
f2fs: fix the panic in do_checkpoint()
f2fs: Fix mount failure due to SPO after a successful online resize FS
f2fs: Add a new CP flag to help fsck fix resize SPO issues
Slava Bacherikov (1):
kbuild, btf: Fix dependencies for DEBUG_INFO_BTF
Sowjanya Komatineni (1):
clk: tegra: Fix Tegra PMC clock out parents
Stefano Brivio (1):
netfilter: nft_set_rbtree: Drop spurious condition for overlap detection on insertion
Stephen Boyd (1):
clk: Don't cache errors from clk_ops::get_phase()
Stephen Rothwell (1):
tty: evh_bytechan: Fix out of bounds accesses
Steven Price (1):
include/linux/swapops.h: correct guards for non_swap_entry()
Takashi Iwai (2):
ALSA: hda: Honor PM disablement in PM freeze and thaw_noirq ops
ALSA: hda: Don't release card at firmware loading error
Thomas Richter (1):
s390/cpum_sf: Fix wrong page count in error message
Tianyu Lan (6):
x86/Hyper-V: Unload vmbus channel in hv panic callback x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump x86/Hyper-V: Trigger crash enlightenment only once during system crash. x86/Hyper-V: Report crash register data or kmsg before running crash kernel x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set x86/Hyper-V: Report crash data in die() when panic_on_oops is set
Tomasz Maciej Nowak (1):
arm64: dts: marvell: espressobin: add ethernet alias
Tommi Rantala (1):
xfs: fix regression in "cleanup xfs_dir2_block_getdents"
Torsten Duwe (1):
s390/crypto: explicitly memzero stack key material in aes_s390.c
Trond Myklebust (3):
NFS: alloc_nfs_open_context() must use the file cred when available NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid()
NFS: Fix memory leaks in nfs_pageio_stop_mirroring()
Vegard Nossum (1):
compiler.h: fix error in BUILD_BUG_ON() reporting
Vidya Sagar (1):
arm64: tegra: Add PCIe endpoint controllers nodes for Tegra194
Waiman Long (1):
KEYS: Don't write out to userspace while holding key semaphore
Wen Yang (1):
mtd: phram: fix a double free issue in error path
Willy Wolff (1):
thermal/drivers/cpufreq_cooling: Fix return of cpufreq_set_cur_state
Yicheng Li (1):
platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW
Yuantian Tang (1):
thermal: qoriq: Fix a compiling issue
Zenghui Yu (1):
irqchip/mbigen: Free msi_desc on device teardown
xinhui pan (1):
drm/ttm: flush the fence on the bo after we individualize the reservation object
Greg KH
maintainerDocumentation/admin-guide/kernel-parameters.txt +1 -1
@@ -2795,7 +2795,7 @@ <name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>] mtdparts= [MTD] - See drivers/mtd/cmdlinepart.c. + See drivers/mtd/parsers/cmdlinepart.c multitce=off [PPC] This parameter disables the use of the pSeries firmware feature for updating multiple TCE entries
Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt +1 -1
@@ -118,7 +118,7 @@ Tegra194: -------- pcie@14180000 { - compatible = "nvidia,tegra194-pcie", "snps,dw-pcie"; + compatible = "nvidia,tegra194-pcie"; power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8B>; reg = <0x00 0x14180000 0x0 0x00020000 /* appl registers (128K) */ 0x00 0x38000000 0x0 0x00040000 /* configuration space (256K) */
Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +4 -5
@@ -53,13 +53,12 @@ properties: description: Reference to an nvmem node for the calibration data - nvmem-cells-names: + nvmem-cell-names: minItems: 1 maxItems: 2 items: - - enum: - - caldata - - calsel + - const: calib + - const: calib_sel "#qcom,sensors": allOf:
@@ -125,7 +124,7 @@ examples: <0x4a8000 0x1000>; /* SROT */ nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; - nvmem-cell-names = "caldata", "calsel"; + nvmem-cell-names = "calib", "calib_sel"; interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "uplow";
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm/boot/dts/imx6qdl.dtsi +2 -3
@@ -1039,9 +1039,8 @@ fec: ethernet@2188000 { compatible = "fsl,imx6q-fec"; reg = <0x02188000 0x4000>; interrupt-names = "int0", "pps"; - interrupts-extended = - <&intc 0 118 IRQ_TYPE_LEVEL_HIGH>, - <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>, + <0 119 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET_REF>;
arch/arm/boot/dts/imx6qp.dtsi +0 -1
@@ -77,7 +77,6 @@ prg2: prg@21cd000 { }; &fec { - /delete-property/interrupts-extended; interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>, <0 119 IRQ_TYPE_LEVEL_HIGH>; };
arch/arm/boot/dts/rk3188-bqedison2qc.dts +17 -12
@@ -58,20 +58,25 @@ gpio-poweroff { lvds-encoder { compatible = "ti,sn75lvds83", "lvds-encoder"; - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - lvds_in_vop0: endpoint { - remote-endpoint = <&vop0_out_lvds>; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + lvds_in_vop0: endpoint { + remote-endpoint = <&vop0_out_lvds>; + }; }; - }; - port@1 { - reg = <1>; - lvds_out_panel: endpoint { - remote-endpoint = <&panel_in_lvds>; + port@1 { + reg = <1>; + + lvds_out_panel: endpoint { + remote-endpoint = <&panel_in_lvds>; + }; }; }; };
@@ -465,7 +470,7 @@ &mmc1 { non-removable; pinctrl-names = "default"; pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>; - vmmcq-supply = <&vccio_wl>; + vqmmc-supply = <&vccio_wl>; #address-cells = <1>; #size-cells = <0>; status = "okay";
arch/arm/boot/dts/sun8i-a83t.dtsi +1 -1
@@ -314,7 +314,7 @@ soc { display_clocks: clock@1000000 { compatible = "allwinner,sun8i-a83t-de2-clk"; - reg = <0x01000000 0x100000>; + reg = <0x01000000 0x10000>; clocks = <&ccu CLK_BUS_DE>, <&ccu CLK_PLL_DE>; clock-names = "bus",
arch/arm/boot/dts/sun8i-r40.dtsi +1 -1
@@ -119,7 +119,7 @@ soc { display_clocks: clock@1000000 { compatible = "allwinner,sun8i-r40-de2-clk", "allwinner,sun8i-h3-de2-clk"; - reg = <0x01000000 0x100000>; + reg = <0x01000000 0x10000>; clocks = <&ccu CLK_BUS_DE>, <&ccu CLK_DE>; clock-names = "bus",
arch/arm/boot/dts/sun8i-v3s.dtsi +1 -1
@@ -105,7 +105,7 @@ soc { display_clocks: clock@1000000 { compatible = "allwinner,sun8i-v3s-de2-clk"; - reg = <0x01000000 0x100000>; + reg = <0x01000000 0x10000>; clocks = <&ccu CLK_BUS_DE>, <&ccu CLK_DE>; clock-names = "bus",
arch/arm/boot/dts/sunxi-h3-h5.dtsi +1 -1
@@ -114,7 +114,7 @@ soc { display_clocks: clock@1000000 { /* compatible is in per SoC .dtsi file */ - reg = <0x01000000 0x100000>; + reg = <0x01000000 0x10000>; clocks = <&ccu CLK_BUS_DE>, <&ccu CLK_DE>; clock-names = "bus",
arch/arm/net/bpf_jit_32.c +34 -18
87 lines not on this page · raw message
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +1 -1
@@ -264,7 +264,7 @@ bus@1000000 { display_clocks: clock@0 { compatible = "allwinner,sun50i-a64-de2-clk"; - reg = <0x0 0x100000>; + reg = <0x0 0x10000>; clocks = <&ccu CLK_BUS_DE>, <&ccu CLK_DE>; clock-names = "bus",
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi +6 -0
@@ -13,6 +13,12 @@ #include "armada-372x.dtsi" / { + aliases { + ethernet0 = ð0; + serial0 = &uart0; + serial1 = &uart1; + }; + chosen { stdout-path = "serial0:115200n8"; };
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +1 -0
@@ -367,6 +367,7 @@ ge_phy: ethernet-phy@0 { pinctrl-0 = <&cp0_copper_eth_phy_reset>; reset-gpios = <&cp0_gpio2 11 GPIO_ACTIVE_LOW>; reset-assert-us = <10000>; + reset-deassert-us = <10000>; }; switch0: switch0@4 {
arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi +4 -4
@@ -17,7 +17,7 @@ cpus { cpu0: cpu@0 { device_type = "cpu"; - compatible = "arm,cortex-a72", "arm,armv8"; + compatible = "arm,cortex-a72"; reg = <0x000>; enable-method = "psci"; #cooling-cells = <2>;
@@ -32,7 +32,7 @@ cpu0: cpu@0 { }; cpu1: cpu@1 { device_type = "cpu"; - compatible = "arm,cortex-a72", "arm,armv8"; + compatible = "arm,cortex-a72"; reg = <0x001>; enable-method = "psci"; #cooling-cells = <2>;
@@ -47,7 +47,7 @@ cpu1: cpu@1 { }; cpu2: cpu@100 { device_type = "cpu"; - compatible = "arm,cortex-a72", "arm,armv8"; + compatible = "arm,cortex-a72"; reg = <0x100>; enable-method = "psci"; #cooling-cells = <2>;
@@ -62,7 +62,7 @@ cpu2: cpu@100 { }; cpu3: cpu@101 { device_type = "cpu"; - compatible = "arm,cortex-a72", "arm,armv8"; + compatible = "arm,cortex-a72"; reg = <0x101>; enable-method = "psci"; #cooling-cells = <2>;
arch/arm64/boot/dts/nvidia/tegra194.dtsi +105 -6
153 lines not on this page · raw message
arch/csky/abiv1/inc/abi/entry.h +1 -4
@@ -172,10 +172,7 @@ addi r6, 0xe cpwcr r6, cpcr30 - lsri r6, 28 - addi r6, 2 - lsli r6, 28 - addi r6, 0xe + movi r6, 0 cpwcr r6, cpcr31 .endm
arch/csky/abiv2/fpu.c +0 -5
@@ -10,11 +10,6 @@#define MTCR_DIST 0xC0006420#define MFCR_DIST 0xC0006020 -void __init init_fpu (void ) -{ -mtcr ("cr<1, 2>" ,0 ); -} -/* * fpu_libc_helper() is to help libc to excute: * - mfcr %a, cr<1, 2>
arch/csky/abiv2/inc/abi/entry.h +2 -5
@@ -230,11 +230,8 @@ addi r6, 0x1ce mtcr r6, cr<30, 15> /* Set MSA0 */ - lsri r6, 28 - addi r6, 2 - lsli r6, 28 - addi r6, 0x1ce - mtcr r6, cr<31, 15> /* Set MSA1 */ + movi r6, 0 + mtcr r6, cr<31, 15> /* Clr MSA1 *//* enable MMU */ mfcr r6, cr18
arch/csky/abiv2/inc/abi/fpu.h +2 -1
@@ -9,7 +9,8 @@int fpu_libc_helper (struct pt_regs *regs);void fpu_fpe (struct pt_regs *regs); -void __init init_fpu (void ); + +static inline void init_fpu (void ) {mtcr ("cr<1, 2>" ,0 ); }void save_to_user_fp (struct user_fp *user_fp);void restore_from_user_fp (struct user_fp *user_fp);
arch/csky/include/asm/processor.h +1 -0
@@ -43,6 +43,7 @@ extern struct cpuinfo_csky cpu_data[];struct thread_struct {unsigned long ksp;/* kernel stack pointer */ unsigned long sr;/* saved status register */ +unsigned long trap_no;/* saved status register */ /* FPU regs */ struct user_fp __aligned(16) user_fp;
arch/csky/kernel/head.S +5 -0
@@ -21,6 +21,11 @@ END(_start) ENTRY(_start_smp_secondary) SETUP_MMU + /* copy msa1 from CPU0 */ + lrw r6, secondary_msa1 + ld.w r6, (r6, 0) + mtcr r6, cr<31, 15> + /* set stack point */ lrw r6, secondary_stack ld.w r6, (r6, 0)
arch/csky/kernel/setup.c +14 -49
94 lines not on this page · raw message
arch/csky/kernel/smp.c +6 -0
@@ -22,6 +22,9 @@#include <asm/sections.h> #include <asm/mmu_context.h> #include <asm/pgalloc.h> +#ifdef CONFIG_CPU_HAS_FPU +#include <abi/fpu.h> +#endif struct ipi_data_struct {unsigned long bits____cacheline_aligned ;
@@ -156,6 +159,8 @@ volatile unsigned int secondary_hint;volatile unsigned int secondary_ccr;volatile unsigned int secondary_stack; +unsigned long secondary_msa1; +int __cpu_up (unsigned int cpu,struct task_struct *tidle) {unsigned long mask =1 << cpu;
@@ -164,6 +169,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) (unsigned int )task_stack_page (tidle) +THREAD_SIZE -8 ; secondary_hint =mfcr ("cr31" ); secondary_ccr =mfcr ("cr18" ); + secondary_msa1 =read_mmu_msa1 ();/* * Because other CPUs are in reset status, we must flush data
arch/csky/kernel/traps.c +10 -1
@@ -115,8 +115,9 @@ asmlinkage void trap_c(struct pt_regs *regs)int sig;unsigned long vector;siginfo_t info; +struct task_struct *tsk = current; - vector = (mfcr ("psr" ) >>16 ) &0xff ; + vector = (regs->sr >>16 ) &0xff ;switch (vector) {case VEC_ZERODIV :
@@ -129,6 +130,7 @@ asmlinkage void trap_c(struct pt_regs *regs) sig =SIGTRAP ;break ;case VEC_ILLEGAL : + tsk->thread.trap_no = vector;die_if_kernel ("Kernel mode ILLEGAL" , regs, vector);#ifndef CONFIG_CPU_NO_USER_BKPT if (*(uint16_t *)instruction_pointer (regs) !=USR_BKPT )
@@ -146,16 +148,20 @@ asmlinkage void trap_c(struct pt_regs *regs) sig =SIGTRAP ;break ;case VEC_ACCESS : + tsk->thread.trap_no = vector;return buserr (regs);#ifdef CONFIG_CPU_NEED_SOFTALIGN case VEC_ALIGN : + tsk->thread.trap_no = vector;return csky_alignment (regs);#endif #ifdef CONFIG_CPU_HAS_FPU case VEC_FPE : + tsk->thread.trap_no = vector;die_if_kernel ("Kernel mode FPE" , regs, vector);return fpu_fpe (regs);case VEC_PRIV : + tsk->thread.trap_no = vector;die_if_kernel ("Kernel mode PRIV" , regs, vector);if (fpu_libc_helper (regs))return ;
@@ -164,5 +170,8 @@ asmlinkage void trap_c(struct pt_regs *regs) sig =SIGSEGV ;break ; } + + tsk->thread.trap_no = vector; +send_sig (sig, current,0 ); }
arch/csky/mm/fault.c +7 -0
@@ -179,11 +179,14 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, bad_area_nosemaphore:/* User mode accesses just cause a SIGSEGV */ if (user_mode (regs)) { + tsk->thread.trap_no = (regs->sr >>16 ) &0xff ;force_sig_fault (SIGSEGV , si_code, (void __user *)address);return ; } no_context: + tsk->thread.trap_no = (regs->sr >>16 ) &0xff ; +/* Are we prepared to handle this kernel fault? */ if (fixup_exception (regs))return ;
@@ -198,6 +201,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,die_if_kernel ("Oops" , regs, write); out_of_memory: + tsk->thread.trap_no = (regs->sr >>16 ) &0xff ; +/* * We ran out of memory, call the OOM killer, and return the userspace * (which will retry the fault, or kill us if we got oom-killed).
@@ -206,6 +211,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,return ; do_sigbus: + tsk->thread.trap_no = (regs->sr >>16 ) &0xff ; +up_read (&mm->mmap_sem);/* Kernel mode? Handle exceptions or die */
arch/mips/boot/dts/ingenic/ci20.dts +5 -0
@@ -62,6 +62,11 @@ eth0_power: fixedregulator@0 { enable-active-high; }; + ir: ir { + compatible = "gpio-ir-receiver"; + gpios = <&gpe 3 GPIO_ACTIVE_LOW>; + }; + wlan0_power: fixedregulator@1 { compatible = "regulator-fixed"; regulator-name = "wlan0_power";
arch/powerpc/kernel/prom_init.c +3 -0
@@ -1773,6 +1773,9 @@ static void __init prom_rtas_os_term(char *str)if (token ==0 )prom_panic ("Could not get token for ibm,os-term\n" ); os_term_args.token =cpu_to_be32 (token); + os_term_args.nargs =cpu_to_be32 (1 ); + os_term_args.nret =cpu_to_be32 (1 ); + os_term_args.args[0 ] =cpu_to_be32 (__pa (str)); prom_rtas_hcall((uint64_t)&os_term_args); }#endif /* CONFIG_PPC_SVM */
arch/powerpc/kvm/book3s_hv.c +1 -0
@@ -3616,6 +3616,7 @@ int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit,if (trap ==BOOK3S_INTERRUPT_SYSCALL && !vcpu->arch.nested &&kvmppc_get_gpr (vcpu,3 ) ==H_CEDE ) {kvmppc_nested_cede (vcpu); +kvmppc_set_gpr (vcpu,3 ,0 ); trap =0 ; } }else {
arch/powerpc/platforms/maple/setup.c +17 -17
@@ -291,23 +291,6 @@ static int __init maple_probe(void)return 1 ; } -define_machine (maple) { - .name = "Maple", - .probe = maple_probe, - .setup_arch = maple_setup_arch, - .init_IRQ = maple_init_IRQ, - .pci_irq_fixup = maple_pci_irq_fixup, - .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq, - .restart = maple_restart, - .halt = maple_halt, - .get_boot_time = maple_get_boot_time, - .set_rtc_time = maple_set_rtc_time, - .get_rtc_time = maple_get_rtc_time, - .calibrate_decr = generic_calibrate_decr, - .progress = maple_progress, - .power_save = power4_idle, -}; -#ifdef CONFIG_EDAC /* * Register a platform device for CPC925 memory controller on
@@ -364,3 +347,20 @@ static int __init maple_cpc925_edac_setup(void) }machine_device_initcall (maple, maple_cpc925_edac_setup);#endif + +define_machine (maple) { + .name = "Maple", + .probe = maple_probe, + .setup_arch = maple_setup_arch, + .init_IRQ = maple_init_IRQ, + .pci_irq_fixup = maple_pci_irq_fixup, + .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq, + .restart = maple_restart, + .halt = maple_halt, + .get_boot_time = maple_get_boot_time, + .set_rtc_time = maple_set_rtc_time, + .get_rtc_time = maple_get_rtc_time, + .calibrate_decr = generic_calibrate_decr, + .progress = maple_progress, + .power_save = power4_idle, +};
arch/s390/crypto/aes_s390.c +3 -0
@@ -342,6 +342,7 @@ static int cbc_aes_crypt(struct skcipher_request *req, unsigned long modifier)memcpy (walk.iv, param.iv,AES_BLOCK_SIZE ); ret =skcipher_walk_done (&walk, nbytes - n); } +memzero_explicit (¶m,sizeof (param));return ret; }
@@ -470,6 +471,8 @@ static int xts_aes_crypt(struct skcipher_request *req, unsigned long modifier) walk.dst.virt.addr, walk.src.virt.addr, n); ret =skcipher_walk_done (&walk, nbytes - n); } +memzero_explicit (&pcc_param,sizeof (pcc_param)); +memzero_explicit (&xts_param,sizeof (xts_param));return ret; }
arch/s390/kernel/perf_cpum_sf.c +3 -1
@@ -1576,6 +1576,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)unsigned long range =0 , size;unsigned long long overflow =0 ;struct perf_output_handle *handle = &cpuhw->handle; +unsigned long num_sdb; aux =perf_get_aux (handle);if (WARN_ON_ONCE (!aux))
@@ -1587,13 +1588,14 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw) size >> PAGE_SHIFT);perf_aux_output_end (handle, size); + num_sdb = aux->sfb.num_sdb;while (!done) {/* Get an output handle */ aux =perf_aux_output_begin (handle, cpuhw->event);if (handle->size ==0 ) {pr_err ("The AUX buffer with %lu pages for the " "diagnostic-sampling mode is full\n" , - aux->sfb.num_sdb); + num_sdb);debug_sprintf_event (sfdbg,1 ,"%s: AUX buffer used up\n" , __func__);
arch/s390/kernel/processor.c +4 -1
@@ -165,8 +165,9 @@ static void show_cpu_mhz(struct seq_file *m, unsigned long n)static int show_cpuinfo (struct seq_file *m,void *v) {unsigned long n = (unsigned long ) v -1 ; +unsigned long first =cpumask_first (cpu_online_mask); -if (!n) +if (n == first)show_cpu_summary (m, v);if (!machine_has_cpu_mhz)return 0 ;
@@ -179,6 +180,8 @@ static inline void *c_update(loff_t *pos) {if (*pos) *pos =cpumask_next (*pos -1 , cpu_online_mask); +else + *pos =cpumask_first (cpu_online_mask);return *pos < nr_cpu_ids ? (void *)*pos +1 :NULL ; }
arch/s390/mm/gmap.c +1 -0
@@ -1844,6 +1844,7 @@ int gmap_shadow_r3t(struct gmap *sg, unsigned long saddr, unsigned long r3t, goto out_free; }else if (*table & _REGION_ENTRY_ORIGIN) { rc = -EAGAIN ;/* Race with shadow */ + goto out_free; }crst_table_init (s_r3t, _REGION3_ENTRY_EMPTY);/* mark as invalid as long as the parent table is not protected */
arch/um/drivers/ubd_kern.c +3 -1
@@ -1607,7 +1607,9 @@ int io_thread(void *arg) written =0 ; do { - res = os_write_file(kernel_fd, ((char *) io_req_buffer) + written, n); + res = os_write_file(kernel_fd, + ((char *) io_req_buffer) + written, + n - written); if (res >= 0) { written += res; }
arch/um/os-Linux/file.c +1 -0
@@ -8,6 +8,7 @@#include <errno.h> #include <fcntl.h> #include <signal.h> +#include <linux/falloc.h> #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/socket.h>
arch/x86/hyperv/hv_init.c +5 -1
@@ -20,6 +20,7 @@#include <linux/mm.h> #include <linux/hyperv.h> #include <linux/slab.h> +#include <linux/kernel.h> #include <linux/cpuhotplug.h> #include <linux/syscore_ops.h> #include <clocksource/hyperv_timer.h>
@@ -419,11 +420,14 @@ void hyperv_cleanup(void) }EXPORT_SYMBOL_GPL (hyperv_cleanup); -void hyperv_report_panic (struct pt_regs *regs,long err) +void hyperv_report_panic (struct pt_regs *regs,long err,bool in_die) {static bool panic_reported;u64 guest_id; +if (in_die && !panic_on_oops) +return ; +/* * We prefer to report panic on 'die' chain as we have proper * registers to report, but if we miss it (e.g. on BUG()) we need
arch/x86/kernel/acpi/cstate.c +2 -1
@@ -161,7 +161,8 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu,/* Make sure we are running on right CPU */ - retval =work_on_cpu (cpu, acpi_processor_ffh_cstate_probe_cpu, cx); + retval =call_on_cpu (cpu, acpi_processor_ffh_cstate_probe_cpu, cx, + false);if (retval ==0 ) {/* Use the hint in CST */ percpu_entry->states[cx->index].eax = cx->address;
arch/x86/kernel/cpu/mshyperv.c +10 -0
@@ -263,6 +263,16 @@ static void __init ms_hyperv_init_platform(void)cpuid_eax (HYPERV_CPUID_NESTED_FEATURES ); } +/* +* Hyper-V expects to get crash register data or kmsg when +* crash enlightment is available and system crashes. Set +* crash_kexec_post_notifiers to be true to make sure that +* calling crash enlightment interface before running kdump +* kernel. +*/ +if (ms_hyperv.misc_features &HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE ) + crash_kexec_post_notifiers = true; +#ifdef CONFIG_X86_LOCAL_APIC if (ms_hyperv.features &HV_X64_ACCESS_FREQUENCY_MSRS && ms_hyperv.misc_features &HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ) {
arch/x86/xen/xen-head.S +6 -2
@@ -35,7 +35,11 @@ SYM_CODE_START(startup_xen) rep __ASM_SIZE(stos) mov %_ASM_SI, xen_start_info - mov $init_thread_union+THREAD_SIZE, %_ASM_SP +#ifdef CONFIG_X86_64 + mov initial_stack(%rip), %rsp +#else + mov initial_stack, %esp +#endif #ifdef CONFIG_X86_64 /* Set up %gs.
@@ -51,7 +55,7 @@ SYM_CODE_START(startup_xen) wrmsr #endif - jmp xen_start_kernel + call xen_start_kernel SYM_CODE_END(startup_xen) __FINIT #endif
block/bfq-cgroup.c +45 -28
114 lines not on this page · raw message
block/bfq-iosched.c +0 -2
@@ -2716,8 +2716,6 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq) } } - -static void bfq_release_process_ref (struct bfq_data *bfqd,struct bfq_queue *bfqq) {/*
block/bfq-iosched.h +1 -0
@@ -955,6 +955,7 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq, bool compensate, enum bfqq_expiration reason);void bfq_put_queue (struct bfq_queue *bfqq);void bfq_end_wr_async_queues (struct bfq_data *bfqd,struct bfq_group *bfqg); +void bfq_release_process_ref (struct bfq_data *bfqd,struct bfq_queue *bfqq);void bfq_schedule_dispatch (struct bfq_data *bfqd);void bfq_put_async_queues (struct bfq_data *bfqd,struct bfq_group *bfqg);
drivers/acpi/acpica/acnamesp.h +2 -0
@@ -256,6 +256,8 @@ u32 acpi_ns_build_normalized_path(struct acpi_namespace_node *node, char *full_path, u32 path_size, u8 no_trailing); +void acpi_ns_normalize_pathname (char *original_path); +char *acpi_ns_get_normalized_pathname (struct acpi_namespace_node *node,u8 no_trailing);
drivers/acpi/acpica/dbinput.c +7 -9
@@ -468,16 +468,14 @@ char *acpi_db_get_next_token(char *string,return (NULL ); } -/* Remove any spaces at the beginning */ +/* Remove any spaces at the beginning, ignore blank lines */ -if (*string ==' ' ) { -while (*string && (*string ==' ' )) { - string++; - } +while (*string &&isspace (*string)) { + string++; + } -if (!(*string)) { -return (NULL ); - } +if (!(*string)) { +return (NULL ); }switch (*string) {
@@ -570,7 +568,7 @@ char *acpi_db_get_next_token(char *string,/* Find end of token */ -while (*string && (*string !=' ' )) { +while (*string && !isspace (*string)) { string++; }break ;
drivers/acpi/acpica/dswexec.c +33 -0
@@ -16,6 +16,9 @@#include "acinterp.h" #include "acnamesp.h" #include "acdebug.h" +#ifdef ACPI_EXEC_APP +#include "aecommon.h" +#endif #define _COMPONENT ACPI_DISPATCHERACPI_MODULE_NAME ("dswexec" )
@@ -329,6 +332,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)u32 op_class;union acpi_parse_object *next_op;union acpi_parse_object *first_arg; +#ifdef ACPI_EXEC_APP +char *namepath; +union acpi_operand_object *obj_desc; +#endif ACPI_FUNCTION_TRACE_PTR (ds_exec_end_op, walk_state);
@@ -537,6 +544,32 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) status =acpi_ds_eval_buffer_field_operands (walk_state, op); +if (ACPI_FAILURE (status)) { +break ; + } +#ifdef ACPI_EXEC_APP +/* +* acpi_exec support for namespace initialization file (initialize +* buffer_fields in this code.) +*/ + namepath = +acpi_ns_get_external_pathname (op->common.node); + status =ae_lookup_init_file_entry (namepath, &obj_desc); +if (ACPI_SUCCESS (status)) { + status = +acpi_ex_write_data_to_field (obj_desc, + op->common. + node->object, +NULL ); + if ACPI_FAILURE + (status) { +ACPI_EXCEPTION ((AE_INFO , status, +"While writing to buffer field" )); + } + } +ACPI_FREE (namepath); + status =AE_OK ; +#endif break ;case AML_TYPE_CREATE_OBJECT :
drivers/acpi/acpica/dswload.c +0 -2
@@ -14,7 +14,6 @@#include "acdispat.h" #include "acinterp.h" #include "acnamesp.h" -#ifdef ACPI_ASL_COMPILER #include "acdisasm.h" #endif
@@ -399,7 +398,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)union acpi_parse_object *op;acpi_object_type object_type;acpi_status status =AE_OK ; -#ifdef ACPI_ASL_COMPILER u8 param_count;#endif
drivers/acpi/acpica/dswload2.c +35 -0
@@ -15,6 +15,9 @@#include "acinterp.h" #include "acnamesp.h" #include "acevents.h" +#ifdef ACPI_EXEC_APP +#include "aecommon.h" +#endif #define _COMPONENT ACPI_DISPATCHERACPI_MODULE_NAME ("dswload2" )
@@ -373,6 +376,10 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)struct acpi_namespace_node *new_node;u32 i;u8 region_space; +#ifdef ACPI_EXEC_APP +union acpi_operand_object *obj_desc; +char *namepath; +#endif ACPI_FUNCTION_TRACE (ds_load2_end_op);
@@ -466,6 +473,11 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)* be evaluated later during the execution phase */ status =acpi_ds_create_buffer_field (op, walk_state); +if (ACPI_FAILURE (status)) { +ACPI_EXCEPTION ((AE_INFO , status, +"CreateBufferField failure" )); + goto cleanup; + }break ;case AML_TYPE_NAMED_FIELD :
@@ -604,6 +616,29 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)case AML_NAME_OP : status =acpi_ds_create_node (walk_state, node, op); +if (ACPI_FAILURE (status)) { + goto cleanup; + } +#ifdef ACPI_EXEC_APP +/* +* acpi_exec support for namespace initialization file (initialize +* Name opcodes in this code.) +*/ + namepath =acpi_ns_get_external_pathname (node); + status =ae_lookup_init_file_entry (namepath, &obj_desc); +if (ACPI_SUCCESS (status)) { + +/* Detach any existing object, attach new object */ + +if (node->object) { +acpi_ns_detach_object (node); + } +acpi_ns_attach_object (node, obj_desc, + obj_desc->common.type); + } +ACPI_FREE (namepath); + status =AE_OK ; +#endif break ;case AML_METHOD_OP :
drivers/acpi/acpica/nsnames.c +1 -5
@@ -13,9 +13,6 @@#define _COMPONENT ACPI_NAMESPACEACPI_MODULE_NAME ("nsnames" ) -/* Local Prototypes */ -static void acpi_ns_normalize_pathname (char *original_path); -/******************************************************************************* * * FUNCTION: acpi_ns_get_external_pathname
@@ -30,7 +27,6 @@ static void acpi_ns_normalize_pathname(char *original_path);* for error and debug statements. * ******************************************************************************/ -char *acpi_ns_get_external_pathname (struct acpi_namespace_node *node) {char *name_buffer;
@@ -411,7 +407,7 @@ char *acpi_ns_build_prefixed_pathname(union acpi_generic_state *prefix_scope,* ******************************************************************************/ -static void acpi_ns_normalize_pathname (char *original_path) +void acpi_ns_normalize_pathname (char *original_path) {char *input_path = original_path;char *new_path_buffer;
drivers/acpi/acpica/utdelete.c +5 -4
@@ -452,13 +452,13 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)* * FUNCTION: acpi_ut_update_object_reference * -* PARAMETERS: object - Increment ref count for this object -* and all sub-objects +* PARAMETERS: object - Increment or decrement the ref count for +* this object and all sub-objects * action - Either REF_INCREMENT or REF_DECREMENT * * RETURN: Status * -* DESCRIPTION: Increment the object reference count +* DESCRIPTION: Increment or decrement the object reference count * * Object references are incremented when: * 1) An object is attached to a Node (namespace object)
@@ -492,7 +492,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action) }/* -* All sub-objects must have their reference count incremented +* All sub-objects must have their reference count updated * also. Different object types have different subobjects. */ switch (object->common.type) {
@@ -559,6 +559,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)break ; } } + next_object =NULL ;break ;
drivers/acpi/device_pm.c +1 -1
@@ -1321,8 +1321,8 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)*/ static const struct acpi_device_id special_pm_ids[] = { {"PNP0C0B" , },/* Generic ACPI fan */ - {"INT1044" , },/* Fan for Tiger Lake generation */ {"INT3404" , },/* Fan */ + {"INTC1044" , },/* Fan for Tiger Lake generation */ {} };struct acpi_device *adev =ACPI_COMPANION (dev);
drivers/acpi/dptf/dptf_power.c +1 -1
@@ -97,8 +97,8 @@ static int dptf_power_remove(struct platform_device *pdev) }static const struct acpi_device_id int3407_device_ids[] = { - {"INT1047" ,0 }, {"INT3407" ,0 }, + {"INTC1047" ,0 }, {"" ,0 }, };MODULE_DEVICE_TABLE (acpi, int3407_device_ids);
drivers/acpi/dptf/int340x_thermal.c +4 -4
@@ -13,10 +13,6 @@#define INT3401_DEVICE 0X01static const struct acpi_device_id int340x_thermal_device_ids[] = { - {"INT1040" }, - {"INT1043" }, - {"INT1044" }, - {"INT1047" }, {"INT3400" }, {"INT3401" ,INT3401_DEVICE }, {"INT3402" },
@@ -28,6 +24,10 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { {"INT3409"}, {"INT340A"}, {"INT340B"}, + {"INTC1040"}, + {"INTC1043"}, + {"INTC1044"}, + {"INTC1047"}, {""}, };
drivers/acpi/processor_throttling.c +0 -7
@@ -897,13 +897,6 @@ static long __acpi_processor_get_throttling(void *data)return pr->throttling.acpi_processor_get_throttling (pr); } -static int call_on_cpu (int cpu,long (*fn)(void *),void *arg,bool direct) -{ -if (direct || (is_percpu_thread () && cpu ==smp_processor_id ())) -return fn (arg); -return work_on_cpu (cpu, fn, arg); -} -static int acpi_processor_get_throttling (struct acpi_processor *pr) {if (!pr)
drivers/block/rbd.c +18 -9
@@ -4554,6 +4554,10 @@ static void cancel_tasks_sync(struct rbd_device *rbd_dev)cancel_work_sync (&rbd_dev->unlock_work); } +/* +* header_rwsem must not be held to avoid a deadlock with +* rbd_dev_refresh() when flushing notifies. +*/ static void rbd_unregister_watch (struct rbd_device *rbd_dev) {cancel_tasks_sync (rbd_dev);
@@ -6951,9 +6955,10 @@ static void rbd_print_dne(struct rbd_device *rbd_dev, bool is_snap)static void rbd_dev_image_release (struct rbd_device *rbd_dev) { -rbd_dev_unprobe (rbd_dev); -if (rbd_dev->opts) +if (!rbd_is_ro (rbd_dev))rbd_unregister_watch (rbd_dev); + +rbd_dev_unprobe (rbd_dev); rbd_dev->image_format =0 ;kfree (rbd_dev->spec->image_id); rbd_dev->spec->image_id =NULL ;
@@ -6964,6 +6969,9 @@ static void rbd_dev_image_release(struct rbd_device *rbd_dev)* device. If this image is the one being mapped (i.e., not a * parent), initiate a watch on its header object before using that * object to get detailed information about the rbd image. +* +* On success, returns with header_rwsem held for write if called +* with @depth == 0. */ static int rbd_dev_image_probe (struct rbd_device *rbd_dev,int depth) {
@@ -6993,11 +7001,14 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) } } +if (!depth) +down_write (&rbd_dev->header_rwsem); + ret =rbd_dev_header_info (rbd_dev);if (ret) {if (ret == -ENOENT && !need_watch)rbd_print_dne (rbd_dev, false); - goto err_out_watch; + goto err_out_probe; }/*
@@ -7042,10 +7053,11 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth)return 0 ; err_out_probe: -rbd_dev_unprobe (rbd_dev); -err_out_watch: +if (!depth) +up_write (&rbd_dev->header_rwsem);if (need_watch)rbd_unregister_watch (rbd_dev); +rbd_dev_unprobe (rbd_dev); err_out_format: rbd_dev->image_format =0 ;kfree (rbd_dev->spec->image_id);
@@ -7107,12 +7119,9 @@ static ssize_t do_rbd_add(struct bus_type *bus, goto err_out_rbd_dev; } -down_write (&rbd_dev->header_rwsem); rc =rbd_dev_image_probe (rbd_dev,0 ); -if (rc <0 ) { -up_write (&rbd_dev->header_rwsem); +if (rc <0 ) goto err_out_rbd_dev; - }if (rbd_dev->opts->alloc_size > rbd_dev->layout.object_size) { rbd_warn(rbd_dev, "alloc_size adjusted to %u",
drivers/clk/at91/clk-usb.c +3 -0
@@ -75,6 +75,9 @@ static int at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, tmp_parent_rate = req->rate * div; tmp_parent_rate =clk_hw_round_rate (parent, tmp_parent_rate); +if (!tmp_parent_rate) +continue ; + tmp_rate =DIV_ROUND_CLOSEST (tmp_parent_rate, div);if (tmp_rate < req->rate) tmp_diff = req->rate - tmp_rate;
drivers/clk/clk.c +32 -16
94 lines not on this page · raw message
drivers/clk/imx/clk-pll14xx.c +2 -0
@@ -55,8 +55,10 @@ static const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { };static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { +PLL_1443X_RATE (1039500000U ,173 ,2 ,1 ,16384 ),PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ),PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ), +PLL_1443X_RATE (519750000U ,173 ,2 ,2 ,16384 ),PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ),PLL_1443X_RATE (361267200U ,361 ,3 ,3 ,17511 ), };
drivers/clk/tegra/clk-tegra-pmc.c +6 -6
@@ -49,16 +49,16 @@ struct pmc_clk_init_data {static DEFINE_SPINLOCK (clk_out_lock); -static const char *clk_out1_parents[] = {"clk_m" ,"clk_m_div2" , -"clk_m_div4" ,"extern1" , +static const char *clk_out1_parents[] = {"osc" ,"osc_div2" , +"osc_div4" ,"extern1" , }; -static const char *clk_out2_parents[] = {"clk_m" ,"clk_m_div2" , -"clk_m_div4" ,"extern2" , +static const char *clk_out2_parents[] = {"osc" ,"osc_div2" , +"osc_div4" ,"extern2" , }; -static const char *clk_out3_parents[] = {"clk_m" ,"clk_m_div2" , -"clk_m_div4" ,"extern3" , +static const char *clk_out3_parents[] = {"osc" ,"osc_div2" , +"osc_div4" ,"extern3" , };static struct pmc_clk_init_data pmc_clks[] = {
drivers/crypto/qce/dma.c +6 -5
@@ -48,9 +48,10 @@ void qce_dma_release(struct qce_dma_data *dma)struct scatterlist *qce_sgtable_add (struct sg_table *sgt,struct scatterlist *new_sgl, -int max_ents) +unsigned int max_len) {struct scatterlist *sg = sgt->sgl, *sg_last =NULL ; +unsigned int new_len;while (sg) {if (!sg_page (sg))
@@ -61,13 +62,13 @@ qce_sgtable_add(struct sg_table *sgt, struct scatterlist *new_sgl,if (!sg)return ERR_PTR (-EINVAL ); -while (new_sgl && sg && max_ents) { -sg_set_page (sg,sg_page (new_sgl), new_sgl->length, - new_sgl->offset); +while (new_sgl && sg && max_len) { + new_len = new_sgl->length > max_len ? max_len : new_sgl->length; +sg_set_page (sg,sg_page (new_sgl), new_len, new_sgl->offset); sg_last = sg; sg =sg_next (sg); new_sgl =sg_next (new_sgl); - max_ents--; + max_len -= new_len; }return sg_last;
drivers/crypto/qce/dma.h +1 -1
@@ -43,6 +43,6 @@ void qce_dma_issue_pending(struct qce_dma_data *dma);int qce_dma_terminate_all (struct qce_dma_data *dma);struct scatterlist *qce_sgtable_add (struct sg_table *sgt,struct scatterlist *sg_add, -int max_ents); +unsigned int max_len);#endif /* _DMA_H_ */
drivers/crypto/qce/skcipher.c +3 -2
@@ -97,13 +97,14 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req)sg_init_one (&rctx->result_sg, qce->dma.result_buf,QCE_RESULT_BUF_SZ ); - sg =qce_sgtable_add (&rctx->dst_tbl, req->dst, rctx->dst_nents -1 ); + sg =qce_sgtable_add (&rctx->dst_tbl, req->dst, req->cryptlen);if (IS_ERR (sg)) { ret =PTR_ERR (sg); goto error_free; } - sg =qce_sgtable_add (&rctx->dst_tbl, &rctx->result_sg,1 ); + sg =qce_sgtable_add (&rctx->dst_tbl, &rctx->result_sg, +QCE_RESULT_BUF_SZ );if (IS_ERR (sg)) { ret =PTR_ERR (sg); goto error_free;
drivers/dma/idxd/device.c +2 -2
@@ -584,11 +584,11 @@ static void idxd_group_flags_setup(struct idxd_device *idxd)struct idxd_group *group = &idxd->groups[i];if (group->tc_a ==-1 ) - group->grpcfg.flags.tc_a =0 ; + group->tc_a = group->grpcfg.flags.tc_a =0 ;else group->grpcfg.flags.tc_a = group->tc_a;if (group->tc_b ==-1 ) - group->grpcfg.flags.tc_b =1 ; + group->tc_b = group->grpcfg.flags.tc_b =1 ;else group->grpcfg.flags.tc_b = group->tc_b; group->grpcfg.flags.use_token_limit = group->use_token_limit;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 -2
@@ -1104,9 +1104,9 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,return 0 ; kfd_gtt_no_free_chunk: -pr_debug ("Allocation failed with mem_obj = %p\n" , mem_obj); +pr_debug ("Allocation failed with mem_obj = %p\n" , *mem_obj);mutex_unlock (&kfd->gtt_sa_lock); -kfree (mem_obj); +kfree (*mem_obj);return -ENOMEM ; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +6 -2
@@ -113,10 +113,13 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work,if (enable_encryption) { display->adjust.disable =0 ; -if (content_type ==DRM_MODE_HDCP_CONTENT_TYPE0 ) +if (content_type ==DRM_MODE_HDCP_CONTENT_TYPE0 ) { + hdcp_w->link.adjust.hdcp1.disable =0 ; hdcp_w->link.adjust.hdcp2.force_type =MOD_HDCP_FORCE_TYPE_0 ; -else if (content_type ==DRM_MODE_HDCP_CONTENT_TYPE1 ) + }else if (content_type ==DRM_MODE_HDCP_CONTENT_TYPE1 ) { + hdcp_w->link.adjust.hdcp1.disable =1 ; hdcp_w->link.adjust.hdcp2.force_type =MOD_HDCP_FORCE_TYPE_1 ; + }schedule_delayed_work (&hdcp_w->property_validate_dwork,msecs_to_jiffies (DRM_HDCP_CHECK_PERIOD_MS ));
@@ -334,6 +337,7 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) link->dp.rev = aconnector->dc_link->dpcd_caps.dpcd_rev.raw; display->adjust.disable =1 ; link->adjust.auth_delay =2 ; + link->adjust.hdcp1.disable =0 ;hdcp_update_display (hdcp_work, link_index, aconnector,DRM_MODE_HDCP_CONTENT_TYPE0 , false); }
drivers/gpu/drm/nouveau/nouveau_drm.c +63 -0
82 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_drv.h +2 -0
@@ -140,6 +140,8 @@ struct nouveau_drm {struct list_head clients; +u8 old_pm_cap; +struct {struct agp_bridge_data *bridge;u32 base;
drivers/gpu/drm/nouveau/nouveau_svm.c +6 -0
@@ -171,6 +171,11 @@ nouveau_svmm_bind(struct drm_device *dev, void *data, mm =get_task_mm (current);down_read (&mm->mmap_sem); +if (!cli->svm.svmm) { +up_read (&mm->mmap_sem); +return -EINVAL ; + } +for (addr = args->va_start, end = args->va_start + size; addr < end;) {struct vm_area_struct *vma;unsigned long next;
@@ -179,6 +184,7 @@ nouveau_svmm_bind(struct drm_device *dev, void *data,if (!vma)break ; + addr =max (addr, vma->vm_start); next =min (vma->vm_end, end);/* This is a best effort so we ignore errors */ nouveau_dmem_migrate_vma (cli->drm, vma, addr, next);
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +26 -0
@@ -1981,8 +1981,34 @@ gf100_gr_init_(struct nvkm_gr *base) {struct gf100_gr *gr =gf100_gr (base);struct nvkm_subdev *subdev = &base->engine.subdev; +struct nvkm_device *device = subdev->device; +bool reset = device->chipset ==0x137 || device->chipset ==0x138 ;u32 ret; +/* On certain GP107/GP108 boards, we trigger a weird issue where +* GR will stop responding to PRI accesses after we've asked the +* SEC2 RTOS to boot the GR falcons. This happens with far more +* frequency when cold-booting a board (ie. returning from D3). +* +* The root cause for this is not known and has proven difficult +* to isolate, with many avenues being dead-ends. +* +* A workaround was discovered by Karol, whereby putting GR into +* reset for an extended period right before initialisation +* prevents the problem from occuring. +* +* XXX: As RM does not require any such workaround, this is more +* of a hack than a true fix. +*/ + reset =nvkm_boolopt (device->cfgopt,"NvGrResetWar" , reset); +if (reset) { +nvkm_mask (device,0x000200 ,0x00001000 ,0x00000000 ); +nvkm_rd32 (device,0x000200 ); +msleep (50 ); +nvkm_mask (device,0x000200 ,0x00001000 ,0x00001000 ); +nvkm_rd32 (device,0x000200 ); + } +nvkm_pmu_pgob (gr->base.engine.subdev.device->pmu, false); ret =nvkm_falcon_get (&gr->fecs.falcon, subdev);
drivers/gpu/drm/ttm/ttm_bo.c +3 -1
@@ -498,8 +498,10 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)dma_resv_unlock (bo->base.resv); } -if (bo->base.resv != &bo->base._resv) +if (bo->base.resv != &bo->base._resv) { +ttm_bo_flush_all_fences (bo);dma_resv_unlock (&bo->base._resv); + } error:kref_get (&bo->list_kref);
drivers/gpu/drm/vc4/vc4_hdmi.c +16 -4
@@ -681,11 +681,23 @@ static enum drm_mode_status vc4_hdmi_encoder_mode_valid(struct drm_encoder *crtc, const struct drm_display_mode *mode) { -/* HSM clock must be 108% of the pixel clock. Additionally, -* the AXI clock needs to be at least 25% of pixel clock, but -* HSM ends up being the limiting factor. +/* +* As stated in RPi's vc4 firmware "HDMI state machine (HSM) clock must +* be faster than pixel clock, infinitesimally faster, tested in +* simulation. Otherwise, exact value is unimportant for HDMI +* operation." This conflicts with bcm2835's vc4 documentation, which +* states HSM's clock has to be at least 108% of the pixel clock. +* +* Real life tests reveal that vc4's firmware statement holds up, and +* users are able to use pixel clocks closer to HSM's, namely for +* 1920x1200@60Hz. So it was decided to have leave a 1% margin between +* both clocks. Which, for RPi0-3 implies a maximum pixel clock of +* 162MHz. +* +* Additionally, the AXI clock needs to be at least 25% of +* pixel clock, but HSM ends up being the limiting factor. */ -if (mode->clock >HSM_CLOCK_FREQ / (1000 *108 /100 )) +if (mode->clock >HSM_CLOCK_FREQ / (1000 *101 /100 ))return MODE_CLOCK_HIGH ;return MODE_OK ;
drivers/hv/channel_mgmt.c +3 -0
@@ -839,6 +839,9 @@ void vmbus_initiate_unload(bool crash) {struct vmbus_channel_message_header hdr; +if (xchg (&vmbus_connection.conn_state,DISCONNECTED ) ==DISCONNECTED ) +return ; +/* Pre-Win2012R2 hosts don't support reconnect */ if (vmbus_proto_version <VERSION_WIN8_1 )return ;
drivers/hv/vmbus_drv.c +44 -18
132 lines not on this page · raw message
drivers/iio/common/st_sensors/st_sensors_core.c +4 -0
@@ -328,6 +328,8 @@ static struct st_sensors_platform_data *st_sensors_dev_probe(struct device *dev,return NULL ; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL ); +if (!pdata) +return ERR_PTR (-ENOMEM );if (!device_property_read_u32 (dev,"st,drdy-int-pin" , &val) && (val <=2 )) pdata->drdy_int_pin = (u8 ) val;else
@@ -371,6 +373,8 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,/* If OF/DT pdata exists, it will take precedence of anything else */ of_pdata =st_sensors_dev_probe (indio_dev->dev.parent, pdata); +if (IS_ERR (of_pdata)) +return PTR_ERR (of_pdata);if (of_pdata) pdata = of_pdata;
drivers/iio/light/si1133.c +24 -13
@@ -102,6 +102,9 @@#define SI1133_INPUT_FRACTION_LOW 15#define SI1133_LUX_OUTPUT_FRACTION 12#define SI1133_LUX_BUFFER_SIZE 9 +#define SI1133_MEASURE_BUFFER_SIZE 3 + +#define SI1133_SIGN_BIT_INDEX 23static const int si1133_scale_available[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };
@@ -234,13 +237,13 @@ static const struct si1133_lux_coeff lux_coeff = { } }; -static int si1133_calculate_polynomial_inner (u32 input,u8 fraction,u16 mag, +static int si1133_calculate_polynomial_inner (s32 input,u8 fraction,u16 mag,s8 shift) {return ((input << fraction) / mag) << shift; } -static int si1133_calculate_output (u32 x,u32 y,u8 x_order,u8 y_order, +static int si1133_calculate_output (s32 x,s32 y,u8 x_order,u8 y_order,u8 input_fraction,s8 sign,const struct si1133_coeff *coeffs) {
@@ -276,7 +279,7 @@ static int si1133_calculate_output(u32 x, u32 y, u8 x_order, u8 y_order,* The algorithm is from: * https://siliconlabs.github.io/Gecko_SDK_Doc/efm32zg/html/si1133_8c_source.html#l00716 */ -static int si1133_calc_polynomial (u32 x,u32 y,u8 input_fraction,u8 num_coeff, +static int si1133_calc_polynomial (s32 x,s32 y,u8 input_fraction,u8 num_coeff,const struct si1133_coeff *coeffs) {u8 x_order, y_order;
@@ -614,7 +617,7 @@ static int si1133_measure(struct si1133_data *data, {int err; -__be16 resp; +u8 buffer[SI1133_MEASURE_BUFFER_SIZE ]; err =si1133_set_adcmux (data,0 , chan->channel);if (err)
@@ -625,12 +628,13 @@ static int si1133_measure(struct si1133_data *data,if (err)return err; - err =si1133_bulk_read (data,SI1133_REG_HOSTOUT (0 ),sizeof (resp), - (u8 *)&resp); + err =si1133_bulk_read (data,SI1133_REG_HOSTOUT (0 ),sizeof (buffer), + buffer);if (err)return err; - *val =be16_to_cpu (resp); + *val =sign_extend32 ((buffer[0 ] <<16 ) | (buffer[1 ] <<8 ) | buffer[2 ], +SI1133_SIGN_BIT_INDEX );return err; }
@@ -704,9 +708,9 @@ static int si1133_get_lux(struct si1133_data *data, int *val) {int err;int lux; -u32 high_vis; -u32 low_vis; -u32 ir; +s32 high_vis; +s32 low_vis; +s32 ir;u8 buffer[SI1133_LUX_BUFFER_SIZE ];/* Activate lux channels */
@@ -719,9 +723,16 @@ static int si1133_get_lux(struct si1133_data *data, int *val)if (err)return err; - high_vis = (buffer[0 ] <<16 ) | (buffer[1 ] <<8 ) | buffer[2 ]; - low_vis = (buffer[3 ] <<16 ) | (buffer[4 ] <<8 ) | buffer[5 ]; - ir = (buffer[6 ] <<16 ) | (buffer[7 ] <<8 ) | buffer[8 ]; + high_vis = +sign_extend32 ((buffer[0 ] <<16 ) | (buffer[1 ] <<8 ) | buffer[2 ], +SI1133_SIGN_BIT_INDEX ); + + low_vis = +sign_extend32 ((buffer[3 ] <<16 ) | (buffer[4 ] <<8 ) | buffer[5 ], +SI1133_SIGN_BIT_INDEX ); + + ir =sign_extend32 ((buffer[6 ] <<16 ) | (buffer[7 ] <<8 ) | buffer[8 ], +SI1133_SIGN_BIT_INDEX );if (high_vis >SI1133_ADC_THRESHOLD || ir >SI1133_ADC_THRESHOLD ) lux = si1133_calc_polynomial(high_vis, ir,
drivers/iommu/Kconfig +1 -0
@@ -188,6 +188,7 @@ config INTEL_IOMMU select NEED_DMA_MAP_STATE select DMAR_TABLE select SWIOTLB + select IOASID help DMA remapping (DMAR) devices support enables independent address translations for Direct Memory Access (DMA) from devices.
drivers/iommu/amd_iommu_types.h +1 -1
@@ -348,7 +348,7 @@#define DTE_GCR3_VAL_A (x) (((x) >> 12) & 0x00007ULL)#define DTE_GCR3_VAL_B (x) (((x) >> 15) & 0x0ffffULL) -#define DTE_GCR3_VAL_C (x) (((x) >> 31) & 0xfffffULL) +#define DTE_GCR3_VAL_C (x) (((x) >> 31) & 0x1fffffULL)#define DTE_GCR3_INDEX_A 0#define DTE_GCR3_INDEX_B 1
drivers/iommu/intel-iommu.c +2 -1
@@ -4501,7 +4501,8 @@ static struct dmar_atsr_unit *dmar_find_atsr(struct acpi_dmar_atsr *atsr)struct dmar_atsr_unit *atsru;struct acpi_dmar_atsr *tmp; -list_for_each_entry_rcu (atsru, &dmar_atsr_units, list) { +list_for_each_entry_rcu (atsru, &dmar_atsr_units, list, +dmar_rcu_check ()) { tmp = (struct acpi_dmar_atsr *)atsru->hdr;if (atsr->segment != tmp->segment)continue ;
drivers/iommu/intel-svm.c +5 -4
@@ -531,7 +531,7 @@ struct page_req_dsc {u64 priv_data[2 ]; }; -#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x10) +#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20)static bool access_error (struct vm_area_struct *vma,struct page_req_dsc *req) {
@@ -611,14 +611,15 @@ static irqreturn_t prq_event_thread(int irq, void *d)* any faults on kernel addresses. */ if (!svm->mm) goto bad_req; -/* If the mm is already defunct, don't handle faults. */ -if (!mmget_not_zero (svm->mm)) - goto bad_req;/* If address is not canonical, return invalid response */ if (!is_canonical_address (address)) goto bad_req; +/* If the mm is already defunct, don't handle faults. */ +if (!mmget_not_zero (svm->mm)) + goto bad_req; +down_read (&svm->mm->mmap_sem); vma =find_extend_vma (svm->mm, address);if (!vma || address < vma->vm_start)
drivers/iommu/virtio-iommu.c +9 -7
@@ -613,18 +613,20 @@ static int viommu_domain_finalise(struct viommu_dev *viommu,int ret;struct viommu_domain *vdomain =to_viommu_domain (domain); - vdomain->viommu = viommu; - vdomain->map_flags = viommu->map_flags; + ret =ida_alloc_range (&viommu->domain_ids, viommu->first_domain, + viommu->last_domain,GFP_KERNEL ); +if (ret <0 ) +return ret; + + vdomain->id = (unsigned int )ret; domain->pgsize_bitmap = viommu->pgsize_bitmap; domain->geometry = viommu->geometry; - ret =ida_alloc_range (&viommu->domain_ids, viommu->first_domain, - viommu->last_domain,GFP_KERNEL ); -if (ret >=0 ) - vdomain->id = (unsigned int )ret; + vdomain->map_flags = viommu->map_flags; + vdomain->viommu = viommu; -return ret >0 ?0 : ret; +return 0 ; }static void viommu_domain_free (struct iommu_domain *domain)
drivers/irqchip/irq-mbigen.c +7 -1
@@ -220,10 +220,16 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,return 0 ; } +static void mbigen_irq_domain_free (struct irq_domain *domain,unsigned int virq, +unsigned int nr_irqs) +{ +platform_msi_domain_free (domain, virq, nr_irqs); +} +static const struct irq_domain_ops mbigen_domain_ops = { .translate = mbigen_domain_translate, .alloc = mbigen_irq_domain_alloc, - .free = irq_domain_free_irqs_common, + .free = mbigen_irq_domain_free, }; static int mbigen_of_create_domain(struct platform_device *pdev,
drivers/leds/led-class.c +1 -1
@@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent,if (ret)dev_warn (parent,"Led %s renamed to %s due to name collision" , - led_cdev->name,dev_name (led_cdev->dev)); + proposed_name,dev_name (led_cdev->dev));if (led_cdev->flags &LED_BRIGHT_HW_CHANGED ) { ret =led_add_brightness_hw_changed (led_cdev);
drivers/memory/tegra/tegra124-emc.c +5 -0
@@ -1158,6 +1158,11 @@ static void emc_debugfs_init(struct device *dev, struct tegra_emc *emc) emc->debugfs.max_rate = emc->timings[i].rate; } +if (!emc->num_timings) { + emc->debugfs.min_rate =clk_get_rate (emc->clk); + emc->debugfs.max_rate = emc->debugfs.min_rate; + } + err =clk_set_rate_range (emc->clk, emc->debugfs.min_rate, emc->debugfs.max_rate);if (err <0 ) {
drivers/memory/tegra/tegra20-emc.c +5 -0
@@ -628,6 +628,11 @@ static void tegra_emc_debugfs_init(struct tegra_emc *emc) emc->debugfs.max_rate = emc->timings[i].rate; } +if (!emc->num_timings) { + emc->debugfs.min_rate =clk_get_rate (emc->clk); + emc->debugfs.max_rate = emc->debugfs.min_rate; + } + err =clk_set_rate_range (emc->clk, emc->debugfs.min_rate, emc->debugfs.max_rate);if (err <0 ) {
drivers/memory/tegra/tegra30-emc.c +5 -0
@@ -1256,6 +1256,11 @@ static void tegra_emc_debugfs_init(struct tegra_emc *emc) emc->debugfs.max_rate = emc->timings[i].rate; } +if (!emc->num_timings) { + emc->debugfs.min_rate =clk_get_rate (emc->clk); + emc->debugfs.max_rate = emc->debugfs.min_rate; + } + err =clk_set_rate_range (emc->clk, emc->debugfs.min_rate, emc->debugfs.max_rate);if (err <0 ) {
drivers/mfd/cros_ec_dev.c +1 -1
@@ -211,7 +211,7 @@ static int ec_device_probe(struct platform_device *pdev)* explicitly added on platforms that don't have the PD notifier ACPI * device entry defined. */ -if (IS_ENABLED (CONFIG_OF )) { +if (IS_ENABLED (CONFIG_OF ) && ec->ec_dev->dev->of_node) {if (cros_ec_check_features (ec,EC_FEATURE_USB_PD )) { retval = mfd_add_hotplug_devices(ec->dev, cros_usbpd_notify_cells,
drivers/mtd/devices/phram.c +9 -6
@@ -243,22 +243,25 @@ static int phram_setup(const char *val) ret =parse_num64 (&start, token[1 ]);if (ret) { -kfree (name);parse_err ("illegal start address\n" ); + goto error; } ret =parse_num64 (&len, token[2 ]);if (ret) { -kfree (name);parse_err ("illegal device length\n" ); + goto error; } ret =register_device (name, start, len); -if (!ret) -pr_info ("%s device: %#llx at %#llx\n" , name, len, start); -else -kfree (name); +if (ret) + goto error; + +pr_info ("%s device: %#llx at %#llx\n" , name, len, start); +return 0 ; +error: +kfree (name);return ret; }
drivers/mtd/lpddr/lpddr_cmds.c +0 -1
@@ -68,7 +68,6 @@ struct mtd_info *lpddr_cmdset(struct map_info *map) shared =kmalloc_array (lpddr->numchips,sizeof (struct flchip_shared ),GFP_KERNEL );if (!shared) { -kfree (lpddr);kfree (mtd);return NULL ; }
drivers/mtd/nand/raw/nand_base.c +2 -0
@@ -5907,6 +5907,8 @@ void nand_cleanup(struct nand_chip *chip) chip->ecc.algo == NAND_ECC_BCH)nand_bch_free ((struct nand_bch_control *)chip->ecc.priv); +nanddev_cleanup (&chip->base); +/* Free bad block table memory */ kfree (chip->bbt);kfree (chip->data_buf);
drivers/mtd/nand/spi/core.c +1 -0
@@ -609,6 +609,7 @@ static int spinand_markbad(struct nand_device *nand, const struct nand_pos *pos) .ooboffs = 0, .ooblen = sizeof(marker), .oobbuf.out = marker, + .mode = MTD_OPS_RAW, };int ret;
drivers/net/dsa/bcm_sf2_cfp.c +3 -6
@@ -882,17 +882,14 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, fs->m_ext.data[1]))return -EINVAL ; -if (fs->location !=RX_CLS_LOC_ANY && fs->location >=CFP_NUM_RULES ) +if (fs->location !=RX_CLS_LOC_ANY && + fs->location >bcm_sf2_cfp_rule_size (priv))return -EINVAL ;if (fs->location !=RX_CLS_LOC_ANY &&test_bit (fs->location, priv->cfp.used))return -EBUSY ; -if (fs->location !=RX_CLS_LOC_ANY && - fs->location >bcm_sf2_cfp_rule_size (priv)) -return -EINVAL ; - ret =bcm_sf2_cfp_rule_cmp (priv, port, fs);if (ret ==0 )return -EEXIST ;
@@ -973,7 +970,7 @@ static int bcm_sf2_cfp_rule_del(struct bcm_sf2_priv *priv, int port, u32 loc)struct cfp_rule *rule;int ret; -if (loc >=CFP_NUM_RULES ) +if (loc >bcm_sf2_cfp_rule_size (priv))return -EINVAL ;/* Refuse deleting unused rules, and those that are not unique since
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +4 -0
@@ -1535,6 +1535,10 @@ static int mlx5e_set_fecparam(struct net_device *netdev,int mode;int err; +if (bitmap_weight ((unsigned long *)&fecparam->fec, +ETHTOOL_FEC_BASER_BIT +1 ) >1 ) +return -EOPNOTSUPP ; +for (mode =0 ; mode <ARRAY_SIZE (pplm_fec_2_ethtool); mode++) {if (!(pplm_fec_2_ethtool[mode] & fecparam->fec))continue ;
drivers/net/macsec.c +3 -0
@@ -2398,6 +2398,9 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)return PTR_ERR (dev); macsec =macsec_priv (dev); +if (!tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]) +return -EINVAL ; + offload =nla_get_u8 (tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]);if (macsec->offload == offload)return 0 ;
drivers/nvdimm/bus.c +4 -2
@@ -1042,8 +1042,10 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm,return -EFAULT ; } -if (!desc || (desc->out_num + desc->in_num ==0 ) || - !test_bit (cmd, &cmd_mask)) +if (!desc || + (desc->out_num + desc->in_num ==0 ) || + cmd >ND_CMD_CALL || + !test_bit (cmd, &cmd_mask))return -ENOTTY ;/* fail write commands (when read-only) */
drivers/of/overlay.c +2 -0
@@ -261,6 +261,8 @@ static struct property *dup_and_fixup_symbol_prop(of_property_set_flag (new_prop,OF_DYNAMIC ); +kfree (target_path); +return new_prop; err_free_new_prop:
drivers/of/unittest.c +13 -3
@@ -777,6 +777,10 @@ static void __init of_unittest_changeset(void)unittest (!of_changeset_revert (&chgset),"revert failed\n" );of_changeset_destroy (&chgset); + +of_node_put (n1); +of_node_put (n2); +of_node_put (n21);#endif }
@@ -1151,10 +1155,13 @@ static void __init of_unittest_platform_populate(void)of_platform_populate (np, match,NULL , &test_bus->dev);for_each_child_of_node (np, child) { -for_each_child_of_node (child, grandchild) -unittest (of_find_device_by_node (grandchild), +for_each_child_of_node (child, grandchild) { + pdev =of_find_device_by_node (grandchild); +unittest (pdev,"Could not create device for node '%pOFn'\n" , grandchild); +of_dev_put (pdev); + } }of_platform_depopulate (&test_bus->dev);
@@ -2564,8 +2571,11 @@ static __init void of_unittest_overlay_high_level(void) goto err_unlock; }if (__of_add_property (of_symbols, new_prop)) { +kfree (new_prop->name); +kfree (new_prop->value); +kfree (new_prop);/* "name" auto-generated by unflatten */ -if (!strcmp (new_prop->name,"name" )) +if (!strcmp (prop->name,"name" ))continue ;unittest (0 ,"duplicate property '%s' in overlay_base node __symbols__" , prop->name);
drivers/phy/socionext/phy-uniphier-usb3ss.c +4 -0
@@ -314,6 +314,10 @@ static const struct of_device_id uniphier_u3ssphy_match[] = { .compatible = "socionext,uniphier-pro4-usb3-ssphy", .data = &uniphier_pro4_data, }, + { + .compatible = "socionext,uniphier-pro5-usb3-ssphy", + .data = &uniphier_pro4_data, + }, { .compatible = "socionext,uniphier-pxs2-usb3-ssphy", .data = &uniphier_pxs2_data,
drivers/platform/chrome/cros_ec.c +30 -0
@@ -138,6 +138,24 @@ static int cros_ec_sleep_event(struct cros_ec_device *ec_dev, u8 sleep_event)return ret; } +static int cros_ec_ready_event (struct notifier_block *nb, +unsigned long queued_during_suspend, +void *_notify) +{ + struct cros_ec_device *ec_dev = container_of(nb, struct cros_ec_device, + notifier_ready); +u32 host_event =cros_ec_get_host_event (ec_dev); + +if (host_event &EC_HOST_EVENT_MASK (EC_HOST_EVENT_INTERFACE_READY )) { +mutex_lock (&ec_dev->lock); +cros_ec_query_all (ec_dev); +mutex_unlock (&ec_dev->lock); +return NOTIFY_OK ; + } + +return NOTIFY_DONE ; +} +/** * cros_ec_register() - Register a new ChromeOS EC, using the provided info. * @ec_dev: Device to register.
@@ -237,6 +255,18 @@ int cros_ec_register(struct cros_ec_device *ec_dev)dev_dbg (ec_dev->dev,"Error %d clearing sleep event to ec" , err); +if (ec_dev->mkbp_event_supported) { +/* +* Register the notifier for EC_HOST_EVENT_INTERFACE_READY +* event. +*/ + ec_dev->notifier_ready.notifier_call = cros_ec_ready_event; + err =blocking_notifier_chain_register (&ec_dev->event_notifier, + &ec_dev->notifier_ready); +if (err) +return err; + } +dev_info (dev,"Chrome EC device registered\n" );return 0 ;
drivers/platform/x86/intel-hid.c +1 -1
@@ -19,8 +19,8 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Alex Hung" );static const struct acpi_device_id intel_hid_ids[] = { - {"INT1051" ,0 }, {"INT33D5" ,0 }, + {"INTC1051" ,0 }, {"" ,0 }, };
drivers/power/supply/axp288_fuel_gauge.c +2 -2
@@ -706,14 +706,14 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = { { /* Intel Cherry Trail Compute Stick, Windows version */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_SYS_VENDOR, "Intel"), DMI_MATCH(DMI_PRODUCT_NAME, "STK1AW32SC"), }, }, { /* Intel Cherry Trail Compute Stick, version without an OS */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_SYS_VENDOR, "Intel"), DMI_MATCH(DMI_PRODUCT_NAME, "STK1A32SC"), }, },
drivers/power/supply/bq27xxx_battery.c +4 -1
@@ -1885,7 +1885,10 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di) di->bat =power_supply_register_no_ws (di->dev, psy_desc, &psy_cfg);if (IS_ERR (di->bat)) { -dev_err (di->dev,"failed to register battery\n" ); +if (PTR_ERR (di->bat) == -EPROBE_DEFER ) +dev_dbg (di->dev,"failed to register battery, deferring probe\n" ); +else +dev_err (di->dev,"failed to register battery\n" );return PTR_ERR (di->bat); }
drivers/rtc/rtc-88pm860x.c +8 -6
@@ -336,6 +336,10 @@ static int pm860x_rtc_probe(struct platform_device *pdev) info->dev = &pdev->dev;dev_set_drvdata (&pdev->dev, info); + info->rtc_dev =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (info->rtc_dev)) +return PTR_ERR (info->rtc_dev); + ret =devm_request_threaded_irq (&pdev->dev, info->irq,NULL , rtc_update_handler,IRQF_ONESHOT ,"rtc" , info);
@@ -377,13 +381,11 @@ static int pm860x_rtc_probe(struct platform_device *pdev) } } - info->rtc_dev =devm_rtc_device_register (&pdev->dev,"88pm860x-rtc" , - &pm860x_rtc_ops,THIS_MODULE ); - ret =PTR_ERR (info->rtc_dev); -if (IS_ERR (info->rtc_dev)) { -dev_err (&pdev->dev,"Failed to register RTC device: %d\n" , ret); + info->rtc_dev->ops = &pm860x_rtc_ops; + + ret =rtc_register_device (info->rtc_dev); +if (ret)return ret; - }/* * enable internal XO instead of internal 3.25MHz clock since it can
drivers/scsi/sg.c +3 -1
@@ -793,8 +793,10 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,"sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n" , (int) cmnd[0], (int) hp->cmd_len)); -if (hp->dxfer_len >=SZ_256M ) +if (hp->dxfer_len >=SZ_256M ) { +sg_remove_request (sfp, srp);return -EINVAL ; + } k =sg_start_req (srp, cmnd);if (k) {
drivers/soc/imx/gpc.c +13 -11
@@ -87,8 +87,8 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd)static int imx6_pm_domain_power_on (struct generic_pm_domain *genpd) {struct imx_pm_domain *pd =to_imx_pm_domain (genpd); -int i, ret, sw, sw2iso; -u32 val; +int i, ret; +u32 val, req;if (pd->supply) { ret =regulator_enable (pd->supply);
@@ -107,17 +107,18 @@ static int imx6_pm_domain_power_on(struct generic_pm_domain *genpd)regmap_update_bits (pd->regmap, pd->reg_offs +GPC_PGC_CTRL_OFFS ,0x1 ,0x1 ); -/* Read ISO and ISO2SW power up delays */ -regmap_read (pd->regmap, pd->reg_offs +GPC_PGC_PUPSCR_OFFS , &val); - sw = val &0x3f ; - sw2iso = (val >>8 ) &0x3f ; -/* Request GPC to power up domain */ - val =BIT (pd->cntr_pdn_bit +1 ); -regmap_update_bits (pd->regmap,GPC_CNTR , val, val); + req =BIT (pd->cntr_pdn_bit +1 ); +regmap_update_bits (pd->regmap,GPC_CNTR , req, req); -/* Wait ISO + ISO2SW IPG clock cycles */ -udelay (DIV_ROUND_UP (sw + sw2iso, pd->ipg_rate_mhz)); +/* Wait for the PGC to handle the request */ + ret =regmap_read_poll_timeout (pd->regmap,GPC_CNTR , val, !(val & req), +1 ,50 ); +if (ret) +pr_err ("powerup request on domain %s timed out\n" , genpd->name); + +/* Wait for reset to propagate through peripherals */ +usleep_range (5 ,10 );/* Disable reset clocks for all devices in the domain */ for (i =0 ; i < pd->num_clks; i++)
@@ -343,6 +344,7 @@ static const struct regmap_config imx_gpc_regmap_config = { .rd_table = &access_table, .wr_table = &access_table, .max_register = 0x2ac, + .fast_io = true, };static struct generic_pm_domain *imx_gpc_onecell_domains[] = {
drivers/thermal/Kconfig +1 -0
@@ -265,6 +265,7 @@ config QORIQ_THERMAL tristate "QorIQ Thermal Monitoring Unit" depends on THERMAL_OF depends on HAS_IOMEM + select REGMAP_MMIO help Support for Thermal Monitoring Unit (TMU) found on QorIQ platforms. It supports one critical trip point and one passive trip point. The
drivers/thermal/cpufreq_cooling.c +4 -2
@@ -431,6 +431,7 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) {struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; +int ret;/* Request state should be less than max_level */ if (WARN_ON (state > cpufreq_cdev->max_level))
@@ -442,8 +443,9 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, cpufreq_cdev->cpufreq_state = state; -return freq_qos_update_request (&cpufreq_cdev->qos_req, -get_state_freq (cpufreq_cdev, state)); + ret =freq_qos_update_request (&cpufreq_cdev->qos_req, +get_state_freq (cpufreq_cdev, state)); +return ret <0 ? ret :0 ; }/* Bind cpufreq callbacks to thermal cooling device ops */
drivers/thermal/qcom/tsens-common.c +2 -4
@@ -602,7 +602,7 @@ int __init init_common(struct tsens_priv *priv)/* DT with separate SROT and TM address space */ priv->tm_offset =0 ; res =platform_get_resource (op,IORESOURCE_MEM ,1 ); - srot_base =devm_ioremap_resource (&op->dev, res); + srot_base =devm_ioremap_resource (dev, res);if (IS_ERR (srot_base)) { ret =PTR_ERR (srot_base); goto err_put_device;
@@ -620,7 +620,7 @@ int __init init_common(struct tsens_priv *priv) } res =platform_get_resource (op,IORESOURCE_MEM ,0 ); - tm_base =devm_ioremap_resource (&op->dev, res); + tm_base =devm_ioremap_resource (dev, res);if (IS_ERR (tm_base)) { ret =PTR_ERR (tm_base); goto err_put_device;
@@ -687,8 +687,6 @@ int __init init_common(struct tsens_priv *priv)tsens_enable_irq (priv);tsens_debug_init (op); -return 0 ; - err_put_device:put_device (&op->dev);return ret;
drivers/tty/ehv_bytechan.c +18 -3
@@ -136,6 +136,21 @@ static int find_console_handle(void)return 1 ; } +static unsigned int local_ev_byte_channel_send (unsigned int handle, +unsigned int *count, +const char *p) +{ +char buffer[EV_BYTE_CHANNEL_MAX_BYTES ]; +unsigned int c = *count; + +if (c <sizeof (buffer)) { +memcpy (buffer, p, c); +memset (&buffer[c],0 ,sizeof (buffer) - c); + p = buffer; + } +return ev_byte_channel_send (handle, count, p); +} +/*************************** EARLY CONSOLE DRIVER ***************************/ #ifdef CONFIG_PPC_EARLY_DEBUG_EHV_BC
@@ -154,7 +169,7 @@ static void byte_channel_spin_send(const char data)do { count =1 ; - ret =ev_byte_channel_send (CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE , + ret =local_ev_byte_channel_send (CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE , &count, &data); }while (ret ==EV_EAGAIN ); }
@@ -221,7 +236,7 @@ static int ehv_bc_console_byte_channel_send(unsigned int handle, const char *s,while (count) { len = min_t(unsigned int, count, EV_BYTE_CHANNEL_MAX_BYTES);do { - ret =ev_byte_channel_send (handle, &len, s); + ret =local_ev_byte_channel_send (handle, &len, s); }while (ret ==EV_EAGAIN ); count -= len; s += len;
@@ -401,7 +416,7 @@ static void ehv_bc_tx_dequeue(struct ehv_bc_data *bc)CIRC_CNT_TO_END (bc->head, bc->tail,BUF_SIZE ), EV_BYTE_CHANNEL_MAX_BYTES); - ret =ev_byte_channel_send (bc->handle, &len, bc->buf + bc->tail); + ret =local_ev_byte_channel_send (bc->handle, &len, bc->buf + bc->tail);/* 'len' is valid only if the return code is 0 or EV_EAGAIN */ if (!ret || (ret ==EV_EAGAIN ))
drivers/video/fbdev/core/fbmem.c +19 -19
@@ -663,20 +663,20 @@ int fb_prepare_logo(struct fb_info *info, int rotate) fb_logo.depth =1 ; -if (fb_logo.depth >4 && depth >4 ) { -switch (info->fix.visual) { -case FB_VISUAL_TRUECOLOR : - fb_logo.needs_truepalette =1 ; -break ; -case FB_VISUAL_DIRECTCOLOR : - fb_logo.needs_directpalette =1 ; - fb_logo.needs_cmapreset =1 ; -break ; -case FB_VISUAL_PSEUDOCOLOR : - fb_logo.needs_cmapreset =1 ; -break ; - } - } +if (fb_logo.depth >4 && depth >4 ) { +switch (info->fix.visual) { +case FB_VISUAL_TRUECOLOR : + fb_logo.needs_truepalette =1 ; +break ; +case FB_VISUAL_DIRECTCOLOR : + fb_logo.needs_directpalette =1 ; + fb_logo.needs_cmapreset =1 ; +break ; +case FB_VISUAL_PSEUDOCOLOR : + fb_logo.needs_cmapreset =1 ; +break ; + } + } height = fb_logo.logo->height;if (fb_center_logo)
@@ -1065,19 +1065,19 @@ fb_blank(struct fb_info *info, int blank)struct fb_event event;int ret = -EINVAL ; -if (blank >FB_BLANK_POWERDOWN ) - blank =FB_BLANK_POWERDOWN ; +if (blank >FB_BLANK_POWERDOWN ) + blank =FB_BLANK_POWERDOWN ; event.info = info; event.data = ␣if (info->fbops->fb_blank) - ret = info->fbops->fb_blank (blank, info); + ret = info->fbops->fb_blank (blank, info);if (!ret)fb_notifier_call_chain (FB_EVENT_BLANK , &event); -return ret; +return ret; }EXPORT_SYMBOL (fb_blank);
@@ -1115,7 +1115,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,break ;case FBIOGET_FSCREENINFO :lock_fb_info (info); - fix = info->fix; +memcpy (&fix, &info->fix,sizeof (fix));if (info->flags &FBINFO_HIDE_SMEM_START ) fix.smem_start =0 ;unlock_fb_info (info);
drivers/virtio/virtio_balloon.c +44 -63
171 lines not on this page · raw message
drivers/watchdog/sp805_wdt.c +4 -0
@@ -137,10 +137,14 @@ wdt_restart(struct watchdog_device *wdd, unsigned long mode, void *cmd) {struct sp805_wdt *wdt =watchdog_get_drvdata (wdd); +writel_relaxed (UNLOCK , wdt->base +WDTLOCK );writel_relaxed (0 , wdt->base +WDTCONTROL );writel_relaxed (0 , wdt->base +WDTLOAD );writel_relaxed (INT_ENABLE |RESET_ENABLE , wdt->base +WDTCONTROL ); +/* Flush posted writes. */ +readl_relaxed (wdt->base +WDTLOCK ); +return 0 ; }
fs/afs/dir.c +67 -41
150 lines not on this page · raw message
fs/ceph/file.c +100 -73
173 lines not on this page · raw message
fs/f2fs/compress.c +46 -17
63 lines not on this page · raw message
fs/f2fs/f2fs.h +51 -51
102 lines not on this page · raw message
include/linux/platform_data/cros_ec_proto.h +4 -0
Lines of this file are not shown. View the raw message.
kernel/bpf/verifier.c +34 -11
45 lines not on this page · raw message
net/sunrpc/auth_gss/auth_gss.c +60 -20
80 lines not on this page · raw message
security/keys/encrypted-keys/encrypted.c +3 -4
Lines of this file are not shown. View the raw message.
security/keys/keyctl.c +57 -16
73 lines not on this page · raw message
security/keys/trusted-keys/trusted_tpm1.c +2 -12
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c +5 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/progs/test_get_stack_rawtp_err.c new file +26 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/verifier/bpf_get_stack.c +4 -4
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.