Linux 4.10.10
Greg KH
maintainerI'm announcing the release of the 4.10.10 kernel.
All users of the 4.10 kernel series must upgrade.
The updated 4.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.10.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
------------
Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt | 9 Documentation/process/stable-kernel-rules.rst | 2 Makefile | 16 arch/arm/kernel/armksyms.c | 4 arch/arm/kernel/smccc-call.S | 14 arch/arm/kvm/mmu.c | 23 arch/arm64/kernel/arm64ksyms.c | 4 arch/arm64/kernel/asm-offsets.c | 7 arch/arm64/kernel/smccc-call.S | 23 arch/arm64/mm/fault.c | 42 + arch/metag/include/asm/uaccess.h | 15 arch/metag/lib/usercopy.c | 312 +++++-------- arch/mips/Kconfig | 2 arch/mips/include/asm/spinlock.h | 8 arch/mips/kernel/cpu-probe.c | 2 arch/mips/kernel/genex.S | 4 arch/mips/kernel/traps.c | 17 arch/mips/lantiq/xway/sysctrl.c | 2 arch/mips/mm/c-r4k.c | 2 arch/mips/mm/tlbex.c | 25 - arch/mips/ralink/rt3883.c | 4 arch/nios2/kernel/prom.c | 7 arch/nios2/kernel/setup.c | 3 arch/powerpc/crypto/crc32c-vpmsum_glue.c | 3 arch/powerpc/kernel/align.c | 27 - arch/powerpc/kernel/misc_64.S | 4 arch/powerpc/kernel/setup_64.c | 9 arch/powerpc/mm/hash_native_64.c | 7 arch/s390/boot/compressed/misc.c | 35 - arch/s390/include/asm/uaccess.h | 2 arch/x86/kernel/cpu/mcheck/mce.c | 7 arch/x86/kernel/reboot.c | 16 arch/x86/kvm/vmx.c | 9 arch/xtensa/include/asm/page.h | 13 drivers/acpi/button.c | 2 drivers/acpi/glue.c | 12 drivers/acpi/sleep.c | 19 drivers/ata/ahci_da850.c | 33 + drivers/char/random.c | 84 +-- drivers/firmware/qcom_scm-64.c | 13 drivers/gpio/gpiolib-acpi.c | 4 drivers/gpu/drm/drm_edid.c | 6 drivers/gpu/drm/i915/gvt/kvmgt.c | 4 drivers/gpu/drm/i915/gvt/sched_policy.c | 4 drivers/gpu/drm/i915/i915_pci.c | 1 drivers/gpu/drm/mga/mga_dma.c | 20 drivers/gpu/drm/mga/mga_drv.c | 37 - drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 drivers/gpu/drm/ttm/ttm_object.c | 10 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 79 ++- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 31 - drivers/hid/wacom_wac.c | 3 drivers/iio/gyro/bmg160_core.c | 12 drivers/iio/industrialio-core.c | 7 drivers/iio/pressure/st_pressure_core.c | 1 drivers/md/dm-raid.c | 2 drivers/md/dm-verity-fec.c | 18 drivers/md/dm-verity-fec.h | 4 drivers/mmc/host/sdhci-of-esdhc.c | 18 drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 drivers/pci/host/pci-thunder-pem.c | 62 ++ drivers/pci/host/pci-xgene.c | 7 drivers/pci/quirks.c | 99 +++- drivers/platform/x86/asus-wmi.c | 23 drivers/staging/android/ashmem.c | 1 drivers/tty/serial/8250/8250_omap.c | 9 drivers/usb/chipidea/ci_hdrc_msm.c | 4 drivers/usb/dwc3/gadget.c | 21 drivers/usb/dwc3/host.c | 21 drivers/usb/host/xhci-hub.c | 6 drivers/usb/host/xhci-plat.c | 3 drivers/usb/host/xhci.h | 3 drivers/usb/storage/unusual_devs.h | 14 drivers/watchdog/s3c2410_wdt.c | 21 fs/cifs/smb2pdu.c | 4 fs/dax.c | 35 - fs/orangefs/super.c | 9 fs/sysfs/file.c | 6 fs/xfs/xfs_bmap_util.c | 10 include/drm/i915_pciids.h | 11 include/drm/ttm/ttm_object.h | 5 include/linux/arm-smccc.h | 52 +- include/linux/pci_ids.h | 2 include/linux/random.h | 1 init/main.c | 1 kernel/ptrace.c | 14 kernel/trace/ring_buffer.c | 8 mm/mempolicy.c | 20 mm/page_alloc.c | 2 net/mac80211/iface.c | 3 net/wireless/sysfs.c | 10 sound/soc/codecs/rt5670.c | 1 sound/soc/intel/atom/sst/sst_acpi.c | 37 + sound/soc/intel/boards/bytcr_rt5640.c | 10 sound/soc/intel/boards/cht_bsw_rt5645.c | 98 +++- sound/soc/sunxi/sun4i-i2s.c | 57 ++ 99 files changed, 1208 insertions(+), 604 deletions(-)
Alex Williamson (1):
PCI: Add ACS quirk for Intel Union Point
Alexander Polakov (1):
mm/page_alloc.c: fix print order in show_free_areas()
Andi Kleen (1):
x86/mce: Don't print MCEs when mcelog is active
Andy Gross (2):
arm: kernel: Add SMC structure parameter
firmware: qcom: scm: Fix interrupted SCM calls
Andy Shevchenko (1):
PCI: Sort the list of devices with D3 delay quirk by ID
Arend Van Spriel (2):
cfg80211: check rdev resume callback only for registered wiphy
brcmfmac: use local iftype avoiding use-after-free of virtual interface
Arnd Bergmann (2):
Kbuild: use cc-disable-warning consistently for maybe-uninitialized drm/msm: adreno: fix build error without debugfs
Bartosz Golaszewski (1):
sata: ahci-da850: implement a workaround for the softreset quirk
Benjamin Herrenschmidt (1):
powerpc: Disable HFSCR[TM] if TM is not supported
Calvin Owens (1):
xfs: Honor FALLOC_FL_KEEP_SIZE when punching ends of files
Changbin Du (1):
drm/i915/kvmgt: fix suspicious rcu dereference usage
Chris Salls (1):
mm/mempolicy.c: fix error handling in set_mempolicy and mbind.
Dan Carpenter (1):
PCI: xgene: Fix double free on init error
Daniel Vetter (1):
drm/mga: remove device_is_agp callback
Dmitry Bilunov (1):
dm raid: fix NULL pointer dereference for raid1 without bitmap
Dmitry Torokhov (1):
ACPI / gpio: do not fall back to parsing _CRS when we get a deferral
Dongdong Liu (1):
PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports
Felipe Balbi (3):
usb: xhci: add quirk flag for broken PED bits
usb: host: xhci-plat: enable BROKEN_PED quirk if platform requested
usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions
Frederic Barrat (1):
powerpc/mm: Add missing global TLB invalidate if cxl is active
Gleb Fotengauer-Malinovskiy (1):
jump label: fix passing kbuild_cflags when checking for asm goto support
Greg Kroah-Hartman (1):
Linux 4.10.10
Hauke Mehrtens (1):
MIPS: Lantiq: fix missing xbar kernel panic
Heiko Carstens (1):
s390/uaccess: get_user() should zero on failure (again)
Huacai Chen (4):
MIPS: Check TLB before handle_ri_rdhwr() for Loongson-3
MIPS: Add MIPS_CPU_FTLB for Loongson-3A R2
MIPS: Flush wrong invalid FTLB entry for huge page
MIPS: c-r4k: Fix Loongson-3's vcache/scache waysize calculation
James Hogan (8):
metag/usercopy: Drop unused macros metag/usercopy: Fix alignment error checking metag/usercopy: Add early abort to copy_to_user metag/usercopy: Zero rest of buffer from copy_from_user metag/usercopy: Set flags before ADDZ metag/usercopy: Fix src fixup in from user rapf loops metag/usercopy: Add missing fixups
MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels
Jan-Marek Glogowski (1):
Reset TreeId to zero on SMB2 TREE_CONNECT
Jani Nikula (1):
drm/edid: constify edid quirk list
Janusz Dziedzic (1):
usb: dwc3: gadget: delay unmap of bounced requests
Jason A. Donenfeld (1):
random: use chacha20 for get_random_int/long
Johan Hovold (1):
Documentation: stable-kernel-rules: fix stable-tag format
Johannes Berg (1):
mac80211: unconditionally start new netdev queues with iTXQ support
John Crispin (1):
MIPS: ralink: Fix typos in rt3883 pinctrl
Jon Mason (1):
PCI: Add Broadcom Northstar2 PAXC quirk for device class and MPSS
João Paulo Rechi Vita (1):
platform/x86: asus-wmi: Detect quirk_no_rfkill from the DSDT
Krzysztof Kozlowski (1):
watchdog: s3c2410: Fix infinite interrupt in soft mode
Li Qiang (1):
drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl()
Lv Zheng (1):
ACPI / button: Change default behavior to lid_init_state=open
Marc Zyngier (2):
arm/arm64: KVM: Take mmap_sem in stage2_unmap_vm arm/arm64: KVM: Take mmap_sem in kvm_arch_prepare_memory_region
Marcelo Henrique Cerri (1):
s390/decompressor: fix initrd corruption caused by bss clear
Martin Brandenburg (1):
orangefs: move features validation to fix filesystem hang
Matjaz Hegedic (3):
x86/reboot/quirks: Add ASUS EeeBook X205TA reboot quirk x86/reboot/quirks: Add ASUS EeeBook X205TA/W reboot quirk x86/reboot/quirks: Fix typo in ASUS EeeBook X205TA reboot quirk
Max Filippov (1):
xtensa: make __pa work with uncached KSEG addresses
Michael Ellerman (1):
powerpc/crypto/crc32c-vpmsum: Fix missing preempt_disable()
Murray McAllister (2):
drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl() drm/vmwgfx: avoid calling vzalloc with a 0 size in vmw_get_cap_3d_ioctl()
Mylène Josserand (1):
ASoC: sun4i-i2s: Add quirks to handle a31 compatible
NeilBrown (1):
sysfs: be careful of error returns from ops->show()
Nikolaus Schulz (1):
iio: core: Fix IIO_VAL_FRACTIONAL_LOG2 for negative values
Oliver O'Halloran (1):
powerpc/64: Fix flush_(d|i)cache_range() called from modules
Paolo Bonzini (1):
kvm: fix page struct leak in handle_vmon
Paul Burton (1):
MIPS: End spinlocks with .insn
Paul Mackerras (1):
powerpc: Don't try to fix up misaligned load-with-reservation instructions
Paulo Zanoni (3):
drm/i915: fix INTEL_BDW_IDS definition drm/i915: more .is_mobile cleanups for BDW drm/i915: actually drive the BDW reserved IDs
Pierre-Louis Bossart (4):
ASoC: codecs: rt5670: add quirk for Lenovo Thinkpad 10
ASoC: Intel: Baytrail: add quirk for Lenovo Thinkpad 10
ASoC: Intel: cht_bsw_rt5645: harden ACPI device detection
ASoC: Intel: cht_bsw_rt5645: add Baytrail MCLK support
Ping Cheng (1):
HID: wacom: don't apply generic settings to old devices
Quentin Schulz (1):
iio: bmg160: reset chip when probing
Rafael J. Wysocki (1):
ACPI / scan: Prefer devices without _HID for _ADR matching
Ross Zwisler (1):
dax: fix radix tree insertion race
Sami Tolvanen (2):
dm verity fec: limit error correction recursion dm verity fec: fix bufio leaks
Shrirang Bagul (1):
iio: st_pressure: initialize lps22hb bootime
Shuxiao Zhang (1):
staging: android: ashmem: lseek failed due to no FMODE_LSEEK.
Sinan Kaya (1):
PCI: Add ACS quirk for Qualcomm QDF2400 and QDF2432
Stephen Boyd (1):
usb: chipidea: msm: Rely on core to override AHBBURST
Suzuki K Poulose (1):
kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd
Thomas Hellstrom (3):
drm/vmwgfx: Type-check lookups of fence objects
drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces drm/vmwgfx: Remove getparam error message
Tobias Jakobi (1):
usb-storage: Add ignore-residue quirk for Initio INIC-3619
Tobias Klauser (1):
nios2: reserve boot memory for device tree
Tomasz Nowicki (2):
PCI: thunder-pem: Add legacy firmware support for Cavium ThunderX host controller
PCI: thunder-pem: Fix legacy firmware PEM-specific resources
Victor Kamensky (1):
arm64: mm: unaligned access by user-land should be received as SIGBUS
Vignesh R (1):
serial: 8250_omap: Add OMAP_DMA_TX_KICK quirk for AM437x
Wei Yongjun (1):
ring-buffer: Fix return value check in test_ringbuffer()
Will Deacon (1):
ARM: smccc: Update HVC comment to describe new quirk parameter
Zhang Rui (1):
ACPI: save NVS memory for Lenovo G50-45
Zhenyu Wang (1):
drm/i915/gvt: Fix gvt scheduler interval time
[email protected] (1):
ptrace: fix PTRACE_LISTEN race corrupting task->state
yangbo lu (1):
mmc: sdhci-of-esdhc: remove default broken-cd for ARM
youling257 (1):
ASoC: Intel: bytcr_rt5640: quirks for Insyde devices
Greg KH
maintainerDocumentation/devicetree/bindings/usb/usb-xhci.txt +1 -0
@@ -27,6 +27,7 @@ Required properties: Optional properties: - clocks: reference to a clock - usb3-lpm-capable: determines if platform is USB3 LPM capable + - quirk-broken-port-ped: set if the controller has broken port disable mechanism Example: usb@f0931000 {
Documentation/devicetree/bindings/watchdog/samsung-wdt.txt +5 -4
@@ -6,10 +6,11 @@ occurred. Required properties: - compatible : should be one among the following - (a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs - (b) "samsung,exynos5250-wdt" for Exynos5250 - (c) "samsung,exynos5420-wdt" for Exynos5420 - (c) "samsung,exynos7-wdt" for Exynos7 + - "samsung,s3c2410-wdt" for S3C2410 + - "samsung,s3c6410-wdt" for S3C6410, S5PV210 and Exynos4 + - "samsung,exynos5250-wdt" for Exynos5250 + - "samsung,exynos5420-wdt" for Exynos5420 + - "samsung,exynos7-wdt" for Exynos7 - reg : base physical address of the controller and length of memory mapped region.
Documentation/process/stable-kernel-rules.rst +1 -1
@@ -124,7 +124,7 @@ specified in the following format in the sign-off area: .. code-block:: none - Cc: <[email protected]> # 3.3.x- + Cc: <[email protected]> # 3.3.x The tag has the meaning of:
Makefile +8 -8
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 10 -SUBLEVEL = 9 +SUBLEVEL = 10 EXTRAVERSION = NAME = Fearless Coyote
@@ -370,7 +370,7 @@ LDFLAGS_MODULE = CFLAGS_KERNEL = AFLAGS_KERNEL = LDFLAGS_vmlinux = -CFLAGS_GCOV = -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized +CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,) CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,)
@@ -651,6 +651,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \ # Tell gcc to never replace conditional load with a non-conditional one KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) +# check for 'asm goto' +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) + KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO +endif + include scripts/Makefile.gcc-plugins ifdef CONFIG_READABLE_ASM
@@ -796,12 +802,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) # use the deterministic mode of AR if available KBUILD_ARFLAGS := $(call ar-option,D) -# check for 'asm goto' -ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) - KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO - KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO -endif - include scripts/Makefile.kasan include scripts/Makefile.extrawarn include scripts/Makefile.ubsan
arch/arm/kernel/armksyms.c +2 -2
@@ -178,6 +178,6 @@ EXPORT_SYMBOL(__pv_offset);#endif #ifdef CONFIG_HAVE_ARM_SMCCC -EXPORT_SYMBOL (arm_smccc_smc); -EXPORT_SYMBOL (arm_smccc_hvc); +EXPORT_SYMBOL (__arm_smccc_smc); +EXPORT_SYMBOL (__arm_smccc_hvc);#endif
arch/arm/kernel/smccc-call.S +8 -6
@@ -46,17 +46,19 @@ UNWIND( .fnend) /* * void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_smc) +ENTRY(__arm_smccc_smc) SMCCC SMCCC_SMC -ENDPROC(arm_smccc_smc) +ENDPROC(__arm_smccc_smc) /* * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_hvc) +ENTRY(__arm_smccc_hvc) SMCCC SMCCC_HVC -ENDPROC(arm_smccc_hvc) +ENDPROC(__arm_smccc_hvc)
arch/arm/kvm/mmu.c +20 -3
@@ -292,11 +292,18 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size)phys_addr_t addr = start, end = start + size;phys_addr_t next; +assert_spin_locked (&kvm->mmu_lock); pgd = kvm->arch.pgd +stage2_pgd_index (addr);do { next =stage2_pgd_addr_end (addr, end);if (!stage2_pgd_none (*pgd))unmap_stage2_puds (kvm, pgd, addr, next); +/* +* If the range is too large, release the kvm->mmu_lock +* to prevent starvation and lockup detector warnings. +*/ +if (next != end) +cond_resched_lock (&kvm->mmu_lock); }while (pgd++, addr = next, addr != end); }
@@ -803,6 +810,7 @@ void stage2_unmap_vm(struct kvm *kvm)int idx; idx =srcu_read_lock (&kvm->srcu); +down_read (¤t->mm->mmap_sem);spin_lock (&kvm->mmu_lock); slots =kvm_memslots (kvm);
@@ -810,6 +818,7 @@ void stage2_unmap_vm(struct kvm *kvm)stage2_unmap_memslot (kvm, memslot);spin_unlock (&kvm->mmu_lock); +up_read (¤t->mm->mmap_sem);srcu_read_unlock (&kvm->srcu, idx); }
@@ -829,7 +838,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm)if (kvm->arch.pgd ==NULL )return ; +spin_lock (&kvm->mmu_lock);unmap_stage2_range (kvm,0 ,KVM_PHYS_SIZE ); +spin_unlock (&kvm->mmu_lock); +/* Free the HW pgd, one page at a time */ free_pages_exact (kvm->arch.pgd,S2_PGD_SIZE ); kvm->arch.pgd =NULL ;
@@ -1804,6 +1816,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, (KVM_PHYS_SIZE >> PAGE_SHIFT))return -EFAULT ; +down_read (¤t->mm->mmap_sem);/* * A memory region could potentially cover multiple VMAs, and any holes * between them, so iterate over all of them to find out if we can map
@@ -1847,8 +1860,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, pa += vm_start - vma->vm_start;/* IO region dirty page logging not allowed */ -if (memslot->flags &KVM_MEM_LOG_DIRTY_PAGES ) -return -EINVAL ; +if (memslot->flags &KVM_MEM_LOG_DIRTY_PAGES ) { + ret = -EINVAL ; + goto out; + } ret = kvm_phys_addr_ioremap(kvm, gpa, pa, vm_end - vm_start,
@@ -1860,7 +1875,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, }while (hva < reg_end);if (change ==KVM_MR_FLAGS_ONLY ) -return ret; + goto out;spin_lock (&kvm->mmu_lock);if (ret)
@@ -1868,6 +1883,8 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,else stage2_flush_memslot (kvm, memslot);spin_unlock (&kvm->mmu_lock); +out: +up_read (¤t->mm->mmap_sem);return ret; }
arch/arm64/kernel/arm64ksyms.c +2 -2
@@ -73,5 +73,5 @@ NOKPROBE_SYMBOL(_mcount);#endif /* arm-smccc */ -EXPORT_SYMBOL (arm_smccc_smc); -EXPORT_SYMBOL (arm_smccc_hvc); +EXPORT_SYMBOL (__arm_smccc_smc); +EXPORT_SYMBOL (__arm_smccc_hvc);
arch/arm64/kernel/asm-offsets.c +5 -2
@@ -143,8 +143,11 @@ int main(void)DEFINE (SLEEP_STACK_DATA_SYSTEM_REGS , offsetof(struct sleep_stack_data , system_regs));DEFINE (SLEEP_STACK_DATA_CALLEE_REGS , offsetof(struct sleep_stack_data , callee_saved_regs));#endif -DEFINE (ARM_SMCCC_RES_X0_OFFS , offsetof(struct arm_smccc_res , a0)); -DEFINE (ARM_SMCCC_RES_X2_OFFS , offsetof(struct arm_smccc_res , a2)); +DEFINE (ARM_SMCCC_RES_X0_OFFS , offsetof(struct arm_smccc_res , a0)); +DEFINE (ARM_SMCCC_RES_X2_OFFS , offsetof(struct arm_smccc_res , a2)); +DEFINE (ARM_SMCCC_QUIRK_ID_OFFS , offsetof(struct arm_smccc_quirk , id)); +DEFINE (ARM_SMCCC_QUIRK_STATE_OFFS , offsetof(struct arm_smccc_quirk , state)); +BLANK ();DEFINE (HIBERN_PBE_ORIG , offsetof(struct pbe , orig_address));DEFINE (HIBERN_PBE_ADDR , offsetof(struct pbe , address));
arch/arm64/kernel/smccc-call.S +16 -7
@@ -12,6 +12,7 @@ * */ #include <linux/linkage.h> +#include <linux/arm-smccc.h> #include <asm/asm-offsets.h> .macro SMCCC instr
@@ -20,24 +21,32 @@ ldr x4, [sp] stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS] stp x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS] - ret + ldr x4, [sp, #8] + cbz x4, 1f /* no quirk structure */ + ldr x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS] + cmp x9, #ARM_SMCCC_QUIRK_QCOM_A6 + b.ne 1f + str x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS] +1: ret .cfi_endproc .endm /* * void arm_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_smc) +ENTRY(__arm_smccc_smc) SMCCC smc -ENDPROC(arm_smccc_smc) +ENDPROC(__arm_smccc_smc) /* * void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_hvc) +ENTRY(__arm_smccc_hvc) SMCCC hvc -ENDPROC(arm_smccc_hvc) +ENDPROC(__arm_smccc_hvc)
arch/arm64/mm/fault.c +24 -18
86 lines not on this page · raw message
arch/metag/include/asm/uaccess.h +8 -7
@@ -197,20 +197,21 @@ extern long __must_check strnlen_user(const char __user *src, long count);#define strlen_user (str) strnlen_user(str, 32767) -extern unsigned long __must_check __copy_user_zeroing (void *to, -const void __user *from, -unsigned long n); +extern unsigned long raw_copy_from_user (void *to,const void __user *from, +unsigned long n);static inline unsigned long copy_from_user (void *to,const void __user *from,unsigned long n) { +unsigned long res = n;if (likely (access_ok (VERIFY_READ , from, n))) -return __copy_user_zeroing (to, from, n); -memset (to,0 , n); -return n; + res =raw_copy_from_user (to, from, n); +if (unlikely (res)) +memset (to + (n - res),0 , res); +return res; } -#define __copy_from_user (to, from, n) __copy_user_zeroing(to, from, n) +#define __copy_from_user (to, from, n) raw_copy_from_user(to, from, n)#define __copy_from_user_inatomic __copy_from_user extern unsigned long __must_check __copy_user(void __user *to,
arch/metag/lib/usercopy.c +120 -192
562 lines not on this page · raw message
arch/mips/Kconfig +1 -1
@@ -1526,7 +1526,7 @@ config CPU_MIPS64_R6 select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_MSA select GENERIC_CSUM - select MIPS_O32_FP64_SUPPORT if MIPS32_O32 + select MIPS_O32_FP64_SUPPORT if 32BIT || MIPS32_O32 select HAVE_KVM help Choose this option to build a kernel for release 6 or later of the
arch/mips/include/asm/spinlock.h +4 -4
@@ -127,7 +127,7 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)" andi %[ticket], %[ticket], 0xffff \n" " bne %[ticket], %[my_ticket], 4f \n" " subu %[ticket], %[my_ticket], %[ticket] \n" -"2: \n" +"2: .insn \n" " .subsection 2 \n" "4: andi %[ticket], %[ticket], 0xffff \n" " sll %[ticket], 5 \n"
@@ -202,7 +202,7 @@ static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock)" sc %[ticket], %[ticket_ptr] \n" " beqz %[ticket], 1b \n" " li %[ticket], 1 \n" -"2: \n" +"2: .insn \n" " .subsection 2 \n" "3: b 2b \n" " li %[ticket], 0 \n"
@@ -382,7 +382,7 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) " .set reorder \n" __WEAK_LLSC_MB " li %2, 1 \n" - "2: \n" + "2: .insn \n" : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp), "=&r" (ret) : GCC_OFF_SMALL_ASM() (rw->lock) : "memory");
@@ -422,7 +422,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) " lui %1, 0x8000 \n" " sc %1, %0 \n" " li %2, 1 \n" - "2: \n" + "2: .insn \n" : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp), "=&r" (ret) : GCC_OFF_SMALL_ASM() (rw->lock)
arch/mips/kernel/cpu-probe.c +1 -1
@@ -1824,7 +1824,7 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) }decode_configs (c); - c->options |=MIPS_CPU_TLBINV |MIPS_CPU_LDPTE ; + c->options |=MIPS_CPU_FTLB |MIPS_CPU_TLBINV |MIPS_CPU_LDPTE ; c->writecombine = _CACHE_UNCACHED_ACCELERATED;break ;default :
arch/mips/kernel/genex.S +2 -2
@@ -448,7 +448,7 @@ NESTED(nmi_handler, PT_SIZE, sp) BUILD_HANDLER reserved reserved sti verbose /* others */ .align 5 - LEAF(handle_ri_rdhwr_vivt) + LEAF(handle_ri_rdhwr_tlbp) .set push .set noat .set noreorder
@@ -467,7 +467,7 @@ NESTED(nmi_handler, PT_SIZE, sp) .set pop bltz k1, handle_ri /* slow path */ /* fall thru */ - END(handle_ri_rdhwr_vivt) + END(handle_ri_rdhwr_tlbp) LEAF(handle_ri_rdhwr) .set push
arch/mips/kernel/traps.c +13 -4
@@ -81,7 +81,7 @@ extern asmlinkage void handle_dbe(void); extern asmlinkage void handle_sys(void); extern asmlinkage void handle_bp(void); extern asmlinkage void handle_ri(void); -extern asmlinkage void handle_ri_rdhwr_vivt(void); +extern asmlinkage void handle_ri_rdhwr_tlbp(void); extern asmlinkage void handle_ri_rdhwr(void); extern asmlinkage void handle_cpu(void); extern asmlinkage void handle_ov(void);
@@ -2352,9 +2352,18 @@ void __init trap_init(void)set_except_vector (EXCCODE_SYS , handle_sys);set_except_vector (EXCCODE_BP , handle_bp); -set_except_vector (EXCCODE_RI , rdhwr_noopt ? handle_ri : - (cpu_has_vtag_icache ? - handle_ri_rdhwr_vivt : handle_ri_rdhwr)); + +if (rdhwr_noopt) +set_except_vector (EXCCODE_RI , handle_ri); +else { +if (cpu_has_vtag_icache) +set_except_vector (EXCCODE_RI , handle_ri_rdhwr_tlbp); +else if (current_cpu_type () ==CPU_LOONGSON3 ) +set_except_vector (EXCCODE_RI , handle_ri_rdhwr_tlbp); +else +set_except_vector (EXCCODE_RI , handle_ri_rdhwr); + } +set_except_vector (EXCCODE_CPU , handle_cpu);set_except_vector (EXCCODE_OV , handle_ov);set_except_vector (EXCCODE_TR , handle_tr);
arch/mips/lantiq/xway/sysctrl.c +1 -1
@@ -467,7 +467,7 @@ void __init ltq_soc_init(void)if (!np_xbar)panic ("Failed to load xbar nodes from devicetree" ); -if (of_address_to_resource (np_pmu,0 , &res_xbar)) +if (of_address_to_resource (np_xbar,0 , &res_xbar))panic ("Failed to get xbar resources" );if (request_mem_region (res_xbar.start,resource_size (&res_xbar), res_xbar.name) <0 )
arch/mips/mm/c-r4k.c +2 -0
@@ -1558,6 +1558,7 @@ static void probe_vcache(void) vcache_size = c->vcache.sets * c->vcache.ways * c->vcache.linesz; c->vcache.waybit =0 ; + c->vcache.waysize = vcache_size / c->vcache.ways;pr_info ("Unified victim cache %ldkB %s, linesize %d bytes.\n" , vcache_size >>10 , way_string[c->vcache.ways], c->vcache.linesz);
@@ -1660,6 +1661,7 @@ static void __init loongson3_sc_init(void)/* Loongson-3 has 4 cores, 1MB scache for each. scaches are shared */ scache_size *=4 ; c->scache.waybit =0 ; + c->scache.waysize = scache_size / c->scache.ways;pr_info ("Unified secondary cache %ldkB %s, linesize %d bytes.\n" , scache_size >>10 , way_string[c->scache.ways], c->scache.linesz);if (scache_size)
arch/mips/mm/tlbex.c +21 -4
@@ -762,7 +762,8 @@ static void build_huge_update_entries(u32 **p, unsigned int pte,static void build_huge_handler_tail (u32 **p,struct uasm_reloc **r,struct uasm_label **l,unsigned int pte, -unsigned int ptr) +unsigned int ptr, +unsigned int flush) {#ifdef CONFIG_SMP UASM_i_SC (p, pte,0 , ptr);
@@ -771,6 +772,22 @@ static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r,#else UASM_i_SW (p, pte,0 , ptr);#endif +if (cpu_has_ftlb && flush) { +BUG_ON (!cpu_has_tlbinv); + +UASM_i_MFC0 (p, ptr,C0_ENTRYHI ); +uasm_i_ori (p, ptr, ptr,MIPS_ENTRYHI_EHINV ); +UASM_i_MTC0 (p, ptr,C0_ENTRYHI ); +build_tlb_write_entry (p, l, r, tlb_indexed); + +uasm_i_xori (p, ptr, ptr,MIPS_ENTRYHI_EHINV ); +UASM_i_MTC0 (p, ptr,C0_ENTRYHI ); +build_huge_update_entries (p, pte, ptr); +build_huge_tlb_write_entry (p, l, r, pte, tlb_random,0 ); + +return ; + } +build_huge_update_entries (p, pte, ptr);build_huge_tlb_write_entry (p, l, r, pte, tlb_indexed,0 ); }
@@ -2197,7 +2214,7 @@ static void build_r4000_tlb_load_handler(void) uasm_l_tlbl_goaround2(&l, p); }uasm_i_ori (&p, wr.r1, wr.r1, (_PAGE_ACCESSED | _PAGE_VALID)); -build_huge_handler_tail (&p, &r, &l, wr.r1, wr.r2); +build_huge_handler_tail (&p, &r, &l, wr.r1, wr.r2,1 );#endif uasm_l_nopage_tlbl (&l, p);
@@ -2252,7 +2269,7 @@ static void build_r4000_tlb_store_handler(void)build_tlb_probe_entry (&p);uasm_i_ori (&p, wr.r1, wr.r1, _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); -build_huge_handler_tail (&p, &r, &l, wr.r1, wr.r2); +build_huge_handler_tail (&p, &r, &l, wr.r1, wr.r2,1 );#endif uasm_l_nopage_tlbs (&l, p);
@@ -2308,7 +2325,7 @@ static void build_r4000_tlb_modify_handler(void)build_tlb_probe_entry (&p);uasm_i_ori (&p, wr.r1, wr.r1, _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); -build_huge_handler_tail (&p, &r, &l, wr.r1, wr.r2); +build_huge_handler_tail (&p, &r, &l, wr.r1, wr.r2,0 );#endif uasm_l_nopage_tlbm (&l, p);
arch/mips/ralink/rt3883.c +2 -2
@@ -36,7 +36,7 @@ static struct rt2880_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) };static struct rt2880_pmx_func jtag_func[] = {FUNC ("jtag" ,0 ,17 ,5 ) };static struct rt2880_pmx_func mdio_func[] = {FUNC ("mdio" ,0 ,22 ,2 ) };static struct rt2880_pmx_func lna_a_func[] = {FUNC ("lna a" ,0 ,32 ,3 ) }; -static struct rt2880_pmx_func lna_g_func[] = {FUNC ("lna a" ,0 ,35 ,3 ) }; +static struct rt2880_pmx_func lna_g_func[] = {FUNC ("lna g" ,0 ,35 ,3 ) };static struct rt2880_pmx_func pci_func[] = {FUNC ("pci-dev" ,0 ,40 ,32 ),FUNC ("pci-host2" ,1 ,40 ,32 ),
@@ -44,7 +44,7 @@ static struct rt2880_pmx_func pci_func[] = {FUNC ("pci-fnc" ,3 ,40 ,32 ) };static struct rt2880_pmx_func ge1_func[] = {FUNC ("ge1" ,0 ,72 ,12 ) }; -static struct rt2880_pmx_func ge2_func[] = {FUNC ("ge1" ,0 ,84 ,12 ) }; +static struct rt2880_pmx_func ge2_func[] = {FUNC ("ge2" ,0 ,84 ,12 ) };static struct rt2880_pmx_group rt3883_pinmux_data[] = {GRP ("i2c" , i2c_func,1 ,RT3883_GPIO_MODE_I2C ),
arch/nios2/kernel/prom.c +7 -0
@@ -48,6 +48,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)return alloc_bootmem_align (size, align); } +int __init early_init_dt_reserve_memory_arch (phys_addr_t base,phys_addr_t size, +bool nomap) +{ +reserve_bootmem (base, size,BOOTMEM_DEFAULT ); +return 0 ; +} +void __init early_init_devtree (void *params) {__be32 *dtb = (u32 *)__dtb_start;
arch/nios2/kernel/setup.c +3 -0
@@ -200,6 +200,9 @@ void __init setup_arch(char **cmdline_p) }#endif /* CONFIG_BLK_DEV_INITRD */ +early_init_fdt_reserve_self (); +early_init_fdt_scan_reserved_mem (); +unflatten_and_copy_device_tree ();setup_cpuinfo ();
arch/powerpc/crypto/crc32c-vpmsum_glue.c +3 -0
@@ -33,10 +33,13 @@ static u32 crc32c_vpmsum(u32 crc, unsigned char const *p, size_t len) }if (len & ~VMX_ALIGN_MASK ) { +preempt_disable ();pagefault_disable ();enable_kernel_altivec (); crc =__crc32c_vpmsum (crc, p, len & ~VMX_ALIGN_MASK ); +disable_kernel_altivec ();pagefault_enable (); +preempt_enable (); } tail = len &VMX_ALIGN_MASK ;
arch/powerpc/kernel/align.c +19 -8
@@ -807,14 +807,25 @@ int fix_alignment(struct pt_regs *regs) nb = aligninfo[instr].len; flags = aligninfo[instr].flags; -/* ldbrx/stdbrx overlap lfs/stfs in the DSISR unfortunately */ -if (IS_XFORM (instruction) && ((instruction >>1 ) &0x3ff ) ==532 ) { - nb =8 ; - flags =LD +SW ; - }else if (IS_XFORM (instruction) && - ((instruction >>1 ) &0x3ff ) ==660 ) { - nb =8 ; - flags =ST +SW ; +/* +* Handle some cases which give overlaps in the DSISR values. +*/ +if (IS_XFORM (instruction)) { +switch (get_xop (instruction)) { +case 532 :/* ldbrx */ + nb =8 ; + flags =LD +SW ; +break ; +case 660 :/* stdbrx */ + nb =8 ; + flags =ST +SW ; +break ; +case 20 :/* lwarx */ +case 84 :/* ldarx */ +case 116 :/* lharx */ +case 276 :/* lqarx */ +return 0 ;/* not emulated ever */ + } }/* Byteswap little endian loads and stores */
arch/powerpc/kernel/misc_64.S +2 -2
@@ -67,7 +67,7 @@ PPC64_CACHES: * flush all bytes from start through stop-1 inclusive */ -_GLOBAL(flush_icache_range) +_GLOBAL_TOC(flush_icache_range) BEGIN_FTR_SECTION PURGE_PREFETCHED_INS blr
@@ -120,7 +120,7 @@ EXPORT_SYMBOL(flush_icache_range) * * flush all bytes from start to stop-1 inclusive */ -_GLOBAL(flush_dcache_range) +_GLOBAL_TOC(flush_dcache_range) /* * Flush the data cache to memory
arch/powerpc/kernel/setup_64.c +9 -0
@@ -245,6 +245,15 @@ static void cpu_ready_for_interrupts(void)mtspr (SPRN_LPCR , lpcr |LPCR_AIL_3 ); } +/* +* Fixup HFSCR:TM based on CPU features. The bit is set by our +* early asm init because at that point we haven't updated our +* CPU features from firmware and device-tree. Here we have, +* so let's do it. +*/ +if (cpu_has_feature (CPU_FTR_HVMODE ) && !cpu_has_feature (CPU_FTR_TM_COMP )) +mtspr (SPRN_HFSCR ,mfspr (SPRN_HFSCR ) & ~HFSCR_TM ); +/* Set IR and DR in PACA MSR */ get_paca ()->kernel_msr =MSR_KERNEL ; }
arch/powerpc/mm/hash_native_64.c +5 -2
@@ -638,6 +638,10 @@ static void native_flush_hash_range(unsigned long number, int local)unsigned long psize = batch->psize;int ssize = batch->ssize;int i; +unsigned int use_local; + + use_local = local &&mmu_has_feature (MMU_FTR_TLBIEL ) && + mmu_psize_defs[psize].tlbiel && !cxl_ctx_in_use ();local_irq_save (flags);
@@ -667,8 +671,7 @@ static void native_flush_hash_range(unsigned long number, int local) }pte_iterate_hashed_end (); } -if (mmu_has_feature (MMU_FTR_TLBIEL ) && - mmu_psize_defs[psize].tlbiel && local) { +if (use_local) { asmvolatile ("ptesync" :::"memory" );for (i =0 ; i < number; i++) { vpn = batch->vpn[i];
arch/s390/boot/compressed/misc.c +19 -16
@@ -141,31 +141,34 @@ static void check_ipl_parmblock(void *start, unsigned long size)unsigned long decompress_kernel (void ) { -unsigned long output_addr; -unsigned char *output; +void *output, *kernel_end; - output_addr = ((unsigned long ) &_end +HEAP_SIZE +4095UL ) &-4096UL ; -check_ipl_parmblock ((void *)0 , output_addr + SZ__bss_start); -memset (&_bss,0 , &_ebss - &_bss); - free_mem_ptr = (unsigned long )&_end; - free_mem_end_ptr = free_mem_ptr +HEAP_SIZE ; - output = (unsigned char *) output_addr; + output = (void *)ALIGN ((unsigned long ) &_end +HEAP_SIZE ,PAGE_SIZE ); + kernel_end = output + SZ__bss_start; +check_ipl_parmblock ((void *)0 , (unsigned long ) kernel_end);#ifdef CONFIG_BLK_DEV_INITRD /* * Move the initrd right behind the end of the decompressed -* kernel image. +* kernel image. This also prevents initrd corruption caused by +* bss clearing since kernel_end will always be located behind the +* current bss section.. */ -if (INITRD_START &&INITRD_SIZE && -INITRD_START < (unsigned long ) output + SZ__bss_start) { -check_ipl_parmblock (output + SZ__bss_start, -INITRD_START +INITRD_SIZE ); -memmove (output + SZ__bss_start, - (void *)INITRD_START ,INITRD_SIZE ); -INITRD_START = (unsigned long ) output + SZ__bss_start; +if (INITRD_START &&INITRD_SIZE && kernel_end > (void *)INITRD_START ) { +check_ipl_parmblock (kernel_end,INITRD_SIZE ); +memmove (kernel_end, (void *)INITRD_START ,INITRD_SIZE ); +INITRD_START = (unsigned long ) kernel_end; }#endif +/* +* Clear bss section. free_mem_ptr and free_mem_end_ptr need to be +* initialized afterwards since they reside in bss. +*/ +memset (&_bss,0 , &_ebss - &_bss); + free_mem_ptr = (unsigned long ) &_end; + free_mem_end_ptr = free_mem_ptr +HEAP_SIZE ; +puts ("Uncompressing Linux... " );__decompress (input_data, input_len,NULL ,NULL , output,0 ,NULL , error);puts ("Ok, booting the kernel.\n" );
arch/s390/include/asm/uaccess.h +1 -1
@@ -144,7 +144,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from," jg 2b\n" \".popsection\n" \ EX_TABLE(0b,3b) EX_TABLE(1b,3b) \ - : "=d" (__rc), "=Q" (*(to)) \ + : "=d" (__rc), "+Q" (*(to)) \: " d" (size), " Q " (*(from)), \ " d" (__reg0), " K " (-EFAULT) \ : " cc"); \
arch/x86/kernel/cpu/mcheck/mce.c +6 -1
@@ -54,6 +54,8 @@static DEFINE_MUTEX (mce_chrdev_read_mutex); +static int mce_chrdev_open_count;/* #times opened */ +#define mce_log_get_idx_check (p) \ ({ \ RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
@@ -601,6 +603,10 @@ static int mce_default_notifier(struct notifier_block *nb, unsigned long val,if (atomic_read (&num_notifiers) >2 )return NOTIFY_DONE ; +/* Don't print when mcelog is running */ +if (mce_chrdev_open_count >0 ) +return NOTIFY_DONE ; +__print_mce (m);return NOTIFY_DONE ;
@@ -1871,7 +1877,6 @@ void mcheck_cpu_clear(struct cpuinfo_x86 *c)*/ static DEFINE_SPINLOCK (mce_chrdev_state_lock); -static int mce_chrdev_open_count;/* #times opened */ static int mce_chrdev_open_exclu;/* already open exclusive? */ static int mce_chrdev_open (struct inode *inode,struct file *file)
arch/x86/kernel/reboot.c +16 -0
@@ -223,6 +223,22 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "P4S800"), }, }, + { /* Handle problems with rebooting on ASUS EeeBook X205TA */ + .callback = set_acpi_reboot, + .ident = "ASUS EeeBook X205TA", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "X205TA"), + }, + }, + { /* Handle problems with rebooting on ASUS EeeBook X205TAW */ + .callback = set_acpi_reboot, + .ident = "ASUS EeeBook X205TAW", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "X205TAW"), + }, + }, /* Certec */ { /* Handle problems with rebooting on Certec BPC600 */
arch/x86/kvm/vmx.c +7 -2
@@ -7086,13 +7086,18 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, } page =nested_get_page (vcpu, vmptr); -if (page ==NULL || - *(u32 *)kmap (page) !=VMCS12_REVISION ) { +if (page ==NULL ) {nested_vmx_failInvalid (vcpu); +return kvm_skip_emulated_instruction (vcpu); + } +if (*(u32 *)kmap (page) !=VMCS12_REVISION ) {kunmap (page); +nested_release_page_clean (page); +nested_vmx_failInvalid (vcpu);return kvm_skip_emulated_instruction (vcpu); }kunmap (page); +nested_release_page_clean (page); vmx->nested.vmxon_ptr = vmptr;break ;case EXIT_REASON_VMCLEAR :
arch/xtensa/include/asm/page.h +13 -0
@@ -164,8 +164,21 @@ void copy_user_highpage(struct page *to, struct page *from,#define ARCH_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT) +#ifdef CONFIG_MMU +static inline unsigned long ___pa (unsigned long va) +{ +unsigned long off = va -PAGE_OFFSET ; + +if (off >=XCHAL_KSEG_SIZE ) + off -=XCHAL_KSEG_SIZE ; + +return off +PHYS_OFFSET ; +} +#define __pa (x) ___pa((unsigned long)(x)) +#else #define __pa (x) \ ((unsigned long) (x) - PAGE_OFFSET + PHYS_OFFSET) +#endif #define __va (x) \ ((void *)((unsigned long) (x) - PHYS_OFFSET + PAGE_OFFSET))#define pfn_valid (pfn) \
drivers/acpi/button.c +1 -1
@@ -113,7 +113,7 @@ struct acpi_button {static BLOCKING_NOTIFIER_HEAD (acpi_lid_notifier);static struct acpi_device *lid_device; -static u8 lid_init_state =ACPI_BUTTON_LID_INIT_METHOD ; +static u8 lid_init_state =ACPI_BUTTON_LID_INIT_OPEN ;static unsigned long lid_report_interval__read_mostly =500 ;module_param (lid_report_interval, ulong,0644 );
drivers/acpi/glue.c +6 -6
@@ -99,13 +99,13 @@ static int find_child_checks(struct acpi_device *adev, bool check_children)return -ENODEV ;/* -* If the device has a _HID (or _CID) returning a valid ACPI/PNP -* device ID, it is better to make it look less attractive here, so that -* the other device with the same _ADR value (that may not have a valid -* device ID) can be matched going forward. [This means a second spec -* violation in a row, so whatever we do here is best effort anyway.] +* If the device has a _HID returning a valid ACPI/PNP device ID, it is +* better to make it look less attractive here, so that the other device +* with the same _ADR value (that may not have a valid device ID) can be +* matched going forward. [This means a second spec violation in a row, +* so whatever we do here is best effort anyway.] */ -return sta_present &&list_empty (&adev->pnp.ids) ? +return sta_present && !adev->pnp.type.platform_id ?FIND_CHILD_MAX_SCORE :FIND_CHILD_MIN_SCORE ; }
drivers/acpi/sleep.c +19 -0
@@ -130,6 +130,12 @@ void __init acpi_nvs_nosave_s3(void) nvs_nosave_s3 = true; } +static int __init init_nvs_save_s3 (const struct dmi_system_id *d) +{ + nvs_nosave_s3 = false; +return 0 ; +} +/* * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the * user to request that behavior by using the 'acpi_old_suspend_ordering'
@@ -324,6 +330,19 @@ static struct dmi_system_id acpisleep_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), }, }, +/* +* https://bugzilla.kernel.org/show_bug.cgi?id=189431 +* Lenovo G50-45 is a platform later than 2012, but needs nvs memory +* saving during S3. +*/ + { + .callback = init_nvs_save_s3, + .ident = "Lenovo G50-45", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "80E3"), + }, + }, {}, };
drivers/ata/ahci_da850.c +32 -1
@@ -54,11 +54,42 @@ static void da850_sata_init(struct device *dev, void __iomem *pwrdn_reg,writel (val, ahci_base +SATA_P0PHYCR_REG ); } +static int ahci_da850_softreset (struct ata_link *link, +unsigned int *class,unsigned long deadline) +{ +int pmp, ret; + + pmp =sata_srst_pmp (link); + +/* +* There's an issue with the SATA controller on da850 SoCs: if we +* enable Port Multiplier support, but the drive is connected directly +* to the board, it can't be detected. As a workaround: if PMP is +* enabled, we first call ahci_do_softreset() and pass it the result of +* sata_srst_pmp(). If this call fails, we retry with pmp = 0. +*/ + ret =ahci_do_softreset (link, class, pmp, deadline, ahci_check_ready); +if (pmp && ret == -EBUSY ) +return ahci_do_softreset (link, class,0 , + deadline, ahci_check_ready); + +return ret; +} + +static struct ata_port_operations ahci_da850_port_ops = { + .inherits = &ahci_platform_ops, + .softreset = ahci_da850_softreset, +/* +* No need to override .pmp_softreset - it's only used for actual +* PMP-enabled ports. +*/ +}; +static const struct ata_port_info ahci_da850_port_info = { .flags =AHCI_FLAG_COMMON , .pio_mask =ATA_PIO4 , .udma_mask =ATA_UDMA6 , - .port_ops = &ahci_platform_ops, + .port_ops = &ahci_da850_port_ops, };static struct scsi_host_template ahci_platform_sht = {
drivers/char/random.c +43 -41
106 lines not on this page · raw message
drivers/firmware/qcom_scm-64.c +10 -3
@@ -91,6 +91,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,dma_addr_t args_phys =0 ;void *args_virt =NULL ;size_t alloc_len; +struct arm_smccc_quirk quirk = {.id =ARM_SMCCC_QUIRK_QCOM_A6 };if (unlikely (arglen >N_REGISTER_ARGS )) { alloc_len =N_EXT_QCOM_SCM_ARGS *sizeof (u64);
@@ -131,10 +132,16 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id, qcom_smccc_convention, ARM_SMCCC_OWNER_SIP, fn_id); + quirk.state.a6 =0 ; +do { -arm_smccc_smc (cmd, desc->arginfo, desc->args[0 ], - desc->args[1 ], desc->args[2 ], x5,0 ,0 , - res); +arm_smccc_smc_quirk (cmd, desc->arginfo, desc->args[0 ], + desc->args[1 ], desc->args[2 ], x5, + quirk.state.a6,0 , res, &quirk); + +if (res->a0 ==QCOM_SCM_INTERRUPTED ) + cmd = res->a0; + }while (res->a0 ==QCOM_SCM_INTERRUPTED );mutex_unlock (&qcom_scm_lock);
drivers/gpio/gpiolib-acpi.c +3 -1
@@ -572,8 +572,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, } desc =acpi_get_gpiod_by_index (adev, propname, idx, &info); -if (!IS_ERR (desc) || (PTR_ERR (desc) == -EPROBE_DEFER )) +if (!IS_ERR (desc))break ; +if (PTR_ERR (desc) == -EPROBE_DEFER ) +return ERR_CAST (desc); }/* Then from plain _CRS GPIOs */
drivers/gpu/drm/drm_edid.c +3 -3
@@ -90,7 +90,7 @@ struct detailed_mode_closure {#define LEVEL_GTF2 2#define LEVEL_CVT 3 -static struct edid_quirk { +static const struct edid_quirk { char vendor[4]; int product_id; u32 quirks;
@@ -1480,7 +1480,7 @@ EXPORT_SYMBOL(drm_edid_duplicate);* * Returns true if @vendor is in @edid, false otherwise */ -static bool edid_vendor (struct edid *edid,char *vendor) +static bool edid_vendor (struct edid *edid,const char *vendor) {char edid_vendor[3 ];
@@ -1500,7 +1500,7 @@ static bool edid_vendor(struct edid *edid, char *vendor)*/ static u32 edid_get_quirks (struct edid *edid) { -struct edid_quirk *quirk; +const struct edid_quirk *quirk;int i;for (i =0 ; i <ARRAY_SIZE (edid_quirk_list); i++) {
drivers/gpu/drm/i915/gvt/kvmgt.c +3 -1
@@ -1422,7 +1422,7 @@ static int kvmgt_rw_gpa(unsigned long handle, unsigned long gpa, {struct kvmgt_guest_info *info;struct kvm *kvm; -int ret; +int idx, ret;bool kthread = current->mm ==NULL ;if (!handle_valid (handle))
@@ -1434,8 +1434,10 @@ static int kvmgt_rw_gpa(unsigned long handle, unsigned long gpa,if (kthread)use_mm (kvm->mm); + idx =srcu_read_lock (&kvm->srcu); ret = write ?kvm_write_guest (kvm, gpa, buf, len) :kvm_read_guest (kvm, gpa, buf, len); +srcu_read_unlock (&kvm->srcu, idx);if (kthread)unuse_mm (kvm->mm);
drivers/gpu/drm/i915/gvt/sched_policy.c +2 -2
@@ -101,7 +101,7 @@ struct tbs_sched_data {struct list_head runq_head; }; -#define GVT_DEFAULT_TIME_SLICE (1 * HZ / 1000) +#define GVT_DEFAULT_TIME_SLICE (msecs_to_jiffies(1))static void tbs_sched_func (struct work_struct *work) {
@@ -224,7 +224,7 @@ static void tbs_sched_start_schedule(struct intel_vgpu *vgpu)return ;list_add_tail (&vgpu_data->list, &sched_data->runq_head); -schedule_delayed_work (&sched_data->work, sched_data->period); +schedule_delayed_work (&sched_data->work,0 ); }static void tbs_sched_stop_schedule (struct intel_vgpu *vgpu)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -421,6 +421,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_VLV_IDS (&intel_valleyview_info),INTEL_BDW_GT12_IDS (&intel_broadwell_info),INTEL_BDW_GT3_IDS (&intel_broadwell_gt3_info), +INTEL_BDW_RSVD_IDS (&intel_broadwell_info),INTEL_CHV_IDS (&intel_cherryview_info),INTEL_SKL_GT1_IDS (&intel_skylake_info), INTEL_SKL_GT2_IDS(&intel_skylake_info),
drivers/gpu/drm/mga/mga_dma.c +19 -1
@@ -392,6 +392,24 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags)drm_mga_private_t *dev_priv;int ret; +/* There are PCI versions of the G450. These cards have the +* same PCI ID as the AGP G450, but have an additional PCI-to-PCI +* bridge chip. We detect these cards, which are not currently +* supported by this driver, by looking at the device ID of the +* bus the "card" is on. If vendor is 0x3388 (Hint Corp) and the +* device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the +* device. +*/ +if ((dev->pdev->device ==0x0525 ) && dev->pdev->bus->self + && (dev->pdev->bus->self->vendor ==0x3388 ) + && (dev->pdev->bus->self->device ==0x0021 ) + && dev->agp) { +/* FIXME: This should be quirked in the pci core, but oh well +* the hw probably stopped existing. */ +arch_phys_wc_del (dev->agp->agp_mtrr); +kfree (dev->agp); + dev->agp =NULL ; + } dev_priv =kzalloc (sizeof (drm_mga_private_t),GFP_KERNEL );if (!dev_priv)return -ENOMEM ;
@@ -698,7 +716,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device *dev,static int mga_do_dma_bootstrap (struct drm_device *dev,drm_mga_dma_bootstrap_t *dma_bs) { -const int is_agp = (dma_bs->agp_mode !=0 ) &&drm_pci_device_is_agp (dev); +const int is_agp = (dma_bs->agp_mode !=0 ) && dev->agp;int err;drm_mga_private_t *const dev_priv = (drm_mga_private_t *) dev->dev_private;
drivers/gpu/drm/mga/mga_drv.c +0 -37
@@ -37,8 +37,6 @@#include <drm/drm_pciids.h> -static int mga_driver_device_is_agp (struct drm_device *dev); -static struct pci_device_id pciidlist[] = { mga_PCI_IDS };
@@ -66,7 +64,6 @@ static struct drm_driver driver = { .lastclose = mga_driver_lastclose, .set_busid = drm_pci_set_busid, .dma_quiescent = mga_driver_dma_quiescent, - .device_is_agp = mga_driver_device_is_agp, .get_vblank_counter = mga_get_vblank_counter, .enable_vblank = mga_enable_vblank, .disable_vblank = mga_disable_vblank,
@@ -107,37 +104,3 @@ module_exit(mga_exit);MODULE_AUTHOR (DRIVER_AUTHOR );MODULE_DESCRIPTION (DRIVER_DESC );MODULE_LICENSE ("GPL and additional rights" ); - -/** -* Determine if the device really is AGP or not. -* -* In addition to the usual tests performed by \c drm_device_is_agp, this -* function detects PCI G450 cards that appear to the system exactly like -* AGP G450 cards. -* -* \param dev The device to be tested. -* -* \returns -* If the device is a PCI G450, zero is returned. Otherwise 2 is returned. -*/ -static int mga_driver_device_is_agp (struct drm_device *dev) -{ -const struct pci_dev *const pdev = dev->pdev; - -/* There are PCI versions of the G450. These cards have the -* same PCI ID as the AGP G450, but have an additional PCI-to-PCI -* bridge chip. We detect these cards, which are not currently -* supported by this driver, by looking at the device ID of the -* bus the "card" is on. If vendor is 0x3388 (Hint Corp) and the -* device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the -* device. -*/ - -if ((pdev->device ==0x0525 ) && pdev->bus->self - && (pdev->bus->self->vendor ==0x3388 ) - && (pdev->bus->self->device ==0x0021 )) { -return 0 ; - } - -return 2 ; -}
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +2 -0
@@ -846,7 +846,9 @@ static const struct adreno_gpu_funcs funcs = { .idle = a5xx_idle, .irq = a5xx_irq, .destroy = a5xx_destroy, +#ifdef CONFIG_DEBUG_FS .show = a5xx_show, +#endif }, .get_timestamp = a5xx_get_timestamp, };
drivers/gpu/drm/ttm/ttm_object.c +7 -3
@@ -179,7 +179,7 @@ int ttm_base_object_init(struct ttm_object_file *tfile,if (unlikely (ret !=0 )) goto out_err0; - ret =ttm_ref_object_add (tfile, base,TTM_REF_USAGE ,NULL ); + ret =ttm_ref_object_add (tfile, base,TTM_REF_USAGE ,NULL , false);if (unlikely (ret !=0 )) goto out_err1;
@@ -318,7 +318,8 @@ EXPORT_SYMBOL(ttm_ref_object_exists);int ttm_ref_object_add (struct ttm_object_file *tfile,struct ttm_base_object *base, -enum ttm_ref_type ref_type,bool *existed) +enum ttm_ref_type ref_type,bool *existed, +bool require_existed) {struct drm_open_hash *ht = &tfile->ref_hash[ref_type];struct ttm_ref_object *ref;
@@ -345,6 +346,9 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, }rcu_read_unlock (); +if (require_existed) +return -EPERM ; + ret =ttm_mem_global_alloc (mem_glob,sizeof (*ref), false, false);if (unlikely (ret !=0 ))
@@ -635,7 +639,7 @@ int ttm_prime_fd_to_handle(struct ttm_object_file *tfile, prime = (struct ttm_prime_object *) dma_buf->priv; base = &prime->base; *handle = base->hash.key; - ret =ttm_ref_object_add (tfile, base,TTM_REF_USAGE ,NULL ); + ret =ttm_ref_object_add (tfile, base,TTM_REF_USAGE ,NULL , false);dma_buf_put (dma_buf);
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +50 -29
127 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +1 -3
@@ -114,8 +114,6 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, param->value = dev_priv->has_dx;break ;default : -DRM_ERROR ("Illegal vmwgfx get param request: %d\n" , - param->param);return -EINVAL ; }
@@ -186,7 +184,7 @@ int vmw_get_cap_3d_ioctl(struct drm_device *dev, void *data,bool gb_objects = !!(dev_priv->capabilities &SVGA_CAP_GBOBJECTS );struct vmw_fpriv *vmw_fp =vmw_fpriv (file_priv); -if (unlikely (arg->pad64 !=0 )) { +if (unlikely (arg->pad64 !=0 || arg->max_size ==0 )) {DRM_ERROR ("Illegal GET_3D_CAP argument.\n" );return -EINVAL ; }
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +2 -2
@@ -589,7 +589,7 @@ static int vmw_user_dmabuf_synccpu_grab(struct vmw_user_dma_buffer *user_bo,return ret; ret =ttm_ref_object_add (tfile, &user_bo->prime.base, -TTM_REF_SYNCCPU_WRITE , &existed); +TTM_REF_SYNCCPU_WRITE , &existed, false);if (ret !=0 || existed)ttm_bo_synccpu_write_release (&user_bo->dma.base);
@@ -773,7 +773,7 @@ int vmw_user_dmabuf_reference(struct ttm_object_file *tfile, *handle = user_bo->prime.base.hash.key;return ttm_ref_object_add (tfile, &user_bo->prime.base, -TTM_REF_USAGE ,NULL ); +TTM_REF_USAGE ,NULL , false); }/*
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +15 -16
@@ -713,11 +713,14 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,128 ; num_sizes =0 ; -for (i =0 ; i <DRM_VMW_MAX_SURFACE_FACES ; ++i) +for (i =0 ; i <DRM_VMW_MAX_SURFACE_FACES ; ++i) { +if (req->mip_levels[i] >DRM_VMW_MAX_MIP_LEVELS ) +return -EINVAL ; num_sizes += req->mip_levels[i]; + } -if (num_sizes >DRM_VMW_MAX_SURFACE_FACES * -DRM_VMW_MAX_MIP_LEVELS ) +if (num_sizes >DRM_VMW_MAX_SURFACE_FACES *DRM_VMW_MAX_MIP_LEVELS || + num_sizes ==0 )return -EINVAL ; size = vmw_user_surface_size + 128 +
@@ -891,17 +894,16 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv,uint32_t handle;struct ttm_base_object *base;int ret; +bool require_exist = false;if (handle_type ==DRM_VMW_HANDLE_PRIME ) { ret =ttm_prime_fd_to_handle (tfile, u_handle, &handle);if (unlikely (ret !=0 ))return ret; }else { -if (unlikely (drm_is_render_client (file_priv))) { -DRM_ERROR ("Render client refused legacy " -"surface reference.\n" ); -return -EACCES ; - } +if (unlikely (drm_is_render_client (file_priv))) + require_exist = true; +if (ACCESS_ONCE (vmw_fpriv (file_priv)->locked_master)) {DRM_ERROR ("Locked master refused legacy " "surface reference.\n" );
@@ -929,17 +931,14 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv,/* * Make sure the surface creator has the same -* authenticating master. +* authenticating master, or is already registered with us. */ if (drm_is_primary_client (file_priv) && - user_srf->master != file_priv->master) { -DRM_ERROR ("Trying to reference surface outside of" -" master domain.\n" ); - ret = -EACCES ; - goto out_bad_resource; - } + user_srf->master != file_priv->master) + require_exist = true; - ret =ttm_ref_object_add (tfile, base,TTM_REF_USAGE ,NULL ); + ret =ttm_ref_object_add (tfile, base,TTM_REF_USAGE ,NULL , + require_exist);if (unlikely (ret !=0 )) {DRM_ERROR ("Could not add a reference to a surface.\n" ); goto out_bad_resource;
drivers/hid/wacom_wac.c +3 -0
@@ -3290,6 +3290,9 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, {struct wacom_features *features = &wacom_wac->features; +if ((features->type ==HID_GENERIC ) && features->numbered_buttons >0 ) + features->device_type |=WACOM_DEVICETYPE_PAD ; +if (!(features->device_type &WACOM_DEVICETYPE_PAD ))return -ENODEV ;
drivers/iio/gyro/bmg160_core.c +12 -0
@@ -27,6 +27,7 @@#include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> #include <linux/regmap.h> +#include <linux/delay.h> #include "bmg160.h" #define BMG160_IRQ_NAME "bmg160_event"
@@ -52,6 +53,9 @@#define BMG160_DEF_BW 100#define BMG160_REG_PMU_BW_RES BIT(7) +#define BMG160_GYRO_REG_RESET 0x14 +#define BMG160_GYRO_RESET_VAL 0xb6 +#define BMG160_REG_INT_MAP_0 0x17#define BMG160_INT_MAP_0_BIT_ANY BIT(1)
@@ -236,6 +240,14 @@ static int bmg160_chip_init(struct bmg160_data *data)int ret;unsigned int val; +/* +* Reset chip to get it in a known good state. A delay of 30ms after +* reset is required according to the datasheet. +*/ +regmap_write (data->regmap,BMG160_GYRO_REG_RESET , +BMG160_GYRO_RESET_VAL ); +usleep_range (30000 ,30700 ); + ret =regmap_read (data->regmap,BMG160_REG_CHIP_ID , &val);if (ret <0 ) {dev_err (dev,"Error reading reg_chip_id\n" );
drivers/iio/industrialio-core.c +3 -4
@@ -608,10 +608,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type, tmp0 = (int )div_s64_rem (tmp,1000000000 , &tmp1);return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_FRACTIONAL_LOG2 : - tmp = (s64 )vals[0 ] *1000000000LL >> vals[1 ]; - tmp1 =do_div (tmp,1000000000LL ); - tmp0 = tmp; -return snprintf (buf, len,"%d.%09u" , tmp0, tmp1); + tmp =shift_right ((s64 )vals[0 ] *1000000000LL , vals[1 ]); + tmp0 = (int )div_s64_rem (tmp,1000000000LL , &tmp1); +return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_INT_MULTIPLE : {int i;
drivers/iio/pressure/st_pressure_core.c +1 -0
@@ -455,6 +455,7 @@ static const struct st_sensor_settings st_press_sensors_settings[] = { .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, .multi_read_bit = true, + .bootime = 2, }, };
drivers/md/dm-raid.c +1 -1
@@ -3594,7 +3594,7 @@ static int raid_preresume(struct dm_target *ti)return r;/* Resize bitmap to adjust to changed region size (aka MD bitmap chunksize) */ -if (test_bit (RT_FLAG_RS_BITMAP_LOADED , &rs->runtime_flags) && +if (test_bit (RT_FLAG_RS_BITMAP_LOADED , &rs->runtime_flags) && mddev->bitmap && mddev->bitmap_info.chunksize !=to_bytes (rs->requested_bitmap_chunk_sectors)) { r =bitmap_resize (mddev->bitmap, mddev->dev_sectors,to_bytes (rs->requested_bitmap_chunk_sectors),0 );
drivers/md/dm-verity-fec.c +14 -4
@@ -146,8 +146,6 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, block =fec_buffer_rs_block (v, fio, n, i); res =fec_decode_rs8 (v, fio, block, &par[offset], neras);if (res <0 ) { -dm_bufio_release (buf); - r = res; goto error; }
@@ -172,6 +170,8 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, done: r = corrected; error: +dm_bufio_release (buf); +if (r <0 && neras)DMERR_LIMIT ("%s: FEC %llu: failed to correct: %d" , v->data_dev->name, (unsigned long long )rsb, r);
@@ -269,7 +269,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, &is_zero) == 0) {/* skip known zero blocks entirely */ if (is_zero) -continue ; + goto done;/* * skip if we have already found the theoretical
@@ -439,6 +439,13 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io,if (!verity_fec_is_enabled (v))return -EOPNOTSUPP ; +if (fio->level >=DM_VERITY_FEC_MAX_RECURSION ) { +DMWARN_LIMIT ("%s: FEC: recursion too deep" , v->data_dev->name); +return -EIO ; + } + + fio->level++; +if (type ==DM_VERITY_BLOCK_TYPE_METADATA ) block += v->data_blocks;
@@ -470,7 +477,7 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io,if (r <0 ) { r =fec_decode_rsb (v, io, fio, rsb, offset, true);if (r <0 ) -return r; + goto done; }if (dest)
@@ -480,6 +487,8 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io, r =verity_for_bv_block (v, io, iter, fec_bv_copy); } +done: + fio->level--;return r; }
@@ -520,6 +529,7 @@ void verity_fec_init_io(struct dm_verity_io *io)memset (fio->bufs,0 ,sizeof (fio->bufs)); fio->nbufs =0 ; fio->output =NULL ; + fio->level =0 ; }/*
drivers/md/dm-verity-fec.h +4 -0
@@ -27,6 +27,9 @@#define DM_VERITY_FEC_BUF_MAX \ (1 << (PAGE_SHIFT - DM_VERITY_FEC_BUF_RS_BITS)) +/* maximum recursion level for verity_fec_decode */ +#define DM_VERITY_FEC_MAX_RECURSION 4 +#define DM_VERITY_OPT_FEC_DEV "use_fec_from_device"#define DM_VERITY_OPT_FEC_BLOCKS "fec_blocks"#define DM_VERITY_OPT_FEC_START "fec_start"
@@ -58,6 +61,7 @@ struct dm_verity_fec_io {unsigned nbufs;/* number of buffers allocated */ u8 *output;/* buffer for corrected output */ size_t output_pos; +unsigned level;/* recursion level */ };#ifdef CONFIG_DM_VERITY_FEC
drivers/mmc/host/sdhci-of-esdhc.c +10 -8
@@ -569,16 +569,19 @@ static const struct sdhci_ops sdhci_esdhc_le_ops = { };static const struct sdhci_pltfm_data sdhci_esdhc_be_pdata = { - .quirks =ESDHC_DEFAULT_QUIRKS |SDHCI_QUIRK_BROKEN_CARD_DETECTION - |SDHCI_QUIRK_NO_CARD_NO_RESET - |SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , + .quirks =ESDHC_DEFAULT_QUIRKS | +#ifdef CONFIG_PPC +SDHCI_QUIRK_BROKEN_CARD_DETECTION | +#endif +SDHCI_QUIRK_NO_CARD_NO_RESET | +SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .ops = &sdhci_esdhc_be_ops, };static const struct sdhci_pltfm_data sdhci_esdhc_le_pdata = { - .quirks =ESDHC_DEFAULT_QUIRKS |SDHCI_QUIRK_BROKEN_CARD_DETECTION - |SDHCI_QUIRK_NO_CARD_NO_RESET - |SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , + .quirks =ESDHC_DEFAULT_QUIRKS | +SDHCI_QUIRK_NO_CARD_NO_RESET | +SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .ops = &sdhci_esdhc_le_ops, };
@@ -643,8 +646,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)of_device_is_compatible (np,"fsl,p5020-esdhc" ) ||of_device_is_compatible (np,"fsl,p4080-esdhc" ) ||of_device_is_compatible (np,"fsl,p1020-esdhc" ) || -of_device_is_compatible (np,"fsl,t1040-esdhc" ) || - of_device_is_compatible(np, "fsl,ls1021a-esdhc")) + of_device_is_compatible(np, "fsl,t1040-esdhc")) host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;if (of_device_is_compatible (np,"fsl,ls1021a-esdhc" ))
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +5 -3
@@ -2238,14 +2238,16 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)struct brcmf_cfg80211_info *cfg =wiphy_priv (wiphy);struct brcmf_p2p_info *p2p = &cfg->p2p;struct brcmf_cfg80211_vif *vif; +enum nl80211_iftype iftype;bool wait_for_disable = false;int err;brcmf_dbg (TRACE ,"delete P2P vif\n" ); vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); + iftype = vif->wdev.iftype;brcmf_cfg80211_arm_vif_event (cfg, vif); -switch (vif->wdev.iftype) { +switch (iftype) {case NL80211_IFTYPE_P2P_CLIENT :if (test_bit (BRCMF_VIF_STATUS_DISCONNECTING , &vif->sme_state)) wait_for_disable = true;
@@ -2275,7 +2277,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) BRCMF_P2P_DISABLE_TIMEOUT); err =0 ; -if (vif->wdev.iftype !=NL80211_IFTYPE_P2P_DEVICE ) { +if (iftype !=NL80211_IFTYPE_P2P_DEVICE ) {brcmf_vif_clear_mgmt_ies (vif); err =brcmf_p2p_release_p2p_if (vif); }
@@ -2291,7 +2293,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)brcmf_remove_interface (vif->ifp, true);brcmf_cfg80211_arm_vif_event (cfg,NULL ); -if (vif->wdev.iftype !=NL80211_IFTYPE_P2P_DEVICE ) +if (iftype !=NL80211_IFTYPE_P2P_DEVICE ) p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif =NULL ;return err;
drivers/pci/host/pci-thunder-pem.c +60 -2
81 lines not on this page · raw message
drivers/pci/host/pci-xgene.c +2 -5
@@ -246,14 +246,11 @@ static int xgene_pcie_ecam_init(struct pci_config_window *cfg, u32 ipversion) ret =xgene_get_csr_resource (adev, &csr);if (ret) {dev_err (dev,"can't get CSR resource\n" ); -kfree (port);return ret; } port->csr_base =devm_ioremap_resource (dev, &csr); -if (IS_ERR (port->csr_base)) { -kfree (port); -return -ENOMEM ; - } +if (IS_ERR (port->csr_base)) +return PTR_ERR (port->csr_base); port->cfg_base = cfg->win; port->version = ipversion;
drivers/pci/quirks.c +83 -16
152 lines not on this page · raw message
drivers/platform/x86/asus-wmi.c +19 -4
@@ -159,6 +159,8 @@ MODULE_LICENSE("GPL");#define USB_INTEL_XUSB2PR 0xD0#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 +static const char *const ashs_ids[] = {"ATK4001" ,"ATK4002" ,NULL }; +struct bios_args {u32 arg0;u32 arg1;
@@ -2051,6 +2053,16 @@ static int asus_wmi_fan_init(struct asus_wmi *asus)return 0 ; } +static bool ashs_present (void ) +{ +int i =0 ; +while (ashs_ids[i]) { +if (acpi_dev_found (ashs_ids[i++])) +return true; + } +return false; +} +/* * WMI Driver */
@@ -2095,6 +2107,13 @@ static int asus_wmi_add(struct platform_device *pdev)if (err) goto fail_leds; +asus_wmi_get_devstate (asus,ASUS_WMI_DEVID_WLAN , &result); +if (result & (ASUS_WMI_DSTS_PRESENCE_BIT |ASUS_WMI_DSTS_USER_BIT )) + asus->driver->wlan_ctrl_by_user =1 ; + +if (asus->driver->wlan_ctrl_by_user &&ashs_present ()) + asus->driver->quirks->no_rfkill =1 ; +if (!asus->driver->quirks->no_rfkill) { err =asus_wmi_rfkill_init (asus);if (err)
@@ -2134,10 +2153,6 @@ static int asus_wmi_add(struct platform_device *pdev)if (err) goto fail_debugfs; -asus_wmi_get_devstate (asus,ASUS_WMI_DEVID_WLAN , &result); -if (result & (ASUS_WMI_DSTS_PRESENCE_BIT |ASUS_WMI_DSTS_USER_BIT )) - asus->driver->wlan_ctrl_by_user =1 ; -return 0 ; fail_debugfs:
drivers/staging/android/ashmem.c +1 -0
@@ -409,6 +409,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) ret =PTR_ERR (vmfile); goto out; } + vmfile->f_mode |=FMODE_LSEEK ; asma->file = vmfile; }get_file (asma->file);
drivers/tty/serial/8250/8250_omap.c +3 -6
@@ -1075,15 +1075,15 @@ static int omap8250_no_handle_irq(struct uart_port *port) }static const u8 am3352_habit =OMAP_DMA_TX_KICK |UART_ERRATA_CLOCK_DISABLE ; -static const u8 am4372_habit =UART_ERRATA_CLOCK_DISABLE ; +static const u8 dra742_habit =UART_ERRATA_CLOCK_DISABLE ;static const struct of_device_id omap8250_dt_ids[] = { { .compatible ="ti,omap2-uart" }, { .compatible ="ti,omap3-uart" }, { .compatible ="ti,omap4-uart" }, { .compatible ="ti,am3352-uart" , .data = &am3352_habit, }, - { .compatible ="ti,am4372-uart" , .data = &am4372_habit, }, - { .compatible ="ti,dra742-uart" , .data = &am4372_habit, }, + { .compatible ="ti,am4372-uart" , .data = &am3352_habit, }, + { .compatible ="ti,dra742-uart" , .data = &dra742_habit, }, {}, };MODULE_DEVICE_TABLE (of, omap8250_dt_ids);
@@ -1218,9 +1218,6 @@ static int omap8250_probe(struct platform_device *pdev) priv->omap8250_dma.rx_size =RX_TRIGGER ; priv->omap8250_dma.rxconf.src_maxburst =RX_TRIGGER ; priv->omap8250_dma.txconf.dst_maxburst =TX_TRIGGER ; - -if (of_machine_is_compatible ("ti,am33xx" )) - priv->habit |=OMAP_DMA_TX_KICK ;/* * pause is currently not supported atleast on omap-sdma * and edma on most earlier kernels.
drivers/usb/chipidea/ci_hdrc_msm.c +2 -2
@@ -24,7 +24,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)switch (event) {case CI_HDRC_CONTROLLER_RESET_EVENT :dev_dbg (dev,"CI_HDRC_CONTROLLER_RESET_EVENT received\n" ); -writel (0 ,USB_AHBBURST );/* use AHB transactor, allow posted data writes */ writel (0x8 ,USB_AHBMODE );usb_phy_init (ci->usb_phy);
@@ -47,7 +46,8 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { .name = "ci_hdrc_msm", .capoffset = DEF_CAPOFFSET, .flags =CI_HDRC_REGS_SHARED | - CI_HDRC_DISABLE_STREAMING, +CI_HDRC_DISABLE_STREAMING | + CI_HDRC_OVERRIDE_AHB_BURST, .notify_event = ci_hdrc_msm_notify_event, };
drivers/usb/dwc3/gadget.c +17 -4
@@ -171,6 +171,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, int status) {struct dwc3 *dwc = dep->dwc; +unsigned int unmap_after_complete = false; req->started = false;list_del (&req->list);
@@ -180,11 +181,19 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,if (req->request.status == -EINPROGRESS ) req->request.status = status; -if (dwc->ep0_bounced && dep->number <=1 ) +/* +* NOTICE we don't want to unmap before calling ->complete() if we're +* dealing with a bounced ep0 request. If we unmap it here, we would end +* up overwritting the contents of req->buf and this could confuse the +* gadget driver. +*/ +if (dwc->ep0_bounced && dep->number <=1 ) { dwc->ep0_bounced = false; - -usb_gadget_unmap_request_by_dev (dwc->sysdev, - &req->request, req->direction); + unmap_after_complete = true; + }else { +usb_gadget_unmap_request_by_dev (dwc->sysdev, + &req->request, req->direction); + }trace_dwc3_gadget_giveback (req);
@@ -192,6 +201,10 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,usb_gadget_giveback_request (&dep->endpoint, &req->request);spin_lock (&dwc->lock); +if (unmap_after_complete) +usb_gadget_unmap_request_by_dev (dwc->sysdev, + &req->request, req->direction); +if (dep->number >1 )pm_runtime_put (dwc->dev); }
drivers/usb/dwc3/host.c +18 -3
@@ -54,11 +54,12 @@ static int dwc3_host_get_irq(struct dwc3 *dwc)int dwc3_host_init (struct dwc3 *dwc) { -struct property_entry props[2 ]; +struct property_entry props[3 ];struct platform_device *xhci;int ret, irq;struct resource *res;struct platform_device *dwc3_pdev =to_platform_device (dwc->dev); +int prop_idx =0 ; irq =dwc3_host_get_irq (dwc);if (irq <0 )
@@ -97,8 +98,22 @@ int dwc3_host_init(struct dwc3 *dwc)memset (props,0 ,sizeof (struct property_entry ) *ARRAY_SIZE (props)); -if (dwc->usb3_lpm_capable) { - props[0 ].name ="usb3-lpm-capable" ; +if (dwc->usb3_lpm_capable) + props[prop_idx++].name ="usb3-lpm-capable" ; + +/** +* WORKAROUND: dwc3 revisions <=3.00a have a limitation +* where Port Disable command doesn't work. +* +* The suggested workaround is that we avoid Port Disable +* completely. +* +* This following flag tells XHCI to do just that. +*/ +if (dwc->revision <=DWC3_REVISION_300A ) + props[prop_idx++].name ="quirk-broken-port-ped" ; + +if (prop_idx) { ret =platform_device_add_properties (xhci, props);if (ret) {dev_err (dwc->dev,"failed to add properties to xHCI\n" );
drivers/usb/host/xhci-hub.c +6 -0
@@ -458,6 +458,12 @@ static void xhci_disable_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,return ; } +if (xhci->quirks &XHCI_BROKEN_PORT_PED ) { +xhci_dbg (xhci, +"Broken Port Enabled/Disabled, ignoring port disable request.\n" ); +return ; + } +/* Write 1 to disable the port */ writel (port_status |PORT_PE , addr); port_status =readl (addr);
drivers/usb/host/xhci-plat.c +3 -0
@@ -232,6 +232,9 @@ static int xhci_plat_probe(struct platform_device *pdev)if (device_property_read_bool (&pdev->dev,"usb3-lpm-capable" )) xhci->quirks |=XHCI_LPM_SUPPORT ; +if (device_property_read_bool (&pdev->dev,"quirk-broken-port-ped" )) + xhci->quirks |=XHCI_BROKEN_PORT_PED ; + hcd->usb_phy =devm_usb_get_phy_by_phandle (&pdev->dev,"usb-phy" ,0 );if (IS_ERR (hcd->usb_phy)) { ret =PTR_ERR (hcd->usb_phy);
drivers/usb/host/xhci.h +3 -0
@@ -1650,6 +1650,9 @@ struct xhci_hcd {#define XHCI_SSIC_PORT_UNUSED (1 << 22)#define XHCI_NO_64BIT_SUPPORT (1 << 23)#define XHCI_MISSING_CAS (1 << 24) +/* For controller with a broken Port Disable implementation */ +#define XHCI_BROKEN_PORT_PED (1 << 25) +unsigned int num_active_eps;unsigned int limit_active_eps;/* There are two roothubs to keep track of bus suspend info for */
drivers/usb/storage/unusual_devs.h +14 -0
@@ -2071,6 +2071,20 @@ UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), +/* +* Reported by Tobias Jakobi <[email protected]> +* The INIC-3619 bridge is used in the StarTech SLSODDU33B +* SATA-USB enclosure for slimline optical drives. +* +* The quirk enables MakeMKV to properly exchange keys with +* an installed BD drive. +*/ +UNUSUAL_DEV (0x13fd ,0x3609 ,0x0209 ,0x0209 , +"Initio Corporation" , +"INIC-3619" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_IGNORE_RESIDUE ), +/* Reported by Qinglin Ye <[email protected]> */ UNUSUAL_DEV( 0x13fe, 0x3600, 0x0100, 0x0100, "Kingston",
drivers/watchdog/s3c2410_wdt.c +18 -3
@@ -46,6 +46,7 @@#define S3C2410_WTCON 0x00#define S3C2410_WTDAT 0x04#define S3C2410_WTCNT 0x08 +#define S3C2410_WTCLRINT 0x0c#define S3C2410_WTCNT_MAXCNT 0xffff
@@ -72,6 +73,7 @@#define EXYNOS5_WDT_MASK_RESET_REG_OFFSET 0x040c#define QUIRK_HAS_PMU_CONFIG (1 << 0)#define QUIRK_HAS_RST_STAT (1 << 1) +#define QUIRK_HAS_WTCLRINT_REG (1 << 2)/* These quirks require that we have a PMU register map */ #define QUIRKS_HAVE_PMUREG (QUIRK_HAS_PMU_CONFIG | \
@@ -143,13 +145,18 @@ static const struct s3c2410_wdt_variant drv_data_s3c2410 = { };#ifdef CONFIG_OF +static const struct s3c2410_wdt_variant drv_data_s3c6410 = { + .quirks =QUIRK_HAS_WTCLRINT_REG , +}; +static const struct s3c2410_wdt_variant drv_data_exynos5250 = { .disable_reg =EXYNOS5_WDT_DISABLE_REG_OFFSET , .mask_reset_reg =EXYNOS5_WDT_MASK_RESET_REG_OFFSET , .mask_bit =20 , .rst_stat_reg =EXYNOS5_RST_STAT_REG_OFFSET , .rst_stat_bit =20 , - .quirks =QUIRK_HAS_PMU_CONFIG |QUIRK_HAS_RST_STAT , + .quirks =QUIRK_HAS_PMU_CONFIG |QUIRK_HAS_RST_STAT \ + |QUIRK_HAS_WTCLRINT_REG , }; static const struct s3c2410_wdt_variant drv_data_exynos5420 = {
@@ -158,7 +165,8 @@ static const struct s3c2410_wdt_variant drv_data_exynos5420 = { .mask_bit = 0, .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET, .rst_stat_bit = 9, - .quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT, + .quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT \ + | QUIRK_HAS_WTCLRINT_REG, };static const struct s3c2410_wdt_variant drv_data_exynos7 = {
@@ -167,12 +175,15 @@ static const struct s3c2410_wdt_variant drv_data_exynos7 = { .mask_bit = 23, .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET, .rst_stat_bit = 23, /* A57 WDTRESET */ - .quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT, + .quirks = QUIRK_HAS_PMU_CONFIG | QUIRK_HAS_RST_STAT \ + | QUIRK_HAS_WTCLRINT_REG, };static const struct of_device_id s3c2410_wdt_match[] = { { .compatible ="samsung,s3c2410-wdt" , .data = &drv_data_s3c2410 }, + { .compatible ="samsung,s3c6410-wdt" , + .data = &drv_data_s3c6410 }, { .compatible ="samsung,exynos5250-wdt" , .data = &drv_data_exynos5250 }, { .compatible ="samsung,exynos5420-wdt" ,
@@ -418,6 +429,10 @@ static irqreturn_t s3c2410wdt_irq(int irqno, void *param)dev_info (wdt->dev,"watchdog timer expired (irq)\n" );s3c2410wdt_keepalive (&wdt->wdt_device); + +if (wdt->drv_data->quirks &QUIRK_HAS_WTCLRINT_REG ) +writel (0x1 , wdt->reg_base +S3C2410_WTCLRINT ); +return IRQ_HANDLED ; }
fs/cifs/smb2pdu.c +4 -0
@@ -1104,6 +1104,10 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,return -EINVAL ; } +/* SMB2 TREE_CONNECT request must be called with TreeId == 0 */ +if (tcon) + tcon->tid =0 ; + rc =small_smb2_init (SMB2_TREE_CONNECT , tcon, (void **) &req);if (rc) {kfree (unc_path);
fs/dax.c +22 -13
@@ -369,6 +369,22 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, }spin_lock_irq (&mapping->tree_lock); +if (!entry) { +/* +* We needed to drop the page_tree lock while calling +* radix_tree_preload() and we didn't have an entry to +* lock. See if another thread inserted an entry at +* our index during this time. +*/ + entry =__radix_tree_lookup (&mapping->page_tree, index, +NULL , &slot); +if (entry) { +radix_tree_preload_end (); +spin_unlock_irq (&mapping->tree_lock); + goto restart; + } + } +if (pmd_downgrade) {radix_tree_delete (&mapping->page_tree, index); mapping->nrexceptional--;
@@ -384,19 +400,12 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index,if (err) {spin_unlock_irq (&mapping->tree_lock);/* -* Someone already created the entry? This is a -* normal failure when inserting PMDs in a range -* that already contains PTEs. In that case we want -* to return -EEXIST immediately. -*/ -if (err == -EEXIST && !(size_flag &RADIX_DAX_PMD )) - goto restart; -/* -* Our insertion of a DAX PMD entry failed, most -* likely because it collided with a PTE sized entry -* at a different index in the PMD range. We haven't -* inserted anything into the radix tree and have no -* waiters to wake. +* Our insertion of a DAX entry failed, most likely +* because we were inserting a PMD entry and it +* collided with a PTE sized entry at a different +* index in the PMD range. We haven't inserted +* anything into the radix tree and have no waiters to +* wake. */ return ERR_PTR (err); }
fs/orangefs/super.c +7 -2
@@ -263,8 +263,13 @@ int orangefs_remount(struct orangefs_sb_info_s *orangefs_sb)if (!new_op)return -ENOMEM ; new_op->upcall.req.features.features =0 ; - ret =service_operation (new_op,"orangefs_features" ,0 ); - orangefs_features = new_op->downcall.resp.features.features; + ret =service_operation (new_op,"orangefs_features" , +ORANGEFS_OP_PRIORITY |ORANGEFS_OP_NO_MUTEX ); +if (!ret) + orangefs_features = + new_op->downcall.resp.features.features; +else + orangefs_features =0 ;op_release (new_op); }else { orangefs_features =0 ;
fs/sysfs/file.c +4 -2
@@ -108,7 +108,7 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf, {const struct sysfs_ops *ops =sysfs_file_ops (of->kn);struct kobject *kobj = of->kn->parent->priv; -size_t len; +ssize_t len;/* * If buf != of->prealloc_buf, we don't know how
@@ -117,13 +117,15 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf,if (WARN_ON_ONCE (buf != of->prealloc_buf))return 0 ; len = ops->show (kobj, of->kn->priv, buf); +if (len <0 ) +return len;if (pos) {if (len <= pos)return 0 ; len -= pos;memmove (buf, buf + pos, len); } -return min (count, len); +return min_t (ssize_t, count, len); }/* kernfs write callback for regular sysfs files */
fs/xfs/xfs_bmap_util.c +9 -1
@@ -1318,8 +1318,16 @@ xfs_free_file_space(/* * Now that we've unmap all full blocks we'll have to zero out any * partial block at the beginning and/or end. xfs_zero_range is -* smart enough to skip any holes, including those we just created. +* smart enough to skip any holes, including those we just created, +* but we must take care not to zero beyond EOF and enlarge i_size. */ + +if (offset >=XFS_ISIZE (ip)) +return 0 ; + +if (offset + len >XFS_ISIZE (ip)) + len =XFS_ISIZE (ip) - offset; +return xfs_zero_range (ip, offset, len,NULL ); }
include/drm/i915_pciids.h +3 -8
@@ -226,23 +226,18 @@INTEL_VGA_DEVICE (0x162A , info),/* Server */ \ INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ -#define INTEL_BDW_RSVDM_IDS (info) \ +#define INTEL_BDW_RSVD_IDS (info) \ INTEL_VGA_DEVICE(0x1632, info),/* ULT */ \INTEL_VGA_DEVICE (0x1636 , info),/* ULT */ \INTEL_VGA_DEVICE (0x163B , info),/* Iris */ \ - INTEL_VGA_DEVICE(0x163E, info) /* ULX */ - -#define INTEL_BDW_RSVDD_IDS (info) \ +INTEL_VGA_DEVICE (0x163E , info),/* ULX */ \INTEL_VGA_DEVICE (0x163A , info),/* Server */ \ INTEL_VGA_DEVICE(0x163D, info) /* Workstation */#define INTEL_BDW_IDS (info) \ INTEL_BDW_GT12_IDS(info), \ INTEL_BDW_GT3_IDS(info), \ - INTEL_BDW_RSVDM_IDS(info), \ - INTEL_BDW_GT12_IDS(info), \ - INTEL_BDW_GT3_IDS(info), \ - INTEL_BDW_RSVDD_IDS(info) + INTEL_BDW_RSVD_IDS(info)#define INTEL_CHV_IDS (info) \ INTEL_VGA_DEVICE(0x22b0, info), \
include/drm/ttm/ttm_object.h +4 -1
@@ -229,6 +229,8 @@ extern void ttm_base_object_unref(struct ttm_base_object **p_base);* @ref_type: The type of reference. * @existed: Upon completion, indicates that an identical reference object * already existed, and the refcount was upped on that object instead. +* @require_existed: Fail with -EPERM if an identical ref object didn't +* already exist. * * Checks that the base object is shareable and adds a ref object to it. *
@@ -243,7 +245,8 @@ extern void ttm_base_object_unref(struct ttm_base_object **p_base);*/ extern int ttm_ref_object_add (struct ttm_object_file *tfile,struct ttm_base_object *base, -enum ttm_ref_type ref_type,bool *existed); +enum ttm_ref_type ref_type,bool *existed, +bool require_existed);extern bool ttm_ref_object_exists (struct ttm_object_file *tfile,struct ttm_base_object *base);
include/linux/arm-smccc.h +41 -11
67 lines not on this page · raw message
sound/soc/intel/boards/cht_bsw_rt5645.c +83 -15
98 lines not on this page · raw message
sound/soc/sunxi/sun4i-i2s.c +55 -2
57 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.