Linux 4.18.9
Greg KH
maintainerI'm announcing the release of the 4.18.9 kernel.
All users of the 4.18 kernel series must upgrade.
The updated 4.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/boot/dts/axs10x_mb.dtsi | 7 arch/arc/boot/dts/hsdk.dts | 7 arch/arc/configs/axs101_defconfig | 1 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/arm64/kvm/hyp/switch.c | 9 - arch/mips/boot/dts/mscc/ocelot.dtsi | 2 arch/mips/cavium-octeon/octeon-platform.c | 2 arch/mips/generic/init.c | 1 arch/mips/include/asm/io.h | 8 - arch/mips/kernel/vdso.c | 20 ++ arch/mips/mm/c-r4k.c | 6 arch/powerpc/include/asm/book3s/64/pgalloc.h | 23 ++- arch/powerpc/kvm/book3s_64_mmu_radix.c | 6 arch/powerpc/platforms/4xx/msi.c | 51 ++++-- arch/powerpc/platforms/powernv/npu-dma.c | 5 arch/powerpc/platforms/pseries/setup.c | 25 ++- arch/s390/kvm/vsie.c | 3 arch/x86/include/asm/kdebug.h | 12 + arch/x86/include/asm/kvm_host.h | 16 +- arch/x86/kernel/apic/vector.c | 2 arch/x86/kernel/cpu/microcode/amd.c | 24 ++- arch/x86/kernel/cpu/microcode/intel.c | 17 +- arch/x86/kernel/dumpstack.c | 11 - arch/x86/kernel/process_32.c | 4 arch/x86/kernel/process_64.c | 12 + arch/x86/kvm/mmu.c | 21 ++ arch/x86/kvm/svm.c | 4 arch/x86/kvm/vmx.c | 4 arch/x86/kvm/x86.c | 10 + arch/x86/mm/fault.c | 2 block/bfq-cgroup.c | 4 block/blk-core.c | 5 block/blk-mq-tag.c | 8 - block/partitions/aix.c | 13 + drivers/acpi/acpi_lpss.c | 2 drivers/android/binder_alloc.c | 43 ++++- drivers/ata/libahci.c | 20 +- drivers/base/memory.c | 20 +- drivers/block/nbd.c | 3 drivers/block/pktcdvd.c | 4 drivers/bluetooth/Kconfig | 1 drivers/char/tpm/tpm_i2c_infineon.c | 8 - drivers/char/tpm/tpm_tis_spi.c | 9 + drivers/clk/clk-scmi.c | 5 drivers/dax/pmem.c | 12 + drivers/firmware/google/vpd.c | 5 drivers/gpio/gpio-ml-ioh.c | 3 drivers/gpio/gpio-pxa.c | 35 +++- drivers/gpio/gpio-tegra.c | 2 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 38 +++-- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 drivers/gpu/ipu-v3/ipu-common.c | 2 drivers/hid/hid-ids.h | 1 drivers/hid/hid-input.c | 5 drivers/hid/hid-multitouch.c | 19 ++ drivers/hid/i2c-hid/i2c-hid.c | 2 drivers/hv/hv.c | 14 + drivers/i2c/busses/i2c-aspeed.c | 2 drivers/i2c/busses/i2c-i801.c | 7 drivers/i2c/busses/i2c-xiic.c | 4 drivers/infiniband/core/cma.c | 13 + drivers/infiniband/hw/hns/hns_roce_hem.c | 3 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 12 + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 drivers/input/touchscreen/atmel_mxt_ts.c | 7 drivers/iommu/arm-smmu-v3.c | 22 ++- drivers/iommu/ipmmu-vmsa.c | 9 - drivers/macintosh/via-pmu.c | 9 - drivers/md/dm-cache-target.c | 19 ++ drivers/md/raid5.c | 6 drivers/media/dvb-frontends/helene.c | 5 drivers/media/platform/davinci/vpif_display.c | 24 ++- drivers/media/platform/qcom/camss-8x16/camss-csid.c | 16 +- drivers/media/platform/rcar-vin/rcar-csi2.c | 20 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 23 +-- drivers/media/usb/dvb-usb/dw2102.c | 19 +- drivers/media/usb/em28xx/em28xx-cards.c | 4 drivers/media/usb/em28xx/em28xx-core.c | 4 drivers/media/usb/em28xx/em28xx-dvb.c | 4 drivers/memory/ti-aemif.c | 2 drivers/mfd/rave-sp.c | 7 drivers/mfd/ti_am335x_tscadc.c | 3 drivers/misc/mic/scif/scif_api.c | 20 +- drivers/misc/ti-st/st_kim.c | 4 drivers/mtd/nand/raw/nand_base.c | 44 +++--- drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/phy/mdio-mux-bcm-iproc.c | 20 ++ drivers/net/wireless/ath/ath10k/mac.c | 7 drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 drivers/net/wireless/ath/ath10k/wmi-tlv.h | 5 drivers/net/wireless/ath/ath9k/hw.c | 7 drivers/net/wireless/ath/ath9k/xmit.c | 3 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 24 +-- drivers/net/wireless/ti/wlcore/rx.c | 8 - drivers/pci/controller/pcie-mobiveil.c | 4 drivers/pci/switch/switchtec.c | 4 drivers/pinctrl/berlin/berlin.c | 14 + drivers/pinctrl/freescale/pinctrl-imx.c | 2 drivers/pinctrl/pinctrl-amd.c | 3 drivers/regulator/tps65217-regulator.c | 2 drivers/rpmsg/rpmsg_core.c | 7 drivers/scsi/3w-9xxx.c | 6 drivers/scsi/3w-sas.c | 3 drivers/scsi/3w-xxxx.c | 2 drivers/scsi/lpfc/lpfc.h | 2 drivers/scsi/lpfc/lpfc_nvme.c | 22 +-- drivers/scsi/qla2xxx/qla_init.c | 9 - drivers/scsi/qla2xxx/qla_target.c | 3 drivers/scsi/qla2xxx/qla_tmpl.c | 9 + drivers/target/target_core_transport.c | 5 drivers/target/target_core_user.c | 73 +++++----- drivers/thermal/rcar_thermal.c | 2 drivers/thermal/thermal_hwmon.c | 1 drivers/tty/rocket.c | 2 drivers/uio/uio.c | 19 -- fs/autofs/autofs_i.h | 4 fs/autofs/inode.c | 1 fs/btrfs/extent-tree.c | 17 +- fs/btrfs/ioctl.c | 19 ++ fs/cifs/connect.c | 2 fs/cifs/inode.c | 2 fs/cifs/smb2ops.c | 35 +++- fs/cifs/smb2pdu.c | 3 fs/f2fs/f2fs.h | 15 +- fs/f2fs/file.c | 2 fs/f2fs/gc.c | 8 - fs/f2fs/inline.c | 22 +++ fs/f2fs/inode.c | 19 ++ fs/f2fs/node.c | 46 ++++-- fs/f2fs/recovery.c | 4 fs/f2fs/segment.c | 20 ++ fs/f2fs/segment.h | 3 fs/f2fs/super.c | 25 ++- fs/f2fs/sysfs.c | 16 +- fs/nfs/callback_proc.c | 4 fs/nfs/callback_xdr.c | 11 + fs/nfs/nfs4client.c | 6 include/linux/hid.h | 1 include/linux/mm_types.h | 2 include/linux/mm_types_task.h | 2 include/linux/mtd/rawnand.h | 16 +- include/linux/vm_event_item.h | 1 include/linux/vmacache.h | 5 include/uapi/linux/ethtool.h | 4 kernel/cpu.c | 11 - kernel/time/clocksource.c | 40 ++++- kernel/time/timer.c | 29 ++- mm/debug.c | 4 mm/memory_hotplug.c | 3 mm/page_alloc.c | 4 mm/vmacache.c | 38 ----- net/bluetooth/hidp/core.c | 2 net/dcb/dcbnl.c | 11 - net/mac80211/rx.c | 1 sound/pci/hda/hda_codec.c | 3 sound/pci/hda/patch_realtek.c | 1 sound/soc/soc-pcm.c | 5 tools/perf/Makefile.config | 4 tools/perf/builtin-c2c.c | 3 tools/perf/perf.h | 2 tools/perf/util/evsel.c | 14 + tools/testing/nvdimm/pmem-dax.c | 12 + tools/testing/selftests/bpf/test_verifier.c | 6 tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json | 24 +-- tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json | 3 virt/kvm/arm/mmu.c | 9 + 170 files changed, 1166 insertions(+), 579 deletions(-)
AceLan Kao (1):
HID: i2c-hid: Fix flooded incomplete report after S3 on Rayd touchscreen
Akshu Agrawal (1):
ASoC: soc-pcm: Use delay set in component pointer function
Alexandru Gagniuc (1):
ALSA: hda/realtek - Add mute LED quirk for HP Spectre x360
Alexey Brodkin (2):
ARC: [plat-axs*/plat-hsdk]: Allow U-Boot to pass MAC-address to the kernel
ARC: [plat-axs*]: Enable SWAP
Amit Daniel Kachhap (1):
clk: scmi: Fix the rounding of clock rate
Andrey Smirnov (1):
mfd: rave-sp: Initialize flow control and parity of the port
Aneesh Kumar K.V (1):
mm/hugetlb: filter out hugetlb pages if HUGEPAGE migration is not supported.
Anthony Koo (1):
drm/amd/display: Prevent PSR from being enabled if initialization fails
Anton Vasilyev (8):
media: davinci: vpif_display: Mix memory leak on probe error path
media: dw2102: Fix memleak on sequence of probes
misc: ti-st: Fix memory leak in the error path of probe()
firmware: vpd: Fix section enabled flag on vpd_section_destroy
tty: rocket: Fix possible buffer overwrite on register_PCI
scsi: 3ware: fix return 0 on the error path of probe
regulator: tps65217: Fix NULL pointer dereference on probe
gpio: ml-ioh: Fix buffer underwrite on probe error path
Arun Parameswaran (1):
net: phy: Fix the register offsets in Broadcom iProc mdio mux driver
Bartosz Golaszewski (1):
memory: ti-aemif: fix a potential NULL-pointer dereference
Benjamin Tissoires (2):
HID: multitouch: fix Elan panels with 2 input modes declaration
HID: core: fix grouping by application
BingJing Chang (1):
md/raid5: fix data corruption of replacements after originals dropped
Brad Love (2):
media: em28xx: Fix dual transport stream operation
media: em28xx: Fix DualHD disconnect oops
Calum Mackay (1):
nfs: Referrals not inheriting proto setting from parent
Chao Yu (10):
f2fs: fix to active page in lru list for read path
f2fs: fix to detect looped node chain correctly
f2fs: try grabbing node page lock aggressively in sync scenario
f2fs: fix to skip GC if type in SSA and SIT is inconsistent
f2fs: fix to do sanity check with reserved blkaddr of inline inode
f2fs: fix to wait on page writeback before updating page
f2fs: fix to do sanity check with secs_per_zone
f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize
f2fs: fix to propagate return value of scan_nat_page()
f2fs: fix to do sanity check with extra_attr feature
Christophe Leroy (1):
perf tools: Allow overriding MAX_NR_CPUS at compile time
Dan Carpenter (4):
misc: mic: SCIF Fix scif_get_new_port() error handling
uio: potential double frees if __uio_register_device() fails
pinctrl: imx: off by one in imx_pinconf_group_dbg_show()
f2fs: Fix uninitialized return in f2fs_ioc_shutdown()
Daniel Kurtz (1):
pinctrl/amd: only handle irq if it is pending and unmasked
Daniel Mack (1):
gpio: pxa: disable pinctrl calls for PXA3xx
Daniel Rosenberg (1):
f2fs: Keep alloc_valid_block_count in sync
Denis Drozdov (1):
IB/IPoIB: Set ah valid flag in multicast send flow
Dmitry Osipenko (1):
gpio: tegra: Move driver registration to subsys_init level
Emmanuel Grumbach (2):
mac80211: don't update the PM state of a peer upon a multicast frame
iwlwifi: pcie: don't access periphery registers when not available
Felipe Balbi (1):
i2c: i801: fix DNV's SMBCTRL register offset
Felix Fietkau (2):
ath9k: report tx status on EOSP
ath9k_hw: fix channel maximum power level test
Filipe Manana (1):
Btrfs: fix data corruption when deduplicating between different files
Filippo Sironi (1):
x86/microcode: Update the new microcode revision unconditionally
Finn Thain (1):
macintosh/via-pmu: Add missing mmio accessors
Florian Fainelli (1):
ethtool: Remove trailing semicolon for static inline
Gaurav Kohli (1):
timers: Clear timer_base::must_forward_clk with timer_base::lock held
Geert Uytterhoeven (1):
iommu/ipmmu-vmsa: Fix allocation in atomic context
Greg Kroah-Hartman (1):
Linux 4.18.9
Guenter Roeck (1):
powerpc/4xx: Fix error return path in ppc4xx_msi_probe()
Gustavo A. R. Silva (1):
switchtec: Fix Spectre v1 vulnerability
Huaisheng Ye (1):
tools/testing/nvdimm: kaddr and pfn can be NULL to ->direct_access()
Ian Kent (1):
autofs: fix autofs_sbi() does not check super block type
Jae Hyun Yoo (1):
i2c: aspeed: Add an explicit type casting for *get_clk_reg_val
Jaegeuk Kim (1):
f2fs: avoid potential deadlock in f2fs_sbi_store
James Smart (2):
scsi: lpfc: Correct MDS diag and nvmet configuration
scsi: lpfc: Fix driver crash when re-registering NVME rports.
Jann Horn (1):
x86/process: Don't mix user/kernel regs in 64bit __show_regs()
Jens Axboe (1):
nbd: don't allow invalid blocksize settings
Jinbum Park (1):
pktcdvd: Fix possible Spectre-v1 for pkt_devs
Jiri Olsa (1):
perf c2c report: Fix crash for empty browser
Joerg Roedel (1):
x86/mm: Remove in_nmi() warning from vmalloc_fault()
Johan Hedberg (1):
Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV
John Pittman (1):
dm cache: only allow a single io_mode cache feature to be requested
Kan Liang (1):
perf evlist: Fix error out while applying initial delay and LBR
Katsuhiro Suzuki (1):
media: helene: fix xtal frequency setting at power on
Konstantin Khlebnikov (1):
block: bfq: swap puts in bfqg_and_blkg_put
Lijun Ou (2):
RDMA/hns: Add illegal hop_num judgement RDMA/hns: Update the data type of immediate data
Linus Torvalds (1):
mm: get rid of vmacache_flush_all() entirely
Linus Walleij (1):
tpm_tis_spi: Pass the SPI IRQ down to the driver
Loic Poulain (1):
wlcore: Set rx_status boottime_ns field on rx
Lorenzo Pieralisi (2):
PCI: mobiveil: Add missing ../pci.h include
PCI: mobiveil: Fix struct mobiveil_pcie.pcie_reg_base address type
Lu Fengqi (1):
btrfs: fix qgroup_free wrong num_bytes in btrfs_subvolume_reserve_metadata
Marc Zyngier (3):
arm64: KVM: Only force FPEXC32_EL2.EN if trapping FPSIMD
KVM: arm/arm64: Clean dcache to PoC when changing PTE due to CoW
thermal_hwmon: Sanitize attribute name passed to hwmon
Marcel Holtmann (1):
Bluetooth: hidp: Fix handling of strncpy for hid->name information
Mauricio Faria de Oliveira (2):
partitions/aix: append null character to print data from disk partitions/aix: fix usage of uninitialized lv_info and lvname structures
Michael Ellerman (1):
powerpc/mm: Don't report PUDs as memory leaks when using kmemleak
Michael Kelley (1):
Drivers: hv: vmbus: Cleanup synic memory free path
Mike Christie (2):
scsi: target: fix __transport_register_session locking
scsi: tcmu: do not set max_blocks if data_bitmap has been setup
Mikhail Zaslonko (1):
memory_hotplug: fix kernel_panic on offline page processing
Mikulas Patocka (1):
block: don't warn when doing fsync on read-only devices
Minchan Kim (1):
android: binder: fix the race mmap and alloc_new_buf_locked
Ming Lei (1):
blk-mq: fix updating tags depth
Miquel Raynal (1):
mtd: rawnand: make subop helpers return unsigned values
Neeraj Upadhyay (1):
cpu/hotplug: Adjust misplaced smb() in cpuhp_thread_fun()
Nicholas Mc Guire (2):
MIPS: Octeon: add missing of_node_put()
MIPS: generic: fix missing of_node_put()
Nick Dyer (1):
Input: atmel_mxt_ts - only use first T9 instance
Niklas Söderlund (1):
media: rcar-csi2: update stream start for V3M
Olga Kornievskaia (1):
NFSv4.0 fix client reference leak in callback
Parav Pandit (1):
RDMA/cma: Do not ignore net namespace for unbound cm_id
Paul Burton (3):
MIPS: VDSO: Match data page cache colouring when D$ aliases
MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET
MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON
Paul Mackerras (1):
KVM: PPC: Book3S HV: Use correct pagesize in kvm_unmap_radix()
Peter Rosin (1):
tpm/tpm_i2c_infineon: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT)
Peter Zijlstra (1):
clocksource: Revert "Remove kthread"
Petr Machata (1):
net: dcb: For wild-card lookups, use priority -1, not 0
Philipp Zabel (1):
gpu: ipu-v3: default to id 0 on missing OF alias
Pierre Morel (1):
KVM: s390: vsie: copy wrapping keys to right place
Prarit Bhargava (1):
x86/microcode: Make sure boot_cpu_data.microcode is up-to-date
Quentin Schulz (1):
MIPS: mscc: ocelot: fix length of memory address space for MIIM
Quinn Tran (3):
scsi: qla2xxx: Fix unintended Logout
scsi: qla2xxx: Fix session state stuck in Get Port DB
scsi: qla2xxx: Silent erroneous message
Randy Dunlap (1):
f2fs: fix defined but not used build warnings
Reza Arbab (1):
powerpc/powernv: Fix concurrency issue with npu->mmio_atsd_usage
Robert Schlabbach (1):
media: em28xx: explicitly disable TS packet filter
Roman Gushchin (1):
selftests/bpf: fix a typo in map in map test
Sam Bobroff (1):
powerpc/pseries: fix EEH recovery of some IOV devices
Sean Christopherson (6):
KVM: x86: SVM: Set EMULTYPE_NO_REEXECUTE for RSM emulation
KVM: VMX: Do not allow reexecute_instruction() when skipping MMIO instr
KVM: x86: Invert emulation re-execute behavior to make it opt-in
KVM: x86: Merge EMULTYPE_RETRY and EMULTYPE_ALLOW_REEXECUTE
KVM: x86: Default to not allowing emulation retry in kvm_mmu_page_fault
KVM: x86: Do not re-{try,execute} after failed emulation in L2
Shubhrajyoti Datta (1):
i2c: xiic: Make the start and the byte count write atomic
Simon Horman (1):
thermal: rcar_thermal: avoid NULL dereference in absence of IRQ resources
Srinivas Kandagatla (1):
rpmsg: core: add support to power domains for devices
Srinivas Pandruvada (2):
ata: libahci: Allow reconfigure of DEVSLP register
ata: libahci: Correct setting of DEVSLP register
Stefan Agner (1):
HID: input: fix leaking custom input node name
Stefan Hajnoczi (1):
device-dax: avoid hang on error before devm_memremap_pages()
Steve French (2):
SMB3: Backup intent flag missing for directory opens with backupuid mounts
smb3: check for and properly advertise directory lease support
Surabhi Vishnoi (1):
ath10k: disable bundle mgmt tx completion event support
Sven Eckelmann (1):
ath10k: prevent active scans on potential unusable channels
Sylwester Nawrocki (1):
media: s5p-mfc: Fix buffer look up in s5p_mfc_handle_frame_{new, copy_time} functions
Takashi Iwai (1):
ALSA: hda - Fix cancel_work_sync() stall from jackpoll work
Thomas Gleixner (2):
cpu/hotplug: Prevent state corruption on error rollback x86/apic/vector: Make error return value negative
Thomas Richter (1):
perf build: Fix installation directory for eBPF
Thomas Werschlein (1):
cifs: connect to servername instead of IP for IPC$ share
Todor Tomov (1):
media: camss: csid: Configure data type and decode format properly
Trond Myklebust (1):
NFSv4.1: Fix a potential layoutget/layoutrecall deadlock
Vlad Buslov (2):
tc-testing: flush gact actions on test teardown
tc-testing: remove duplicate spaces in connmark match patterns
Will Deacon (1):
iommu/arm-smmu-v3: Abort all transactions if SMMU is enabled in kdump kernel
Xiubo Li (1):
uio: fix possible circular locking dependency
Yelena Krivosheev (1):
net: mvneta: fix mtu change on port without link
YueHaibing (1):
pinctrl: berlin: fix 'pctrl->functions' allocation in berlin_pinctrl_build_state
Yunlong Song (2):
f2fs: do not set free of current section
f2fs: issue discard align to section in LFS mode
Zhang Rui (1):
ACPI / LPSS: Force LPSS quirks on boot
Zumeng Chen (1):
mfd: ti_am335x_tscadc: Fix struct clk memory leak
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 18 -SUBLEVEL = 8 +SUBLEVEL = 9 EXTRAVERSION = NAME = Merciless Moray
arch/arc/boot/dts/axs10x_mb.dtsi +6 -1
@@ -9,6 +9,10 @@ */ / { + aliases { + ethernet = &gmac; + }; + axs10x_mb { compatible = "simple-bus"; #address-cells = <1>;
@@ -68,7 +72,7 @@ }; }; - ethernet@0x18000 { + gmac: ethernet@0x18000 { #interrupt-cells = <1>; compatible = "snps,dwmac"; reg = < 0x18000 0x2000 >;
@@ -81,6 +85,7 @@ max-speed = <100>; resets = <&creg_rst 5>; reset-names = "stmmaceth"; + mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */ }; ehci@0x40000 {
arch/arc/boot/dts/hsdk.dts +6 -1
@@ -25,6 +25,10 @@ bootargs = "earlycon=uart8250,mmio32,0xf0005000,115200n8 console=ttyS0,115200n8 debug print-fatal-signals=1"; }; + aliases { + ethernet = &gmac; + }; + cpus { #address-cells = <1>; #size-cells = <0>;
@@ -163,7 +167,7 @@ #clock-cells = <0>; }; - ethernet@8000 { + gmac: ethernet@8000 { #interrupt-cells = <1>; compatible = "snps,dwmac"; reg = <0x8000 0x2000>;
@@ -176,6 +180,7 @@ phy-handle = <&phy0>; resets = <&cgu_rst HSDK_ETH_RESET>; reset-names = "stmmaceth"; + mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */ mdio { #address-cells = <1>;
arch/arc/configs/axs101_defconfig +0 -1
@@ -1,5 +1,4 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arc/configs/axs103_defconfig +0 -1
@@ -1,5 +1,4 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arc/configs/axs103_smp_defconfig +0 -1
@@ -1,5 +1,4 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arm64/kvm/hyp/switch.c +6 -3
@@ -98,8 +98,10 @@ static void activate_traps_vhe(struct kvm_vcpu *vcpu) val =read_sysreg (cpacr_el1); val |=CPACR_EL1_TTA ; val &= ~CPACR_EL1_ZEN ; -if (!update_fp_enabled (vcpu)) +if (!update_fp_enabled (vcpu)) { val &= ~CPACR_EL1_FPEN ; +__activate_traps_fpsimd32 (vcpu); + }write_sysreg (val, cpacr_el1);
@@ -114,8 +116,10 @@ static void __hyp_text __activate_traps_nvhe(struct kvm_vcpu *vcpu) val =CPTR_EL2_DEFAULT ; val |=CPTR_EL2_TTA |CPTR_EL2_TZ ; -if (!update_fp_enabled (vcpu)) +if (!update_fp_enabled (vcpu)) { val |=CPTR_EL2_TFP ; +__activate_traps_fpsimd32 (vcpu); + }write_sysreg (val, cptr_el2); }
@@ -129,7 +133,6 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)if (cpus_have_const_cap (ARM64_HAS_RAS_EXTN ) && (hcr &HCR_VSE ))write_sysreg_s (vcpu->arch.vsesr_el2,SYS_VSESR_EL2 ); -__activate_traps_fpsimd32 (vcpu);if (has_vhe ())activate_traps_vhe (vcpu);else
arch/mips/boot/dts/mscc/ocelot.dtsi +1 -1
@@ -184,7 +184,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "mscc,ocelot-miim"; - reg = <0x107009c 0x36>, <0x10700f0 0x8>; + reg = <0x107009c 0x24>, <0x10700f0 0x8>; interrupts = <14>; status = "disabled";
arch/mips/cavium-octeon/octeon-platform.c +2 -0
@@ -322,6 +322,7 @@ static int __init octeon_ehci_device_init(void)return 0 ; pd =of_find_device_by_node (ehci_node); +of_node_put (ehci_node);if (!pd)return 0 ;
@@ -384,6 +385,7 @@ static int __init octeon_ohci_device_init(void)return 0 ; pd =of_find_device_by_node (ohci_node); +of_node_put (ohci_node);if (!pd)return 0 ;
arch/mips/generic/init.c +1 -0
@@ -204,6 +204,7 @@ void __init arch_init_irq(void) "mti,cpu-interrupt-controller");if (!cpu_has_veic && !intc_node)mips_cpu_irq_init (); +of_node_put (intc_node);irqchip_init (); }
arch/mips/include/asm/io.h +4 -4
@@ -141,14 +141,14 @@ static inline void * phys_to_virt(unsigned long address)/* * ISA I/O bus memory addresses are 1:1 with the physical address. */ -static inline unsigned long isa_virt_to_bus (volatile void * address) +static inline unsigned long isa_virt_to_bus (volatile void *address) { -return (unsigned long )address -PAGE_OFFSET ; +return virt_to_phys (address); } -static inline void *isa_bus_to_virt (unsigned long address) +static inline void *isa_bus_to_virt (unsigned long address) { -return (void *)(address +PAGE_OFFSET ); +return phys_to_virt (address); }#define isa_page_to_bus page_to_phys
arch/mips/kernel/vdso.c +20 -0
@@ -13,6 +13,7 @@#include <linux/err.h> #include <linux/init.h> #include <linux/ioport.h> +#include <linux/kernel.h> #include <linux/mm.h> #include <linux/sched.h> #include <linux/slab.h>
@@ -20,6 +21,7 @@#include <asm/abi.h> #include <asm/mips-cps.h> +#include <asm/page.h> #include <asm/vdso.h> /* Kernel-provided data used by the VDSO. */
@@ -128,12 +130,30 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vvar_size = gic_size +PAGE_SIZE ; size = vvar_size + image->size; +/* +* Find a region that's large enough for us to perform the +* colour-matching alignment below. +*/ +if (cpu_has_dc_aliases) + size += shm_align_mask +1 ; + base =get_unmapped_area (NULL ,0 , size,0 ,0 );if (IS_ERR_VALUE (base)) { ret = base; goto out; } +/* +* If we suffer from dcache aliasing, ensure that the VDSO data page +* mapping is coloured the same as the kernel's mapping of that memory. +* This ensures that when the kernel updates the VDSO data userland +* will observe it without requiring cache invalidations. +*/ +if (cpu_has_dc_aliases) { + base =__ALIGN_MASK (base, shm_align_mask); + base += ((unsigned long )&vdso_data - gic_size) & shm_align_mask; + } + data_addr = base + gic_size; vdso_addr = data_addr +PAGE_SIZE ;
arch/mips/mm/c-r4k.c +4 -2
@@ -835,7 +835,8 @@ static void r4k_flush_icache_user_range(unsigned long start, unsigned long end)static void r4k_dma_cache_wback_inv (unsigned long addr,unsigned long size) {/* Catch bad driver code */ -BUG_ON (size ==0 ); +if (WARN_ON (size ==0 )) +return ;preempt_disable ();if (cpu_has_inclusive_pcaches) {
@@ -871,7 +872,8 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)static void r4k_dma_cache_inv (unsigned long addr,unsigned long size) {/* Catch bad driver code */ -BUG_ON (size ==0 ); +if (WARN_ON (size ==0 )) +return ;preempt_disable ();if (cpu_has_inclusive_pcaches) {
arch/powerpc/include/asm/book3s/64/pgalloc.h +21 -2
@@ -9,6 +9,7 @@#include <linux/slab.h> #include <linux/cpumask.h> +#include <linux/kmemleak.h> #include <linux/percpu.h> struct vmemmap_backing {
@@ -82,6 +83,13 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) pgd =kmem_cache_alloc (PGT_CACHE (PGD_INDEX_SIZE ),pgtable_gfp_flags (mm,GFP_KERNEL )); +/* +* Don't scan the PGD for pointers, it contains references to PUDs but +* those references are not full pointers and so can't be recognised by +* kmemleak. +*/ +kmemleak_no_scan (pgd); +/* * With hugetlb, we don't clear the second half of the page table. * If we share the same slab cache with the pmd or pud level table,
@@ -110,8 +118,19 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)static inline pud_t *pud_alloc_one (struct mm_struct *mm,unsigned long addr) { -return kmem_cache_alloc (PGT_CACHE (PUD_CACHE_INDEX ), -pgtable_gfp_flags (mm,GFP_KERNEL )); +pud_t *pud; + + pud =kmem_cache_alloc (PGT_CACHE (PUD_CACHE_INDEX ), +pgtable_gfp_flags (mm,GFP_KERNEL )); +/* +* Tell kmemleak to ignore the PUD, that means don't scan it for +* pointers and don't consider it a leak. PUDs are typically only +* referred to by their PGD, but kmemleak is not able to recognise those +* as pointers, leading to false leak reports. +*/ +kmemleak_ignore (pud); + +return pud; }static inline void pud_free (struct mm_struct *mm,pud_t *pud)
arch/powerpc/kvm/book3s_64_mmu_radix.c +3 -3
@@ -738,10 +738,10 @@ int kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot, gpa, shift);kvmppc_radix_tlbie_page (kvm, gpa, shift);if ((old & _PAGE_DIRTY) && memslot->dirty_bitmap) { -unsigned long npages =1 ; +unsigned long psize =PAGE_SIZE ;if (shift) - npages =1ul << (shift -PAGE_SHIFT ); -kvmppc_update_dirty_map (memslot, gfn, npages); + psize =1ul << shift; +kvmppc_update_dirty_map (memslot, gfn, psize); } }return 0 ;
arch/powerpc/platforms/4xx/msi.c +30 -21
118 lines not on this page · raw message
arch/powerpc/platforms/powernv/npu-dma.c +3 -2
@@ -437,8 +437,9 @@ static int get_mmio_atsd_reg(struct npu *npu)int i;for (i =0 ; i < npu->mmio_atsd_count; i++) { -if (!test_and_set_bit_lock (i, &npu->mmio_atsd_usage)) -return i; +if (!test_bit (i, &npu->mmio_atsd_usage)) +if (!test_and_set_bit_lock (i, &npu->mmio_atsd_usage)) +return i; }return -ENOSPC ;
arch/powerpc/platforms/pseries/setup.c +17 -8
@@ -647,6 +647,15 @@ void of_pci_parse_iov_addrs(struct pci_dev *dev, const int *indexes) } } +static void pseries_disable_sriov_resources (struct pci_dev *pdev) +{ +int i; + +pci_warn (pdev,"No hypervisor support for SR-IOV on this device, IOV BARs disabled.\n" ); +for (i =0 ; i <PCI_SRIOV_NUM_BARS ; i++) + pdev->resource[i +PCI_IOV_RESOURCES ].flags =0 ; +} +static void pseries_pci_fixup_resources (struct pci_dev *pdev) {const int *indexes;
@@ -654,10 +663,10 @@ static void pseries_pci_fixup_resources(struct pci_dev *pdev)/*Firmware must support open sriov otherwise dont configure*/ indexes =of_get_property (dn,"ibm,open-sriov-vf-bar-info" ,NULL ); -if (!indexes) -return ; -/* Assign the addresses from device tree*/ -of_pci_set_vf_bar_size (pdev, indexes); +if (indexes) +of_pci_set_vf_bar_size (pdev, indexes); +else +pseries_disable_sriov_resources (pdev); }static void pseries_pci_fixup_iov_resources (struct pci_dev *pdev)
@@ -669,10 +678,10 @@ static void pseries_pci_fixup_iov_resources(struct pci_dev *pdev)return ;/*Firmware must support open sriov otherwise dont configure*/ indexes =of_get_property (dn,"ibm,open-sriov-vf-bar-info" ,NULL ); -if (!indexes) -return ; -/* Assign the addresses from device tree*/ -of_pci_parse_iov_addrs (pdev, indexes); +if (indexes) +of_pci_parse_iov_addrs (pdev, indexes); +else +pseries_disable_sriov_resources (pdev); } static resource_size_t pseries_pci_iov_resource_alignment(struct pci_dev *pdev,
arch/s390/kvm/vsie.c +2 -1
@@ -173,7 +173,8 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)return set_validity_icpt (scb_s,0x0039U );/* copy only the wrapping keys */ -if (read_guest_real (vcpu, crycb_addr +72 , &vsie_page->crycb,56 )) +if (read_guest_real (vcpu, crycb_addr +72 , + vsie_page->crycb.dea_wrapping_key_mask,56 ))return set_validity_icpt (scb_s,0x0035U ); scb_s->ecb3 |= ecb3_flags;
arch/x86/include/asm/kdebug.h +11 -1
@@ -22,10 +22,20 @@ enum die_val { DIE_NMIUNKNOWN, }; +enum show_regs_mode { +SHOW_REGS_SHORT , +/* +* For when userspace crashed, but we don't think it's our fault, and +* therefore don't print kernel registers. +*/ +SHOW_REGS_USER , +SHOW_REGS_ALL +}; +extern void die (const char *,struct pt_regs *,long );extern int __must_check __die (const char *,struct pt_regs *,long );extern void show_stack_regs (struct pt_regs *regs); -extern void __show_regs (struct pt_regs *regs,int all); +extern void __show_regs (struct pt_regs *regs,enum show_regs_mode );extern void show_iret_regs (struct pt_regs *regs);extern unsigned long oops_begin (void );extern void oops_end (unsigned long ,struct pt_regs *,int signr);
arch/x86/include/asm/kvm_host.h +10 -6
@@ -1198,18 +1198,22 @@ enum emulation_result {#define EMULTYPE_NO_DECODE (1 << 0)#define EMULTYPE_TRAP_UD (1 << 1)#define EMULTYPE_SKIP (1 << 2) -#define EMULTYPE_RETRY (1 << 3) -#define EMULTYPE_NO_REEXECUTE (1 << 4) -#define EMULTYPE_NO_UD_ON_FAIL (1 << 5) -#define EMULTYPE_VMWARE (1 << 6) +#define EMULTYPE_ALLOW_RETRY (1 << 3) +#define EMULTYPE_NO_UD_ON_FAIL (1 << 4) +#define EMULTYPE_VMWARE (1 << 5)int x86_emulate_instruction (struct kvm_vcpu *vcpu,unsigned long cr2,int emulation_type,void *insn,int insn_len);static inline int emulate_instruction (struct kvm_vcpu *vcpu,int emulation_type) { -return x86_emulate_instruction (vcpu,0 , - emulation_type |EMULTYPE_NO_REEXECUTE ,NULL ,0 ); +return x86_emulate_instruction (vcpu,0 , emulation_type,NULL ,0 ); +} + +static inline int kvm_emulate_instruction_from_buffer (struct kvm_vcpu *vcpu, +void *insn,int insn_len) +{ +return x86_emulate_instruction (vcpu,0 ,0 , insn, insn_len); }void kvm_enable_efer_bits (u64 );
arch/x86/kernel/apic/vector.c +1 -1
@@ -422,7 +422,7 @@ static int activate_managed(struct irq_data *irqd)if (WARN_ON_ONCE (cpumask_empty (vector_searchmask))) {/* Something in the core code broke! Survive gracefully */ pr_err ("Managed startup for irq %u, but no CPU\n" , irqd->irq); -return EINVAL ; +return -EINVAL ; } ret =assign_managed_vector (irqd, vector_searchmask);
arch/x86/kernel/cpu/microcode/amd.c +16 -8
@@ -504,6 +504,7 @@ static enum ucode_state apply_microcode_amd(int cpu)struct microcode_amd *mc_amd;struct ucode_cpu_info *uci;struct ucode_patch *p; +enum ucode_state ret;u32 rev, dummy;BUG_ON (raw_smp_processor_id () != cpu);
@@ -521,9 +522,8 @@ static enum ucode_state apply_microcode_amd(int cpu)/* need to apply patch? */ if (rev >= mc_amd->hdr.patch_id) { - c->microcode = rev; - uci->cpu_sig.rev = rev; -return UCODE_OK ; + ret =UCODE_OK ; + goto out; }if (__apply_microcode_amd (mc_amd)) {
@@ -531,13 +531,21 @@ static enum ucode_state apply_microcode_amd(int cpu) cpu, mc_amd->hdr.patch_id);return UCODE_ERROR ; } -pr_info ("CPU%d: new patch_level=0x%08x\n" , cpu, - mc_amd->hdr.patch_id); - uci->cpu_sig.rev = mc_amd->hdr.patch_id; - c->microcode = mc_amd->hdr.patch_id; + rev = mc_amd->hdr.patch_id; + ret =UCODE_UPDATED ; + +pr_info ("CPU%d: new patch_level=0x%08x\n" , cpu, rev); -return UCODE_UPDATED ; +out: + uci->cpu_sig.rev = rev; + c->microcode = rev; + +/* Update boot_cpu_data's revision too, if we're on the BSP: */ +if (c->cpu_index == boot_cpu_data.cpu_index) + boot_cpu_data.microcode = rev; + +return ret; }static int install_equiv_cpu_table (const u8 *buf)
arch/x86/kernel/cpu/microcode/intel.c +12 -5
@@ -795,6 +795,7 @@ static enum ucode_state apply_microcode_intel(int cpu)struct ucode_cpu_info *uci = ucode_cpu_info + cpu;struct cpuinfo_x86 *c = &cpu_data (cpu);struct microcode_intel *mc; +enum ucode_state ret;static int prev_rev;u32 rev;
@@ -817,9 +818,8 @@ static enum ucode_state apply_microcode_intel(int cpu)*/ rev =intel_get_microcode_revision ();if (rev >= mc->hdr.rev) { - uci->cpu_sig.rev = rev; - c->microcode = rev; -return UCODE_OK ; + ret =UCODE_OK ; + goto out; }/*
@@ -848,10 +848,17 @@ static enum ucode_state apply_microcode_intel(int cpu) prev_rev = rev; } + ret =UCODE_UPDATED ; + +out: uci->cpu_sig.rev = rev; - c->microcode = rev; + c->microcode = rev; + +/* Update boot_cpu_data's revision too, if we're on the BSP: */ +if (c->cpu_index == boot_cpu_data.cpu_index) + boot_cpu_data.microcode = rev; -return UCODE_UPDATED ; +return ret; } static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
arch/x86/kernel/dumpstack.c +3 -8
@@ -155,7 +155,7 @@ static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs,* they can be printed in the right context. */ if (!partial &&on_stack (info, regs,sizeof (*regs))) { -__show_regs (regs,0 ); +__show_regs (regs,SHOW_REGS_SHORT ); }else if (partial &&on_stack (info, (void *)regs +IRET_FRAME_OFFSET ,IRET_FRAME_SIZE )) {
@@ -353,7 +353,7 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)oops_exit ();/* Executive summary in case the oops scrolled away */ -__show_regs (&exec_summary_regs, true); +__show_regs (&exec_summary_regs,SHOW_REGS_ALL );if (!signr)return ;
@@ -416,14 +416,9 @@ void die(const char *str, struct pt_regs *regs, long err)void show_regs (struct pt_regs *regs) { -bool all = true; -show_regs_print_info (KERN_DEFAULT ); -if (IS_ENABLED (CONFIG_X86_32 )) - all = !user_mode (regs); - -__show_regs (regs, all); +__show_regs (regs,user_mode (regs) ?SHOW_REGS_USER :SHOW_REGS_ALL );/* * When in-kernel, we also print out the stack at the time of the fault..
arch/x86/kernel/process_32.c +2 -2
@@ -59,7 +59,7 @@#include <asm/intel_rdt_sched.h> #include <asm/proto.h> -void __show_regs (struct pt_regs *regs,int all) +void __show_regs (struct pt_regs *regs,enum show_regs_mode mode) {unsigned long cr0 =0L , cr2 =0L , cr3 =0L , cr4 =0L ;unsigned long d0, d1, d2, d3, d6, d7;
@@ -85,7 +85,7 @@ void __show_regs(struct pt_regs *regs, int all)printk (KERN_DEFAULT "DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x EFLAGS: %08lx\n" , (u16 )regs->ds, (u16 )regs->es, (u16 )regs->fs, gs, ss, regs->flags); -if (!all) +if (mode !=SHOW_REGS_ALL )return ; cr0 =read_cr0 ();
arch/x86/kernel/process_64.c +10 -2
@@ -62,7 +62,7 @@__visible DEFINE_PER_CPU (unsigned long ,rsp_scratch );/* Prints also some state that isn't saved in the pt_regs */ -void __show_regs (struct pt_regs *regs,int all) +void __show_regs (struct pt_regs *regs,enum show_regs_mode mode) {unsigned long cr0 =0L , cr2 =0L , cr3 =0L , cr4 =0L , fs, gs, shadowgs;unsigned long d0, d1, d2, d3, d6, d7;
@@ -87,9 +87,17 @@ void __show_regs(struct pt_regs *regs, int all)printk (KERN_DEFAULT "R13: %016lx R14: %016lx R15: %016lx\n" , regs->r13, regs->r14, regs->r15); -if (!all) +if (mode ==SHOW_REGS_SHORT )return ; +if (mode ==SHOW_REGS_USER ) { +rdmsrl (MSR_FS_BASE , fs); +rdmsrl (MSR_KERNEL_GS_BASE , shadowgs); +printk (KERN_DEFAULT "FS: %016lx GS: %016lx\n" , + fs, shadowgs); +return ; + } + asm("movl %%ds,%0" :"=r" (ds)); asm("movl %%cs,%0" :"=r" (cs)); asm("movl %%es,%0" :"=r" (es));
arch/x86/kvm/mmu.c +15 -6
@@ -4960,7 +4960,7 @@ static int make_mmu_pages_available(struct kvm_vcpu *vcpu)int kvm_mmu_page_fault (struct kvm_vcpu *vcpu,gva_t cr2,u64 error_code,void *insn,int insn_len) { -int r, emulation_type =EMULTYPE_RETRY ; +int r, emulation_type =0 ;enum emulation_result er;bool direct = vcpu->arch.mmu.direct_map;
@@ -4973,10 +4973,8 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u64 error_code, r =RET_PF_INVALID ;if (unlikely (error_code &PFERR_RSVD_MASK )) { r =handle_mmio_page_fault (vcpu, cr2, direct); -if (r ==RET_PF_EMULATE ) { - emulation_type =0 ; +if (r ==RET_PF_EMULATE ) goto emulate; - } }if (r ==RET_PF_INVALID ) {
@@ -5003,8 +5001,19 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u64 error_code,return 1 ; } -if (mmio_info_in_cache (vcpu, cr2, direct)) - emulation_type =0 ; +/* +* vcpu->arch.mmu.page_fault returned RET_PF_EMULATE, but we can still +* optimistically try to just unprotect the page and let the processor +* re-execute the instruction that caused the page fault. Do not allow +* retrying MMIO emulation, as it's not only pointless but could also +* cause us to enter an infinite loop because the processor will keep +* faulting on the non-existent MMIO address. Retrying an instruction +* from a nested guest is also pointless and dangerous as we are only +* explicitly shadowing L1's page tables, i.e. unprotecting something +* for L1 isn't going to magically fix whatever issue cause L2 to fail. +*/ +if (!mmio_info_in_cache (vcpu, cr2, direct) && !is_guest_mode (vcpu)) + emulation_type =EMULTYPE_ALLOW_RETRY ; emulate:/* * On AMD platforms, under certain conditions insn_len may be zero on #NPF.
arch/x86/kvm/svm.c +2 -2
@@ -3875,8 +3875,8 @@ static int emulate_on_interception(struct vcpu_svm *svm)static int rsm_interception (struct vcpu_svm *svm) { -return x86_emulate_instruction (&svm->vcpu,0 ,0 , - rsm_ins_bytes,2 ) ==EMULATE_DONE ; +return kvm_emulate_instruction_from_buffer (&svm->vcpu, + rsm_ins_bytes,2 ) ==EMULATE_DONE ; }static int rdpmc_interception (struct vcpu_svm *svm)
arch/x86/kvm/vmx.c +2 -2
@@ -7539,8 +7539,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu)if (!static_cpu_has (X86_FEATURE_HYPERVISOR ))return kvm_skip_emulated_instruction (vcpu);else -return x86_emulate_instruction (vcpu, gpa,EMULTYPE_SKIP , -NULL ,0 ) ==EMULATE_DONE ; +return emulate_instruction (vcpu,EMULTYPE_SKIP ) == +EMULATE_DONE ; }return kvm_mmu_page_fault (vcpu, gpa,PFERR_RSVD_MASK ,NULL ,0 );
arch/x86/kvm/x86.c +8 -2
@@ -5810,7 +5810,10 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t cr2,gpa_t gpa = cr2;kvm_pfn_t pfn; -if (emulation_type &EMULTYPE_NO_REEXECUTE ) +if (!(emulation_type &EMULTYPE_ALLOW_RETRY )) +return false; + +if (WARN_ON_ONCE (is_guest_mode (vcpu)))return false;if (!vcpu->arch.mmu.direct_map) {
@@ -5898,7 +5901,10 @@ static bool retry_instruction(struct x86_emulate_ctxt *ctxt,*/ vcpu->arch.last_retry_eip = vcpu->arch.last_retry_addr =0 ; -if (!(emulation_type &EMULTYPE_RETRY )) +if (!(emulation_type &EMULTYPE_ALLOW_RETRY )) +return false; + +if (WARN_ON_ONCE (is_guest_mode (vcpu)))return false;if (x86_page_table_writing_insn (ctxt))
arch/x86/mm/fault.c +0 -2
@@ -317,8 +317,6 @@ static noinline int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Synchronize this task's top level page-table * with the 'reference' page table.
block/bfq-cgroup.c +2 -2
@@ -275,9 +275,9 @@ static void bfqg_and_blkg_get(struct bfq_group *bfqg)void bfqg_and_blkg_put (struct bfq_group *bfqg) { -bfqg_put (bfqg); -blkg_put (bfqg_to_blkg (bfqg)); + +bfqg_put (bfqg); }/* @stats = 0 */
block/blk-core.c +4 -1
@@ -2161,9 +2161,12 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) {const int op =bio_op (bio); -if (part->policy && (op_is_write (op) && !op_is_flush (op))) { +if (part->policy &&op_is_write (op)) {char b[BDEVNAME_SIZE ]; +if (op_is_flush (bio->bi_opf) && !bio_sectors (bio)) +return false; + WARN_ONCE(1, "generic_make_request: Trying to write " "to read-only block-device %s (partno %d)\n",
block/blk-mq-tag.c +4 -4
@@ -402,8 +402,6 @@ int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,if (tdepth <= tags->nr_reserved_tags)return -EINVAL ; - tdepth -= tags->nr_reserved_tags; -/* * If we are allowed to grow beyond the original size, allocate * a new set of tags before freeing the old one.
@@ -423,7 +421,8 @@ int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,if (tdepth >16 *BLKDEV_MAX_RQ )return -EINVAL ; - new =blk_mq_alloc_rq_map (set, hctx->queue_num, tdepth,0 ); + new =blk_mq_alloc_rq_map (set, hctx->queue_num, tdepth, + tags->nr_reserved_tags);if (!new)return -ENOMEM ; ret =blk_mq_alloc_rqs (set, new, hctx->queue_num, tdepth);
@@ -440,7 +439,8 @@ int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,* Don't need (or can't) update reserved tags here, they * remain static and should never need resizing. */ -sbitmap_queue_resize (&tags->bitmap_tags, tdepth); +sbitmap_queue_resize (&tags->bitmap_tags, + tdepth - tags->nr_reserved_tags); }return 0 ;
block/partitions/aix.c +9 -4
@@ -178,7 +178,7 @@ int aix_partition(struct parsed_partitions *state)u32 vgda_sector =0 ;u32 vgda_len =0 ;int numlvs =0 ; -struct pvd *pvd; +struct pvd *pvd =NULL ;struct lv_info {unsigned short pps_per_lv;unsigned short pps_found;
@@ -232,10 +232,11 @@ int aix_partition(struct parsed_partitions *state)if (lvip[i].pps_per_lv) foundlvs +=1 ; } +/* pvd loops depend on n[].name and lvip[].pps_per_lv */ + pvd =alloc_pvd (state, vgda_sector +17 ); }put_dev_sector (sect); } - pvd =alloc_pvd (state, vgda_sector +17 );if (pvd) {int numpps =be16_to_cpu (pvd->pp_count);int psn_part1 =be32_to_cpu (pvd->psn_part1);
@@ -282,10 +283,14 @@ int aix_partition(struct parsed_partitions *state) next_lp_ix +=1 ; }for (i =0 ; i < state->limit; i +=1 ) -if (lvip[i].pps_found && !lvip[i].lv_is_contiguous) +if (lvip[i].pps_found && !lvip[i].lv_is_contiguous) { +char tmp[sizeof (n[i].name) +1 ];// null char + +snprintf (tmp,sizeof (tmp),"%s" , n[i].name);pr_warn ("partition %s (%u pp's found) is " "not contiguous\n" , - n[i].name, lvip[i].pps_found); + tmp, lvip[i].pps_found); + }kfree (pvd); }kfree (n);
drivers/acpi/acpi_lpss.c +1 -1
@@ -879,7 +879,7 @@ static void acpi_lpss_dismiss(struct device *dev)#define LPSS_GPIODEF0_DMA_LLP BIT(13)static DEFINE_MUTEX (lpss_iosf_mutex); -static bool lpss_iosf_d3_entered; +static bool lpss_iosf_d3_entered = true;static void lpss_iosf_enter_d3_state (void ) {
drivers/android/binder_alloc.c +35 -8
81 lines not on this page · raw message
drivers/ata/libahci.c +12 -8
@@ -2107,7 +2107,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)struct ahci_host_priv *hpriv = ap->host->private_data;void __iomem *port_mmio =ahci_port_base (ap);struct ata_device *dev = ap->link.device; -u32 devslp, dm, dito, mdat, deto; +u32 devslp, dm, dito, mdat, deto, dito_conf;int rc;unsigned int err_mask;
@@ -2131,8 +2131,15 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)return ; } -/* device sleep was already enabled */ -if (devslp &PORT_DEVSLP_ADSE ) + dm = (devslp &PORT_DEVSLP_DM_MASK ) >>PORT_DEVSLP_DM_OFFSET ; + dito = devslp_idle_timeout / (dm +1 ); +if (dito >0x3ff ) + dito =0x3ff ; + + dito_conf = (devslp >>PORT_DEVSLP_DITO_OFFSET ) &0x3FF ; + +/* device sleep was already enabled and same dito */ +if ((devslp &PORT_DEVSLP_ADSE ) && (dito_conf == dito))return ;/* set DITO, MDAT, DETO and enable DevSlp, need to stop engine first */
@@ -2140,11 +2147,6 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)if (rc)return ; - dm = (devslp &PORT_DEVSLP_DM_MASK ) >>PORT_DEVSLP_DM_OFFSET ; - dito = devslp_idle_timeout / (dm +1 ); -if (dito >0x3ff ) - dito =0x3ff ; -/* Use the nominal value 10 ms if the read MDAT is zero, * the nominal value of DETO is 20 ms. */
@@ -2162,6 +2164,8 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) deto =20 ; } +/* Make dito, mdat, deto bits to 0s */ + devslp &= ~GENMASK_ULL (24 ,2 ); devslp |= ((dito << PORT_DEVSLP_DITO_OFFSET) | (mdat << PORT_DEVSLP_MDAT_OFFSET) | (deto << PORT_DEVSLP_DETO_OFFSET) |
drivers/base/memory.c +9 -11
@@ -416,26 +416,24 @@ static ssize_t show_valid_zones(struct device *dev,struct zone *default_zone;int nid; -/* -* The block contains more than one zone can not be offlined. -* This can happen e.g. for ZONE_DMA and ZONE_DMA32 -*/ -if (!test_pages_in_a_zone (start_pfn, start_pfn + nr_pages, &valid_start_pfn, &valid_end_pfn)) -return sprintf (buf,"none\n" ); - - start_pfn = valid_start_pfn; - nr_pages = valid_end_pfn - start_pfn; -/* * Check the existing zone. Make sure that we do that only on the * online nodes otherwise the page_zone is not reliable */ if (mem->state ==MEM_ONLINE ) { +/* +* The block contains more than one zone can not be offlined. +* This can happen e.g. for ZONE_DMA and ZONE_DMA32 +*/ +if (!test_pages_in_a_zone (start_pfn, start_pfn + nr_pages, + &valid_start_pfn, &valid_end_pfn)) +return sprintf (buf,"none\n" ); + start_pfn = valid_start_pfn;strcat (buf,page_zone (pfn_to_page (start_pfn))->name); goto out; } - nid =pfn_to_nid (start_pfn); + nid = mem->nid; default_zone =zone_for_pfn_range (MMOP_ONLINE_KEEP , nid, start_pfn, nr_pages);strcat (buf, default_zone->name);
drivers/block/nbd.c +3 -0
@@ -1239,6 +1239,9 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,case NBD_SET_SOCK :return nbd_add_socket (nbd, arg, false);case NBD_SET_BLKSIZE : +if (!arg || !is_power_of_2 (arg) || arg <512 || + arg >PAGE_SIZE ) +return -EINVAL ;nbd_size_set (nbd, arg,div_s64 (config->bytesize, arg));return 0 ;
drivers/block/pktcdvd.c +3 -1
@@ -67,7 +67,7 @@#include <scsi/scsi.h> #include <linux/debugfs.h> #include <linux/device.h> - +#include <linux/nospec.h> #include <linux/uaccess.h> #define DRIVER_NAME "pktcdvd"
@@ -2231,6 +2231,8 @@ static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor) {if (dev_minor >=MAX_WRITERS )return NULL ; + + dev_minor =array_index_nospec (dev_minor,MAX_WRITERS );return pkt_devs[dev_minor]; }
drivers/bluetooth/Kconfig +1 -0
@@ -159,6 +159,7 @@ config BT_HCIUART_LL config BT_HCIUART_3WIRE bool "Three-wire UART (H5) protocol support" depends on BT_HCIUART + depends on BT_HCIUART_SERDEV help The HCI Three-wire UART Transport Layer makes it possible to user the Bluetooth HCI over a serial port interface. The HCI
drivers/char/tpm/tpm_i2c_infineon.c +4 -4
@@ -117,7 +117,7 @@ static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)/* Lock the adapter for the duration of the whole sequence. */ if (!tpm_dev.client->adapter->algo->master_xfer)return -EOPNOTSUPP ; -i2c_lock_adapter (tpm_dev.client->adapter); +i2c_lock_bus (tpm_dev.client->adapter,I2C_LOCK_SEGMENT );if (tpm_dev.chip_type ==SLB9645 ) {/* use a combined read for newer chips
@@ -192,7 +192,7 @@ static int iic_tpm_read(u8 addr, u8 *buffer, size_t len) } out: -i2c_unlock_adapter (tpm_dev.client->adapter); +i2c_unlock_bus (tpm_dev.client->adapter,I2C_LOCK_SEGMENT );/* take care of 'guard time' */ usleep_range (SLEEP_DURATION_LOW ,SLEEP_DURATION_HI );
@@ -224,7 +224,7 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,if (!tpm_dev.client->adapter->algo->master_xfer)return -EOPNOTSUPP ; -i2c_lock_adapter (tpm_dev.client->adapter); +i2c_lock_bus (tpm_dev.client->adapter,I2C_LOCK_SEGMENT );/* prepend the 'register address' to the buffer */ tpm_dev.buf[0 ] = addr;
@@ -243,7 +243,7 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,usleep_range (sleep_low, sleep_hi); } -i2c_unlock_adapter (tpm_dev.client->adapter); +i2c_unlock_bus (tpm_dev.client->adapter,I2C_LOCK_SEGMENT );/* take care of 'guard time' */ usleep_range (SLEEP_DURATION_LOW ,SLEEP_DURATION_HI );
drivers/char/tpm/tpm_tis_spi.c +8 -1
@@ -199,6 +199,7 @@ static const struct tpm_tis_phy_ops tpm_spi_phy_ops = {static int tpm_tis_spi_probe (struct spi_device *dev) {struct tpm_tis_spi_phy *phy; +int irq; phy =devm_kzalloc (&dev->dev,sizeof (struct tpm_tis_spi_phy ),GFP_KERNEL );
@@ -211,7 +212,13 @@ static int tpm_tis_spi_probe(struct spi_device *dev)if (!phy->iobuf)return -ENOMEM ; -return tpm_tis_core_init (&dev->dev, &phy->priv,-1 , &tpm_spi_phy_ops, +/* If the SPI device has an IRQ then use that */ +if (dev->irq >0 ) + irq = dev->irq; +else + irq =-1 ; + +return tpm_tis_core_init (&dev->dev, &phy->priv, irq, &tpm_spi_phy_ops,NULL ); }
drivers/clk/clk-scmi.c +2 -3
@@ -38,7 +38,6 @@ static unsigned long scmi_clk_recalc_rate(struct clk_hw *hw,static long scmi_clk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate) { -int step;u64 fmin, fmax, ftmp;struct scmi_clk *clk =to_scmi_clk (hw);
@@ -60,9 +59,9 @@ static long scmi_clk_round_rate(struct clk_hw *hw, unsigned long rate, ftmp = rate - fmin; ftmp += clk->info->range.step_size -1 ;/* to round up */ - step =do_div (ftmp, clk->info->range.step_size); +do_div (ftmp, clk->info->range.step_size); -return step * clk->info->range.step_size + fmin; +return ftmp * clk->info->range.step_size + fmin; } static int scmi_clk_set_rate(struct clk_hw *hw, unsigned long rate,
drivers/dax/pmem.c +8 -4
@@ -105,15 +105,19 @@ static int dax_pmem_probe(struct device *dev)if (rc)return rc; - rc =devm_add_action_or_reset (dev, dax_pmem_percpu_exit, - &dax_pmem->ref); -if (rc) + rc =devm_add_action (dev, dax_pmem_percpu_exit, &dax_pmem->ref); +if (rc) { +percpu_ref_exit (&dax_pmem->ref);return rc; + } dax_pmem->pgmap.ref = &dax_pmem->ref; addr =devm_memremap_pages (dev, &dax_pmem->pgmap); -if (IS_ERR (addr)) +if (IS_ERR (addr)) { +devm_remove_action (dev, dax_pmem_percpu_exit, &dax_pmem->ref); +percpu_ref_exit (&dax_pmem->ref);return PTR_ERR (addr); + } rc =devm_add_action_or_reset (dev, dax_pmem_percpu_kill, &dax_pmem->ref);
drivers/firmware/google/vpd.c +4 -1
@@ -246,6 +246,7 @@ static int vpd_section_destroy(struct vpd_section *sec)sysfs_remove_bin_file (vpd_kobj, &sec->bin_attr);kfree (sec->raw_name);memunmap (sec->baseaddr); + sec->enabled = false; }return 0 ;
@@ -279,8 +280,10 @@ static int vpd_sections_init(phys_addr_t physaddr) ret =vpd_section_init ("rw" , &rw_vpd, physaddr +sizeof (struct vpd_cbmem ) + header.ro_size, header.rw_size); -if (ret) +if (ret) { +vpd_section_destroy (&ro_vpd);return ret; + } }return 0 ;
drivers/gpio/gpio-ml-ioh.c +2 -1
@@ -496,9 +496,10 @@ static int ioh_gpio_probe(struct pci_dev *pdev,return 0 ; err_gpiochip_add: + chip = chip_save;while (--i >=0 ) { - chip--;gpiochip_remove (&chip->gpio); + chip++; }kfree (chip_save);
drivers/gpio/gpio-pxa.c +27 -8
@@ -241,6 +241,17 @@ int pxa_irq_to_gpio(int irq)return irq_gpio0; } +static bool pxa_gpio_has_pinctrl (void ) +{ +switch (gpio_type) { +case PXA3XX_GPIO : +return false; + +default : +return true; + } +} +static int pxa_gpio_to_irq (struct gpio_chip *chip,unsigned offset) {struct pxa_gpio_chip *pchip =chip_to_pxachip (chip);
@@ -255,9 +266,11 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)unsigned long flags;int ret; - ret =pinctrl_gpio_direction_input (chip->base + offset); -if (!ret) -return 0 ; +if (pxa_gpio_has_pinctrl ()) { + ret =pinctrl_gpio_direction_input (chip->base + offset); +if (!ret) +return 0 ; + }spin_lock_irqsave (&gpio_lock, flags);
@@ -282,9 +295,11 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,writel_relaxed (mask, base + (value ?GPSR_OFFSET :GPCR_OFFSET )); - ret =pinctrl_gpio_direction_output (chip->base + offset); -if (ret) -return ret; +if (pxa_gpio_has_pinctrl ()) { + ret =pinctrl_gpio_direction_output (chip->base + offset); +if (ret) +return ret; + }spin_lock_irqsave (&gpio_lock, flags);
@@ -348,8 +363,12 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio, pchip->chip.set = pxa_gpio_set; pchip->chip.to_irq = pxa_gpio_to_irq; pchip->chip.ngpio = ngpio; - pchip->chip.request = gpiochip_generic_request; - pchip->chip.free = gpiochip_generic_free; + +if (pxa_gpio_has_pinctrl ()) { + pchip->chip.request = gpiochip_generic_request; + pchip->chip.free = gpiochip_generic_free; + } +#ifdef CONFIG_OF_GPIO pchip->chip.of_node = np; pchip->chip.of_xlate = pxa_gpio_of_xlate;
drivers/gpio/gpio-tegra.c +1 -1
@@ -720,4 +720,4 @@ static int __init tegra_gpio_init(void) {return platform_driver_register (&tegra_gpio_driver); } -postcore_initcall (tegra_gpio_init); +subsys_initcall (tegra_gpio_init);
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +23 -15
@@ -150,7 +150,7 @@ static void dce_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait) } } -static void dce_dmcu_setup_psr (struct dmcu *dmcu, +static bool dce_dmcu_setup_psr (struct dmcu *dmcu,struct dc_link *link,struct psr_context *psr_context) {
@@ -261,6 +261,8 @@ static void dce_dmcu_setup_psr(struct dmcu *dmcu,/* notifyDMCUMsg */ REG_UPDATE (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,1 ); + +return true; }static bool dce_is_dmcu_initialized (struct dmcu *dmcu)
@@ -545,24 +547,25 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)* least a few frames. Should never hit the max retry assert below. */ if (wait == true) { -for (retryCount =0 ; retryCount <=1000 ; retryCount++) { -dcn10_get_dmcu_psr_state (dmcu, &psr_state); -if (enable) { -if (psr_state !=0 ) -break ; - }else { -if (psr_state ==0 ) -break ; +for (retryCount =0 ; retryCount <=1000 ; retryCount++) { +dcn10_get_dmcu_psr_state (dmcu, &psr_state); +if (enable) { +if (psr_state !=0 ) +break ; + }else { +if (psr_state ==0 ) +break ; + } +udelay (500 ); } -udelay (500 ); - } -/* assert if max retry hit */ -ASSERT (retryCount <=1000 ); +/* assert if max retry hit */ +if (retryCount >=1000 ) +ASSERT (0 ); } } -static void dcn10_dmcu_setup_psr (struct dmcu *dmcu, +static bool dcn10_dmcu_setup_psr (struct dmcu *dmcu,struct dc_link *link,struct psr_context *psr_context) {
@@ -577,7 +580,7 @@ static void dcn10_dmcu_setup_psr(struct dmcu *dmcu,/* If microcontroller is not running, do nothing */ if (dmcu->dmcu_state !=DMCU_RUNNING ) -return ; +return false; link->link_enc->funcs->psr_program_dp_dphy_fast_training (link->link_enc, psr_context->psrExitLinkTrainingRequired);
@@ -677,6 +680,11 @@ static void dcn10_dmcu_setup_psr(struct dmcu *dmcu,/* notifyDMCUMsg */ REG_UPDATE (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,1 ); + +/* waitDMCUReadyForCmd */ +REG_WAIT (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,0 ,1 ,10000 ); + +return true; } static void dcn10_psr_wait_loop(
drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h +1 -1
@@ -48,7 +48,7 @@ struct dmcu_funcs {const char *src, unsigned int bytes);void (*set_psr_enable)(struct dmcu *dmcu,bool enable,bool wait); -void (*setup_psr)(struct dmcu *dmcu, +bool (*setup_psr)(struct dmcu *dmcu,struct dc_link *link,struct psr_context *psr_context);void (*get_psr_state)(struct dmcu *dmcu,uint32_t *psr_state);
drivers/gpu/ipu-v3/ipu-common.c +2 -0
@@ -1401,6 +1401,8 @@ static int ipu_probe(struct platform_device *pdev)return -ENODEV ; ipu->id =of_alias_get_id (np,"ipu" ); +if (ipu->id <0 ) + ipu->id =0 ;if (of_device_is_compatible (np,"fsl,imx6qp-ipu" ) &&IS_ENABLED (CONFIG_DRM )) {
drivers/hid/hid-ids.h +1 -0
@@ -528,6 +528,7 @@#define I2C_VENDOR_ID_RAYD 0x2386#define I2C_PRODUCT_ID_RAYD_3118 0x3118 +#define I2C_PRODUCT_ID_RAYD_4B33 0x4B33#define USB_VENDOR_ID_HANWANG 0x0b57#define USB_DEVICE_ID_HANWANG_TABLET_FIRST 0x5000
drivers/hid/hid-input.c +3 -2
@@ -1579,6 +1579,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, input_dev->dev.parent = &hid->dev; hidinput->input = input_dev; + hidinput->application = application;list_add_tail (&hidinput->list, &hid->inputs);INIT_LIST_HEAD (&hidinput->reports);
@@ -1674,8 +1675,7 @@ static struct hid_input *hidinput_match_application(struct hid_report *report)struct hid_input *hidinput;list_for_each_entry (hidinput, &hid->inputs, list) { -if (hidinput->report && - hidinput->report->application == report->application) +if (hidinput->application == report->application)return hidinput; }
@@ -1812,6 +1812,7 @@ void hidinput_disconnect(struct hid_device *hid)input_unregister_device (hidinput->input); else input_free_device(hidinput->input); +kfree (hidinput->name);kfree (hidinput); }
drivers/hid/hid-multitouch.c +17 -2
@@ -1167,7 +1167,8 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev,struct hid_usage *usage, enum latency_mode latency, bool surface_switch, - bool button_switch) + bool button_switch, + bool *inputmode_found) { struct mt_device *td = hid_get_drvdata(hdev);struct mt_class *cls = &td->mtclass;
@@ -1179,6 +1180,14 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev,switch (usage->hid) {case HID_DG_INPUTMODE : +/* +* Some elan panels wrongly declare 2 input mode features, +* and silently ignore when we set the value in the second +* field. Skip the second feature and hope for the best. +*/ +if (*inputmode_found) +return false; +if (cls->quirks &MT_QUIRK_FORCE_GET_FEATURE ) { report_len =hid_report_len (report); buf =hid_alloc_report_buf (report,GFP_KERNEL );
@@ -1194,6 +1203,7 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev, } field->value[index] = td->inputmode_value; + *inputmode_found = true;return true;case HID_DG_CONTACTMAX :
@@ -1231,6 +1241,7 @@ static void mt_set_modes(struct hid_device *hdev, enum latency_mode latency,struct hid_usage *usage;int i, j;bool update_report; +bool inputmode_found = false; rep_enum = &hdev->report_enum[HID_FEATURE_REPORT ];list_for_each_entry (rep, &rep_enum->report_list, list) {
@@ -1249,7 +1260,8 @@ static void mt_set_modes(struct hid_device *hdev, enum latency_mode latency, usage, latency, surface_switch, - button_switch)) + button_switch, + &inputmode_found)) update_report = true; } }
@@ -1476,6 +1488,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)*/ hdev->quirks |=HID_QUIRK_INPUT_PER_APP ; +if (id->group !=HID_GROUP_MULTITOUCH_WIN_8 ) + hdev->quirks |=HID_QUIRK_MULTI_INPUT ; +timer_setup (&td->release_timer, mt_expired_timeout,0 ); ret =hid_parse (hdev);
drivers/hid/i2c-hid/i2c-hid.c +2 -0
@@ -174,6 +174,8 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_RESEND_REPORT_DESCR }, { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS10FB_TOUCH, I2C_HID_QUIRK_RESEND_REPORT_DESCR }, + { I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_4B33, + I2C_HID_QUIRK_RESEND_REPORT_DESCR }, { 0, 0 } };
drivers/hv/hv.c +8 -6
@@ -242,6 +242,10 @@ int hv_synic_alloc(void)return 0 ; err: +/* +* Any memory allocations that succeeded will be freed when +* the caller cleans up by calling hv_synic_free() +*/ return -ENOMEM ; }
@@ -254,12 +258,10 @@ void hv_synic_free(void)struct hv_per_cpu_context *hv_cpu =per_cpu_ptr (hv_context.cpu_context, cpu); -if (hv_cpu->synic_event_page) -free_page ((unsigned long )hv_cpu->synic_event_page); -if (hv_cpu->synic_message_page) -free_page ((unsigned long )hv_cpu->synic_message_page); -if (hv_cpu->post_msg_page) -free_page ((unsigned long )hv_cpu->post_msg_page); +kfree (hv_cpu->clk_evt); +free_page ((unsigned long )hv_cpu->synic_event_page); +free_page ((unsigned long )hv_cpu->synic_message_page); +free_page ((unsigned long )hv_cpu->post_msg_page); }kfree (hv_context.hv_numa_map);
drivers/i2c/busses/i2c-aspeed.c +1 -1
@@ -868,7 +868,7 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev)if (!match) bus->get_clk_reg_val = aspeed_i2c_24xx_get_clk_reg_val;else - bus->get_clk_reg_val = match->data; + bus->get_clk_reg_val = (u32 (*)(u32 ))match->data;/* Initialize the I2C adapter */ spin_lock_init (&bus->lock);
drivers/i2c/busses/i2c-i801.c +6 -1
@@ -139,6 +139,7 @@#define SBREG_BAR 0x10#define SBREG_SMBCTRL 0xc6000c +#define SBREG_SMBCTRL_DNV 0xcf000c/* Host status bits for SMBPCISTS */ #define SMBPCISTS_INTS BIT(3)
@@ -1396,7 +1397,11 @@ static void i801_add_tco(struct i801_priv *priv)spin_unlock (&p2sb_spinlock); res = &tco_res[ICH_RES_MEM_OFF ]; - res->start = (resource_size_t )base64_addr +SBREG_SMBCTRL ; +if (pci_dev->device ==PCI_DEVICE_ID_INTEL_DNV_SMBUS ) + res->start = (resource_size_t )base64_addr +SBREG_SMBCTRL_DNV ; +else + res->start = (resource_size_t )base64_addr +SBREG_SMBCTRL ; + res->end = res->start +3 ; res->flags =IORESOURCE_MEM ;
drivers/i2c/busses/i2c-xiic.c +4 -0
@@ -532,6 +532,7 @@ static void xiic_start_recv(struct xiic_i2c *i2c) {u8 rx_watermark;struct i2c_msg *msg = i2c->rx_msg = i2c->tx_msg; +unsigned long flags;/* Clear and enable Rx full interrupt. */ xiic_irq_clr_en (i2c,XIIC_INTR_RX_FULL_MASK |XIIC_INTR_TX_ERROR_MASK );
@@ -547,6 +548,7 @@ static void xiic_start_recv(struct xiic_i2c *i2c) rx_watermark =IIC_RX_FIFO_DEPTH ;xiic_setreg8 (i2c,XIIC_RFD_REG_OFFSET , rx_watermark -1 ); +local_irq_save (flags);if (!(msg->flags &I2C_M_NOSTART ))/* write the address */ xiic_setreg16(i2c, XIIC_DTR_REG_OFFSET,
@@ -556,6 +558,8 @@ static void xiic_start_recv(struct xiic_i2c *i2c)xiic_setreg16 (i2c,XIIC_DTR_REG_OFFSET , msg->len | ((i2c->nmsgs ==1 ) ?XIIC_TX_DYN_STOP_MASK :0 )); +local_irq_restore (flags); +if (i2c->nmsgs ==1 )/* very last, enable bus not busy as well */ xiic_irq_clr_en (i2c,XIIC_INTR_BNB_MASK );
drivers/infiniband/core/cma.c +10 -3
@@ -1445,9 +1445,16 @@ static bool cma_match_net_dev(const struct rdma_cm_id *id, (addr->src_addr.ss_family ==AF_IB ||rdma_protocol_roce (id->device, port_num)); -return !addr->dev_addr.bound_dev_if || - (net_eq (dev_net (net_dev), addr->dev_addr.net) && - addr->dev_addr.bound_dev_if == net_dev->ifindex); +/* +* Net namespaces must match, and if the listner is listening +* on a specific netdevice than netdevice must match as well. +*/ +if (net_eq (dev_net (net_dev), addr->dev_addr.net) && + (!!addr->dev_addr.bound_dev_if == + (addr->dev_addr.bound_dev_if == net_dev->ifindex))) +return true; +else +return false; } static struct rdma_id_private *cma_find_listener(
drivers/infiniband/hw/hns/hns_roce_hem.c +3 -0
@@ -494,6 +494,9 @@ static int hns_roce_table_mhop_get(struct hns_roce_dev *hr_dev, step_idx =1 ; }else if (hop_num ==HNS_ROCE_HOP_NUM_0 ) { step_idx =0 ; + }else { + ret = -EINVAL ; + goto err_dma_alloc_l1; }/* set HEM base address to hardware */
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +8 -4
@@ -273,7 +273,8 @@ static int hns_roce_v2_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,switch (wr->opcode) {case IB_WR_SEND_WITH_IMM :case IB_WR_RDMA_WRITE_WITH_IMM : - ud_sq_wqe->immtdata = wr->ex.imm_data; + ud_sq_wqe->immtdata = +cpu_to_le32 (be32_to_cpu (wr->ex.imm_data));break ;default : ud_sq_wqe->immtdata =0 ;
@@ -371,7 +372,8 @@ static int hns_roce_v2_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,switch (wr->opcode) {case IB_WR_SEND_WITH_IMM :case IB_WR_RDMA_WRITE_WITH_IMM : - rc_sq_wqe->immtdata = wr->ex.imm_data; + rc_sq_wqe->immtdata = +cpu_to_le32 (be32_to_cpu (wr->ex.imm_data));break ;case IB_WR_SEND_WITH_INV : rc_sq_wqe->inv_key =
@@ -1931,7 +1933,8 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq,case HNS_ROCE_V2_OPCODE_RDMA_WRITE_IMM : wc->opcode =IB_WC_RECV_RDMA_WITH_IMM ; wc->wc_flags =IB_WC_WITH_IMM ; - wc->ex.imm_data = cqe->immtdata; + wc->ex.imm_data = +cpu_to_be32 (le32_to_cpu (cqe->immtdata));break ;case HNS_ROCE_V2_OPCODE_SEND : wc->opcode =IB_WC_RECV ;
@@ -1940,7 +1943,8 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq,case HNS_ROCE_V2_OPCODE_SEND_WITH_IMM : wc->opcode =IB_WC_RECV ; wc->wc_flags =IB_WC_WITH_IMM ; - wc->ex.imm_data = cqe->immtdata; + wc->ex.imm_data = +cpu_to_be32 (le32_to_cpu (cqe->immtdata));break ;case HNS_ROCE_V2_OPCODE_SEND_WITH_INV : wc->opcode =IB_WC_RECV ;
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +3 -3
@@ -768,7 +768,7 @@ struct hns_roce_v2_cqe {__le32 byte_4;union {__le32 rkey; -__be32 immtdata; +__le32 immtdata; };__le32 byte_12;__le32 byte_16;
@@ -926,7 +926,7 @@ struct hns_roce_v2_cq_db {struct hns_roce_v2_ud_send_wqe {__le32 byte_4;__le32 msg_len; -__be32 immtdata; +__le32 immtdata;__le32 byte_16;__le32 byte_20;__le32 byte_24;
@@ -1012,7 +1012,7 @@ struct hns_roce_v2_rc_send_wqe {__le32 msg_len;union {__le32 inv_key; -__be32 immtdata; +__le32 immtdata; };__le32 byte_16;__le32 byte_20;
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +1 -0
@@ -822,6 +822,7 @@ void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb)if (neigh &&list_empty (&neigh->list)) {kref_get (&mcast->ah->ref); neigh->ah = mcast->ah; + neigh->ah->valid =1 ;list_add_tail (&neigh->list, &mcast->neigh_list); } }
drivers/input/touchscreen/atmel_mxt_ts.c +4 -3
@@ -1658,10 +1658,11 @@ static int mxt_parse_object_table(struct mxt_data *data,break ;case MXT_TOUCH_MULTI_T9 : data->multitouch =MXT_TOUCH_MULTI_T9 ; +/* Only handle messages from first T9 instance */ data->T9_reportid_min = min_id; - data->T9_reportid_max = max_id; - data->num_touchids = object->num_report_ids - *mxt_obj_instances (object); + data->T9_reportid_max = min_id + + object->num_report_ids -1 ; + data->num_touchids = object->num_report_ids;break ;case MXT_SPT_MESSAGECOUNT_T44 : data->T44_address = object->start_address;
drivers/iommu/arm-smmu-v3.c +16 -6
@@ -24,6 +24,7 @@#include <linux/acpi_iort.h> #include <linux/bitfield.h> #include <linux/bitops.h> +#include <linux/crash_dump.h> #include <linux/delay.h> #include <linux/dma-iommu.h> #include <linux/err.h>
@@ -2211,8 +2212,12 @@ static int arm_smmu_update_gbpa(struct arm_smmu_device *smmu, u32 set, u32 clr) reg &= ~clr; reg |= set;writel_relaxed (reg |GBPA_UPDATE , gbpa); -return readl_relaxed_poll_timeout (gbpa, reg, !(reg &GBPA_UPDATE ), -1 ,ARM_SMMU_POLL_TIMEOUT_US ); + ret =readl_relaxed_poll_timeout (gbpa, reg, !(reg &GBPA_UPDATE ), +1 ,ARM_SMMU_POLL_TIMEOUT_US ); + +if (ret) +dev_err (smmu->dev,"GBPA not responding to update\n" ); +return ret; }static void arm_smmu_free_msis (void *data)
@@ -2392,8 +2397,15 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass)/* Clear CR0 and sync (disables SMMU and queue processing) */ reg =readl_relaxed (smmu->base +ARM_SMMU_CR0 ); -if (reg &CR0_SMMUEN ) +if (reg &CR0_SMMUEN ) { +if (is_kdump_kernel ()) { +arm_smmu_update_gbpa (smmu,GBPA_ABORT ,0 ); +arm_smmu_device_disable (smmu); +return -EBUSY ; + } +dev_warn (smmu->dev,"SMMU currently enabled! Resetting...\n" ); + } ret =arm_smmu_device_disable (smmu);if (ret)
@@ -2491,10 +2503,8 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass) enables |=CR0_SMMUEN ; }else { ret =arm_smmu_update_gbpa (smmu,0 ,GBPA_ABORT ); -if (ret) { -dev_err (smmu->dev,"GBPA not responding to update\n" ); +if (ret)return ret; - } } ret =arm_smmu_write_reg_sync (smmu, enables,ARM_SMMU_CR0 ,ARM_SMMU_CR0ACK );
drivers/iommu/ipmmu-vmsa.c +4 -5
@@ -73,7 +73,7 @@ struct ipmmu_vmsa_domain {struct io_pgtable_ops *iop;unsigned int context_id; -spinlock_t lock;/* Protects mappings */ +struct mutex mutex;/* Protects mappings */ };static struct ipmmu_vmsa_domain *to_vmsa_domain (struct iommu_domain *dom)
@@ -595,7 +595,7 @@ static struct iommu_domain *__ipmmu_domain_alloc(unsigned type)if (!domain)return NULL ; -spin_lock_init (&domain->lock); +mutex_init (&domain->mutex);return &domain->io_domain; }
@@ -641,7 +641,6 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,struct iommu_fwspec *fwspec = dev->iommu_fwspec;struct ipmmu_vmsa_device *mmu =to_ipmmu (dev);struct ipmmu_vmsa_domain *domain =to_vmsa_domain (io_domain); -unsigned long flags;unsigned int i;int ret =0 ;
@@ -650,7 +649,7 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,return -ENXIO ; } -spin_lock_irqsave (&domain->lock, flags); +mutex_lock (&domain->mutex);if (!domain->mmu) {/* The domain hasn't been used yet, initialize it. */
@@ -674,7 +673,7 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain, }else dev_info (dev,"Reusing IPMMU context %u\n" , domain->context_id); -spin_unlock_irqrestore (&domain->lock, flags); +mutex_unlock (&domain->mutex);if (ret <0 )return ret;
drivers/macintosh/via-pmu.c +5 -4
@@ -534,8 +534,9 @@ init_pmu(void)int timeout;struct adb_request req; -out_8 (&via[B ], via[B ] |TREQ );/* negate TREQ */ -out_8 (&via[DIRB ], (via[DIRB ] |TREQ ) & ~TACK );/* TACK in, TREQ out */ +/* Negate TREQ. Set TACK to input and TREQ to output. */ +out_8 (&via[B ],in_8 (&via[B ]) |TREQ ); +out_8 (&via[DIRB ], (in_8 (&via[DIRB ]) |TREQ ) & ~TACK );pmu_request (&req,NULL ,2 ,PMU_SET_INTR_MASK , pmu_intr_mask); timeout =100000 ;
@@ -1418,8 +1419,8 @@ pmu_sr_intr(void)struct adb_request *req;int bite =0 ; -if (via[B ] &TREQ ) { -printk (KERN_ERR "PMU: spurious SR intr (%x)\n" , via[B ]); +if (in_8 (&via[B ]) &TREQ ) { +printk (KERN_ERR "PMU: spurious SR intr (%x)\n" ,in_8 (&via[B ]));out_8 (&via[IFR ],SR_INT );return NULL ; }
drivers/md/dm-cache-target.c +15 -4
@@ -2250,7 +2250,7 @@ static int parse_features(struct cache_args *ca, struct dm_arg_set *as, {0, 2, "Invalid number of cache feature arguments"}, }; -int r; +int r, mode_ctr =0 ;unsigned argc;const char *arg;struct cache_features *cf = &ca->features;
@@ -2264,14 +2264,20 @@ static int parse_features(struct cache_args *ca, struct dm_arg_set *as,while (argc--) { arg =dm_shift_arg (as); -if (!strcasecmp (arg,"writeback" )) +if (!strcasecmp (arg,"writeback" )) { cf->io_mode =CM_IO_WRITEBACK ; + mode_ctr++; + } -else if (!strcasecmp (arg,"writethrough" )) +else if (!strcasecmp (arg,"writethrough" )) { cf->io_mode =CM_IO_WRITETHROUGH ; + mode_ctr++; + } -else if (!strcasecmp (arg,"passthrough" )) +else if (!strcasecmp (arg,"passthrough" )) { cf->io_mode =CM_IO_PASSTHROUGH ; + mode_ctr++; + }else if (!strcasecmp (arg,"metadata2" )) cf->metadata_version =2 ;
@@ -2282,6 +2288,11 @@ static int parse_features(struct cache_args *ca, struct dm_arg_set *as, } } +if (mode_ctr >1 ) { + *error ="Duplicate cache io_mode features requested" ; +return -EINVAL ; + } +return 0 ; }
drivers/md/raid5.c +6 -0
@@ -4521,6 +4521,12 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) s->failed++;if (rdev && !test_bit (Faulty, &rdev->flags)) do_recovery =1 ; +else if (!rdev) { + rdev =rcu_dereference ( + conf->disks[i].replacement); +if (rdev && !test_bit (Faulty, &rdev->flags)) + do_recovery =1 ; + } }if (test_bit (R5_InJournal, &dev->flags))
drivers/media/dvb-frontends/helene.c +4 -1
@@ -897,7 +897,10 @@ static int helene_x_pon(struct helene_priv *priv)helene_write_regs (priv,0x99 , cdata,sizeof (cdata));/* 0x81 - 0x94 */ - data[0 ] =0x18 ;/* xtal 24 MHz */ +if (priv->xtal ==SONY_HELENE_XTAL_16000 ) + data[0 ] =0x10 ;/* xtal 16 MHz */ +else + data[0 ] =0x18 ;/* xtal 24 MHz */ data[1 ] = (uint8_t )(0x80 | (0x04 &0x1F ));/* 4 x 25 = 100uA */ data[2 ] = (uint8_t )(0x80 | (0x26 &0x7F ));/* 38 x 0.25 = 9.5pF */ data[3 ] =0x80 ;/* REFOUT signal output 500mVpp */
drivers/media/platform/davinci/vpif_display.c +16 -8
@@ -1114,6 +1114,14 @@ static int initialize_vpif(void)return err; } +static void free_vpif_objs (void ) +{ +int i; + +for (i =0 ; i <VPIF_DISPLAY_MAX_DEVICES ; i++) +kfree (vpif_obj.dev[i]); +} +static int vpif_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev,struct v4l2_async_subdev *asd)
@@ -1255,11 +1263,6 @@ static __init int vpif_probe(struct platform_device *pdev)return -EINVAL ; } -if (!pdev->dev.platform_data) { -dev_warn (&pdev->dev,"Missing platform data. Giving up.\n" ); -return -EINVAL ; - } - vpif_dev = &pdev->dev; err =initialize_vpif ();
@@ -1271,7 +1274,7 @@ static __init int vpif_probe(struct platform_device *pdev) err =v4l2_device_register (vpif_dev, &vpif_obj.v4l2_dev);if (err) {v4l2_err (vpif_dev->driver,"Error registering v4l2 device\n" ); -return err; + goto vpif_free; }while ((res =platform_get_resource (pdev,IORESOURCE_IRQ , res_idx))) {
@@ -1314,7 +1317,10 @@ static __init int vpif_probe(struct platform_device *pdev)if (vpif_obj.sd[i]) vpif_obj.sd[i]->grp_id =1 << i; } -vpif_probe_complete (); + err =vpif_probe_complete (); +if (err) { + goto probe_subdev_out; + } }else { vpif_obj.notifier.subdevs = vpif_obj.config->asd; vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0 ];
@@ -1334,6 +1340,8 @@ static __init int vpif_probe(struct platform_device *pdev)kfree (vpif_obj.sd); vpif_unregister:v4l2_device_unregister (&vpif_obj.v4l2_dev); +vpif_free: +free_vpif_objs ();return err; }
@@ -1355,8 +1363,8 @@ static int vpif_remove(struct platform_device *device) ch = vpif_obj.dev[i];/* Unregister video device */ video_unregister_device (&ch->video_dev); -kfree (vpif_obj.dev[i]); } +free_vpif_objs ();return 0 ; }
drivers/media/platform/qcom/camss-8x16/camss-csid.c +11 -5
@@ -392,9 +392,6 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable) !media_entity_remote_pad(&csid->pads[MSM_CSID_PAD_SINK]))return -ENOLINK ; - dt =csid_get_fmt_entry (csid->fmt[MSM_CSID_PAD_SRC ].code)-> - data_type; -if (tg->enabled) {/* Config Test Generator */ struct v4l2_mbus_framefmt *f =
@@ -416,6 +413,9 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)writel_relaxed (val, csid->base +CAMSS_CSID_TG_DT_n_CGG_0 (0 )); + dt =csid_get_fmt_entry ( + csid->fmt[MSM_CSID_PAD_SRC ].code)->data_type; +/* 5:0 data type */ val = dt; writel_relaxed(val, csid->base +
@@ -425,6 +425,9 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable) val = tg->payload_mode;writel_relaxed (val, csid->base +CAMSS_CSID_TG_DT_n_CGG_2 (0 )); + + df =csid_get_fmt_entry ( + csid->fmt[MSM_CSID_PAD_SRC ].code)->decode_format; }else {struct csid_phy_config *phy = &csid->phy;
@@ -439,13 +442,16 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)writel_relaxed (val, csid->base +CAMSS_CSID_CORE_CTRL_1 ); + + dt =csid_get_fmt_entry ( + csid->fmt[MSM_CSID_PAD_SINK ].code)->data_type; + df =csid_get_fmt_entry ( + csid->fmt[MSM_CSID_PAD_SINK ].code)->decode_format; }/* Config LUT */ dt_shift = (cid %4 ) *8 ; - df =csid_get_fmt_entry (csid->fmt[MSM_CSID_PAD_SINK ].code)-> - decode_format; val =readl_relaxed (csid->base +CAMSS_CSID_CID_LUT_VC_n (vc)); val &= ~(0xff << dt_shift);
drivers/media/platform/rcar-vin/rcar-csi2.c +14 -6
@@ -339,6 +339,7 @@ enum rcar_csi2_pads {struct rcar_csi2_info {int (*init_phtw)(struct rcar_csi2 *priv,unsigned int mbps); +int (*confirm_start)(struct rcar_csi2 *priv);const struct rcsi2_mbps_reg *hsfreqrange;unsigned int csi0clkfreqrange;bool clear_ulps;
@@ -545,6 +546,13 @@ static int rcsi2_start(struct rcar_csi2 *priv)if (ret)return ret; +/* Confirm start */ +if (priv->info->confirm_start) { + ret = priv->info->confirm_start (priv); +if (ret) +return ret; + } +/* Clear Ultra Low Power interrupt. */ if (priv->info->clear_ulps) rcsi2_write(priv, INTSTATE_REG,
@@ -880,6 +888,11 @@ static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps) }static int rcsi2_init_phtw_v3m_e3 (struct rcar_csi2 *priv,unsigned int mbps) +{ +return rcsi2_phtw_write_mbps (priv, mbps, phtw_mbps_v3m_e3,0x44 ); +} + +static int rcsi2_confirm_start_v3m_e3 (struct rcar_csi2 *priv) {static const struct phtw_value step1[] = { { .data =0xed , .code =0x34 },
@@ -890,12 +903,6 @@ static int rcsi2_init_phtw_v3m_e3(struct rcar_csi2 *priv, unsigned int mbps) { /* sentinel */ }, }; -int ret; - - ret =rcsi2_phtw_write_mbps (priv, mbps, phtw_mbps_v3m_e3,0x44 ); -if (ret) -return ret; -return rcsi2_phtw_write_array (priv, step1); }
@@ -949,6 +956,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77965 = {static const struct rcar_csi2_info rcar_csi2_info_r8a77970 = { .init_phtw = rcsi2_init_phtw_v3m_e3, + .confirm_start = rcsi2_confirm_start_v3m_e3, };static const struct of_device_id rcar_csi2_of_table[] = {
drivers/media/platform/s5p-mfc/s5p_mfc.c +12 -11
@@ -254,24 +254,24 @@ static void s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx)static void s5p_mfc_handle_frame_copy_time (struct s5p_mfc_ctx *ctx) {struct s5p_mfc_dev *dev = ctx->dev; -struct s5p_mfc_buf *dst_buf, *src_buf; -size_t dec_y_addr; +struct s5p_mfc_buf *dst_buf, *src_buf; +u32 dec_y_addr;unsigned int frame_type;/* Make sure we actually have a new frame before continuing. */ frame_type =s5p_mfc_hw_call (dev->mfc_ops, get_dec_frame_type, dev);if (frame_type ==S5P_FIMV_DECODE_FRAME_SKIPPED )return ; - dec_y_addr =s5p_mfc_hw_call (dev->mfc_ops, get_dec_y_adr, dev); + dec_y_addr = (u32 )s5p_mfc_hw_call (dev->mfc_ops, get_dec_y_adr, dev);/* Copy timestamp / timecode from decoded src to dst and set appropriate flags. */ src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);list_for_each_entry (dst_buf, &ctx->dst_queue, list) { -if (vb2_dma_contig_plane_dma_addr (&dst_buf->b->vb2_buf,0 ) - == dec_y_addr) { - dst_buf->b->timecode = - src_buf->b->timecode; +u32 addr = (u32 )vb2_dma_contig_plane_dma_addr (&dst_buf->b->vb2_buf,0 ); + +if (addr == dec_y_addr) { + dst_buf->b->timecode = src_buf->b->timecode; dst_buf->b->vb2_buf.timestamp = src_buf->b->vb2_buf.timestamp; dst_buf->b->flags &=
@@ -307,10 +307,10 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err) {struct s5p_mfc_dev *dev = ctx->dev;struct s5p_mfc_buf *dst_buf; -size_t dspl_y_addr; +u32 dspl_y_addr;unsigned int frame_type; - dspl_y_addr =s5p_mfc_hw_call (dev->mfc_ops, get_dspl_y_adr, dev); + dspl_y_addr = (u32 )s5p_mfc_hw_call (dev->mfc_ops, get_dspl_y_adr, dev);if (IS_MFCV6_PLUS (dev)) frame_type =s5p_mfc_hw_call (dev->mfc_ops, get_disp_frame_type, ctx);
@@ -329,9 +329,10 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)/* The MFC returns address of the buffer, now we have to * check which videobuf does it correspond to */ list_for_each_entry (dst_buf, &ctx->dst_queue, list) { +u32 addr = (u32 )vb2_dma_contig_plane_dma_addr (&dst_buf->b->vb2_buf,0 ); +/* Check if this is the buffer we're looking for */ -if (vb2_dma_contig_plane_dma_addr (&dst_buf->b->vb2_buf,0 ) - == dspl_y_addr) { +if (addr == dspl_y_addr) {list_del (&dst_buf->list); ctx->dst_queue_cnt--; dst_buf->b->sequence = ctx->sequence;
drivers/media/usb/dvb-usb/dw2102.c +14 -5
@@ -2101,14 +2101,12 @@ static struct dvb_usb_device_properties s6x0_properties = { } }; -static struct dvb_usb_device_properties *p1100;static const struct dvb_usb_device_description d1100 = {"Prof 1100 USB " , {&dw2102_table[PROF_1100 ],NULL }, {NULL }, }; -static struct dvb_usb_device_properties *s660;static const struct dvb_usb_device_description d660 = {"TeVii S660 USB" , {&dw2102_table[TEVII_S660 ],NULL },
@@ -2127,14 +2125,12 @@ static const struct dvb_usb_device_description d480_2 = { {NULL}, }; -static struct dvb_usb_device_properties *p7500;static const struct dvb_usb_device_description d7500 = {"Prof 7500 USB DVB-S2" , {&dw2102_table[PROF_7500 ],NULL }, {NULL }, }; -static struct dvb_usb_device_properties *s421;static const struct dvb_usb_device_description d421 = {"TeVii S421 PCI" , {&dw2102_table[TEVII_S421], NULL},
@@ -2334,6 +2330,11 @@ static int dw2102_probe(struct usb_interface *intf, const struct usb_device_id *id) {int retval = -ENOMEM ; +struct dvb_usb_device_properties *p1100; +struct dvb_usb_device_properties *s660; +struct dvb_usb_device_properties *p7500; +struct dvb_usb_device_properties *s421; + p1100 =kmemdup (&s6x0_properties,sizeof (struct dvb_usb_device_properties ),GFP_KERNEL );if (!p1100)
@@ -2402,8 +2403,16 @@ static int dw2102_probe(struct usb_interface *intf, 0 == dvb_usb_device_init(intf, &t220_properties, THIS_MODULE, NULL, adapter_nr) || 0 == dvb_usb_device_init(intf, &tt_s2_4600_properties, - THIS_MODULE, NULL, adapter_nr)) + THIS_MODULE, NULL, adapter_nr)) { + +/* clean up copied properties */ +kfree (s421); +kfree (p7500); +kfree (s660); +kfree (p1100); +return 0 ; + } retval = -ENODEV ;kfree (s421);
drivers/media/usb/em28xx/em28xx-cards.c +3 -1
@@ -3376,7 +3376,9 @@ void em28xx_free_device(struct kref *ref)if (!dev->disconnected)em28xx_release_resources (dev); -kfree (dev->alt_max_pkt_size_isoc); +if (dev->ts ==PRIMARY_TS ) +kfree (dev->alt_max_pkt_size_isoc); +kfree (dev); }EXPORT_SYMBOL_GPL (em28xx_free_device);
drivers/media/usb/em28xx/em28xx-core.c +2 -2
@@ -655,12 +655,12 @@ int em28xx_capture_start(struct em28xx *dev, int start) rc =em28xx_write_reg_bits (dev,EM2874_R5F_TS_ENABLE , start ?EM2874_TS1_CAPTURE_ENABLE :0x00 , -EM2874_TS1_CAPTURE_ENABLE ); +EM2874_TS1_CAPTURE_ENABLE |EM2874_TS1_FILTER_ENABLE |EM2874_TS1_NULL_DISCARD ); else rc =em28xx_write_reg_bits (dev,EM2874_R5F_TS_ENABLE , start ?EM2874_TS2_CAPTURE_ENABLE :0x00 , -EM2874_TS2_CAPTURE_ENABLE ); +EM2874_TS2_CAPTURE_ENABLE |EM2874_TS2_FILTER_ENABLE |EM2874_TS2_NULL_DISCARD ); }else {/* FIXME: which is the best order? */ /* video registers are sampled by VREF */
drivers/media/usb/em28xx/em28xx-dvb.c +3 -1
@@ -218,7 +218,9 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb) dvb_alt = dev->dvb_alt_isoc; } -usb_set_interface (udev, dev->ifnum, dvb_alt); +if (!dev->board.has_dual_ts) +usb_set_interface (udev, dev->ifnum, dvb_alt); + rc =em28xx_set_mode (dev,EM28XX_DIGITAL_MODE );if (rc <0 )return rc;
drivers/memory/ti-aemif.c +1 -1
@@ -411,7 +411,7 @@ static int aemif_probe(struct platform_device *pdev)if (ret <0 ) goto error; } - }else { + }else if (pdata) {for (i =0 ; i < pdata->num_sub_devices; i++) { pdata->sub_devices[i].dev.parent = dev; ret =platform_device_register (&pdata->sub_devices[i]);
drivers/mfd/rave-sp.c +7 -0
@@ -776,6 +776,13 @@ static int rave_sp_probe(struct serdev_device *serdev)return ret;serdev_device_set_baudrate (serdev, baud); +serdev_device_set_flow_control (serdev, false); + + ret =serdev_device_set_parity (serdev,SERDEV_PARITY_NONE ); +if (ret) { +dev_err (dev,"Failed to set parity\n" ); +return ret; + } ret =rave_sp_get_status (sp);if (ret) {
drivers/mfd/ti_am335x_tscadc.c +1 -2
@@ -209,14 +209,13 @@ static int ti_tscadc_probe(struct platform_device *pdev)* The TSC_ADC_SS controller design assumes the OCP clock is * at least 6x faster than the ADC clock. */ - clk =clk_get (&pdev->dev,"adc_tsc_fck" ); + clk =devm_clk_get (&pdev->dev,"adc_tsc_fck" );if (IS_ERR (clk)) {dev_err (&pdev->dev,"failed to get TSC fck\n" ); err =PTR_ERR (clk); goto err_disable_clk; } clock_rate =clk_get_rate (clk); -clk_put (clk); tscadc->clk_div = clock_rate /ADC_CLK ;/* TSCADC_CLKDIV needs to be configured to the value minus 1 */
drivers/misc/mic/scif/scif_api.c +9 -11
@@ -370,11 +370,10 @@ int scif_bind(scif_epd_t epd, u16 pn) goto scif_bind_exit; } }else { - pn =scif_get_new_port (); -if (!pn) { - ret = -ENOSPC ; + ret =scif_get_new_port (); +if (ret <0 ) goto scif_bind_exit; - } + pn = ret; } ep->state =SCIFEP_BOUND ;
@@ -648,13 +647,12 @@ int __scif_connect(scif_epd_t epd, struct scif_port_id *dst, bool non_block) err = -EISCONN ;break ;case SCIFEP_UNBOUND : - ep->port.port =scif_get_new_port (); -if (!ep->port.port) { - err = -ENOSPC ; - }else { - ep->port.node = scif_info.nodeid; - ep->conn_async_state =ASYNC_CONN_IDLE ; - } + err =scif_get_new_port (); +if (err <0 ) +break ; + ep->port.port = err; + ep->port.node = scif_info.nodeid; + ep->conn_async_state =ASYNC_CONN_IDLE ;/* Fall through */ case SCIFEP_BOUND :/*
drivers/misc/ti-st/st_kim.c +2 -2
@@ -756,14 +756,14 @@ static int kim_probe(struct platform_device *pdev) err =gpio_request (kim_gdata->nshutdown,"kim" );if (unlikely (err)) {pr_err (" gpio %d request failed " , kim_gdata->nshutdown); -return err; + goto err_sysfs_group; }/* Configure nShutdown GPIO as output=0 */ err =gpio_direction_output (kim_gdata->nshutdown,0 );if (unlikely (err)) {pr_err (" unable to configure gpio %d" , kim_gdata->nshutdown); -return err; + goto err_sysfs_group; }/* get reference of pdev for request_firmware */
drivers/mtd/nand/raw/nand_base.c +22 -22
82 lines not on this page · raw message
drivers/net/ethernet/marvell/mvneta.c +0 -1
@@ -3196,7 +3196,6 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu)on_each_cpu (mvneta_percpu_enable, pp, true);mvneta_start_dev (pp); -mvneta_port_up (pp);netdev_update_features (dev);
drivers/net/phy/mdio-mux-bcm-iproc.c +15 -5
@@ -22,7 +22,7 @@#include <linux/mdio-mux.h> #include <linux/delay.h> -#define MDIO_PARAM_OFFSET 0x00 +#define MDIO_PARAM_OFFSET 0x23c#define MDIO_PARAM_MIIM_CYCLE 29#define MDIO_PARAM_INTERNAL_SEL 25#define MDIO_PARAM_BUS_ID 22
@@ -30,20 +30,22 @@#define MDIO_PARAM_PHY_ID 16#define MDIO_PARAM_PHY_DATA 0 -#define MDIO_READ_OFFSET 0x04 +#define MDIO_READ_OFFSET 0x240#define MDIO_READ_DATA_MASK 0xffff -#define MDIO_ADDR_OFFSET 0x08 +#define MDIO_ADDR_OFFSET 0x244 -#define MDIO_CTRL_OFFSET 0x0C +#define MDIO_CTRL_OFFSET 0x248#define MDIO_CTRL_WRITE_OP 0x1#define MDIO_CTRL_READ_OP 0x2 -#define MDIO_STAT_OFFSET 0x10 +#define MDIO_STAT_OFFSET 0x24c#define MDIO_STAT_DONE 1#define BUS_MAX_ADDR 32#define EXT_BUS_START_ADDR 16 +#define MDIO_REG_ADDR_SPACE_SIZE 0x250 +struct iproc_mdiomux_desc {void *mux_handle;void __iomem *base;
@@ -169,6 +171,14 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) md->dev = &pdev->dev; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (res->start &0xfff ) { +/* For backward compatibility in case the +* base address is specified with an offset. +*/ +dev_info (&pdev->dev,"fix base address in dt-blob\n" ); + res->start &= ~0xfff ; + res->end = res->start +MDIO_REG_ADDR_SPACE_SIZE -1 ; + } md->base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (md->base)) {dev_err (&pdev->dev,"failed to ioremap register\n" );
drivers/net/wireless/ath/ath10k/mac.c +7 -0
@@ -3085,6 +3085,13 @@ static int ath10k_update_channel_list(struct ath10k *ar) passive = channel->flags &IEEE80211_CHAN_NO_IR ; ch->passive = passive; +/* the firmware is ignoring the "radar" flag of the +* channel and is scanning actively using Probe Requests +* on "Radar detection"/DFS channels which are not +* marked as "available" +*/ + ch->passive |= ch->chan_radar; + ch->freq = channel->center_freq; ch->band_center_freq1 = channel->center_freq; ch->min_power =0 ;
drivers/net/wireless/ath/ath10k/wmi-tlv.c +5 -0
@@ -1584,6 +1584,11 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar) cfg->keep_alive_pattern_size =__cpu_to_le32 (0 ); cfg->max_tdls_concurrent_sleep_sta =__cpu_to_le32 (1 ); cfg->max_tdls_concurrent_buffer_sta =__cpu_to_le32 (1 ); + cfg->wmi_send_separate =__cpu_to_le32 (0 ); + cfg->num_ocb_vdevs =__cpu_to_le32 (0 ); + cfg->num_ocb_channels =__cpu_to_le32 (0 ); + cfg->num_ocb_schedules =__cpu_to_le32 (0 ); + cfg->host_capab =__cpu_to_le32 (0 );ath10k_wmi_put_host_mem_chunks (ar, chunks);
drivers/net/wireless/ath/ath10k/wmi-tlv.h +5 -0
@@ -1670,6 +1670,11 @@ struct wmi_tlv_resource_config {__le32 keep_alive_pattern_size;__le32 max_tdls_concurrent_sleep_sta;__le32 max_tdls_concurrent_buffer_sta; +__le32 wmi_send_separate; +__le32 num_ocb_vdevs; +__le32 num_ocb_channels; +__le32 num_ocb_schedules; +__le32 host_capab; } __packed;struct wmi_tlv_init_cmd {
drivers/net/wireless/ath/ath9k/hw.c +5 -2
@@ -2942,16 +2942,19 @@ void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,struct ath_regulatory *reg =ath9k_hw_regulatory (ah);struct ieee80211_channel *channel;int chan_pwr, new_pwr; +u16 ctl =NO_CTL ;if (!chan)return ; +if (!test) + ctl =ath9k_regd_get_ctl (reg, chan); + channel = chan->chan; chan_pwr =min_t (int, channel->max_power *2 ,MAX_RATE_POWER ); new_pwr =min_t (int, chan_pwr, reg->power_limit); - ah->eep_ops->set_txpower (ah, chan, -ath9k_regd_get_ctl (reg, chan), + ah->eep_ops->set_txpower (ah, chan, ctl,get_antenna_gain (ah, chan), new_pwr, test); }
drivers/net/wireless/ath/ath9k/xmit.c +2 -1
@@ -86,7 +86,8 @@ static void ath_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_sta *sta = info->status.status_driver_data[0 ]; -if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) { +if (info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS | +IEEE80211_TX_STATUS_EOSP )) {ieee80211_tx_status (hw, skb);return ; }
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +4 -0
@@ -1003,6 +1003,10 @@ static int iwl_pci_resume(struct device *device)if (!trans->op_mode)return 0 ; +/* In WOWLAN, let iwl_trans_pcie_d3_resume do the rest of the work */ +if (test_bit (STATUS_DEVICE_ENABLED , &trans->status)) +return 0 ; +/* reconfigure the MSI-X mapping to get the correct IRQ for rfkill */ iwl_pcie_conf_msix_hw (trans_pcie);
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +12 -12
@@ -1539,18 +1539,6 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,iwl_pcie_enable_rx_wake (trans, true); -/* -* Reconfigure IVAR table in case of MSIX or reset ict table in -* MSI mode since HW reset erased it. -* Also enables interrupts - none will happen as -* the device doesn't know we're waking it up, only when -* the opmode actually tells it after this call. -*/ -iwl_pcie_conf_msix_hw (trans_pcie); -if (!trans_pcie->msix_enabled) -iwl_pcie_reset_ict (trans); -iwl_enable_interrupts (trans); -iwl_set_bit (trans,CSR_GP_CNTRL ,BIT (trans->cfg->csr->flag_mac_access_req)); iwl_set_bit(trans, CSR_GP_CNTRL,
@@ -1568,6 +1556,18 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,return ret; } +/* +* Reconfigure IVAR table in case of MSIX or reset ict table in +* MSI mode since HW reset erased it. +* Also enables interrupts - none will happen as +* the device doesn't know we're waking it up, only when +* the opmode actually tells it after this call. +*/ +iwl_pcie_conf_msix_hw (trans_pcie); +if (!trans_pcie->msix_enabled) +iwl_pcie_reset_ict (trans); +iwl_enable_interrupts (trans); +iwl_pcie_set_pwr (trans, false);if (!reset) {
drivers/net/wireless/ti/wlcore/rx.c +6 -2
@@ -59,7 +59,7 @@ static u32 wlcore_rx_get_align_buf_size(struct wl1271 *wl, u32 pkt_len)static void wl1271_rx_status (struct wl1271 *wl,struct wl1271_rx_descriptor *desc,struct ieee80211_rx_status *status, -u8 beacon) +u8 beacon,u8 probe_rsp) {memset (status,0 ,sizeof (struct ieee80211_rx_status ));
@@ -106,6 +106,9 @@ static void wl1271_rx_status(struct wl1271 *wl, } } +if (beacon || probe_rsp) + status->boottime_ns =ktime_get_boot_ns (); +if (beacon)wlcore_set_pending_regdomain_ch (wl, (u16 )desc->channel, status->band);
@@ -191,7 +194,8 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,if (ieee80211_is_data_present (hdr->frame_control)) is_data =1 ; -wl1271_rx_status (wl, desc,IEEE80211_SKB_RXCB (skb), beacon); +wl1271_rx_status (wl, desc,IEEE80211_SKB_RXCB (skb), beacon, +ieee80211_is_probe_resp (hdr->frame_control));wlcore_hw_set_rx_csum (wl, desc, skb); seq_num = (le16_to_cpu (hdr->seq_ctrl) &IEEE80211_SCTL_SEQ ) >>4 ;
drivers/pci/controller/pcie-mobiveil.c +3 -1
@@ -23,6 +23,8 @@#include <linux/platform_device.h> #include <linux/slab.h> +#include "../pci.h" +/* register offsets and bit positions */ /*
@@ -130,7 +132,7 @@ struct mobiveil_pcie {void __iomem *config_axi_slave_base;/* endpoint config base */ void __iomem *csr_axi_slave_base;/* root port config base */ void __iomem *apb_csr_base;/* MSI register base */ -void __iomem *pcie_reg_base;/* Physical PCIe Controller Base */ +phys_addr_t pcie_reg_base;/* Physical PCIe Controller Base */ struct irq_domain *intx_domain;raw_spinlock_t intx_mask_lock;int irq;
drivers/pci/switch/switchtec.c +4 -0
@@ -14,6 +14,8 @@#include <linux/poll.h> #include <linux/wait.h> +#include <linux/nospec.h> +MODULE_DESCRIPTION ("Microsemi Switchtec(tm) PCIe Management Driver" );MODULE_VERSION ("0.1" );MODULE_LICENSE ("GPL" );
@@ -909,6 +911,8 @@ static int ioctl_port_to_pff(struct switchtec_dev *stdev,default :if (p.port >ARRAY_SIZE (pcfg->dsp_pff_inst_id))return -EINVAL ; + p.port =array_index_nospec (p.port, +ARRAY_SIZE (pcfg->dsp_pff_inst_id) +1 ); p.pff =ioread32 (&pcfg->dsp_pff_inst_id[p.port -1 ]);break ; }
drivers/pinctrl/berlin/berlin.c +8 -6
@@ -216,10 +216,8 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) }/* we will reallocate later */ - pctrl->functions =devm_kcalloc (&pdev->dev, - max_functions, -sizeof (*pctrl->functions), -GFP_KERNEL ); + pctrl->functions =kcalloc (max_functions, +sizeof (*pctrl->functions),GFP_KERNEL );if (!pctrl->functions)return -ENOMEM ;
@@ -257,8 +255,10 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) function++; } -if (!found) +if (!found) { +kfree (pctrl->functions);return -EINVAL ; + }if (!function->groups) { function->groups =
@@ -267,8 +267,10 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev)sizeof (char *), GFP_KERNEL); -if (!function->groups) +if (!function->groups) { +kfree (pctrl->functions);return -ENOMEM ; + } } groups = function->groups;
drivers/pinctrl/freescale/pinctrl-imx.c +1 -1
@@ -383,7 +383,7 @@ static void imx_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,const char *name;int i, ret; -if (group > pctldev->num_groups) +if (group >= pctldev->num_groups)return ;seq_puts (s,"\n" );
drivers/pinctrl/pinctrl-amd.c +2 -1
@@ -552,7 +552,8 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id)/* Each status bit covers four pins */ for (i =0 ; i <4 ; i++) { regval =readl (regs + i); -if (!(regval &PIN_IRQ_PENDING )) +if (!(regval &PIN_IRQ_PENDING ) || + !(regval &BIT (INTERRUPT_MASK_OFF )))continue ; irq =irq_find_mapping (gc->irq.domain, irqnr + i);generic_handle_irq (irq);
drivers/regulator/tps65217-regulator.c +2 -0
@@ -232,6 +232,8 @@ static int tps65217_regulator_probe(struct platform_device *pdev) tps->strobes =devm_kcalloc (&pdev->dev,TPS65217_NUM_REGULATOR ,sizeof (u8),GFP_KERNEL ); +if (!tps->strobes) +return -ENOMEM ;platform_set_drvdata (pdev, tps);
drivers/rpmsg/rpmsg_core.c +7 -0
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/rpmsg.h> #include <linux/of_device.h> +#include <linux/pm_domain.h> #include <linux/slab.h> #include "rpmsg_internal.h"
@@ -449,6 +450,10 @@ static int rpmsg_dev_probe(struct device *dev)struct rpmsg_endpoint *ept =NULL ;int err; + err =dev_pm_domain_attach (dev, true); +if (err) + goto out; +if (rpdrv->callback) {strncpy (chinfo.name, rpdev->id.name,RPMSG_NAME_SIZE ); chinfo.src = rpdev->src;
@@ -490,6 +495,8 @@ static int rpmsg_dev_remove(struct device *dev) rpdrv->remove (rpdev); +dev_pm_domain_detach (dev, true); +if (rpdev->ept)rpmsg_destroy_ept (rpdev->ept);
drivers/scsi/3w-9xxx.c +5 -1
@@ -2038,6 +2038,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)if (twa_initialize_device_extension (tw_dev)) {TW_PRINTK (tw_dev->host,TW_DRIVER ,0x25 ,"Failed to initialize device extension" ); + retval = -ENOMEM ; goto out_free_device_extension; }
@@ -2060,6 +2061,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->base_addr =ioremap (mem_addr, mem_len);if (!tw_dev->base_addr) {TW_PRINTK (tw_dev->host,TW_DRIVER ,0x35 ,"Failed to ioremap" ); + retval = -ENOMEM ; goto out_release_mem_region; }
@@ -2067,8 +2069,10 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)TW_DISABLE_INTERRUPTS (tw_dev);/* Initialize the card */ -if (twa_reset_sequence (tw_dev,0 )) +if (twa_reset_sequence (tw_dev,0 )) { + retval = -ENOMEM ; goto out_iounmap; + }/* Set host specific parameters */ if ((pdev->device == PCI_DEVICE_ID_3WARE_9650SE) ||
drivers/scsi/3w-sas.c +3 -0
@@ -1594,6 +1594,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)if (twl_initialize_device_extension (tw_dev)) {TW_PRINTK (tw_dev->host,TW_DRIVER ,0x1a ,"Failed to initialize device extension" ); + retval = -ENOMEM ; goto out_free_device_extension; }
@@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->base_addr =pci_iomap (pdev,1 ,0 );if (!tw_dev->base_addr) {TW_PRINTK (tw_dev->host,TW_DRIVER ,0x1c ,"Failed to ioremap" ); + retval = -ENOMEM ; goto out_release_mem_region; }
@@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)/* Initialize the card */ if (twl_reset_sequence (tw_dev,0 )) {TW_PRINTK (tw_dev->host,TW_DRIVER ,0x1d ,"Controller reset failed during probe" ); + retval = -ENOMEM ; goto out_iounmap; }
drivers/scsi/3w-xxxx.c +2 -0
@@ -2280,6 +2280,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)if (tw_initialize_device_extension (tw_dev)) {printk (KERN_WARNING "3w-xxxx: Failed to initialize device extension." ); + retval = -ENOMEM ; goto out_free_device_extension; }
@@ -2294,6 +2295,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->base_addr =pci_resource_start (pdev,0 );if (!tw_dev->base_addr) {printk (KERN_WARNING "3w-xxxx: Failed to get io address." ); + retval = -ENOMEM ; goto out_release_mem_region; }
drivers/scsi/lpfc/lpfc.h +1 -1
@@ -672,7 +672,7 @@ struct lpfc_hba {#define LS_NPIV_FAB_SUPPORTED 0x2/* Fabric supports NPIV */ #define LS_IGNORE_ERATT 0x4/* intr handler should ignore ERATT */ #define LS_MDS_LINK_DOWN 0x8/* MDS Diagnostics Link Down */ -#define LS_MDS_LOOPBACK 0x16/* MDS Diagnostics Link Up (Loopback) */ +#define LS_MDS_LOOPBACK 0x10/* MDS Diagnostics Link Up (Loopback) */ uint32_t hba_flag;/* hba generic flags */ #define HBA_ERATT_HANDLED 0x1/* This flag is set when eratt handled */
drivers/scsi/lpfc/lpfc_nvme.c +14 -8
@@ -2687,7 +2687,7 @@ lpfc_nvme_register_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)struct lpfc_nvme_rport *oldrport;struct nvme_fc_remote_port *remote_port;struct nvme_fc_port_info rpinfo; -struct lpfc_nodelist *prev_ndlp; +struct lpfc_nodelist *prev_ndlp =NULL ; lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NVME_DISC, "6006 Register NVME PORT. DID x%06x nlptype x%x\n",
@@ -2736,23 +2736,29 @@ lpfc_nvme_register_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)spin_unlock_irq (&vport->phba->hbalock); rport = remote_port->private;if (oldrport) { +/* New remoteport record does not guarantee valid +* host private memory area. +*/ + prev_ndlp = oldrport->ndlp;if (oldrport == remote_port->private) { -/* Same remoteport. Just reuse. */ +/* Same remoteport - ndlp should match. +* Just reuse. +*/ lpfc_printf_vlog (ndlp->vport,KERN_INFO ,LOG_NVME_DISC ,"6014 Rebinding lport to " "remoteport %p wwpn 0x%llx, " -"Data: x%x x%x %p x%x x%06x\n" , +"Data: x%x x%x %p %p x%x x%06x\n" , remote_port, remote_port->port_name, remote_port->port_id, remote_port->port_role, + prev_ndlp, ndlp, ndlp->nlp_type, ndlp->nlp_DID);return 0 ; } - prev_ndlp = rport->ndlp;/* Sever the ndlp<->rport association * before dropping the ndlp ref from
@@ -2786,13 +2792,13 @@ lpfc_nvme_register_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)lpfc_printf_vlog (vport,KERN_INFO ,LOG_NVME_DISC |LOG_NODE ,"6022 Binding new rport to " -"lport %p Remoteport %p WWNN 0x%llx, " +"lport %p Remoteport %p rport %p WWNN 0x%llx, " "Rport WWPN 0x%llx DID " -"x%06x Role x%x, ndlp %p\n" , - lport, remote_port, +"x%06x Role x%x, ndlp %p prev_ndlp %p\n" , + lport, remote_port, rport, rpinfo.node_name, rpinfo.port_name, rpinfo.port_id, rpinfo.port_role, - ndlp); + ndlp, prev_ndlp); }else { lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME_DISC | LOG_NODE,
drivers/scsi/qla2xxx/qla_init.c +6 -3
@@ -1074,9 +1074,12 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)case PDS_PLOGI_COMPLETE :case PDS_PRLI_PENDING :case PDS_PRLI2_PENDING : -ql_dbg (ql_dbg_disc, vha,0x20d5 ,"%s %d %8phC relogin needed\n" , - __func__, __LINE__, fcport->port_name); -set_bit (RELOGIN_NEEDED , &vha->dpc_flags); +/* Set discovery state back to GNL to Relogin attempt */ +if (qla_dual_mode_enabled (vha) || +qla_ini_mode_enabled (vha)) { + fcport->disc_state =DSC_GNL ; +set_bit (RELOGIN_NEEDED , &vha->dpc_flags); + }return ;case PDS_LOGO_PENDING :case PDS_PORT_UNAVAILABLE :
drivers/scsi/qla2xxx/qla_target.c +2 -1
@@ -982,8 +982,9 @@ void qlt_free_session_done(struct work_struct *work) logo.id = sess->d_id; logo.cmd_count =0 ; +if (!own) +qlt_send_first_logo (vha, &logo); sess->send_els_logo =0 ; -qlt_send_first_logo (vha, &logo); }if (sess->logout_on_delete && sess->loop_id !=FC_NO_LOOP_ID ) {
drivers/scsi/qla2xxx/qla_tmpl.c +9 -0
@@ -571,6 +571,15 @@ qla27xx_fwdt_entry_t268(struct scsi_qla_host *vha, }break ; +case T268_BUF_TYPE_REQ_MIRROR : +case T268_BUF_TYPE_RSP_MIRROR : +/* +* Mirror pointers are not implemented in the +* driver, instead shadow pointers are used by +* the drier. Skip these entries. +*/ +qla27xx_skip_entry (ent, buf); +break ;default :ql_dbg (ql_dbg_async, vha,0xd02b ,"%s: unknown buffer %x\n" , __func__, ent->t268.buf_type);
drivers/target/target_core_transport.c +3 -2
@@ -316,6 +316,7 @@ void __transport_register_session( {const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo;unsigned char buf[PR_REG_ISID_LEN ]; +unsigned long flags; se_sess->se_tpg = se_tpg; se_sess->fabric_sess_ptr = fabric_sess_ptr;
@@ -352,7 +353,7 @@ void __transport_register_session( se_sess->sess_bin_isid =get_unaligned_be64 (&buf[0 ]); } -spin_lock_irq (&se_nacl->nacl_sess_lock); +spin_lock_irqsave (&se_nacl->nacl_sess_lock, flags);/* * The se_nacl->nacl_sess pointer will be set to the * last active I_T Nexus for each struct se_node_acl.
@@ -361,7 +362,7 @@ void __transport_register_session(list_add_tail (&se_sess->sess_acl_list, &se_nacl->acl_sess_list); -spin_unlock_irq (&se_nacl->nacl_sess_lock); +spin_unlock_irqrestore (&se_nacl->nacl_sess_lock, flags); }list_add_tail (&se_sess->sess_list, &se_tpg->tpg_sess_list);
drivers/target/target_core_user.c +40 -33
106 lines not on this page · raw message
drivers/thermal/rcar_thermal.c +1 -1
@@ -598,7 +598,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) enr_bits |=3 << (i *8 ); } -if (enr_bits) +if (common->base && enr_bits)rcar_thermal_common_write (common,ENR , enr_bits);dev_info (dev,"%d sensor probed\n" , i);
drivers/thermal/thermal_hwmon.c +1 -0
@@ -142,6 +142,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)INIT_LIST_HEAD (&hwmon->tz_list);strlcpy (hwmon->type, tz->type,THERMAL_NAME_LENGTH ); +strreplace (hwmon->type,'-' ,'_' ); hwmon->device =hwmon_device_register_with_info (NULL , hwmon->type, hwmon,NULL ,NULL );if (IS_ERR (hwmon->device)) {
drivers/tty/rocket.c +1 -1
@@ -1881,7 +1881,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)ByteIO_t UPCIRingInd =0 ;if (!dev || !pci_match_id (rocket_pci_ids, dev) || -pci_enable_device (dev)) +pci_enable_device (dev) || i >=NUM_BOARDS )return 0 ; rcktpt_io_addr[i] =pci_resource_start (dev,0 );
drivers/uio/uio.c +7 -12
@@ -622,6 +622,12 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,ssize_t retval;s32 irq_on; +if (count !=sizeof (s32)) +return -EINVAL ; + +if (copy_from_user (&irq_on, buf, count)) +return -EFAULT ; +mutex_lock (&idev->info_lock);if (!idev->info) { retval = -EINVAL ;
@@ -633,21 +639,11 @@ static ssize_t uio_write(struct file *filep, const char __user *buf, goto out; } -if (count !=sizeof (s32)) { - retval = -EINVAL ; - goto out; - } -if (!idev->info->irqcontrol) { retval = -ENOSYS ; goto out; } -if (copy_from_user (&irq_on, buf, count)) { - retval = -EFAULT ; - goto out; - } - retval = idev->info->irqcontrol (idev->info, irq_on); out:
@@ -955,8 +951,6 @@ int __uio_register_device(struct module *owner,if (ret) goto err_uio_dev_add_attributes; - info->uio_dev = idev; -if (info->irq && (info->irq !=UIO_IRQ_CUSTOM )) {/* * Note that we deliberately don't use devm_request_irq
@@ -972,6 +966,7 @@ int __uio_register_device(struct module *owner, goto err_request_irq; } + info->uio_dev = idev;return 0 ; err_request_irq:
fs/autofs/autofs_i.h +3 -1
@@ -26,6 +26,7 @@#include <linux/list.h> #include <linux/completion.h> #include <linux/file.h> +#include <linux/magic.h> /* This is the range of ioctl() numbers we claim as ours */ #define AUTOFS_IOC_FIRST AUTOFS_IOC_READY
@@ -124,7 +125,8 @@ struct autofs_sb_info {static inline struct autofs_sb_info *autofs_sbi (struct super_block *sb) { -return (struct autofs_sb_info *)(sb->s_fs_info); +return sb->s_magic !=AUTOFS_SUPER_MAGIC ? +NULL : (struct autofs_sb_info *)(sb->s_fs_info); }static inline struct autofs_info *autofs_dentry_ino (struct dentry *dentry)
fs/autofs/inode.c +0 -1
@@ -10,7 +10,6 @@#include <linux/seq_file.h> #include <linux/pagemap.h> #include <linux/parser.h> -#include <linux/magic.h> #include "autofs_i.h"
fs/btrfs/extent-tree.c +8 -9
@@ -5935,7 +5935,7 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)* root: the root of the parent directory * rsv: block reservation * items: the number of items that we need do reservation -* qgroup_reserved: used to return the reserved size in qgroup +* use_global_rsv: allow fallback to the global block reservation * * This function is used to reserve the space for snapshot/subvolume * creation and deletion. Those operations are different with the
@@ -5945,10 +5945,10 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)* the space reservation mechanism in start_transaction(). */ int btrfs_subvolume_reserve_metadata (struct btrfs_root *root, -struct btrfs_block_rsv *rsv, -int items, +struct btrfs_block_rsv *rsv,int items,bool use_global_rsv) { +u64 qgroup_num_bytes =0 ;u64 num_bytes;int ret;struct btrfs_fs_info *fs_info = root->fs_info;
@@ -5956,12 +5956,11 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,if (test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) {/* One for parent inode, two for dir entries */ - num_bytes =3 * fs_info->nodesize; - ret =btrfs_qgroup_reserve_meta_prealloc (root, num_bytes, true); + qgroup_num_bytes =3 * fs_info->nodesize; + ret =btrfs_qgroup_reserve_meta_prealloc (root, + qgroup_num_bytes, true);if (ret)return ret; - }else { - num_bytes =0 ; } num_bytes =btrfs_calc_trans_metadata_size (fs_info, items);
@@ -5973,8 +5972,8 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,if (ret == -ENOSPC && use_global_rsv) ret =btrfs_block_rsv_migrate (global_rsv, rsv, num_bytes,1 ); -if (ret && num_bytes) -btrfs_qgroup_free_meta_prealloc (root, num_bytes); +if (ret && qgroup_num_bytes) +btrfs_qgroup_free_meta_prealloc (root, qgroup_num_bytes);return ret; }
fs/btrfs/ioctl.c +19 -0
@@ -3463,6 +3463,25 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 olen, same_lock_start =min_t (u64, loff, dst_loff); same_lock_len =max_t (u64, loff, dst_loff) + len - same_lock_start; + }else { +/* +* If the source and destination inodes are different, the +* source's range end offset matches the source's i_size, that +* i_size is not a multiple of the sector size, and the +* destination range does not go past the destination's i_size, +* we must round down the length to the nearest sector size +* multiple. If we don't do this adjustment we end replacing +* with zeroes the bytes in the range that starts at the +* deduplication range's end offset and ends at the next sector +* size multiple. +*/ +if (loff + olen ==i_size_read (src) && + dst_loff + len <i_size_read (dst)) { +const u64 sz =BTRFS_I (src)->root->fs_info->sectorsize; + + len =round_down (i_size_read (src), sz) - loff; + olen = len; + } } again:
fs/cifs/connect.c +1 -1
@@ -2523,7 +2523,7 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb_vol *volume_info)if (tcon ==NULL )return -ENOMEM ; -snprintf (unc,sizeof (unc),"\\\\%s\\IPC$" , ses->serverName); +snprintf (unc,sizeof (unc),"\\\\%s\\IPC$" , ses->server->hostname);/* cannot fail */
Lines of this file are not shown. View the raw message.
fs/f2fs/node.c +33 -13
46 lines not on this page · raw message
tools/testing/selftests/bpf/test_verifier.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json +12 -12
Lines of this file are not shown. View the raw message.
tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json +2 -1
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.