Linux 4.14.23
Greg KH
maintainerI'm announcing the release of the 4.14.23 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.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/arm64/kernel/cpufeature.c | 6 + arch/arm64/kernel/traps.c | 10 --- arch/arm64/mm/proc.S | 2 arch/m32r/Kconfig | 4 - arch/microblaze/Makefile | 17 +++-- arch/mips/boot/Makefile | 1 arch/mips/include/asm/compat.h | 1 arch/x86/oprofile/nmi_int.c | 2 arch/xtensa/mm/init.c | 70 ++++++++++++++++++++--- crypto/asymmetric_keys/pkcs7_verify.c | 12 ++- crypto/asymmetric_keys/public_key.c | 4 - crypto/asymmetric_keys/restrict.c | 21 ++++-- drivers/extcon/extcon-intel-int3496.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 58 ++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 drivers/gpu/drm/amd/amdgpu/si_dpm.c | 5 + drivers/gpu/drm/amd/amdgpu/soc15.c | 4 - drivers/gpu/drm/amd/amdgpu/vi.c | 21 ++++-- drivers/gpu/drm/cirrus/cirrus_mode.c | 40 +++++++------ drivers/gpu/drm/drm_edid.c | 3 drivers/gpu/drm/drm_mm.c | 21 +++++- drivers/gpu/drm/i915/intel_breadcrumbs.c | 29 +++------ drivers/hid/hid-core.c | 3 drivers/hid/hid-ids.h | 3 drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++ drivers/i2c/busses/i2c-designware-master.c | 2 drivers/iio/adc/stm32-adc.c | 7 +- drivers/iio/imu/adis_trigger.c | 7 +- drivers/iio/industrialio-buffer.c | 2 drivers/iio/proximity/Kconfig | 2 drivers/infiniband/core/rdma_core.c | 10 ++- drivers/infiniband/core/uverbs_cmd.c | 16 +++-- drivers/infiniband/core/uverbs_main.c | 27 ++++++-- drivers/irqchip/irq-gic-v3.c | 2 drivers/irqchip/irq-mips-gic.c | 2 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 10 --- drivers/pci/quirks.c | 39 +++++++----- drivers/scsi/ibmvscsi/ibmvfc.h | 2 drivers/usb/core/quirks.c | 3 drivers/usb/dwc3/ep0.c | 7 +- drivers/usb/dwc3/gadget.c | 2 drivers/usb/gadget/function/f_fs.c | 44 ++------------ drivers/usb/host/ehci-hub.c | 4 - drivers/usb/host/ohci-hcd.c | 10 ++- drivers/usb/host/ohci-hub.c | 4 - drivers/usb/host/ohci-q.c | 17 +++-- drivers/usb/misc/ldusb.c | 6 + drivers/usb/musb/musb_host.c | 8 -- drivers/usb/renesas_usbhs/fifo.c | 5 + drivers/xen/tmem.c | 4 + include/linux/kconfig.h | 9 ++ mm/zswap.c | 6 + net/ipv4/ip_sockglue.c | 7 -- net/ipv6/ipv6_sockglue.c | 10 --- net/mac80211/cfg.c | 2 56 files changed, 415 insertions(+), 226 deletions(-)
AMAN DEEP (1):
usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks()
Alex Deucher (4):
drm/amdgpu: Add dpm quirk for Jet PRO (v2) drm/amdgpu: only check mmBIF_IOV_FUNC_IDENTIFIER on tonga/fiji drm/amdgpu: add atpx quirk handling (v2) drm/amdgpu: Avoid leaking PM domain on driver unbind (v2)
Andreas Klinger (1):
iio: srf08: fix link error "devm_iio_triggered_buffer_setup" undefined
Ard Biesheuvel (1):
arm64: mm: don't write garbage into TTBR1_EL1 register
Arnd Bergmann (4):
cfg80211: fix cfg80211_beacon_dup
Kbuild: always define endianess in kconfig.h x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()
microblaze: fix endian handling
Ben Gardner (1):
i2c: designware: must wait for enable
Bin Liu (1):
Revert "usb: musb: host: don't start next rx urb if current one failed"
Casey Leedom (1):
PCI/cxgb4: Extend T3 PCI quirk to T4+ devices
Chris Wilson (2):
drm: Handle unexpected holes in color-eviction drm/i915/breadcrumbs: Ignore unsubmitted signalers
Daniel Vetter (1):
drm/cirrus: Load lut in crtc_commit
Eric Anholt (1):
i2c: bcm2835: Set up the rising/falling edge delays
Eric Biggers (4):
X.509: fix BUG_ON() when hash algorithm is unsupported X.509: fix NULL dereference when restricting key with unsupported_sig PKCS#7: fix certificate chain verification
PKCS#7: fix certificate blacklisting
Fabrice Gasnier (1):
iio: adc: stm32: fix stm32h7_adc_enable error handling
Geert Uytterhoeven (1):
m32r: fix endianness constraints
Greg Kroah-Hartman (1):
Linux 4.14.23
Hans de Goede (1):
extcon: int3496: process id-pin first so that we start with the right status
Huang Rui (1):
drm/amdgpu: disable MMHUB power gating on raven
Huang Ying (1):
mm, swap, frontswap: fix THP swap if frontswap enabled
Jack Pham (2):
usb: gadget: f_fs: Process all descriptors during bind
usb: gadget: f_fs: Use config_ep_by_speed()
Jack Stocker (1):
Add delay-init quirk for Corsair K70 RGB keyboards
James Hogan (1):
MIPS: Drop spurious __unused in struct compat_flock
Kai-Heng Feng (2):
drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA drm/amdgpu: add new device to use atpx quirk
Karsten Koop (1):
usb: ldusb: add PIDs for new CASSY devices supported by this driver
Kees Cook (2):
kconfig.h: Include compiler types to avoid missed struct attributes
MIPS: boot: Define __ASSEMBLY__ for its.S build
Lars-Peter Clausen (1):
iio: adis_lib: Initialize trigger before requesting interrupt
Leon Romanovsky (5):
RDMA/uverbs: Protect from races between lookup and destroy of uobjects RDMA/uverbs: Protect from command mask overflow RDMA/uverbs: Fix bad unlock balance in ib_uverbs_close_xrcd RDMA/uverbs: Fix circular locking dependency
RDMA/uverbs: Sanitize user entered port numbers prior to access it
Matt Redfearn (1):
irqchip/mips-gic: Avoid spuriously handling masked interrupts
Max Filippov (1):
xtensa: fix high memory/reserved memory collision
Michael Weiser (2):
arm64: Remove unimplemented syscall log message
arm64: Disable unhandled signal log messages by default
Paolo Abeni (1):
netfilter: drop outermost socket lock in getsockopt()
Peter Chen (1):
usb: host: ehci: use correct device pointer for dma ops
Shanker Donthineni (1):
irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
Shigeru Yoshida (1):
ohci-hcd: Fix race condition caused by ohci_urb_enqueue() and io_watchdog_func()
Stefan Windfeldt-Prytz (1):
iio: buffer: check if a buffer has been set up when poll is called
Thinh Nguyen (2):
usb: dwc3: gadget: Set maxpacket size for ep0 IN
usb: dwc3: ep0: Reset TRB counter for ep0 IN
Tyrel Datwyler (1):
scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
Will Deacon (1):
arm64: cpufeature: Fix CTR_EL0 field definitions
Yoshihiro Shimoda (1):
usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 22 +SUBLEVEL = 23 EXTRAVERSION = NAME = Petit Gorille
arch/arm64/kernel/cpufeature.c +4 -2
@@ -175,9 +175,11 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { };static const struct arm64_ftr_bits ftr_ctr[] = { -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_EXACT ,31 ,1 ,1 ),/* RAO */ +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_EXACT ,31 ,1 ,1 ),/* RES1 */ +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,29 ,1 ,1 ),/* DIC */ +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,28 ,1 ,1 ),/* IDC */ ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_HIGHER_SAFE ,24 ,4 ,0 ),/* CWG */ -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,20 ,4 ,0 ),/* ERG */ +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_HIGHER_SAFE ,20 ,4 ,0 ),/* ERG */ ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,16 ,4 ,1 ),/* DminLine */ /* * Linux can handle differing I-cache policies. Userspace JITs will
arch/arm64/kernel/traps.c +1 -9
@@ -56,7 +56,7 @@ static const char *handler[]= { "Error" }; -int show_unhandled_signals =1 ; +int show_unhandled_signals =0 ;/* * Dump out the contents of some kernel memory nicely...
@@ -573,14 +573,6 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) }#endif -if (show_unhandled_signals_ratelimited ()) { -pr_info ("%s[%d]: syscall %d\n" , current->comm, -task_pid_nr (current), regs->syscallno); -dump_instr ("" , regs); -if (user_mode (regs)) -__show_regs (regs); - } -return sys_ni_syscall (); }
arch/arm64/mm/proc.S +1 -1
@@ -155,7 +155,7 @@ ENDPROC(cpu_do_switch_mm) .macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2 adrp \tmp1, empty_zero_page - msr ttbr1_el1, \tmp2 + msr ttbr1_el1, \tmp1 isb tlbi vmalle1 dsb nsh
arch/m32r/Kconfig +2 -2
@@ -196,8 +196,8 @@ config TIMER_DIVIDE default "128" config CPU_BIG_ENDIAN - bool "Generate big endian code" - default n + bool + default !CPU_LITTLE_ENDIAN config CPU_LITTLE_ENDIAN bool "Generate little endian code"
arch/microblaze/Makefile +11 -6
@@ -36,16 +36,21 @@ endif CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare -CPUFLAGS-$(CONFIG_BIG_ENDIAN) += -mbig-endian -CPUFLAGS-$(CONFIG_LITTLE_ENDIAN) += -mlittle-endian + +ifdef CONFIG_CPU_BIG_ENDIAN +KBUILD_CFLAGS += -mbig-endian +KBUILD_AFLAGS += -mbig-endian +LD += -EB +else +KBUILD_CFLAGS += -mlittle-endian +KBUILD_AFLAGS += -mlittle-endian +LD += -EL +endif CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) # r31 holds current when in kernel mode -KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) - -LDFLAGS := -LDFLAGS_vmlinux := +KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2) head-y := arch/microblaze/kernel/head.o libs-y += arch/microblaze/lib/
arch/mips/boot/Makefile +1 -0
@@ -126,6 +126,7 @@ $(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS quiet_cmd_cpp_its_S = ITS $@ cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \ + -D__ASSEMBLY__ \ -DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \ -DVMLINUX_BINARY="\"$(3)\"" \ -DVMLINUX_COMPRESSION="\"$(2)\"" \
arch/mips/include/asm/compat.h +0 -1
@@ -86,7 +86,6 @@ struct compat_flock {compat_off_t l_len;s32 l_sysid;compat_pid_t l_pid; -short __unused;s32 pad[4 ]; };
arch/x86/oprofile/nmi_int.c +1 -1
@@ -460,7 +460,7 @@ static int nmi_setup(void) goto fail;for_each_possible_cpu (cpu) { -if (!cpu) +if (!IS_ENABLED (CONFIG_SMP ) || !cpu)continue ; memcpy(per_cpu(cpu_msrs, cpu).counters,
arch/xtensa/mm/init.c +63 -7
82 lines not on this page · raw message
crypto/asymmetric_keys/pkcs7_verify.c +7 -5
@@ -273,7 +273,7 @@ static int pkcs7_verify_sig_chain(struct pkcs7_message *pkcs7, sinfo->index);return 0 ; } - ret =public_key_verify_signature (p->pub, p->sig); + ret =public_key_verify_signature (p->pub, x509->sig);if (ret <0 )return ret; x509->signer = p;
@@ -369,8 +369,7 @@ static int pkcs7_verify_one(struct pkcs7_message *pkcs7,* * (*) -EBADMSG if some part of the message was invalid, or: * -* (*) 0 if no signature chains were found to be blacklisted or to contain -* unsupported crypto, or: +* (*) 0 if a signature chain passed verification, or: * * (*) -EKEYREJECTED if a blacklisted key was encountered, or: *
@@ -426,8 +425,11 @@ int pkcs7_verify(struct pkcs7_message *pkcs7,for (sinfo = pkcs7->signed_infos; sinfo; sinfo = sinfo->next) { ret =pkcs7_verify_one (pkcs7, sinfo); -if (sinfo->blacklisted && actual_ret == -ENOPKG ) - actual_ret = -EKEYREJECTED ; +if (sinfo->blacklisted) { +if (actual_ret == -ENOPKG ) + actual_ret = -EKEYREJECTED ; +continue ; + }if (ret <0 ) {if (ret == -ENOPKG ) { sinfo->unsupported_crypto = true;
crypto/asymmetric_keys/public_key.c +3 -1
@@ -93,9 +93,11 @@ int public_key_verify_signature(const struct public_key *pkey,BUG_ON (!pkey);BUG_ON (!sig); -BUG_ON (!sig->digest);BUG_ON (!sig->s); +if (!sig->digest) +return -ENOPKG ; + alg_name = sig->pkey_algo;if (strcmp (sig->pkey_algo,"rsa" ) ==0 ) {/* The data wangled by the RSA algorithm is typically padded
crypto/asymmetric_keys/restrict.c +13 -8
@@ -67,8 +67,9 @@ __setup("ca_keys=", ca_keys_setup);* * Returns 0 if the new certificate was accepted, -ENOKEY if we couldn't find a * matching parent certificate in the trusted list, -EKEYREJECTED if the -* signature check fails or the key is blacklisted and some other error if -* there is a matching certificate but the signature check cannot be performed. +* signature check fails or the key is blacklisted, -ENOPKG if the signature +* uses unsupported crypto, or some other error if there is a matching +* certificate but the signature check cannot be performed. */ int restrict_link_by_signature(struct key *dest_keyring, const struct key_type *type,
@@ -88,6 +89,8 @@ int restrict_link_by_signature(struct key *dest_keyring,return -EOPNOTSUPP ; sig = payload->data[asym_auth]; +if (!sig) +return -ENOPKG ;if (!sig->auth_ids[0 ] && !sig->auth_ids[1 ])return -ENOKEY ;
@@ -139,6 +142,8 @@ static int key_or_keyring_common(struct key *dest_keyring,return -EOPNOTSUPP ; sig = payload->data[asym_auth]; +if (!sig) +return -ENOPKG ;if (!sig->auth_ids[0 ] && !sig->auth_ids[1 ])return -ENOKEY ;
@@ -222,9 +227,9 @@ static int key_or_keyring_common(struct key *dest_keyring,* * Returns 0 if the new certificate was accepted, -ENOKEY if we * couldn't find a matching parent certificate in the trusted list, -* -EKEYREJECTED if the signature check fails, and some other error if -* there is a matching certificate but the signature check cannot be -* performed. +* -EKEYREJECTED if the signature check fails, -ENOPKG if the signature uses +* unsupported crypto, or some other error if there is a matching certificate +* but the signature check cannot be performed. */ int restrict_link_by_key_or_keyring(struct key *dest_keyring, const struct key_type *type,
@@ -249,9 +254,9 @@ int restrict_link_by_key_or_keyring(struct key *dest_keyring,* * Returns 0 if the new certificate was accepted, -ENOKEY if we * couldn't find a matching parent certificate in the trusted list, -* -EKEYREJECTED if the signature check fails, and some other error if -* there is a matching certificate but the signature check cannot be -* performed. +* -EKEYREJECTED if the signature check fails, -ENOPKG if the signature uses +* unsupported crypto, or some other error if there is a matching certificate +* but the signature check cannot be performed. */ int restrict_link_by_key_or_keyring_chain(struct key *dest_keyring, const struct key_type *type,
drivers/extcon/extcon-intel-int3496.c +2 -1
@@ -153,8 +153,9 @@ static int int3496_probe(struct platform_device *pdev)return ret; } -/* queue initial processing of id-pin */ +/* process id-pin so that we start with the right status */ queue_delayed_work (system_wq, &data->work,0 ); +flush_delayed_work (&data->work);platform_set_drvdata (pdev, data);
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +51 -7
94 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -2
@@ -2076,8 +2076,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,* ignore it */ vga_client_register (adev->pdev, adev,NULL , amdgpu_vga_set_decode); -if (amdgpu_runtime_pm ==1 ) - runtime = true;if (amdgpu_device_is_px (ddev)) runtime = true;if (!pci_is_thunderbolt_attached (adev->pdev))
drivers/gpu/drm/amd/amdgpu/si_dpm.c +5 -0
@@ -3465,6 +3465,11 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, (adev->pdev->device == 0x6667)) { max_sclk =75000 ; } +if ((adev->pdev->revision ==0xC3 ) || + (adev->pdev->device ==0x6665 )) { + max_sclk =60000 ; + max_mclk =80000 ; + } }else if (adev->asic_type ==CHIP_OLAND ) { if ((adev->pdev->revision == 0xC7) || (adev->pdev->revision == 0x80) ||
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -2
@@ -661,8 +661,8 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_MC_LS |AMD_CG_SUPPORT_SDMA_MGCG |AMD_CG_SUPPORT_SDMA_LS ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA | -AMD_PG_SUPPORT_MMHUB ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA ; + adev->external_rev_id =0x1 ;break ;default :
drivers/gpu/drm/amd/amdgpu/vi.c +13 -8
@@ -448,14 +448,19 @@ static bool vi_read_bios_from_rom(struct amdgpu_device *adev,static void vi_detect_hw_virtualization (struct amdgpu_device *adev) { -uint32_t reg =RREG32 (mmBIF_IOV_FUNC_IDENTIFIER); -/* bit0: 0 means pf and 1 means vf */ -/* bit31: 0 means disable IOV and 1 means enable */ -if (reg &1 ) - adev->virt.caps |=AMDGPU_SRIOV_CAPS_IS_VF ; - -if (reg &0x80000000 ) - adev->virt.caps |=AMDGPU_SRIOV_CAPS_ENABLE_IOV ; +uint32_t reg =0 ; + +if (adev->asic_type ==CHIP_TONGA || + adev->asic_type ==CHIP_FIJI ) { + reg =RREG32 (mmBIF_IOV_FUNC_IDENTIFIER); +/* bit0: 0 means pf and 1 means vf */ +/* bit31: 0 means disable IOV and 1 means enable */ +if (reg &1 ) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_IS_VF ; + +if (reg &0x80000000 ) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_ENABLE_IOV ; + }if (reg ==0 ) {if (is_virtual_machine ())/* passthrough mode exclus sr-iov mode */
drivers/gpu/drm/cirrus/cirrus_mode.c +23 -17
@@ -294,22 +294,7 @@ static void cirrus_crtc_prepare(struct drm_crtc *crtc) { } -/* -* This is called after a mode is programmed. It should reverse anything done -* by the prepare function -*/ -static void cirrus_crtc_commit (struct drm_crtc *crtc) -{ -} - -/* -* The core can pass us a set of gamma values to program. We actually only -* use this for 8-bit mode so can't perform smooth fades on deeper modes, -* but it's a requirement that we provide the function -*/ -static int cirrus_crtc_gamma_set (struct drm_crtc *crtc,u16 *red,u16 *green, -u16 *blue,uint32_t size, -struct drm_modeset_acquire_ctx *ctx) +static void cirrus_crtc_load_lut (struct drm_crtc *crtc) {struct drm_device *dev = crtc->dev;struct cirrus_device *cdev = dev->dev_private;
@@ -317,7 +302,7 @@ static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,int i;if (!crtc->enabled) -return 0 ; +return ; r = crtc->gamma_store; g = r + crtc->gamma_size;
@@ -330,6 +315,27 @@ static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,WREG8 (PALETTE_DATA , *g++ >>8 );WREG8 (PALETTE_DATA , *b++ >>8 ); } +} + +/* +* This is called after a mode is programmed. It should reverse anything done +* by the prepare function +*/ +static void cirrus_crtc_commit (struct drm_crtc *crtc) +{ +cirrus_crtc_load_lut (crtc); +} + +/* +* The core can pass us a set of gamma values to program. We actually only +* use this for 8-bit mode so can't perform smooth fades on deeper modes, +* but it's a requirement that we provide the function +*/ +static int cirrus_crtc_gamma_set (struct drm_crtc *crtc,u16 *red,u16 *green, +u16 *blue,uint32_t size, +struct drm_modeset_acquire_ctx *ctx) +{ +cirrus_crtc_load_lut (crtc);return 0 ; }
drivers/gpu/drm/drm_edid.c +3 -0
@@ -111,6 +111,9 @@ static const struct edid_quirk {/* AEO model 0 reports 8 bpc, but is a 6 bpc panel */ { "AEO", 0, EDID_QUIRK_FORCE_6BPC }, +/* CPT panel of Asus UX303LA reports 8 bpc, but is a 6 bpc panel */ + { "CPT", 0x17df, EDID_QUIRK_FORCE_6BPC }, +/* Belinea 10 15 55 */ { "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 }, { "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
drivers/gpu/drm/drm_mm.c +18 -3
@@ -834,9 +834,24 @@ struct drm_mm_node *drm_mm_scan_color_evict(struct drm_mm_scan *scan)if (!mm->color_adjust)return NULL ; - hole =list_first_entry (&mm->hole_stack,typeof (*hole), hole_stack); - hole_start =__drm_mm_hole_node_start (hole); - hole_end = hole_start + hole->hole_size; +/* +* The hole found during scanning should ideally be the first element +* in the hole_stack list, but due to side-effects in the driver it +* may not be. +*/ +list_for_each_entry (hole, &mm->hole_stack, hole_stack) { + hole_start =__drm_mm_hole_node_start (hole); + hole_end = hole_start + hole->hole_size; + +if (hole_start <= scan->hit_start && + hole_end >= scan->hit_end) +break ; + } + +/* We should only be called after we found the hole previously */ +DRM_MM_BUG_ON (&hole->hole_stack == &mm->hole_stack); +if (unlikely (&hole->hole_stack == &mm->hole_stack)) +return NULL ;DRM_MM_BUG_ON (hole_start > scan->hit_start);DRM_MM_BUG_ON (hole_end < scan->hit_end);
drivers/gpu/drm/i915/intel_breadcrumbs.c +10 -19
@@ -541,29 +541,16 @@ void intel_engine_remove_wait(struct intel_engine_cs *engine,spin_unlock_irq (&b->rb_lock); } -static bool signal_valid (const struct drm_i915_gem_request *request) -{ -return intel_wait_check_request (&request->signaling.wait, request); -} -static bool signal_complete (const struct drm_i915_gem_request *request) {if (!request)return false; -/* If another process served as the bottom-half it may have already -* signalled that this wait is already completed. -*/ -if (intel_wait_complete (&request->signaling.wait)) -return signal_valid (request); - -/* Carefully check if the request is complete, giving time for the +/* +* Carefully check if the request is complete, giving time for the * seqno to be visible or if the GPU hung. */ -if (__i915_request_irq_complete (request)) -return true; - -return false; +return __i915_request_irq_complete (request); }static struct drm_i915_gem_request *to_signaler (struct rb_node *rb)
@@ -606,9 +593,13 @@ static int intel_breadcrumbs_signaler(void *arg) request =i915_gem_request_get_rcu (request);rcu_read_unlock ();if (signal_complete (request)) { -local_bh_disable (); -dma_fence_signal (&request->fence); -local_bh_enable ();/* kick start the tasklets */ +if (!test_bit (DMA_FENCE_FLAG_SIGNALED_BIT , + &request->fence.flags)) { +local_bh_disable (); +dma_fence_signal (&request->fence); +GEM_BUG_ON (!i915_gem_request_completed (request)); +local_bh_enable ();/* kick start the tasklets */ + }spin_lock_irq (&b->rb_lock);
drivers/hid/hid-core.c +3 -0
@@ -2716,6 +2716,9 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTIME) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYPH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERANALYSERCASSY) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETESTCASSY) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },
drivers/hid/hid-ids.h +3 -0
@@ -634,6 +634,9 @@#define USB_DEVICE_ID_LD_MICROCASSYTIME 0x1033#define USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE 0x1035#define USB_DEVICE_ID_LD_MICROCASSYPH 0x1038 +#define USB_DEVICE_ID_LD_POWERANALYSERCASSY 0x1040 +#define USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY 0x1042 +#define USB_DEVICE_ID_LD_MACHINETESTCASSY 0x1043#define USB_DEVICE_ID_LD_JWM 0x1080#define USB_DEVICE_ID_LD_DMMP 0x1081#define USB_DEVICE_ID_LD_UMIP 0x1090
drivers/i2c/busses/i2c-bcm2835.c +20 -1
@@ -50,6 +50,9 @@#define BCM2835_I2C_S_CLKT BIT(9)#define BCM2835_I2C_S_LEN BIT(10)/* Fake bit for SW error reporting */ +#define BCM2835_I2C_FEDL_SHIFT 16 +#define BCM2835_I2C_REDL_SHIFT 0 +#define BCM2835_I2C_CDIV_MIN 0x0002#define BCM2835_I2C_CDIV_MAX 0xFFFE
@@ -81,7 +84,7 @@ static inline u32 bcm2835_i2c_readl(struct bcm2835_i2c_dev *i2c_dev, u32 reg)static int bcm2835_i2c_set_divider (struct bcm2835_i2c_dev *i2c_dev) { -u32 divider; +u32 divider, redl, fedl; divider =DIV_ROUND_UP (clk_get_rate (i2c_dev->clk), i2c_dev->bus_clk_rate);
@@ -100,6 +103,22 @@ static int bcm2835_i2c_set_divider(struct bcm2835_i2c_dev *i2c_dev)bcm2835_i2c_writel (i2c_dev,BCM2835_I2C_DIV , divider); +/* +* Number of core clocks to wait after falling edge before +* outputting the next data bit. Note that both FEDL and REDL +* can't be greater than CDIV/2. +*/ + fedl =max (divider /16 ,1u ); + +/* +* Number of core clocks to wait after rising edge before +* sampling the next incoming data bit. +*/ + redl =max (divider /4 ,1u ); + +bcm2835_i2c_writel (i2c_dev,BCM2835_I2C_DEL , + (fedl <<BCM2835_I2C_FEDL_SHIFT ) | + (redl <<BCM2835_I2C_REDL_SHIFT ));return 0 ; }
drivers/i2c/busses/i2c-designware-master.c +1 -1
@@ -207,7 +207,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)i2c_dw_disable_int (dev);/* Enable the adapter */ -__i2c_dw_enable (dev, true); +__i2c_dw_enable_and_wait (dev, true);/* Clear and enable interrupts */ dw_readl (dev,DW_IC_CLR_INTR );
drivers/iio/adc/stm32-adc.c +4 -3
@@ -764,8 +764,6 @@ static int stm32h7_adc_enable(struct stm32_adc *adc)int ret;u32 val; -/* Clear ADRDY by writing one, then enable ADC */ -stm32_adc_set_bits (adc,STM32H7_ADC_ISR ,STM32H7_ADRDY );stm32_adc_set_bits (adc,STM32H7_ADC_CR ,STM32H7_ADEN );/* Poll for ADRDY to be set (after adc startup time) */
@@ -773,8 +771,11 @@ static int stm32h7_adc_enable(struct stm32_adc *adc) val &STM32H7_ADRDY , 100, STM32_ADC_TIMEOUT_US);if (ret) { -stm32_adc_clr_bits (adc,STM32H7_ADC_CR ,STM32H7_ADEN ); +stm32_adc_set_bits (adc,STM32H7_ADC_CR ,STM32H7_ADDIS );dev_err (&indio_dev->dev,"Failed to enable ADC\n" ); + }else { +/* Clear ADRDY by writing one */ +stm32_adc_set_bits (adc,STM32H7_ADC_ISR ,STM32H7_ADRDY ); }return ret;
drivers/iio/imu/adis_trigger.c +4 -3
@@ -47,6 +47,10 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)if (adis->trig ==NULL )return -ENOMEM ; + adis->trig->dev.parent = &adis->spi->dev; + adis->trig->ops = &adis_trigger_ops; +iio_trigger_set_drvdata (adis->trig, adis); + ret = request_irq(adis->spi->irq, &iio_trigger_generic_data_rdy_poll, IRQF_TRIGGER_RISING,
@@ -55,9 +59,6 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)if (ret) goto error_free_trig; - adis->trig->dev.parent = &adis->spi->dev; - adis->trig->ops = &adis_trigger_ops; -iio_trigger_set_drvdata (adis->trig, adis); ret =iio_trigger_register (adis->trig); indio_dev->trig =iio_trigger_get (adis->trig);
drivers/iio/industrialio-buffer.c +1 -1
@@ -175,7 +175,7 @@ unsigned int iio_buffer_poll(struct file *filp,struct iio_dev *indio_dev = filp->private_data;struct iio_buffer *rb = indio_dev->buffer; -if (!indio_dev->info) +if (!indio_dev->info || rb ==NULL )return 0 ;poll_wait (filp, &rb->pollq, wait);
drivers/iio/proximity/Kconfig +2 -0
@@ -58,6 +58,8 @@ config SX9500 config SRF08 tristate "Devantech SRF02/SRF08/SRF10 ultrasonic ranger sensor" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER depends on I2C help Say Y here to build a driver for Devantech SRF02/SRF08/SRF10
drivers/infiniband/core/rdma_core.c +9 -1
@@ -196,7 +196,15 @@ static struct ib_uobject *lookup_get_idr_uobject(const struct uverbs_obj_type *t goto free; } -uverbs_uobject_get (uobj); +/* +* The idr_find is guaranteed to return a pointer to something that +* isn't freed yet, or NULL, as the free after idr_remove goes through +* kfree_rcu(). However the object may still have been released and +* kfree() could be called at any time. +*/ +if (!kref_get_unless_zero (&uobj->ref)) + uobj =ERR_PTR (-ENOENT ); + free:rcu_read_unlock ();return uobj;
drivers/infiniband/core/uverbs_cmd.c +11 -5
@@ -565,9 +565,10 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,if (f.file)fdput (f); +mutex_unlock (&file->device->xrcd_tree_mutex); +uobj_alloc_commit (&obj->uobject); -mutex_unlock (&file->device->xrcd_tree_mutex);return in_len; err_copy:
@@ -606,10 +607,8 @@ ssize_t ib_uverbs_close_xrcd(struct ib_uverbs_file *file, uobj =uobj_get_write (uobj_get_type (xrcd), cmd.xrcd_handle, file->ucontext); -if (IS_ERR (uobj)) { -mutex_unlock (&file->device->xrcd_tree_mutex); +if (IS_ERR (uobj))return PTR_ERR (uobj); - } ret =uobj_remove_commit (uobj);return ret ?: in_len;
@@ -1982,8 +1981,15 @@ static int modify_qp(struct ib_uverbs_file *file, goto release_qp; } +if ((cmd->base.attr_mask &IB_QP_AV ) && + !rdma_is_port_valid (qp->device, cmd->base.dest.port_num)) { + ret = -EINVAL ; + goto release_qp; + } +if ((cmd->base.attr_mask &IB_QP_ALT_PATH ) && - !rdma_is_port_valid (qp->device, cmd->base.alt_port_num)) { + (!rdma_is_port_valid (qp->device, cmd->base.alt_port_num) || + !rdma_is_port_valid (qp->device, cmd->base.alt_dest.port_num))) { ret = -EINVAL ; goto release_qp; }
drivers/infiniband/core/uverbs_main.c +20 -7
@@ -647,12 +647,21 @@ static int verify_command_mask(struct ib_device *ib_dev, __u32 command)return -1 ; } +static bool verify_command_idx (u32 command,bool extended) +{ +if (extended) +return command <ARRAY_SIZE (uverbs_ex_cmd_table); + +return command <ARRAY_SIZE (uverbs_cmd_table); +} +static ssize_t ib_uverbs_write (struct file *filp,const char __user *buf,size_t count,loff_t *pos) {struct ib_uverbs_file *file = filp->private_data;struct ib_device *ib_dev;struct ib_uverbs_cmd_hdr hdr; +bool extended_command;__u32 command;__u32 flags;int srcu_key;
@@ -685,6 +694,15 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, } command = hdr.command &IB_USER_VERBS_CMD_COMMAND_MASK ; + flags = (hdr.command & +IB_USER_VERBS_CMD_FLAGS_MASK ) >>IB_USER_VERBS_CMD_FLAGS_SHIFT ; + + extended_command = flags &IB_USER_VERBS_CMD_FLAG_EXTENDED ; +if (!verify_command_idx (command, extended_command)) { + ret = -EINVAL ; + goto out; + } +if (verify_command_mask (ib_dev, command)) { ret = -EOPNOTSUPP ; goto out;
@@ -696,12 +714,8 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, goto out; } - flags = (hdr.command & -IB_USER_VERBS_CMD_FLAGS_MASK ) >>IB_USER_VERBS_CMD_FLAGS_SHIFT ; -if (!flags) { -if (command >=ARRAY_SIZE (uverbs_cmd_table) || - !uverbs_cmd_table[command]) { +if (!uverbs_cmd_table[command]) { ret = -EINVAL ; goto out; }
@@ -722,8 +736,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,struct ib_udata uhw;size_t written_count = count; -if (command >=ARRAY_SIZE (uverbs_ex_cmd_table) || - !uverbs_ex_cmd_table[command]) { +if (!uverbs_ex_cmd_table[command]) { ret = -ENOSYS ; goto out; }
drivers/irqchip/irq-gic-v3.c +1 -1
@@ -660,7 +660,7 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)* Ensure that stores to Normal memory are visible to the * other CPUs before issuing the IPI. */ -smp_wmb (); +wmb ();for_each_cpu (cpu, mask) {unsigned long cluster_id =cpu_logical_map (cpu) & ~0xffUL ;
drivers/irqchip/irq-mips-gic.c +0 -2
@@ -427,8 +427,6 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq,spin_lock_irqsave (&gic_lock, flags);write_gic_map_pin (intr,GIC_MAP_PIN_MAP_TO_PIN | gic_cpu_pin);write_gic_map_vp (intr,BIT (mips_cm_vp_id (cpu))); -gic_clear_pcpu_masks (intr); -set_bit (intr,per_cpu_ptr (pcpu_masks, cpu));irq_data_update_effective_affinity (data,cpumask_of (cpu));spin_unlock_irqrestore (&gic_lock, flags);
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +0 -10
@@ -2632,7 +2632,6 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size) }#define EEPROM_STAT_ADDR 0x7bfc -#define VPD_SIZE 0x800#define VPD_BASE 0x400#define VPD_BASE_OLD 0#define VPD_LEN 1024
@@ -2670,15 +2669,6 @@ int t4_get_raw_vpd_params(struct adapter *adapter, struct vpd_params *p)if (!vpd)return -ENOMEM ; -/* We have two VPD data structures stored in the adapter VPD area. -* By default, Linux calculates the size of the VPD area by traversing -* the first VPD area at offset 0x0, so we need to tell the OS what -* our real VPD size is. -*/ - ret =pci_set_vpd_size (adapter->pdev,VPD_SIZE ); -if (ret <0 ) - goto out; -/* Card information normally starts at VPD_BASE but early cards had * it at 0. */
drivers/pci/quirks.c +23 -16
@@ -3412,22 +3412,29 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PORT_RIDGE,static void quirk_chelsio_extend_vpd (struct pci_dev *dev) { -pci_set_vpd_size (dev,8192 ); -} - -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x20 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x21 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x22 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x23 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x24 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x25 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x26 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x30 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x31 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x32 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x35 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x36 , quirk_chelsio_extend_vpd); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,0x37 , quirk_chelsio_extend_vpd); +int chip = (dev->device &0xf000 ) >>12 ; +int func = (dev->device &0x0f00 ) >>8 ; +int prod = (dev->device &0x00ff ) >>0 ; + +/* +* If this is a T3-based adapter, there's a 1KB VPD area at offset +* 0xc00 which contains the preferred VPD values. If this is a T4 or +* later based adapter, the special VPD is at offset 0x400 for the +* Physical Functions (the SR-IOV Virtual Functions have no VPD +* Capabilities). The PCI VPD Access core routines will normally +* compute the size of the VPD by parsing the VPD Data Structure at +* offset 0x000. This will result in silent failures when attempting +* to accesses these other VPD areas which are beyond those computed +* limits. +*/ +if (chip ==0x0 && prod >=0x20 ) +pci_set_vpd_size (dev,8192 ); +else if (chip >=0x4 && func <0x8 ) +pci_set_vpd_size (dev,2048 ); +} + +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_CHELSIO ,PCI_ANY_ID , + quirk_chelsio_extend_vpd);#ifdef CONFIG_ACPI /*
drivers/scsi/ibmvscsi/ibmvfc.h +1 -1
@@ -367,7 +367,7 @@ enum ibmvfc_fcp_rsp_info_codes { };struct ibmvfc_fcp_rsp_info { -__be16 reserved; +u8 reserved[3 ];u8 rsp_code;u8 reserved2[4 ]; }__attribute__((packed,aligned (2 )));
drivers/usb/core/quirks.c +3 -0
@@ -225,6 +225,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1a0a, 0x0200), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* Corsair K70 RGB */ + { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Corsair Strafe RGB */ { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT },
drivers/usb/dwc3/ep0.c +6 -1
@@ -884,7 +884,12 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, trb++; trb->ctrl &= ~DWC3_TRB_CTRL_HWO ;trace_dwc3_complete_trb (ep0, trb); - ep0->trb_enqueue =0 ; + +if (r->direction) + dwc->eps[1 ]->trb_enqueue =0 ; +else + dwc->eps[0 ]->trb_enqueue =0 ; + dwc->ep0_bounced = false; }
drivers/usb/dwc3/gadget.c +2 -0
@@ -2774,6 +2774,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)break ; } + dwc->eps[1 ]->endpoint.maxpacket = dwc->gadget.ep0->maxpacket; +/* Enable USB2 LPM Capability */ if ((dwc->revision > DWC3_REVISION_194A) &&
drivers/usb/gadget/function/f_fs.c +9 -35
63 lines not on this page · raw message
drivers/usb/host/ehci-hub.c +2 -2
@@ -787,12 +787,12 @@ static struct urb *request_single_step_set_feature_urb(atomic_inc (&urb->use_count);atomic_inc (&urb->dev->urbnum); urb->setup_dma =dma_map_single ( - hcd->self.controller, + hcd->self.sysdev, urb->setup_packet,sizeof (struct usb_ctrlrequest ),DMA_TO_DEVICE ); urb->transfer_dma =dma_map_single ( - hcd->self.controller, + hcd->self.sysdev, urb->transfer_buffer, urb->transfer_buffer_length,DMA_FROM_DEVICE );
drivers/usb/host/ohci-hcd.c +7 -3
@@ -73,6 +73,7 @@ static const char hcd_name [] = "ohci_hcd";#define STATECHANGE_DELAY msecs_to_jiffies(300)#define IO_WATCHDOG_DELAY msecs_to_jiffies(275) +#define IO_WATCHDOG_OFF 0xffffff00#include "ohci.h" #include "pci-quirks.h"
@@ -230,7 +231,7 @@ static int ohci_urb_enqueue ( }/* Start up the I/O watchdog timer, if it's not running */ -if (!timer_pending (&ohci->io_watchdog) && +if (ohci->prev_frame_no ==IO_WATCHDOG_OFF &&list_empty (&ohci->eds_in_use) && !(ohci->flags &OHCI_QUIRK_QEMU )) { ohci->prev_frame_no =ohci_frame_no (ohci);
@@ -501,6 +502,7 @@ static int ohci_init (struct ohci_hcd *ohci)setup_timer (&ohci->io_watchdog, io_watchdog_func, (unsigned long ) ohci); + ohci->prev_frame_no =IO_WATCHDOG_OFF ; ohci->hcca =dma_alloc_coherent (hcd->self.controller,sizeof (*ohci->hcca), &ohci->hcca_dma,GFP_KERNEL );
@@ -730,7 +732,7 @@ static void io_watchdog_func(unsigned long _ohci)u32 head;struct ed *ed;struct td *td, *td_start, *td_next; -unsigned frame_no; +unsigned frame_no, prev_frame_no =IO_WATCHDOG_OFF ;unsigned long flags;spin_lock_irqsave (&ohci->lock, flags);
@@ -835,7 +837,7 @@ static void io_watchdog_func(unsigned long _ohci) } }if (!list_empty (&ohci->eds_in_use)) { - ohci->prev_frame_no = frame_no; + prev_frame_no = frame_no; ohci->prev_wdh_cnt = ohci->wdh_cnt; ohci->prev_donehead =ohci_readl (ohci, &ohci->regs->donehead);
@@ -845,6 +847,7 @@ static void io_watchdog_func(unsigned long _ohci) } done: + ohci->prev_frame_no = prev_frame_no;spin_unlock_irqrestore (&ohci->lock, flags); }
@@ -973,6 +976,7 @@ static void ohci_stop (struct usb_hcd *hcd)if (quirk_nec (ohci))flush_work (&ohci->nec_work);del_timer_sync (&ohci->io_watchdog); + ohci->prev_frame_no =IO_WATCHDOG_OFF ;ohci_writel (ohci,OHCI_INTR_MIE , &ohci->regs->intrdisable);ohci_usb_reset (ohci);
drivers/usb/host/ohci-hub.c +3 -1
@@ -310,8 +310,10 @@ static int ohci_bus_suspend (struct usb_hcd *hcd) rc =ohci_rh_suspend (ohci,0 );spin_unlock_irq (&ohci->lock); -if (rc ==0 ) +if (rc ==0 ) {del_timer_sync (&ohci->io_watchdog); + ohci->prev_frame_no =IO_WATCHDOG_OFF ; + }return rc; }
drivers/usb/host/ohci-q.c +10 -7
@@ -1018,6 +1018,8 @@ static void finish_unlinks(struct ohci_hcd *ohci)* have modified this list. normally it's just prepending * entries (which we'd ignore), but paranoia won't hurt. */ + *last = ed->ed_next; + ed->ed_next =NULL ; modified =0 ;/* unlink urbs as requested, but rescan the list after
@@ -1076,21 +1078,22 @@ static void finish_unlinks(struct ohci_hcd *ohci) goto rescan_this;/* -* If no TDs are queued, take ED off the ed_rm_list. +* If no TDs are queued, ED is now idle. * Otherwise, if the HC is running, reschedule. -* If not, leave it on the list for further dequeues. +* If the HC isn't running, add ED back to the +* start of the list for later processing. */ if (list_empty (&ed->td_list)) { - *last = ed->ed_next; - ed->ed_next =NULL ; ed->state =ED_IDLE ;list_del (&ed->in_use_list); }else if (ohci->rh_state ==OHCI_RH_RUNNING ) { - *last = ed->ed_next; - ed->ed_next =NULL ;ed_schedule (ohci, ed); }else { - last = &ed->ed_next; + ed->ed_next = ohci->ed_rm_list; + ohci->ed_rm_list = ed; +/* Don't loop on the same ED */ +if (last == &ohci->ed_rm_list) + last = &ed->ed_next; }if (modified)
drivers/usb/misc/ldusb.c +6 -0
@@ -46,6 +46,9 @@#define USB_DEVICE_ID_LD_MICROCASSYTIME 0x1033/* USB Product ID of Micro-CASSY Time (reserved) */ #define USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE 0x1035/* USB Product ID of Micro-CASSY Temperature */ #define USB_DEVICE_ID_LD_MICROCASSYPH 0x1038/* USB Product ID of Micro-CASSY pH */ +#define USB_DEVICE_ID_LD_POWERANALYSERCASSY 0x1040/* USB Product ID of Power Analyser CASSY */ +#define USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY 0x1042/* USB Product ID of Converter Controller CASSY */ +#define USB_DEVICE_ID_LD_MACHINETESTCASSY 0x1043/* USB Product ID of Machine Test CASSY */ #define USB_DEVICE_ID_LD_JWM 0x1080/* USB Product ID of Joule and Wattmeter */ #define USB_DEVICE_ID_LD_DMMP 0x1081/* USB Product ID of Digital Multimeter P (reserved) */ #define USB_DEVICE_ID_LD_UMIP 0x1090/* USB Product ID of UMI P */
@@ -88,6 +91,9 @@ static const struct usb_device_id ld_usb_table[] = { { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTIME) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYPH) }, + { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERANALYSERCASSY) }, + { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY) }, + { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETESTCASSY) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) }, { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },
drivers/usb/musb/musb_host.c +1 -7
@@ -418,13 +418,7 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb, } } -/* -* The pipe must be broken if current urb->status is set, so don't -* start next urb. -* TODO: to minimize the risk of regression, only check urb->status -* for RX, until we have a test case to understand the behavior of TX. -*/ -if ((!status || !is_in) && qh && qh->is_ready) { +if (qh !=NULL && qh->is_ready) {musb_dbg (musb,"... next ep%d %cX urb %p" , hw_ep->epnum, is_in ?'R' :'T' ,next_urb (qh));musb_start_urb (musb, is_in, qh);
drivers/usb/renesas_usbhs/fifo.c +5 -0
@@ -998,6 +998,10 @@ static int usbhsf_dma_prepare_pop_with_usb_dmac(struct usbhs_pkt *pkt,if ((uintptr_t )pkt->buf & (USBHS_USB_DMAC_XFER_SIZE -1 )) goto usbhsf_pio_prepare_pop; +/* return at this time if the pipe is running */ +if (usbhs_pipe_is_running (pipe)) +return 0 ; +usbhs_pipe_config_change_bfre (pipe,1 ); ret =usbhsf_fifo_select (pipe, fifo,0 );
@@ -1188,6 +1192,7 @@ static int usbhsf_dma_pop_done_with_usb_dmac(struct usbhs_pkt *pkt,usbhsf_fifo_clear (pipe, fifo); pkt->actual =usbhs_dma_calc_received_size (pkt, chan, rcv_len); +usbhs_pipe_running (pipe,0 );usbhsf_dma_stop (pipe, fifo);usbhsf_dma_unmap (pkt);usbhsf_fifo_unselect (pipe, pipe->fifo);
drivers/xen/tmem.c +4 -0
@@ -284,6 +284,10 @@ static int tmem_frontswap_store(unsigned type, pgoff_t offset,int pool = tmem_frontswap_poolid;int ret; +/* THP isn't supported */ +if (PageTransHuge (page)) +return -1 ; +if (pool <0 )return -1 ;if (ind64 != ind)
include/linux/kconfig.h +9 -0
@@ -4,6 +4,12 @@#include <generated/autoconf.h> +#ifdef CONFIG_CPU_BIG_ENDIAN +#define __BIG_ENDIAN 4321 +#else +#define __LITTLE_ENDIAN 1234 +#endif +#define __ARG_PLACEHOLDER_1 0,#define __take_second_arg (__ignored, val, ...) val
@@ -64,4 +70,7 @@*/ #define IS_ENABLED (option) __or(IS_BUILTIN(option), IS_MODULE(option)) +/* Make sure we always have all types and struct attributes defined. */ +#include <linux/compiler_types.h> +#endif /* __LINUX_KCONFIG_H */
mm/zswap.c +6 -0
@@ -970,6 +970,12 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,u8 *src, *dst;struct zswap_header *zhdr; +/* THP isn't supported */ +if (PageTransHuge (page)) { + ret = -EINVAL ; + goto reject; + } +if (!zswap_enabled || !tree) { ret = -ENODEV ; goto reject;
net/ipv4/ip_sockglue.c +1 -6
@@ -1563,10 +1563,7 @@ int ip_getsockopt(struct sock *sk, int level,if (get_user (len, optlen))return -EFAULT ; -lock_sock (sk); - err =nf_getsockopt (sk,PF_INET , optname, optval, - &len); -release_sock (sk); + err =nf_getsockopt (sk,PF_INET , optname, optval, &len);if (err >=0 ) err =put_user (len, optlen);return err;
@@ -1598,9 +1595,7 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,if (get_user (len, optlen))return -EFAULT ; -lock_sock (sk); err =compat_nf_getsockopt (sk,PF_INET , optname, optval, &len); -release_sock (sk);if (err >=0 ) err =put_user (len, optlen);return err;
net/ipv6/ipv6_sockglue.c +2 -8
@@ -1355,10 +1355,7 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname,if (get_user (len, optlen))return -EFAULT ; -lock_sock (sk); - err =nf_getsockopt (sk,PF_INET6 , optname, optval, - &len); -release_sock (sk); + err =nf_getsockopt (sk,PF_INET6 , optname, optval, &len);if (err >=0 ) err =put_user (len, optlen); }
@@ -1397,10 +1394,7 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,if (get_user (len, optlen))return -EFAULT ; -lock_sock (sk); - err =compat_nf_getsockopt (sk,PF_INET6 , - optname, optval, &len); -release_sock (sk); + err =compat_nf_getsockopt (sk,PF_INET6 , optname, optval, &len);if (err >=0 ) err =put_user (len, optlen); }
net/mac80211/cfg.c +1 -1
@@ -2863,7 +2863,7 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) }if (beacon->probe_resp_len) { new_beacon->probe_resp_len = beacon->probe_resp_len; - beacon->probe_resp = pos; + new_beacon->probe_resp = pos;memcpy (pos, beacon->probe_resp, beacon->probe_resp_len); pos += beacon->probe_resp_len; }