Linux 4.19.73
Greg KH
maintainerI'm announcing the release of the 4.19.73 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt | 9 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt | 6 Documentation/devicetree/bindings/mmc/mmc.txt | 4 Makefile | 2 arch/arc/kernel/troubleshoot.c | 8 arch/arc/mm/fault.c | 38 -- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 arch/arm/mach-davinci/devices-da8xx.c | 40 ++ arch/arm/mach-davinci/dm355.c | 30 + arch/arm/mach-davinci/dm365.c | 35 ++ arch/arm/mach-davinci/dm644x.c | 20 + arch/arm/mach-davinci/dm646x.c | 10 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 3 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 arch/powerpc/include/asm/kvm_book3s.h | 4 arch/powerpc/include/asm/kvm_book3s_64.h | 4 arch/powerpc/include/asm/kvm_booke.h | 4 arch/powerpc/include/asm/kvm_host.h | 2 arch/powerpc/include/asm/mmu_context.h | 15 arch/powerpc/include/asm/reg.h | 7 arch/powerpc/kernel/asm-offsets.c | 4 arch/powerpc/kernel/head_64.S | 2 arch/powerpc/kernel/process.c | 38 -- arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 arch/powerpc/kvm/book3s_emulate.c | 12 arch/powerpc/kvm/book3s_hv.c | 19 - arch/powerpc/kvm/book3s_hv_rmhandlers.S | 30 + arch/powerpc/kvm/book3s_hv_tm.c | 12 arch/powerpc/kvm/book3s_hv_tm_builtin.c | 5 arch/powerpc/kvm/book3s_pr.c | 4 arch/powerpc/kvm/bookehv_interrupts.S | 8 arch/powerpc/kvm/emulate_loadstore.c | 1 arch/powerpc/mm/hash_utils_64.c | 9 arch/powerpc/mm/pkeys.c | 10 arch/riscv/kernel/ftrace.c | 1 arch/x86/include/asm/kvm_host.h | 15 arch/x86/kernel/ftrace.c | 42 +- arch/x86/kernel/kvmclock.c | 6 arch/x86/kernel/setup.c | 2 arch/x86/kvm/emulate.c | 10 arch/x86/kvm/hyperv.c | 71 +++- arch/x86/kvm/hyperv.h | 4 arch/x86/kvm/irq.c | 7 arch/x86/kvm/irq.h | 1 arch/x86/kvm/lapic.c | 14 arch/x86/kvm/lapic.h | 2 arch/x86/kvm/mmu.c | 13 arch/x86/kvm/mmu.h | 2 arch/x86/kvm/mtrr.c | 10 arch/x86/kvm/svm.c | 2 arch/x86/kvm/vmx.c | 41 +- arch/x86/kvm/x86.c | 26 - arch/x86/kvm/x86.h | 12 block/blk-core.c | 3 block/blk-iolatency.c | 55 +-- block/blk-mq-sysfs.c | 6 block/blk-mq.c | 8 block/blk-mq.h | 2 drivers/char/tpm/st33zp24/i2c.c | 2 drivers/char/tpm/st33zp24/spi.c | 2 drivers/char/tpm/st33zp24/st33zp24.h | 4 drivers/char/tpm/tpm_i2c_infineon.c | 15 drivers/char/tpm/tpm_i2c_nuvoton.c | 16 - drivers/clk/clk-s2mps11.c | 2 drivers/clk/tegra/clk-audio-sync.c | 3 drivers/clk/tegra/clk-tegra-audio.c | 7 drivers/clk/tegra/clk-tegra114.c | 9 drivers/clk/tegra/clk-tegra124.c | 9 drivers/clk/tegra/clk-tegra210.c | 11 drivers/clk/tegra/clk-tegra30.c | 9 drivers/clk/tegra/clk.h | 4 drivers/crypto/ccree/cc_driver.c | 7 drivers/crypto/ccree/cc_pm.c | 13 drivers/crypto/ccree/cc_pm.h | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 5 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 32 +- drivers/gpu/drm/drm_atomic.c | 21 + drivers/gpu/drm/drm_ioc32.c | 6 drivers/gpu/drm/drm_vblank.c | 45 ++ drivers/gpu/drm/i915/i915_debugfs.c | 4 drivers/gpu/drm/i915/i915_gem.c | 39 ++ drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/i915/intel_cdclk.c | 11 drivers/gpu/drm/i915/intel_display.c | 37 +- drivers/gpu/drm/i915/intel_dp.c | 16 + drivers/gpu/drm/i915/intel_dp_mst.c | 2 drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 drivers/gpu/drm/panel/panel-simple.c | 29 + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 8 drivers/hv/hv_kvp.c | 32 +- drivers/i2c/busses/i2c-at91.c | 11 drivers/iio/adc/exynos_adc.c | 31 ++ drivers/iio/adc/rcar-gyroadc.c | 4 drivers/infiniband/core/uverbs_main.c | 7 drivers/infiniband/hw/hfi1/sdma.c | 9 drivers/infiniband/hw/mlx5/odp.c | 3 drivers/infiniband/ulp/srp/ib_srp.c | 24 + drivers/iommu/iova.c | 5 drivers/md/bcache/btree.c | 49 ++- drivers/md/bcache/btree.h | 2 drivers/md/bcache/extents.c | 15 drivers/md/bcache/journal.c | 7 drivers/md/dm-crypt.c | 5 drivers/md/dm-mpath.c | 17 + drivers/md/dm-rq.c | 8 drivers/md/dm-target.c | 3 drivers/md/dm-thin-metadata.c | 7 drivers/media/cec/Makefile | 2 drivers/media/cec/cec-adap.c | 13 drivers/media/cec/cec-edid.c | 95 ------ drivers/media/i2c/Kconfig | 3 drivers/media/i2c/adv7604.c | 4 drivers/media/i2c/adv7842.c | 4 drivers/media/i2c/tc358743.c | 2 drivers/media/platform/stm32/stm32-dcmi.c | 2 drivers/media/platform/vim2m.c | 28 - drivers/media/platform/vivid/vivid-vid-cap.c | 4 drivers/media/platform/vivid/vivid-vid-common.c | 2 drivers/media/v4l2-core/v4l2-dv-timings.c | 151 ++++++++++ drivers/mfd/Kconfig | 6 drivers/mmc/host/renesas_sdhi_core.c | 11 drivers/mmc/host/sdhci-pci-core.c | 2 drivers/mmc/host/sdhci-pci.h | 2 drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 65 ++++ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 9 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 56 +-- drivers/net/wireless/mediatek/mt76/mt76x2_mac_common.c | 2 drivers/nvme/host/fc.c | 15 drivers/pci/controller/dwc/pcie-designware-host.c | 21 - drivers/pci/controller/dwc/pcie-qcom.c | 58 ++- drivers/pci/quirks.c | 148 ++++++--- drivers/remoteproc/qcom_q6v5.c | 44 ++ drivers/remoteproc/qcom_q6v5_pil.c | 3 drivers/s390/crypto/ap_bus.c | 8 drivers/s390/crypto/ap_bus.h | 1 drivers/s390/crypto/ap_queue.c | 15 drivers/s390/crypto/zcrypt_cex2a.c | 1 drivers/s390/crypto/zcrypt_cex4.c | 1 drivers/s390/crypto/zcrypt_pcixcc.c | 1 drivers/s390/scsi/zfcp_fsf.c | 10 drivers/s390/virtio/virtio_ccw.c | 3 drivers/scsi/megaraid/megaraid_sas_base.c | 76 +++-- drivers/scsi/qla2xxx/qla_gs.c | 15 drivers/scsi/qla2xxx/qla_init.c | 48 +-- drivers/spi/spi-gpio.c | 3 drivers/staging/wilc1000/linux_wlan.c | 12 drivers/target/target_core_iblock.c | 6 drivers/target/target_core_iblock.h | 1 drivers/usb/typec/tcpm.c | 27 + drivers/vhost/test.c | 13 drivers/vhost/vhost.c | 4 fs/btrfs/compression.c | 16 + fs/btrfs/compression.h | 1 fs/btrfs/ctree.h | 3 fs/btrfs/extent-tree.c | 34 +- fs/btrfs/extent_io.c | 20 - fs/btrfs/extent_io.h | 5 fs/btrfs/inode.c | 40 +- fs/btrfs/props.c | 6 fs/btrfs/scrub.c | 119 +++++-- fs/btrfs/volumes.c | 29 + fs/ceph/inode.c | 7 fs/ceph/super.c | 2 fs/ceph/super.h | 2 fs/cifs/cifs_fs_sb.h | 5 fs/cifs/cifsfs.c | 1 fs/cifs/cifsglob.h | 24 + fs/cifs/cifssmb.c | 24 + fs/cifs/connect.c | 8 fs/cifs/file.c | 37 +- fs/cifs/inode.c | 10 fs/cifs/misc.c | 1 fs/cifs/smb2pdu.c | 1 fs/cifs/smbdirect.c | 55 +-- fs/cifs/smbdirect.h | 5 fs/cifs/transport.c | 2 fs/ext4/block_validity.c | 54 +++ fs/ext4/extents.c | 12 fs/ext4/inode.c | 4 fs/nfs/delegation.c | 2 fs/nfs/delegation.h | 2 fs/nfs/nfs4proc.c | 25 - fs/pstore/inode.c | 12 include/drm/drm_device.h | 8 include/drm/drm_vblank.h | 22 + include/linux/device-mapper.h | 3 include/linux/gpio/consumer.h | 62 ++-- include/media/cec.h | 80 ----- include/media/v4l2-dv-timings.h | 6 include/net/cfg80211.h | 15 include/uapi/linux/keyctl.h | 7 kernel/module.c | 29 + kernel/resource.c | 110 +++---- kernel/sched/fair.c | 5 kernel/time/timekeeping.c | 2 mm/migrate.c | 17 - net/batman-adv/bat_iv_ogm.c | 20 - net/batman-adv/netlink.c | 2 net/mac80211/util.c | 7 net/vmw_vsock/hyperv_transport.c | 8 net/wireless/core.c | 6 net/wireless/nl80211.c | 4 net/wireless/util.c | 27 + scripts/decode_stacktrace.sh | 2 security/apparmor/policy_unpack.c | 40 ++ sound/pci/hda/hda_auto_parser.c | 4 sound/pci/hda/hda_codec.c | 8 sound/pci/hda/hda_codec.h | 2 sound/pci/hda/hda_generic.c | 3 sound/pci/hda/hda_generic.h | 1 sound/pci/hda/hda_intel.c | 6 sound/pci/hda/patch_hdmi.c | 6 sound/pci/hda/patch_realtek.c | 17 + tools/testing/selftests/net/fib_rule_tests.sh | 5 virt/kvm/eventfd.c | 9 222 files changed, 2341 insertions(+), 1167 deletions(-)
Adrian Hunter (1):
mmc: sdhci-pci: Add support for Intel CML
Ajay Singh (1):
staging: wilc1000: fix error path cleanup in wilc_wlan_initialize()
Anand Jain (1):
btrfs: scrub: fix circular locking dependency warning
Arnd Bergmann (1):
iio: adc: gyroadc: fix uninitialized return code
Bart Van Assche (3):
scsi: target/core: Use the SECTOR_SHIFT constant
RDMA/srp: Document srp_parse_in() arguments
RDMA/srp: Accept again source addresses that do not have a port number
Bartosz Golaszewski (6):
ARM: davinci: da8xx: define gpio interrupts as separate resources
ARM: davinci: dm365: define gpio interrupts as separate resources
ARM: davinci: dm646x: define gpio interrupts as separate resources
ARM: davinci: dm355: define gpio interrupts as separate resources
ARM: davinci: dm644x: define gpio interrupts as separate resources
gpio: don't WARN() on NULL descs if gpiolib is disabled
Ben Dooks (1):
drm: add __user attribute to ptr_to_compat()
Ben Gardon (1):
kvm: mmu: Fix overflow on kvm mmu page limit calculation
Benjamin Block (1):
scsi: zfcp: fix request object use-after-free in send path causing wrong traces
Bjorn Andersson (2):
PCI: qcom: Fix error handling in runtime PM support
PCI: qcom: Don't deassert reset GPIO during probe
Bjorn Helgaas (2):
resource: Include resource end in walk_*() interfaces
resource: Fix find_next_iomem_res() iteration issue
Breno Leitao (1):
powerpc/tm: Remove msr_tm_active()
Brian Norris (2):
remoteproc: qcom: q6v5: shore up resource probe handling
remoteproc: qcom: q6v5-mss: add SCM probe dependency
Chris Wilson (4):
drm/i915: Restore sane defaults for KMS on GEM error load drm/i915: Cleanup gt powerstate from gem drm/i915: Sanity check mmap length against object size iommu/iova: Remove stale cached32_node
Christian Lamparter (1):
ARM: dts: qcom: ipq4019: enlarge PCIe BAR range
Christoph Muellner (1):
dt-bindings: mmc: Add disable-cqe-dcmd property.
Christophe Leroy (1):
powerpc/64: mark start_here_multiplatform as __ref
Colin Ian King (1):
ext4: unsigned int compared against zero
Coly Li (4):
bcache: replace hard coded number with BUCKET_GC_GEN_MAX
bcache: only clear BTREE_NODE_dirty bit when it is set
bcache: add comments for mutex_lock(&b->write_lock)
bcache: fix race in btree_flush_write()
Dan Carpenter (1):
drm/vmwgfx: Fix double free in vmw_recv_msg()
Dan Robertson (1):
btrfs: init csum_list before possible free
David Abdurachmanov (1):
riscv: remove unused variable in ftrace
David Francis (1):
powerplay: Respect units on max dcfclk watermark
David Howells (1):
keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h
David Sterba (2):
btrfs: scrub: pass fs_info to scrub_setup_ctx
btrfs: scrub: move scrub_setup_ctx allocation out of device_list_mutex
Dennis Zhou (1):
blk-iolatency: fix STS_AGAIN handling
Dexuan Cui (4):
hv_sock: Fix hang when a connection is closed
Drivers: hv: kvp: Fix two "this statement may fall through" warnings
Drivers: hv: kvp: Fix the indentation of some "break" statements
Drivers: hv: kvp: Fix the recent regression caused by incorrect clean-up
Dhinakaran Pandiyan (1):
drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE
Dinh Nguyen (1):
arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's
Dmitry Voytik (1):
arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64
Eric Dumazet (1):
batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
Eric W. Biederman (1):
signal/arc: Use force_sig_fault where appropriate
Eugeniy Paltsev (2):
ARC: mm: fix uninitialised signal code in do_page_fault
ARC: mm: SIGSEGV userspace trying to access kernel virtual memory
Fabien Dessenne (1):
media: stm32-dcmi: fix irq = 0 case
Feifei Xu (2):
drm/amdgpu/gfx9: Update gfx9 golden settings. drm/amdgpu: Update gc_9_0 golden settings.
Felix Fietkau (1):
mt76: fix corrupted software generated tx CCMP PN
Filipe Manana (2):
Btrfs: fix deadlock with memory reclaim during scrub
Btrfs: fix race between block group removal and block group allocation
Gilad Ben-Yossef (2):
crypto: ccree - fix resume race condition on init
crypto: ccree - add missing inline qualifier
Giridhar Malavali (1):
scsi: qla2xxx: Move log messages before issuing command to firmware
Greg Kroah-Hartman (1):
Linux 4.19.73
Gustavo Romero (2):
powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts
Halil Pasic (1):
virtio/s390: fix race on airq_areas[]
Hangbin Liu (1):
selftests: fib_rule_tests: use pre-defined DEV_ADDR
Hannes Reinecke (1):
nvme-fc: use separate work queue to avoid warning
Hans Verkuil (5):
media: cec/v4l2: move V4L2 specific CEC functions to V4L2
media: cec: remove cec-edid.c
media: vim2m: use workqueue
media: vim2m: use cancel_delayed_work_sync instead of flush_schedule_work
media: vim2m: only cancel work if it is for right context
Hans de Goede (1):
usb: typec: tcpm: Try PD-2.0 if sink does not respond to 3.0 source-caps
Harald Freudenberger (1):
s390/zcrypt: reinit ap queue state machine during device probe
Hui Wang (1):
ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre
Ihab Zhaika (1):
iwlwifi: add new card for 9260 series
Imre Deak (1):
drm/i915/gen9+: Fix initial readout for Y tiled framebuffers
Jan-Marek Glogowski (1):
drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"
Jarkko Nikula (1):
mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies
Jarkko Sakkinen (1):
tpm: Fix some name collisions with drivers/char/tpm.h
Jason A. Donenfeld (1):
timekeeping: Use proper ktime_add when adding nsecs in coarse offset
Jessica Yu (1):
modules: always page-align module section allocations
Jian-Hong Pan (1):
ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL
Jisheng Zhang (1):
PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code
Johannes Thumshirn (1):
btrfs: correctly validate compression type
Jon Hunter (2):
clk: tegra: Fix maximum audio sync clock for Tegra124/210
clk: tegra210: Fix default rates for HDA clocks
Jonathan Bakker (2):
iio: adc: exynos-adc: Add S5PV210 variant
dt-bindings: iio: adc: exynos-adc: Add S5PV210 variant
Joonas Lahtinen (1):
drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set
José Roberto de Souza (1):
drm/i915/ilk: Fix warning when reading emon_status with no output
Kent Russell (1):
drm/amdkfd: Add missing Polaris10 ID
Koen Vandeputte (1):
media: i2c: tda1997x: select V4L2_FWNODE
Krzysztof Kozlowski (1):
iio: adc: exynos-adc: Use proper number of channels for Exynos4x12
Ladi Prosek (1):
KVM: hyperv: define VP assist page helpers
Liangyan (1):
sched/fair: Don't assign runtime for throttled cfs_rq
Linus Walleij (1):
ARM: dts: gemini: Set DIR-685 SPI CS as active low
Liu Bo (1):
Blk-iolatency: warn on negative inflight IO counter
Logan Gunthorpe (1):
PCI: Add macro for Switchtec quirk declarations
Long Li (1):
cifs: smbd: take an array of reqeusts when sending upper layer data
Louis Li (1):
drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2)
Luca Coelho (1):
iwlwifi: fix devices with PCI Device ID 0x34F0 and 11ac RF modules
Lyude Paul (7):
drm/i915: Fix intel_dp_mst_best_encoder()
drm/atomic_helper: Disallow new modesets on unregistered connectors drm/amd/dm: Understand why attaching path/tile properties are needed drm/nouveau: Don't WARN_ON VCPI allocation failures
PCI: Reset Lenovo ThinkPad P50 nvgpu at boot if necessary drm/atomic_helper: Allow DPMS On<->Off changes for unregistered connectors
PCI: Reset both NVIDIA GPU and HDA in ThinkPad P50 workaround
Manikanta Pubbisetty (1):
{nl,mac}80211: fix interface combinations on crypto controlled devices
Mathias Kresin (1):
ARM: dts: qcom: ipq4019: fix PCI range
Michael Ellerman (1):
powerpc/kvm: Save and restore host AMR/IAMR/UAMOR
Michael Neuling (1):
KVM: PPC: Book3S HV: Fix CR0 setting in TM emulation
Michał Mirosław (2):
i2c: at91: disable TXRDY interrupt after sending data
i2c: at91: fix clk_offset for sama5d2
Mike Marciniszyn (1):
IB/hfi1: Avoid hardlockup with flushlist_lock
Mike Salvatore (1):
apparmor: reset pos on failure to unpack for various functions
Mike Snitzer (1):
dm thin metadata: check if in fail_io mode when setting needs_check
Milan Broz (1):
dm crypt: move detailed message into debug level
Ming Lei (1):
blk-mq: free hw queue's resource in hctx's release handler
Moni Shoua (1):
IB/mlx5: Reset access mask when looping inside page fault handler
Nadav Amit (1):
resource: fix locking in find_next_iomem_res()
Nathan Chancellor (1):
clk: s2mps11: Add used attribute to s2mps11_dt_match
Nicolas Boichat (1):
scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
Niklas Cassel (1):
ARM: dts: qcom: ipq4019: Fix MSI IRQ type
Nikolay Borisov (2):
btrfs: Remove extent_io_ops::fill_delalloc
btrfs: Fix error handling in btrfs_cleanup_ordered_extents
Norbert Manthey (1):
pstore: Fix double-free in pstore_mkfile() failure path
Omar Sandoval (1):
Btrfs: clean up scrub is_dev_replace parameter
Paolo Bonzini (1):
KVM: x86: optimize check for valid PAT value
Paul Mackerras (2):
KVM: PPC: Book3S HV: Fix race between kvm_unmap_hva_range and MMU mode switch
KVM: PPC: Use ccr field in pt_regs struct embedded in vcpu struct
Paulo Alcantara (SUSE) (1):
cifs: Properly handle auto disabling of serverino option
Pavel Shilovsky (2):
CIFS: Fix error paths in writeback code
CIFS: Fix leaking locked VFS cache pages in writeback retry
Pavel Tatashin (1):
x86/kvmclock: set offset for kvm unstable clock
Peter Xu (1):
kvm: Check irqchip mode before assign irqfd
Qu Wenruo (2):
btrfs: volumes: Make sure no dev extent is beyond device boundary
btrfs: Use real device structure to verify dev extent
Ralph Campbell (1):
mm/migrate.c: initialize pud_entry in migrate_vma()
Ram Pai (1):
powerpc/pkeys: Fix handling of pkey state across fork()
Rex Zhu (1):
drm/amd/pp: Fix truncated clock value when set watermark
Roman Bolshakov (1):
scsi: target/iblock: Fix overrun in WRITE SAME emulation
Ronnie Sahlberg (1):
cifs: add spinlock for the openFileList to cifsInodeInfo
Russell King (1):
spi: spi-gpio: fix SPI_CS_HIGH capability
Sam Bazley (1):
ALSA: hda/realtek - Add quirk for HP Pavilion 15
Sean Christopherson (4):
KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run
KVM: x86: Always use 32-bit SMRAM save state for 32-bit kernels
KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value
KVM: VMX: Fix handling of #MC that occurs during VM-Entry
Shirish S (1):
drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc
Shivasharan S (3):
scsi: megaraid_sas: Fix combined reply queue mode detection
scsi: megaraid_sas: Add check for reset adapter bit
scsi: megaraid_sas: Use 63-bit DMA addressing
Sowjanya Komatineni (1):
dt-bindings: mmc: Add supports-cqe property
Steven Rostedt (VMware) (1):
x86/ftrace: Fix warning and considate ftrace_jmp_replace() and ftrace_call_replace()
Suraj Jitindar Singh (1):
powerpc/mm: Limit rma_size to 1TB when running without HV mode
Sven Eckelmann (1):
batman-adv: Only read OGM tvlv_len after buffer len check
Sébastien Szymanski (1):
drm/panel: Add support for Armadeus ST0700 Adapt
Takashi Iwai (4):
ALSA: hda - Fix potential endless loop at applying quirks
ALSA: hda/realtek - Fix overridden device-specific initialization
ALSA: hda - Don't resume forcibly i915 HDMI/DP codec
ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips
Takeshi Saito (1):
mmc: renesas_sdhi: Fix card initialization failure in high speed mode
Tang Junhui (1):
bcache: treat stale && dirty keys as bad keys
Theodore Ts'o (3):
ext4: protect journal inode's blocks using block_validity
ext4: don't perform block validity checks on the journal inode
ext4: fix block validity checks for journal inodes using indirect blocks
Tiwei Bie (2):
vhost/test: fix build for vhost test vhost/test: fix build for vhost test - again
Trond Myklebust (1):
NFSv4: Fix delegation state recovery
Ville Syrjälä (2):
drm/vblank: Allow dynamic per-crtc max_vblank_count drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV
Vineet Gupta (2):
ARC: show_regs: lockdep: re-enable preemption
ARC: mm: do_page_fault fixes #1: relinquish mmap_sem if signal arrives while handle_mm_fault
Vitaly Kuznetsov (4):
KVM: x86: hyperv: enforce vp_index < KVM_MAX_VCPUS
KVM: x86: hyperv: consistently use 'hv_vcpu' for 'struct kvm_vcpu_hv' variables
KVM: x86: hyperv: keep track of mismatched VP indexes x86/kvm/lapic: preserve gfn_to_hva_cache len on cache reinit
WANG Chao (1):
x86/kvm: move kvm_load/put_guest_xcr0 into atomic context
Wanpeng Li (1):
KVM: VMX: check CPUID before allowing read/write of IA32_XSS
Yan, Zheng (1):
ceph: use ceph_evict_inode to cleanup inode's resource
Yishai Hadas (1):
IB/uverbs: Fix OOPs upon device disassociation
YueHaibing (1):
kernel/module: Fix mem leak in module_add_modinfo_attrs
Yufen Yu (1):
dm mpath: fix missing call of path selector type->end_io
ZhangXiaoxu (1):
cifs: Fix lease buffer length error
Zhimin Gu (1):
x86, hibernate: Fix nosave_regions setup for hibernation
yongduan (1):
vhost: make sure log_num < in_num
Greg KH
maintainerDocumentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt new file +9 -0
@@ -0,0 +1,9 @@ +Armadeus ST0700 Adapt. A Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT with +an adapter board. + +Required properties: +- compatible: "armadeus,st0700-adapt" +- power-supply: see panel-common.txt + +Optional properties: +- backlight: see panel-common.txt
Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt +5 -1
@@ -11,11 +11,13 @@ New driver handles the following Required properties: - compatible: Must be "samsung,exynos-adc-v1" - for exynos4412/5250 and s5pv210 controllers. + for Exynos5250 controllers. Must be "samsung,exynos-adc-v2" for future controllers. Must be "samsung,exynos3250-adc" for controllers compatible with ADC of Exynos3250. + Must be "samsung,exynos4212-adc" for + controllers compatible with ADC of Exynos4212 and Exynos4412. Must be "samsung,exynos7-adc" for the ADC in Exynos7 and compatibles Must be "samsung,s3c2410-adc" for
@@ -28,6 +30,8 @@ Required properties: the ADC in s3c2443 and compatibles Must be "samsung,s3c6410-adc" for the ADC in s3c6410 and compatibles + Must be "samsung,s5pv210-adc" for + the ADC in s5pv210 and compatibles - reg: List of ADC register address range - The base address and range of ADC register - The base address and range of ADC_PHY register (every
Documentation/devicetree/bindings/mmc/mmc.txt +4 -0
@@ -62,6 +62,10 @@ Optional properties: be referred to mmc-pwrseq-simple.txt. But now it's reused as a tunable delay waiting for I/O signalling and card power supply to be stable, regardless of whether pwrseq-simple is used. Default to 10ms if no available. +- supports-cqe : The presence of this property indicates that the corresponding + MMC host controller supports HW command queue feature. +- disable-cqe-dcmd: This property indicates that the MMC controller's command + queue engine (CQE) does not support direct commands (DCMDs). *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line polarity properties, we have to fix the meaning of the "normal" and "inverted"
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 72 +SUBLEVEL = 73 EXTRAVERSION = NAME = "People's Front"
arch/arc/kernel/troubleshoot.c +8 -0
@@ -179,6 +179,12 @@ void show_regs(struct pt_regs *regs)struct task_struct *tsk = current;struct callee_regs *cregs; +/* +* generic code calls us with preemption disabled, but some calls +* here could sleep, so re-enable to avoid lockdep splat +*/ +preempt_enable (); +print_task_path_n_nm (tsk);show_regs_print_info (KERN_INFO );
@@ -221,6 +227,8 @@ void show_regs(struct pt_regs *regs) cregs = (struct callee_regs *)current->thread.callee_reg;if (cregs)show_callee_regs (cregs); + +preempt_disable (); } void show_kernel_fault_diag(const char *str, struct pt_regs *regs,
arch/arc/mm/fault.c +15 -23
@@ -66,14 +66,12 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)struct vm_area_struct *vma =NULL ;struct task_struct *tsk = current;struct mm_struct *mm = tsk->mm; -siginfo_t info; +int si_code =SEGV_MAPERR ;int ret;vm_fault_t fault;int write = regs->ecr_cause &ECR_C_PROTV_STORE ;/* ST/EX */ unsigned int flags =FAULT_FLAG_ALLOW_RETRY |FAULT_FLAG_KILLABLE ; -clear_siginfo (&info); -/* * We fault-in kernel-space virtual memory on-demand. The * 'reference' page table is init_mm.pgd.
@@ -83,16 +81,14 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)* only copy the information from the master page table, * nothing more. */ -if (address >=VMALLOC_START ) { +if (address >=VMALLOC_START && !user_mode (regs)) { ret =handle_kernel_vaddr_fault (address);if (unlikely (ret)) - goto bad_area_nosemaphore; + goto no_context;else return ; } - info.si_code =SEGV_MAPERR ; -/* * If we're in an interrupt or have no user * context, we must not take the fault..
@@ -119,7 +115,7 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)* we can handle it.. */ good_area: - info.si_code =SEGV_ACCERR ; + si_code =SEGV_ACCERR ;/* Handle protection violation, execute on heap or stack */
@@ -143,12 +139,17 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)*/ fault =handle_mm_fault (vma, address, flags); -/* If Pagefault was interrupted by SIGKILL, exit page fault "early" */ if (unlikely (fatal_signal_pending (current))) { -if ((fault &VM_FAULT_ERROR ) && !(fault &VM_FAULT_RETRY )) -up_read (&mm->mmap_sem); -if (user_mode (regs)) + +/* +* if fault retry, mmap_sem already relinquished by core mm +* so OK to return to user mode (with signal handled first) +*/ +if (fault &VM_FAULT_RETRY ) { +if (!user_mode (regs)) + goto no_context;return ; + } }perf_sw_event (PERF_COUNT_SW_PAGE_FAULTS ,1 , regs, address);
@@ -195,15 +196,10 @@ void do_page_fault(unsigned long address, struct pt_regs *regs) bad_area:up_read (&mm->mmap_sem); -bad_area_nosemaphore:/* User mode accesses just cause a SIGSEGV */ if (user_mode (regs)) { tsk->thread.fault_address = address; - info.si_signo =SIGSEGV ; - info.si_errno =0 ; -/* info.si_code has been set above */ - info.si_addr = (void __user *)address; -force_sig_info (SIGSEGV , &info, tsk); +force_sig_fault (SIGSEGV , si_code, (void __user *)address, tsk);return ; }
@@ -238,9 +234,5 @@ void do_page_fault(unsigned long address, struct pt_regs *regs) goto no_context; tsk->thread.fault_address = address; - info.si_signo =SIGBUS ; - info.si_errno =0 ; - info.si_code =BUS_ADRERR ; - info.si_addr = (void __user *)address; -force_sig_info (SIGBUS , &info, tsk); +force_sig_fault (SIGBUS ,BUS_ADRERR , (void __user *)address, tsk); }
arch/arm/boot/dts/gemini-dlink-dir-685.dts +1 -1
@@ -65,7 +65,7 @@ gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>; gpio-mosi = <&gpio1 7 GPIO_ACTIVE_HIGH>; /* Collides with pflash CE1, not so cool */ - cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; + cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; num-chipselects = <1>; panel: display@0 {
arch/arm/boot/dts/qcom-ipq4019.dtsi +3 -3
@@ -386,10 +386,10 @@ #address-cells = <3>; #size-cells = <2>; - ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000 - 0x82000000 0 0x48000000 0x48000000 0 0x10000000>; + ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>, + <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>; - interrupts = <GIC_SPI 141 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>;
arch/arm/mach-davinci/devices-da8xx.c +40 -0
@@ -704,6 +704,46 @@ static struct resource da8xx_gpio_resources[] = { }, { /* interrupt */ .start = IRQ_DA8XX_GPIO0, + .end = IRQ_DA8XX_GPIO0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO1, + .end = IRQ_DA8XX_GPIO1, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO2, + .end = IRQ_DA8XX_GPIO2, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO3, + .end = IRQ_DA8XX_GPIO3, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO4, + .end = IRQ_DA8XX_GPIO4, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO5, + .end = IRQ_DA8XX_GPIO5, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO6, + .end = IRQ_DA8XX_GPIO6, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO7, + .end = IRQ_DA8XX_GPIO7, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_GPIO8, .end = IRQ_DA8XX_GPIO8, .flags = IORESOURCE_IRQ, },
arch/arm/mach-davinci/dm355.c +30 -0
@@ -548,6 +548,36 @@ static struct resource dm355_gpio_resources[] = { }, { /* interrupt */ .start = IRQ_DM355_GPIOBNK0, + .end = IRQ_DM355_GPIOBNK0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM355_GPIOBNK1, + .end = IRQ_DM355_GPIOBNK1, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM355_GPIOBNK2, + .end = IRQ_DM355_GPIOBNK2, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM355_GPIOBNK3, + .end = IRQ_DM355_GPIOBNK3, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM355_GPIOBNK4, + .end = IRQ_DM355_GPIOBNK4, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM355_GPIOBNK5, + .end = IRQ_DM355_GPIOBNK5, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM355_GPIOBNK6, .end = IRQ_DM355_GPIOBNK6, .flags = IORESOURCE_IRQ, },
arch/arm/mach-davinci/dm365.c +35 -0
@@ -267,6 +267,41 @@ static struct resource dm365_gpio_resources[] = { }, { /* interrupt */ .start = IRQ_DM365_GPIO0, + .end = IRQ_DM365_GPIO0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO1, + .end = IRQ_DM365_GPIO1, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO2, + .end = IRQ_DM365_GPIO2, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO3, + .end = IRQ_DM365_GPIO3, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO4, + .end = IRQ_DM365_GPIO4, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO5, + .end = IRQ_DM365_GPIO5, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO6, + .end = IRQ_DM365_GPIO6, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM365_GPIO7, .end = IRQ_DM365_GPIO7, .flags = IORESOURCE_IRQ, },
arch/arm/mach-davinci/dm644x.c +20 -0
@@ -492,6 +492,26 @@ static struct resource dm644_gpio_resources[] = { }, { /* interrupt */ .start = IRQ_GPIOBNK0, + .end = IRQ_GPIOBNK0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_GPIOBNK1, + .end = IRQ_GPIOBNK1, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_GPIOBNK2, + .end = IRQ_GPIOBNK2, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_GPIOBNK3, + .end = IRQ_GPIOBNK3, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_GPIOBNK4, .end = IRQ_GPIOBNK4, .flags = IORESOURCE_IRQ, },
arch/arm/mach-davinci/dm646x.c +10 -0
@@ -442,6 +442,16 @@ static struct resource dm646x_gpio_resources[] = { }, { /* interrupt */ .start = IRQ_DM646X_GPIOBNK0, + .end = IRQ_DM646X_GPIOBNK0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM646X_GPIOBNK1, + .end = IRQ_DM646X_GPIOBNK1, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DM646X_GPIOBNK2, .end = IRQ_DM646X_GPIOBNK2, .flags = IORESOURCE_IRQ, },
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +3 -0
@@ -140,6 +140,7 @@ tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>; + altr,sysmgr-syscon = <&sysmgr 0x44 0>; status = "disabled"; };
@@ -156,6 +157,7 @@ tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>; + altr,sysmgr-syscon = <&sysmgr 0x48 0>; status = "disabled"; };
@@ -172,6 +174,7 @@ tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>; + altr,sysmgr-syscon = <&sysmgr 0x4c 0>; status = "disabled"; };
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +2 -0
@@ -40,6 +40,7 @@ pinctrl-0 = <&usb30_host_drv>; regulator-name = "vcc_host_5v"; regulator-always-on; + regulator-boot-on; vin-supply = <&vcc_sys>; };
@@ -50,6 +51,7 @@ pinctrl-0 = <&usb20_host_drv>; regulator-name = "vcc_host1_5v"; regulator-always-on; + regulator-boot-on; vin-supply = <&vcc_sys>; };
arch/powerpc/include/asm/kvm_book3s.h +2 -2
@@ -301,12 +301,12 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)static inline void kvmppc_set_cr (struct kvm_vcpu *vcpu,u32 val) { - vcpu->arch.cr = val; + vcpu->arch.regs.ccr = val; }static inline u32 kvmppc_get_cr (struct kvm_vcpu *vcpu) { -return vcpu->arch.cr; +return vcpu->arch.regs.ccr; }static inline void kvmppc_set_xer (struct kvm_vcpu *vcpu,ulong val)
arch/powerpc/include/asm/kvm_book3s_64.h +2 -2
@@ -482,7 +482,7 @@ static inline u64 sanitize_msr(u64 msr)#ifdef CONFIG_PPC_TRANSACTIONAL_MEM static inline void copy_from_checkpoint (struct kvm_vcpu *vcpu) { - vcpu->arch.cr = vcpu->arch.cr_tm; + vcpu->arch.regs.ccr = vcpu->arch.cr_tm; vcpu->arch.regs.xer = vcpu->arch.xer_tm; vcpu->arch.regs.link = vcpu->arch.lr_tm; vcpu->arch.regs.ctr = vcpu->arch.ctr_tm;
@@ -499,7 +499,7 @@ static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu)static inline void copy_to_checkpoint (struct kvm_vcpu *vcpu) { - vcpu->arch.cr_tm = vcpu->arch.cr; + vcpu->arch.cr_tm = vcpu->arch.regs.ccr; vcpu->arch.xer_tm = vcpu->arch.regs.xer; vcpu->arch.lr_tm = vcpu->arch.regs.link; vcpu->arch.ctr_tm = vcpu->arch.regs.ctr;
arch/powerpc/include/asm/kvm_booke.h +2 -2
@@ -46,12 +46,12 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)static inline void kvmppc_set_cr (struct kvm_vcpu *vcpu,u32 val) { - vcpu->arch.cr = val; + vcpu->arch.regs.ccr = val; }static inline u32 kvmppc_get_cr (struct kvm_vcpu *vcpu) { -return vcpu->arch.cr; +return vcpu->arch.regs.ccr; }static inline void kvmppc_set_xer (struct kvm_vcpu *vcpu,ulong val)
arch/powerpc/include/asm/kvm_host.h +0 -2
@@ -538,8 +538,6 @@ struct kvm_vcpu_arch {ulong tar;#endif -u32 cr; -#ifdef CONFIG_PPC_BOOK3S ulong hflags;ulong guest_owned_ext;
arch/powerpc/include/asm/mmu_context.h +9 -6
@@ -217,12 +217,6 @@ static inline void enter_lazy_tlb(struct mm_struct *mm,#endif } -static inline int arch_dup_mmap (struct mm_struct *oldmm, -struct mm_struct *mm) -{ -return 0 ; -} -#ifndef CONFIG_PPC_BOOK3S_64 static inline void arch_exit_mmap (struct mm_struct *mm) {
@@ -247,6 +241,7 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,#ifdef CONFIG_PPC_MEM_KEYS bool arch_vma_access_permitted (struct vm_area_struct *vma,bool write,bool execute,bool foreign); +void arch_dup_pkeys (struct mm_struct *oldmm,struct mm_struct *mm);#else /* CONFIG_PPC_MEM_KEYS */ static inline bool arch_vma_access_permitted (struct vm_area_struct *vma,bool write,bool execute,bool foreign)
@@ -259,6 +254,7 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,#define thread_pkey_regs_save (thread)#define thread_pkey_regs_restore (new_thread, old_thread)#define thread_pkey_regs_init (thread) +#define arch_dup_pkeys (oldmm, mm)static inline u64 pte_to_hpte_pkey_bits (u64 pteflags) {
@@ -267,5 +263,12 @@ static inline u64 pte_to_hpte_pkey_bits(u64 pteflags)#endif /* CONFIG_PPC_MEM_KEYS */ +static inline int arch_dup_mmap (struct mm_struct *oldmm, +struct mm_struct *mm) +{ +arch_dup_pkeys (oldmm, mm); +return 0 ; +} +#endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_MMU_CONTEXT_H */
arch/powerpc/include/asm/reg.h +6 -1
@@ -118,11 +118,16 @@#define MSR_TS_S __MASK(MSR_TS_S_LG)/* Transaction Suspended */ #define MSR_TS_T __MASK(MSR_TS_T_LG)/* Transaction Transactional */ #define MSR_TS_MASK (MSR_TS_T | MSR_TS_S)/* Transaction State bits */ -#define MSR_TM_ACTIVE (x) (((x) & MSR_TS_MASK) != 0)/* Transaction active? */ #define MSR_TM_RESV (x) (((x) & MSR_TS_MASK) == MSR_TS_MASK)/* Reserved */ #define MSR_TM_TRANSACTIONAL (x) (((x) & MSR_TS_MASK) == MSR_TS_T)#define MSR_TM_SUSPENDED (x) (((x) & MSR_TS_MASK) == MSR_TS_S) +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +#define MSR_TM_ACTIVE (x) (((x) & MSR_TS_MASK) != 0)/* Transaction active? */ +#else +#define MSR_TM_ACTIVE (x) 0 +#endif +#if defined(CONFIG_PPC_BOOK3S_64 )#define MSR_64BIT MSR_SF
arch/powerpc/kernel/asm-offsets.c +2 -2
@@ -438,7 +438,7 @@ int main(void)#ifdef CONFIG_PPC_BOOK3S OFFSET (VCPU_TAR , kvm_vcpu, arch.tar);#endif -OFFSET (VCPU_CR , kvm_vcpu, arch.cr); +OFFSET (VCPU_CR , kvm_vcpu, arch.regs.ccr);OFFSET (VCPU_PC , kvm_vcpu, arch.regs.nip);#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE OFFSET (VCPU_MSR , kvm_vcpu, arch.shregs.msr);
@@ -695,7 +695,7 @@ int main(void)#endif /* CONFIG_PPC_BOOK3S_64 */ #else /* CONFIG_PPC_BOOK3S */ -OFFSET (VCPU_CR , kvm_vcpu, arch.cr); +OFFSET (VCPU_CR , kvm_vcpu, arch.regs.ccr);OFFSET (VCPU_XER , kvm_vcpu, arch.regs.xer);OFFSET (VCPU_LR , kvm_vcpu, arch.regs.link);OFFSET (VCPU_CTR , kvm_vcpu, arch.regs.ctr);
arch/powerpc/kernel/head_64.S +2 -0
@@ -906,6 +906,7 @@ p_toc: .8byte __toc_start + 0x8000 - 0b /* * This is where the main kernel code starts. */ +__REF start_here_multiplatform: /* set up the TOC */ bl relative_toc
@@ -981,6 +982,7 @@ start_here_multiplatform: RFI b . /* prevent speculative execution */ + .previous /* This is where all platforms converge execution */ start_here_common:
arch/powerpc/kernel/process.c +11 -27
@@ -102,27 +102,8 @@ static void check_if_tm_restore_required(struct task_struct *tsk) } } -static inline bool msr_tm_active (unsigned long msr) -{ -return MSR_TM_ACTIVE (msr); -} - -static bool tm_active_with_fp (struct task_struct *tsk) -{ -return msr_tm_active (tsk->thread.regs->msr) && - (tsk->thread.ckpt_regs.msr &MSR_FP ); -} - -static bool tm_active_with_altivec (struct task_struct *tsk) -{ -return msr_tm_active (tsk->thread.regs->msr) && - (tsk->thread.ckpt_regs.msr &MSR_VEC ); -}#else -static inline bool msr_tm_active (unsigned long msr) {return false; }static inline void check_if_tm_restore_required (struct task_struct *tsk) { } -static inline bool tm_active_with_fp (struct task_struct *tsk) {return false; } -static inline bool tm_active_with_altivec (struct task_struct *tsk) {return false; }#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ bool strict_msr_control;
@@ -247,7 +228,8 @@ void enable_kernel_fp(void)* giveup as this would save to the 'live' structure not the * checkpointed structure. */ -if (!msr_tm_active (cpumsr) &&msr_tm_active (current->thread.regs->msr)) +if (!MSR_TM_ACTIVE (cpumsr) && +MSR_TM_ACTIVE (current->thread.regs->msr))return ;__giveup_fpu (current); }
@@ -256,7 +238,7 @@ EXPORT_SYMBOL(enable_kernel_fp);static int restore_fp (struct task_struct *tsk) { -if (tsk->thread.load_fp ||tm_active_with_fp (tsk)) { +if (tsk->thread.load_fp) {load_fp_state (¤t->thread.fp_state); current->thread.load_fp++;return 1 ;
@@ -311,7 +293,8 @@ void enable_kernel_altivec(void)* giveup as this would save to the 'live' structure not the * checkpointed structure. */ -if (!msr_tm_active (cpumsr) &&msr_tm_active (current->thread.regs->msr)) +if (!MSR_TM_ACTIVE (cpumsr) && +MSR_TM_ACTIVE (current->thread.regs->msr))return ;__giveup_altivec (current); }
@@ -337,8 +320,7 @@ EXPORT_SYMBOL_GPL(flush_altivec_to_thread);static int restore_altivec (struct task_struct *tsk) { -if (cpu_has_feature (CPU_FTR_ALTIVEC ) && - (tsk->thread.load_vec ||tm_active_with_altivec (tsk))) { +if (cpu_has_feature (CPU_FTR_ALTIVEC ) && (tsk->thread.load_vec)) {load_vr_state (&tsk->thread.vr_state); tsk->thread.used_vr =1 ; tsk->thread.load_vec++;
@@ -397,7 +379,8 @@ void enable_kernel_vsx(void)* giveup as this would save to the 'live' structure not the * checkpointed structure. */ -if (!msr_tm_active (cpumsr) &&msr_tm_active (current->thread.regs->msr)) +if (!MSR_TM_ACTIVE (cpumsr) && +MSR_TM_ACTIVE (current->thread.regs->msr))return ;__giveup_vsx (current); }
@@ -499,13 +482,14 @@ void giveup_all(struct task_struct *tsk)if (!tsk->thread.regs)return ; +check_if_tm_restore_required (tsk); + usermsr = tsk->thread.regs->msr;if ((usermsr & msr_all_available) ==0 )return ;msr_check_and_set (msr_all_available); -check_if_tm_restore_required (tsk);WARN_ON ((usermsr &MSR_VSX ) && !((usermsr &MSR_FP ) && (usermsr &MSR_VEC )));
@@ -530,7 +514,7 @@ void restore_math(struct pt_regs *regs) {unsigned long msr; -if (!msr_tm_active (regs->msr) && +if (!MSR_TM_ACTIVE (regs->msr) && !current->thread.load_fp && !loadvec (current->thread))return ;
arch/powerpc/kvm/book3s_64_mmu_hv.c +3 -0
@@ -744,12 +744,15 @@ void kvmppc_rmap_reset(struct kvm *kvm) srcu_idx =srcu_read_lock (&kvm->srcu); slots =kvm_memslots (kvm);kvm_for_each_memslot (memslot, slots) { +/* Mutual exclusion with kvm_unmap_hva_range etc. */ +spin_lock (&kvm->mmu_lock);/* * This assumes it is acceptable to lose reference and * change bits across a reset. */ memset (memslot->arch.rmap,0 , memslot->npages *sizeof (*memslot->arch.rmap)); +spin_unlock (&kvm->mmu_lock); }srcu_read_unlock (&kvm->srcu, srcu_idx); }
arch/powerpc/kvm/book3s_emulate.c +6 -6
@@ -110,7 +110,7 @@ static inline void kvmppc_copyto_vcpu_tm(struct kvm_vcpu *vcpu) vcpu->arch.ctr_tm = vcpu->arch.regs.ctr; vcpu->arch.tar_tm = vcpu->arch.tar; vcpu->arch.lr_tm = vcpu->arch.regs.link; - vcpu->arch.cr_tm = vcpu->arch.cr; + vcpu->arch.cr_tm = vcpu->arch.regs.ccr; vcpu->arch.xer_tm = vcpu->arch.regs.xer; vcpu->arch.vrsave_tm = vcpu->arch.vrsave; }
@@ -129,7 +129,7 @@ static inline void kvmppc_copyfrom_vcpu_tm(struct kvm_vcpu *vcpu) vcpu->arch.regs.ctr = vcpu->arch.ctr_tm; vcpu->arch.tar = vcpu->arch.tar_tm; vcpu->arch.regs.link = vcpu->arch.lr_tm; - vcpu->arch.cr = vcpu->arch.cr_tm; + vcpu->arch.regs.ccr = vcpu->arch.cr_tm; vcpu->arch.regs.xer = vcpu->arch.xer_tm; vcpu->arch.vrsave = vcpu->arch.vrsave_tm; }
@@ -141,7 +141,7 @@ static void kvmppc_emulate_treclaim(struct kvm_vcpu *vcpu, int ra_val)uint64_t texasr;/* CR0 = 0 | MSR[TS] | 0 */ - vcpu->arch.cr = (vcpu->arch.cr & ~(CR0_MASK <<CR0_SHIFT )) | + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr & ~(CR0_MASK <<CR0_SHIFT )) | (((guest_msr &MSR_TS_MASK ) >> (MSR_TS_S_LG -1 )) <<CR0_SHIFT );
@@ -220,7 +220,7 @@ void kvmppc_emulate_tabort(struct kvm_vcpu *vcpu, int ra_val)tm_abort (ra_val);/* CR0 = 0 | MSR[TS] | 0 */ - vcpu->arch.cr = (vcpu->arch.cr & ~(CR0_MASK <<CR0_SHIFT )) | + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr & ~(CR0_MASK <<CR0_SHIFT )) | (((guest_msr &MSR_TS_MASK ) >> (MSR_TS_S_LG -1 )) <<CR0_SHIFT );
@@ -494,8 +494,8 @@ int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,if (!(kvmppc_get_msr (vcpu) &MSR_PR )) {preempt_disable (); - vcpu->arch.cr = (CR0_TBEGIN_FAILURE | - (vcpu->arch.cr & ~(CR0_MASK <<CR0_SHIFT ))); + vcpu->arch.regs.ccr = (CR0_TBEGIN_FAILURE | + (vcpu->arch.regs.ccr & ~(CR0_MASK <<CR0_SHIFT ))); vcpu->arch.texasr = (TEXASR_FS | TEXASR_EXACT | (((u64)(TM_CAUSE_EMULATE | TM_CAUSE_PERSISTENT))
arch/powerpc/kvm/book3s_hv.c +13 -6
@@ -410,8 +410,8 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu) vcpu->arch.shregs.sprg0, vcpu->arch.shregs.sprg1);pr_err ("sprg2 = %.16llx sprg3 = %.16llx\n" , vcpu->arch.shregs.sprg2, vcpu->arch.shregs.sprg3); -pr_err ("cr = %.8x xer = %.16lx dsisr = %.8x\n" , - vcpu->arch.cr, vcpu->arch.regs.xer, vcpu->arch.shregs.dsisr); +pr_err ("cr = %.8lx xer = %.16lx dsisr = %.8x\n" , + vcpu->arch.regs.ccr, vcpu->arch.regs.xer, vcpu->arch.shregs.dsisr);pr_err ("dar = %.16llx\n" , vcpu->arch.shregs.dar);pr_err ("fault dar = %.16lx dsisr = %.8x\n" , vcpu->arch.fault_dar, vcpu->arch.fault_dsisr);
@@ -3813,12 +3813,15 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)/* Must be called with kvm->lock held and mmu_ready = 0 and no vcpus running */ int kvmppc_switch_mmu_to_hpt (struct kvm *kvm) { +kvmppc_rmap_reset (kvm); + kvm->arch.process_table =0 ; +/* Mutual exclusion with kvm_unmap_hva_range etc. */ +spin_lock (&kvm->mmu_lock); + kvm->arch.radix =0 ; +spin_unlock (&kvm->mmu_lock);kvmppc_free_radix (kvm);kvmppc_update_lpcr (kvm,LPCR_VPM1 ,LPCR_VPM1 |LPCR_UPRT |LPCR_GTSE |LPCR_HR ); -kvmppc_rmap_reset (kvm); - kvm->arch.radix =0 ; - kvm->arch.process_table =0 ;return 0 ; }
@@ -3831,10 +3834,14 @@ int kvmppc_switch_mmu_to_radix(struct kvm *kvm)if (err)return err; +kvmppc_rmap_reset (kvm); +/* Mutual exclusion with kvm_unmap_hva_range etc. */ +spin_lock (&kvm->mmu_lock); + kvm->arch.radix =1 ; +spin_unlock (&kvm->mmu_lock);kvmppc_free_hpt (&kvm->arch.hpt);kvmppc_update_lpcr (kvm,LPCR_UPRT |LPCR_GTSE |LPCR_HR ,LPCR_VPM1 |LPCR_UPRT |LPCR_GTSE |LPCR_HR ); - kvm->arch.radix =1 ;return 0 ; }
arch/powerpc/kvm/book3s_hv_rmhandlers.S +19 -11
@@ -56,6 +56,8 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300) #define STACK_SLOT_DAWR (SFS-56) #define STACK_SLOT_DAWRX (SFS-64) #define STACK_SLOT_HFSCR (SFS-72) +#define STACK_SLOT_AMR (SFS-80) +#define STACK_SLOT_UAMOR (SFS-88) /* * Call kvmppc_hv_entry in real mode.
@@ -760,11 +762,9 @@ BEGIN_FTR_SECTION mfspr r5, SPRN_TIDR mfspr r6, SPRN_PSSCR mfspr r7, SPRN_PID - mfspr r8, SPRN_IAMR std r5, STACK_SLOT_TID(r1) std r6, STACK_SLOT_PSSCR(r1) std r7, STACK_SLOT_PID(r1) - std r8, STACK_SLOT_IAMR(r1) mfspr r5, SPRN_HFSCR std r5, STACK_SLOT_HFSCR(r1) END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
@@ -772,11 +772,18 @@ BEGIN_FTR_SECTION mfspr r5, SPRN_CIABR mfspr r6, SPRN_DAWR mfspr r7, SPRN_DAWRX + mfspr r8, SPRN_IAMR std r5, STACK_SLOT_CIABR(r1) std r6, STACK_SLOT_DAWR(r1) std r7, STACK_SLOT_DAWRX(r1) + std r8, STACK_SLOT_IAMR(r1) END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) + mfspr r5, SPRN_AMR + std r5, STACK_SLOT_AMR(r1) + mfspr r6, SPRN_UAMOR + std r6, STACK_SLOT_UAMOR(r1) + BEGIN_FTR_SECTION /* Set partition DABR */ /* Do this before re-enabling PMU to avoid P7 DABR corruption bug */
@@ -1202,7 +1209,7 @@ BEGIN_FTR_SECTION END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) ld r5, VCPU_LR(r4) - lwz r6, VCPU_CR(r4) + ld r6, VCPU_CR(r4) mtlr r5 mtcr r6
@@ -1313,7 +1320,7 @@ kvmppc_interrupt_hv: std r3, VCPU_GPR(R12)(r9) /* CR is in the high half of r12 */ srdi r4, r12, 32 - stw r4, VCPU_CR(r9) + std r4, VCPU_CR(r9) BEGIN_FTR_SECTION ld r3, HSTATE_CFAR(r13) std r3, VCPU_CFAR(r9)
@@ -1713,22 +1720,25 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300) mtspr SPRN_PSPB, r0 mtspr SPRN_WORT, r0 BEGIN_FTR_SECTION - mtspr SPRN_IAMR, r0 mtspr SPRN_TCSCR, r0 /* Set MMCRS to 1<<31 to freeze and disable the SPMC counters */ li r0, 1 sldi r0, r0, 31 mtspr SPRN_MMCRS, r0 END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300) -8: - /* Save and reset AMR and UAMOR before turning on the MMU */ + /* Save and restore AMR, IAMR and UAMOR before turning on the MMU */ + ld r8, STACK_SLOT_IAMR(r1) + mtspr SPRN_IAMR, r8 + +8: /* Power7 jumps back in here */ mfspr r5,SPRN_AMR mfspr r6,SPRN_UAMOR std r5,VCPU_AMR(r9) std r6,VCPU_UAMOR(r9) - li r6,0 - mtspr SPRN_AMR,r6 + ld r5,STACK_SLOT_AMR(r1) + ld r6,STACK_SLOT_UAMOR(r1) + mtspr SPRN_AMR, r5 mtspr SPRN_UAMOR, r6 /* Switch DSCR back to host value */
@@ -1897,11 +1907,9 @@ BEGIN_FTR_SECTION ld r5, STACK_SLOT_TID(r1) ld r6, STACK_SLOT_PSSCR(r1) ld r7, STACK_SLOT_PID(r1) - ld r8, STACK_SLOT_IAMR(r1) mtspr SPRN_TIDR, r5 mtspr SPRN_PSSCR, r6 mtspr SPRN_PID, r7 - mtspr SPRN_IAMR, r8 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) #ifdef CONFIG_PPC_RADIX_MMU
arch/powerpc/kvm/book3s_hv_tm.c +6 -6
@@ -130,8 +130,8 @@ int kvmhv_p9_tm_emulation(struct kvm_vcpu *vcpu)return RESUME_GUEST ; }/* Set CR0 to indicate previous transactional state */ - vcpu->arch.cr = (vcpu->arch.cr &0x0fffffff ) | - (((msr &MSR_TS_MASK ) >>MSR_TS_S_LG ) <<28 ); + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr &0x0fffffff ) | + (((msr &MSR_TS_MASK ) >>MSR_TS_S_LG ) <<29 );/* L=1 => tresume, L=0 => tsuspend */ if (instr & (1 <<21 )) {if (MSR_TM_SUSPENDED (msr))
@@ -174,8 +174,8 @@ int kvmhv_p9_tm_emulation(struct kvm_vcpu *vcpu)copy_from_checkpoint (vcpu);/* Set CR0 to indicate previous transactional state */ - vcpu->arch.cr = (vcpu->arch.cr &0x0fffffff ) | - (((msr &MSR_TS_MASK ) >>MSR_TS_S_LG ) <<28 ); + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr &0x0fffffff ) | + (((msr &MSR_TS_MASK ) >>MSR_TS_S_LG ) <<29 ); vcpu->arch.shregs.msr &= ~MSR_TS_MASK ;return RESUME_GUEST ;
@@ -204,8 +204,8 @@ int kvmhv_p9_tm_emulation(struct kvm_vcpu *vcpu)copy_to_checkpoint (vcpu);/* Set CR0 to indicate previous transactional state */ - vcpu->arch.cr = (vcpu->arch.cr &0x0fffffff ) | - (((msr &MSR_TS_MASK ) >>MSR_TS_S_LG ) <<28 ); + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr &0x0fffffff ) | + (((msr &MSR_TS_MASK ) >>MSR_TS_S_LG ) <<29 ); vcpu->arch.shregs.msr = msr |MSR_TS_S ;return RESUME_GUEST ; }
arch/powerpc/kvm/book3s_hv_tm_builtin.c +3 -2
@@ -89,7 +89,8 @@ int kvmhv_p9_tm_emulation_early(struct kvm_vcpu *vcpu)if (instr & (1 <<21 )) vcpu->arch.shregs.msr = (msr & ~MSR_TS_MASK ) |MSR_TS_T ;/* Set CR0 to 0b0010 */ - vcpu->arch.cr = (vcpu->arch.cr &0x0fffffff ) |0x20000000 ; + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr &0x0fffffff ) | +0x20000000 ;return 1 ; }
@@ -105,5 +106,5 @@ void kvmhv_emulate_tm_rollback(struct kvm_vcpu *vcpu) vcpu->arch.shregs.msr &= ~MSR_TS_MASK ;/* go to N state */ vcpu->arch.regs.nip = vcpu->arch.tfhar;copy_from_checkpoint (vcpu); - vcpu->arch.cr = (vcpu->arch.cr &0x0fffffff ) |0xa0000000 ; + vcpu->arch.regs.ccr = (vcpu->arch.regs.ccr &0x0fffffff ) |0xa0000000 ; }
arch/powerpc/kvm/book3s_pr.c +2 -2
@@ -167,7 +167,7 @@ void kvmppc_copy_to_svcpu(struct kvm_vcpu *vcpu) svcpu->gpr[11 ] = vcpu->arch.regs.gpr[11 ]; svcpu->gpr[12 ] = vcpu->arch.regs.gpr[12 ]; svcpu->gpr[13 ] = vcpu->arch.regs.gpr[13 ]; - svcpu->cr = vcpu->arch.cr; + svcpu->cr = vcpu->arch.regs.ccr; svcpu->xer = vcpu->arch.regs.xer; svcpu->ctr = vcpu->arch.regs.ctr; svcpu->lr = vcpu->arch.regs.link;
@@ -249,7 +249,7 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu) vcpu->arch.regs.gpr[11 ] = svcpu->gpr[11 ]; vcpu->arch.regs.gpr[12 ] = svcpu->gpr[12 ]; vcpu->arch.regs.gpr[13 ] = svcpu->gpr[13 ]; - vcpu->arch.cr = svcpu->cr; + vcpu->arch.regs.ccr = svcpu->cr; vcpu->arch.regs.xer = svcpu->xer; vcpu->arch.regs.ctr = svcpu->ctr; vcpu->arch.regs.link = svcpu->lr;
arch/powerpc/kvm/bookehv_interrupts.S +4 -4
@@ -186,7 +186,7 @@ END_BTB_FLUSH_SECTION */ PPC_LL r4, PACACURRENT(r13) PPC_LL r4, (THREAD + THREAD_KVM_VCPU)(r4) - stw r10, VCPU_CR(r4) + PPC_STL r10, VCPU_CR(r4) PPC_STL r11, VCPU_GPR(R4)(r4) PPC_STL r5, VCPU_GPR(R5)(r4) PPC_STL r6, VCPU_GPR(R6)(r4)
@@ -296,7 +296,7 @@ _GLOBAL(kvmppc_handler_\intno\()_\srr1) PPC_STL r4, VCPU_GPR(R4)(r11) PPC_LL r4, THREAD_NORMSAVE(0)(r10) PPC_STL r5, VCPU_GPR(R5)(r11) - stw r13, VCPU_CR(r11) + PPC_STL r13, VCPU_CR(r11) mfspr r5, \srr0 PPC_STL r3, VCPU_GPR(R10)(r11) PPC_LL r3, THREAD_NORMSAVE(2)(r10)
@@ -323,7 +323,7 @@ _GLOBAL(kvmppc_handler_\intno\()_\srr1) PPC_STL r4, VCPU_GPR(R4)(r11) PPC_LL r4, GPR9(r8) PPC_STL r5, VCPU_GPR(R5)(r11) - stw r9, VCPU_CR(r11) + PPC_STL r9, VCPU_CR(r11) mfspr r5, \srr0 PPC_STL r3, VCPU_GPR(R8)(r11) PPC_LL r3, GPR10(r8)
@@ -647,7 +647,7 @@ lightweight_exit: PPC_LL r3, VCPU_LR(r4) PPC_LL r5, VCPU_XER(r4) PPC_LL r6, VCPU_CTR(r4) - lwz r7, VCPU_CR(r4) + PPC_LL r7, VCPU_CR(r4) PPC_LL r8, VCPU_PC(r4) PPC_LD(r9, VCPU_SHARED_MSR, r11) PPC_LL r0, VCPU_GPR(R0)(r4)
arch/powerpc/kvm/emulate_loadstore.c +0 -1
@@ -117,7 +117,6 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) emulated =EMULATE_FAIL ; vcpu->arch.regs.msr = vcpu->arch.shared->msr; - vcpu->arch.regs.ccr = vcpu->arch.cr;if (analyse_instr (&op, &vcpu->arch.regs, inst) ==0 ) {int type = op.type &INSTR_TYPE_MASK ;int size =GETSIZE (op.type);
arch/powerpc/mm/hash_utils_64.c +9 -0
@@ -1859,11 +1859,20 @@ void hash__setup_initial_memory_limit(phys_addr_t first_memblock_base,* * For guests on platforms before POWER9, we clamp the it limit to 1G * to avoid some funky things such as RTAS bugs etc... +* +* On POWER9 we limit to 1TB in case the host erroneously told us that +* the RMA was >1TB. Effective address bits 0:23 are treated as zero +* (meaning the access is aliased to zero i.e. addr = addr % 1TB) +* for virtual real mode addressing and so it doesn't make sense to +* have an area larger than 1TB as it can't be addressed. */ if (!early_cpu_has_feature (CPU_FTR_HVMODE )) { ppc64_rma_size = first_memblock_size;if (!early_cpu_has_feature (CPU_FTR_ARCH_300 )) ppc64_rma_size =min_t (u64, ppc64_rma_size,0x40000000 ); +else + ppc64_rma_size =min_t (u64, ppc64_rma_size, +1UL <<SID_SHIFT_1T );/* Finally limit subsequent allocations */ memblock_set_current_limit (ppc64_rma_size);
arch/powerpc/mm/pkeys.c +10 -0
@@ -414,3 +414,13 @@ bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write,return pkey_access_permitted (vma_pkey (vma), write, execute); } + +void arch_dup_pkeys (struct mm_struct *oldmm,struct mm_struct *mm) +{ +if (static_branch_likely (&pkey_disabled)) +return ; + +/* Duplicate the oldmm pkey state in mm: */ +mm_pkey_allocation_map (mm) =mm_pkey_allocation_map (oldmm); + mm->context.execute_only_pkey = oldmm->context.execute_only_pkey; +}
arch/riscv/kernel/ftrace.c +0 -1
@@ -132,7 +132,6 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, {unsigned long return_hooker = (unsigned long )&return_to_handler;unsigned long old; -int err;if (unlikely (atomic_read (¤t->tracing_graph_pause)))return ;
arch/x86/include/asm/kvm_host.h +9 -6
@@ -117,7 +117,7 @@ static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level) }#define KVM_PERMILLE_MMU_PAGES 20 -#define KVM_MIN_ALLOC_MMU_PAGES 64 +#define KVM_MIN_ALLOC_MMU_PAGES 64UL#define KVM_MMU_HASH_SHIFT 12#define KVM_NUM_MMU_PAGES (1 << KVM_MMU_HASH_SHIFT)#define KVM_MIN_FREE_MMU_PAGES 5
@@ -784,6 +784,9 @@ struct kvm_hv {u64 hv_reenlightenment_control;u64 hv_tsc_emulation_control;u64 hv_tsc_emulation_status; + +/* How many vCPUs have VP index != vCPU index */ +atomic_t num_mismatched_vp_indexes; };enum kvm_irqchip_mode {
@@ -793,9 +796,9 @@ enum kvm_irqchip_mode { };struct kvm_arch { -unsigned int n_used_mmu_pages; -unsigned int n_requested_mmu_pages; -unsigned int n_max_mmu_pages; +unsigned long n_used_mmu_pages; +unsigned long n_requested_mmu_pages; +unsigned long n_max_mmu_pages;unsigned int indirect_shadow_pages;unsigned long mmu_valid_gen;struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES ];
@@ -1198,8 +1201,8 @@ void kvm_mmu_clear_dirty_pt_masked(struct kvm *kvm, gfn_t gfn_offset, unsigned long mask);void kvm_mmu_zap_all (struct kvm *kvm);void kvm_mmu_invalidate_mmio_sptes (struct kvm *kvm,u64 gen); -unsigned int kvm_mmu_calculate_mmu_pages (struct kvm *kvm); -void kvm_mmu_change_mmu_pages (struct kvm *kvm,unsigned int kvm_nr_mmu_pages); +unsigned long kvm_mmu_calculate_mmu_pages (struct kvm *kvm); +void kvm_mmu_change_mmu_pages (struct kvm *kvm,unsigned long kvm_nr_mmu_pages);int load_pdptrs (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,unsigned long cr3);bool pdptrs_changed (struct kvm_vcpu *vcpu);
arch/x86/kernel/ftrace.c +17 -25
80 lines not on this page · raw message
arch/x86/kernel/kvmclock.c +1 -5
@@ -117,12 +117,8 @@ static u64 kvm_sched_clock_read(void)static inline void kvm_sched_clock_init (bool stable) { -if (!stable) { - pv_time_ops.sched_clock = kvm_clock_read; +if (!stable)clear_sched_clock_stable (); -return ; - } - kvm_sched_clock_offset =kvm_clock_read (); pv_time_ops.sched_clock = kvm_sched_clock_read;
arch/x86/kernel/setup.c +1 -1
@@ -1251,7 +1251,7 @@ void __init setup_arch(char **cmdline_p) x86_init.hyper.guest_late_init ();e820__reserve_resources (); -e820__register_nosave_regions (max_low_pfn); +e820__register_nosave_regions (max_pfn); x86_init.resources.reserve_resources ();
arch/x86/kvm/emulate.c +10 -0
@@ -2331,12 +2331,16 @@ static int em_lseg(struct x86_emulate_ctxt *ctxt)static int emulator_has_longmode (struct x86_emulate_ctxt *ctxt) { +#ifdef CONFIG_X86_64 u32 eax, ebx, ecx, edx; eax =0x80000001 ; ecx =0 ; ctxt->ops->get_cpuid (ctxt, &eax, &ebx, &ecx, &edx, false);return edx &bit (X86_FEATURE_LM ); +#else +return false; +#endif }#define GET_SMSTATE (type, smbase, offset) \
@@ -2381,6 +2385,7 @@ static int rsm_load_seg_32(struct x86_emulate_ctxt *ctxt, u64 smbase, int n)return X86EMUL_CONTINUE ; } +#ifdef CONFIG_X86_64 static int rsm_load_seg_64 (struct x86_emulate_ctxt *ctxt,u64 smbase,int n) {struct desc_struct desc;
@@ -2399,6 +2404,7 @@ static int rsm_load_seg_64(struct x86_emulate_ctxt *ctxt, u64 smbase, int n) ctxt->ops->set_segment (ctxt, selector, &desc, base3, n); return X86EMUL_CONTINUE; } +#endif static int rsm_enter_protected_mode (struct x86_emulate_ctxt *ctxt,u64 cr0,u64 cr3,u64 cr4)
@@ -2499,6 +2505,7 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, u64 smbase)return rsm_enter_protected_mode (ctxt, cr0, cr3, cr4); } +#ifdef CONFIG_X86_64 static int rsm_load_state_64 (struct x86_emulate_ctxt *ctxt,u64 smbase) {struct desc_struct desc;
@@ -2560,6 +2567,7 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase) return X86EMUL_CONTINUE; } +#endif static int em_rsm (struct x86_emulate_ctxt *ctxt) {
@@ -2616,9 +2624,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)if (ctxt->ops->pre_leave_smm (ctxt, smbase))return X86EMUL_UNHANDLEABLE ; +#ifdef CONFIG_X86_64 if (emulator_has_longmode (ctxt)) ret =rsm_load_state_64 (ctxt, smbase +0x8000 ); else +#endif ret =rsm_load_state_32 (ctxt, smbase +0x8000 );if (ret !=X86EMUL_CONTINUE ) {
arch/x86/kvm/hyperv.c +56 -15
129 lines not on this page · raw message
arch/x86/kvm/hyperv.h +4 -0
@@ -62,6 +62,10 @@ void kvm_hv_vcpu_init(struct kvm_vcpu *vcpu);void kvm_hv_vcpu_postcreate (struct kvm_vcpu *vcpu);void kvm_hv_vcpu_uninit (struct kvm_vcpu *vcpu); +bool kvm_hv_assist_page_enabled (struct kvm_vcpu *vcpu); +bool kvm_hv_get_assist_page (struct kvm_vcpu *vcpu, +struct hv_vp_assist_page *assist_page); +static inline struct kvm_vcpu_hv_stimer *vcpu_to_stimer (struct kvm_vcpu *vcpu,int timer_index) {
arch/x86/kvm/irq.c +7 -0
@@ -172,3 +172,10 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu)__kvm_migrate_apic_timer (vcpu);__kvm_migrate_pit_timer (vcpu); } + +bool kvm_arch_irqfd_allowed (struct kvm *kvm,struct kvm_irqfd *args) +{ +bool resample = args->flags &KVM_IRQFD_FLAG_RESAMPLE ; + +return resample ?irqchip_kernel (kvm) :irqchip_in_kernel (kvm); +}
arch/x86/kvm/irq.h +1 -0
@@ -114,6 +114,7 @@ static inline int irqchip_in_kernel(struct kvm *kvm)return mode !=KVM_IRQCHIP_NONE ; } +bool kvm_arch_irqfd_allowed (struct kvm *kvm,struct kvm_irqfd *args);void kvm_inject_pending_timer_irqs (struct kvm_vcpu *vcpu);void kvm_inject_apic_timer_irqs (struct kvm_vcpu *vcpu);void kvm_apic_nmi_wd_deliver (struct kvm_vcpu *vcpu);
arch/x86/kvm/lapic.c +11 -3
@@ -2633,17 +2633,25 @@ int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 reg, u64 *data)return 0 ; } -int kvm_lapic_enable_pv_eoi (struct kvm_vcpu *vcpu,u64 data) +int kvm_lapic_enable_pv_eoi (struct kvm_vcpu *vcpu,u64 data,unsigned long len) {u64 addr = data & ~KVM_MSR_ENABLED ; +struct gfn_to_hva_cache *ghc = &vcpu->arch.pv_eoi.data; +unsigned long new_len; +if (!IS_ALIGNED (addr,4 ))return 1 ; vcpu->arch.pv_eoi.msr_val = data;if (!pv_eoi_enabled (vcpu))return 0 ; -return kvm_gfn_to_hva_cache_init (vcpu->kvm, &vcpu->arch.pv_eoi.data, - addr,sizeof (u8)); + +if (addr == ghc->gpa && len <= ghc->len) + new_len = ghc->len; +else + new_len = len; + +return kvm_gfn_to_hva_cache_init (vcpu->kvm, ghc, addr, new_len); }void kvm_apic_accept_events (struct kvm_vcpu *vcpu)
arch/x86/kvm/lapic.h +1 -1
@@ -120,7 +120,7 @@ static inline bool kvm_hv_vapic_assist_page_enabled(struct kvm_vcpu *vcpu)return vcpu->arch.hyperv.hv_vapic &HV_X64_MSR_VP_ASSIST_PAGE_ENABLE ; } -int kvm_lapic_enable_pv_eoi (struct kvm_vcpu *vcpu,u64 data); +int kvm_lapic_enable_pv_eoi (struct kvm_vcpu *vcpu,u64 data,unsigned long len);void kvm_lapic_init (void );void kvm_lapic_exit (void );
arch/x86/kvm/mmu.c +6 -7
@@ -1954,7 +1954,7 @@ static int is_empty_shadow_page(u64 *spt)* aggregate version in order to make the slab shrinker * faster */ -static inline void kvm_mod_used_mmu_pages (struct kvm *kvm,int nr) +static inline void kvm_mod_used_mmu_pages (struct kvm *kvm,unsigned long nr) { kvm->arch.n_used_mmu_pages += nr;percpu_counter_add (&kvm_total_used_mmu_pages, nr);
@@ -2704,7 +2704,7 @@ static bool prepare_zap_oldest_mmu_page(struct kvm *kvm,* Changing the number of mmu pages allocated to the vm * Note: if goal_nr_mmu_pages is too small, you will get dead lock */ -void kvm_mmu_change_mmu_pages (struct kvm *kvm,unsigned int goal_nr_mmu_pages) +void kvm_mmu_change_mmu_pages (struct kvm *kvm,unsigned long goal_nr_mmu_pages) {LIST_HEAD (invalid_list);
@@ -5926,10 +5926,10 @@ int kvm_mmu_module_init(void)/* * Caculate mmu pages needed for kvm. */ -unsigned int kvm_mmu_calculate_mmu_pages (struct kvm *kvm) +unsigned long kvm_mmu_calculate_mmu_pages (struct kvm *kvm) { -unsigned int nr_mmu_pages; -unsigned int nr_pages =0 ; +unsigned long nr_mmu_pages; +unsigned long nr_pages =0 ;struct kvm_memslots *slots;struct kvm_memory_slot *memslot;int i;
@@ -5942,8 +5942,7 @@ unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm) } nr_mmu_pages = nr_pages *KVM_PERMILLE_MMU_PAGES /1000 ; - nr_mmu_pages =max (nr_mmu_pages, - (unsigned int )KVM_MIN_ALLOC_MMU_PAGES ); + nr_mmu_pages =max (nr_mmu_pages,KVM_MIN_ALLOC_MMU_PAGES );return nr_mmu_pages; }
arch/x86/kvm/mmu.h +1 -1
@@ -69,7 +69,7 @@ bool kvm_can_do_async_pf(struct kvm_vcpu *vcpu);int kvm_handle_page_fault (struct kvm_vcpu *vcpu,u64 error_code,u64 fault_address,char *insn,int insn_len); -static inline unsigned int kvm_mmu_available_pages (struct kvm *kvm) +static inline unsigned long kvm_mmu_available_pages (struct kvm *kvm) {if (kvm->arch.n_max_mmu_pages > kvm->arch.n_used_mmu_pages) return kvm->arch.n_max_mmu_pages -
arch/x86/kvm/mtrr.c +1 -9
@@ -48,11 +48,6 @@ static bool msr_mtrr_valid(unsigned msr)return false; } -static bool valid_pat_type (unsigned t) -{ -return t <8 && (1 << t) &0xf3 ;/* 0, 1, 4, 5, 6, 7 */ -} -static bool valid_mtrr_type (unsigned t) {return t <8 && (1 << t) &0x73 ;/* 0, 1, 4, 5, 6 */
@@ -67,10 +62,7 @@ bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)return false;if (msr ==MSR_IA32_CR_PAT ) { -for (i =0 ; i <8 ; i++) -if (!valid_pat_type ((data >> (i *8 )) &0xff )) -return false; -return true; +return kvm_pat_valid (data); }else if (msr == MSR_MTRRdefType) {if (data & ~0xcff )return false;
arch/x86/kvm/svm.c +2 -0
@@ -5622,6 +5622,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) svm->vmcb->save.cr2 = vcpu->arch.cr2;clgi (); +kvm_load_guest_xcr0 (vcpu);/* * If this vCPU has touched SPEC_CTRL, restore the guest's value if
@@ -5769,6 +5770,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)if (unlikely (svm->vmcb->control.exit_code ==SVM_EXIT_NMI ))kvm_before_interrupt (&svm->vcpu); +kvm_put_guest_xcr0 (vcpu);stgi ();/* Any pending NMI will happen here */
arch/x86/kvm/vmx.c +24 -17
98 lines not on this page · raw message
arch/x86/kvm/x86.c +13 -13
@@ -713,7 +713,7 @@ void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw) }EXPORT_SYMBOL_GPL (kvm_lmsw); -static void kvm_load_guest_xcr0 (struct kvm_vcpu *vcpu) +void kvm_load_guest_xcr0 (struct kvm_vcpu *vcpu) {if (kvm_read_cr4_bits (vcpu,X86_CR4_OSXSAVE ) && !vcpu->guest_xcr0_loaded) {
@@ -723,8 +723,9 @@ static void kvm_load_guest_xcr0(struct kvm_vcpu *vcpu) vcpu->guest_xcr0_loaded =1 ; } } +EXPORT_SYMBOL_GPL (kvm_load_guest_xcr0); -static void kvm_put_guest_xcr0 (struct kvm_vcpu *vcpu) +void kvm_put_guest_xcr0 (struct kvm_vcpu *vcpu) {if (vcpu->guest_xcr0_loaded) {if (vcpu->arch.xcr0 != host_xcr0)
@@ -732,6 +733,7 @@ static void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu) vcpu->guest_xcr0_loaded =0 ; } } +EXPORT_SYMBOL_GPL (kvm_put_guest_xcr0);static int __kvm_set_xcr (struct kvm_vcpu *vcpu,u32 index,u64 xcr) {
@@ -2494,7 +2496,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)break ;case MSR_KVM_PV_EOI_EN : -if (kvm_lapic_enable_pv_eoi (vcpu, data)) +if (kvm_lapic_enable_pv_eoi (vcpu, data,sizeof (u8)))return 1 ;break ;
@@ -4116,7 +4118,7 @@ static int kvm_vm_ioctl_set_identity_map_addr(struct kvm *kvm, }static int kvm_vm_ioctl_set_nr_mmu_pages (struct kvm *kvm, -u32 kvm_nr_mmu_pages) +unsigned long kvm_nr_mmu_pages) {if (kvm_nr_mmu_pages <KVM_MIN_ALLOC_MMU_PAGES )return -EINVAL ;
@@ -4130,7 +4132,7 @@ static int kvm_vm_ioctl_set_nr_mmu_pages(struct kvm *kvm,return 0 ; } -static int kvm_vm_ioctl_get_nr_mmu_pages (struct kvm *kvm) +static unsigned long kvm_vm_ioctl_get_nr_mmu_pages (struct kvm *kvm) {return kvm->arch.n_max_mmu_pages; }
@@ -7225,9 +7227,9 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, char *buf)put_smstate (u32, buf,0x7ef8 , vcpu->arch.smbase); } +#ifdef CONFIG_X86_64 static void enter_smm_save_state_64 (struct kvm_vcpu *vcpu,char *buf) { -#ifdef CONFIG_X86_64 struct desc_ptr dt;struct kvm_segment seg;unsigned long val;
@@ -7277,10 +7279,8 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, char *buf)for (i =0 ; i <6 ; i++) enter_smm_save_seg_64(vcpu, buf, i); -#else -WARN_ON_ONCE (1 ); -#endif } +#endif static void enter_smm (struct kvm_vcpu *vcpu) {
@@ -7291,9 +7291,11 @@ static void enter_smm(struct kvm_vcpu *vcpu)trace_kvm_enter_smm (vcpu->vcpu_id, vcpu->arch.smbase, true);memset (buf,0 ,512 ); +#ifdef CONFIG_X86_64 if (guest_cpuid_has (vcpu,X86_FEATURE_LM ))enter_smm_save_state_64 (vcpu, buf); else +#endif enter_smm_save_state_32 (vcpu, buf);/*
@@ -7351,8 +7353,10 @@ static void enter_smm(struct kvm_vcpu *vcpu)kvm_set_segment (vcpu, &ds,VCPU_SREG_GS );kvm_set_segment (vcpu, &ds,VCPU_SREG_SS ); +#ifdef CONFIG_X86_64 if (guest_cpuid_has (vcpu,X86_FEATURE_LM )) kvm_x86_ops->set_efer (vcpu,0 ); +#endif kvm_update_cpuid (vcpu);kvm_mmu_reset_context (vcpu);
@@ -7649,8 +7653,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) goto cancel_injection; } -kvm_load_guest_xcr0 (vcpu); -if (req_immediate_exit) {kvm_make_request (KVM_REQ_EVENT , vcpu); kvm_x86_ops->request_immediate_exit (vcpu);
@@ -7703,8 +7705,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) vcpu->mode =OUTSIDE_GUEST_MODE ;smp_wmb (); -kvm_put_guest_xcr0 (vcpu); -kvm_before_interrupt (vcpu); kvm_x86_ops->handle_external_intr (vcpu);kvm_after_interrupt (vcpu);
arch/x86/kvm/x86.h +12 -0
@@ -345,4 +345,16 @@ static inline void kvm_after_interrupt(struct kvm_vcpu *vcpu) __this_cpu_write(current_vcpu, NULL); } + +static inline bool kvm_pat_valid (u64 data) +{ +if (data &0xF8F8F8F8F8F8F8F8ull ) +return false; +/* 0, 1, 4, 5, 6, 7 are valid values. */ +return (data | ((data &0x0202020202020202ull ) <<1 )) == data; +} + +void kvm_load_guest_xcr0 (struct kvm_vcpu *vcpu); +void kvm_put_guest_xcr0 (struct kvm_vcpu *vcpu); +#endif
block/blk-core.c +2 -1
@@ -816,7 +816,8 @@ void blk_cleanup_queue(struct request_queue *q)blk_exit_queue (q);if (q->mq_ops) -blk_mq_free_queue (q); +blk_mq_exit_queue (q); +percpu_ref_exit (&q->q_usage_counter);spin_lock_irq (lock);
block/blk-iolatency.c +17 -38
80 lines not on this page · raw message
block/blk-mq-sysfs.c +6 -0
@@ -10,6 +10,7 @@#include <linux/smp.h> #include <linux/blk-mq.h> +#include "blk.h" #include "blk-mq.h" #include "blk-mq-tag.h"
@@ -21,6 +22,11 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj) { struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx, kobj); + +if (hctx->flags &BLK_MQ_F_BLOCKING ) +cleanup_srcu_struct (hctx->srcu); +blk_free_flush_queue (hctx->fq); +sbitmap_free (&hctx->ctx_map);free_cpumask_var (hctx->cpumask);kfree (hctx->ctxs);kfree (hctx);
block/blk-mq.c +2 -6
@@ -2157,12 +2157,7 @@ static void blk_mq_exit_hctx(struct request_queue *q,if (set->ops->exit_hctx) set->ops->exit_hctx (hctx, hctx_idx); -if (hctx->flags &BLK_MQ_F_BLOCKING ) -cleanup_srcu_struct (hctx->srcu); -blk_mq_remove_cpuhp (hctx); -blk_free_flush_queue (hctx->fq); -sbitmap_free (&hctx->ctx_map); } static void blk_mq_exit_hw_queues(struct request_queue *q,
@@ -2662,7 +2657,8 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, }EXPORT_SYMBOL (blk_mq_init_allocated_queue); -void blk_mq_free_queue (struct request_queue *q) +/* tags can _not_ be used after returning from blk_mq_exit_queue */ +void blk_mq_exit_queue (struct request_queue *q) {struct blk_mq_tag_set *set = q->tag_set;
block/blk-mq.h +1 -1
@@ -31,7 +31,7 @@ struct blk_mq_ctx { }____cacheline_aligned_in_smp ;void blk_mq_freeze_queue (struct request_queue *q); -void blk_mq_free_queue (struct request_queue *q); +void blk_mq_exit_queue (struct request_queue *q);int blk_mq_update_nr_requests (struct request_queue *q,unsigned int nr);void blk_mq_wake_waiters (struct request_queue *q);bool blk_mq_dispatch_rq_list (struct request_queue *,struct list_head *,bool );
drivers/char/tpm/st33zp24/i2c.c +1 -1
@@ -33,7 +33,7 @@struct st33zp24_i2c_phy {struct i2c_client *client; -u8 buf[TPM_BUFSIZE +1 ]; +u8 buf[ST33ZP24_BUFSIZE +1 ];int io_lpcpd; };
drivers/char/tpm/st33zp24/spi.c +1 -1
@@ -63,7 +63,7 @@* some latency byte before the answer is available (max 15). * We have 2048 + 1024 + 15. */ -#define ST33ZP24_SPI_BUFFER_SIZE (TPM_BUFSIZE + (TPM_BUFSIZE / 2) +\ +#define ST33ZP24_SPI_BUFFER_SIZE (ST33ZP24_BUFSIZE + (ST33ZP24_BUFSIZE / 2) +\ MAX_SPI_LATENCY)
drivers/char/tpm/st33zp24/st33zp24.h +2 -2
@@ -18,8 +18,8 @@ #ifndef __LOCAL_ST33ZP24_H__ #define __LOCAL_ST33ZP24_H__ -#define TPM_WRITE_DIRECTION 0x80 -#define TPM_BUFSIZE 2048 +#define TPM_WRITE_DIRECTION 0x80 +#define ST33ZP24_BUFSIZE 2048 struct st33zp24_dev { struct tpm_chip *chip;
drivers/char/tpm/tpm_i2c_infineon.c +8 -7
@@ -26,8 +26,7 @@#include <linux/wait.h> #include "tpm.h" -/* max. buffer size supported by our TPM */ -#define TPM_BUFSIZE 1260 +#define TPM_I2C_INFINEON_BUFSIZE 1260/* max. number of iterations after I2C NAK */ #define MAX_COUNT 3
@@ -63,11 +62,13 @@ enum i2c_chip_type { UNKNOWN, }; -/* Structure to store I2C TPM specific stuff */ struct tpm_inf_dev {struct i2c_client *client;int locality; -u8 buf[TPM_BUFSIZE +sizeof (u8)];/* max. buffer size + addr */ +/* In addition to the data itself, the buffer must fit the 7-bit I2C +* address and the direction bit. +*/ +u8 buf[TPM_I2C_INFINEON_BUFSIZE +1 ];struct tpm_chip *chip;enum i2c_chip_type chip_type;unsigned int adapterlimit;
@@ -219,7 +220,7 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len, .buf = tpm_dev.buf }; -if (len >TPM_BUFSIZE ) +if (len >TPM_I2C_INFINEON_BUFSIZE )return -EINVAL ;if (!tpm_dev.client->adapter->algo->master_xfer)
@@ -527,8 +528,8 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)u8 retries =0 ;u8 sts =TPM_STS_GO ; -if (len >TPM_BUFSIZE ) -return -E2BIG ;/* command is too long for our tpm, sorry */ +if (len >TPM_I2C_INFINEON_BUFSIZE ) +return -E2BIG ;if (request_locality (chip,0 ) <0 )return -EBUSY ;
drivers/char/tpm/tpm_i2c_nuvoton.c +7 -9
@@ -35,14 +35,12 @@#include "tpm.h" /* I2C interface offsets */ -#define TPM_STS 0x00 -#define TPM_BURST_COUNT 0x01 -#define TPM_DATA_FIFO_W 0x20 -#define TPM_DATA_FIFO_R 0x40 -#define TPM_VID_DID_RID 0x60 -/* TPM command header size */ -#define TPM_HEADER_SIZE 10 -#define TPM_RETRY 5 +#define TPM_STS 0x00 +#define TPM_BURST_COUNT 0x01 +#define TPM_DATA_FIFO_W 0x20 +#define TPM_DATA_FIFO_R 0x40 +#define TPM_VID_DID_RID 0x60 +#define TPM_I2C_RETRIES 5/* * I2C bus device maximum buffer size w/o counting I2C address or command * i.e. max size required for I2C write is 34 = addr, command, 32 bytes data
@@ -292,7 +290,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count)dev_err (dev,"%s() count < header size\n" , __func__);return -EIO ; } -for (retries =0 ; retries <TPM_RETRY ; retries++) { +for (retries =0 ; retries <TPM_I2C_RETRIES ; retries++) {if (retries >0 ) {/* if this is not the first trial, set responseRetry */ i2c_nuvoton_write_status(client,
drivers/clk/clk-s2mps11.c +1 -1
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(platform, s2mps11_clk_id);* This requires of_device_id table. In the same time this will not change the * actual *device* matching so do not add .of_match_table. */ -static const struct of_device_id s2mps11_dt_match[] = { +static const struct of_device_id s2mps11_dt_match[]__used = { { .compatible ="samsung,s2mps11-clk" , .data = (void *)S2MPS11X ,
drivers/clk/tegra/clk-audio-sync.c +1 -2
@@ -55,7 +55,7 @@ const struct clk_ops tegra_clk_sync_source_ops = { };struct clk *tegra_clk_register_sync_source (const char *name, -unsigned long rate,unsigned long max_rate) +unsigned long max_rate) {struct tegra_clk_sync_source *sync;struct clk_init_data init;
@@ -67,7 +67,6 @@ struct clk *tegra_clk_register_sync_source(const char *name,return ERR_PTR (-ENOMEM ); } - sync->rate = rate; sync->max_rate = max_rate; init.ops = &tegra_clk_sync_source_ops;
drivers/clk/tegra/clk-tegra-audio.c +2 -5
@@ -49,8 +49,6 @@ struct tegra_sync_source_initdata {#define SYNC (_name) \ {\ .name = #_name,\ - .rate = 24000000,\ - .max_rate = 24000000,\ .clk_id = tegra_clk_ ## _name,\ }
@@ -176,7 +174,7 @@ static void __init tegra_audio_sync_clk_init(void __iomem *clk_base,void __init tegra_audio_clk_init (void __iomem *clk_base,void __iomem *pmc_base,struct tegra_clk *tegra_clks,struct tegra_audio_clk_info *audio_info, -unsigned int num_plls) +unsigned int num_plls,unsigned long sync_max_rate) {struct clk *clk;struct clk **dt_clk;
@@ -221,8 +219,7 @@ void __init tegra_audio_clk_init(void __iomem *clk_base,if (!dt_clk)continue ; - clk =tegra_clk_register_sync_source (data->name, - data->rate, data->max_rate); + clk =tegra_clk_register_sync_source (data->name, sync_max_rate); *dt_clk = clk; }
drivers/clk/tegra/clk-tegra114.c +8 -1
@@ -1190,6 +1190,13 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA114_CLK_XUSB_FALCON_SRC, TEGRA114_CLK_PLL_P, 204000000, 0 }, { TEGRA114_CLK_XUSB_HOST_SRC, TEGRA114_CLK_PLL_P, 102000000, 0 }, { TEGRA114_CLK_VDE, TEGRA114_CLK_CLK_MAX, 600000000, 0 }, + { TEGRA114_CLK_SPDIF_IN_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA114_CLK_I2S0_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA114_CLK_I2S1_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA114_CLK_I2S2_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA114_CLK_I2S3_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA114_CLK_I2S4_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA114_CLK_VIMCLK_SYNC, TEGRA114_CLK_CLK_MAX, 24000000, 0 },/* must be the last entry */ { TEGRA114_CLK_CLK_MAX, TEGRA114_CLK_CLK_MAX, 0, 0 }, };
@@ -1362,7 +1369,7 @@ static void __init tegra114_clock_init(struct device_node *np)tegra114_periph_clk_init (clk_base, pmc_base);tegra_audio_clk_init (clk_base, pmc_base, tegra114_clks, tegra114_audio_plls, -ARRAY_SIZE (tegra114_audio_plls)); +ARRAY_SIZE (tegra114_audio_plls),24000000 );tegra_pmc_clk_init (pmc_base, tegra114_clks);tegra_super_clk_gen4_init (clk_base, pmc_base, tegra114_clks, &pll_x_params);
drivers/clk/tegra/clk-tegra124.c +8 -1
@@ -1291,6 +1291,13 @@ static struct tegra_clk_init_table common_init_table[] __initdata = { { TEGRA124_CLK_CSITE, TEGRA124_CLK_CLK_MAX, 0, 1 }, { TEGRA124_CLK_TSENSOR, TEGRA124_CLK_CLK_M, 400000, 0 }, { TEGRA124_CLK_VIC03, TEGRA124_CLK_PLL_C3, 0, 0 }, + { TEGRA124_CLK_SPDIF_IN_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA124_CLK_I2S0_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA124_CLK_I2S1_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA124_CLK_I2S2_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA124_CLK_I2S3_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA124_CLK_I2S4_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA124_CLK_VIMCLK_SYNC, TEGRA124_CLK_CLK_MAX, 24576000, 0 },/* must be the last entry */ { TEGRA124_CLK_CLK_MAX, TEGRA124_CLK_CLK_MAX, 0, 0 }, };
@@ -1455,7 +1462,7 @@ static void __init tegra124_132_clock_init_pre(struct device_node *np)tegra124_periph_clk_init (clk_base, pmc_base);tegra_audio_clk_init (clk_base, pmc_base, tegra124_clks, tegra124_audio_plls, -ARRAY_SIZE (tegra124_audio_plls)); +ARRAY_SIZE (tegra124_audio_plls),24576000 );tegra_pmc_clk_init (pmc_base, tegra124_clks);/* For Tegra124 & Tegra132, PLLD is the only source for DSIA & DSIB */
drivers/clk/tegra/clk-tegra210.c +10 -1
@@ -3369,6 +3369,15 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA210_CLK_SOC_THERM, TEGRA210_CLK_PLL_P, 51000000, 0 }, { TEGRA210_CLK_CCLK_G, TEGRA210_CLK_CLK_MAX, 0, 1 }, { TEGRA210_CLK_PLL_U_OUT2, TEGRA210_CLK_CLK_MAX, 60000000, 1 }, + { TEGRA210_CLK_SPDIF_IN_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_I2S0_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_I2S1_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_I2S2_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_I2S3_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_I2S4_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_VIMCLK_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, + { TEGRA210_CLK_HDA, TEGRA210_CLK_PLL_P, 51000000, 0 }, + { TEGRA210_CLK_HDA2CODEC_2X, TEGRA210_CLK_PLL_P, 48000000, 0 },/* This MUST be the last entry. */ { TEGRA210_CLK_CLK_MAX, TEGRA210_CLK_CLK_MAX, 0, 0 }, };
@@ -3562,7 +3571,7 @@ static void __init tegra210_clock_init(struct device_node *np)tegra210_periph_clk_init (clk_base, pmc_base);tegra_audio_clk_init (clk_base, pmc_base, tegra210_clks, tegra210_audio_plls, -ARRAY_SIZE (tegra210_audio_plls)); +ARRAY_SIZE (tegra210_audio_plls),24576000 );tegra_pmc_clk_init (pmc_base, tegra210_clks);/* For Tegra210, PLLD is the only source for DSIA & DSIB */
drivers/clk/tegra/clk-tegra30.c +8 -1
@@ -1267,6 +1267,13 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA30_CLK_GR3D2, TEGRA30_CLK_PLL_C, 300000000, 0 }, { TEGRA30_CLK_PLL_U, TEGRA30_CLK_CLK_MAX, 480000000, 0 }, { TEGRA30_CLK_VDE, TEGRA30_CLK_CLK_MAX, 600000000, 0 }, + { TEGRA30_CLK_SPDIF_IN_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA30_CLK_I2S0_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA30_CLK_I2S1_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA30_CLK_I2S2_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA30_CLK_I2S3_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA30_CLK_I2S4_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, + { TEGRA30_CLK_VIMCLK_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },/* must be the last entry */ { TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0 }, };
@@ -1344,7 +1351,7 @@ static void __init tegra30_clock_init(struct device_node *np)tegra30_periph_clk_init ();tegra_audio_clk_init (clk_base, pmc_base, tegra30_clks, tegra30_audio_plls, -ARRAY_SIZE (tegra30_audio_plls)); +ARRAY_SIZE (tegra30_audio_plls),24000000 );tegra_pmc_clk_init (pmc_base, tegra30_clks);tegra_init_dup_clks (tegra_clk_duplicates, clks,TEGRA30_CLK_CLK_MAX );
drivers/clk/tegra/clk.h +2 -2
@@ -41,7 +41,7 @@ extern const struct clk_ops tegra_clk_sync_source_ops;extern int *periph_clk_enb_refcnt;struct clk *tegra_clk_register_sync_source (const char *name, -unsigned long fixed_rate,unsigned long max_rate); +unsigned long max_rate);/** * struct tegra_clk_frac_div - fractional divider clock
@@ -796,7 +796,7 @@ void tegra_register_devclks(struct tegra_devclk *dev_clks, int num);void tegra_audio_clk_init (void __iomem *clk_base,void __iomem *pmc_base,struct tegra_clk *tegra_clks,struct tegra_audio_clk_info *audio_info, -unsigned int num_plls); +unsigned int num_plls,unsigned long sync_max_rate); void tegra_periph_clk_init(void __iomem *clk_base, void __iomem *pmc_base, struct tegra_clk *tegra_clks,
drivers/crypto/ccree/cc_driver.c +4 -3
@@ -364,7 +364,7 @@ static int init_cc_resources(struct platform_device *plat_dev) rc =cc_ivgen_init (new_drvdata);if (rc) {dev_err (dev,"cc_ivgen_init failed\n" ); - goto post_power_mgr_err; + goto post_buf_mgr_err; }/* Allocate crypto algs */
@@ -387,6 +387,9 @@ static int init_cc_resources(struct platform_device *plat_dev) goto post_hash_err; } +/* All set, we can allow autosuspend */ +cc_pm_go (new_drvdata); +/* If we got here and FIPS mode is enabled * it means all FIPS test passed, so let TEE * know we're good.
@@ -401,8 +404,6 @@ static int init_cc_resources(struct platform_device *plat_dev)cc_cipher_free (new_drvdata); post_ivgen_err:cc_ivgen_fini (new_drvdata); -post_power_mgr_err: -cc_pm_fini (new_drvdata); post_buf_mgr_err:cc_buffer_mgr_fini (new_drvdata); post_req_mgr_err:
drivers/crypto/ccree/cc_pm.c +6 -7
@@ -103,20 +103,19 @@ int cc_pm_put_suspend(struct device *dev)int cc_pm_init (struct cc_drvdata *drvdata) { -int rc =0 ;struct device *dev =drvdata_to_dev (drvdata);/* must be before the enabling to avoid resdundent suspending */ pm_runtime_set_autosuspend_delay (dev,CC_SUSPEND_TIMEOUT );pm_runtime_use_autosuspend (dev);/* activate the PM module */ - rc =pm_runtime_set_active (dev); -if (rc) -return rc; -/* enable the PM module*/ -pm_runtime_enable (dev); +return pm_runtime_set_active (dev); +} -return rc; +/* enable the PM module*/ +void cc_pm_go (struct cc_drvdata *drvdata) +{ +pm_runtime_enable (drvdata_to_dev (drvdata)); }void cc_pm_fini (struct cc_drvdata *drvdata)
drivers/crypto/ccree/cc_pm.h +3 -0
@@ -16,6 +16,7 @@extern const struct dev_pm_ops ccree_pm;int cc_pm_init (struct cc_drvdata *drvdata); +void cc_pm_go (struct cc_drvdata *drvdata);void cc_pm_fini (struct cc_drvdata *drvdata);int cc_pm_suspend (struct device *dev);int cc_pm_resume (struct device *dev);
@@ -29,6 +30,8 @@ static inline int cc_pm_init(struct cc_drvdata *drvdata)return 0 ; } +static inline void cc_pm_go (struct cc_drvdata *drvdata) {} +static inline void cc_pm_fini (struct cc_drvdata *drvdata) {}static inline int cc_pm_suspend (struct device *dev)
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +4 -1
@@ -1070,7 +1070,7 @@ void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq,int amdgpu_vce_ring_test_ring (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -uint32_t rptr =amdgpu_ring_get_rptr (ring); +uint32_t rptr;unsigned i;int r, timeout = adev->usec_timeout;
@@ -1084,6 +1084,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) ring->idx, r);return r; } + + rptr =amdgpu_ring_get_rptr (ring); +amdgpu_ring_write (ring,VCE_CMD_END );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +4 -1
@@ -431,7 +431,7 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)int amdgpu_vcn_enc_ring_test_ring (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -uint32_t rptr =amdgpu_ring_get_rptr (ring); +uint32_t rptr;unsigned i;int r;
@@ -441,6 +441,9 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) ring->idx, r);return r; } + + rptr =amdgpu_ring_get_rptr (ring); +amdgpu_ring_write (ring,VCN_ENC_CMD_END );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
@@ -82,7 +82,8 @@ MODULE_FIRMWARE("amdgpu/raven_rlc.bin");static const struct soc15_reg_golden golden_settings_gc_9_0[] = { -SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG2,0xf00fffff ,0x00000420 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG2,0xf00fffff ,0x00000400 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG3,0x80000000 ,0x80000000 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGB_GPU_ID,0x0000000f ,0x00000000 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_SC_BINNER_EVENT_CNTL_3,0x00000003 ,0x82400024 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_SC_ENHANCE,0x3fffffff ,0x00000001 ),
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +4 -1
@@ -170,7 +170,7 @@ static void uvd_v6_0_enc_ring_set_wptr(struct amdgpu_ring *ring)static int uvd_v6_0_enc_ring_test_ring (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -uint32_t rptr =amdgpu_ring_get_rptr (ring); +uint32_t rptr;unsigned i;int r;
@@ -180,6 +180,9 @@ static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring) ring->idx, r);return r; } + + rptr =amdgpu_ring_get_rptr (ring); +amdgpu_ring_write (ring,HEVC_ENC_CMD_END );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +4 -1
@@ -175,7 +175,7 @@ static void uvd_v7_0_enc_ring_set_wptr(struct amdgpu_ring *ring)static int uvd_v7_0_enc_ring_test_ring (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -uint32_t rptr =amdgpu_ring_get_rptr (ring); +uint32_t rptr;unsigned i;int r;
@@ -188,6 +188,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring) ring->me, ring->idx, r);return r; } + + rptr =amdgpu_ring_get_rptr (ring); +amdgpu_ring_write (ring,HEVC_ENC_CMD_END );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdkfd/kfd_device.c +1 -0
@@ -310,6 +310,7 @@ static const struct kfd_deviceid supported_devices[] = { { 0x67CF, &polaris10_device_info }, /* Polaris10 */ { 0x67D0, &polaris10_vf_device_info }, /* Polaris10 vf*/ { 0x67DF, &polaris10_device_info }, /* Polaris10 */ + { 0x6FDF, &polaris10_device_info }, /* Polaris10 */ { 0x67E0, &polaris11_device_info }, /* Polaris11 */ { 0x67E1, &polaris11_device_info }, /* Polaris11 */ { 0x67E3, &polaris11_device_info }, /* Polaris11 */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +0 -3
@@ -377,9 +377,6 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,drm_connector_attach_encoder (&aconnector->base, &aconnector->mst_encoder->base); -/* -* TODO: understand why this one is needed -*/ drm_object_attach_property( &connector->base, dev->mode_config.path_property,
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c +16 -16
@@ -669,20 +669,20 @@ int smu_set_watermarks_for_clocks_ranges(void *wt_table,for (i =0 ; i < wm_with_clock_ranges->num_wm_dmif_sets; i++) { table->WatermarkRow[1 ][i].MinClock =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_dcfclk_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_dcfclk_clk_in_khz / +1000 )); table->WatermarkRow[1 ][i].MaxClock =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_dcfclk_clk_in_khz) / -100 ); + (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_dcfclk_clk_in_khz / +1000 )); table->WatermarkRow[1 ][i].MinUclk =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_mem_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_mem_clk_in_khz / +1000 )); table->WatermarkRow[1 ][i].MaxUclk =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_mem_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_mem_clk_in_khz / +1000 )); table->WatermarkRow[1 ][i].WmSetting = (uint8_t ) wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_set_id; }
@@ -690,20 +690,20 @@ int smu_set_watermarks_for_clocks_ranges(void *wt_table,for (i =0 ; i < wm_with_clock_ranges->num_wm_mcif_sets; i++) { table->WatermarkRow[0 ][i].MinClock =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_socclk_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_socclk_clk_in_khz / +1000 )); table->WatermarkRow[0 ][i].MaxClock =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_socclk_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_socclk_clk_in_khz / +1000 )); table->WatermarkRow[0 ][i].MinUclk =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_mem_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_mem_clk_in_khz / +1000 )); table->WatermarkRow[0 ][i].MaxUclk =cpu_to_le16 ((uint16_t ) - (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_mem_clk_in_khz) / -1000 ); + (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_mem_clk_in_khz / +1000 )); table->WatermarkRow[0 ][i].WmSetting = (uint8_t ) wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_set_id; }
drivers/gpu/drm/drm_atomic.c +21 -0
@@ -1702,6 +1702,27 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,struct drm_connector *connector = conn_state->connector;struct drm_crtc_state *crtc_state; +/* +* For compatibility with legacy users, we want to make sure that +* we allow DPMS On<->Off modesets on unregistered connectors, since +* legacy modesetting users will not be expecting these to fail. We do +* not however, want to allow legacy users to assign a connector +* that's been unregistered from sysfs to another CRTC, since doing +* this with a now non-existent connector could potentially leave us +* in an invalid state. +* +* Since the connector can be unregistered at any point during an +* atomic check or commit, this is racy. But that's OK: all we care +* about is ensuring that userspace can't use this connector for new +* configurations after it's been notified that the connector is no +* longer present. +*/ +if (!READ_ONCE (connector->registered) && crtc) { +DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] is not registered\n" , + connector->base.id, connector->name); +return -EINVAL ; + } +if (conn_state->crtc == crtc)return 0 ;
drivers/gpu/drm/drm_ioc32.c +3 -3
@@ -185,7 +185,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd, m32.size = map.size; m32.type = map.type; m32.flags = map.flags; - m32.handle =ptr_to_compat (map.handle); + m32.handle =ptr_to_compat ((void __user *)map.handle); m32.mtrr = map.mtrr;if (copy_to_user (argp, &m32,sizeof (m32)))return -EFAULT ;
@@ -216,7 +216,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, m32.offset = map.offset; m32.mtrr = map.mtrr; - m32.handle =ptr_to_compat (map.handle); + m32.handle =ptr_to_compat ((void __user *)map.handle);if (map.handle !=compat_ptr (m32.handle))pr_err_ratelimited ("compat_drm_addmap truncated handle %p for type %d offset %x\n" , map.handle, m32.type, m32.offset);
@@ -529,7 +529,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd,if (err)return err; - req32.handle =ptr_to_compat (req.handle); + req32.handle =ptr_to_compat ((void __user *)req.handle);if (copy_to_user (argp, &req32,sizeof (req32)))return -EFAULT ;
drivers/gpu/drm/drm_vblank.c +42 -3
76 lines not on this page · raw message
drivers/gpu/drm/i915/i915_debugfs.c +4 -0
@@ -1788,6 +1788,8 @@ static int i915_emon_status(struct seq_file *m, void *unused)if (!IS_GEN5 (dev_priv))return -ENODEV ; +intel_runtime_pm_get (dev_priv); + ret =mutex_lock_interruptible (&dev->struct_mutex);if (ret)return ret;
@@ -1802,6 +1804,8 @@ static int i915_emon_status(struct seq_file *m, void *unused)seq_printf (m,"GFX power: %ld\n" , gfx);seq_printf (m,"Total power: %ld\n" , chipset + gfx); +intel_runtime_pm_put (dev_priv); +return 0 ; }
drivers/gpu/drm/i915/i915_gem.c +31 -8
@@ -1874,20 +1874,28 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,* pages from. */ if (!obj->base.filp) { -i915_gem_object_put (obj); -return -ENXIO ; + addr = -ENXIO ; + goto err; + } + +if (range_overflows (args->offset, args->size, (u64 )obj->base.size)) { + addr = -EINVAL ; + goto err; } addr =vm_mmap (obj->base.filp,0 , args->size,PROT_READ |PROT_WRITE ,MAP_SHARED , args->offset); +if (IS_ERR_VALUE (addr)) + goto err; +if (args->flags &I915_MMAP_WC ) {struct mm_struct *mm = current->mm;struct vm_area_struct *vma;if (down_write_killable (&mm->mmap_sem)) { -i915_gem_object_put (obj); -return -EINTR ; + addr = -EINTR ; + goto err; } vma =find_vma (mm, addr);if (vma &&__vma_matches (vma, obj->base.filp, addr, args->size))
@@ -1896,17 +1904,20 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,else addr = -ENOMEM ;up_write (&mm->mmap_sem); +if (IS_ERR_VALUE (addr)) + goto err;/* This may race, but that's ok, it only gets set */ WRITE_ONCE (obj->frontbuffer_ggtt_origin,ORIGIN_CPU ); }i915_gem_object_put (obj); -if (IS_ERR ((void *)addr)) -return addr; args->addr_ptr = (uint64_t ) addr; -return 0 ; + +err: +i915_gem_object_put (obj); +return addr; }static unsigned int tile_row_pages (struct drm_i915_gem_object *obj)
@@ -5595,6 +5606,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv)i915_gem_cleanup_userptr (dev_priv);if (ret == -EIO ) { +mutex_lock (&dev_priv->drm.struct_mutex); +/* * Allow engine initialisation to fail by marking the GPU as * wedged. But we only want to do this where the GPU is angry,
@@ -5605,7 +5618,14 @@ int i915_gem_init(struct drm_i915_private *dev_priv) "Failed to initialize GPU, declaring it wedged!\n");i915_gem_set_wedged (dev_priv); } - ret =0 ; + +/* Minimal basic recovery for KMS */ + ret =i915_ggtt_enable_hw (dev_priv); +i915_gem_restore_gtt_mappings (dev_priv); +i915_gem_restore_fences (dev_priv); +intel_init_clock_gating (dev_priv); + +mutex_unlock (&dev_priv->drm.struct_mutex); }i915_gem_drain_freed_objects (dev_priv);
@@ -5615,6 +5635,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)void i915_gem_fini (struct drm_i915_private *dev_priv) {i915_gem_suspend_late (dev_priv); +intel_disable_gt_powersave (dev_priv);/* Flush any outstanding unpin_work. */ i915_gem_drain_workqueue (dev_priv);
@@ -5626,6 +5647,8 @@ void i915_gem_fini(struct drm_i915_private *dev_priv)i915_gem_contexts_fini (dev_priv);mutex_unlock (&dev_priv->drm.struct_mutex); +intel_cleanup_gt_powersave (dev_priv); +intel_uc_fini_misc (dev_priv);i915_gem_cleanup_userptr (dev_priv);
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -6531,7 +6531,7 @@ enum {#define PLANE_CTL_YUV422_UYVY (1 << 16)#define PLANE_CTL_YUV422_YVYU (2 << 16)#define PLANE_CTL_YUV422_VYUY (3 << 16) -#define PLANE_CTL_DECOMPRESSION_ENABLE (1 << 15) +#define PLANE_CTL_RENDER_DECOMPRESSION_ENABLE (1 << 15)#define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14)#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13)/* Pre-GLK */ #define PLANE_CTL_TILED_MASK (0x7 << 10)
drivers/gpu/drm/i915/intel_cdclk.c +11 -0
@@ -2208,6 +2208,17 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state)if (INTEL_GEN (dev_priv) >=9 ) min_cdclk =max (2 *96000 , min_cdclk); +/* +* "For DP audio configuration, cdclk frequency shall be set to +* meet the following requirements: +* DP Link Frequency(MHz) | Cdclk frequency(MHz) +* 270 | 320 or higher +* 162 | 200 or higher" +*/ +if ((IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) && +intel_crtc_has_dp_encoder (crtc_state) && crtc_state->has_audio) + min_cdclk =max (crtc_state->port_clock, min_cdclk); +/* * On Valleyview some DSI panels lose (v|h)sync when the clock is lower * than 320000KHz.
drivers/gpu/drm/i915/intel_display.c +27 -10
@@ -2712,6 +2712,17 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,if (size_aligned *2 > dev_priv->stolen_usable_size)return false; +switch (fb->modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +case I915_FORMAT_MOD_Y_TILED : +break ; +default : +DRM_DEBUG_DRIVER ("Unsupported modifier for initial FB: 0x%llx\n" , + fb->modifier); +return false; + } +mutex_lock (&dev->struct_mutex); obj = i915_gem_object_create_stolen_for_preallocated(dev_priv, base_aligned,
@@ -2721,8 +2732,17 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,if (!obj)return false; -if (plane_config->tiling ==I915_TILING_X ) - obj->tiling_and_stride = fb->pitches[0 ] |I915_TILING_X ; +switch (plane_config->tiling) { +case I915_TILING_NONE : +break ; +case I915_TILING_X : +case I915_TILING_Y : + obj->tiling_and_stride = fb->pitches[0 ] | plane_config->tiling; +break ; +default : +MISSING_CASE (plane_config->tiling); +return false; + } mode_cmd.pixel_format = fb->format->format; mode_cmd.width = fb->width;
@@ -3561,11 +3581,11 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier)case I915_FORMAT_MOD_Y_TILED :return PLANE_CTL_TILED_Y ;case I915_FORMAT_MOD_Y_TILED_CCS : -return PLANE_CTL_TILED_Y |PLANE_CTL_DECOMPRESSION_ENABLE ; +return PLANE_CTL_TILED_Y |PLANE_CTL_RENDER_DECOMPRESSION_ENABLE ;case I915_FORMAT_MOD_Yf_TILED:return PLANE_CTL_TILED_YF ;case I915_FORMAT_MOD_Yf_TILED_CCS: -return PLANE_CTL_TILED_YF |PLANE_CTL_DECOMPRESSION_ENABLE ; +return PLANE_CTL_TILED_YF |PLANE_CTL_RENDER_DECOMPRESSION_ENABLE ;default :MISSING_CASE (fb_modifier); }
@@ -8812,13 +8832,14 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, fb->modifier =I915_FORMAT_MOD_X_TILED ;break ;case PLANE_CTL_TILED_Y : -if (val &PLANE_CTL_DECOMPRESSION_ENABLE ) + plane_config->tiling =I915_TILING_Y ; +if (val &PLANE_CTL_RENDER_DECOMPRESSION_ENABLE ) fb->modifier =I915_FORMAT_MOD_Y_TILED_CCS ;else fb->modifier =I915_FORMAT_MOD_Y_TILED ;break ;case PLANE_CTL_TILED_YF : -if (val &PLANE_CTL_DECOMPRESSION_ENABLE ) +if (val &PLANE_CTL_RENDER_DECOMPRESSION_ENABLE ) fb->modifier = I915_FORMAT_MOD_Yf_TILED_CCS;else fb->modifier = I915_FORMAT_MOD_Yf_TILED;
@@ -15951,8 +15972,6 @@ void intel_modeset_cleanup(struct drm_device *dev)flush_work (&dev_priv->atomic_helper.free_work);WARN_ON (!llist_empty (&dev_priv->atomic_helper.free_list)); -intel_disable_gt_powersave (dev_priv); -/* * Interrupts and polling as the first thing to avoid creating havoc. * Too much stuff here (turning of connectors, ...) would
@@ -15980,8 +15999,6 @@ void intel_modeset_cleanup(struct drm_device *dev)intel_cleanup_overlay (dev_priv); -intel_cleanup_gt_powersave (dev_priv); -intel_teardown_gmbus (dev_priv);destroy_workqueue (dev_priv->modeset_wq);
drivers/gpu/drm/i915/intel_dp.c +16 -0
@@ -4739,6 +4739,22 @@ intel_dp_long_pulse(struct intel_connector *connector,*/ status = connector_status_disconnected; goto out; + }else { +/* +* If display is now connected check links status, +* there has been known issues of link loss triggering +* long pulse. +* +* Some sinks (eg. ASUS PB287Q) seem to perform some +* weird HPD ping pong during modesets. So we can apparently +* end up with HPD going low during a modeset, and then +* going back up soon after. And once that happens we must +* retrain the link to get a picture. That's in case no +* userspace component reacted to intermittent HPD dip. +*/ +struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base; + +intel_dp_retrain_link (encoder, ctx); }/*
drivers/gpu/drm/i915/intel_dp_mst.c +0 -2
@@ -408,8 +408,6 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *cstruct intel_dp *intel_dp = intel_connector->mst_port;struct intel_crtc *crtc =to_intel_crtc (state->crtc); -if (!READ_ONCE (connector->registered)) -return NULL ;return &intel_dp->mst_encoders[crtc->pipe]->base.base; }
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
@@ -759,7 +759,8 @@ nv50_msto_enable(struct drm_encoder *encoder) slots =drm_dp_find_vcpi_slots (&mstm->mgr, mstc->pbn); r =drm_dp_mst_allocate_vcpi (&mstm->mgr, mstc->port, mstc->pbn, slots); -WARN_ON (!r); +if (!r) +DRM_DEBUG_KMS ("Failed to allocate VCPI\n" );if (!mstm->links++)nv50_outp_acquire (mstm->outp);
drivers/gpu/drm/panel/panel-simple.c +29 -0
@@ -436,6 +436,32 @@ static const struct panel_desc ampire_am800480r3tmqwa1h = { .bus_format = MEDIA_BUS_FMT_RGB666_1X18, }; +static const struct display_timing santek_st0700i5y_rbslw_f_timing = { + .pixelclock = {26400000 ,33300000 ,46800000 }, + .hactive = {800 ,800 ,800 }, + .hfront_porch = {16 ,210 ,354 }, + .hback_porch = {45 ,36 ,6 }, + .hsync_len = {1 ,10 ,40 }, + .vactive = {480 ,480 ,480 }, + .vfront_porch = {7 ,22 ,147 }, + .vback_porch = {22 ,13 ,3 }, + .vsync_len = {1 ,10 ,20 }, + .flags =DISPLAY_FLAGS_HSYNC_LOW |DISPLAY_FLAGS_VSYNC_LOW | +DISPLAY_FLAGS_DE_HIGH |DISPLAY_FLAGS_PIXDATA_POSEDGE +}; + +static const struct panel_desc armadeus_st0700_adapt = { + .timings = &santek_st0700i5y_rbslw_f_timing, + .num_timings =1 , + .bpc =6 , + .size = { + .width =154 , + .height =86 , + }, + .bus_format =MEDIA_BUS_FMT_RGB666_1X18 , + .bus_flags =DRM_BUS_FLAG_DE_HIGH |DRM_BUS_FLAG_PIXDATA_POSEDGE , +}; +static const struct drm_display_mode auo_b101aw03_mode = { .clock =51450 , .hdisplay =1024 ,
@@ -2330,6 +2356,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "ampire,am800480r3tmqwa1h", .data = &ire_am800480r3tmqwa1h, + }, { + .compatible = "armadeus,st0700-adapt", + .data = &armadeus_st0700_adapt, }, { .compatible = "auo,b101aw03", .data = &auo_b101aw03,
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +3 -5
@@ -353,7 +353,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, !!(HIGH_WORD(ecx) & MESSAGE_STATUS_HB));if ((HIGH_WORD (ebx) &MESSAGE_STATUS_SUCCESS ) ==0 ) {kfree (reply); - + reply =NULL ;if ((HIGH_WORD (ebx) &MESSAGE_STATUS_CPT ) !=0 ) {/* A checkpoint occurred. Retry. */ continue ;
@@ -377,7 +377,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,if ((HIGH_WORD (ecx) &MESSAGE_STATUS_SUCCESS ) ==0 ) {kfree (reply); - + reply =NULL ;if ((HIGH_WORD (ecx) &MESSAGE_STATUS_CPT ) !=0 ) {/* A checkpoint occurred. Retry. */ continue ;
@@ -389,10 +389,8 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,break ; } -if (retries ==RETRIES ) { -kfree (reply); +if (!reply)return -EINVAL ; - } *msg_len = reply_len; *msg = reply;
drivers/hv/hv_kvp.c +26 -6
@@ -353,7 +353,9 @@ static void process_ib_ipinfo(void *in_msg, void *out_msg, int op) out->body.kvp_ip_val.dhcp_enabled = in->kvp_ip_val.dhcp_enabled; -default : +/* fallthrough */ + +case KVP_OP_GET_IP_INFO : utf16s_to_utf8s((wchar_t *)in->kvp_ip_val.adapter_id, MAX_ADAPTER_ID_SIZE, UTF16_LITTLE_ENDIAN,
@@ -406,6 +408,10 @@ kvp_send_key(struct work_struct *dummy)process_ib_ipinfo (in_msg, message,KVP_OP_SET_IP_INFO );break ;case KVP_OP_GET_IP_INFO : +/* +* We only need to pass on the info of operation, adapter_id +* and addr_family to the userland kvp daemon. +*/ process_ib_ipinfo (in_msg, message,KVP_OP_GET_IP_INFO );break ;case KVP_OP_SET :
@@ -421,7 +427,7 @@ kvp_send_key(struct work_struct *dummy)UTF16_LITTLE_ENDIAN , message->body.kvp_set.data.value, HV_KVP_EXCHANGE_MAX_VALUE_SIZE - 1) + 1; -break ; +break ;case REG_U32 :/*
@@ -446,7 +452,10 @@ kvp_send_key(struct work_struct *dummy)break ; } -case KVP_OP_GET : + +/* +* The key is always a string - utf16 encoding. +*/ message->body.kvp_set.data.key_size = utf16s_to_utf8s( (wchar_t *)in_msg->body.kvp_set.data.key,
@@ -454,7 +463,18 @@ kvp_send_key(struct work_struct *dummy)UTF16_LITTLE_ENDIAN , message->body.kvp_set.data.key, HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1) + 1; -break ; + +break ; + +case KVP_OP_GET : + message->body.kvp_get.data.key_size = +utf16s_to_utf8s ( + (wchar_t *)in_msg->body.kvp_get.data.key, + in_msg->body.kvp_get.data.key_size, +UTF16_LITTLE_ENDIAN , + message->body.kvp_get.data.key, +HV_KVP_EXCHANGE_MAX_KEY_SIZE -1 ) +1 ; +break ;case KVP_OP_DELETE : message->body.kvp_delete.key_size =
@@ -464,12 +484,12 @@ kvp_send_key(struct work_struct *dummy)UTF16_LITTLE_ENDIAN , message->body.kvp_delete.key, HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1) + 1; -break ; +break ;case KVP_OP_ENUMERATE : message->body.kvp_enum_data.index = in_msg->body.kvp_enum_data.index; -break ; +break ; } kvp_transaction.state =HVUTIL_USERSPACE_REQ ;
drivers/i2c/busses/i2c-at91.c +6 -5
@@ -270,9 +270,11 @@ static void at91_twi_write_next_byte(struct at91_twi_dev *dev)writeb_relaxed (*dev->buf, dev->base +AT91_TWI_THR );/* send stop when last byte has been written */ -if (--dev->buf_len ==0 ) +if (--dev->buf_len ==0 ) {if (!dev->use_alt_cmd)at91_twi_write (dev,AT91_TWI_CR ,AT91_TWI_STOP ); +at91_twi_write (dev,AT91_TWI_IDR ,AT91_TWI_TXRDY ); + }dev_dbg (dev->dev,"wrote 0x%x, to go %zu\n" , *dev->buf, dev->buf_len);
@@ -690,9 +692,8 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) }else {at91_twi_write_next_byte (dev);at91_twi_write (dev,AT91_TWI_IER , -AT91_TWI_TXCOMP | -AT91_TWI_NACK | -AT91_TWI_TXRDY ); +AT91_TWI_TXCOMP |AT91_TWI_NACK | + (dev->buf_len ?AT91_TWI_TXRDY :0 )); } }
@@ -913,7 +914,7 @@ static struct at91_twi_pdata sama5d4_config = {static struct at91_twi_pdata sama5d2_config = { .clk_max_div =7 , - .clk_offset =4 , + .clk_offset =3 , .has_unre_flag = true, .has_alt_cmd = true, .has_hold_field = true,
drivers/iio/adc/exynos_adc.c +31 -0
@@ -115,6 +115,8 @@#define MAX_ADC_V2_CHANNELS 10#define MAX_ADC_V1_CHANNELS 8#define MAX_EXYNOS3250_ADC_CHANNELS 2 +#define MAX_EXYNOS4212_ADC_CHANNELS 4 +#define MAX_S5PV210_ADC_CHANNELS 10/* Bit definitions common for ADC_V1 and ADC_V2 */ #define ADC_CON_EN_START (1u << 0)
@@ -270,6 +272,19 @@ static void exynos_adc_v1_start_conv(struct exynos_adc *info,writel (con1 |ADC_CON_EN_START ,ADC_V1_CON (info->regs)); } +/* Exynos4212 and 4412 is like ADCv1 but with four channels only */ +static const struct exynos_adc_data exynos4212_adc_data = { + .num_channels =MAX_EXYNOS4212_ADC_CHANNELS , + .mask =ADC_DATX_MASK ,/* 12 bit ADC resolution */ + .needs_adc_phy = true, + .phy_offset =EXYNOS_ADCV1_PHY_OFFSET , + + .init_hw = exynos_adc_v1_init_hw, + .exit_hw = exynos_adc_v1_exit_hw, + .clear_irq = exynos_adc_v1_clear_irq, + .start_conv = exynos_adc_v1_start_conv, +}; +static const struct exynos_adc_data exynos_adc_v1_data = { .num_channels =MAX_ADC_V1_CHANNELS , .mask =ADC_DATX_MASK ,/* 12 bit ADC resolution */
@@ -282,6 +297,16 @@ static const struct exynos_adc_data exynos_adc_v1_data = { .start_conv = exynos_adc_v1_start_conv, }; +static const struct exynos_adc_data exynos_adc_s5pv210_data = { + .num_channels =MAX_S5PV210_ADC_CHANNELS , + .mask =ADC_DATX_MASK ,/* 12 bit ADC resolution */ + + .init_hw = exynos_adc_v1_init_hw, + .exit_hw = exynos_adc_v1_exit_hw, + .clear_irq = exynos_adc_v1_clear_irq, + .start_conv = exynos_adc_v1_start_conv, +}; +static void exynos_adc_s3c2416_start_conv (struct exynos_adc *info,unsigned long addr) {
@@ -478,6 +503,12 @@ static const struct of_device_id exynos_adc_match[] = { }, { .compatible = "samsung,s3c6410-adc", .data = &exynos_adc_s3c64xx_data, + }, { + .compatible = "samsung,s5pv210-adc", + .data = &exynos_adc_s5pv210_data, + }, { + .compatible = "samsung,exynos4212-adc", + .data = &exynos4212_adc_data, }, { .compatible = "samsung,exynos-adc-v1", .data = &exynos_adc_v1_data,
drivers/iio/adc/rcar-gyroadc.c +2 -2
@@ -391,7 +391,7 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)dev_err (dev,"Only %i channels supported with %s, but reg = <%i>.\n" , num_channels, child->name, reg); -return ret; +return -EINVAL ; } }
@@ -400,7 +400,7 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)dev_err (dev,"Channel %i uses different ADC mode than the rest.\n" , reg); -return ret; +return -EINVAL ; }/* Channel is valid, grab the regulator. */
drivers/infiniband/core/uverbs_main.c +3 -4
@@ -265,6 +265,9 @@ void ib_uverbs_release_file(struct kref *ref)if (atomic_dec_and_test (&file->device->refcount))ib_uverbs_comp_dev (file->device); +if (file->async_file) +kref_put (&file->async_file->ref, + ib_uverbs_release_async_event_file);kobject_put (&file->device->kobj);kfree (file); }
@@ -915,10 +918,6 @@ static int ib_uverbs_close(struct inode *inode, struct file *filp) }mutex_unlock (&file->device->lists_mutex); -if (file->async_file) -kref_put (&file->async_file->ref, - ib_uverbs_release_async_event_file); -kref_put (&file->ref, ib_uverbs_release_file);return 0 ;
drivers/infiniband/hw/hfi1/sdma.c +3 -6
@@ -410,10 +410,7 @@ static void sdma_flush(struct sdma_engine *sde)sdma_flush_descq (sde);spin_lock_irqsave (&sde->flushlist_lock, flags);/* copy flush list */ -list_for_each_entry_safe (txp, txp_next, &sde->flushlist, list) { -list_del_init (&txp->list); -list_add_tail (&txp->list, &flushlist); - } +list_splice_init (&sde->flushlist, &flushlist);spin_unlock_irqrestore (&sde->flushlist_lock, flags);/* flush from flush list */ list_for_each_entry_safe (txp, txp_next, &flushlist, list)
@@ -2426,7 +2423,7 @@ int sdma_send_txreq(struct sdma_engine *sde, wait->tx_count++; wait->count += tx->num_desc; } -schedule_work (&sde->flush_worker); +queue_work_on (sde->cpu, system_highpri_wq, &sde->flush_worker); ret = -ECOMM ; goto unlock; nodesc:
@@ -2526,7 +2523,7 @@ int sdma_send_txlist(struct sdma_engine *sde, struct iowait *wait, } }spin_unlock (&sde->flushlist_lock); -schedule_work (&sde->flush_worker); +queue_work_on (sde->cpu, system_highpri_wq, &sde->flush_worker); ret = -ECOMM ; goto update_tail; nodesc:
drivers/infiniband/hw/mlx5/odp.c +2 -1
@@ -497,7 +497,7 @@ void mlx5_ib_free_implicit_mr(struct mlx5_ib_mr *imr)static int pagefault_mr (struct mlx5_ib_dev *dev,struct mlx5_ib_mr *mr,u64 io_virt,size_t bcnt,u32 *bytes_mapped) { -u64 access_mask =ODP_READ_ALLOWED_BIT ; +u64 access_mask;int npages =0 , page_shift, np;u64 start_idx, page_mask;struct ib_umem_odp *odp;
@@ -522,6 +522,7 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr, page_shift = mr->umem->page_shift; page_mask = ~(BIT (page_shift) -1 ); start_idx = (io_virt - (mr->mmkey.iova & page_mask)) >> page_shift; + access_mask =ODP_READ_ALLOWED_BIT ;if (mr->umem->writable) access_mask |=ODP_WRITE_ALLOWED_BIT ;
drivers/infiniband/ulp/srp/ib_srp.c +18 -6
@@ -3401,13 +3401,17 @@ static const match_table_t srp_opt_tokens = {/** * srp_parse_in - parse an IP address and port number combination +* @net: [in] Network namespace. +* @sa: [out] Address family, IP address and port number. +* @addr_port_str: [in] IP address and port number. +* @has_port: [out] Whether or not @addr_port_str includes a port number. * * Parse the following address formats: * - IPv4: <ip_address>:<port>, e.g. 1.2.3.4:5. * - IPv6: \[<ipv6_address>\]:<port>, e.g. [1::2:3%4]:5. */ static int srp_parse_in (struct net *net,struct sockaddr_storage *sa, -const char *addr_port_str) +const char *addr_port_str,bool *has_port) {char *addr_end, *addr =kstrdup (addr_port_str,GFP_KERNEL );char *port_str;
@@ -3416,9 +3420,12 @@ static int srp_parse_in(struct net *net, struct sockaddr_storage *sa,if (!addr)return -ENOMEM ; port_str =strrchr (addr,':' ); -if (!port_str) -return -EINVAL ; - *port_str++ ='\0' ; +if (port_str &&strchr (port_str,']' )) + port_str =NULL ; +if (port_str) + *port_str++ ='\0' ; +if (has_port) + *has_port = port_str !=NULL ; ret =inet_pton_with_scope (net,AF_INET , addr, port_str, sa);if (ret && addr[0 ]) { addr_end = addr +strlen (addr) -1 ;
@@ -3440,6 +3447,7 @@ static int srp_parse_options(struct net *net, const char *buf,char *p;substring_t args[MAX_OPT_ARGS ];unsigned long long ull; +bool has_port;int opt_mask =0 ;int token;int ret = -EINVAL ;
@@ -3538,7 +3546,8 @@ static int srp_parse_options(struct net *net, const char *buf, ret = -ENOMEM ; goto out; } - ret =srp_parse_in (net, &target->rdma_cm.src.ss, p); + ret =srp_parse_in (net, &target->rdma_cm.src.ss, p, +NULL );if (ret <0 ) {pr_warn ("bad source parameter '%s'\n" , p);kfree (p);
@@ -3554,7 +3563,10 @@ static int srp_parse_options(struct net *net, const char *buf, ret = -ENOMEM ; goto out; } - ret =srp_parse_in (net, &target->rdma_cm.dst.ss, p); + ret =srp_parse_in (net, &target->rdma_cm.dst.ss, p, + &has_port); +if (!has_port) + ret = -EINVAL ;if (ret <0 ) {pr_warn ("bad dest parameter '%s'\n" , p);kfree (p);
drivers/iommu/iova.c +3 -2
@@ -148,8 +148,9 @@ __cached_rbnode_delete_update(struct iova_domain *iovad, struct iova *free)struct iova *cached_iova; cached_iova = rb_entry(iovad->cached32_node, struct iova, node); -if (free->pfn_hi < iovad->dma_32bit_pfn && - free->pfn_lo >= cached_iova->pfn_lo) +if (free == cached_iova || + (free->pfn_hi < iovad->dma_32bit_pfn && + free->pfn_lo >= cached_iova->pfn_lo)) iovad->cached32_node =rb_next (&free->node); cached_iova = rb_entry(iovad->cached_node, struct iova, node);
drivers/md/bcache/btree.c +43 -6
15 lines not on this page · raw message
drivers/media/cec/cec-edid.c deleted +0 -95
95 lines not on this page · raw message
drivers/media/platform/stm32/stm32-dcmi.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/media/platform/vivid/vivid-vid-cap.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/media/platform/vivid/vivid-vid-common.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/media/v4l2-core/v4l2-dv-timings.c +151 -0
151 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +62 -3
65 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/iwl-config.h +8 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +28 -28
56 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2_mac_common.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/pci/controller/dwc/pcie-designware-host.c +8 -13
Lines of this file are not shown. View the raw message.
drivers/pci/controller/dwc/pcie-qcom.c +40 -18
58 lines not on this page · raw message
drivers/pci/quirks.c +92 -56
148 lines not on this page · raw message
drivers/remoteproc/qcom_q6v5.c +36 -8
44 lines not on this page · raw message
drivers/scsi/megaraid/megaraid_sas_base.c +52 -24
76 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +25 -23
48 lines not on this page · raw message
fs/btrfs/scrub.c +76 -43
119 lines not on this page · raw message
fs/cifs/smbdirect.c +28 -27
55 lines not on this page · raw message
fs/ext4/block_validity.c +54 -0
54 lines not on this page · raw message
include/linux/gpio/consumer.h +31 -31
62 lines not on this page · raw message
include/media/cec.h +0 -80
80 lines not on this page · raw message
kernel/resource.c +49 -61
110 lines not on this page · raw message
tools/testing/selftests/net/fib_rule_tests.sh +3 -2
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.