Linux 3.19.3
Greg KH
maintainerI'm announcing the release of the 3.19.3 kernel.
All users of the 3.19 kernel series must upgrade.
The updated 3.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.19.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/arm/boot/dts/am33xx-clocks.dtsi | 6 - arch/arm/boot/dts/am43xx-clocks.dtsi | 12 +-- arch/arm/boot/dts/dra7xx-clocks.dtsi | 90 ++++++++++++++++++++--- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 arch/arm/boot/dts/imx6sl-evk.dts | 2 arch/arm/crypto/aesbs-core.S_shipped | 12 ++- arch/arm/crypto/bsaes-armv7.pl | 12 ++- arch/arm/mach-at91/pm.h | 2 arch/arm/mach-exynos/platsmp.c | 3 arch/arm64/include/asm/tlb.h | 3 arch/arm64/include/asm/tlbflush.h | 13 +++ arch/arm64/mm/dma-mapping.c | 12 ++- arch/powerpc/include/asm/iommu.h | 6 + arch/powerpc/kernel/iommu.c | 26 ++++++ arch/powerpc/kernel/smp.c | 4 - arch/powerpc/platforms/powernv/pci.c | 26 ------ arch/powerpc/platforms/pseries/iommu.c | 2 arch/s390/kvm/kvm-s390.c | 1 arch/s390/pci/pci_mmio.c | 17 ++-- arch/sparc/kernel/perf_event.c | 15 --- arch/sparc/kernel/process_64.c | 4 + arch/sparc/kernel/sys_sparc_64.c | 2 arch/sparc/lib/memmove.S | 35 ++++++++ arch/x86/crypto/aesni-intel_glue.c | 4 - arch/x86/include/asm/fpu-internal.h | 2 arch/x86/kernel/apic/apic_numachip.c | 22 ++++- arch/x86/kernel/traps.c | 4 - arch/x86/kernel/xsave.c | 7 + arch/x86/kvm/x86.c | 1 arch/x86/vdso/vdso32/sigreturn.S | 1 arch/x86/xen/p2m.c | 2 drivers/char/tpm/tpm_i2c_stm_st33.c | 10 +- drivers/char/tpm/tpm_ibmvtpm.c | 10 +- drivers/char/tpm/tpm_ibmvtpm.h | 6 - drivers/char/virtio_console.c | 19 ++++ drivers/gpu/drm/drm_crtc.c | 35 ++++---- drivers/gpu/drm/i915/i915_drv.c | 39 +++++++-- drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/intel_display.c | 2 drivers/gpu/drm/radeon/atombios_crtc.c | 3 drivers/gpu/drm/radeon/cik.c | 3 drivers/gpu/drm/radeon/evergreen.c | 3 drivers/gpu/drm/radeon/r100.c | 4 + drivers/gpu/drm/radeon/r600.c | 3 drivers/gpu/drm/radeon/radeon_cs.c | 4 - drivers/gpu/drm/radeon/radeon_fence.c | 68 +++++++++++------ drivers/gpu/drm/radeon/radeon_kfd.c | 2 drivers/gpu/drm/radeon/radeon_object.c | 11 -- drivers/gpu/drm/radeon/rs600.c | 4 + drivers/gpu/drm/radeon/si.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 77 ++++++++++--------- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 8 -- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 --- drivers/i2c/i2c-core.c | 3 drivers/irqchip/irq-armada-370-xp.c | 21 +++++ drivers/mtd/nand/pxa3xx_nand.c | 48 ++++++++++-- drivers/net/can/dev.c | 8 ++ drivers/net/can/usb/kvaser_usb.c | 28 +++++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 drivers/net/ethernet/freescale/fec_main.c | 5 - drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 drivers/net/usb/cx82310_eth.c | 11 ++ drivers/net/virtio_net.c | 9 +- drivers/net/wireless/b43/main.c | 1 drivers/of/base.c | 18 ++-- drivers/pci/pci-sysfs.c | 5 - drivers/regulator/core.c | 34 ++++---- drivers/regulator/rk808-regulator.c | 8 ++ drivers/rtc/rtc-s3c.c | 1 drivers/scsi/libsas/sas_discover.c | 6 + drivers/spi/spi-atmel.c | 12 +-- drivers/spi/spi-dw-mid.c | 6 + drivers/spi/spi-pl022.c | 2 drivers/target/iscsi/iscsi_target.c | 14 ++- drivers/target/target_core_device.c | 4 - drivers/target/target_core_pscsi.c | 2 drivers/target/target_core_transport.c | 4 + drivers/tty/serial/8250/8250_dw.c | 15 +++ drivers/tty/serial/8250/8250_pci.c | 2 drivers/usb/gadget/legacy/inode.c | 15 +++ drivers/xen/events/events_base.c | 18 +++- drivers/xen/xen-pciback/conf_space.c | 2 drivers/xen/xen-pciback/conf_space.h | 2 drivers/xen/xen-pciback/conf_space_header.c | 61 ++++++++++++--- fs/fuse/dev.c | 7 + fs/nilfs2/segment.c | 7 + fs/proc/task_mmu.c | 3 include/linux/serial_core.h | 6 - include/linux/workqueue.h | 3 kernel/cpuset.c | 9 +- kernel/printk/console_cmdline.h | 2 kernel/printk/printk.c | 1 kernel/trace/ftrace.c | 40 +++++++--- kernel/workqueue.c | 56 +++++++++++++- lib/lz4/lz4_decompress.c | 3 lib/seq_buf.c | 4 - mm/cma.c | 12 +-- net/caif/caif_socket.c | 2 net/can/af_can.c | 3 net/compat.c | 7 + net/core/sysctl_net_core.c | 10 +- net/ipv4/inet_diag.c | 18 +++- net/ipv4/tcp_cong.c | 6 + net/ipv4/tcp_cubic.c | 6 + net/ipv4/tcp_output.c | 6 - net/ipv6/fib6_rules.c | 1 net/ipv6/udp_offload.c | 8 -- net/netfilter/ipvs/ip_vs_ctl.c | 2 net/netfilter/ipvs/ip_vs_sync.c | 3 net/netfilter/nf_tables_api.c | 23 +++-- net/netfilter/nft_compat.c | 12 ++- net/netfilter/xt_socket.c | 21 +++-- net/rds/iw_rdma.c | 40 +++++----- net/rxrpc/ar-recvmsg.c | 2 net/sched/cls_u32.c | 5 + net/socket.c | 4 + sound/core/control.c | 4 + sound/pci/hda/hda_controller.c | 2 sound/pci/hda/hda_generic.c | 47 +++++++++--- sound/pci/hda/hda_proc.c | 38 +++++++-- sound/pci/hda/patch_cirrus.c | 2 sound/pci/hda/patch_conexant.c | 11 ++ sound/usb/quirks-table.h | 30 +++++++ virt/kvm/kvm_main.c | 1 125 files changed, 1081 insertions(+), 447 deletions(-)
Ahmed S. Darwish (1):
can: kvaser_usb: Read all messages in a bulk-in URB buffer
Al Viro (4):
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg()
net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom
gadgetfs: use-after-free in ->aio_read()
Alex Deucher (8):
drm/radeon: do a posting read in evergreen_set_irq drm/radeon: do a posting read in r100_set_irq drm/radeon: do a posting read in r600_set_irq drm/radeon: do a posting read in cik_set_irq drm/radeon: do a posting read in si_set_irq drm/radeon: do a posting read in rs600_set_irq drm/radeon: fix interlaced modes on DCE8 drm/radeon: drop ttm two ended allocation
Alexander Sverdlin (1):
spi: pl022: Fix race in giveback() leading to driver lock-up
Alexandre Belloni (1):
ARM: at91: pm: fix at91rm9200 standby
Alexey Andriyanov (1):
ipvs: fix inability to remove a mixed-family RS
Alexey Kodanev (1):
net: sysctl_net_core: check SNDBUF and RCVBUF for min length
Andy Lutomirski (1):
x86/asm/entry/32: Fix user_mode() misuses
Andy Shevchenko (1):
spi: dw-mid: avoid potential NULL dereference
Ard Biesheuvel (1):
crypto: arm/aes update NEON AES module to latest OpenSSL version
Arnd Bergmann (1):
rds: avoid potential stack overflow
Bart Van Assche (1):
target: Fix reference leak in target_get_sess_cmd() error path
Ben Goz (1):
drm/radeon: Changing number of compute pipe lines
Brian King (1):
bnx2x: Force fundamental reset for EEH recovery
Brian Norris (1):
of: handle both '/' and ':' in path strings
Catalin Marinas (2):
net: compat: Update get_compat_msghdr() to match copy_msghdr_from_user() behaviour
arm64: Invalidate the TLB corresponding to intermediate page table levels
Chris Wilson (1):
drm: Don't assign fbs for universal cursor support to files
Christian König (1):
drm/radeon: drop setting UPLL to sleep mode
Christophe Ricard (1):
tpm/tpm_i2c_stm_st33: Add status check when reading data on the FIFO
Danesh Petigara (1):
mm: cma: fix CMA aligned offset calculation
Daniel J Blueman (1):
x86/apic/numachip: Fix sibling map with NumaChip
Daniel Mack (1):
ALSA: snd-usb: add quirks for Roland UA-22
Dave Gordon (1):
drm/i915: use in_interrupt() not in_irq() to check context
David Ahern (3):
sparc: perf: Remove redundant perf_pmu_{en|dis}able calls
sparc: perf: Make counting mode actually work
sparc: Touch NMI watchdog when walking cpus and calling printk
David S. Miller (1):
sparc64: Fix several bugs in memmove().
Doug Anderson (2):
regulator: rk808: Set the enable time for LDOs
regulator: core: Fix enable GPIO reference counting
Eran Ben Elisha (1):
net/mlx4_en: Fix off-by-one in ethtool statistics display
Eric Dumazet (2):
inet_diag: fix possible overflow in inet_diag_dump_one_icsk()
netfilter: xt_socket: fix a stack corruption bug
Fugang Duan (1):
net: fec: fix rcv is not last issue when do suspend/resume test
Greg Kroah-Hartman (1):
Linux 3.19.3
Imre Deak (2):
drm/i915: add dev_to_i915 helper
drm/i915: gen4: work around hang during hibernation
Jakub Kicinski (1):
Revert "i2c: core: Dispose OF IRQ mapping at client removal time"
James Bottomley (1):
libsas: Fix Kernel Crash in smp_execute_task
Jan Beulich (1):
xen-pciback: limit guest control of command register
Jason Low (1):
cpuset: Fix cpuset sched_relax_domain_level
Jason Wang (1):
virtio-net: correctly delete napi hash
Javier Martinez Canillas (2):
regulator: Only enable disabled regulators on resume drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data
JeHyeon Yeon (1):
LZ4 : fix the data abort issue
Jiri Slaby (1):
x86/vdso: Fix the build on GCC5
Josh Hunt (1):
tcp: fix tcp fin memory accounting
Juergen Gross (2):
xen/events: avoid NULL pointer dereference in dom0 on large machines x86/xen: correct bug in p2m list initialization
Julian Anastasov (1):
ipvs: add missing ip_vs_pe_put in sync code
Kirill A. Shutemov (1):
pagemap: do not leak physical addresses to non-privileged userspace
Krzysztof Kozlowski (1):
ARM: EXYNOS: Don't use LDREX and STREX after disabling cache coherency
Leif Lindholm (1):
of: fix handling of '/' in options for of_find_node_by_path()
Maarten Lankhorst (1):
drm/radeon: fix wait to actually occur after the signaling callback
Maxime Ripard (2):
mtd: nand: pxa3xx: Fix PIO FIFO draining
irqchip: armada-370-xp: Fix chained per-cpu interrupts
Michael Ellerman (1):
powerpc/smp: Wait until secondaries are active & online
Michael S. Tsirkin (2):
virtio_console: init work unconditionally
virtio_console: avoid config access from irq
Miklos Szeredi (2):
fuse: set stolen page uptodate
fuse: notify: don't move pages
Neal Cardwell (2):
tcp: fix tcp_cong_avoid_ai() credit accumulation bug with decreases in w
tcp: restore 1.5x per RTT limit to CUBIC cwnd growth in congestion avoidance
Nicholas Bellinger (3):
target: Fix virtual LUN=0 target_configure_device failure OOPs
iscsi-target: Avoid early conn_logout_comp for iser connections target/pscsi: Fix NULL pointer dereference in get_device_type
Nimrod Andy (1):
net: fec: fix receive VLAN CTAG HW acceleration issue
Nishanth Aravamudan (1):
powerpc/iommu: Remove IOMMU device references via bus notifier
Oleg Nesterov (2):
x86/fpu: Avoid math_state_restore() without used_math() in __restore_xstate_sig() x86/fpu: Drop_fpu() should not assume that tsk equals current
Oliver Hartkopp (1):
can: add missing initialisations in CAN related skbuffs
Ondrej Zary (1):
Revert "net: cx82310_eth: use common match macro"
Pablo Neira Ayuso (2):
netfilter: nft_compat: fix module refcount underflow
netfilter: nf_tables: fix addition/deletion of elements from commit/abort
Paolo Bonzini (1):
kvm: move advertising of KVM_CAP_IRQFD to common code
Patrick McHardy (1):
netfilter: nf_tables: fix transaction race condition
Peter Chen (2):
ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
Peter Hurley (3):
serial: core: Fix iotype userspace breakage
serial: 8250_dw: Fix deadlock in LCR workaround
console: Fix console name size mismatch
Pratyush Anand (1):
ftrace: Fix en(dis)able graph caller when en(dis)abling record via sysctl
Rafał Miłecki (1):
b43: fix support for 5 GHz only BCM43228 model
Ravikumar Kattekola (1):
ARM: dts: DRA7x: Fix the bypass clock source for dpll_iva and others
Rob Gardner (1):
sparc: semtimedop() unreachable due to comparison error
Russell King (1):
Change email address for 8250_pci
Ryusuke Konishi (1):
nilfs2: fix deadlock of segment constructor during recovery
Sabrina Dubroca (1):
ipv6: call ipv6_proxy_select_ident instead of ipv6_select_ident in udp6_ufo_fragment
Sasha Levin (1):
PCI: Don't read past the end of sysfs "driver_override" buffer
Sebastian Ott (1):
s390/pci: fix possible information leak in mmio syscall
Stephan Mueller (1):
crypto: aesni - fix memory usage in GCM decryption
Steven Barth (1):
ipv6: fix backtracking for throw routes
Steven Rostedt (Red Hat) (4):
ftrace: Clear REGS_EN and TRAMP_EN flags on disabling record via sysctl
ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled
seq_buf: Fix seq_buf_vprintf() truncation
seq_buf: Fix seq_buf_bprintf() truncation
Suzuki K. Poulose (1):
arm64: Honor __GFP_ZERO in dma allocations
Takashi Iwai (7):
ALSA: control: Add sanity checks for user ctl id name string
ALSA: hda - Fix built-in mic on Compaq Presario CQ60
ALSA: hda - Don't access stereo amps for mono channel widgets
ALSA: hda - Set single_adc_amp flag for CS420x codecs
ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic
ALSA: hda - Fix regression of HD-audio controller fallback modes
ALSA: hda - Treat stereo-to-mono mix properly
Tejun Heo (1):
workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
Thomas Hellstrom (2):
drm/vmwgfx: Reorder device takedown somewhat drm/vmwgfx: Fix a couple of lock dependency violations
Tommi Rantala (1):
drm/radeon: fix DRM_IOCTL_RADEON_CS oops
Torsten Fleischer (1):
spi: atmel: Fix interrupt setup for PDC transfers
Vignesh R (2):
ARM: dts: am33xx-clocks: Fix ehrpwm tbclk data on am33xx
ARM: dts: am43xx-clocks: Fix ehrpwm tbclk data on am43xx
WANG Cong (1):
net_sched: fix struct tc_u_hnode layout in u32
Zefan Li (2):
cpuset: initialize effective masks when clone_children is enabled
cpuset: fix a warning when clearing configured masks in old hierarchy
[email protected] (1):
tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 19 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = NAME = Diseased Newt
arch/arm/boot/dts/am33xx-clocks.dtsi +3 -3
@@ -99,7 +99,7 @@ ehrpwm0_tbclk: ehrpwm0_tbclk@44e10664 { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <0>; reg = <0x0664>; };
@@ -107,7 +107,7 @@ ehrpwm1_tbclk: ehrpwm1_tbclk@44e10664 { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <1>; reg = <0x0664>; };
@@ -115,7 +115,7 @@ ehrpwm2_tbclk: ehrpwm2_tbclk@44e10664 { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <2>; reg = <0x0664>; };
arch/arm/boot/dts/am43xx-clocks.dtsi +6 -6
@@ -107,7 +107,7 @@ ehrpwm0_tbclk: ehrpwm0_tbclk { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <0>; reg = <0x0664>; };
@@ -115,7 +115,7 @@ ehrpwm1_tbclk: ehrpwm1_tbclk { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <1>; reg = <0x0664>; };
@@ -123,7 +123,7 @@ ehrpwm2_tbclk: ehrpwm2_tbclk { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <2>; reg = <0x0664>; };
@@ -131,7 +131,7 @@ ehrpwm3_tbclk: ehrpwm3_tbclk { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <4>; reg = <0x0664>; };
@@ -139,7 +139,7 @@ ehrpwm4_tbclk: ehrpwm4_tbclk { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <5>; reg = <0x0664>; };
@@ -147,7 +147,7 @@ ehrpwm5_tbclk: ehrpwm5_tbclk { #clock-cells = <0>; compatible = "ti,gate-clock"; - clocks = <&dpll_per_m2_ck>; + clocks = <&l4ls_gclk>; ti,bit-shift = <6>; reg = <0x0664>; };
arch/arm/boot/dts/dra7xx-clocks.dtsi +81 -9
171 lines not on this page · raw message
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +2 -0
@@ -35,6 +35,7 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio3 22 0>; enable-active-high; + vin-supply = <&swbst_reg>; }; reg_usb_h1_vbus: regulator@1 {
@@ -45,6 +46,7 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio1 29 0>; enable-active-high; + vin-supply = <&swbst_reg>; }; reg_audio: regulator@2 {
arch/arm/boot/dts/imx6sl-evk.dts +2 -0
@@ -52,6 +52,7 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio4 0 0>; enable-active-high; + vin-supply = <&swbst_reg>; }; reg_usb_otg2_vbus: regulator@1 {
@@ -62,6 +63,7 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio4 2 0>; enable-active-high; + vin-supply = <&swbst_reg>; }; reg_aud3v: regulator@2 {
arch/arm/crypto/aesbs-core.S_shipped +8 -4
@@ -58,14 +58,18 @@ # define VFP_ABI_FRAME 0 # define BSAES_ASM_EXTENDED_KEY # define XTS_CHAIN_TWEAK -# define __ARM_ARCH__ 7 +# define __ARM_ARCH__ __LINUX_ARM_ARCH__ +# define __ARM_MAX_ARCH__ 7 #endif #ifdef __thumb__ # define adrl adr #endif -#if __ARM_ARCH__>=7 +#if __ARM_MAX_ARCH__>=7 +.arch armv7-a +.fpu neon + .text .syntax unified @ ARMv7-capable assembler is expected to handle this #ifdef __thumb2__
@@ -74,8 +78,6 @@ .code 32 #endif -.fpu neon - .type _bsaes_decrypt8,%function .align 4 _bsaes_decrypt8:
@@ -2095,9 +2097,11 @@ bsaes_xts_decrypt: vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic +#ifndef XTS_CHAIN_TWEAK tst r9, #0xf @ if not multiple of 16 it ne @ Thumb2 thing, sanity check in ARM subne r9, #0x10 @ subtract another 16 bytes +#endif subs r9, #0x80 blo .Lxts_dec_short
arch/arm/crypto/bsaes-armv7.pl +8 -4
@@ -701,14 +701,18 @@ $code.=<<___; # define VFP_ABI_FRAME 0 # define BSAES_ASM_EXTENDED_KEY # define XTS_CHAIN_TWEAK -# define __ARM_ARCH__ 7 +# define __ARM_ARCH__ __LINUX_ARM_ARCH__ +# define __ARM_MAX_ARCH__ 7 #endif #ifdef __thumb__ # define adrl adr #endif -#if __ARM_ARCH__>=7 +#if __ARM_MAX_ARCH__>=7 +.arch armv7-a +.fpu neon + .text .syntax unified @ ARMv7-capable assembler is expected to handle this #ifdef __thumb2__
@@ -717,8 +721,6 @@ $code.=<<___; .code 32 #endif -.fpu neon - .type _bsaes_decrypt8,%function .align 4 _bsaes_decrypt8:
@@ -2076,9 +2078,11 @@ bsaes_xts_decrypt: vld1.8 {@XMM[8]}, [r0] @ initial tweak adr $magic, .Lxts_magic +#ifndef XTS_CHAIN_TWEAK tst $len, #0xf @ if not multiple of 16 it ne @ Thumb2 thing, sanity check in ARM subne $len, #0x10 @ subtract another 16 bytes +#endif subs $len, #0x80 blo .Lxts_dec_short
arch/arm/mach-at91/pm.h +1 -1
@@ -44,7 +44,7 @@ static inline void at91rm9200_standby(void) " mcr p15, 0, %0, c7, c0, 4\n\t" " str %5, [%1, %2]" : - : "r" (0), "r" (AT91_BASE_SYS), "r" (AT91RM9200_SDRAMC_LPR), + : "r" (0), "r" (at91_ramc_base[0]), "r" (AT91RM9200_SDRAMC_LPR),"r" (1 ),"r" (AT91RM9200_SDRAMC_SRR ), "r" (lpr)); }
arch/arm/mach-exynos/platsmp.c +1 -2
@@ -126,8 +126,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)*/ void exynos_cpu_power_down (int cpu) { -if (cpu ==0 && (of_machine_is_compatible ("samsung,exynos5420" ) || -of_machine_is_compatible ("samsung,exynos5800" ))) { +if (cpu ==0 && (soc_is_exynos5420 () ||soc_is_exynos5800 ())) {/* * Bypass power down for CPU0 during suspend. Check for * the SYS_PWR_REG value to decide if we are suspending
arch/arm64/include/asm/tlb.h +3 -0
@@ -48,6 +48,7 @@ static inline void tlb_flush(struct mmu_gather *tlb)static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pte,unsigned long addr) { +__flush_tlb_pgtable (tlb->mm, addr);pgtable_page_dtor (pte);tlb_remove_entry (tlb, pte); }
@@ -56,6 +57,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,static inline void __pmd_free_tlb (struct mmu_gather *tlb,pmd_t *pmdp,unsigned long addr) { +__flush_tlb_pgtable (tlb->mm, addr);tlb_remove_entry (tlb,virt_to_page (pmdp)); }#endif
@@ -64,6 +66,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,static inline void __pud_free_tlb (struct mmu_gather *tlb,pud_t *pudp,unsigned long addr) { +__flush_tlb_pgtable (tlb->mm, addr);tlb_remove_entry (tlb,virt_to_page (pudp)); }#endif
arch/arm64/include/asm/tlbflush.h +13 -0
@@ -149,6 +149,19 @@ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end }/* +* Used to invalidate the TLB (walk caches) corresponding to intermediate page +* table levels (pgd/pud/pmd). +*/ +static inline void __flush_tlb_pgtable (struct mm_struct *mm, +unsigned long uaddr) +{ +unsigned long addr = uaddr >>12 | ((unsigned long )ASID (mm) <<48 ); + +dsb (ishst); + asm("tlbi vae1is, %0" : :"r" (addr)); +dsb (ish); +} +/* * On AArch64, the cache coherency is handled via the set_pte_at() function. */ static inline void update_mmu_cache(struct vm_area_struct *vma,
arch/arm64/mm/dma-mapping.c +9 -3
@@ -51,7 +51,7 @@ static int __init early_coherent_pool(char *p) }early_param ("coherent_pool" , early_coherent_pool); -static void *__alloc_from_pool (size_t size,struct page **ret_page) +static void *__alloc_from_pool (size_t size,struct page **ret_page,gfp_t flags) {unsigned long val;void *ptr =NULL ;
@@ -67,6 +67,8 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) *ret_page =phys_to_page (phys); ptr = (void *)val; +if (flags & __GFP_ZERO) +memset (ptr,0 , size); }return ptr;
@@ -101,6 +103,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, flags |=GFP_DMA ;if (IS_ENABLED (CONFIG_DMA_CMA ) && (flags & __GFP_WAIT)) {struct page *page; +void *addr; size =PAGE_ALIGN (size); page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,
@@ -109,7 +112,10 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size,return NULL ; *dma_handle =phys_to_dma (dev,page_to_phys (page)); -return page_address (page); + addr =page_address (page); +if (flags & __GFP_ZERO) +memset (addr,0 , size); +return addr; }else {return swiotlb_alloc_coherent (dev, size, dma_handle, flags); }
@@ -145,7 +151,7 @@ static void *__dma_alloc_noncoherent(struct device *dev, size_t size,if (!(flags & __GFP_WAIT)) {struct page *page =NULL ; -void *addr =__alloc_from_pool (size, &page); +void *addr =__alloc_from_pool (size, &page, flags);if (addr) *dma_handle =phys_to_dma (dev,page_to_phys (page));
arch/powerpc/include/asm/iommu.h +6 -0
@@ -113,6 +113,7 @@ extern void iommu_register_group(struct iommu_table *tbl, int pci_domain_number, unsigned long pe_num);extern int iommu_add_device (struct device *dev);extern void iommu_del_device (struct device *dev); +extern int __init tce_iommu_bus_notifier_init (void );#else static inline void iommu_register_group(struct iommu_table *tbl, int pci_domain_number,
@@ -128,6 +129,11 @@ static inline int iommu_add_device(struct device *dev)static inline void iommu_del_device (struct device *dev) { } + +static inline int __init tce_iommu_bus_notifier_init (void ) +{ +return 0 ; +}#endif /* !CONFIG_IOMMU_API */ static inline void set_iommu_table_base_and_group(struct device *dev,
arch/powerpc/kernel/iommu.c +26 -0
@@ -1175,4 +1175,30 @@ void iommu_del_device(struct device *dev) }EXPORT_SYMBOL_GPL (iommu_del_device); +static int tce_iommu_bus_notifier (struct notifier_block *nb, +unsigned long action,void *data) +{ +struct device *dev = data; + +switch (action) { +case BUS_NOTIFY_ADD_DEVICE : +return iommu_add_device (dev); +case BUS_NOTIFY_DEL_DEVICE : +if (dev->iommu_group) +iommu_del_device (dev); +return 0 ; +default : +return 0 ; + } +} + +static struct notifier_block tce_iommu_bus_nb = { + .notifier_call = tce_iommu_bus_notifier, +}; + +int __init tce_iommu_bus_notifier_init (void ) +{ +bus_register_notifier (&pci_bus_type, &tce_iommu_bus_nb); +return 0 ; +}#endif /* CONFIG_IOMMU_API */
arch/powerpc/kernel/smp.c +2 -2
@@ -555,8 +555,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)if (smp_ops->give_timebase) smp_ops->give_timebase (); -/* Wait until cpu puts itself in the online map */ -while (!cpu_online (cpu)) +/* Wait until cpu puts itself in the online & active maps */ +while (!cpu_online (cpu) || !cpu_active (cpu))cpu_relax ();return 0 ;
arch/powerpc/platforms/powernv/pci.c +0 -26
@@ -866,30 +866,4 @@ void __init pnv_pci_init(void)#endif } -static int tce_iommu_bus_notifier (struct notifier_block *nb, -unsigned long action,void *data) -{ -struct device *dev = data; - -switch (action) { -case BUS_NOTIFY_ADD_DEVICE : -return iommu_add_device (dev); -case BUS_NOTIFY_DEL_DEVICE : -if (dev->iommu_group) -iommu_del_device (dev); -return 0 ; -default : -return 0 ; - } -} - -static struct notifier_block tce_iommu_bus_nb = { - .notifier_call = tce_iommu_bus_notifier, -}; - -static int __init tce_iommu_bus_notifier_init (void ) -{ -bus_register_notifier (&pci_bus_type, &tce_iommu_bus_nb); -return 0 ; -}machine_subsys_initcall_sync (powernv, tce_iommu_bus_notifier_init);
arch/powerpc/platforms/pseries/iommu.c +2 -0
@@ -1340,3 +1340,5 @@ static int __init disable_multitce(char *str) }__setup ("multitce=" , disable_multitce); + +machine_subsys_initcall_sync (pseries, tce_iommu_bus_notifier_init);
arch/s390/kvm/kvm-s390.c +0 -1
@@ -159,7 +159,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ONE_REG :case KVM_CAP_ENABLE_CAP :case KVM_CAP_S390_CSS_SUPPORT : -case KVM_CAP_IRQFD :case KVM_CAP_IOEVENTFD :case KVM_CAP_DEVICE_CTRL :case KVM_CAP_ENABLE_CAP_VM :
arch/s390/pci/pci_mmio.c +8 -9
@@ -64,8 +64,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr,if (copy_from_user (buf, user_buffer, length)) goto out; -memcpy_toio (io_addr, buf, length); - ret =0 ; + ret =zpci_memcpy_toio (io_addr, buf, length); out:if (buf != local_buf)kfree (buf);
@@ -98,16 +97,16 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr, goto out; io_addr = (void *)((pfn <<PAGE_SHIFT ) | (mmio_addr & ~PAGE_MASK )); - ret = -EFAULT ; -if ((unsigned long ) io_addr <ZPCI_IOMAP_ADDR_BASE ) +if ((unsigned long ) io_addr <ZPCI_IOMAP_ADDR_BASE ) { + ret = -EFAULT ; goto out; - -memcpy_fromio (buf, io_addr, length); - -if (copy_to_user (user_buffer, buf, length)) + } + ret =zpci_memcpy_fromio (buf, io_addr, length); +if (ret) goto out; +if (copy_to_user (user_buffer, buf, length)) + ret = -EFAULT ; - ret =0 ; out:if (buf != local_buf)kfree (buf);
arch/sparc/kernel/perf_event.c +3 -12
@@ -960,6 +960,8 @@ out: cpuc->pcr[0 ] |= cpuc->event[0 ]->hw.config_base; } +static void sparc_pmu_start (struct perf_event *event,int flags); +/* On this PMU each PIC has it's own PCR control register. */ static void calculate_multiple_pcrs (struct cpu_hw_events *cpuc) {
@@ -972,20 +974,13 @@ static void calculate_multiple_pcrs(struct cpu_hw_events *cpuc)struct perf_event *cp = cpuc->event[i];struct hw_perf_event *hwc = &cp->hw;int idx = hwc->idx; -u64 enc;if (cpuc->current_idx[i] !=PIC_NO_INDEX )continue ; -sparc_perf_event_set_period (cp, hwc, idx); cpuc->current_idx[i] = idx; - enc =perf_event_get_enc (cpuc->events[i]); - cpuc->pcr[idx] &= ~mask_for_index (idx); -if (hwc->state &PERF_HES_STOPPED ) - cpuc->pcr[idx] |=nop_for_index (idx); -else - cpuc->pcr[idx] |=event_encoding (enc, idx); +sparc_pmu_start (cp,PERF_EF_RELOAD ); } out:for (i =0 ; i < cpuc->n_events; i++) {
@@ -1101,7 +1096,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags)int i;local_irq_save (flags); -perf_pmu_disable (event->pmu);for (i =0 ; i < cpuc->n_events; i++) {if (event == cpuc->event[i]) {
@@ -1127,7 +1121,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags) } } -perf_pmu_enable (event->pmu);local_irq_restore (flags); }
@@ -1361,7 +1354,6 @@ static int sparc_pmu_add(struct perf_event *event, int ef_flags)unsigned long flags;local_irq_save (flags); -perf_pmu_disable (event->pmu); n0 = cpuc->n_events;if (n0 >= sparc_pmu->max_hw_events)
@@ -1394,7 +1386,6 @@ nocheck: ret =0 ; out: -perf_pmu_enable (event->pmu);local_irq_restore (flags);return ret; }
arch/sparc/kernel/process_64.c +4 -0
@@ -287,6 +287,8 @@ void arch_trigger_all_cpu_backtrace(bool include_self)printk (" TPC[%lx] O7[%lx] I7[%lx] RPC[%lx]\n" , gp->tpc, gp->o7, gp->i7, gp->rpc); } + +touch_nmi_watchdog (); }memset (global_cpu_snapshot,0 ,sizeof (global_cpu_snapshot));
@@ -362,6 +364,8 @@ static void pmu_snapshot_all_cpus(void) (cpu == this_cpu ?'*' :' ' ), cpu, pp->pcr[0 ], pp->pcr[1 ], pp->pcr[2 ], pp->pcr[3 ], pp->pic[0], pp->pic[1], pp->pic[2], pp->pic[3]); + +touch_nmi_watchdog (); }memset (global_cpu_snapshot,0 ,sizeof (global_cpu_snapshot));
arch/sparc/kernel/sys_sparc_64.c +1 -1
@@ -333,7 +333,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, secondlong err;/* No need for backward compatibility. We can start fresh... */ -if (call <=SEMCTL ) { +if (call <=SEMTIMEDOP ) {switch (call) {case SEMOP : err = sys_semtimedop(first, ptr,
arch/sparc/lib/memmove.S +32 -3
@@ -8,9 +8,11 @@ .text ENTRY(memmove) /* o0=dst o1=src o2=len */ - mov %o0, %g1 + brz,pn %o2, 99f + mov %o0, %g1 + cmp %o0, %o1 - bleu,pt %xcc, memcpy + bleu,pt %xcc, 2f add %o1, %o2, %g7 cmp %g7, %o0 bleu,pt %xcc, memcpy
@@ -24,7 +26,34 @@ ENTRY(memmove) /* o0=dst o1=src o2=len */ stb %g7, [%o0] bne,pt %icc, 1b sub %o0, 1, %o0 - +99: retl mov %g1, %o0 + + /* We can't just call memcpy for these memmove cases. On some + * chips the memcpy uses cache initializing stores and when dst + * and src are close enough, those can clobber the source data + * before we've loaded it in. + */ +2: or %o0, %o1, %g7 + or %o2, %g7, %g7 + andcc %g7, 0x7, %g0 + bne,pn %xcc, 4f + nop + +3: ldx [%o1], %g7 + add %o1, 8, %o1 + subcc %o2, 8, %o2 + add %o0, 8, %o0 + bne,pt %icc, 3b + stx %g7, [%o0 - 0x8] + ba,a,pt %xcc, 99b + +4: ldub [%o1], %g7 + add %o1, 1, %o1 + subcc %o2, 1, %o2 + add %o0, 1, %o0 + bne,pt %icc, 4b + stb %g7, [%o0 - 0x1] + ba,a,pt %xcc, 99b ENDPROC(memmove)
arch/x86/crypto/aesni-intel_glue.c +2 -2
@@ -1133,7 +1133,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req) src =kmalloc (req->cryptlen + req->assoclen,GFP_ATOMIC );if (!src)return -ENOMEM ; - assoc = (src + req->cryptlen + auth_tag_len); + assoc = (src + req->cryptlen);scatterwalk_map_and_copy (src, req->src,0 , req->cryptlen,0 );scatterwalk_map_and_copy (assoc, req->assoc,0 , req->assoclen,0 );
@@ -1158,7 +1158,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req)scatterwalk_done (&src_sg_walk,0 ,0 );scatterwalk_done (&assoc_sg_walk,0 ,0 ); }else { -scatterwalk_map_and_copy (dst, req->dst,0 , req->cryptlen,1 ); +scatterwalk_map_and_copy (dst, req->dst,0 , tempCipherLen,1 );kfree (src); }return retval;
arch/x86/include/asm/fpu-internal.h +1 -1
@@ -368,7 +368,7 @@ static inline void drop_fpu(struct task_struct *tsk)preempt_disable (); tsk->thread.fpu_counter =0 ;__drop_fpu (tsk); -clear_used_math (); +clear_stopped_child_used_math (tsk);preempt_enable (); }
arch/x86/kernel/apic/apic_numachip.c +16 -6
@@ -37,10 +37,12 @@ static const struct apic apic_numachip;static unsigned int get_apic_id (unsigned long x) {unsigned long value; -unsigned int id; +unsigned int id = (x >>24 ) &0xff ; -rdmsrl (MSR_FAM10H_NODE_ID , value); - id = ((x >>24 ) &0xffU ) | ((value <<2 ) &0xff00U ); +if (static_cpu_has_safe (X86_FEATURE_NODEID_MSR )) { +rdmsrl (MSR_FAM10H_NODE_ID , value); + id |= (value <<2 ) &0xff00 ; + }return id; }
@@ -155,10 +157,18 @@ static int __init numachip_probe(void)static void fixup_cpu_id (struct cpuinfo_x86 *c,int node) { -if (c->phys_proc_id != node) { - c->phys_proc_id = node; -per_cpu (cpu_llc_id,smp_processor_id ()) = node; +u64 val; +u32 nodes =1 ; + +this_cpu_write (cpu_llc_id, node); + +/* Account for nodes per socket in multi-core-module processors */ +if (static_cpu_has_safe (X86_FEATURE_NODEID_MSR )) { +rdmsrl (MSR_FAM10H_NODE_ID , val); + nodes = ((val >>3 ) &7 ) +1 ; } + + c->phys_proc_id = node / nodes; }static int __init numachip_system_init (void )
arch/x86/kernel/traps.c +2 -2
@@ -300,7 +300,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code) goto exit;conditional_sti (regs); -if (!user_mode (regs)) +if (!user_mode_vm (regs))die ("bounds" , regs, error_code);if (!cpu_feature_enabled (X86_FEATURE_MPX )) {
@@ -566,7 +566,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)* then it's very likely the result of an icebp/int01 trap. * User wants a sigtrap for that. */ -if (!dr6 &&user_mode (regs)) +if (!dr6 &&user_mode_vm (regs)) user_icebp =1 ;/* Catch kmemcheck conditions first of all! */
arch/x86/kernel/xsave.c +4 -3
@@ -378,7 +378,7 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)* thread's fpu state, reconstruct fxstate from the fsave * header. Sanitize the copied state etc. */ -struct xsave_struct *xsave = &tsk->thread.fpu.state->xsave; +struct fpu *fpu = &tsk->thread.fpu;struct user_i387_ia32_struct env;int err =0 ;
@@ -392,14 +392,15 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)*/ drop_fpu (tsk); -if (__copy_from_user (xsave, buf_fx, state_size) || +if (__copy_from_user (&fpu->state->xsave, buf_fx, state_size) ||__copy_from_user (&env, buf,sizeof (env))) { +fpu_finit (fpu); err =-1 ; }else {sanitize_restored_xstate (tsk, &env, xstate_bv, fx_only); -set_used_math (); } +set_used_math ();if (use_eager_fpu ()) {preempt_disable ();math_state_restore ();
arch/x86/kvm/x86.c +0 -1
@@ -2716,7 +2716,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_USER_NMI :case KVM_CAP_REINJECT_CONTROL :case KVM_CAP_IRQ_INJECT_STATUS : -case KVM_CAP_IRQFD :case KVM_CAP_IOEVENTFD :case KVM_CAP_IOEVENTFD_NO_LENGTH :case KVM_CAP_PIT2 :
arch/x86/vdso/vdso32/sigreturn.S +1 -0
@@ -17,6 +17,7 @@ .text .globl __kernel_sigreturn .type __kernel_sigreturn,@function + nop /* this guy is needed for .LSTARTFDEDLSI1 below (watch for HACK) */ ALIGN __kernel_sigreturn: .LSTART_sigreturn:
arch/x86/xen/p2m.c +1 -1
@@ -567,7 +567,7 @@ static bool alloc_p2m(unsigned long pfn)if (p2m_pfn ==PFN_DOWN (__pa (p2m_missing)))p2m_init (p2m);else -p2m_init_identity (p2m, pfn); +p2m_init_identity (p2m, pfn & ~(P2M_PER_PAGE -1 ));spin_lock_irqsave (&p2m_update_lock, flags);
drivers/char/tpm/tpm_i2c_stm_st33.c +6 -4
@@ -397,7 +397,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,*/ static int recv_data (struct tpm_chip *chip,u8 *buf,size_t count) { -int size =0 , burstcnt, len; +int size =0 , burstcnt, len, ret;struct i2c_client *client; client = (struct i2c_client *)TPM_VPRIV (chip);
@@ -406,13 +406,15 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) wait_for_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, chip->vendor.timeout_c, - &chip->vendor.read_queue) - == 0) { + &chip->vendor.read_queue) == 0) { burstcnt =get_burstcount (chip);if (burstcnt <0 )return burstcnt; len =min_t (int, burstcnt, count - size); -I2C_READ_DATA (client,TPM_DATA_FIFO , buf + size, len); + ret =I2C_READ_DATA (client,TPM_DATA_FIFO , buf + size, len); +if (ret <0 ) +return ret; + size += len; }return size;
drivers/char/tpm/tpm_ibmvtpm.c +5 -5
@@ -124,7 +124,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) {struct ibmvtpm_dev *ibmvtpm;struct ibmvtpm_crq crq; -u64 *word = (u64 *) &crq; +__be64 *word = (__be64 *)&crq;int rc; ibmvtpm = (struct ibmvtpm_dev *)TPM_VPRIV (chip);
@@ -145,11 +145,11 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)memcpy ((void *)ibmvtpm->rtce_buf, (void *)buf, count); crq.valid = (u8 )IBMVTPM_VALID_CMD ; crq.msg = (u8 )VTPM_TPM_COMMAND ; - crq.len = (u16 )count; - crq.data = ibmvtpm->rtce_dma_handle; + crq.len =cpu_to_be16 (count); + crq.data =cpu_to_be32 (ibmvtpm->rtce_dma_handle); - rc =ibmvtpm_send_crq (ibmvtpm->vdev,cpu_to_be64 (word[0 ]), -cpu_to_be64 (word[1 ])); + rc =ibmvtpm_send_crq (ibmvtpm->vdev,be64_to_cpu (word[0 ]), +be64_to_cpu (word[1 ]));if (rc !=H_SUCCESS ) {dev_err (ibmvtpm->dev,"tpm_ibmvtpm_send failed rc=%d\n" , rc); rc =0 ;
drivers/char/tpm/tpm_ibmvtpm.h +3 -3
@@ -22,9 +22,9 @@struct ibmvtpm_crq {u8 valid;u8 msg; -u16 len; -u32 data; -u64 reserved; +__be16 len; +__be32 data; +__be64 reserved; } __attribute__((packed,aligned (8 )));struct ibmvtpm_crq_queue {
drivers/char/virtio_console.c +18 -1
@@ -142,6 +142,7 @@ struct ports_device {* notification */ struct work_struct control_work; +struct work_struct config_work;struct list_head ports;
@@ -1837,10 +1838,21 @@ static void config_intr(struct virtio_device *vdev) portdev = vdev->priv; +if (!use_multiport (portdev)) +schedule_work (&portdev->config_work); +} + +static void config_work_handler (struct work_struct *work) +{ +struct ports_device *portdev; + + portdev = container_of(work, struct ports_device, control_work);if (!use_multiport (portdev)) { +struct virtio_device *vdev;struct port *port;u16 rows, cols; + vdev = portdev->vdev; virtio_cread(vdev, struct virtio_console_config, cols, &cols); virtio_cread(vdev, struct virtio_console_config, rows, &rows);
@@ -2031,12 +2043,14 @@ static int virtcons_probe(struct virtio_device *vdev)virtio_device_ready (portdev->vdev); +INIT_WORK (&portdev->config_work, &config_work_handler); +INIT_WORK (&portdev->control_work, &control_work_handler); +if (multiport) {unsigned int nr_added_bufs;spin_lock_init (&portdev->c_ivq_lock);spin_lock_init (&portdev->c_ovq_lock); -INIT_WORK (&portdev->control_work, &control_work_handler); nr_added_bufs =fill_queue (portdev->c_ivq, &portdev->c_ivq_lock);
@@ -2104,6 +2118,8 @@ static void virtcons_remove(struct virtio_device *vdev)/* Finish up work that's lined up */ if (use_multiport (portdev))cancel_work_sync (&portdev->control_work); +else +cancel_work_sync (&portdev->config_work);list_for_each_entry_safe (port, port2, &portdev->ports, list)unplug_port (port);
@@ -2155,6 +2171,7 @@ static int virtcons_freeze(struct virtio_device *vdev)virtqueue_disable_cb (portdev->c_ivq);cancel_work_sync (&portdev->control_work); +cancel_work_sync (&portdev->config_work);/* * Once more: if control_work_handler() was running, it would * enable the cb as the last step.
drivers/gpu/drm/drm_crtc.c +19 -16
@@ -42,9 +42,10 @@#include "drm_crtc_internal.h" #include "drm_internal.h" -static struct drm_framebuffer *add_framebuffer_internal (struct drm_device *dev, -struct drm_mode_fb_cmd2 *r, -struct drm_file *file_priv); +static struct drm_framebuffer * +internal_framebuffer_create (struct drm_device *dev, +struct drm_mode_fb_cmd2 *r, +struct drm_file *file_priv);/* Avoid boilerplate. I'm tired of typing. */ #define DRM_ENUM_NAME_FN (fnname, list) \
@@ -2817,13 +2818,11 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,*/ if (req->flags &DRM_MODE_CURSOR_BO ) {if (req->handle) { - fb =add_framebuffer_internal (dev, &fbreq, file_priv); + fb =internal_framebuffer_create (dev, &fbreq, file_priv);if (IS_ERR (fb)) {DRM_DEBUG_KMS ("failed to wrap cursor buffer in drm framebuffer\n" );return PTR_ERR (fb); } - -drm_framebuffer_reference (fb); }else { fb =NULL ; }
@@ -3175,9 +3174,10 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r)return 0 ; } -static struct drm_framebuffer *add_framebuffer_internal (struct drm_device *dev, -struct drm_mode_fb_cmd2 *r, -struct drm_file *file_priv) +static struct drm_framebuffer * +internal_framebuffer_create (struct drm_device *dev, +struct drm_mode_fb_cmd2 *r, +struct drm_file *file_priv) {struct drm_mode_config *config = &dev->mode_config;struct drm_framebuffer *fb;
@@ -3209,12 +3209,6 @@ static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev,return fb; } -mutex_lock (&file_priv->fbs_lock); - r->fb_id = fb->base.id; -list_add (&fb->filp_head, &file_priv->fbs); -DRM_DEBUG_KMS ("[FB:%d]\n" , fb->base.id); -mutex_unlock (&file_priv->fbs_lock); -return fb; }
@@ -3236,15 +3230,24 @@ static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev,int drm_mode_addfb2 (struct drm_device *dev,void *data,struct drm_file *file_priv) { +struct drm_mode_fb_cmd2 *r = data;struct drm_framebuffer *fb;if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ; - fb =add_framebuffer_internal (dev, data, file_priv); + fb =internal_framebuffer_create (dev, r, file_priv);if (IS_ERR (fb))return PTR_ERR (fb); +/* Transfer ownership to the filp for reaping on close */ + +DRM_DEBUG_KMS ("[FB:%d]\n" , fb->base.id); +mutex_lock (&file_priv->fbs_lock); + r->fb_id = fb->base.id; +list_add (&fb->filp_head, &file_priv->fbs); +mutex_unlock (&file_priv->fbs_lock); +return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +28 -11
@@ -622,7 +622,7 @@ static int i915_drm_suspend(struct drm_device *dev)return 0 ; } -static int i915_drm_suspend_late (struct drm_device *drm_dev) +static int i915_drm_suspend_late (struct drm_device *drm_dev,bool hibernation) {struct drm_i915_private *dev_priv = drm_dev->dev_private;int ret;
@@ -636,7 +636,17 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev) }pci_disable_device (drm_dev->pdev); -pci_set_power_state (drm_dev->pdev, PCI_D3hot); +/* +* During hibernation on some GEN4 platforms the BIOS may try to access +* the device even though it's already in D3 and hang the machine. So +* leave the device in D0 on those platforms and hope the BIOS will +* power down the device properly. Platforms where this was seen: +* Lenovo Thinkpad X301, X61s +*/ +if (!(hibernation && + drm_dev->pdev->subsystem_vendor ==PCI_VENDOR_ID_LENOVO && +INTEL_INFO (dev_priv)->gen ==4 )) +pci_set_power_state (drm_dev->pdev, PCI_D3hot);return 0 ; }
@@ -662,7 +672,7 @@ int i915_suspend_legacy(struct drm_device *dev, pm_message_t state)if (error)return error; -return i915_drm_suspend_late (dev); +return i915_drm_suspend_late (dev, false); }static int i915_drm_resume (struct drm_device *dev)
@@ -934,8 +944,7 @@ static int i915_pm_suspend(struct device *dev)static int i915_pm_suspend_late (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct drm_device *drm_dev =dev_to_i915 (dev)->dev;/* * We have a suspedn ordering issue with the snd-hda driver also
@@ -949,13 +958,22 @@ static int i915_pm_suspend_late(struct device *dev)if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -return i915_drm_suspend_late (drm_dev); +return i915_drm_suspend_late (drm_dev, false); +} + +static int i915_pm_poweroff_late (struct device *dev) +{ +struct drm_device *drm_dev =dev_to_i915 (dev)->dev; + +if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF ) +return 0 ; + +return i915_drm_suspend_late (drm_dev, true); }static int i915_pm_resume_early (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct drm_device *drm_dev =dev_to_i915 (dev)->dev;if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ;
@@ -965,8 +983,7 @@ static int i915_pm_resume_early(struct device *dev)static int i915_pm_resume (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct drm_device *drm_dev =dev_to_i915 (dev)->dev;if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ;
@@ -1517,7 +1534,7 @@ static const struct dev_pm_ops i915_pm_ops = { .thaw_early = i915_pm_resume_early, .thaw = i915_pm_resume, .poweroff = i915_pm_suspend, - .poweroff_late = i915_pm_suspend_late, + .poweroff_late = i915_pm_poweroff_late, .restore_early = i915_pm_resume_early, .restore = i915_pm_resume,
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -1781,6 +1781,11 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev)return dev->dev_private; } +static inline struct drm_i915_private *dev_to_i915 (struct device *dev) +{ +return to_i915 (dev_get_drvdata (dev)); +} +/* Iterate over initialised rings */ #define for_each_ring (ring__, dev_priv__, i__) \ for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -9702,7 +9702,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe)struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -WARN_ON (!in_irq ()); +WARN_ON (!in_interrupt ());if (crtc ==NULL )return ;
drivers/gpu/drm/radeon/atombios_crtc.c +3 -0
@@ -1405,6 +1405,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, (x << 16) | y); viewport_w = crtc->mode.hdisplay; viewport_h = (crtc->mode.vdisplay +1 ) & ~1 ; +if ((rdev->family >=CHIP_BONAIRE ) && + (crtc->mode.flags &DRM_MODE_FLAG_INTERLACE )) + viewport_h *=2 ;WREG32 (EVERGREEN_VIEWPORT_SIZE + radeon_crtc->crtc_offset, (viewport_w <<16 ) | viewport_h);
drivers/gpu/drm/radeon/cik.c +3 -0
@@ -7526,6 +7526,9 @@ int cik_irq_set(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , hpd5);WREG32 (DC_HPD6_INT_CONTROL , hpd6); +/* posting read */ +RREG32 (SRBM_STATUS ); +return 0 ; }
drivers/gpu/drm/radeon/evergreen.c +3 -0
@@ -4589,6 +4589,9 @@ int evergreen_irq_set(struct radeon_device *rdev)WREG32 (AFMT_AUDIO_PACKET_CONTROL +EVERGREEN_CRTC4_REGISTER_OFFSET , afmt5);WREG32 (AFMT_AUDIO_PACKET_CONTROL +EVERGREEN_CRTC5_REGISTER_OFFSET , afmt6); +/* posting read */ +RREG32 (SRBM_STATUS ); +return 0 ; }
drivers/gpu/drm/radeon/r100.c +4 -0
@@ -728,6 +728,10 @@ int r100_irq_set(struct radeon_device *rdev) tmp |=RADEON_FP2_DETECT_MASK ; }WREG32 (RADEON_GEN_INT_CNTL , tmp); + +/* read back to post the write */ +RREG32 (RADEON_GEN_INT_CNTL ); +return 0 ; }
drivers/gpu/drm/radeon/r600.c +3 -0
@@ -3783,6 +3783,9 @@ int r600_irq_set(struct radeon_device *rdev)WREG32 (RV770_CG_THERMAL_INT , thermal_int); } +/* posting read */ +RREG32 (R_000E50_SRBM_STATUS ); +return 0 ; }
drivers/gpu/drm/radeon/radeon_cs.c +3 -1
@@ -256,11 +256,13 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)u32 ring =RADEON_CS_RING_GFX ;s32 priority =0 ; +INIT_LIST_HEAD (&p->validated); +if (!cs->num_chunks) {return 0 ; } +/* get chunks */ -INIT_LIST_HEAD (&p->validated); p->idx =0 ; p->ib.sa_bo =NULL ; p->const_ib.sa_bo =NULL ;
drivers/gpu/drm/radeon/radeon_fence.c +45 -23
82 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_kfd.c +1 -1
@@ -152,7 +152,7 @@ void radeon_kfd_device_init(struct radeon_device *rdev) .compute_vmid_bitmap = 0xFF00, .first_compute_pipe = 1, - .compute_pipe_count = 8 - 1, + .compute_pipe_count = 4 - 1, }; radeon_doorbell_get_kfd_info(rdev,
drivers/gpu/drm/radeon/radeon_object.c +0 -11
@@ -173,17 +173,6 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)else rbo->placements[i].lpfn =0 ; } - -/* -* Use two-ended allocation depending on the buffer size to -* improve fragmentation quality. -* 512kb was measured as the most optimal number. -*/ -if (rbo->tbo.mem.size >512 *1024 ) { -for (i =0 ; i < c; i++) { - rbo->placements[i].flags |=TTM_PL_FLAG_TOPDOWN ; - } - } } int radeon_bo_create(struct radeon_device *rdev,
drivers/gpu/drm/radeon/rs600.c +4 -0
@@ -693,6 +693,10 @@ int rs600_irq_set(struct radeon_device *rdev)WREG32 (R_007D18_DC_HOT_PLUG_DETECT2_INT_CONTROL , hpd2);if (ASIC_IS_DCE2 (rdev))WREG32 (R_007408_HDMI0_AUDIO_PACKET_CONTROL , hdmi0); + +/* posting read */ +RREG32 (R_000040_GEN_INT_CNTL ); +return 0 ; }
drivers/gpu/drm/radeon/si.c +5 -4
@@ -6198,6 +6198,9 @@ int si_irq_set(struct radeon_device *rdev)WREG32 (CG_THERMAL_INT , thermal_int); +/* posting read */ +RREG32 (SRBM_STATUS ); +return 0 ; }
@@ -7118,8 +7121,7 @@ int si_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk)WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_BYPASS_EN_MASK , ~UPLL_BYPASS_EN_MASK );if (!vclk || !dclk) { -/* keep the Bypass mode, put PLL to sleep */ -WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_SLEEP_MASK , ~UPLL_SLEEP_MASK ); +/* keep the Bypass mode */ return 0 ; }
@@ -7135,8 +7137,7 @@ int si_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk)/* set VCO_MODE to 1 */ WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_VCO_MODE_MASK , ~UPLL_VCO_MODE_MASK ); -/* toggle UPLL_SLEEP to 1 then back to 0 */ -WREG32_P (CG_UPLL_FUNC_CNTL ,UPLL_SLEEP_MASK , ~UPLL_SLEEP_MASK ); +/* disable sleep mode */ WREG32_P (CG_UPLL_FUNC_CNTL ,0 , ~UPLL_SLEEP_MASK );/* deassert UPLL_RESET */
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +40 -37
113 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +3 -5
@@ -2780,13 +2780,11 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data,NULL , arg->command_size, arg->throttle_us, (void __user *)(unsigned long )arg->fence_rep, NULL); - +ttm_read_unlock (&dev_priv->reservation_sem);if (unlikely (ret !=0 )) - goto out_unlock; +return ret;vmw_kms_cursor_post_execbuf (dev_priv); -out_unlock: -ttm_read_unlock (&dev_priv->reservation_sem); -return ret; +return 0 ; }
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +3 -11
@@ -2033,23 +2033,17 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,int i;struct drm_mode_config *mode_config = &dev->mode_config; - ret =ttm_read_lock (&dev_priv->reservation_sem, true); -if (unlikely (ret !=0 )) -return ret; -if (!arg->num_outputs) {struct drm_vmw_rect def_rect = {0 ,0 ,800 ,600 };vmw_du_update_layout (dev_priv,1 , &def_rect); - goto out_unlock; +return 0 ; } rects_size = arg->num_outputs *sizeof (struct drm_vmw_rect ); rects =kcalloc (arg->num_outputs,sizeof (struct drm_vmw_rect ),GFP_KERNEL ); -if (unlikely (!rects)) { - ret = -ENOMEM ; - goto out_unlock; - } +if (unlikely (!rects)) +return -ENOMEM ; user_rects = (void __user *)(unsigned long )arg->rects; ret =copy_from_user (rects, user_rects, rects_size);
@@ -2074,7 +2068,5 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, out_free:kfree (rects); -out_unlock: -ttm_read_unlock (&dev_priv->reservation_sem);return ret; }
drivers/i2c/i2c-core.c +0 -3
@@ -679,9 +679,6 @@ static int i2c_device_remove(struct device *dev) status = driver->remove (client); } -if (dev->of_node) -irq_dispose_mapping (client->irq); -dev_pm_domain_detach (&client->dev, true);return status; }
drivers/irqchip/irq-armada-370-xp.c +20 -1
@@ -69,6 +69,7 @@ static void __iomem *per_cpu_int_base;static void __iomem *main_int_base;static struct irq_domain *armada_370_xp_mpic_domain;static u32 doorbell_mask_reg; +static int parent_irq;#ifdef CONFIG_PCI_MSI static struct irq_domain *armada_370_xp_msi_domain; static DECLARE_BITMAP(msi_used, PCI_MSI_DOORBELL_NR);
@@ -356,6 +357,7 @@ static int armada_xp_mpic_secondary_init(struct notifier_block *nfb, {if (action ==CPU_STARTING || action ==CPU_STARTING_FROZEN )armada_xp_mpic_smp_cpu_init (); +return NOTIFY_OK ; }
@@ -364,6 +366,20 @@ static struct notifier_block armada_370_xp_mpic_cpu_notifier = { .priority = 100, }; +static int mpic_cascaded_secondary_init (struct notifier_block *nfb, +unsigned long action,void *hcpu) +{ +if (action ==CPU_STARTING || action ==CPU_STARTING_FROZEN ) +enable_percpu_irq (parent_irq,IRQ_TYPE_NONE ); + +return NOTIFY_OK ; +} + +static struct notifier_block mpic_cascaded_cpu_notifier = { + .notifier_call = mpic_cascaded_secondary_init, + .priority =100 , +}; +#endif /* CONFIG_SMP */ static struct irq_domain_ops armada_370_xp_mpic_irq_ops = {
@@ -539,7 +555,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node, struct device_node *parent) {struct resource main_int_res, per_cpu_int_res; -int parent_irq, nr_irqs, i; +int nr_irqs, i;u32 control;BUG_ON (of_address_to_resource (node,0 , &main_int_res));
@@ -587,6 +603,9 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,register_cpu_notifier (&armada_370_xp_mpic_cpu_notifier);#endif }else { +#ifdef CONFIG_SMP +register_cpu_notifier (&mpic_cascaded_cpu_notifier); +#endif irq_set_chained_handler (parent_irq, armada_370_xp_mpic_handle_cascade_irq); }
drivers/mtd/nand/pxa3xx_nand.c +42 -6
62 lines not on this page · raw message
drivers/net/can/dev.c +8 -0
@@ -578,6 +578,10 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) skb->pkt_type =PACKET_BROADCAST ; skb->ip_summed =CHECKSUM_UNNECESSARY ; +skb_reset_mac_header (skb); +skb_reset_network_header (skb); +skb_reset_transport_header (skb); +can_skb_reserve (skb);can_skb_prv (skb)->ifindex = dev->ifindex;
@@ -602,6 +606,10 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, skb->pkt_type =PACKET_BROADCAST ; skb->ip_summed =CHECKSUM_UNNECESSARY ; +skb_reset_mac_header (skb); +skb_reset_network_header (skb); +skb_reset_transport_header (skb); +can_skb_reserve (skb);can_skb_prv (skb)->ifindex = dev->ifindex;
drivers/net/can/usb/kvaser_usb.c +23 -5
@@ -12,6 +12,7 @@* Copyright (C) 2012 Olivier Sobrie <[email protected]> */ +#include <linux/kernel.h> #include <linux/completion.h> #include <linux/module.h> #include <linux/netdevice.h>
@@ -403,8 +404,15 @@ static int kvaser_usb_wait_msg(const struct kvaser_usb *dev, u8 id,while (pos <= actual_len -MSG_HEADER_LEN ) { tmp = buf + pos; -if (!tmp->len) -break ; +/* Handle messages crossing the USB endpoint max packet +* size boundary. Check kvaser_usb_read_bulk_callback() +* for further details. +*/ +if (tmp->len ==0 ) { + pos =round_up (pos, + dev->bulk_in->wMaxPacketSize); +continue ; + }if (pos + tmp->len > actual_len) { dev_err(dev->udev->dev.parent,
@@ -980,8 +988,19 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)while (pos <= urb->actual_length -MSG_HEADER_LEN ) { msg = urb->transfer_buffer + pos; -if (!msg->len) -break ; +/* The Kvaser firmware can only read and write messages that +* does not cross the USB's endpoint wMaxPacketSize boundary. +* If a follow-up command crosses such boundary, firmware puts +* a placeholder zero-length command in its place then aligns +* the real command to the next max packet size. +* +* Handle such cases or we're going to miss a significant +* number of events in case of a heavy rx load on the bus. +*/ +if (msg->len ==0 ) { + pos =round_up (pos, dev->bulk_in->wMaxPacketSize); +continue ; + }if (pos + msg->len > urb->actual_length) {dev_err (dev->udev->dev.parent,"Format error\n" );
@@ -989,7 +1008,6 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb) }kvaser_usb_handle_message (dev, msg); - pos += msg->len; }
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +3 -0
@@ -12722,6 +12722,9 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,pci_write_config_dword (bp->pdev,PCICFG_GRC_ADDRESS ,PCICFG_VENDOR_ID_OFFSET ); +/* Set PCIe reset type to fundamental for EEH recovery */ + pdev->needs_freset =1 ; +/* AER (Advanced Error reporting) configuration */ rc =pci_enable_pcie_error_reporting (pdev);if (!rc)
drivers/net/ethernet/freescale/fec_main.c +2 -3
@@ -1448,8 +1448,7 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) vlan_packet_rcvd = true; -skb_copy_to_linear_data_offset (skb,VLAN_HLEN , - data, (2 *ETH_ALEN )); +memmove (skb->data +VLAN_HLEN , data,ETH_ALEN *2 );skb_pull (skb,VLAN_HLEN ); }
@@ -1566,7 +1565,7 @@ fec_enet_interrupt(int irq, void *dev_id)writel (int_events, fep->hwp +FEC_IEVENT );fec_enet_collect_events (fep, int_events); -if (fep->work_tx || fep->work_rx) { +if ((fep->work_tx || fep->work_rx) && fep->link) { ret =IRQ_HANDLED ;if (napi_schedule_prep (&fep->napi)) {
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +1 -1
@@ -451,7 +451,7 @@ struct mlx4_en_port_stats {unsigned long rx_chksum_none;unsigned long rx_chksum_complete;unsigned long tx_chksum_offload; -#define NUM_PORT_STATS 9 +#define NUM_PORT_STATS 10 };struct mlx4_en_perf_stats {
drivers/net/usb/cx82310_eth.c +10 -1
@@ -300,9 +300,18 @@ static const struct driver_info cx82310_info = { .tx_fixup = cx82310_tx_fixup, }; +#define USB_DEVICE_CLASS (vend, prod, cl, sc, pr) \ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ + USB_DEVICE_ID_MATCH_DEV_INFO, \ + .idVendor = (vend), \ + .idProduct = (prod), \ + .bDeviceClass = (cl), \ + .bDeviceSubClass = (sc), \ + .bDeviceProtocol = (pr) +static const struct usb_device_id products[] = { { -USB_DEVICE_AND_INTERFACE_INFO (0x0572 ,0xcb01 ,0xff ,0 ,0 ), +USB_DEVICE_CLASS (0x0572 ,0xcb01 ,0xff ,0 ,0 ), .driver_info = (unsigned long ) &cx82310_info }, { },
drivers/net/virtio_net.c +4 -5
@@ -1444,8 +1444,10 @@ static void virtnet_free_queues(struct virtnet_info *vi) {int i; -for (i =0 ; i < vi->max_queue_pairs; i++) +for (i =0 ; i < vi->max_queue_pairs; i++) { +napi_hash_del (&vi->rq[i].napi);netif_napi_del (&vi->rq[i].napi); + }kfree (vi->rq);kfree (vi->sq);
@@ -1936,11 +1938,8 @@ static int virtnet_freeze(struct virtio_device *vdev)cancel_delayed_work_sync (&vi->refill);if (netif_running (vi->dev)) { -for (i =0 ; i < vi->max_queue_pairs; i++) { +for (i =0 ; i < vi->max_queue_pairs; i++)napi_disable (&vi->rq[i].napi); -napi_hash_del (&vi->rq[i].napi); -netif_napi_del (&vi->rq[i].napi); - } }remove_vq_common (vi);
drivers/net/wireless/b43/main.c +1 -0
@@ -5322,6 +5322,7 @@ static void b43_supported_bands(struct b43_wldev *dev, bool *have_2ghz_phy,case 0x432a :/* BCM4321 */ case 0x432d :/* BCM4322 */ case 0x4352 :/* BCM43222 */ +case 0x435a :/* BCM43228 */ case 0x4333 :/* BCM4331 */ case 0x43a2 :/* BCM4360 */ case 0x43b3 :/* BCM4352 */
drivers/of/base.c +10 -8
@@ -714,16 +714,12 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, const char *path) {struct device_node *child; -int len =strchrnul (path,'/' ) - path; -int term; +int len; + len =strcspn (path,"/:" );if (!len)return NULL ; - term =strchrnul (path,':' ) - path; -if (term < len) - len = term; -__for_each_child_of_node (parent, child) {const char *name =strrchr (child->full_name,'/' );if (WARN (!name,"malformed device_node %s\n" , child->full_name))
@@ -768,8 +764,12 @@ struct device_node *of_find_node_opts_by_path(const char *path, const char **opt/* The path could begin with an alias */ if (*path !='/' ) { -char *p =strchrnul (path,'/' ); -int len = separator ? separator - path : p - path; +int len; +const char *p = separator; + +if (!p) + p =strchrnul (path,'/' ); + len = p - path;/* of_aliases must not be NULL */ if (!of_aliases)
@@ -794,6 +794,8 @@ struct device_node *of_find_node_opts_by_path(const char *path, const char **opt path++;/* Increment past '/' delimiter */ np =__of_find_node_by_path (np, path); path =strchrnul (path,'/' ); +if (separator && separator < path) +break ; }raw_spin_unlock_irqrestore (&devtree_lock, flags);return np;
drivers/pci/pci-sysfs.c +3 -2
@@ -521,7 +521,8 @@ static ssize_t driver_override_store(struct device *dev,struct pci_dev *pdev =to_pci_dev (dev);char *driver_override, *old = pdev->driver_override, *cp; -if (count >PATH_MAX ) +/* We need to keep extra room for a newline */ +if (count >= (PAGE_SIZE -1 ))return -EINVAL ; driver_override =kstrndup (buf, count,GFP_KERNEL );
@@ -549,7 +550,7 @@ static ssize_t driver_override_show(struct device *dev, {struct pci_dev *pdev =to_pci_dev (dev); -return sprintf (buf,"%s\n" , pdev->driver_override); +return snprintf (buf,PAGE_SIZE ,"%s\n" , pdev->driver_override); }static DEVICE_ATTR_RW (driver_override);
drivers/regulator/core.c +17 -17
@@ -1843,10 +1843,12 @@ static int _regulator_do_enable(struct regulator_dev *rdev) }if (rdev->ena_pin) { - ret =regulator_ena_gpio_ctrl (rdev, true); -if (ret <0 ) -return ret; - rdev->ena_gpio_state =1 ; +if (!rdev->ena_gpio_state) { + ret =regulator_ena_gpio_ctrl (rdev, true); +if (ret <0 ) +return ret; + rdev->ena_gpio_state =1 ; + } }else if (rdev->desc->ops->enable) { ret = rdev->desc->ops->enable (rdev);if (ret <0 )
@@ -1943,10 +1945,12 @@ static int _regulator_do_disable(struct regulator_dev *rdev)trace_regulator_disable (rdev_get_name (rdev));if (rdev->ena_pin) { - ret =regulator_ena_gpio_ctrl (rdev, false); -if (ret <0 ) -return ret; - rdev->ena_gpio_state =0 ; +if (rdev->ena_gpio_state) { + ret =regulator_ena_gpio_ctrl (rdev, false); +if (ret <0 ) +return ret; + rdev->ena_gpio_state =0 ; + } }else if (rdev->desc->ops->disable) { ret = rdev->desc->ops->disable (rdev);
@@ -3678,12 +3682,6 @@ regulator_register(const struct regulator_desc *regulator_desc, config->ena_gpio, ret); goto wash; } - -if (config->ena_gpio_flags &GPIOF_OUT_INIT_HIGH ) - rdev->ena_gpio_state =1 ; - -if (config->ena_gpio_invert) - rdev->ena_gpio_state = !rdev->ena_gpio_state; }/* set regulator constraints */
@@ -3856,9 +3854,11 @@ int regulator_suspend_finish(void)list_for_each_entry (rdev, ®ulator_list, list) {mutex_lock (&rdev->mutex);if (rdev->use_count >0 || rdev->constraints->always_on) { - error =_regulator_do_enable (rdev); -if (error) - ret = error; +if (!_regulator_is_enabled (rdev)) { + error =_regulator_do_enable (rdev); +if (error) + ret = error; + } }else {if (!have_full_constraints ()) goto unlock;
drivers/regulator/rk808-regulator.c +8 -0
@@ -235,6 +235,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(0), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG2",
@@ -249,6 +250,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(1), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG3",
@@ -263,6 +265,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_BUCK4_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(2), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG4",
@@ -277,6 +280,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(3), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG5",
@@ -291,6 +295,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(4), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG6",
@@ -305,6 +310,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(5), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG7",
@@ -319,6 +325,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(6), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "LDO_REG8",
@@ -333,6 +340,7 @@ static const struct regulator_desc rk808_reg[] = { .vsel_mask = RK808_LDO_VSEL_MASK, .enable_reg = RK808_LDO_EN_REG, .enable_mask = BIT(7), + .enable_time = 400, .owner = THIS_MODULE, }, { .name = "SWITCH_REG1",
drivers/rtc/rtc-s3c.c +1 -0
@@ -849,6 +849,7 @@ static struct s3c_rtc_data const s3c2443_rtc_data = {static struct s3c_rtc_data const s3c6410_rtc_data = { .max_user_freq =32768 , + .needs_src_clk = true, .irq_handler = s3c6410_rtc_irq, .set_freq = s3c6410_rtc_setfreq, .enable_tick = s3c6410_rtc_enable_tick,
drivers/scsi/libsas/sas_discover.c +4 -2
@@ -500,6 +500,7 @@ static void sas_revalidate_domain(struct work_struct *work)struct sas_discovery_event *ev =to_sas_discovery_event (work);struct asd_sas_port *port = ev->port;struct sas_ha_struct *ha = port->ha; +struct domain_device *ddev = port->port_dev;/* prevent revalidation from finding sata links in recovery */ mutex_lock (&ha->disco_mutex);
@@ -514,8 +515,9 @@ static void sas_revalidate_domain(struct work_struct *work)SAS_DPRINTK ("REVALIDATING DOMAIN on port %d, pid:%d\n" , port->id,task_pid_nr (current)); -if (port->port_dev) - res =sas_ex_revalidate_domain (port->port_dev); +if (ddev && (ddev->dev_type ==SAS_FANOUT_EXPANDER_DEVICE || + ddev->dev_type ==SAS_EDGE_EXPANDER_DEVICE )) + res =sas_ex_revalidate_domain (ddev);SAS_DPRINTK ("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n" , port->id,task_pid_nr (current), res);
drivers/spi/spi-atmel.c +6 -6
@@ -764,17 +764,17 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master, (unsigned long long)xfer->rx_dma); } -/* REVISIT: We're waiting for ENDRX before we start the next +/* REVISIT: We're waiting for RXBUFF before we start the next * transfer because we need to handle some difficult timing -* issues otherwise. If we wait for ENDTX in one transfer and -* then starts waiting for ENDRX in the next, it's difficult -* to tell the difference between the ENDRX interrupt we're -* actually waiting for and the ENDRX interrupt of the +* issues otherwise. If we wait for TXBUFE in one transfer and +* then starts waiting for RXBUFF in the next, it's difficult +* to tell the difference between the RXBUFF interrupt we're +* actually waiting for and the RXBUFF interrupt of the * previous transfer. * * It should be doable, though. Just not now... */ -spi_writel (as,IER ,SPI_BIT (ENDRX ) |SPI_BIT (OVRES )); +spi_writel (as,IER ,SPI_BIT (RXBUFF ) |SPI_BIT (OVRES ));spi_writel (as,PTCR ,SPI_BIT (TXTEN ) |SPI_BIT (RXTEN )); }
drivers/spi/spi-dw-mid.c +6 -0
@@ -139,6 +139,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx(struct dw_spi *dws)1 ,DMA_MEM_TO_DEV , DMA_PREP_INTERRUPT | DMA_CTRL_ACK); +if (!txdesc) +return NULL ; + txdesc->callback = dw_spi_dma_tx_done; txdesc->callback_param = dws;
@@ -184,6 +187,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws)1 ,DMA_DEV_TO_MEM , DMA_PREP_INTERRUPT | DMA_CTRL_ACK); +if (!rxdesc) +return NULL ; + rxdesc->callback = dw_spi_dma_rx_done; rxdesc->callback_param = dws;
drivers/spi/spi-pl022.c +1 -1
@@ -534,12 +534,12 @@ static void giveback(struct pl022 *pl022) pl022->cur_msg =NULL ; pl022->cur_transfer =NULL ; pl022->cur_chip =NULL ; -spi_finalize_current_message (pl022->master);/* disable the SPI/SSP operation */ writew ((readw (SSP_CR1 (pl022->virtbase)) & (~SSP_CR1_MASK_SSE )),SSP_CR1 (pl022->virtbase)); +spi_finalize_current_message (pl022->master); }/**
drivers/target/iscsi/iscsi_target.c +10 -4
@@ -4221,11 +4221,17 @@ int iscsit_close_connection(pr_debug ("Closing iSCSI connection CID %hu on SID:" " %u\n" , conn->cid, sess->sid);/* -* Always up conn_logout_comp just in case the RX Thread is sleeping -* and the logout response never got sent because the connection -* failed. +* Always up conn_logout_comp for the traditional TCP case just in case +* the RX Thread in iscsi_target_rx_opcode() is sleeping and the logout +* response never got sent because the connection failed. +* +* However for iser-target, isert_wait4logout() is using conn_logout_comp +* to signal logout response TX interrupt completion. Go ahead and skip +* this for iser since isert_rx_opcode() does not wait on logout failure, +* and to avoid iscsi_conn pointer dereference in iser-target code. */ -complete (&conn->conn_logout_comp); +if (conn->conn_transport->transport_type ==ISCSI_TCP ) +complete (&conn->conn_logout_comp);iscsi_release_thread_set (conn);
drivers/target/target_core_device.c +2 -2
@@ -1534,8 +1534,6 @@ int target_configure_device(struct se_device *dev) ret = dev->transport->configure_device (dev);if (ret) goto out; - dev->dev_flags |=DF_CONFIGURED ; -/* * XXX: there is not much point to have two different values here.. */
@@ -1597,6 +1595,8 @@ int target_configure_device(struct se_device *dev)list_add_tail (&dev->g_dev_node, &g_device_list);mutex_unlock (&g_device_mutex); + dev->dev_flags |=DF_CONFIGURED ; +return 0 ; out_free_alua:
drivers/target/target_core_pscsi.c +1 -1
@@ -1121,7 +1121,7 @@ static u32 pscsi_get_device_type(struct se_device *dev)struct pscsi_dev_virt *pdv =PSCSI_DEV (dev);struct scsi_device *sd = pdv->pdv_sd; -return sd->type; +return (sd) ? sd->type :TYPE_NO_LUN ; }static sector_t pscsi_get_blocks (struct se_device *dev)
drivers/target/target_core_transport.c +4 -0
@@ -2389,6 +2389,10 @@ int target_get_sess_cmd(struct se_session *se_sess, struct se_cmd *se_cmd,list_add_tail (&se_cmd->se_cmd_list, &se_sess->sess_cmd_list); out:spin_unlock_irqrestore (&se_sess->sess_cmd_lock, flags); + +if (ret && ack_kref) +target_put_sess_cmd (se_sess, se_cmd); +return ret; }EXPORT_SYMBOL (target_get_sess_cmd);
drivers/tty/serial/8250/8250_dw.c +12 -3
@@ -111,7 +111,10 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)dw8250_force_idle (p);writeb (value, p->membase + (UART_LCR << p->regshift)); } -dev_err (p->dev,"Couldn't set LCR to %d\n" , value); +/* +* FIXME: this deadlocks if port->lock is already held +* dev_err(p->dev, "Couldn't set LCR to %d\n", value); +*/ } }
@@ -155,7 +158,10 @@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value)__raw_writeq (value &0xff , p->membase + (UART_LCR << p->regshift)); } -dev_err (p->dev,"Couldn't set LCR to %d\n" , value); +/* +* FIXME: this deadlocks if port->lock is already held +* dev_err(p->dev, "Couldn't set LCR to %d\n", value); +*/ } }#endif /* CONFIG_64BIT */
@@ -179,7 +185,10 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)dw8250_force_idle (p);writel (value, p->membase + (UART_LCR << p->regshift)); } -dev_err (p->dev,"Couldn't set LCR to %d\n" , value); +/* +* FIXME: this deadlocks if port->lock is already held +* dev_err(p->dev, "Couldn't set LCR to %d\n", value); +*/ } }
drivers/tty/serial/8250/8250_pci.c +1 -1
@@ -69,7 +69,7 @@ static void moan_device(const char *str, struct pci_dev *dev)"Please send the output of lspci -vv, this\n" "message (0x%04x,0x%04x,0x%04x,0x%04x), the\n" "manufacturer and name of serial board or\n" -"modem board to [email protected].\n" , +"modem board to <[email protected]>.\n" ,pci_name (dev), str, dev->vendor, dev->device, dev->subsystem_vendor, dev->subsystem_device); }
drivers/usb/gadget/legacy/inode.c +12 -3
@@ -566,7 +566,6 @@ static ssize_t ep_copy_to_user(struct kiocb_priv *priv)if (total ==0 )break ; } -return len; }
@@ -585,6 +584,7 @@ static void ep_user_copy_worker(struct work_struct *work)aio_complete (iocb, ret, ret);kfree (priv->buf); +kfree (priv->iv);kfree (priv); }
@@ -605,6 +605,7 @@ static void ep_aio_complete(struct usb_ep *ep, struct usb_request *req)*/ if (priv->iv ==NULL ||unlikely (req->actual ==0 )) {kfree (req->buf); +kfree (priv->iv);kfree (priv); iocb->private =NULL ;/* aio_complete() reports bytes-transferred _and_ faults */
@@ -640,7 +641,7 @@ ep_aio_rwtail(struct usb_request *req;ssize_t value; - priv =kmalloc (sizeof *priv,GFP_KERNEL ); + priv =kzalloc (sizeof *priv,GFP_KERNEL );if (!priv) { value = -ENOMEM ; fail:
@@ -649,7 +650,14 @@ fail: } iocb->private = priv; priv->iocb = iocb; - priv->iv = iv; +if (iv) { + priv->iv =kmemdup (iv, nr_segs *sizeof (struct iovec ), +GFP_KERNEL ); +if (!priv->iv) { +kfree (priv); + goto fail; + } + } priv->nr_segs = nr_segs;INIT_WORK (&priv->work, ep_user_copy_worker);
@@ -689,6 +697,7 @@ fail:mutex_unlock (&epdata->lock);if (unlikely (value)) { +kfree (priv->iv);kfree (priv);put_ep (epdata); }else
drivers/xen/events/events_base.c +12 -6
@@ -526,20 +526,26 @@ static unsigned int __startup_pirq(unsigned int irq)pirq_query_unmask (irq); rc =set_evtchn_to_irq (evtchn, irq); -if (rc !=0 ) { -pr_err ("irq%d: Failed to set port to irq mapping (%d)\n" , - irq, rc); -xen_evtchn_close (evtchn); -return 0 ; - } +if (rc) + goto err; +bind_evtchn_to_cpu (evtchn,0 ); info->evtchn = evtchn; + rc =xen_evtchn_port_setup (info); +if (rc) + goto err; + out:unmask_evtchn (evtchn);eoi_pirq (irq_get_irq_data (irq));return 0 ; + +err: +pr_err ("irq%d: Failed to set port to irq mapping (%d)\n" , irq, rc); +xen_evtchn_close (evtchn); +return 0 ; }static unsigned int startup_pirq (struct irq_data *data)
drivers/xen/xen-pciback/conf_space.c +1 -1
@@ -16,7 +16,7 @@#include "conf_space.h" #include "conf_space_quirks.h" -static bool permissive; +bool permissive;module_param (permissive, bool,0644 );/* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word,
drivers/xen/xen-pciback/conf_space.h +2 -0
@@ -64,6 +64,8 @@ struct config_field_entry {void *data; }; +extern bool permissive; +#define OFFSET (cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset)/* Add fields to a device - the add_fields macro expects to get a pointer to
drivers/xen/xen-pciback/conf_space_header.c +48 -13
94 lines not on this page · raw message
fs/fuse/dev.c +5 -2
@@ -890,8 +890,8 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) newpage = buf->page; -if (WARN_ON (!PageUptodate (newpage))) -return -EIO ; +if (!PageUptodate (newpage)) +SetPageUptodate (newpage);ClearPageMappedToDisk (newpage);
@@ -1797,6 +1797,9 @@ copy_finish:static int fuse_notify (struct fuse_conn *fc,enum fuse_notify_code code,unsigned int size,struct fuse_copy_state *cs) { +/* Don't try to move pages (yet) */ + cs->move_pages =0 ; +switch (code) {case FUSE_NOTIFY_POLL :return fuse_notify_poll (fc, size, cs);
fs/nilfs2/segment.c +4 -3
@@ -1907,6 +1907,7 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci, struct the_nilfs *nilfs) {struct nilfs_inode_info *ii, *n; +int during_mount = !(sci->sc_super->s_flags &MS_ACTIVE );int defer_iput = false;spin_lock (&nilfs->ns_inode_lock);
@@ -1919,10 +1920,10 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci,brelse (ii->i_bh); ii->i_bh =NULL ;list_del_init (&ii->i_dirty); -if (!ii->vfs_inode.i_nlink) { +if (!ii->vfs_inode.i_nlink || during_mount) {/* -* Defer calling iput() to avoid a deadlock -* over I_SYNC flag for inodes with i_nlink == 0 +* Defer calling iput() to avoid deadlocks if +* i_nlink == 0 or mount is not yet finished. */ list_add_tail (&ii->i_dirty, &sci->sc_iput_queue); defer_iput = true;
fs/proc/task_mmu.c +3 -0
@@ -1326,6 +1326,9 @@ out:static int pagemap_open (struct inode *inode,struct file *file) { +/* do not disclose physical addresses: attack vector */ +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ;pr_warn_once ("Bits 55-60 of /proc/PID/pagemap entries are about " "to stop being page-shift some time soon. See the " "linux/Documentation/vm/pagemap.txt for details.\n" );
include/linux/serial_core.h +3 -3
@@ -146,9 +146,9 @@ struct uart_port {#define UPIO_HUB6 (1)/* Hub6 ISA card */ #define UPIO_MEM (2)/* 8b MMIO access */ #define UPIO_MEM32 (3)/* 32b little endian */ -#define UPIO_MEM32BE (4)/* 32b big endian */ -#define UPIO_AU (5)/* Au1x00 and RT288x type IO */ -#define UPIO_TSI (6)/* Tsi108/109 type IO */ +#define UPIO_AU (4)/* Au1x00 and RT288x type IO */ +#define UPIO_TSI (5)/* Tsi108/109 type IO */ +#define UPIO_MEM32BE (6)/* 32b big endian */ unsigned int read_status_mask;/* driver specific */ unsigned int ignore_status_mask;/* driver specific */
include/linux/workqueue.h +2 -1
@@ -70,7 +70,8 @@ enum {/* data contains off-queue information when !WORK_STRUCT_PWQ */ WORK_OFFQ_FLAG_BASE =WORK_STRUCT_COLOR_SHIFT , - WORK_OFFQ_CANCELING = (1 << WORK_OFFQ_FLAG_BASE), + __WORK_OFFQ_CANCELING =WORK_OFFQ_FLAG_BASE , + WORK_OFFQ_CANCELING = (1 << __WORK_OFFQ_CANCELING),/* * When a work item is off queue, its high bits point to the last
kernel/cpuset.c +4 -5
@@ -548,9 +548,6 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr,rcu_read_lock ();cpuset_for_each_descendant_pre (cp, pos_css, root_cs) { -if (cp == root_cs) -continue ; -/* skip the whole subtree if @cp doesn't have any CPU */ if (cpumask_empty (cp->cpus_allowed)) { pos_css =css_rightmost_descendant (pos_css);
@@ -873,7 +870,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus)* If it becomes empty, inherit the effective mask of the * parent, which is guaranteed to have some CPUs. */ -if (cpumask_empty (new_cpus)) +if (cgroup_on_dfl (cp->css.cgroup) &&cpumask_empty (new_cpus))cpumask_copy (new_cpus, parent->effective_cpus);/* Skip the whole subtree if the cpumask remains the same. */
@@ -1129,7 +1126,7 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems)* If it becomes empty, inherit the effective mask of the * parent, which is guaranteed to have some MEMs. */ -if (nodes_empty (*new_mems)) +if (cgroup_on_dfl (cp->css.cgroup) &&nodes_empty (*new_mems)) *new_mems = parent->effective_mems;/* Skip the whole subtree if the nodemask remains the same. */
@@ -1992,7 +1989,9 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)spin_lock_irq (&callback_lock); cs->mems_allowed = parent->mems_allowed; + cs->effective_mems = parent->mems_allowed;cpumask_copy (cs->cpus_allowed, parent->cpus_allowed); +cpumask_copy (cs->effective_cpus, parent->cpus_allowed);spin_unlock_irq (&callback_lock); out_unlock:mutex_unlock (&cpuset_mutex);
kernel/printk/console_cmdline.h +1 -1
@@ -3,7 +3,7 @@struct console_cmdline { -char name[8 ];/* Name of the driver */ +char name[16 ];/* Name of the driver */ int index;/* Minor dev. to use */ char *options;/* Options for the driver */ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
kernel/printk/printk.c +1 -0
@@ -2464,6 +2464,7 @@ void register_console(struct console *newcon)for (i =0 , c = console_cmdline; i <MAX_CMDLINECONSOLES && c->name[0 ]; i++, c++) { +BUILD_BUG_ON (sizeof (c->name) !=sizeof (newcon->name));if (strcmp (c->name, newcon->name) !=0 )continue ; if (newcon->index >= 0 &&
kernel/trace/ftrace.c +30 -10
@@ -1059,6 +1059,12 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)static struct pid *const ftrace_swapper_pid = &init_struct_pid; +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +static int ftrace_graph_active; +#else +# define ftrace_graph_active 0 +#endif +#ifdef CONFIG_DYNAMIC_FTRACE static struct ftrace_ops *removed_ops;
@@ -2041,8 +2047,12 @@ static int ftrace_check_record(struct dyn_ftrace *rec, int enable, int update)if (!ftrace_rec_count (rec)) rec->flags =0 ;else -/* Just disable the record (keep REGS state) */ - rec->flags &= ~FTRACE_FL_ENABLED ; +/* +* Just disable the record, but keep the ops TRAMP +* and REGS states. The _EN flags must be disabled though. +*/ + rec->flags &= ~(FTRACE_FL_ENABLED |FTRACE_FL_TRAMP_EN | +FTRACE_FL_REGS_EN ); }return FTRACE_UPDATE_MAKE_NOP ;
@@ -2688,24 +2698,36 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command)static void ftrace_startup_sysctl (void ) { +int command; +if (unlikely (ftrace_disabled))return ;/* Force update next time */ saved_ftrace_func =NULL ;/* ftrace_start_up is true if we want ftrace running */ -if (ftrace_start_up) -ftrace_run_update_code (FTRACE_UPDATE_CALLS ); +if (ftrace_start_up) { + command =FTRACE_UPDATE_CALLS ; +if (ftrace_graph_active) + command |=FTRACE_START_FUNC_RET ; +ftrace_startup_enable (command); + } }static void ftrace_shutdown_sysctl (void ) { +int command; +if (unlikely (ftrace_disabled))return ;/* ftrace_start_up is true if ftrace is running */ -if (ftrace_start_up) -ftrace_run_update_code (FTRACE_DISABLE_CALLS ); +if (ftrace_start_up) { + command =FTRACE_DISABLE_CALLS ; +if (ftrace_graph_active) + command |=FTRACE_STOP_FUNC_RET ; +ftrace_run_update_code (command); + } }static cycle_t ftrace_update_time;
@@ -5558,12 +5580,12 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,if (ftrace_enabled) { -ftrace_startup_sysctl (); -/* we are starting ftrace again */ if (ftrace_ops_list != &ftrace_list_end)update_ftrace_function (); +ftrace_startup_sysctl (); + }else {/* stopping ftrace calls (just send to ftrace_stub) */ ftrace_trace_function = ftrace_stub;
@@ -5590,8 +5612,6 @@ static struct ftrace_ops graph_ops = { ASSIGN_OPS_HASH(graph_ops, &global_ops.local_hash) }; -static int ftrace_graph_active; -int ftrace_graph_entry_stub (struct ftrace_graph_ent *trace) {return 0 ;
kernel/workqueue.c +52 -4
77 lines not on this page · raw message
lib/lz4/lz4_decompress.c +3 -0
@@ -139,6 +139,9 @@ static int lz4_uncompress(const char *source, char *dest, int osize)/* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; +if ((ref +COPYLENGTH ) > oend || + (op +COPYLENGTH ) > oend) + goto _output_error;LZ4_SECURECOPY (ref, op, (oend -COPYLENGTH ));while (op < cpy) *op++ = *ref++;
lib/seq_buf.c +2 -2
@@ -61,7 +61,7 @@ int seq_buf_vprintf(struct seq_buf *s, const char *fmt, va_list args)if (s->len < s->size) { len =vsnprintf (s->buffer + s->len, s->size - s->len, fmt, args); -if (seq_buf_can_fit (s, len)) { +if (s->len + len < s->size) { s->len += len;return 0 ; }
@@ -154,7 +154,7 @@ int seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary)if (s->len < s->size) { ret =bstr_printf (s->buffer + s->len, len, fmt, binary); -if (seq_buf_can_fit (s, ret)) { +if (s->len + ret < s->size) { s->len += ret;return 0 ; }
mm/cma.c +7 -5
@@ -64,15 +64,17 @@ static unsigned long cma_bitmap_aligned_mask(struct cma *cma, int align_order)return (1UL << (align_order - cma->order_per_bit)) -1 ; } +/* +* Find a PFN aligned to the specified order and return an offset represented in +* order_per_bits. +*/ static unsigned long cma_bitmap_aligned_offset (struct cma *cma,int align_order) { -unsigned int alignment; -if (align_order <= cma->order_per_bit)return 0 ; - alignment =1UL << (align_order - cma->order_per_bit); -return ALIGN (cma->base_pfn, alignment) - - (cma->base_pfn >> cma->order_per_bit); + +return (ALIGN (cma->base_pfn, (1UL << align_order)) + - cma->base_pfn) >> cma->order_per_bit; }static unsigned long cma_bitmap_maxno (struct cma *cma)
net/caif/caif_socket.c +1 -1
@@ -281,7 +281,7 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock,int copylen; ret = -EOPNOTSUPP ; -if (m->msg_flags&MSG_OOB ) +if (flags &MSG_OOB ) goto read_error; skb =skb_recv_datagram (sk, flags,0 , &ret);
net/can/af_can.c +3 -0
@@ -259,6 +259,9 @@ int can_send(struct sk_buff *skb, int loop) goto inval_skb; } + skb->ip_summed =CHECKSUM_UNNECESSARY ; + +skb_reset_mac_header (skb);skb_reset_network_header (skb);skb_reset_transport_header (skb);
net/compat.c +7 -0
@@ -49,6 +49,13 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,__get_user (kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) return -EFAULT; + +if (!uaddr) + kmsg->msg_namelen =0 ; + +if (kmsg->msg_namelen <0 ) +return -EINVAL ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) kmsg->msg_namelen =sizeof (struct sockaddr_storage ); kmsg->msg_control =compat_ptr (tmp3);
net/core/sysctl_net_core.c +6 -4
@@ -25,6 +25,8 @@static int zero =0 ;static int one =1 ;static int ushort_max =USHRT_MAX ; +static int min_sndbuf =SOCK_MIN_SNDBUF ; +static int min_rcvbuf =SOCK_MIN_RCVBUF ;static int net_msg_warn;/* Unused, but still a sysctl */
@@ -237,7 +239,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_sndbuf, }, { .procname = "rmem_max",
@@ -245,7 +247,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_rcvbuf, }, { .procname = "wmem_default",
@@ -253,7 +255,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_sndbuf, }, { .procname = "rmem_default",
@@ -261,7 +263,7 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &one, + .extra1 = &min_rcvbuf, }, { .procname = "dev_weight",
net/ipv4/inet_diag.c +15 -3
@@ -71,6 +71,20 @@ static inline void inet_diag_unlock_handler(mutex_unlock (&inet_diag_table_mutex); } +static size_t inet_sk_attr_size (void ) +{ +return nla_total_size (sizeof (struct tcp_info )) + +nla_total_size (1 )/* INET_DIAG_SHUTDOWN */ + +nla_total_size (1 )/* INET_DIAG_TOS */ + +nla_total_size (1 )/* INET_DIAG_TCLASS */ + +nla_total_size (sizeof (struct inet_diag_meminfo )) + +nla_total_size (sizeof (struct inet_diag_msg )) + +nla_total_size (SK_MEMINFO_VARS *sizeof (u32)) + +nla_total_size (TCP_CA_NAME_MAX ) + +nla_total_size (sizeof (struct tcpvegas_info )) + +64 ; +} + int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, struct sk_buff *skb, struct inet_diag_req_v2 *req, struct user_namespace *user_ns,
@@ -324,9 +338,7 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_sif (err) goto out; - rep =nlmsg_new (sizeof (struct inet_diag_msg ) + -sizeof (struct inet_diag_meminfo ) + -sizeof (struct tcp_info ) +64 ,GFP_KERNEL ); + rep =nlmsg_new (inet_sk_attr_size (),GFP_KERNEL );if (!rep) { err = -ENOMEM ; goto out;
net/ipv4/tcp_cong.c +6 -0
@@ -309,6 +309,12 @@ EXPORT_SYMBOL_GPL(tcp_slow_start);*/ void tcp_cong_avoid_ai (struct tcp_sock *tp,u32 w,u32 acked) { +/* If credits accumulated at a higher w, apply them gently now. */ +if (tp->snd_cwnd_cnt >= w) { + tp->snd_cwnd_cnt =0 ; + tp->snd_cwnd++; + } + tp->snd_cwnd_cnt += acked;if (tp->snd_cwnd_cnt >= w) {u32 delta = tp->snd_cwnd_cnt / w;
net/ipv4/tcp_cubic.c +4 -2
@@ -306,8 +306,10 @@ tcp_friendliness: } } -if (ca->cnt ==0 )/* cannot be zero */ - ca->cnt =1 ; +/* The maximum rate of cwnd increase CUBIC allows is 1 packet per +* 2 packets ACKed, meaning cwnd grows at 1.5x per RTT. +*/ + ca->cnt =max (ca->cnt,2U ); }static void bictcp_cong_avoid (struct sock *sk,u32 ack,u32 acked)
net/ipv4/tcp_output.c +1 -5
@@ -2775,15 +2775,11 @@ void tcp_send_fin(struct sock *sk) }else {/* Socket is locked, keep trying until memory is available. */ for (;;) { - skb =alloc_skb_fclone (MAX_TCP_HEADER , - sk->sk_allocation); + skb =sk_stream_alloc_skb (sk,0 , sk->sk_allocation);if (skb)break ;yield (); } - -/* Reserve space for headers and prepare control bits. */ -skb_reserve (skb,MAX_TCP_HEADER );/* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */ tcp_init_nondata_skb (skb, tp->write_seq,TCPHDR_ACK |TCPHDR_FIN );
net/ipv6/fib6_rules.c +1 -0
@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, goto again; flp6->saddr = saddr; } + err = rt->dst.error; goto out; } again:
net/ipv6/udp_offload.c +3 -5
@@ -112,11 +112,9 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, fptr = (struct frag_hdr *)(skb_network_header (skb) + unfrag_ip6hlen); fptr->nexthdr = nexthdr; fptr->reserved =0 ; -if (skb_shinfo (skb)->ip6_frag_id) - fptr->identification =skb_shinfo (skb)->ip6_frag_id; -else -ipv6_select_ident (fptr, - (struct rt6_info *)skb_dst (skb)); +if (!skb_shinfo (skb)->ip6_frag_id) +ipv6_proxy_select_ident (skb); + fptr->identification =skb_shinfo (skb)->ip6_frag_id;/* Fragment the skb. ipv6 header and the remaining fields of the * fragment header are updated in ipv6_gso_segment()
net/netfilter/ipvs/ip_vs_ctl.c +1 -1
@@ -3399,7 +3399,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)if (udest.af ==0 ) udest.af = svc->af; -if (udest.af != svc->af) { +if (udest.af != svc->af && cmd !=IPVS_CMD_DEL_DEST ) {/* The synchronization protocol is incompatible * with mixed family services */
net/netfilter/ipvs/ip_vs_sync.c +3 -0
@@ -896,6 +896,8 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,IP_VS_DBG (2 ,"BACKUP, add new conn. failed\n" );return ; } +if (!(flags &IP_VS_CONN_F_TEMPLATE )) +kfree (param->pe_data); }if (opt)
@@ -1169,6 +1171,7 @@ static inline int ip_vs_proc_sync_conn(struct net *net, __u8 *p, __u8 *msg_end) (opt_flags &IPVS_OPT_F_SEQ_DATA ? &opt :NULL ) );#endif +ip_vs_pe_put (param.pe);return 0 ;/* Error exit */ out:
net/netfilter/nf_tables_api.c +13 -10
@@ -227,7 +227,7 @@ nft_rule_deactivate_next(struct net *net, struct nft_rule *rule)static inline void nft_rule_clear (struct net *net,struct nft_rule *rule) { - rule->genmask =0 ; + rule->genmask &= ~(1 <<gencursor_next (net)); } static int
@@ -3606,12 +3606,11 @@ static int nf_tables_commit(struct sk_buff *skb) &te->elem, NFT_MSG_DELSETELEM, 0); te->set->ops->get (te->set, &te->elem); - te->set->ops->remove (te->set, &te->elem);nft_data_uninit (&te->elem.key,NFT_DATA_VALUE ); -if (te->elem.flags &NFT_SET_MAP ) { -nft_data_uninit (&te->elem.data, - te->set->dtype); - } +if (te->set->flags &NFT_SET_MAP && + !(te->elem.flags &NFT_SET_ELEM_INTERVAL_END )) +nft_data_uninit (&te->elem.data, te->set->dtype); + te->set->ops->remove (te->set, &te->elem);nft_trans_destroy (trans);break ; }
@@ -3652,7 +3651,7 @@ static int nf_tables_abort(struct sk_buff *skb) {struct net *net =sock_net (skb->sk);struct nft_trans *trans, *next; -struct nft_set *set; +struct nft_trans_elem *te;list_for_each_entry_safe (trans, next, &net->nft.commit_list, list) {switch (trans->msg_type) {
@@ -3713,9 +3712,13 @@ static int nf_tables_abort(struct sk_buff *skb)break ;case NFT_MSG_NEWSETELEM :nft_trans_elem_set (trans)->nelems--; - set =nft_trans_elem_set (trans); - set->ops->get (set, &nft_trans_elem (trans)); - set->ops->remove (set, &nft_trans_elem (trans)); + te = (struct nft_trans_elem *)trans->data; + te->set->ops->get (te->set, &te->elem); +nft_data_uninit (&te->elem.key,NFT_DATA_VALUE ); +if (te->set->flags &NFT_SET_MAP && + !(te->elem.flags &NFT_SET_ELEM_INTERVAL_END )) +nft_data_uninit (&te->elem.data, te->set->dtype); + te->set->ops->remove (te->set, &te->elem);nft_trans_destroy (trans);break ;case NFT_MSG_DELSETELEM :
net/netfilter/nft_compat.c +10 -2
@@ -578,8 +578,12 @@ nft_match_select_ops(const struct nft_ctx *ctx,struct xt_match *match = nft_match->ops.data;if (strcmp (match->name, mt_name) ==0 && - match->revision == rev && match->family == family) + match->revision == rev && match->family == family) { +if (!try_module_get (match->me)) +return ERR_PTR (-ENOENT ); +return &nft_match->ops; + } } match =xt_request_find_match (family, mt_name, rev);
@@ -648,8 +652,12 @@ nft_target_select_ops(const struct nft_ctx *ctx,struct xt_target *target = nft_target->ops.data;if (strcmp (target->name, tg_name) ==0 && - target->revision == rev && target->family == family) + target->revision == rev && target->family == family) { +if (!try_module_get (target->me)) +return ERR_PTR (-ENOENT ); +return &nft_target->ops; + } } target =xt_request_find_target (family, tg_name, rev);
net/netfilter/xt_socket.c +12 -9
@@ -243,12 +243,13 @@ static int extract_icmp6_fields(const struct sk_buff *skb, unsigned int outside_hdrlen, int *protocol, - struct in6_addr **raddr, - struct in6_addr **laddr, + const struct in6_addr **raddr, + const struct in6_addr **laddr, __be16 *rport, - __be16 *lport) + __be16 *lport, + struct ipv6hdr *ipv6_var) { - struct ipv6hdr *inside_iph, _inside_iph; + const struct ipv6hdr *inside_iph;struct icmp6hdr *icmph, _icmph;__be16 *ports, _ports[2 ];u8 inside_nexthdr;
@@ -263,12 +264,14 @@ extract_icmp6_fields(const struct sk_buff *skb,if (icmph->icmp6_type &ICMPV6_INFOMSG_MASK )return 1 ; - inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph),sizeof (_inside_iph), &_inside_iph); + inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph), +sizeof (*ipv6_var), ipv6_var);if (inside_iph ==NULL )return 1 ; inside_nexthdr = inside_iph->nexthdr; - inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) +sizeof (_inside_iph), + inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) + +sizeof (*ipv6_var), &inside_nexthdr, &inside_fragoff);if (inside_hdrlen <0 )return 1 ;/* hjm: Packet has no/incomplete transport layer headers. */
@@ -315,10 +318,10 @@ xt_socket_get_sock_v6(struct net *net, const u8 protocol,static bool socket_mt6_v1_v2 (const struct sk_buff *skb,struct xt_action_param *par) { -struct ipv6hdr *iph =ipv6_hdr (skb); +struct ipv6hdr ipv6_var, *iph =ipv6_hdr (skb);struct udphdr _hdr, *hp =NULL ;struct sock *sk = skb->sk; -struct in6_addr *daddr =NULL , *saddr =NULL ; +const struct in6_addr *daddr =NULL , *saddr =NULL ;__be16 uninitialized_var (dport ),uninitialized_var (sport );int thoff =0 ,uninitialized_var (tproto );const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;
@@ -342,7 +345,7 @@ socket_mt6_v1_v2(const struct sk_buff *skb, struct xt_action_param *par) }else if (tproto ==IPPROTO_ICMPV6 ) {if (extract_icmp6_fields (skb, thoff, &tproto, &saddr, &daddr, - &sport, &dport)) + &sport, &dport, &ipv6_var))return false; }else {return false;
net/rds/iw_rdma.c +22 -18
@@ -88,7 +88,9 @@ static unsigned int rds_iw_unmap_fastreg_list(struct rds_iw_mr_pool *pool, int *unpinned);static void rds_iw_destroy_fastreg (struct rds_iw_mr_pool *pool,struct rds_iw_mr *ibmr); -static int rds_iw_get_device (struct rds_sock *rs,struct rds_iw_device **rds_iwdev,struct rdma_cm_id **cm_id) +static int rds_iw_get_device (struct sockaddr_in *src,struct sockaddr_in *dst, +struct rds_iw_device **rds_iwdev, +struct rdma_cm_id **cm_id) {struct rds_iw_device *iwdev;struct rds_iw_cm_id *i_cm_id;
@@ -112,15 +114,15 @@ static int rds_iw_get_device(struct rds_sock *rs, struct rds_iw_device **rds_iwd src_addr->sin_port, dst_addr->sin_addr.s_addr, dst_addr->sin_port, - rs->rs_bound_addr, - rs->rs_bound_port, - rs->rs_conn_addr, - rs->rs_conn_port); + src->sin_addr.s_addr, + src->sin_port, + dst->sin_addr.s_addr, + dst->sin_port);#ifdef WORKING_TUPLE_DETECTION -if (src_addr->sin_addr.s_addr == rs->rs_bound_addr && - src_addr->sin_port == rs->rs_bound_port && - dst_addr->sin_addr.s_addr == rs->rs_conn_addr && - dst_addr->sin_port == rs->rs_conn_port) { +if (src_addr->sin_addr.s_addr == src->sin_addr.s_addr && + src_addr->sin_port == src->sin_port && + dst_addr->sin_addr.s_addr == dst->sin_addr.s_addr && + dst_addr->sin_port == dst->sin_port) {#else /* FIXME - needs to compare the local and remote * ipaddr/port tuple, but the ipaddr is the only
@@ -128,7 +130,7 @@ static int rds_iw_get_device(struct rds_sock *rs, struct rds_iw_device **rds_iwd* zero'ed. It doesn't appear to be properly populated * during connection setup... */ -if (src_addr->sin_addr.s_addr == rs->rs_bound_addr) { +if (src_addr->sin_addr.s_addr == src->sin_addr.s_addr) {
Lines of this file are not shown. View the raw message.
sound/pci/hda/hda_generic.c +39 -8
47 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.