Linux 4.8.7
Greg KH
maintainerI'm announcing the release of the 4.8.7 kernel.
All users of the 4.8 kernel series must upgrade.
The updated 4.8.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.8.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/device-mapper/dm-raid.txt | 1 Makefile | 2 arch/arm/boot/dts/ste-snowball.dts | 15 +- arch/arm/mach-mvebu/Kconfig | 4 arch/arm/mm/abort-lv4t.S | 34 +++- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 arch/h8300/include/asm/thread_info.h | 4 arch/h8300/kernel/signal.c | 2 arch/mips/include/asm/kvm_host.h | 7 arch/mips/kernel/relocate.c | 2 arch/mips/kvm/emulate.c | 32 ++-- arch/parisc/kernel/syscall.S | 11 + arch/powerpc/include/asm/cpuidle.h | 2 arch/powerpc/include/asm/tlb.h | 12 + arch/powerpc/kernel/idle_book3s.S | 35 ++++ arch/powerpc/mm/tlb-radix.c | 8 - arch/s390/kvm/sthyi.c | 4 arch/x86/kernel/cpu/microcode/amd.c | 2 arch/x86/kernel/setup.c | 7 arch/x86/kvm/emulate.c | 2 arch/x86/kvm/x86.c | 4 drivers/android/binder.c | 35 +++- drivers/char/virtio_console.c | 22 ++- drivers/cpufreq/intel_pstate.c | 29 +++- drivers/dax/pmem.c | 2 drivers/firewire/net.c | 59 +++++--- drivers/gpio/gpiolib-acpi.c | 7 drivers/gpio/gpiolib.c | 99 +++++++++++-- drivers/gpu/drm/drm_atomic.c | 9 - drivers/gpu/drm/drm_dp_mst_topology.c | 6 drivers/gpu/drm/drm_fb_helper.c | 68 +++++---- drivers/gpu/drm/i915/intel_bios.c | 122 ++++++++++------- drivers/gpu/drm/i915/intel_display.c | 2 drivers/gpu/drm/i915/intel_dp.c | 71 +++++---- drivers/gpu/drm/i915/intel_fbc.c | 4 drivers/gpu/drm/i915/intel_pm.c | 24 +-- drivers/gpu/drm/imx/ipuv3-plane.c | 7 drivers/gpu/drm/nouveau/nouveau_acpi.c | 3 drivers/gpu/drm/radeon/ni.c | 4 drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 drivers/gpu/drm/radeon/si_dpm.c | 53 +++++-- drivers/hid/hid-ids.h | 1 drivers/hid/usbhid/hid-quirks.c | 1 drivers/hv/hv_util.c | 10 - drivers/i2c/busses/i2c-rk3x.c | 2 drivers/i2c/busses/i2c-xgene-slimpro.c | 2 drivers/i2c/i2c-core.c | 13 + drivers/iio/chemical/atlas-ph-sensor.c | 7 drivers/input/serio/i8042-x86ia64io.h | 7 drivers/md/dm-raid.c | 15 +- drivers/md/dm-raid1.c | 1 drivers/md/dm-rq.c | 7 drivers/md/dm-table.c | 24 +-- drivers/md/dm.c | 4 drivers/md/md.c | 4 drivers/md/raid1.c | 7 drivers/md/raid10.c | 7 drivers/media/platform/vsp1/vsp1_video.c | 7 drivers/misc/cxl/api.c | 2 drivers/misc/cxl/file.c | 22 +-- drivers/misc/genwqe/card_utils.c | 12 + drivers/misc/mei/hw-txe.c | 6 drivers/mmc/host/dw_mmc-pltfm.c | 5 drivers/mtd/ubi/fastmap.c | 17 +- drivers/net/wireless/ath/ath10k/core.h | 1 drivers/net/wireless/ath/ath10k/debug.c | 75 +++++----- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 25 --- drivers/net/wireless/ath/ath9k/hw.h | 1 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 4 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 + drivers/pwm/core.c | 2 drivers/pwm/sysfs.c | 18 ++ drivers/scsi/arcmsr/arcmsr_hba.c | 9 - drivers/scsi/scsi_debug.c | 1 drivers/spi/spi-fsl-espi.c | 2 drivers/spi/spi.c | 5 drivers/staging/wilc1000/host_interface.c | 1 drivers/thermal/intel_powerclamp.c | 14 - drivers/tty/vt/vt.c | 7 drivers/usb/chipidea/host.c | 2 drivers/usb/dwc3/gadget.c | 4 drivers/usb/gadget/function/u_ether.c | 5 drivers/usb/gadget/udc/atmel_usba_udc.c | 2 drivers/usb/host/ohci-hcd.c | 2 drivers/usb/host/xhci-hub.c | 41 +++++ drivers/usb/host/xhci-pci.c | 10 + drivers/usb/host/xhci.h | 3 drivers/usb/musb/omap2430.c | 7 drivers/usb/renesas_usbhs/rcar3.c | 8 - drivers/usb/serial/cp210x.c | 4 drivers/usb/serial/ftdi_sio.c | 3 drivers/usb/serial/ftdi_sio_ids.h | 5 drivers/usb/serial/usb-serial.c | 3 drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 4 drivers/video/fbdev/pxafb.c | 2 drivers/virtio/virtio_pci_legacy.c | 16 +- drivers/virtio/virtio_ring.c | 14 + fs/btrfs/inode.c | 9 - fs/btrfs/tree-log.c | 20 -- fs/nfsd/nfs4state.c | 10 - fs/overlayfs/copy_up.c | 2 fs/overlayfs/inode.c | 3 fs/overlayfs/super.c | 15 ++ fs/ubifs/dir.c | 16 +- fs/xfs/libxfs/xfs_dquot_buf.c | 3 include/linux/pwm.h | 5 include/uapi/linux/Kbuild | 1 kernel/time/timer.c | 74 ++++++---- mm/list_lru.c | 2 mm/memcontrol.c | 9 + mm/slab.c | 2 mm/vmscan.c | 2 net/mac80211/rx.c | 24 ++- net/netfilter/xt_NFLOG.c | 1 security/keys/Kconfig | 2 security/keys/big_key.c | 59 ++++---- security/keys/proc.c | 2 sound/core/seq/seq_timer.c | 4 sound/pci/hda/hda_intel.c | 7 sound/pci/hda/patch_realtek.c | 30 +++- sound/usb/quirks-table.h | 17 ++ 122 files changed, 1096 insertions(+), 541 deletions(-)
Aditya Shankar (1):
Staging: wilc1000: Fix kernel Oops on opening the device
Alex Deucher (1):
drm/radeon/si_dpm: workaround for SI kickers
Alexander Polakov (1):
mm/list_lru.c: avoid error-path NULL pointer deref
Alexander Usyskin (1):
mei: txe: don't clean an unprocessed interrupt cause.
Alexandre Belloni (1):
usb: gadget: udc: atmel: fix endpoint name
Andy Whitcroft (1):
dm raid: fix compat_features validation
Aneesh Kumar K.V (1):
powerpc/mm/radix: Use tlbiel only if we ever ran on the current cpu
Ard Biesheuvel (1):
ALSA: hda - allow 40 bit DMA mask for NVidia devices
Arnd Bergmann (1):
spi: fsl-espi: avoid processing uninitalized data on error
Artem Savkov (1):
security/keys: make BIG_KEYS dependent on stdrng.
Arve Hjønnevåg (2):
ANDROID: binder: Add strong ref checks
ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
Boris Brezillon (2):
UBI: fastmap: scrub PEB when bitflips are detected in a free PEB EC header
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
Borislav Petkov (1):
x86/microcode/AMD: Fix more fallout from CONFIG_RANDOMIZE_MEMORY=y
Bryan Paluch (1):
usb: increase ohci watchdog delay to 275 msec
Ching Huang (1):
scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware
Chris Mason (1):
btrfs: fix races on root_log_ctx lists
Christophe JAILLET (1):
usb: dwc3: Fix size used in dma_free_coherent()
Chuck Lever (1):
nfsd: Fix general protection fault in release_lock_stateid()
Dan Carpenter (1):
video: fbdev: pxafb: potential NULL dereference on error
Dan Williams (1):
device-dax: fix percpu_ref_exit ordering
Daniel Stone (1):
drm: i915: Wait for fences on new fb, not old
Darrick J. Wong (1):
libxfs: clean up _calc_dquots_per_chunk
David Arcari (1):
gpio / ACPI: fix returned error from acpi_dev_gpio_irq_get()
David Howells (2):
KEYS: Fix short sprintf buffer in /proc/keys show function
KEYS: Sort out big_key initialisation
David Hsu (1):
pwm: Unexport children before chip removal
David Wu (1):
i2c: rk3x: Give the tuning value 0 during rk3x_i2c_v0_calc_timings
Dmitry Vyukov (1):
tty: limit terminal size to 4M chars
Emilio López (1):
uapi: add missing install of sync_file.h
Eric Ernst (1):
thermal/powerclamp: correct cpu support check
Ewan D. Milne (1):
scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded
Felipe Balbi (1):
usb: gadget: function: u_ether: don't starve tx request queue
Felix Fietkau (1):
Revert "ath9k_hw: implement temperature compensation support for AR9003+"
Felix Monninger (1):
drm: Release reference from blob lookup after replacing property
Gerald Schaefer (1):
GenWQE: Fix bad page access during abort of resource allocation
Goldwyn Rodrigues (1):
btrfs: qgroup: Prevent qgroup->reserved from going subzero
Greg Kroah-Hartman (1):
Linux 4.8.7
Gregory CLEMENT (1):
ARM: mvebu: Select corediv clk for all mvebu v7 SoC
Heinz Mauelshagen (2):
dm mirror: fix read error on recovery after default leg failure dm raid: fix activation of existing raid4/10 devices
Hoan Tran (1):
i2c: xgene: Avoid dma_buffer overrun
Hui Wang (2):
ALSA: hda - Adding a new group of pin cfg into ALC295 pin quirk table
ALSA: hda - Fix headset mic detection problem for two Dell laptops
Ido Yariv (1):
KVM: x86: fix wbinvd_dirty_mask use-after-free
Jaehoon Chung (1):
mmc: dw_mmc-pltfm: fix the potential NULL pointer dereference
James Hogan (2):
KVM: MIPS: Make ERET handle ERL before EXL
KVM: MIPS: Precalculate MMIO load resume PC
Janosch Frank (1):
KVM: s390: Fix STHYI buffer alignment for diag224
Jes Sorensen (3):
rtl8xxxu: Fix memory leak in handling rxdesc16 packets
rtl8xxxu: Fix big-endian problem reporting mactime
rtl8xxxu: Fix rtl8723bu driver reload issue
Jiri Slaby (1):
tty: vt, fix bogus division in csi_J
Johan Hovold (2):
USB: serial: fix potential NULL-dereference at probe
USB: serial: cp210x: fix tiocmget error handling
Johannes Berg (1):
mac80211: discard multicast and 4-addr A-MSDUs
Johannes Weiner (1):
mm: memcontrol: do not recurse in direct reclaim
John David Anglin (1):
parisc: Ensure consistent state when switching to kernel stack at syscall entry
Joonsoo Kim (1):
mm/slab: fix kmemcg cache creation delayed issue
Ladi Prosek (1):
virtio_ring: Make interrupt suppression spec compliant
Lars-Peter Clausen (9):
gpio: GPIO_GET_CHIPINFO_IOCTL: Fix line offset validation
gpio: GPIO_GET_CHIPINFO_IOCTL: Fix information leak
gpio: GPIO_GET_LINEHANDLE_IOCTL: Validate line offset
gpio: GPIOHANDLE_GET_LINE_VALUES_IOCTL: Fix information leak
gpio: GPIO_GET_LINEEVENT_IOCTL: Validate line offset
gpio: GPIO_GET_LINEHANDLE_IOCTL: Reject invalid line flags
gpio: GPIO_GET_LINEEVENT_IOCTL: Reject invalid line and event flags
gpio: GPIOHANDLE_GET_LINE_VALUES_IOCTL: Fix another information leak
gpio: GPIO_GET_LINE{HANDLE,EVENT}_IOCTL: Fix file descriptor leak
Laurent Pinchart (1):
v4l: vsp1: Prevent pipelines from running when not streaming
Linus Walleij (1):
ARM: dts: fix the SD card on the Snowball
Liping Zhang (1):
netfilter: xt_NFLOG: fix unexpected truncated packet
Liu Ying (2):
drm/imx: ipuv3-plane: Switch EBA buffer only when we don't need modeset drm/imx: ipuv3-plane: Access old u/vbo properly in ->atomic_check for YU12/YV12
Long Li (1):
hv: do not lose pending heartbeat vmbus packets
Lucas Stach (1):
drm/radeon: drop register readback in cayman_cp_int_cntl_setup
Marcel Hasler (1):
ALSA: usb-audio: Add quirk for Syntek STK1160
Marcin Wojtas (1):
arm64: dts: marvell: fix clocksource for CP110 master SPI0
Mark Rutland (1):
h8300: fix syscall restarting
Marty Faltesek (1):
ath10k: cache calibration data when the core is stopped
Mathias Nyman (3):
xhci: use default USB_RESUME_TIMEOUT when resuming ports.
xhci: add restart quirk for Intel Wildcatpoint PCH
xhci: workaround for hosts missing CAS bit
Matt Redfearn (2):
MIPS: KASLR: Fix handling of NULL FDT
virtio: console: Unlock vqs while freeing buffers
Michel Dänzer (1):
Revert "drm/radeon: fix DP link training issue with second 4K monitor"
Mike Snitzer (1):
dm rq: clear kworker_task if kthread_run() returned an error
Miklos Szeredi (3):
ovl: fix get_acl() on tmpfs
ovl: update S_ISGID when setting posix ACLs
ovl: fsync after copy-up
NeilBrown (1):
md: be careful not lot leak internal curr_resync value into metadata. -- (all)
Oliver Neukum (1):
HID: usbhid: add ATEN CS962 to list of quirky devices
Owen Hofmann (1):
kvm: x86: Check memopp before dereference (CVE-2016-8630)
Patrick Scheuring (1):
Input: i8042 - add XMG C504 to keyboard reset table
Paul Mackerras (2):
powerpc/64: Re-fix race condition between going idle and entering guest powerpc/64: Fix race condition in setting lock bit in idle/wakeup code
Paulo Zanoni (3):
drm/i915/gen9: fix DDB partitioning for multi-screen cases drm/i915/gen9: fix watermarks when using the pipe scaler drm/i915/fbc: fix CFB size calculation for gen8+
Peter Wu (1):
drm/nouveau/acpi: fix check for power resources support
Rafael J. Wysocki (1):
cpufreq: intel_pstate: Set P-state upfront in performance mode
Ralf Ramsauer (2):
spi: mark device nodes only in case of successful instantiation
i2c: mark device nodes only in case of successful instantiation
Richard Weinberger (2):
ubifs: Abort readdir upon error
ubifs: Fix regression in ubifs_readdir()
Russell King (1):
ARM: fix oops when using older ARMv4T CPUs
Sandhya Bankar (1):
iio:chemical:atlas-ph-sensor: Fix use of 32 bit int to hold 16 bit big endian value
Scot Doyle (1):
vt: clear selection before resizing
Segher Boessenkool (1):
powerpc: Convert cmp to cmpd in idle enter sequence
Shaohua Li (2):
RAID1: ignore discard error
RAID10: ignore discard error
Stefan Richter (2):
firewire: net: guard against rx buffer overflows
firewire: net: fix fragmented datagram_size off-by-one
Stefan Tauner (1):
USB: serial: ftdi_sio: add support for Infineon TriBoard TC2X7
Stefan Wahren (1):
usb: chipidea: host: fix NULL ptr dereference during shutdown
Tahsin Erdogan (1):
dm: free io_barrier after blk_cleanup_queue call
Takashi Iwai (3):
ALSA: seq: Fix time account regression
ALSA: hda - Fix surround output pins for ASRock B150M mobo drm/fb-helper: Don't call dirty callback for untouched clips
Thomas Gleixner (5):
timers: Prevent base clock rewind when forwarding clock
timers: Prevent base clock corruption when forwarding
timers: Plug locking race vs. timer migration
timers: Lock base for same bucket optimization x86/smpboot: Init apic mapping before usage
Tom St Denis (1):
drm/radeon/si_dpm: Limit clocks on HD86xx part
Tony Lindgren (1):
usb: musb: Fix hardirq-safe hardirq-unsafe lock order error
Vaibhav Jain (1):
cxl: Fix leaking pid refs in some error paths
Ville Syrjälä (6):
drm/dp/mst: Clear port->pdt when tearing down the i2c adapter drm/fb-helper: Fix connector ref leak on error drm/fb-helper: Keep references for the current set of used connectors drm/dp/mst: Check peer device type before attempting EDID read drm/i915: Respect alternate_aux_channel for all DDI ports drm/i915: Clean up DDI DDC/AUX CH sanitation
Vladimir Zapolskiy (1):
i2c: core: fix NULL pointer dereference under race condition
Wei Yongjun (1):
omapfb: fix return value check in dsi_bind()
Will Deacon (1):
virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices
Yoshihiro Shimoda (1):
usb: renesas_usbhs: add wait after initialization for R-Car Gen3
tang.junhui (1):
dm table: fix missing dm_put_target_type() in dm_table_add_target()
Greg KH
maintainerDocumentation/device-mapper/dm-raid.txt +1 -0
@@ -309,3 +309,4 @@ Version History with a reshape in progress. 1.9.0 Add support for RAID level takeover/reshape/region size and set size reduction. +1.9.1 Fix activation of existing RAID 4/10 mapped devices
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 8 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = NAME = Psychotic Stoned Sheep
arch/arm/boot/dts/ste-snowball.dts +13 -2
@@ -239,14 +239,25 @@ arm,primecell-periphid = <0x10480180>; max-frequency = <100000000>; bus-width = <4>; + cap-sd-highspeed; cap-mmc-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + /* All direction control is used */ + st,sig-dir-cmd; + st,sig-dir-dat0; + st,sig-dir-dat2; + st,sig-dir-dat31; + st,sig-pin-fbclk; + full-pwr-cycle; vmmc-supply = <&ab8500_ldo_aux3_reg>; vqmmc-supply = <&vmmci>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdi0_default_mode>; pinctrl-1 = <&sdi0_sleep_mode>; - cd-gpios = <&gpio6 26 GPIO_ACTIVE_LOW>; // 218 + /* GPIO218 MMC_CD */ + cd-gpios = <&gpio6 26 GPIO_ACTIVE_LOW>; status = "okay"; };
@@ -549,7 +560,7 @@ /* VMMCI level-shifter enable */ snowball_cfg3 { pins = "GPIO217_AH12"; - ste,config = <&gpio_out_lo>; + ste,config = <&gpio_out_hi>; }; /* VMMCI level-shifter voltage select */ snowball_cfg4 {
arch/arm/mach-mvebu/Kconfig +1 -3
@@ -23,6 +23,7 @@ config MACH_MVEBU_V7 select CACHE_L2X0 select ARM_CPU_SUSPEND select MACH_MVEBU_ANY + select MVEBU_CLK_COREDIV config MACH_ARMADA_370 bool "Marvell Armada 370 boards"
@@ -32,7 +33,6 @@ config MACH_ARMADA_370 select CPU_PJ4B select MACH_MVEBU_V7 select PINCTRL_ARMADA_370 - select MVEBU_CLK_COREDIV help Say 'Y' here if you want your kernel to support boards based on the Marvell Armada 370 SoC with device tree.
@@ -50,7 +50,6 @@ config MACH_ARMADA_375 select HAVE_SMP select MACH_MVEBU_V7 select PINCTRL_ARMADA_375 - select MVEBU_CLK_COREDIV help Say 'Y' here if you want your kernel to support boards based on the Marvell Armada 375 SoC with device tree.
@@ -68,7 +67,6 @@ config MACH_ARMADA_38X select HAVE_SMP select MACH_MVEBU_V7 select PINCTRL_ARMADA_38X - select MVEBU_CLK_COREDIV help Say 'Y' here if you want your kernel to support boards based on the Marvell Armada 380/385 SoC with device tree.
arch/arm/mm/abort-lv4t.S +24 -10
@@ -7,7 +7,7 @@ * : r4 = aborted context pc * : r5 = aborted context psr * - * Returns : r4-r5, r10-r11, r13 preserved + * Returns : r4-r5, r9-r11, r13 preserved * * Purpose : obtain information about current aborted instruction. * Note: we read user space. This means we might cause a data
@@ -48,7 +48,10 @@ ENTRY(v4t_late_abort) /* c */ b do_DataAbort @ ldc rd, [rn], #m @ Same as ldr rd, [rn], #m /* d */ b do_DataAbort @ ldc rd, [rn, #m] /* e */ b .data_unknown -/* f */ +/* f */ b .data_unknown + +.data_unknown_r9: + ldr r9, [sp], #4 .data_unknown: @ Part of jumptable mov r0, r4 mov r1, r8
@@ -57,6 +60,7 @@ ENTRY(v4t_late_abort) .data_arm_ldmstm: tst r8, #1 << 21 @ check writeback bit beq do_DataAbort @ no writeback -> no fixup + str r9, [sp, #-4]! mov r7, #0x11 orr r7, r7, #0x1100 and r6, r8, r7
@@ -75,12 +79,14 @@ ENTRY(v4t_late_abort) subne r7, r7, r6, lsl #2 @ Undo increment addeq r7, r7, r6, lsl #2 @ Undo decrement str r7, [r2, r9, lsr #14] @ Put register 'Rn' + ldr r9, [sp], #4 b do_DataAbort .data_arm_lateldrhpre: tst r8, #1 << 21 @ Check writeback bit beq do_DataAbort @ No writeback -> no fixup .data_arm_lateldrhpost: + str r9, [sp, #-4]! and r9, r8, #0x00f @ get Rm / low nibble of immediate value tst r8, #1 << 22 @ if (immediate offset) andne r6, r8, #0xf00 @ { immediate high nibble
@@ -93,6 +99,7 @@ ENTRY(v4t_late_abort) subne r7, r7, r6 @ Undo incrmenet addeq r7, r7, r6 @ Undo decrement str r7, [r2, r9, lsr #14] @ Put register 'Rn' + ldr r9, [sp], #4 b do_DataAbort .data_arm_lateldrpreconst:
@@ -101,12 +108,14 @@ ENTRY(v4t_late_abort) .data_arm_lateldrpostconst: movs r6, r8, lsl #20 @ Get offset beq do_DataAbort @ zero -> no fixup + str r9, [sp, #-4]! and r9, r8, #15 << 16 @ Extract 'n' from instruction ldr r7, [r2, r9, lsr #14] @ Get register 'Rn' tst r8, #1 << 23 @ Check U bit subne r7, r7, r6, lsr #20 @ Undo increment addeq r7, r7, r6, lsr #20 @ Undo decrement str r7, [r2, r9, lsr #14] @ Put register 'Rn' + ldr r9, [sp], #4 b do_DataAbort .data_arm_lateldrprereg:
@@ -115,6 +124,7 @@ ENTRY(v4t_late_abort) .data_arm_lateldrpostreg: and r7, r8, #15 @ Extract 'm' from instruction ldr r6, [r2, r7, lsl #2] @ Get register 'Rm' + str r9, [sp, #-4]! mov r9, r8, lsr #7 @ get shift count ands r9, r9, #31 and r7, r8, #0x70 @ get shift type
@@ -126,33 +136,33 @@ ENTRY(v4t_late_abort) b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn @ 1: LSL #0 nop - b .data_unknown @ 2: MUL? + b .data_unknown_r9 @ 2: MUL? nop - b .data_unknown @ 3: MUL? + b .data_unknown_r9 @ 3: MUL? nop mov r6, r6, lsr r9 @ 4: LSR #!0 b .data_arm_apply_r6_and_rn mov r6, r6, lsr #32 @ 5: LSR #32 b .data_arm_apply_r6_and_rn - b .data_unknown @ 6: MUL? + b .data_unknown_r9 @ 6: MUL? nop - b .data_unknown @ 7: MUL? + b .data_unknown_r9 @ 7: MUL? nop mov r6, r6, asr r9 @ 8: ASR #!0 b .data_arm_apply_r6_and_rn mov r6, r6, asr #32 @ 9: ASR #32 b .data_arm_apply_r6_and_rn - b .data_unknown @ A: MUL? + b .data_unknown_r9 @ A: MUL? nop - b .data_unknown @ B: MUL? + b .data_unknown_r9 @ B: MUL? nop mov r6, r6, ror r9 @ C: ROR #!0 b .data_arm_apply_r6_and_rn mov r6, r6, rrx @ D: RRX b .data_arm_apply_r6_and_rn - b .data_unknown @ E: MUL? + b .data_unknown_r9 @ E: MUL? nop - b .data_unknown @ F: MUL? + b .data_unknown_r9 @ F: MUL? .data_thumb_abort: ldrh r8, [r4] @ read instruction
@@ -190,6 +200,7 @@ ENTRY(v4t_late_abort) .data_thumb_pushpop: tst r8, #1 << 10 beq .data_unknown + str r9, [sp, #-4]! and r6, r8, #0x55 @ hweight8(r8) + R bit and r9, r8, #0xaa add r6, r6, r9, lsr #1
@@ -204,9 +215,11 @@ ENTRY(v4t_late_abort) addeq r7, r7, r6, lsl #2 @ increment SP if PUSH subne r7, r7, r6, lsl #2 @ decrement SP if POP str r7, [r2, #13 << 2] + ldr r9, [sp], #4 b do_DataAbort .data_thumb_ldmstm: + str r9, [sp, #-4]! and r6, r8, #0x55 @ hweight8(r8) and r9, r8, #0xaa add r6, r6, r9, lsr #1
@@ -219,4 +232,5 @@ ENTRY(v4t_late_abort) and r6, r6, #15 @ number of regs to transfer sub r7, r7, r6, lsl #2 @ always decrement str r7, [r2, r9, lsr #6] + ldr r9, [sp], #4 b do_DataAbort
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +1 -1
@@ -131,7 +131,7 @@ #address-cells = <0x1>; #size-cells = <0x0>; cell-index = <1>; - clocks = <&cpm_syscon0 0 3>; + clocks = <&cpm_syscon0 1 21>; status = "disabled"; };
arch/h8300/include/asm/thread_info.h +0 -4
@@ -31,7 +31,6 @@ struct thread_info {int cpu;/* cpu we're on */ int preempt_count;/* 0 => preemptable, <0 => BUG */ mm_segment_t addr_limit; -struct restart_block restart_block; };/*
@@ -44,9 +43,6 @@ struct thread_info { .cpu = 0, \ .preempt_count = INIT_PREEMPT_COUNT, \ .addr_limit = KERNEL_DS, \ - .restart_block = { \ - .fn = do_no_restart_syscall, \ - }, \ }#define init_thread_info (init_thread_union.thread_info)
arch/h8300/kernel/signal.c +1 -1
@@ -79,7 +79,7 @@ restore_sigcontext(struct sigcontext *usc, int *pd0)unsigned int er0;/* Always make any pending restarted system calls return -EINTR */ -current_thread_info ()->restart_block.fn = do_no_restart_syscall; + current->restart_block.fn = do_no_restart_syscall;/* restore passed registers */ #define COPY (r) do { err |= get_user(regs->r, &usc->sc_##r); } while (0)
arch/mips/include/asm/kvm_host.h +4 -3
@@ -279,7 +279,10 @@ struct kvm_vcpu_arch {/* Host KSEG0 address of the EI/DI offset */ void *kseg0_commpage; -u32 io_gpr;/* GPR used as IO source/target */ +/* Resume PC after MMIO completion */ +unsigned long io_pc; +/* GPR used as IO source/target */ +u32 io_gpr;struct hrtimer comparecount_timer;/* Count timer control KVM register */
@@ -301,8 +304,6 @@ struct kvm_vcpu_arch {/* Bitmask of pending exceptions to be cleared */ unsigned long pending_exceptions_clr; -u32 pending_load_cause; -/* Save/Restore the entryhi register when are are preempted/scheduled back in */ unsigned long preempt_entryhi;
arch/mips/kernel/relocate.c +1 -1
@@ -200,7 +200,7 @@ static inline __init unsigned long get_random_boot(void)#if defined(CONFIG_USE_OF )/* Get any additional entropy passed in device tree */ - { +if (initial_boot_params) {int node, len;u64 *prop;
arch/mips/kvm/emulate.c +19 -13
@@ -791,15 +791,15 @@ enum emulation_result kvm_mips_emul_eret(struct kvm_vcpu *vcpu)struct mips_coproc *cop0 = vcpu->arch.cop0;enum emulation_result er =EMULATE_DONE ; -if (kvm_read_c0_guest_status (cop0) &ST0_EXL ) { +if (kvm_read_c0_guest_status (cop0) &ST0_ERL ) { +kvm_clear_c0_guest_status (cop0,ST0_ERL ); + vcpu->arch.pc =kvm_read_c0_guest_errorepc (cop0); + }else if (kvm_read_c0_guest_status (cop0) &ST0_EXL ) {kvm_debug ("[%#lx] ERET to %#lx\n" , vcpu->arch.pc,kvm_read_c0_guest_epc (cop0));kvm_clear_c0_guest_status (cop0,ST0_EXL ); vcpu->arch.pc =kvm_read_c0_guest_epc (cop0); - }else if (kvm_read_c0_guest_status (cop0) &ST0_ERL ) { -kvm_clear_c0_guest_status (cop0,ST0_ERL ); - vcpu->arch.pc =kvm_read_c0_guest_errorepc (cop0); }else {kvm_err ("[%#lx] ERET when MIPS_SR_EXL|MIPS_SR_ERL == 0\n" , vcpu->arch.pc);
@@ -1522,13 +1522,25 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, struct kvm_vcpu *vcpu) {enum emulation_result er =EMULATE_DO_MMIO ; +unsigned long curr_pc;u32 op, rt;u32 bytes; rt = inst.i_format.rt; op = inst.i_format.opcode; - vcpu->arch.pending_load_cause = cause; +/* +* Find the resume PC now while we have safe and easy access to the +* prior branch instruction, and save it for +* kvm_mips_complete_mmio_load() to restore later. +*/ + curr_pc = vcpu->arch.pc; + er =update_pc (vcpu, cause); +if (er ==EMULATE_FAIL ) +return er; + vcpu->arch.io_pc = vcpu->arch.pc; + vcpu->arch.pc = curr_pc; + vcpu->arch.io_gpr = rt;switch (op) {
@@ -2488,9 +2500,8 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, goto done; } - er =update_pc (vcpu, vcpu->arch.pending_load_cause); -if (er ==EMULATE_FAIL ) -return er; +/* Restore saved resume PC */ + vcpu->arch.pc = vcpu->arch.io_pc;switch (run->mmio.len) {case 4 :
@@ -2512,11 +2523,6 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu,break ; } -if (vcpu->arch.pending_load_cause &CAUSEF_BD ) -kvm_debug ("[%#lx] Completing %d byte BD Load to gpr %d (0x%08lx) type %d\n" , - vcpu->arch.pc, run->mmio.len, vcpu->arch.io_gpr, *gpr, - vcpu->mmio_needed); - done:return er; }
arch/parisc/kernel/syscall.S +9 -2
@@ -106,8 +106,6 @@ linux_gateway_entry: mtsp %r0,%sr4 /* get kernel space into sr4 */ mtsp %r0,%sr5 /* get kernel space into sr5 */ mtsp %r0,%sr6 /* get kernel space into sr6 */ - mfsp %sr7,%r1 /* save user sr7 */ - mtsp %r1,%sr3 /* and store it in sr3 */ #ifdef CONFIG_64BIT /* for now we can *always* set the W bit on entry to the syscall
@@ -133,6 +131,14 @@ linux_gateway_entry: depdi 0, 31, 32, %r21 1: #endif + + /* We use a rsm/ssm pair to prevent sr3 from being clobbered + * by external interrupts. + */ + mfsp %sr7,%r1 /* save user sr7 */ + rsm PSW_SM_I, %r0 /* disable interrupts */ + mtsp %r1,%sr3 /* and store it in sr3 */ + mfctl %cr30,%r1 xor %r1,%r30,%r30 /* ye olde xor trick */ xor %r1,%r30,%r1
@@ -147,6 +153,7 @@ linux_gateway_entry: */ mtsp %r0,%sr7 /* get kernel space into sr7 */ + ssm PSW_SM_I, %r0 /* enable interrupts */ STREGM %r1,FRAME_SIZE(%r30) /* save r1 (usp) here for now */ mfctl %cr30,%r1 /* get task ptr in %r1 */ LDREG TI_TASK(%r1),%r1
arch/powerpc/include/asm/cpuidle.h +1 -1
@@ -26,7 +26,7 @@ extern u64 pnv_first_deep_stop_state; std r0,0(r1); \ ptesync; \ ld r0,0(r1); \ -1: cmp cr0,r0,r0; \ +1: cmpd cr0,r0,r0; \ bne 1b; \IDLE_INST ; \ b .
arch/powerpc/include/asm/tlb.h +12 -0
@@ -52,11 +52,23 @@ static inline int mm_is_core_local(struct mm_struct *mm)return cpumask_subset (mm_cpumask (mm),topology_sibling_cpumask (smp_processor_id ())); } + +static inline int mm_is_thread_local (struct mm_struct *mm) +{ +return cpumask_equal (mm_cpumask (mm), +cpumask_of (smp_processor_id ())); +} +#else static inline int mm_is_core_local (struct mm_struct *mm) {return 1 ; } + +static inline int mm_is_thread_local (struct mm_struct *mm) +{ +return 1 ; +}#endif #endif /* __KERNEL__ */
arch/powerpc/kernel/idle_book3s.S +29 -6
@@ -90,6 +90,7 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_ARCH_300) * Threads will spin in HMT_LOW until the lock bit is cleared. * r14 - pointer to core_idle_state * r15 - used to load contents of core_idle_state + * r9 - used as a temporary variable */ core_idle_lock_held:
@@ -99,6 +100,8 @@ core_idle_lock_held: bne 3b HMT_MEDIUM lwarx r15,0,r14 + andi. r9,r15,PNV_CORE_IDLE_LOCK_BIT + bne core_idle_lock_held blr /*
@@ -163,12 +166,6 @@ _GLOBAL(pnv_powersave_common) std r9,_MSR(r1) std r1,PACAR1(r13) -#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE - /* Tell KVM we're entering idle */ - li r4,KVM_HWTHREAD_IN_IDLE - stb r4,HSTATE_HWTHREAD_STATE(r13) -#endif - /* * Go to real mode to do the nap, as required by the architecture. * Also, we need to be in real mode before setting hwthread_state,
@@ -185,6 +182,26 @@ _GLOBAL(pnv_powersave_common) .globl pnv_enter_arch207_idle_mode pnv_enter_arch207_idle_mode: +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE + /* Tell KVM we're entering idle */ + li r4,KVM_HWTHREAD_IN_IDLE + /******************************************************/ + /* N O T E W E L L ! ! ! N O T E W E L L */ + /* The following store to HSTATE_HWTHREAD_STATE(r13) */ + /* MUST occur in real mode, i.e. with the MMU off, */ + /* and the MMU must stay off until we clear this flag */ + /* and test HSTATE_HWTHREAD_REQ(r13) in the system */ + /* reset interrupt vector in exceptions-64s.S. */ + /* The reason is that another thread can switch the */ + /* MMU to a guest context whenever this flag is set */ + /* to KVM_HWTHREAD_IN_IDLE, and if the MMU was on, */ + /* that would potentially cause this thread to start */ + /* executing instructions from guest memory in */ + /* hypervisor mode, leading to a host crash or data */ + /* corruption, or worse. */ + /******************************************************/ + stb r4,HSTATE_HWTHREAD_STATE(r13) +#endif stb r3,PACA_THREAD_IDLE_STATE(r13) cmpwi cr3,r3,PNV_THREAD_SLEEP bge cr3,2f
@@ -250,6 +267,12 @@ enter_winkle: * r3 - requested stop state */ power_enter_stop: +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE + /* Tell KVM we're entering idle */ + li r4,KVM_HWTHREAD_IN_IDLE + /* DO THIS IN REAL MODE! See comment above. */ + stb r4,HSTATE_HWTHREAD_STATE(r13) +#endif /* * Check if the requested state is a deep idle state. */
arch/powerpc/mm/tlb-radix.c +4 -4
@@ -175,7 +175,7 @@ void radix__flush_tlb_mm(struct mm_struct *mm)if (unlikely (pid ==MMU_NO_CONTEXT )) goto no_context; -if (!mm_is_core_local (mm)) { +if (!mm_is_thread_local (mm)) {int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE );if (lock_tlbie)
@@ -201,7 +201,7 @@ void radix__flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr)if (unlikely (pid ==MMU_NO_CONTEXT )) goto no_context; -if (!mm_is_core_local (mm)) { +if (!mm_is_thread_local (mm)) {int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE );if (lock_tlbie)
@@ -226,7 +226,7 @@ void radix__flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmaddr, pid = mm ? mm->context.id :0 ;if (unlikely (pid ==MMU_NO_CONTEXT )) goto bail; -if (!mm_is_core_local (mm)) { +if (!mm_is_thread_local (mm)) {int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE );if (lock_tlbie)
@@ -321,7 +321,7 @@ void radix__flush_tlb_range_psize(struct mm_struct *mm, unsigned long start, {unsigned long pid;unsigned long addr; -int local =mm_is_core_local (mm); +int local =mm_is_thread_local (mm);unsigned long ap =mmu_get_ap (psize);int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE );unsigned long page_size =1UL << mmu_psize_defs[psize].shift;
arch/s390/kvm/sthyi.c +2 -2
@@ -315,7 +315,7 @@ static void fill_diag(struct sthyi_sctns *sctns)if (r <0 ) goto out; - diag224_buf =kmalloc (PAGE_SIZE ,GFP_KERNEL |GFP_DMA ); + diag224_buf = (void *)__get_free_page (GFP_KERNEL |GFP_DMA );if (!diag224_buf ||diag224 (diag224_buf)) goto out;
@@ -378,7 +378,7 @@ static void fill_diag(struct sthyi_sctns *sctns) sctns->par.infpval1 |=PAR_WGHT_VLD ; out: -kfree (diag224_buf); +free_page ((unsigned long )diag224_buf);vfree (diag204_buf); }
arch/x86/kernel/cpu/microcode/amd.c +1 -1
@@ -429,7 +429,7 @@ int __init save_microcode_in_initrd_amd(void)* We need the physical address of the container for both bitness since * boot_params.hdr.ramdisk_image is a physical address. */ - cont =__pa (container); + cont =__pa_nodebug (container); cont_va = container;#endif
arch/x86/kernel/setup.c +6 -1
@@ -1222,11 +1222,16 @@ void __init setup_arch(char **cmdline_p)if (smp_found_config)get_smp_config (); +/* +* Systems w/o ACPI and mptables might not have it mapped the local +* APIC yet, but prefill_possible_map() might need to access it. +*/ +init_apic_mappings (); +prefill_possible_map ();init_cpu_to_node (); -init_apic_mappings ();io_apic_init_mappings ();kvm_guest_init ();
arch/x86/kvm/emulate.c +1 -1
@@ -5045,7 +5045,7 @@ done_prefixes:/* Decode and fetch the destination operand: register or memory. */ rc =decode_operand (ctxt, &ctxt->dst, (ctxt->d >> DstShift) & OpMask); -if (ctxt->rip_relative) +if (ctxt->rip_relative &&likely (ctxt->memopp)) ctxt->memopp->addr.mem.ea =address_mask (ctxt, ctxt->memopp->addr.mem.ea + ctxt->_eip);
arch/x86/kvm/x86.c +3 -1
@@ -7372,10 +7372,12 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) { +void *wbinvd_dirty_mask = vcpu->arch.wbinvd_dirty_mask; +kvmclock_reset (vcpu); -free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); kvm_x86_ops->vcpu_free (vcpu); +free_cpumask_var (wbinvd_dirty_mask); } struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
drivers/android/binder.c +26 -9
@@ -1003,7 +1003,7 @@ static int binder_dec_node(struct binder_node *node, int strong, int internal)static struct binder_ref *binder_get_ref (struct binder_proc *proc, -uint32_t desc) +u32 desc,bool need_strong_ref) {struct rb_node *n = proc->refs_by_desc.rb_node;struct binder_ref *ref;
@@ -1011,12 +1011,16 @@ static struct binder_ref *binder_get_ref(struct binder_proc *proc,while (n) { ref = rb_entry(n, struct binder_ref, rb_node_desc); -if (desc < ref->desc) +if (desc < ref->desc) { n = n->rb_left; -else if (desc > ref->desc) + }else if (desc > ref->desc) { n = n->rb_right; -else + }else if (need_strong_ref && !ref->strong) { +binder_user_error ("tried to use weak ref as strong ref\n" ); +return NULL ; + }else {return ref; + } }return NULL ; }
@@ -1286,7 +1290,10 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, }break ;case BINDER_TYPE_HANDLE :case BINDER_TYPE_WEAK_HANDLE : { -struct binder_ref *ref =binder_get_ref (proc, fp->handle); +struct binder_ref *ref; + + ref =binder_get_ref (proc, fp->handle, + fp->type ==BINDER_TYPE_HANDLE );if (ref ==NULL ) { pr_err("transaction release %d bad handle %d\n",
@@ -1381,7 +1388,7 @@ static void binder_transaction(struct binder_proc *proc,if (tr->target.handle) {struct binder_ref *ref; - ref =binder_get_ref (proc, tr->target.handle); + ref =binder_get_ref (proc, tr->target.handle, true);if (ref ==NULL ) {binder_user_error ("%d:%d got transaction to invalid handle\n" , proc->pid, thread->pid);
@@ -1578,7 +1585,9 @@ static void binder_transaction(struct binder_proc *proc, fp->type =BINDER_TYPE_HANDLE ; else fp->type = BINDER_TYPE_WEAK_HANDLE; + fp->binder =0 ; fp->handle = ref->desc; + fp->cookie =0 ;binder_inc_ref (ref, fp->type ==BINDER_TYPE_HANDLE , &thread->todo);
@@ -1590,7 +1599,10 @@ static void binder_transaction(struct binder_proc *proc, }break ;case BINDER_TYPE_HANDLE :case BINDER_TYPE_WEAK_HANDLE : { -struct binder_ref *ref =binder_get_ref (proc, fp->handle); +struct binder_ref *ref; + + ref =binder_get_ref (proc, fp->handle, + fp->type ==BINDER_TYPE_HANDLE );if (ref ==NULL ) { binder_user_error("%d:%d got transaction with invalid handle, %d\n",
@@ -1625,7 +1637,9 @@ static void binder_transaction(struct binder_proc *proc, return_error =BR_FAILED_REPLY ; goto err_binder_get_ref_for_node_failed; } + fp->binder =0 ; fp->handle = new_ref->desc; + fp->cookie =0 ;binder_inc_ref (new_ref, fp->type ==BINDER_TYPE_HANDLE ,NULL );trace_binder_transaction_ref_to_ref (t, ref, new_ref);
@@ -1679,6 +1693,7 @@ static void binder_transaction(struct binder_proc *proc,binder_debug (BINDER_DEBUG_TRANSACTION ," fd %d -> %d\n" , fp->handle, target_fd);/* TODO: fput? */ + fp->binder =0 ; fp->handle = target_fd; }break ;
@@ -1801,7 +1816,9 @@ static int binder_thread_write(struct binder_proc *proc, ref->desc); } }else - ref =binder_get_ref (proc, target); + ref =binder_get_ref (proc, target, + cmd ==BC_ACQUIRE || + cmd ==BC_RELEASE );if (ref ==NULL ) {binder_user_error ("%d:%d refcount change on invalid ref %d\n" , proc->pid, thread->pid, target);
@@ -1997,7 +2014,7 @@ static int binder_thread_write(struct binder_proc *proc,if (get_user (cookie, (binder_uintptr_t __user *)ptr))return -EFAULT ; ptr +=sizeof (binder_uintptr_t); - ref =binder_get_ref (proc, target); + ref =binder_get_ref (proc, target, false);if (ref ==NULL ) { binder_user_error("%d:%d %s invalid ref %d\n", proc->pid, thread->pid,
drivers/char/virtio_console.c +16 -6
@@ -1540,19 +1540,29 @@ static void remove_port_data(struct port *port)spin_lock_irq (&port->inbuf_lock);/* Remove unused data this port might have received. */ discard_port_data (port); +spin_unlock_irq (&port->inbuf_lock);/* Remove buffers we queued up for the Host to send us data in. */ -while ((buf =virtqueue_detach_unused_buf (port->in_vq))) -free_buf (buf, true); -spin_unlock_irq (&port->inbuf_lock); +do { +spin_lock_irq (&port->inbuf_lock); + buf =virtqueue_detach_unused_buf (port->in_vq); +spin_unlock_irq (&port->inbuf_lock); +if (buf) +free_buf (buf, true); + }while (buf);spin_lock_irq (&port->outvq_lock);reclaim_consumed_buffers (port); +spin_unlock_irq (&port->outvq_lock);/* Free pending buffers from the out-queue. */ -while ((buf =virtqueue_detach_unused_buf (port->out_vq))) -free_buf (buf, true); -spin_unlock_irq (&port->outvq_lock); +do { +spin_lock_irq (&port->outvq_lock); + buf =virtqueue_detach_unused_buf (port->out_vq); +spin_unlock_irq (&port->outvq_lock); +if (buf) +free_buf (buf, true); + }while (buf); }/*
drivers/cpufreq/intel_pstate.c +25 -4
@@ -1133,10 +1133,8 @@ static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max) *min =clamp_t (int, min_perf, cpu->pstate.min_pstate, max_perf); } -static void intel_pstate_set_min_pstate (struct cpudata *cpu) +static void intel_pstate_set_pstate (struct cpudata *cpu,int pstate) { -int pstate = cpu->pstate.min_pstate; -trace_cpu_frequency (pstate * cpu->pstate.scaling, cpu->cpu); cpu->pstate.current_pstate = pstate;/*
@@ -1148,6 +1146,20 @@ static void intel_pstate_set_min_pstate(struct cpudata *cpu) pstate_funcs.get_val(cpu, pstate)); } +static void intel_pstate_set_min_pstate (struct cpudata *cpu) +{ +intel_pstate_set_pstate (cpu, cpu->pstate.min_pstate); +} + +static void intel_pstate_max_within_limits (struct cpudata *cpu) +{ +int min_pstate, max_pstate; + +update_turbo_state (); +intel_pstate_get_min_max (cpu, &min_pstate, &max_pstate); +intel_pstate_set_pstate (cpu, max_pstate); +} +static void intel_pstate_get_cpu_pstates (struct cpudata *cpu) { cpu->pstate.min_pstate = pstate_funcs.get_min ();
@@ -1465,7 +1477,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)pr_debug ("set_policy cpuinfo.max %u policy->max %u\n" , policy->cpuinfo.max_freq, policy->max); - cpu = all_cpu_data[0 ]; + cpu = all_cpu_data[policy->cpu];if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate && policy->max < policy->cpuinfo.max_freq && policy->max > cpu->pstate.max_pstate * cpu->pstate.scaling) {
@@ -1509,6 +1521,15 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) limits->max_perf =round_up (limits->max_perf,FRAC_BITS ); out: +if (policy->policy ==CPUFREQ_POLICY_PERFORMANCE ) { +/* +* NOHZ_FULL CPUs need this as the governor callback may not +* be invoked on them. +*/ +intel_pstate_clear_update_util_hook (policy->cpu); +intel_pstate_max_within_limits (cpu); + } +intel_pstate_set_update_util_hook (policy->cpu);intel_pstate_hwp_set_policy (policy);
drivers/dax/pmem.c +1 -1
@@ -44,7 +44,6 @@ static void dax_pmem_percpu_exit(void *data)dev_dbg (dax_pmem->dev,"%s\n" , __func__);percpu_ref_exit (ref); -wait_for_completion (&dax_pmem->cmp); }static void dax_pmem_percpu_kill (void *data)
@@ -54,6 +53,7 @@ static void dax_pmem_percpu_kill(void *data)dev_dbg (dax_pmem->dev,"%s\n" , __func__);percpu_ref_kill (ref); +wait_for_completion (&dax_pmem->cmp); }static int dax_pmem_probe (struct device *dev)
drivers/firewire/net.c +39 -20
109 lines not on this page · raw message
drivers/gpio/gpiolib-acpi.c +5 -2
@@ -602,14 +602,17 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) {int idx, i;unsigned int irq_flags; +int ret = -ENOENT ;for (i =0 , idx =0 ; idx <= index; i++) {struct acpi_gpio_info info;struct gpio_desc *desc; desc =acpi_get_gpiod_by_index (adev,NULL , i, &info); -if (IS_ERR (desc)) +if (IS_ERR (desc)) { + ret =PTR_ERR (desc);break ; + }if (info.gpioint && idx++ == index) {int irq =gpiod_to_irq (desc);
@@ -628,7 +631,7 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) } } -return -ENOENT ; +return ret; }EXPORT_SYMBOL_GPL (acpi_dev_gpio_irq_get);
drivers/gpio/gpiolib.c +86 -13
202 lines not on this page · raw message
drivers/gpu/drm/drm_atomic.c +6 -3
@@ -420,18 +420,21 @@ drm_atomic_replace_property_blob_from_id(struct drm_crtc *crtc,ssize_t expected_size, bool *replaced) { - struct drm_device *dev = crtc->dev; struct drm_property_blob *new_blob = NULL;if (blob_id !=0 ) { - new_blob =drm_property_lookup_blob (dev, blob_id); + new_blob =drm_property_lookup_blob (crtc->dev, blob_id);if (new_blob ==NULL )return -EINVAL ; -if (expected_size >0 && expected_size != new_blob->length) + +if (expected_size >0 && expected_size != new_blob->length) { +drm_property_unreference_blob (new_blob);return -EINVAL ; + } }drm_atomic_replace_property_blob (blob, new_blob, replaced); +drm_property_unreference_blob (new_blob);return 0 ; }
drivers/gpu/drm/drm_dp_mst_topology.c +5 -1
@@ -914,6 +914,7 @@ static void drm_dp_destroy_port(struct kref *kref)/* no need to clean up vcpi * as if we have no connector we never setup a vcpi */ drm_dp_port_teardown_pdt (port, port->pdt); + port->pdt =DP_PEER_DEVICE_NONE ; }kfree (port); }
@@ -1159,7 +1160,9 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,drm_dp_put_port (port); goto out; } -if (port->port_num >=DP_MST_LOGICAL_PORT_0 ) { +if ((port->pdt ==DP_PEER_DEVICE_DP_LEGACY_CONV || + port->pdt ==DP_PEER_DEVICE_SST_SINK ) && + port->port_num >=DP_MST_LOGICAL_PORT_0 ) { port->cached_edid =drm_get_edid (port->connector, &port->aux.ddc);drm_mode_connector_set_tile_property (port->connector); }
@@ -2919,6 +2922,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work) mgr->cbs->destroy_connector (mgr, port->connector);drm_dp_port_teardown_pdt (port, port->pdt); + port->pdt =DP_PEER_DEVICE_NONE ;if (!port->input && port->vcpi.vcpi >0 ) {drm_dp_mst_reset_vcpi_slots (mgr, port);
drivers/gpu/drm/drm_fb_helper.c +42 -26
124 lines not on this page · raw message
drivers/gpu/drm/i915/intel_bios.c +77 -45
137 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -13834,7 +13834,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)for_each_plane_in_state (state, plane, plane_state, i) {struct intel_plane_state *intel_plane_state = -to_intel_plane_state (plane_state); +to_intel_plane_state (plane->state);if (!intel_plane_state->wait_req)continue ;
drivers/gpu/drm/i915/intel_dp.c +40 -31
98 lines not on this page · raw message
drivers/gpu/drm/i915/intel_fbc.c +3 -1
@@ -104,8 +104,10 @@ static int intel_fbc_calculate_cfb_size(struct drm_i915_private *dev_priv,int lines;intel_fbc_get_plane_source_size (cache,NULL , &lines); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) ==7 ) lines =min (lines,2048 ); +else if (INTEL_GEN (dev_priv) >=8 ) + lines =min (lines,2560 );/* Hardware needs the full buffer stride, not just the active area. */ return lines * cache->fb.stride;
drivers/gpu/drm/i915/intel_pm.c +13 -11
@@ -3363,13 +3363,15 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,int num_active;int id, i; +/* Clear the partitioning for disabled planes. */ +memset (ddb->plane[pipe],0 ,sizeof (ddb->plane[pipe])); +memset (ddb->y_plane[pipe],0 ,sizeof (ddb->y_plane[pipe])); +if (WARN_ON (!state))return 0 ;if (!cstate->base.active) { ddb->pipe[pipe].start = ddb->pipe[pipe].end =0 ; -memset (ddb->plane[pipe],0 ,sizeof (ddb->plane[pipe])); -memset (ddb->y_plane[pipe],0 ,sizeof (ddb->y_plane[pipe]));return 0 ; }
@@ -3469,12 +3471,6 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,return 0 ; } -static uint32_t skl_pipe_pixel_rate (const struct intel_crtc_state *config) -{ -/* TODO: Take into account the scalers once we support them */ -return config->base.adjusted_mode.crtc_clock; -} -/* * The max latency should be 257 (max the punit can code is 255 and we add 2us * for the read latency) and cpp should always be <= 8, so that
@@ -3525,7 +3521,7 @@ static uint32_t skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cst* Adjusted plane pixel rate is just the pipe's adjusted pixel rate * with additional adjustments for plane-specific scaling. */ - adjusted_pixel_rate =skl_pipe_pixel_rate (cstate); + adjusted_pixel_rate =ilk_pipe_pixel_rate (cstate); downscale_amount =skl_plane_downscale_amount (pstate); pixel_rate = adjusted_pixel_rate * downscale_amount >>16 ;
@@ -3737,11 +3733,11 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate)if (!cstate->base.active)return 0 ; -if (WARN_ON (skl_pipe_pixel_rate (cstate) ==0 )) +if (WARN_ON (ilk_pipe_pixel_rate (cstate) ==0 ))return 0 ;return DIV_ROUND_UP (8 * cstate->base.adjusted_mode.crtc_htotal *1000 , -skl_pipe_pixel_rate (cstate)); +ilk_pipe_pixel_rate (cstate)); } static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
@@ -4051,6 +4047,12 @@ skl_compute_ddb(struct drm_atomic_state *state) intel_state->wm_results.dirty_pipes = ~0 ; } +/* +* We're not recomputing for the pipes not included in the commit, so +* make sure we start with the current state. +*/ +memcpy (ddb, &dev_priv->wm.skl_hw.ddb,sizeof (*ddb)); +for_each_intel_crtc_mask (dev, intel_crtc, realloc_pipes) {struct intel_crtc_state *cstate;
drivers/gpu/drm/imx/ipuv3-plane.c +5 -2
@@ -108,6 +108,7 @@ static void ipu_plane_atomic_set_base(struct ipu_plane *ipu_plane, {struct drm_plane *plane = &ipu_plane->base;struct drm_plane_state *state = plane->state; +struct drm_crtc_state *crtc_state = state->crtc->state;struct drm_framebuffer *fb = state->fb;unsigned long eba, ubo, vbo;int active;
@@ -149,7 +150,7 @@ static void ipu_plane_atomic_set_base(struct ipu_plane *ipu_plane,break ; } -if (old_state->fb) { +if (!drm_atomic_crtc_needs_modeset (crtc_state)) { active =ipu_idmac_get_current_buffer (ipu_plane->ipu_ch);ipu_cpmem_set_buffer (ipu_plane->ipu_ch, !active, eba);ipu_idmac_select_buffer (ipu_plane->ipu_ch, !active);
@@ -359,7 +360,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,if ((ubo >0xfffff8 ) || (vbo >0xfffff8 ))return -EINVAL ; -if (old_fb) { +if (old_fb && + (old_fb->pixel_format ==DRM_FORMAT_YUV420 || + old_fb->pixel_format ==DRM_FORMAT_YVU420 )) { old_ubo =drm_plane_state_to_ubo (old_state); old_vbo =drm_plane_state_to_vbo (old_state);if (ubo != old_ubo || vbo != old_vbo)
drivers/gpu/drm/nouveau/nouveau_acpi.c +2 -1
@@ -240,7 +240,8 @@ static bool nouveau_pr3_present(struct pci_dev *pdev)if (!parent_adev)return false; -return acpi_has_method (parent_adev->handle,"_PR3" ); +return parent_adev->power.flags.power_resources && +acpi_has_method (parent_adev->handle,"_PR3" ); } static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out,
drivers/gpu/drm/radeon/ni.c +1 -3
@@ -1396,9 +1396,7 @@ static void cayman_pcie_gart_fini(struct radeon_device *rdev)void cayman_cp_int_cntl_setup (struct radeon_device *rdev,int ring,u32 cp_int_cntl) { -u32 srbm_gfx_cntl =RREG32 (SRBM_GFX_CNTL ) & ~3 ; - -WREG32 (SRBM_GFX_CNTL , srbm_gfx_cntl | (ring &3 )); +WREG32 (SRBM_GFX_CNTL ,RINGID (ring));WREG32 (CP_INT_CNTL , cp_int_cntl); }
drivers/gpu/drm/radeon/radeon_dp_auxch.c +1 -1
@@ -105,7 +105,7 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg tmp &=AUX_HPD_SEL (0x7 ); tmp |=AUX_HPD_SEL (chan->rec.hpd); - tmp |=AUX_EN |AUX_LS_READ_EN |AUX_HPD_DISCON (0x1 ); + tmp |=AUX_EN |AUX_LS_READ_EN ;WREG32 (AUX_CONTROL + aux_offset[instance], tmp);
drivers/gpu/drm/radeon/si_dpm.c +43 -10
65 lines not on this page · raw message
drivers/hid/hid-ids.h +1 -0
@@ -179,6 +179,7 @@#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208#define USB_DEVICE_ID_ATEN_CS682 0x2213 +#define USB_DEVICE_ID_ATEN_CS692 0x8021#define USB_VENDOR_ID_ATMEL 0x03eb#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -63,6 +63,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FIGHTERSTICK, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
drivers/hv/hv_util.c +7 -3
@@ -283,10 +283,14 @@ static void heartbeat_onchannelcallback(void *context)u8 *hbeat_txf_buf = util_heartbeat.recv_buffer;struct icmsg_negotiate *negop =NULL ; -vmbus_recvpacket (channel, hbeat_txf_buf, -PAGE_SIZE , &recvlen, &requestid); +while (1 ) { + +vmbus_recvpacket (channel, hbeat_txf_buf, +PAGE_SIZE , &recvlen, &requestid); + +if (!recvlen) +break ; -if (recvlen >0 ) { icmsghdrp = (struct icmsg_hdr *)&hbeat_txf_buf[sizeof (struct vmbuspipe_hdr )];
drivers/i2c/busses/i2c-rk3x.c +2 -0
@@ -694,6 +694,8 @@ static int rk3x_i2c_v0_calc_timings(unsigned long clk_rate, t_calc->div_low--; t_calc->div_high--; +/* Give the tuning value 0, that would not update con register */ + t_calc->tuning =0 ;/* Maximum divider supported by hw is 0xffff */ if (t_calc->div_low >0xffff ) { t_calc->div_low =0xffff ;
drivers/i2c/busses/i2c-xgene-slimpro.c +1 -1
@@ -105,7 +105,7 @@ struct slimpro_i2c_dev {struct mbox_chan *mbox_chan;struct mbox_client mbox_client;struct completion rd_complete; -u8 dma_buffer[I2C_SMBUS_BLOCK_MAX ]; +u8 dma_buffer[I2C_SMBUS_BLOCK_MAX +1 ];/* dma_buffer[0] is used for length */ u32 *resp_msg; };
drivers/i2c/i2c-core.c +11 -2
@@ -1592,6 +1592,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,static void of_i2c_register_devices (struct i2c_adapter *adap) {struct device_node *node; +struct i2c_client *client;/* Only register child devices if the adapter has a node pointer set */ if (!adap->dev.of_node)
@@ -1602,7 +1603,14 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)for_each_available_child_of_node (adap->dev.of_node, node) {if (of_node_test_and_set_flag (node,OF_POPULATED ))continue ; -of_i2c_register_device (adap, node); + + client =of_i2c_register_device (adap, node); +if (IS_ERR (client)) { +dev_warn (&adap->dev, +"Failed to create I2C device for %s\n" , + node->full_name); +of_node_clear_flag (node,OF_POPULATED ); + } } }
@@ -2073,6 +2081,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)/* add the driver to the list of i2c drivers in the driver core */ driver->driver.owner = owner; driver->driver.bus = &i2c_bus_type; +INIT_LIST_HEAD (&driver->clients);/* When registration returns, the driver core * will have called probe() for all matching-but-unbound devices.
@@ -2083,7 +2092,6 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)pr_debug ("driver [%s] registered\n" , driver->driver.name); -INIT_LIST_HEAD (&driver->clients);/* Walk the adapters that are already present */ i2c_for_each_dev (driver, __process_new_driver);
@@ -2201,6 +2209,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,if (IS_ERR (client)) {dev_err (&adap->dev,"failed to create client for '%s'\n" , rd->dn->full_name); +of_node_clear_flag (rd->dn,OF_POPULATED );return notifier_from_errno (PTR_ERR (client)); }break ;
drivers/iio/chemical/atlas-ph-sensor.c +4 -3
@@ -207,13 +207,14 @@ static int atlas_check_ec_calibration(struct atlas_data *data)struct device *dev = &data->client->dev;int ret;unsigned int val; +__be16 rval; - ret =regmap_bulk_read (data->regmap,ATLAS_REG_EC_PROBE , &val,2 ); + ret =regmap_bulk_read (data->regmap,ATLAS_REG_EC_PROBE , &rval,2 );if (ret)return ret; -dev_info (dev,"probe set to K = %d.%.2d" ,be16_to_cpu (val) /100 , -be16_to_cpu (val) %100 ); + val =be16_to_cpu (rval); +dev_info (dev,"probe set to K = %d.%.2d" , val /100 , val %100 ); ret =regmap_read (data->regmap,ATLAS_REG_EC_CALIB_STATUS , &val);if (ret)
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -877,6 +877,13 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "P34"), }, }, + { + /* Schenker XMG C504 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "XMG"), + DMI_MATCH(DMI_PRODUCT_NAME, "C504"), + }, + }, { } };
drivers/md/dm-raid.c +9 -6
@@ -266,7 +266,7 @@ static struct raid_type { {"raid10_offset", "raid10 offset (striped mirrors)", 0, 2, 10, ALGORITHM_RAID10_OFFSET}, {"raid10_near", "raid10 near (striped mirrors)", 0, 2, 10, ALGORITHM_RAID10_NEAR}, {"raid10", "raid10 (striped mirrors)", 0, 2, 10, ALGORITHM_RAID10_DEFAULT}, - {"raid4", "raid4 (dedicated last parity disk)", 1, 2, 4, ALGORITHM_PARITY_N}, /* raid4 layout = raid5_n */ + {"raid4", "raid4 (dedicated first parity disk)", 1, 2, 5, ALGORITHM_PARITY_0}, /* raid4 layout = raid5_0 */ {"raid5_n", "raid5 (dedicated last parity disk)", 1, 2, 5, ALGORITHM_PARITY_N}, {"raid5_ls", "raid5 (left symmetric)", 1, 2, 5, ALGORITHM_LEFT_SYMMETRIC}, {"raid5_rs", "raid5 (right symmetric)", 1, 2, 5, ALGORITHM_RIGHT_SYMMETRIC},
@@ -2087,11 +2087,11 @@ static int super_init_validation(struct raid_set *rs, struct md_rdev *rdev)/* * No takeover/reshaping, because we don't have the extended v1.9.0 metadata */ -if (le32_to_cpu (sb->level) != mddev->level) { +if (le32_to_cpu (sb->level) != mddev->new_level) {DMERR ("Reshaping/takeover raid sets not yet supported. (raid level/stripes/size change)" );return -EINVAL ; } -if (le32_to_cpu (sb->layout) != mddev->layout) { +if (le32_to_cpu (sb->layout) != mddev->new_layout) {DMERR ("Reshaping raid sets not yet supported. (raid layout change)" );DMERR (" 0x%X vs 0x%X" ,le32_to_cpu (sb->layout), mddev->layout); DMERR(" Old layout: %s w/ %d copies",
@@ -2102,7 +2102,7 @@ static int super_init_validation(struct raid_set *rs, struct md_rdev *rdev) raid10_md_layout_to_copies(mddev->layout));return -EINVAL ; } -if (le32_to_cpu (sb->stripe_sectors) != mddev->chunk_sectors) { +if (le32_to_cpu (sb->stripe_sectors) != mddev->new_chunk_sectors) {DMERR ("Reshaping raid sets not yet supported. (stripe sectors change)" );return -EINVAL ; }
@@ -2115,6 +2115,8 @@ static int super_init_validation(struct raid_set *rs, struct md_rdev *rdev)return -EINVAL ; } +DMINFO ("Discovered old metadata format; upgrading to extended metadata format" ); +/* Table line is checked vs. authoritative superblock */ rs_set_new (rs); }
@@ -2258,7 +2260,8 @@ static int super_validate(struct raid_set *rs, struct md_rdev *rdev)if (!mddev->events &&super_init_validation (rs, rdev))return -EINVAL ; -if (le32_to_cpu (sb->compat_features) !=FEATURE_FLAG_SUPPORTS_V190 ) { +if (le32_to_cpu (sb->compat_features) && +le32_to_cpu (sb->compat_features) !=FEATURE_FLAG_SUPPORTS_V190 ) { rs->ti->error ="Unable to assemble array: Unknown flag(s) in compatible feature flags" ;return -EINVAL ; }
@@ -3646,7 +3649,7 @@ static void raid_resume(struct dm_target *ti)static struct target_type raid_target = { .name ="raid" , - .version = {1 ,9 ,0 }, + .version = {1 ,9 ,1 }, .module =THIS_MODULE , .ctr = raid_ctr, .dtr = raid_dtr,
drivers/md/dm-raid1.c +1 -0
@@ -1292,6 +1292,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, int error)dm_bio_restore (bd, bio); bio_record->details.bi_bdev =NULL ; + bio->bi_error =0 ;queue_bio (ms, bio, rw);return DM_ENDIO_INCOMPLETE ;
drivers/md/dm-rq.c +5 -2
@@ -835,8 +835,11 @@ int dm_old_init_request_queue(struct mapped_device *md)init_kthread_worker (&md->kworker); md->kworker_task =kthread_run (kthread_worker_fn, &md->kworker,"kdmwork-%s" ,dm_device_name (md)); -if (IS_ERR (md->kworker_task)) -return PTR_ERR (md->kworker_task); +if (IS_ERR (md->kworker_task)) { +int error =PTR_ERR (md->kworker_task); + md->kworker_task =NULL ; +return error; + }elv_register_queue (md->queue);
drivers/md/dm-table.c +9 -15
@@ -695,37 +695,32 @@ int dm_table_add_target(struct dm_table *t, const char *type, tgt->type =dm_get_target_type (type);if (!tgt->type) { -DMERR ("%s: %s: unknown target type" ,dm_device_name (t->md), - type); +DMERR ("%s: %s: unknown target type" ,dm_device_name (t->md), type);return -EINVAL ; }if (dm_target_needs_singleton (tgt->type)) {if (t->num_targets) { -DMERR ("%s: target type %s must appear alone in table" , -dm_device_name (t->md), type); -return -EINVAL ; + tgt->error ="singleton target type must appear alone in table" ; + goto bad; } t->singleton = true; }if (dm_target_always_writeable (tgt->type) && !(t->mode &FMODE_WRITE )) { -DMERR ("%s: target type %s may not be included in read-only tables" , -dm_device_name (t->md), type); -return -EINVAL ; + tgt->error ="target type may not be included in a read-only table" ; + goto bad; }if (t->immutable_target_type) {if (t->immutable_target_type != tgt->type) { -DMERR ("%s: immutable target type %s cannot be mixed with other target types" , -dm_device_name (t->md), t->immutable_target_type->name); -return -EINVAL ; + tgt->error ="immutable target type cannot be mixed with other target types" ; + goto bad; } }else if (dm_target_is_immutable (tgt->type)) {if (t->num_targets) { -DMERR ("%s: immutable target type %s cannot be mixed with other target types" , -dm_device_name (t->md), tgt->type->name); -return -EINVAL ; + tgt->error ="immutable target type cannot be mixed with other target types" ; + goto bad; } t->immutable_target_type = tgt->type; }
@@ -740,7 +735,6 @@ int dm_table_add_target(struct dm_table *t, const char *type,*/ if (!adjoin (t, tgt)) { tgt->error ="Gap in table" ; - r = -EINVAL ; goto bad; }
drivers/md/dm.c +2 -2
@@ -1423,8 +1423,6 @@ static void cleanup_mapped_device(struct mapped_device *md)if (md->bs)bioset_free (md->bs); -cleanup_srcu_struct (&md->io_barrier); -if (md->disk) {spin_lock (&_minor_lock); md->disk->private_data =NULL ;
@@ -1436,6 +1434,8 @@ static void cleanup_mapped_device(struct mapped_device *md)if (md->queue)blk_cleanup_queue (md->queue); +cleanup_srcu_struct (&md->io_barrier); +if (md->bdev) {bdput (md->bdev); md->bdev =NULL ;
drivers/md/md.c +2 -2
@@ -8120,14 +8120,14 @@ void md_do_sync(struct md_thread *thread)if (!test_bit (MD_RECOVERY_RESHAPE , &mddev->recovery) && !test_bit (MD_RECOVERY_INTR , &mddev->recovery) && - mddev->curr_resync >2 ) { + mddev->curr_resync >3 ) { mddev->curr_resync_completed = mddev->curr_resync;sysfs_notify (&mddev->kobj,NULL ,"sync_completed" ); } mddev->pers->sync_request (mddev, max_sectors, &skipped);if (!test_bit (MD_RECOVERY_CHECK , &mddev->recovery) && - mddev->curr_resync >2 ) { + mddev->curr_resync >3 ) {if (test_bit (MD_RECOVERY_SYNC , &mddev->recovery)) {if (test_bit (MD_RECOVERY_INTR , &mddev->recovery)) {if (mddev->curr_resync >= mddev->recovery_cp) {
drivers/md/raid1.c +5 -2
@@ -407,11 +407,14 @@ static void raid1_end_write_request(struct bio *bio)struct bio *to_put =NULL ;int mirror =find_bio_disk (r1_bio, bio);struct md_rdev *rdev = conf->mirrors[mirror].rdev; +bool discard_error; + + discard_error = bio->bi_error &&bio_op (bio) ==REQ_OP_DISCARD ;/* * 'one mirror IO has finished' event handler: */ -if (bio->bi_error) { +if (bio->bi_error && !discard_error) {set_bit (WriteErrorSeen, &rdev->flags);if (!test_and_set_bit (WantReplacement, &rdev->flags)) set_bit(MD_RECOVERY_NEEDED, &
@@ -448,7 +451,7 @@ static void raid1_end_write_request(struct bio *bio)/* Maybe we can clear some bad blocks. */ if (is_badblock (rdev, r1_bio->sector, r1_bio->sectors, - &first_bad, &bad_sectors)) { + &first_bad, &bad_sectors) && !discard_error) { r1_bio->bios[mirror] =IO_MADE_GOOD ;set_bit (R1BIO_MadeGood, &r1_bio->state); }
drivers/md/raid10.c +5 -2
@@ -447,6 +447,9 @@ static void raid10_end_write_request(struct bio *bio)struct r10conf *conf = r10_bio->mddev->private;int slot, repl;struct md_rdev *rdev =NULL ; +bool discard_error; + + discard_error = bio->bi_error &&bio_op (bio) ==REQ_OP_DISCARD ; dev =find_bio_disk (conf, r10_bio, bio, &slot, &repl);
@@ -460,7 +463,7 @@ static void raid10_end_write_request(struct bio *bio)/* * this branch is our 'one mirror IO has finished' event handler: */ -if (bio->bi_error) { +if (bio->bi_error && !discard_error) {if (repl)/* Never record new bad blocks to replacement, * just fail it.
@@ -503,7 +506,7 @@ static void raid10_end_write_request(struct bio *bio)if (is_badblock (rdev, r10_bio->devs[slot].addr, r10_bio->sectors, - &first_bad, &bad_sectors)) { + &first_bad, &bad_sectors) && !discard_error) {bio_put (bio);if (repl) r10_bio->devs[slot].repl_bio =IO_MADE_GOOD ;
drivers/media/platform/vsp1/vsp1_video.c +7 -0
@@ -675,6 +675,13 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)unsigned long flags;int ret; +/* Clear the buffers ready flag to make sure the device won't be started +* by a QBUF on the video node on the other side of the pipeline. +*/ +spin_lock_irqsave (&video->irqlock, flags); + pipe->buffers_ready &= ~(1 << video->pipe_index); +spin_unlock_irqrestore (&video->irqlock, flags); +mutex_lock (&pipe->lock);if (--pipe->stream_count == pipe->num_inputs) {/* Stop the pipeline. */
drivers/misc/cxl/api.c +2 -0
@@ -247,7 +247,9 @@ int cxl_start_context(struct cxl_context *ctx, u64 wed,cxl_ctx_get ();if ((rc = cxl_ops->attach_process (ctx, kernel, wed,0 ))) { +put_pid (ctx->glpid);put_pid (ctx->pid); + ctx->glpid = ctx->pid =NULL ;cxl_adapter_context_put (ctx->afu->adapter);cxl_ctx_put (); goto out;
drivers/misc/cxl/file.c +13 -9
@@ -194,6 +194,16 @@ static long afu_ioctl_start_work(struct cxl_context *ctx, ctx->mmio_err_ff = !!(work.flags &CXL_START_WORK_ERR_FF );/* +* Increment the mapped context count for adapter. This also checks +* if adapter_context_lock is taken. +*/ + rc =cxl_adapter_context_get (ctx->afu->adapter); +if (rc) { +afu_release_irqs (ctx, ctx); + goto out; + } + +/* * We grab the PID here and not in the file open to allow for the case * where a process (master, some daemon, etc) has opened the chardev on * behalf of another process, so the AFU's mm gets bound to the process
@@ -205,15 +215,6 @@ static long afu_ioctl_start_work(struct cxl_context *ctx, ctx->pid =get_task_pid (current,PIDTYPE_PID ); ctx->glpid =get_task_pid (current->group_leader,PIDTYPE_PID ); -/* -* Increment the mapped context count for adapter. This also checks -* if adapter_context_lock is taken. -*/ - rc =cxl_adapter_context_get (ctx->afu->adapter); -if (rc) { -afu_release_irqs (ctx, ctx); - goto out; - }trace_cxl_attach (ctx, work.work_element_descriptor, work.num_interrupts, amr);
@@ -221,6 +222,9 @@ static long afu_ioctl_start_work(struct cxl_context *ctx, amr))) {afu_release_irqs (ctx, ctx);cxl_adapter_context_put (ctx->afu->adapter); +put_pid (ctx->glpid); +put_pid (ctx->pid); + ctx->glpid = ctx->pid =NULL ; goto out; }
drivers/misc/genwqe/card_utils.c +11 -1
@@ -352,17 +352,27 @@ int genwqe_alloc_sync_sgl(struct genwqe_dev *cd, struct genwqe_sgl *sgl,if (copy_from_user (sgl->lpage, user_addr + user_size - sgl->lpage_size, sgl->lpage_size)) { rc = -EFAULT ; - goto err_out1; + goto err_out2; } }return 0 ; + err_out2: +__genwqe_free_consistent (cd,PAGE_SIZE , sgl->lpage, + sgl->lpage_dma_addr); + sgl->lpage =NULL ; + sgl->lpage_dma_addr =0 ; err_out1:__genwqe_free_consistent (cd,PAGE_SIZE , sgl->fpage, sgl->fpage_dma_addr); + sgl->fpage =NULL ; + sgl->fpage_dma_addr =0 ; err_out:__genwqe_free_consistent (cd, sgl->sgl_size, sgl->sgl, sgl->sgl_dma_addr); + sgl->sgl =NULL ; + sgl->sgl_dma_addr =0 ; + sgl->sgl_size =0 ;return -ENOMEM ; }
drivers/misc/mei/hw-txe.c +4 -2
@@ -978,11 +978,13 @@ static bool mei_txe_check_and_ack_intrs(struct mei_device *dev, bool do_ack) hisr =mei_txe_br_reg_read (hw,HISR_REG ); aliveness =mei_txe_aliveness_get (dev); -if (hhisr &IPC_HHIER_SEC && aliveness) +if (hhisr &IPC_HHIER_SEC && aliveness) { ipc_isr =mei_txe_sec_reg_read_silent (hw,SEC_IPC_HOST_INT_STATUS_REG ); -else + }else { ipc_isr =0 ; + hhisr &= ~IPC_HHIER_SEC ; + } generated = generated || (hisr & HISR_INT_STS_MSK) ||
drivers/mmc/host/dw_mmc-pltfm.c +3 -2
@@ -46,12 +46,13 @@ int dw_mci_pltfm_register(struct platform_device *pdev, host->pdata = pdev->dev.platform_data; regs =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -/* Get registers' physical base address */ - host->phy_regs = regs->start; host->regs =devm_ioremap_resource (&pdev->dev, regs);if (IS_ERR (host->regs))return PTR_ERR (host->regs); +/* Get registers' physical base address */ + host->phy_regs = regs->start; +platform_set_drvdata (pdev, host);return dw_mci_probe (host); }
drivers/mtd/ubi/fastmap.c +9 -8
@@ -515,10 +515,11 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,unsigned long long ec =be64_to_cpu (ech->ec);unmap_peb (ai, pnum);dbg_bld ("Adding PEB to free: %i" , pnum); +if (err ==UBI_IO_FF_BITFLIPS ) -add_aeb (ai, free, pnum, ec,1 ); -else -add_aeb (ai, free, pnum, ec,0 ); + scrub =1 ; + +add_aeb (ai, free, pnum, ec, scrub);continue ; }else if (err ==0 || err ==UBI_IO_BITFLIPS ) {dbg_bld ("Found non empty PEB:%i in pool" , pnum);
@@ -750,11 +751,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, fmvhdr->vol_type, be32_to_cpu(fmvhdr->last_eb_bytes)); -if (!av) - goto fail_bad; -if (PTR_ERR (av) == -EINVAL ) { -ubi_err (ubi,"volume (ID %i) already exists" , - fmvhdr->vol_id); +if (IS_ERR (av)) { +if (PTR_ERR (av) == -EEXIST ) +ubi_err (ubi,"volume (ID %i) already exists" , + fmvhdr->vol_id); + goto fail_bad; }
drivers/net/wireless/ath/ath10k/core.h +1 -0
@@ -445,6 +445,7 @@ struct ath10k_debug {u32 pktlog_filter;u32 reg_addr;u32 nf_cal_period; +void *cal_data;struct ath10k_fw_crash_data *fw_crash_data; };
drivers/net/wireless/ath/ath10k/debug.c +39 -36
144 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/ar9003_calib.c +3 -22
@@ -33,7 +33,6 @@ struct coeff {enum ar9003_cal_types {IQ_MISMATCH_CAL =BIT (0 ), -TEMP_COMP_CAL =BIT (1 ), }; static void ar9003_hw_setup_calibration(struct ath_hw *ah,
@@ -59,12 +58,6 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,/* Kick-off cal */ REG_SET_BIT (ah,AR_PHY_TIMING4 ,AR_PHY_TIMING4_DO_CAL );break ; -case TEMP_COMP_CAL : -ath_dbg (common,CALIBRATE , -"starting Temperature Compensation Calibration\n" ); -REG_SET_BIT (ah,AR_CH0_THERM ,AR_CH0_THERM_LOCAL ); -REG_SET_BIT (ah,AR_CH0_THERM ,AR_CH0_THERM_START ); -break ;default :ath_err (common,"Invalid calibration type\n" );break ;
@@ -93,8 +86,7 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah,/* * Accumulate cal measures for active chains */ -if (cur_caldata->calCollect) - cur_caldata->calCollect (ah); + cur_caldata->calCollect (ah); ah->cal_samples++;if (ah->cal_samples >= cur_caldata->calNumSamples) {
@@ -107,8 +99,7 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah,/* * Process accumulated data */ -if (cur_caldata->calPostProc) - cur_caldata->calPostProc (ah, numChains); + cur_caldata->calPostProc (ah, numChains);/* Calibration has finished. */ caldata->CalValid |= cur_caldata->calType;
@@ -323,16 +314,9 @@ static const struct ath9k_percal_data iq_cal_single_sample = { ar9003_hw_iqcalibrate }; -static const struct ath9k_percal_data temp_cal_single_sample = { -TEMP_COMP_CAL , -MIN_CAL_SAMPLES , -PER_MAX_LOG_COUNT , -}; -static void ar9003_hw_init_cal_settings (struct ath_hw *ah) { ah->iq_caldata.calData = &iq_cal_single_sample; - ah->temp_caldata.calData = &temp_cal_single_sample;if (AR_SREV_9300_20_OR_LATER (ah)) { ah->enabled_cals |=TX_IQ_CAL ;
@@ -340,7 +324,7 @@ static void ar9003_hw_init_cal_settings(struct ath_hw *ah) ah->enabled_cals |=TX_IQ_ON_AGC_CAL ; } - ah->supp_cals =IQ_MISMATCH_CAL |TEMP_COMP_CAL ; + ah->supp_cals =IQ_MISMATCH_CAL ; }#define OFF_UPPER_LT 24
@@ -1399,9 +1383,6 @@ static void ar9003_hw_init_cal_common(struct ath_hw *ah)INIT_CAL (&ah->iq_caldata);INSERT_CAL (ah, &ah->iq_caldata); -INIT_CAL (&ah->temp_caldata); -INSERT_CAL (ah, &ah->temp_caldata); -/* Initialize current pointer to first element in list */ ah->cal_list_curr = ah->cal_list;
drivers/net/wireless/ath/ath9k/hw.h +0 -1
@@ -830,7 +830,6 @@ struct ath_hw {/* Calibration */ u32 supp_cals;struct ath9k_cal_list iq_caldata; -struct ath9k_cal_list temp_caldata;struct ath9k_cal_list adcgain_caldata;struct ath9k_cal_list adcdc_caldata;struct ath9k_cal_list *cal_list;
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +2 -2
@@ -231,7 +231,7 @@ struct rtl8xxxu_rxdesc16 { u32 pattern1match:1; u32 pattern0match:1;#endif -__le32 tsfl; +u32 tsfl;#if 0 u32 bassn:12; u32 bavld:1;
@@ -361,7 +361,7 @@ struct rtl8xxxu_rxdesc24 { u32 ldcp:1; u32 splcp:1;#endif -__le32 tsfl; +u32 tsfl; };struct rtl8xxxu_txdesc32 {
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +4 -0
@@ -1498,6 +1498,10 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv)u32 val32;u8 val8; + val32 =rtl8xxxu_read32 (priv,REG_RX_WAIT_CCA ); + val32 |= (BIT (22 ) |BIT (23 )); +rtl8xxxu_write32 (priv,REG_RX_WAIT_CCA , val32); +/* * No indication anywhere as to what 0x0790 does. The 2 antenna * vendor code preserves bits 6-7 here.
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +8 -3
@@ -5201,7 +5201,12 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb) pkt_offset =roundup (pkt_len + drvinfo_sz + desc_shift +sizeof (struct rtl8xxxu_rxdesc16 ),128 ); -if (pkt_cnt >1 ) +/* +* Only clone the skb if there's enough data at the end to +* at least cover the rx descriptor +*/ +if (pkt_cnt >1 && + urb_len > (pkt_offset +sizeof (struct rtl8xxxu_rxdesc16 ))) next_skb =skb_clone (skb,GFP_ATOMIC ); rx_status =IEEE80211_SKB_RXCB (skb);
@@ -5219,7 +5224,7 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb)rtl8xxxu_rx_parse_phystats (priv, rx_status, phy_stats, rx_desc->rxmcs); - rx_status->mactime =le32_to_cpu (rx_desc->tsfl); + rx_status->mactime = rx_desc->tsfl; rx_status->flag |=RX_FLAG_MACTIME_START ;if (!rx_desc->swdec)
@@ -5289,7 +5294,7 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb)rtl8xxxu_rx_parse_phystats (priv, rx_status, phy_stats, rx_desc->rxmcs); - rx_status->mactime =le32_to_cpu (rx_desc->tsfl); + rx_status->mactime = rx_desc->tsfl; rx_status->flag |=RX_FLAG_MACTIME_START ;if (!rx_desc->swdec)
drivers/pwm/core.c +2 -0
@@ -339,6 +339,8 @@ int pwmchip_remove(struct pwm_chip *chip)unsigned int i;int ret =0 ; +pwmchip_sysfs_unexport_children (chip); +mutex_lock (&pwm_lock);for (i =0 ; i < chip->npwm; i++) {
drivers/pwm/sysfs.c +18 -0
@@ -409,6 +409,24 @@ void pwmchip_sysfs_unexport(struct pwm_chip *chip) } } +void pwmchip_sysfs_unexport_children (struct pwm_chip *chip) +{ +struct device *parent; +unsigned int i; + + parent =class_find_device (&pwm_class,NULL , chip, + pwmchip_sysfs_match); +if (!parent) +return ; + +for (i =0 ; i < chip->npwm; i++) { +struct pwm_device *pwm = &chip->pwms[i]; + +if (test_bit (PWMF_EXPORTED , &pwm->flags)) +pwm_unexport_child (parent, pwm); + } +} +static int __init pwm_sysfs_init (void ) {return class_register (&pwm_class);
drivers/scsi/arcmsr/arcmsr_hba.c +0 -9
@@ -2636,18 +2636,9 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd,struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;struct CommandControlBlock *ccb;int target = cmd->device->id; -int lun = cmd->device->lun; -uint8_t scsicmd = cmd->cmnd[0 ]; cmd->scsi_done = done; cmd->host_scribble =NULL ; cmd->result =0 ; -if ((scsicmd ==SYNCHRONIZE_CACHE ) ||(scsicmd ==SEND_DIAGNOSTIC )){ -if (acb->devstate[target][lun] ==ARECA_RAID_GONE ) { - cmd->result = (DID_NO_CONNECT <<16 ); - } - cmd->scsi_done (cmd); -return 0 ; - }if (target ==16 ) {/* virtual device for iop message transfer */ arcmsr_handle_virtual_command (acb, cmd);
drivers/scsi/scsi_debug.c +1 -0
@@ -5134,6 +5134,7 @@ static void __exit scsi_debug_exit(void)bus_unregister (&pseudo_lld_bus);root_device_unregister (pseudo_primary); +vfree (map_storep);vfree (dif_storep);vfree (fake_storep);kfree (sdebug_q_arr);
drivers/spi/spi-fsl-espi.c +1 -1
@@ -581,7 +581,7 @@ void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) mspi->len -= rx_nr_bytes; -if (mspi->rx) +if (rx_nr_bytes && mspi->rx) mspi->get_rx (rx_data, mspi); }
drivers/spi/spi.c +4 -1
@@ -1607,9 +1607,11 @@ static void of_register_spi_devices(struct spi_master *master)if (of_node_test_and_set_flag (nc,OF_POPULATED ))continue ; spi =of_register_spi_device (master, nc); -if (IS_ERR (spi)) +if (IS_ERR (spi)) {dev_warn (&master->dev,"Failed to create SPI device for %s\n" , nc->full_name); +of_node_clear_flag (nc,OF_POPULATED ); + } } }#else
@@ -3120,6 +3122,7 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action,if (IS_ERR (spi)) {pr_err ("%s: failed to create for '%s'\n" , __func__, rd->dn->full_name); +of_node_clear_flag (rd->dn,OF_POPULATED );return notifier_from_errno (PTR_ERR (spi)); }break ;
drivers/staging/wilc1000/host_interface.c +0 -1
@@ -3391,7 +3391,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) clients_count++; -destroy_workqueue (hif_workqueue); _fail_:return result; }
drivers/thermal/intel_powerclamp.c +2 -12
@@ -669,20 +669,10 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = { .set_cur_state = powerclamp_set_cur_state, }; -static const struct x86_cpu_id intel_powerclamp_ids[]__initconst = { - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_MWAIT }, - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_ARAT }, - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_NONSTOP_TSC }, - {X86_VENDOR_INTEL ,X86_FAMILY_ANY ,X86_MODEL_ANY ,X86_FEATURE_CONSTANT_TSC }, - {} -}; -MODULE_DEVICE_TABLE (x86cpu, intel_powerclamp_ids); -static int __init powerclamp_probe (void ) { -if (!x86_match_cpu (intel_powerclamp_ids)) { -pr_err ("Intel powerclamp does not run on family %d model %d\n" , - boot_cpu_data.x86, boot_cpu_data.x86_model); +if (!boot_cpu_has (X86_FEATURE_MWAIT )) { +pr_err ("CPU does not support MWAIT" );return -ENODEV ; }
drivers/tty/vt/vt.c +6 -1
@@ -870,10 +870,15 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)return 0 ; +if (new_screen_size > (4 <<20 )) +return -EINVAL ; newscreen =kmalloc (new_screen_size,GFP_USER );if (!newscreen)return -ENOMEM ; +if (vc == sel_cons) +clear_selection (); + old_rows = vc->vc_rows; old_row_size = vc->vc_size_row;
@@ -1176,7 +1181,7 @@ static void csi_J(struct vc_data *vc, int vpar)break ;case 3 :/* erase scroll-back buffer (and whole display) */ scr_memsetw (vc->vc_screenbuf, vc->vc_video_erase_char, - vc->vc_screenbuf_size >>1 ); + vc->vc_screenbuf_size);set_origin (vc);if (con_is_visible (vc))update_screen (vc);
drivers/usb/chipidea/host.c +2 -0
@@ -185,6 +185,8 @@ static void host_stop(struct ci_hdrc *ci)if (hcd) {usb_remove_hcd (hcd); + ci->role =CI_ROLE_END ; +synchronize_irq (ci->irq);usb_put_hcd (hcd);if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode (ci) && (ci->platdata->flags &CI_HDRC_TURN_VBUS_EARLY_ON ))
drivers/usb/dwc3/gadget.c +2 -2
@@ -3055,7 +3055,7 @@ err3:kfree (dwc->setup_buf); err2: -dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb), +dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb) *2 , dwc->ep0_trb, dwc->ep0_trb_addr); err1:
@@ -3080,7 +3080,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)kfree (dwc->setup_buf);kfree (dwc->zlp_buf); -dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb), +dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb) *2 , dwc->ep0_trb, dwc->ep0_trb_addr); dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
drivers/usb/gadget/function/u_ether.c +3 -2
@@ -587,8 +587,9 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,/* throttle high/super speed IRQ rate back slightly */ if (gadget_is_dualspeed (dev->gadget)) - req->no_interrupt = (dev->gadget->speed ==USB_SPEED_HIGH || - dev->gadget->speed ==USB_SPEED_SUPER ) + req->no_interrupt = (((dev->gadget->speed ==USB_SPEED_HIGH || + dev->gadget->speed ==USB_SPEED_SUPER )) && + !list_empty (&dev->tx_reqs)) ? ((atomic_read (&dev->tx_qlen) % dev->qmult) !=0 ) :0 ;
drivers/usb/gadget/udc/atmel_usba_udc.c +1 -1
@@ -1978,7 +1978,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,dev_err (&pdev->dev,"of_probe: name error(%d)\n" , ret); goto err; } - ep->ep.name = name; + ep->ep.name =kasprintf (GFP_KERNEL ,"ep%d" , ep->index); ep->ep_regs = udc->regs +USBA_EPT_BASE (i); ep->dma_regs = udc->regs +USBA_DMA_BASE (i);
drivers/usb/host/ohci-hcd.c +1 -1
@@ -72,7 +72,7 @@static const char hcd_name [] ="ohci_hcd" ;#define STATECHANGE_DELAY msecs_to_jiffies(300) -#define IO_WATCHDOG_DELAY msecs_to_jiffies(250) +#define IO_WATCHDOG_DELAY msecs_to_jiffies(275)#include "ohci.h" #include "pci-quirks.h"
drivers/usb/host/xhci-hub.c +39 -2
65 lines not on this page · raw message
drivers/usb/host/xhci-pci.c +9 -1
@@ -45,11 +45,13 @@#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 +#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI 0x9cb1#define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI 0xa12f#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI 0x9d2f#define PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI 0x0aa8#define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI 0x1aa8 +#define PCI_DEVICE_ID_INTEL_APL_XHCI 0x5aa8static const char hcd_name[] ="xhci_hcd" ;
@@ -153,7 +155,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |=XHCI_SPURIOUS_REBOOT ; }if (pdev->vendor ==PCI_VENDOR_ID_INTEL && - pdev->device ==PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI ) { + (pdev->device ==PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI || + pdev->device ==PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI )) { xhci->quirks |=XHCI_SPURIOUS_REBOOT ; xhci->quirks |=XHCI_SPURIOUS_WAKEUP ; }
@@ -169,6 +172,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) { xhci->quirks |=XHCI_SSIC_PORT_UNUSED ; } +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && + (pdev->device ==PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI || + pdev->device ==PCI_DEVICE_ID_INTEL_APL_XHCI )) + xhci->quirks |=XHCI_MISSING_CAS ; +if (pdev->vendor ==PCI_VENDOR_ID_ETRON && pdev->device ==PCI_DEVICE_ID_EJ168 ) { xhci->quirks |=XHCI_RESET_ON_RESUME ;
drivers/usb/host/xhci.h +3 -0
@@ -314,6 +314,8 @@ struct xhci_op_regs {#define XDEV_U2 (0x2 << 5)#define XDEV_U3 (0x3 << 5)#define XDEV_INACTIVE (0x6 << 5) +#define XDEV_POLLING (0x7 << 5) +#define XDEV_COMP_MODE (0xa << 5)#define XDEV_RESUME (0xf << 5)/* true: port has power (see HCC_PPC) */ #define PORT_POWER (1 << 9)
@@ -1653,6 +1655,7 @@ struct xhci_hcd {#define XHCI_MTK_HOST (1 << 21)#define XHCI_SSIC_PORT_UNUSED (1 << 22)#define XHCI_NO_64BIT_SUPPORT (1 << 23) +#define XHCI_MISSING_CAS (1 << 24)unsigned int num_active_eps;unsigned int limit_active_eps;/* There are two roothubs to keep track of bus suspend info for */
drivers/usb/musb/omap2430.c +2 -5
@@ -337,6 +337,7 @@ static int omap2430_musb_init(struct musb *musb) } musb->isr = omap2430_musb_interrupt;phy_init (musb->phy); +phy_power_on (musb->phy); l =musb_readl (musb->mregs,OTG_INTERFSEL );
@@ -373,8 +374,6 @@ static void omap2430_musb_enable(struct musb *musb)struct musb_hdrc_platform_data *pdata =dev_get_platdata (dev);struct omap_musb_board_data *data = pdata->board_data; -if (!WARN_ON (!musb->phy)) -phy_power_on (musb->phy);omap2430_set_power (musb, true, glue->cable_connected);
@@ -413,9 +412,6 @@ static void omap2430_musb_disable(struct musb *musb)struct device *dev = musb->controller;struct omap2430_glue *glue =dev_get_drvdata (dev->parent); -if (!WARN_ON (!musb->phy)) -phy_power_off (musb->phy); -if (glue->status !=MUSB_UNKNOWN )omap_control_usb_set_mode (glue->control_otghs,USB_MODE_DISCONNECT );
@@ -429,6 +425,7 @@ static int omap2430_musb_exit(struct musb *musb)struct omap2430_glue *glue =dev_get_drvdata (dev->parent);omap2430_low_level_exit (musb); +phy_power_off (musb->phy);phy_exit (musb->phy); musb->phy =NULL ;cancel_work_sync (&glue->omap_musb_mailbox_work);
drivers/usb/renesas_usbhs/rcar3.c +6 -2
@@ -9,6 +9,7 @@* */ +#include <linux/delay.h> #include <linux/io.h> #include "common.h" #include "rcar3.h"
@@ -35,10 +36,13 @@ static int usbhs_rcar3_power_ctrl(struct platform_device *pdev,usbhs_write32 (priv,UGCTRL2 ,UGCTRL2_RESERVED_3 |UGCTRL2_USB0SEL_OTG ); -if (enable) +if (enable) {usbhs_bset (priv,LPSTS ,LPSTS_SUSPM ,LPSTS_SUSPM ); -else +/* The controller on R-Car Gen3 needs to wait up to 45 usec */ +udelay (45 ); + }else {usbhs_bset (priv,LPSTS ,LPSTS_SUSPM ,0 ); + }return 0 ; }
drivers/usb/serial/cp210x.c +3 -1
@@ -1077,7 +1077,9 @@ static int cp210x_tiocmget(struct tty_struct *tty)u8 control;int result; -cp210x_read_u8_reg (port,CP210X_GET_MDMSTS , &control); + result =cp210x_read_u8_reg (port,CP210X_GET_MDMSTS , &control); +if (result) +return result; result = ((control &CONTROL_DTR ) ?TIOCM_DTR :0 ) |((control &CONTROL_RTS ) ?TIOCM_RTS :0 )
drivers/usb/serial/ftdi_sio.c +2 -1
@@ -986,7 +986,8 @@ static const struct usb_device_id id_table_combined[] = {/* ekey Devices */ { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },/* Infineon Devices */ - { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) }, + { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_TC1798_PID, 1) }, + { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_TC2X7_PID, 1) },/* GE Healthcare devices */ { USB_DEVICE(GE_HEALTHCARE_VID, GE_HEALTHCARE_NEMO_TRACKER_PID) },/* Active Research (Actisense) devices */
drivers/usb/serial/ftdi_sio_ids.h +3 -2
@@ -626,8 +626,9 @@/* * Infineon Technologies */ -#define INFINEON_VID 0x058b -#define INFINEON_TRIBOARD_PID 0x0028/* DAS JTAG TriBoard TC1798 V1.0 */ +#define INFINEON_VID 0x058b +#define INFINEON_TRIBOARD_TC1798_PID 0x0028/* DAS JTAG TriBoard TC1798 V1.0 */ +#define INFINEON_TRIBOARD_TC2X7_PID 0x0043/* DAS JTAG TriBoard TC2X7 V1.0 */ /* * Acton Research Corp.
drivers/usb/serial/usb-serial.c +2 -1
@@ -1078,7 +1078,8 @@ static int usb_serial_probe(struct usb_interface *interface, serial->disconnected =0 ; -usb_serial_console_init (serial->port[0 ]->minor); +if (num_ports >0 ) +usb_serial_console_init (serial->port[0 ]->minor); exit:module_put (type->driver.owner);return 0 ;
drivers/video/fbdev/omap2/omapfb/dss/dsi.c +2 -2
@@ -5348,7 +5348,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) dsi->phy_base =devm_ioremap (&dsidev->dev, res->start,resource_size (res)); -if (!dsi->proto_base) { +if (!dsi->phy_base) {DSSERR ("can't ioremap DSI PHY\n" );return -ENOMEM ; }
@@ -5368,7 +5368,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) dsi->pll_base =devm_ioremap (&dsidev->dev, res->start,resource_size (res)); -if (!dsi->proto_base) { +if (!dsi->pll_base) {DSSERR ("can't ioremap DSI PLL\n" );return -ENOMEM ; }
drivers/video/fbdev/pxafb.c +1 -1
@@ -2125,7 +2125,7 @@ static int of_get_pxafb_display(struct device *dev, struct device_node *disp, timings =of_get_display_timings (disp);if (!timings) - goto out; +return -EINVAL ; ret = -ENOMEM ; info->modes = kmalloc_array(timings->num_timings,
drivers/virtio/virtio_pci_legacy.c +12 -4
@@ -212,10 +212,18 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev)return -ENODEV ; } - rc =dma_set_mask_and_coherent (&pci_dev->dev,DMA_BIT_MASK (64 )); -if (rc) - rc =dma_set_mask_and_coherent (&pci_dev->dev, -DMA_BIT_MASK (32 )); + rc =dma_set_mask (&pci_dev->dev,DMA_BIT_MASK (64 )); +if (rc) { + rc =dma_set_mask_and_coherent (&pci_dev->dev,DMA_BIT_MASK (32 )); + }else { +/* +* The virtio ring base address is expressed as a 32-bit PFN, +* with a page size of 1 << VIRTIO_PCI_QUEUE_ADDR_SHIFT. +*/ +dma_set_coherent_mask (&pci_dev->dev, +DMA_BIT_MASK (32 +VIRTIO_PCI_QUEUE_ADDR_SHIFT )); + } +if (rc)dev_warn (&pci_dev->dev,"Failed to enable 64-bit or 32-bit DMA. Trying to continue, but this might not work.\n" );
drivers/virtio/virtio_ring.c +9 -5
@@ -732,7 +732,8 @@ void virtqueue_disable_cb(struct virtqueue *_vq)if (!(vq->avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT )) { vq->avail_flags_shadow |=VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); } }
@@ -764,7 +765,8 @@ unsigned virtqueue_enable_cb_prepare(struct virtqueue *_vq)* entry. Always do both to keep code simple. */ if (vq->avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT ) { vq->avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); }vring_used_event (&vq->vring) =cpu_to_virtio16 (_vq->vdev, last_used_idx = vq->last_used_idx);END_USE (vq);
@@ -832,10 +834,11 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq)* more to do. */ /* Depending on the VIRTIO_RING_F_USED_EVENT_IDX feature, we need to * either clear the flags bit or point the event index at the next -* entry. Always do both to keep code simple. */ +* entry. Always update the event index to keep code simple. */ if (vq->avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT ) { vq->avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); }/* TODO: tune this threshold */ bufs = (u16)(vq->avail_idx_shadow - vq->last_used_idx) *3 /4 ;
@@ -953,7 +956,8 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,/* No callback? Tell other side not to bother us. */ if (!callback) { vq->avail_flags_shadow |=VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (vdev, vq->avail_flags_shadow); }/* Put everything in free lists. */
fs/btrfs/inode.c +7 -2
@@ -8915,9 +8915,14 @@ again:* So even we call qgroup_free_data(), it won't decrease reserved * space. * 2) Not written to disk -* This means the reserved space should be freed here. +* This means the reserved space should be freed here. However, +* if a truncate invalidates the page (by clearing PageDirty) +* and the page is accounted for while allocating extent +* in btrfs_check_data_free_space() we let delayed_ref to +* free the entire extent. */ -btrfs_qgroup_free_data (inode, page_start,PAGE_SIZE ); +if (PageDirty (page)) +btrfs_qgroup_free_data (inode, page_start,PAGE_SIZE );if (!inode_evicting) { clear_extent_bit(tree, page_start, page_end, EXTENT_LOCKED | EXTENT_DIRTY |
fs/btrfs/tree-log.c +6 -14
@@ -2713,14 +2713,12 @@ static inline void btrfs_remove_all_log_ctxs(struct btrfs_root *root, int index, int error) {struct btrfs_log_ctx *ctx; +struct btrfs_log_ctx *safe; -if (!error) { -INIT_LIST_HEAD (&root->log_ctxs[index]); -return ; - } - -list_for_each_entry (ctx, &root->log_ctxs[index], list) +list_for_each_entry_safe (ctx, safe, &root->log_ctxs[index], list) { +list_del_init (&ctx->list); ctx->log_ret = error; + }INIT_LIST_HEAD (&root->log_ctxs[index]); }
@@ -2961,13 +2959,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&root->log_mutex); out_wake_log_root: -/* -* We needn't get log_mutex here because we are sure all -* the other tasks are blocked. -*/ +mutex_lock (&log_root_tree->log_mutex);btrfs_remove_all_log_ctxs (log_root_tree, index2, ret); -mutex_lock (&log_root_tree->log_mutex); log_root_tree->log_transid_committed++;atomic_set (&log_root_tree->log_commit[index2],0 );mutex_unlock (&log_root_tree->log_mutex);
@@ -2978,10 +2972,8 @@ out_wake_log_root:if (waitqueue_active (&log_root_tree->log_commit_wait[index2]))wake_up (&log_root_tree->log_commit_wait[index2]); out: -/* See above. */ -btrfs_remove_all_log_ctxs (root, index1, ret); -mutex_lock (&root->log_mutex); +btrfs_remove_all_log_ctxs (root, index1, ret); root->log_transid_committed++;atomic_set (&root->log_commit[index1],0 );mutex_unlock (&root->log_mutex);
fs/nfsd/nfs4state.c +4 -6
@@ -1147,9 +1147,7 @@ static void put_ol_stateid_locked(struct nfs4_ol_stateid *stp,static bool unhash_lock_stateid (struct nfs4_ol_stateid *stp) { -struct nfs4_openowner *oo =openowner (stp->st_openstp->st_stateowner); - -lockdep_assert_held (&oo->oo_owner.so_client->cl_lock); +lockdep_assert_held (&stp->st_stid.sc_client->cl_lock);
Lines of this file are not shown. View the raw message.
kernel/time/timer.c +44 -30
74 lines not on this page · raw message
security/keys/big_key.c +32 -27
59 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.