Linux 4.9.2
Greg KH
maintainerI'm announcing the release of the 4.9.2 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/sphinx/rstFlatTable.py | 5 + Documentation/virtual/kvm/api.txt | 1 Makefile | 2 arch/arc/include/asm/cacheflush.h | 6 - arch/arc/mm/cache.c | 13 ++- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 18 ++++ arch/arm64/kvm/hyp/switch.c | 8 + arch/powerpc/boot/ps3-head.S | 5 - arch/powerpc/boot/ps3.c | 8 - arch/powerpc/boot/wrapper | 24 +++++ arch/powerpc/include/asm/kvm_host.h | 1 arch/powerpc/include/uapi/asm/kvm.h | 1 arch/powerpc/kernel/asm-offsets.c | 1 arch/powerpc/kernel/head_64.S | 8 - arch/powerpc/kvm/book3s_hv.c | 6 + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 arch/s390/kernel/setup.c | 2 arch/x86/entry/entry_32.S | 4 arch/x86/events/core.c | 8 + arch/x86/events/intel/cstate.c | 14 +-- arch/x86/events/perf_event.h | 2 arch/x86/kernel/apic/apic.c | 15 --- arch/x86/kernel/cpu/common.c | 24 +---- arch/x86/kernel/smpboot.c | 51 ++++-------- arch/x86/kvm/vmx.c | 11 +- arch/x86/xen/smp.c | 6 - block/bsg.c | 3 drivers/acpi/video_detect.c | 20 ++++ drivers/base/firmware_class.c | 7 - drivers/clk/bcm/clk-bcm2835.c | 4 drivers/gpio/gpio-stmpe.c | 2 drivers/gpio/gpiolib.c | 5 - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 15 +-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 15 +-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 15 +-- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 28 +++--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 2 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 6 + drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 6 + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 6 + drivers/gpu/drm/ast/ast_main.c | 7 + drivers/gpu/drm/gma500/psb_drv.c | 3 drivers/gpu/drm/i915/i915_gem_stolen.c | 5 - drivers/gpu/drm/i915/i915_sysfs.c | 2 drivers/gpu/drm/i915/intel_display.c | 9 +- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 3 drivers/gpu/drm/i915/intel_runtime_pm.c | 13 ++- drivers/gpu/drm/nouveau/nouveau_bios.c | 3 drivers/gpu/drm/nouveau/nouveau_bo.c | 1 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 6 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c | 9 +- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 8 + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 50 +++++++++++- drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h | 1 drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c | 7 + drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c | 1 drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c | 2 drivers/gpu/drm/radeon/radeon_cursor.c | 69 +++++++++++------ drivers/gpu/drm/radeon/radeon_mode.h | 1 drivers/gpu/drm/radeon/si.c | 1 drivers/gpu/drm/radeon/si_dpm.c | 1 drivers/hv/channel_mgmt.c | 2 drivers/hwtracing/stm/core.c | 8 + drivers/infiniband/core/mad.c | 2 drivers/infiniband/core/multicast.c | 7 + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 drivers/infiniband/sw/rxe/rxe_qp.c | 1 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 + drivers/input/misc/drv260x.c | 1 drivers/md/raid5.c | 9 ++ drivers/media/dvb-frontends/mn88472.c | 24 ++--- drivers/media/dvb-frontends/mn88473.c | 24 ++--- drivers/media/i2c/tvp5150.c | 1 drivers/media/pci/solo6x10/solo6x10.h | 3 drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 drivers/misc/mei/client.c | 2 drivers/misc/mei/hw-me-regs.h | 2 drivers/misc/mei/pci-me.c | 1 drivers/mmc/core/sd.c | 12 ++ drivers/mmc/host/sdhci.c | 24 ++++- drivers/net/ethernet/marvell/mvpp2.c | 59 +++++++------- drivers/net/wireless/ath/ath10k/core.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 1 drivers/net/wireless/ath/ath9k/hw.c | 2 drivers/net/wireless/ath/ath9k/pci.c | 7 + drivers/net/wireless/ath/ath9k/xmit.c | 2 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 8 + drivers/net/wireless/realtek/rtlwifi/base.c | 8 - drivers/net/wireless/realtek/rtlwifi/core.c | 9 -- drivers/net/wireless/realtek/rtlwifi/pci.c | 14 +-- drivers/net/wireless/realtek/rtlwifi/ps.c | 36 ++++++-- drivers/nvdimm/pfn_devs.c | 2 drivers/of/of_numa.c | 7 + drivers/pci/pci.c | 4 drivers/platform/x86/asus-nb-wmi.c | 9 ++ drivers/regulator/stw481x-vmmc.c | 3 drivers/s390/char/vmlogrdr.c | 2 drivers/s390/scsi/zfcp_dbf.c | 17 +++- drivers/s390/scsi/zfcp_dbf.h | 41 +++++++++- drivers/s390/scsi/zfcp_erp.c | 61 ++++++++++++++- drivers/s390/scsi/zfcp_ext.h | 4 drivers/s390/scsi/zfcp_fsf.h | 3 drivers/s390/scsi/zfcp_reqlist.h | 30 +++++++ drivers/s390/scsi/zfcp_scsi.c | 61 +++++++++++++-- drivers/scsi/aacraid/linit.c | 2 drivers/scsi/megaraid/megaraid_sas_fusion.c | 9 +- drivers/scsi/scsi_sysfs.c | 4 drivers/scsi/sg.c | 3 drivers/ssb/pci.c | 1 drivers/staging/comedi/drivers/ni_mio_common.c | 7 - drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 8 - drivers/staging/lustre/lustre/osc/osc_page.c | 5 - drivers/target/iscsi/iscsi_target_configfs.c | 4 drivers/target/target_core_user.c | 2 drivers/thermal/thermal_hwmon.c | 2 drivers/tty/serial/sc16is7xx.c | 2 drivers/tty/vt/keyboard.c | 2 fs/bad_inode.c | 55 ++++++++++++- fs/block_dev.c | 7 + fs/nfs/file.c | 2 fs/nfs/flexfilelayout/flexfilelayout.c | 4 fs/nfs/pnfs.c | 31 +++++-- fs/nfs/pnfs.h | 1 fs/notify/inode_mark.c | 45 ++--------- include/net/cfg80211.h | 11 ++ include/rdma/ib_addr.h | 6 - kernel/time/timekeeping.c | 4 kernel/trace/trace_functions_graph.c | 17 +++- net/ceph/messenger.c | 13 +++ net/mac80211/mlme.c | 21 ++--- net/sunrpc/auth_gss/auth_gss.c | 7 + net/vmw_vsock/virtio_transport_common.c | 14 +-- net/wireless/core.h | 1 net/wireless/mlme.c | 12 ++ net/wireless/sme.c | 14 +++ scripts/gcc-plugins/latent_entropy_plugin.c | 4 scripts/kconfig/nconf.gui.c | 15 ++- tools/perf/util/annotate.c | 3 141 files changed, 1031 insertions(+), 438 deletions(-)
Adrian Hunter (2):
Revert "mmc: sdhci: Reset cmd and data circuits after tuning failure"
mmc: sdhci: Fix recovery from tuning timeout
Al Viro (2):
nfs_write_end(): fix handling of short copies sg_write()/bsg_write() is not fit to be called under KERNEL_DS
Alan Stern (1):
PCI: Check for PME in targeted sleep state
Alex Deucher (4):
drm/amdgpu/si: load the proper firmware on 0x87 oland boards drm/amdgpu: add additional pci revision to dpm workaround drm/radeon: add additional pci revision to dpm workaround drm/radeon/si: load the proper firmware on 0x87 oland boards
Alexander Usyskin (1):
mei: request async autosuspend at the end of enumeration
Alexandre Courbot (2):
arm64: tegra: Add VDD_GPU regulator to Jetson TX1 drm/nouveau/gr: fallback to legacy paths during firmware lookup
Andi Kleen (1):
perf/x86: Fix exclusion of BTS and LBR for Goldmont
Andrey Utkin (1):
media: solo6x10: fix lockup by avoiding delayed register write
Andy Grover (1):
target/user: Fix use-after-free of tcmu_cmds if they are expired
Antti Palosaari (2):
mn88472: fix chip id check on probe
mn88473: fix chip id check on probe
Arindam Nath (1):
drm/amd/amdgpu: enable GUI idle INT after enabling CGCG
Arnd Bergmann (1):
staging: lustre: ldlm: pl_recalc time handling is wrong
Bart Van Assche (5):
IB/mad: Fix an array index check
IPoIB: Avoid reading an uninitialized member variable IB/multicast: Check ib_find_pkey() return value IB/rxe: Fix a memory leak in rxe_qp_cleanup() IB/cma: Fix a race condition in iboe_addr_get_sgid()
Ben Hutchings (1):
kconfig/nconf: Fix hang when editing symbol with a long prompt
Ben Skeggs (6):
drm/nouveau/kms: lvds panel strap moved again on maxwell drm/nouveau/bios: require checksum to match for fast acpi shadow method drm/nouveau/ltc: protect clearing of comptags with mutex drm/nouveau/ttm: wait for bo fence to signal before unmapping vmas drm/nouveau/i2c/gk110b,gm10x: use the correct implementation drm/nouveau/fifo/gf100-: protect channel preempt with subdev mutex
Benjamin Block (1):
scsi: zfcp: fix use-after-"free" in FC ingress path after TMF
Boris Brezillon (1):
clk: bcm2835: Avoid overwriting the div info when disabling a pll_div clk
Dan Williams (1):
libnvdimm, pfn: fix align attribute
David Daney (1):
of, numa: Return NUMA_NO_NODE from disable of_node_to_nid() if nid not possible.
Dmitry Shachnev (1):
docs: sphinx-extensions: make rstFlatTable work with docutils 0.13
Geoff Levand (1):
powerpc/ps3: Fix system hang with GCC 5 builds
Gerald Schaefer (1):
s390/vmlogrdr: fix IUCV buffer allocation
Greg Kroah-Hartman (1):
Linux 4.9.2
Hans de Goede (4):
ACPI / video: Add force_native quirk for Dell XPS 17 L702X
ACPI / video: Add force_native quirk for HP Pavilion dv6
drm/i915/dsi: Fix chv_exec_gpio disabling the GPIOs it is setting drm/i915/dsi: Do not clear DPOUNIT_CLOCK_GATE_DISABLE from vlv_init_display_clock_gating
Hawking Zhang (1):
drm/amd/powerplay: bypass fan table setup if no fan connected
Heiko Carstens (1):
s390/kexec: use node 0 when re-adding crash kernel memory
Ian Abbott (2):
staging: comedi: ni_mio_common: fix M Series ni_ai_insn_read() data mask
staging: comedi: ni_mio_common: fix E series ni_ai_insn_read() data
Ilya Dryomov (1):
libceph: verify authorize reply on connect
Jan Kara (1):
fsnotify: Fix possible use-after-free in inode iteration on umount
Jes Sorensen (1):
rtl8xxxu: Work around issue with 8192eu and 8723bu devices not reconnecting
Jim Mattson (1):
kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)
Jingkui Wang (1):
Input: drv260x - fix input device's parent assignment
Johan Hovold (1):
stm class: Fix device leak in open error path
Johannes Berg (1):
cfg80211/mac80211: fix BSS leaks when abandoning assoc attempts
Josh Cartwright (1):
sc16is7xx: Drop bogus use of IRQF_ONESHOT
Kashyap Desai (2):
scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs before reset
scsi: megaraid_sas: Do not set MPI2_TYPE_CUDA for JBOD FP path for FW which does not support JBOD sequence map
Kees Cook (1):
latent_entropy: fix ARM build error on earlier gcc
Kevin Barnett (1):
scsi: aacraid: remove wildcard for series 9 controllers
Konstantin Khlebnikov (1):
md/raid5: limit request size according to implementation limits
Krzysztof Kozlowski (1):
thermal: hwmon: Properly report critical temperature in sysfs
Larry Finger (2):
ssb: Fix error routine when fallback SPROM fails
rtlwifi: Fix enter/exit power_save
Lars-Peter Clausen (1):
gpio: chardev: Return error for seek operations
Laurent Pinchart (1):
v4l: tvp5150: Add missing break in set control handler
Linus Walleij (2):
regulator: stw481x-vmmc: fix ages old enable error
gpio: stmpe: fix interrupt handling bug
Maciej S. Szmigiero (1):
vt: fix Scroll Lock LED trigger name
Marc Zyngier (1):
arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest
Marcos Paulo de Souza (1):
platform/x86: asus-nb-wmi.c: Add X45U quirk
Marek Szyprowski (1):
s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
Matthias Schiffer (1):
ath9k: fix ath9k_hw_gpio_get() to return 0 or 1 on success
Michael S. Tsirkin (1):
vsock/virtio: fix src/dst cid format
Michel Dänzer (4):
drm/amdgpu: Store CRTC relative amdgpu_crtc->cursor_x/y values drm/amdgpu: Also call cursor_move_locked when the cursor size changes drm/radeon: Also call cursor_move_locked when the cursor size changes drm/radeon: Hide the HW cursor while it's out of bounds
Mika Kuoppala (1):
drm/i915: Fix setting of boost freq tunable
Miklos Szeredi (1):
bad_inode: add missing i_op initializers
Mohammed Shafi Shajakhan (1):
ath10k: fix soft lockup during firmware crash/hw-restart
NeilBrown (1):
SUNRPC: fix refcounting problems with auth_gss messages.
Nicholas Piggin (2):
powerpc/64e: Convert cmpi to cmpwi in head_64.S powerpc/boot: Request no dynamic linker for boot wrapper
Oleg Drokin (1):
staging/lustre/osc: Revert erroneous list_for_each_entry_safe use
Patrik Jakobsson (1):
drm/gma500: Add compat ioctl
Paul Burton (1):
mmc: sd: Meet alignment requirements for raw_ssr DMA
Paul Mackerras (2):
KVM: PPC: Book3S HV: Save/restore XER in checkpointed register state
KVM: PPC: Book3S HV: Don't lose hardware R/C bit updates in H_PROTECT
Paulo Zanoni (1):
drm/i915: skip the first 4k of stolen memory on everything >= gen8
Rabin Vincent (1):
block: protect iterate_bdevs() against concurrent close
Ravi Bangoria (1):
perf annotate: Don't throw error for zero length symbols
Rex Zhu (2):
drm/amdgpu: fix enable_cp_power_gating in gfx_v8.0. drm/amdgpu: fix init save/restore list in gfx_v8.0
Russell Currey (1):
drivers/gpu/drm/ast: Fix infinite loop if read fails
Shiraz Saleem (1):
i40iw: Use correct src address in memcpy to rdma stats counters
Steffen Maier (2):
scsi: zfcp: do not trace pure benign residual HBA responses at default level
scsi: zfcp: fix rport unblock race with LUN recovery
Steven Rostedt (Red Hat) (2):
ftrace/x86_32: Set ftrace_stub to weak to prevent gcc from using short jumps to it
fgraph: Handle a case where a tracer ignores set_graph_notrace
Thomas Gleixner (3):
perf/x86/intel/cstate: Prevent hotplug callback leak timekeeping_Force_unsigned_clocksource_to_nanoseconds_conversion x86/smpboot: Make logical package management more robust
Thomas Petazzoni (1):
net: mvpp2: fix dma unmapping of TX buffers for fragments
Tobias Klausmann (1):
ath9k: do not return early to fix rcu unlocking
Tomas Winkler (1):
mei: me: add lewisburg device ids
Trond Myklebust (4):
pNFS: On error, do not send LAYOUTGET until the LAYOUTRETURN has completed
pNFS: Don't clear the layout stateid if a layout return is outstanding
pNFS: Clear NFS_LAYOUT_RETURN_REQUESTED when invalidating the layout stateid
pNFS: Fix a deadlock between read resends and layoutreturn
Varun Prakash (1):
iscsi-target: Return error if unable to add network portal
Ville Syrjälä (2):
drm/i915: Fix cdclk vs. dev_cdclk mess when not recomputing things drm/i915: Initialize dev_priv->atomic_cdclk_freq at init time
Vineet Gupta (1):
ARC: mm: arc700: Don't assume 2 colours for aliasing VIPT dcache
Vitaly Kuznetsov (1):
hv: acquire vmbus_connection.channel_mutex in vmbus_free_channels()
Vittorio Gambaletta (VittGam) (1):
ath9k: Really fix LED polarity for some Mini PCI AR9220 MB92 cards.
Wei Fang (1):
scsi: avoid a permanent stop of the scsi device's request queue
Yves-Alexis Perez (1):
firmware: fix usermode helper fallback loading
Greg KH
maintainerDocumentation/sphinx/rstFlatTable.py +5 -0
@@ -157,6 +157,11 @@ class ListTableBuilder(object): def buildTableNode(self): colwidths = self.directive.get_column_widths(self.max_cols) + if isinstance(colwidths, tuple): + # Since docutils 0.13, get_column_widths returns a (widths, + # colwidths) tuple, where widths is a string (i.e. 'auto'). + # See https://sourceforge.net/p/docutils/patches/120/. + colwidths = colwidths[1] stub_columns = self.directive.options.get('stub-columns', 0) header_rows = self.directive.options.get('header-rows', 0)
Documentation/virtual/kvm/api.txt +1 -0
@@ -2050,6 +2050,7 @@ registers, find a list below: PPC | KVM_REG_PPC_TM_VSCR | 32 PPC | KVM_REG_PPC_TM_DSCR | 64 PPC | KVM_REG_PPC_TM_TAR | 64 + PPC | KVM_REG_PPC_TM_XER | 64 | | MIPS | KVM_REG_MIPS_R0 | 64 ...
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = NAME = Roaring Lionus
arch/arc/include/asm/cacheflush.h +4 -2
@@ -85,6 +85,10 @@ void flush_anon_page(struct vm_area_struct *vma,*/ #define PG_dc_clean PG_arch_1 +#define CACHE_COLORS_NUM 4 +#define CACHE_COLORS_MSK (CACHE_COLORS_NUM - 1) +#define CACHE_COLOR (addr) (((unsigned long)(addr) >> (PAGE_SHIFT)) & CACHE_COLORS_MSK) +/* * Simple wrapper over config option * Bootup code ensures that hardware matches kernel configuration
@@ -94,8 +98,6 @@ static inline int cache_is_vipt_aliasing(void)return IS_ENABLED (CONFIG_ARC_CACHE_VIPT_ALIASING ); } -#define CACHE_COLOR (addr) (((unsigned long)(addr) >> (PAGE_SHIFT)) & 1) -/* * checks if two addresses (after page aligning) index into same cache set */
arch/arc/mm/cache.c +9 -4
@@ -979,11 +979,16 @@ void arc_cache_init(void)/* check for D-Cache aliasing on ARCompact: ARCv2 has PIPT */ if (is_isa_arcompact ()) {int handled =IS_ENABLED (CONFIG_ARC_CACHE_VIPT_ALIASING ); - -if (dc->alias && !handled) -panic ("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n" ); -else if (!dc->alias && handled) +int num_colors = dc->sz_k/dc->assoc/TO_KB (PAGE_SIZE ); + +if (dc->alias) { +if (!handled) +panic ("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n" ); +if (CACHE_COLORS_NUM != num_colors) +panic ("CACHE_COLORS_NUM not optimized for config\n" ); + }else if (!dc->alias && handled) {panic ("Disable CONFIG_ARC_CACHE_VIPT_ALIASING\n" ); + } } }
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +18 -0
@@ -21,6 +21,10 @@ reg = <0x0 0x80000000 0x1 0x0>; }; + gpu@57000000 { + vdd-supply = <&vdd_gpu>; + }; + /* debug port */ serial@70006000 { status = "okay";
@@ -291,4 +295,18 @@ clock-frequency = <32768>; }; }; + + regulators { + vdd_gpu: regulator@100 { + compatible = "pwm-regulator"; + reg = <100>; + pwms = <&pwm 1 4880>; + regulator-name = "VDD_GPU"; + regulator-min-microvolt = <710000>; + regulator-max-microvolt = <1320000>; + enable-gpios = <&pmic 6 GPIO_ACTIVE_HIGH>; + regulator-ramp-delay = <80>; + regulator-enable-ramp-delay = <1000>; + }; + }; };
arch/arm64/kvm/hyp/switch.c +7 -1
@@ -85,7 +85,13 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)write_sysreg (val, hcr_el2);/* Trap on AArch32 cp15 c15 accesses (EL1 or EL0) */ write_sysreg (1 <<15 , hstr_el2); -/* Make sure we trap PMU access from EL0 to EL2 */ +/* +* Make sure we trap PMU access from EL0 to EL2. Also sanitize +* PMSELR_EL0 to make sure it never contains the cycle +* counter, which could make a PMXEVCNTR_EL0 access UNDEF at +* EL1 instead of being trapped to EL2. +*/ +write_sysreg (0 , pmselr_el0);write_sysreg (ARMV8_PMU_USERENR_MASK , pmuserenr_el0);write_sysreg (vcpu->arch.mdcr_el2, mdcr_el2);__activate_traps_arch ()();
arch/powerpc/boot/ps3-head.S +0 -5
@@ -57,11 +57,6 @@ __system_reset_overlay: bctr 1: - /* Save the value at addr zero for a null pointer write check later. */ - - li r4, 0 - lwz r3, 0(r4) - /* Primary delays then goes to _zimage_start in wrapper. */ or 31, 31, 31 /* db16cyc */
arch/powerpc/boot/ps3.c +1 -7
@@ -119,13 +119,12 @@ void ps3_copy_vectors(void)flush_cache ((void *)0x100 ,512 ); } -void platform_init (unsigned long null_check) +void platform_init (void ) {const u32 heapsize =0x1000000 - (u32 )_end;/* 16MiB */ void *chosen;unsigned long ft_addr;u64 rm_size; -unsigned long val; console_ops.write = ps3_console_write; platform_ops.exit = ps3_exit;
@@ -153,11 +152,6 @@ void platform_init(unsigned long null_check)printf (" flat tree at 0x%lx\n\r" , ft_addr); - val = *(unsigned long *)0 ; - -if (val != null_check) -printf ("null check failed: %lx != %lx\n\r" , val, null_check); - ((kernel_entry_t )0 )(ft_addr,0 ,NULL );ps3_exit ();
arch/powerpc/boot/wrapper +23 -1
@@ -181,6 +181,28 @@ case "$elfformat" in elf32-powerpc) format=elf32ppc ;; esac +ld_version() +{ + # Poached from scripts/ld-version.sh, but we don't want to call that because + # this script (wrapper) is distributed separately from the kernel source. + # Extract linker version number from stdin and turn into single number. + awk '{ + gsub(".*\\)", ""); + gsub(".*version ", ""); + gsub("-.*", ""); + split($1,a, "."); + print a[1]*100000000 + a[2]*1000000 + a[3]*10000; + exit + }' +} + +# Do not include PT_INTERP segment when linking pie. Non-pie linking +# just ignores this option. +LD_VERSION=$(${CROSS}ld --version | ld_version) +LD_NO_DL_MIN_VERSION=$(echo 2.26 | ld_version) +if [ "$LD_VERSION" -ge "$LD_NO_DL_MIN_VERSION" ] ; then + nodl="--no-dynamic-linker" +fi platformo=$object/"$platform".o lds=$object/zImage.lds
@@ -446,7 +468,7 @@ if [ "$platform" != "miboot" ]; then text_start="-Ttext $link_address" fi #link everything - ${CROSS}ld -m $format -T $lds $text_start $pie -o "$ofile" \ + ${CROSS}ld -m $format -T $lds $text_start $pie $nodl -o "$ofile" \ $platformo $tmp $object/wrapper.a rm $tmp fi
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -546,6 +546,7 @@ struct kvm_vcpu_arch {u64 tfiar;u32 cr_tm; +u64 xer_tm;u64 lr_tm;u64 ctr_tm;u64 amr_tm;
arch/powerpc/include/uapi/asm/kvm.h +1 -0
@@ -596,6 +596,7 @@ struct kvm_get_htab_header {#define KVM_REG_PPC_TM_VSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U32 | 0x67)#define KVM_REG_PPC_TM_DSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x68)#define KVM_REG_PPC_TM_TAR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x69) +#define KVM_REG_PPC_TM_XER (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x6a)/* PPC64 eXternal Interrupt Controller Specification */ #define KVM_DEV_XICS_GRP_SOURCES 1/* 64-bit source attributes */
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -569,6 +569,7 @@ int main(void) DEFINE(VCPU_VRS_TM, offsetof(struct kvm_vcpu, arch.vr_tm.vr)); DEFINE(VCPU_VRSAVE_TM, offsetof(struct kvm_vcpu, arch.vrsave_tm)); DEFINE(VCPU_CR_TM, offsetof(struct kvm_vcpu, arch.cr_tm)); + DEFINE(VCPU_XER_TM, offsetof(struct kvm_vcpu, arch.xer_tm)); DEFINE(VCPU_LR_TM, offsetof(struct kvm_vcpu, arch.lr_tm)); DEFINE(VCPU_CTR_TM, offsetof(struct kvm_vcpu, arch.ctr_tm)); DEFINE(VCPU_AMR_TM, offsetof(struct kvm_vcpu, arch.amr_tm));
arch/powerpc/kernel/head_64.S +4 -4
@@ -214,9 +214,9 @@ booting_thread_hwid: */ _GLOBAL(book3e_start_thread) LOAD_REG_IMMEDIATE(r5, MSR_KERNEL) - cmpi 0, r3, 0 + cmpwi r3, 0 beq 10f - cmpi 0, r3, 1 + cmpwi r3, 1 beq 11f /* If the thread id is invalid, just exit. */ b 13f
@@ -241,9 +241,9 @@ _GLOBAL(book3e_start_thread) * r3 = the thread physical id */ _GLOBAL(book3e_stop_thread) - cmpi 0, r3, 0 + cmpwi r3, 0 beq 10f - cmpi 0, r3, 1 + cmpwi r3, 1 beq 10f /* If the thread id is invalid, just exit. */ b 13f
arch/powerpc/kvm/book3s_hv.c +6 -0
@@ -1288,6 +1288,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_TM_CR : *val =get_reg_val (id, vcpu->arch.cr_tm);break ; +case KVM_REG_PPC_TM_XER : + *val =get_reg_val (id, vcpu->arch.xer_tm); +break ;case KVM_REG_PPC_TM_LR : *val =get_reg_val (id, vcpu->arch.lr_tm);break ;
@@ -1498,6 +1501,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_TM_CR : vcpu->arch.cr_tm =set_reg_val (id, *val);break ; +case KVM_REG_PPC_TM_XER : + vcpu->arch.xer_tm =set_reg_val (id, *val); +break ;case KVM_REG_PPC_TM_LR : vcpu->arch.lr_tm =set_reg_val (id, *val);break ;
arch/powerpc/kvm/book3s_hv_rm_mmu.c +2 -0
@@ -653,6 +653,8 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags, HPTE_V_ABSENT);do_tlbies (kvm, &rb,1 ,global_invalidates (kvm, flags), true); +/* Don't lose R/C bit updates done by hardware */ + r |=be64_to_cpu (hpte[1 ]) & (HPTE_R_R |HPTE_R_C ); hpte[1 ] =cpu_to_be64 (r); } }
arch/powerpc/kvm/book3s_hv_rmhandlers.S +4 -0
@@ -2600,11 +2600,13 @@ kvmppc_save_tm: mfctr r7 mfspr r8, SPRN_AMR mfspr r10, SPRN_TAR + mfxer r11 std r5, VCPU_LR_TM(r9) stw r6, VCPU_CR_TM(r9) std r7, VCPU_CTR_TM(r9) std r8, VCPU_AMR_TM(r9) std r10, VCPU_TAR_TM(r9) + std r11, VCPU_XER_TM(r9) /* Restore r12 as trap number. */ lwz r12, VCPU_TRAP(r9)
@@ -2697,11 +2699,13 @@ kvmppc_restore_tm: ld r7, VCPU_CTR_TM(r4) ld r8, VCPU_AMR_TM(r4) ld r9, VCPU_TAR_TM(r4) + ld r10, VCPU_XER_TM(r4) mtlr r5 mtcr r6 mtctr r7 mtspr SPRN_AMR, r8 mtspr SPRN_TAR, r9 + mtxer r10 /* * Load up PPR and DSCR values but don't put them in the actual SPRs
arch/s390/kernel/setup.c +1 -1
@@ -445,7 +445,7 @@ static void __init setup_resources(void)* part of the System RAM resource. */ if (crashk_res.end) { -memblock_add (crashk_res.start,resource_size (&crashk_res)); +memblock_add_node (crashk_res.start,resource_size (&crashk_res),0 );memblock_reserve (crashk_res.start,resource_size (&crashk_res));insert_resource (&iomem_resource, &crashk_res); }
arch/x86/entry/entry_32.S +2 -2
@@ -889,8 +889,8 @@ ftrace_graph_call: jmp ftrace_stub #endif -.globl ftrace_stub -ftrace_stub: +/* This is weak to keep gas from relaxing the jumps */ +WEAK(ftrace_stub) ret END(ftrace_caller)
arch/x86/events/core.c +6 -2
@@ -365,7 +365,11 @@ int x86_add_exclusive(unsigned int what) {int i; -if (x86_pmu.lbr_pt_coexist) +/* +* When lbr_pt_coexist we allow PT to coexist with either LBR or BTS. +* LBR and BTS are still mutually exclusive. +*/ +if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt)return 0 ;if (!atomic_inc_not_zero (&x86_pmu.lbr_exclusive[what])) {
@@ -388,7 +392,7 @@ int x86_add_exclusive(unsigned int what)void x86_del_exclusive (unsigned int what) { -if (x86_pmu.lbr_pt_coexist) +if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt)return ;atomic_dec (&x86_pmu.lbr_exclusive[what]);
arch/x86/events/intel/cstate.c +7 -7
@@ -594,6 +594,9 @@ static int __init cstate_probe(const struct cstate_model *cm)static inline void cstate_cleanup (void ) { +cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_CSTATE_ONLINE ); +cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_CSTATE_STARTING ); +if (has_cstate_core)perf_pmu_unregister (&cstate_core_pmu);
@@ -606,16 +609,16 @@ static int __init cstate_init(void)int err;cpuhp_setup_state (CPUHP_AP_PERF_X86_CSTATE_STARTING , -"AP_PERF_X86_CSTATE_STARTING" , cstate_cpu_init, -NULL ); +"perf/x86/cstate:starting" , cstate_cpu_init,NULL );cpuhp_setup_state (CPUHP_AP_PERF_X86_CSTATE_ONLINE , -"AP_PERF_X86_CSTATE_ONLINE" ,NULL , cstate_cpu_exit); +"perf/x86/cstate:online" ,NULL , cstate_cpu_exit);if (has_cstate_core) { err =perf_pmu_register (&cstate_core_pmu, cstate_core_pmu.name,-1 );if (err) { has_cstate_core = false;pr_info ("Failed to register cstate core pmu\n" ); +cstate_cleanup ();return err; } }
@@ -629,8 +632,7 @@ static int __init cstate_init(void)return err; } } - -return err; +return 0 ; }static int __init cstate_pmu_init (void )
@@ -655,8 +657,6 @@ module_init(cstate_pmu_init); static void __exit cstate_pmu_exit(void) { -cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_CSTATE_ONLINE ); -cpuhp_remove_state_nocalls (CPUHP_AP_PERF_X86_CSTATE_STARTING );cstate_cleanup (); }module_exit (cstate_pmu_exit);
arch/x86/events/perf_event.h +1 -1
@@ -604,7 +604,7 @@ struct x86_pmu {u64 lbr_sel_mask;/* LBR_SELECT valid bits */ const int *lbr_sel_map;/* lbr_select mappings */ bool lbr_double_abort;/* duplicated lbr aborts */ -bool lbr_pt_coexist;/* LBR may coexist with PT */ +bool lbr_pt_coexist;/* (LBR|BTS) may coexist with PT */ /* * Intel PT/LBR/BTS are exclusive
arch/x86/kernel/apic/apic.c +0 -15
@@ -2159,21 +2159,6 @@ int __generic_processor_info(int apicid, int version, bool enabled) }/* -* This can happen on physical hotplug. The sanity check at boot time -* is done from native_smp_prepare_cpus() after num_possible_cpus() is -* established. -*/ -if (topology_update_package_map (apicid, cpu) <0 ) { -int thiscpu = max + disabled_cpus; - -pr_warning ("APIC: Package limit reached. Processor %d/0x%x ignored.\n" , - thiscpu, apicid); - - disabled_cpus++; -return -ENOSPC ; - } - -/* * Validate version */ if (version ==0x0 ) {
arch/x86/kernel/cpu/common.c +8 -16
@@ -979,29 +979,21 @@ static void x86_init_cache_qos(struct cpuinfo_x86 *c) }/* -* The physical to logical package id mapping is initialized from the -* acpi/mptables information. Make sure that CPUID actually agrees with -* that. +* Validate that ACPI/mptables have the same information about the +* effective APIC id and update the package map. */ -static void sanitize_package_id (struct cpuinfo_x86 *c) +static void validate_apic_and_package_id (struct cpuinfo_x86 *c) {#ifdef CONFIG_SMP -unsigned int pkg, apicid, cpu =smp_processor_id (); +unsigned int apicid, cpu =smp_processor_id (); apicid = apic->cpu_present_to_apicid (cpu); - pkg = apicid >> boot_cpu_data.x86_coreid_bits; -if (apicid != c->initial_apicid) { -pr_err (FW_BUG "CPU%u: APIC id mismatch. Firmware: %x CPUID: %x\n" , +if (apicid != c->apicid) { +pr_err (FW_BUG "CPU%u: APIC id mismatch. Firmware: %x APIC: %x\n" , cpu, apicid, c->initial_apicid); - c->initial_apicid = apicid; } -if (pkg != c->phys_proc_id) { -pr_err (FW_BUG "CPU%u: Using firmware package id %u instead of %u\n" , - cpu, pkg, c->phys_proc_id); - c->phys_proc_id = pkg; - } - c->logical_proc_id =topology_phys_to_logical_pkg (pkg); +BUG_ON (topology_update_package_map (c->phys_proc_id, cpu));#else c->logical_proc_id =0 ;#endif
@@ -1132,7 +1124,6 @@ static void identify_cpu(struct cpuinfo_x86 *c)#ifdef CONFIG_NUMA numa_add_cpu (smp_processor_id ());#endif -sanitize_package_id (c); }/*
@@ -1188,6 +1179,7 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c)enable_sep_cpu ();#endif mtrr_ap_init (); +validate_apic_and_package_id (c); }struct msr_range {
arch/x86/kernel/smpboot.c +19 -32
94 lines not on this page · raw message
arch/x86/kvm/vmx.c +5 -6
@@ -1343,10 +1343,10 @@ static inline bool nested_cpu_has_posted_intr(struct vmcs12 *vmcs12)return vmcs12->pin_based_vm_exec_control &PIN_BASED_POSTED_INTR ; } -static inline bool is_exception (u32 intr_info) +static inline bool is_nmi (u32 intr_info) {return (intr_info & (INTR_INFO_INTR_TYPE_MASK |INTR_INFO_VALID_MASK )) - == (INTR_TYPE_HARD_EXCEPTION |INTR_INFO_VALID_MASK ); + == (INTR_TYPE_NMI_INTR |INTR_INFO_VALID_MASK ); } static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
@@ -5476,7 +5476,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)if (is_machine_check (intr_info))return handle_machine_check (vcpu); -if ((intr_info &INTR_INFO_INTR_TYPE_MASK ) ==INTR_TYPE_NMI_INTR ) +if (is_nmi (intr_info))return 1 ;/* already handled by vmx_vcpu_run() */ if (is_no_device (intr_info)) {
@@ -8018,7 +8018,7 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)switch (exit_reason) {case EXIT_REASON_EXCEPTION_NMI : -if (!is_exception (intr_info)) +if (is_nmi (intr_info))return false;else if (is_page_fault (intr_info))return enable_ept;
@@ -8611,8 +8611,7 @@ static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)kvm_machine_check ();/* We need to handle NMIs before interrupts are enabled */ -if ((exit_intr_info &INTR_INFO_INTR_TYPE_MASK ) ==INTR_TYPE_NMI_INTR && - (exit_intr_info &INTR_INFO_VALID_MASK )) { +if (is_nmi (exit_intr_info)) {kvm_before_handle_nmi (&vmx->vcpu); asm("int $2" );kvm_after_handle_nmi (&vmx->vcpu);
arch/x86/xen/smp.c +0 -6
@@ -87,12 +87,6 @@ static void cpu_bringup(void)cpu_data (cpu).x86_max_cores =1 ;set_cpu_sibling_map (cpu); -/* -* identify_cpu() may have set logical_pkg_id to -1 due -* to incorrect phys_proc_id. Let's re-comupte it. -*/ -topology_update_package_map (apic->cpu_present_to_apicid (cpu), cpu); -xen_setup_cpu_clockevents ();notify_cpu_starting (cpu);
block/bsg.c +3 -0
@@ -655,6 +655,9 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)dprintk ("%s: write %Zd bytes\n" , bd->name, count); +if (unlikely (segment_eq (get_fs (),KERNEL_DS ))) +return -EINVAL ; +bsg_set_block (bd, file); bytes_written =0 ;
drivers/acpi/video_detect.c +20 -0
@@ -296,6 +296,26 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"), }, }, + { + /* https://bugzilla.redhat.com/show_bug.cgi?id=1123661 */ + .callback = video_detect_force_native, + .ident = "Dell XPS 17 L702X", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L702X"), + }, + }, + { + /* https://bugzilla.redhat.com/show_bug.cgi?id=1204476 */ + /* https://bugs.launchpad.net/ubuntu/+source/linux-lts-trusty/+bug/1416940 */ + .callback = video_detect_force_native, + .ident = "HP Pavilion dv6", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv6 Notebook PC"), + }, + }, + { }, };
drivers/base/firmware_class.c +4 -3
@@ -955,13 +955,14 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, timeout =MAX_JIFFY_OFFSET ; } - retval =wait_for_completion_interruptible_timeout (&buf->completion, + timeout =wait_for_completion_interruptible_timeout (&buf->completion, timeout); -if (retval == -ERESTARTSYS || !retval) { +if (timeout == -ERESTARTSYS || !timeout) { + retval = timeout;mutex_lock (&fw_lock);fw_load_abort (fw_priv);mutex_unlock (&fw_lock); - }else if (retval >0 ) { + }else if (timeout >0 ) { retval =0 ; }
drivers/clk/bcm/clk-bcm2835.c +3 -1
@@ -751,7 +751,9 @@ static void bcm2835_pll_divider_off(struct clk_hw *hw)cprman_write (cprman, data->cm_reg, (cprman_read (cprman, data->cm_reg) & ~data->load_mask) | data->hold_mask); -cprman_write (cprman, data->a2w_reg,A2W_PLL_CHANNEL_DISABLE ); +cprman_write (cprman, data->a2w_reg, +cprman_read (cprman, data->a2w_reg) | +A2W_PLL_CHANNEL_DISABLE );spin_unlock (&cprman->regs_lock); }
drivers/gpio/gpio-stmpe.c +1 -1
@@ -413,7 +413,7 @@ static irqreturn_t stmpe_gpio_irq(int irq, void *dev) stmpe->partnum != STMPE1801) {stmpe_reg_write (stmpe, statmsbreg + i, status[i]);stmpe_reg_write (stmpe, - stmpe->regs[STMPE_IDX_GPEDR_LSB + i], + stmpe->regs[STMPE_IDX_GPEDR_MSB ] + i, status[i]); } }
drivers/gpio/gpiolib.c +3 -2
@@ -986,7 +986,8 @@ static int gpio_chrdev_open(struct inode *inode, struct file *filp)return -ENODEV ;get_device (&gdev->dev); filp->private_data = gdev; -return 0 ; + +return nonseekable_open (inode, filp); }/**
@@ -1011,7 +1012,7 @@ static const struct file_operations gpio_fileops = { .release = gpio_chrdev_release, .open = gpio_chrdev_open, .owner = THIS_MODULE, - .llseek = noop_llseek, + .llseek = no_llseek, .unlocked_ioctl = gpio_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = gpio_ioctl_compat,
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +8 -7
@@ -2577,6 +2577,9 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -2596,9 +2599,6 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y; -return 0 ; }
@@ -2661,12 +2661,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v10_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2675,6 +2674,8 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v10_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +8 -7
@@ -2593,6 +2593,9 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -2612,9 +2615,6 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y; -return 0 ; }
@@ -2677,12 +2677,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v11_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2691,6 +2690,8 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v11_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +8 -6
@@ -1933,6 +1933,9 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,int w = amdgpu_crtc->cursor_width; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -1952,8 +1955,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc->crtc_offset, ((w -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y;return 0 ; }
@@ -2016,12 +2017,11 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v6_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2030,6 +2030,8 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v6_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +8 -7
@@ -2465,6 +2465,9 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -2484,9 +2487,6 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y; -return 0 ; }
@@ -2549,12 +2549,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v8_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2563,6 +2562,8 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v8_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +16 -12
@@ -3947,8 +3947,12 @@ static int gfx_v8_0_init_save_restore_list(struct amdgpu_device *adev) temp = mmRLC_SRM_INDEX_CNTL_ADDR_0; data = mmRLC_SRM_INDEX_CNTL_DATA_0;for (i =0 ; i <sizeof (unique_indices) /sizeof (int ); i++) { -amdgpu_mm_wreg (adev, temp + i, unique_indices[i] &0x3FFFF , false); -amdgpu_mm_wreg (adev, data + i, unique_indices[i] >>20 , false); +if (unique_indices[i] !=0 ) { +amdgpu_mm_wreg (adev, temp + i, + unique_indices[i] &0x3FFFF , false); +amdgpu_mm_wreg (adev, data + i, + unique_indices[i] >>20 , false); + } }kfree (register_list_format);
@@ -3994,7 +3998,7 @@ static void cz_enable_sck_slow_down_on_power_down(struct amdgpu_device *adev,static void cz_enable_cp_power_gating (struct amdgpu_device *adev,bool enable) { -WREG32_FIELD (RLC_PG_CNTL ,CP_PG_DISABLE , enable ?1 :0 ); +WREG32_FIELD (RLC_PG_CNTL ,CP_PG_DISABLE , enable ?0 :1 ); }static void gfx_v8_0_init_pg (struct amdgpu_device *adev)
@@ -5891,29 +5895,24 @@ static void gfx_v8_0_update_coarse_grain_clock_gating(struct amdgpu_device *adev adev->gfx.rlc.funcs->enter_safe_mode (adev);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_GFX_CGCG )) { -/* 1 enable cntx_empty_int_enable/cntx_busy_int_enable/ -* Cmp_busy/GFX_Idle interrupts -*/ -gfx_v8_0_enable_gui_idle_interrupt (adev, true); - temp1 = data1 =RREG32 (mmRLC_CGTT_MGCG_OVERRIDE); data1 &= ~RLC_CGTT_MGCG_OVERRIDE__CGCG_MASK ;if (temp1 != data1)WREG32 (mmRLC_CGTT_MGCG_OVERRIDE, data1); -/* 2 wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */ +/* : wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */ gfx_v8_0_wait_for_rlc_serdes (adev); -/* 3 - clear cgcg override */ +/* 2 - clear cgcg override */ gfx_v8_0_send_serdes_cmd (adev,BPM_REG_CGCG_OVERRIDE ,CLE_BPM_SERDES_CMD );/* wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */ gfx_v8_0_wait_for_rlc_serdes (adev); -/* 4 - write cmd to set CGLS */ +/* 3 - write cmd to set CGLS */ gfx_v8_0_send_serdes_cmd (adev,BPM_REG_CGLS_EN ,SET_BPM_SERDES_CMD ); -/* 5 - enable cgcg */ +/* 4 - enable cgcg */ data |=RLC_CGCG_CGLS_CTRL__CGCG_EN_MASK ;if (adev->cg_flags &AMD_CG_SUPPORT_GFX_CGLS ) {
@@ -5931,6 +5930,11 @@ static void gfx_v8_0_update_coarse_grain_clock_gating(struct amdgpu_device *adevif (temp != data)WREG32 (mmRLC_CGCG_CGLS_CTRL, data); + +/* 5 enable cntx_empty_int_enable/cntx_busy_int_enable/ +* Cmp_busy/GFX_Idle interrupts +*/ +gfx_v8_0_enable_gui_idle_interrupt (adev, true); }else {/* disable cntx_empty_int_enable & GFX Idle interrupt */ gfx_v8_0_enable_gui_idle_interrupt (adev, false);
drivers/gpu/drm/amd/amdgpu/si_dpm.c +2 -0
@@ -3504,6 +3504,7 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, (adev->pdev->revision == 0x80) || (adev->pdev->revision == 0x81) || (adev->pdev->revision == 0x83) || + (adev->pdev->revision == 0x87) || (adev->pdev->device == 0x6604) || (adev->pdev->device == 0x6605)) { max_sclk =75000 ;
@@ -7713,6 +7714,7 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev) (adev->pdev->revision == 0x80) || (adev->pdev->revision == 0x81) || (adev->pdev->revision == 0x83) || + (adev->pdev->revision == 0x87) || (adev->pdev->device == 0x6604) || (adev->pdev->device == 0x6605)) chip_name ="oland_k" ;
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +6 -0
@@ -1958,6 +1958,12 @@ int fiji_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)int res;uint64_t tmp64; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (smu_data->smu7_data.fan_table_start ==0 ) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c +6 -0
@@ -2006,6 +2006,12 @@ int iceland_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)if (!phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl))return 0 ; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (0 == smu7_data->fan_table_start) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);return 0 ;
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +6 -0
@@ -1885,6 +1885,12 @@ int polaris10_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)int res;uint64_t tmp64; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (smu_data->smu7_data.fan_table_start ==0 ) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c +6 -0
@@ -2496,6 +2496,12 @@ int tonga_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) PHM_PlatformCaps_MicrocodeFanControl))return 0 ; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (0 == smu_data->smu7_data.fan_table_start) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);
drivers/gpu/drm/ast/ast_main.c +5 -2
@@ -223,7 +223,8 @@ static int ast_get_dram_info(struct drm_device *dev)ast_write32 (ast,0x10000 ,0xfc600309 );do { - ; +if (pci_channel_offline (dev->pdev)) +return -EIO ; }while (ast_read32 (ast,0x10000 ) !=0x01 ); data =ast_read32 (ast,0x10004 );
@@ -428,7 +429,9 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)ast_detect_chip (dev, &need_post);if (ast->chip !=AST1180 ) { -ast_get_dram_info (dev); + ret =ast_get_dram_info (dev); +if (ret) + goto out_free; ast->vram_size =ast_get_vram_info (dev);DRM_INFO ("dram %d %d %d %08x\n" , ast->mclk, ast->dram_type, ast->dram_bus_width, ast->vram_size); }
drivers/gpu/drm/gma500/psb_drv.c +3 -0
@@ -473,6 +473,9 @@ static const struct file_operations psb_gem_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = psb_unlocked_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = drm_compat_ioctl, +#endif .mmap = drm_gem_mmap, .poll = drm_poll, .read = drm_read,
drivers/gpu/drm/i915/i915_gem_stolen.c +2 -3
@@ -55,10 +55,9 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,return -ENODEV ;/* See the comment at the drm_mm_init() call for more about this check. -* WaSkipStolenMemoryFirstPage:bdw,chv,kbl (incomplete) +* WaSkipStolenMemoryFirstPage:bdw+ (incomplete) */ -if (start <4096 && (IS_GEN8 (dev_priv) || -IS_KBL_REVID (dev_priv,0 ,KBL_REVID_A0 ))) +if (start <4096 &&INTEL_GEN (dev_priv) >=8 ) start =4096 ;mutex_lock (&dev_priv->mm.stolen_lock);
drivers/gpu/drm/i915/i915_sysfs.c +1 -1
@@ -460,7 +460,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev, static DEVICE_ATTR(gt_act_freq_mhz, S_IRUGO, gt_act_freq_mhz_show, NULL); static DEVICE_ATTR(gt_cur_freq_mhz, S_IRUGO, gt_cur_freq_mhz_show, NULL); -static DEVICE_ATTR(gt_boost_freq_mhz, S_IRUGO, gt_boost_freq_mhz_show, gt_boost_freq_mhz_store); +static DEVICE_ATTR(gt_boost_freq_mhz, S_IRUGO | S_IWUSR, gt_boost_freq_mhz_show, gt_boost_freq_mhz_store); static DEVICE_ATTR(gt_max_freq_mhz, S_IRUGO | S_IWUSR, gt_max_freq_mhz_show, gt_max_freq_mhz_store); static DEVICE_ATTR(gt_min_freq_mhz, S_IRUGO | S_IWUSR, gt_min_freq_mhz_show, gt_min_freq_mhz_store);
drivers/gpu/drm/i915/intel_display.c +6 -3
@@ -13970,8 +13970,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state)DRM_DEBUG_KMS ("New cdclk calculated to be atomic %u, actual %u\n" , intel_state->cdclk, intel_state->dev_cdclk); - }else + }else {to_intel_atomic_state (state)->cdclk = dev_priv->atomic_cdclk_freq; + }intel_modeset_clear_plls (state);
@@ -14072,8 +14073,9 @@ static int intel_atomic_check(struct drm_device *dev,if (ret)return ret; - }else - intel_state->cdclk = dev_priv->cdclk_freq; + }else { + intel_state->cdclk = dev_priv->atomic_cdclk_freq; + } ret =drm_atomic_helper_check_planes (dev, state);if (ret)
@@ -16441,6 +16443,7 @@ void intel_modeset_init(struct drm_device *dev)intel_update_czclk (dev_priv);intel_update_cdclk (dev); + dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq;intel_shared_dpll_init (dev);
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +2 -1
@@ -296,7 +296,8 @@ static void chv_exec_gpio(struct drm_i915_private *dev_priv,mutex_lock (&dev_priv->sb_lock);vlv_iosf_sb_write (dev_priv, port, cfg1,0 );vlv_iosf_sb_write (dev_priv, port, cfg0, -CHV_GPIO_GPIOCFG_GPO |CHV_GPIO_GPIOTXSTATE (value)); +CHV_GPIO_GPIOEN |CHV_GPIO_GPIOCFG_GPO | +CHV_GPIO_GPIOTXSTATE (value));mutex_unlock (&dev_priv->sb_lock); }
drivers/gpu/drm/i915/intel_runtime_pm.c +12 -1
@@ -1065,7 +1065,18 @@ static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv,static void vlv_init_display_clock_gating (struct drm_i915_private *dev_priv) { -I915_WRITE (DSPCLK_GATE_D ,VRHUNIT_CLOCK_GATE_DISABLE ); +u32 val; + +/* +* On driver load, a pipe may be active and driving a DSI display. +* Preserve DPOUNIT_CLOCK_GATE_DISABLE to avoid the pipe getting stuck +* (and never recovering) in this case. intel_dsi_post_disable() will +* clear it when we turn off the display. +*/ + val =I915_READ (DSPCLK_GATE_D ); + val &=DPOUNIT_CLOCK_GATE_DISABLE ; + val |=VRHUNIT_CLOCK_GATE_DISABLE ; +I915_WRITE (DSPCLK_GATE_D , val);/* * Disable trickle feed and enable pnd deadline calculation
drivers/gpu/drm/nouveau/nouveau_bios.c +3 -0
@@ -333,6 +333,9 @@ get_fp_strap(struct drm_device *dev, struct nvbios *bios)if (bios->major_version <5 && bios->data[0x48 ] &0x4 )return NVReadVgaCrtc5758 (dev,0 ,0xf ) &0xf ; +if (drm->device.info.family >=NV_DEVICE_INFO_V0_MAXWELL ) +return nvif_rd32 (device,0x001800 ) &0x0000000f ; +else if (drm->device.info.family >=NV_DEVICE_INFO_V0_TESLA )return (nvif_rd32 (device,NV_PEXTDEV_BOOT_0 ) >>24 ) &0xf ;else
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -0
@@ -1209,6 +1209,7 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem) nvbo->page_shift != vma->vm->mmu->lpg_shift)) { nvkm_vm_map(vma, new_mem->mm_node); } else { +WARN_ON (ttm_bo_wait (bo, false, false));nvkm_vm_unmap (vma); } }
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +3 -3
@@ -1851,7 +1851,7 @@ nvf1_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, - .i2c = gf119_i2c_new, + .i2c = gk104_i2c_new, .ibus = gk104_ibus_new, .iccsense = gf100_iccsense_new, .imem = nv50_instmem_new,
@@ -1965,7 +1965,7 @@ nv117_chipset = { .fb = gm107_fb_new, .fuse = gm107_fuse_new, .gpio = gk104_gpio_new, - .i2c = gf119_i2c_new, + .i2c = gk104_i2c_new, .ibus = gk104_ibus_new, .iccsense = gf100_iccsense_new, .imem = nv50_instmem_new,
@@ -1999,7 +1999,7 @@ nv118_chipset = { .fb = gm107_fb_new, .fuse = gm107_fuse_new, .gpio = gk104_gpio_new, - .i2c = gf119_i2c_new, + .i2c = gk104_i2c_new, .ibus = gk104_ibus_new, .iccsense = gf100_iccsense_new, .imem = nv50_instmem_new,
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c +6 -3
@@ -60,6 +60,7 @@ gf100_fifo_gpfifo_engine_fini(struct nvkm_fifo_chan *base,struct nvkm_gpuobj *inst = chan->base.inst;int ret =0 ; +mutex_lock (&subdev->mutex);nvkm_wr32 (device,0x002634 , chan->base.chid); if (nvkm_msec(device, 2000, if (nvkm_rd32(device, 0x002634) == chan->base.chid)
@@ -67,10 +68,12 @@ gf100_fifo_gpfifo_engine_fini(struct nvkm_fifo_chan *base, ) < 0) {nvkm_error (subdev,"channel %d [%s] kick timeout\n" , chan->base.chid, chan->base.object.client->name); - ret = -EBUSY ; -if (suspend) -return ret; + ret = -ETIMEDOUT ; } +mutex_unlock (&subdev->mutex); + +if (ret && suspend) +return ret;if (offset) {nvkm_kmap (inst);
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c +5 -3
@@ -40,7 +40,9 @@ gk104_fifo_gpfifo_kick(struct gk104_fifo_chan *chan)struct nvkm_subdev *subdev = &fifo->base.engine.subdev;struct nvkm_device *device = subdev->device;struct nvkm_client *client = chan->base.object.client; +int ret =0 ; +mutex_lock (&subdev->mutex);nvkm_wr32 (device,0x002634 , chan->base.chid); if (nvkm_msec(device, 2000, if (!(nvkm_rd32(device, 0x002634) & 0x00100000))
@@ -48,10 +50,10 @@ gk104_fifo_gpfifo_kick(struct gk104_fifo_chan *chan) ) < 0) {nvkm_error (subdev,"channel %d [%s] kick timeout\n" , chan->base.chid, client->name); -return -EBUSY ; + ret = -ETIMEDOUT ; } - -return 0 ; +mutex_unlock (&subdev->mutex); +return ret; } static u32
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +46 -4
62 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h +1 -0
@@ -12,6 +12,7 @@ struct nvbios_source {bool rw;bool ignore_checksum;bool no_pcir; +bool require_checksum; };int nvbios_extend (struct nvkm_bios *,u32 length);
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c +5 -2
@@ -86,9 +86,12 @@ shadow_image(struct nvkm_bios *bios, int idx, u32 offset, struct shadow *mthd) nvbios_checksum(&bios->data[image.base], image.size)) {nvkm_debug (subdev,"%08x: checksum failed\n" , image.base); - if (mthd->func->rw) +if (!mthd->func->require_checksum) { +if (mthd->func->rw) + score +=1 ; score +=1 ; - score += 1; + }else +return 0 ; } else { score +=3 ; }
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c +1 -0
@@ -99,6 +99,7 @@ nvbios_acpi_fast = { .init = acpi_init, .read = acpi_read_fast, .rw = false, + .require_checksum = true, }; const struct nvbios_source
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c +2 -0
@@ -47,8 +47,10 @@ nvkm_ltc_tags_clear(struct nvkm_ltc *ltc, u32 first, u32 count)BUG_ON ((first > limit) || (limit >= ltc->num_tags)); +mutex_lock (<c->subdev.mutex); ltc->func->cbc_clear (ltc, first, limit); ltc->func->cbc_wait (ltc); +mutex_unlock (<c->subdev.mutex); }int
drivers/gpu/drm/radeon/radeon_cursor.c +47 -22
130 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +1 -0
@@ -330,6 +330,7 @@ struct radeon_crtc {u16 lut_r[256 ], lut_g[256 ], lut_b[256 ];bool enabled;bool can_tile; +bool cursor_out_of_bounds;uint32_t crtc_offset;struct drm_gem_object *cursor_bo;uint64_t cursor_addr;
drivers/gpu/drm/radeon/si.c +1 -0
@@ -1714,6 +1714,7 @@ static int si_init_microcode(struct radeon_device *rdev) (rdev->pdev->revision ==0x80 ) || (rdev->pdev->revision ==0x81 ) || (rdev->pdev->revision ==0x83 ) || + (rdev->pdev->revision ==0x87 ) || (rdev->pdev->device ==0x6604 ) || (rdev->pdev->device == 0x6605)) new_smc = true;
drivers/gpu/drm/radeon/si_dpm.c +1 -0
@@ -3026,6 +3026,7 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, (rdev->pdev->revision == 0x80) || (rdev->pdev->revision == 0x81) || (rdev->pdev->revision == 0x83) || + (rdev->pdev->revision == 0x87) || (rdev->pdev->device == 0x6604) || (rdev->pdev->device == 0x6605)) { max_sclk =75000 ;
drivers/hv/channel_mgmt.c +2 -0
@@ -389,6 +389,7 @@ void vmbus_free_channels(void) {struct vmbus_channel *channel, *tmp; +mutex_lock (&vmbus_connection.channel_mutex);list_for_each_entry_safe (channel, tmp, &vmbus_connection.chn_list, listentry) {/* hv_process_channel_removal() needs this */
@@ -396,6 +397,7 @@ void vmbus_free_channels(void)vmbus_device_unregister (channel->device_obj); } +mutex_unlock (&vmbus_connection.channel_mutex); }/*
drivers/hwtracing/stm/core.c +5 -3
@@ -361,7 +361,7 @@ static int stm_char_open(struct inode *inode, struct file *file)struct stm_file *stmf;struct device *dev;unsigned int major =imajor (inode); -int err = -ENODEV ; +int err = -ENOMEM ; dev =class_find_device (&stm_class,NULL , &major, major_match);if (!dev)
@@ -369,8 +369,9 @@ static int stm_char_open(struct inode *inode, struct file *file) stmf =kzalloc (sizeof (*stmf),GFP_KERNEL );if (!stmf) -return -ENOMEM ; + goto err_put_device; + err = -ENODEV ;stm_output_init (&stmf->output); stmf->stm =to_stm_device (dev);
@@ -382,9 +383,10 @@ static int stm_char_open(struct inode *inode, struct file *file)return nonseekable_open (inode, file); err_free: +kfree (stmf); +err_put_device:/* matches class_find_device() above */ put_device (dev); -kfree (stmf);return err; }
drivers/infiniband/core/mad.c +1 -1
@@ -1746,7 +1746,7 @@ find_mad_agent(struct ib_mad_port_private *port_priv,if (!class) goto out;if (convert_mgmt_class (mad_hdr->mgmt_class) >= -IB_MGMT_MAX_METHODS ) +ARRAY_SIZE (class->method_table)) goto out; method = class->method_table[convert_mgmt_class ( mad_hdr->mgmt_class)];
drivers/infiniband/core/multicast.c +5 -2
@@ -518,8 +518,11 @@ static void join_handler(int status, struct ib_sa_mcmember_rec *rec,process_join_error (group, status); else {int mgids_changed, is_mgid0; -ib_find_pkey (group->port->dev->device, group->port->port_num, -be16_to_cpu (rec->pkey), &pkey_index); + +if (ib_find_pkey (group->port->dev->device, + group->port->port_num,be16_to_cpu (rec->pkey), + &pkey_index)) + pkey_index =MCAST_INVALID_PKEY_INDEX ;spin_lock_irq (&group->port->lock); if (group->state == MCAST_BUSY &&
drivers/infiniband/hw/i40iw/i40iw_verbs.c +1 -1
@@ -2501,7 +2501,7 @@ static int i40iw_get_hw_stats(struct ib_device *ibdev,return -ENOSYS ; } -memcpy (&stats->value[0 ], &hw_stats,sizeof (*hw_stats)); +memcpy (&stats->value[0 ], hw_stats,sizeof (*hw_stats));return stats->num_counters; }
drivers/infiniband/sw/rxe/rxe_qp.c +1 -0
@@ -855,4 +855,5 @@ void rxe_qp_cleanup(void *arg)free_rd_atomic_resources (qp);kernel_sock_shutdown (qp->sk,SHUT_RDWR ); +sock_release (qp->sk); }
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +5 -2
@@ -575,8 +575,11 @@ void ipoib_mcast_join_task(struct work_struct *work)if (!test_bit (IPOIB_FLAG_OPER_UP , &priv->flags))return ; -if (ib_query_port (priv->ca, priv->port, &port_attr) || - port_attr.state !=IB_PORT_ACTIVE ) { +if (ib_query_port (priv->ca, priv->port, &port_attr)) { +ipoib_dbg (priv,"ib_query_port() failed\n" ); +return ; + } +if (port_attr.state !=IB_PORT_ACTIVE ) {ipoib_dbg (priv,"port state is not ACTIVE (state = %d) suspending join task\n" , port_attr.state);return ;
drivers/input/misc/drv260x.c +0 -1
@@ -592,7 +592,6 @@ static int drv260x_probe(struct i2c_client *client, } haptics->input_dev->name ="drv260x:haptics" ; - haptics->input_dev->dev.parent = client->dev.parent; haptics->input_dev->close = drv260x_close;input_set_drvdata (haptics->input_dev, haptics);input_set_capability (haptics->input_dev,EV_FF ,FF_RUMBLE );
drivers/md/raid5.c +9 -0
@@ -6984,6 +6984,15 @@ static int raid5_run(struct mddev *mddev) stripe = (stripe | (stripe-1 )) +1 ; mddev->queue->limits.discard_alignment = stripe; mddev->queue->limits.discard_granularity = stripe; + +/* +* We use 16-bit counter of active stripes in bi_phys_segments +* (minus one for over-loaded initialization) +*/ +blk_queue_max_hw_sectors (mddev->queue,0xfffe *STRIPE_SECTORS ); +blk_queue_max_discard_sectors (mddev->queue, +0xfffe *STRIPE_SECTORS ); +/* * unaligned part of discard request will be ignored, so can't * guarantee discard_zeroes_data
drivers/media/dvb-frontends/mn88472.c +12 -12
@@ -488,18 +488,6 @@ static int mn88472_probe(struct i2c_client *client, goto err_kfree; } -/* Check demod answers with correct chip id */ - ret =regmap_read (dev->regmap[0 ],0xff , &utmp); -if (ret) - goto err_regmap_0_regmap_exit; - -dev_dbg (&client->dev,"chip id=%02x\n" , utmp); - -if (utmp !=0x02 ) { - ret = -ENODEV ; - goto err_regmap_0_regmap_exit; - } -/* * Chip has three I2C addresses for different register banks. Used * addresses are 0x18, 0x1a and 0x1c. We register two dummy clients,
@@ -536,6 +524,18 @@ static int mn88472_probe(struct i2c_client *client, }i2c_set_clientdata (dev->client[2 ], dev); +/* Check demod answers with correct chip id */ + ret =regmap_read (dev->regmap[2 ],0xff , &utmp); +if (ret) + goto err_regmap_2_regmap_exit; + +dev_dbg (&client->dev,"chip id=%02x\n" , utmp); + +if (utmp !=0x02 ) { + ret = -ENODEV ; + goto err_regmap_2_regmap_exit; + } +/* Sleep because chip is active by default */ ret =regmap_write (dev->regmap[2 ],0x05 ,0x3e );if (ret)
drivers/media/dvb-frontends/mn88473.c +12 -12
@@ -485,18 +485,6 @@ static int mn88473_probe(struct i2c_client *client, goto err_kfree; } -/* Check demod answers with correct chip id */ - ret =regmap_read (dev->regmap[0 ],0xff , &uitmp); -if (ret) - goto err_regmap_0_regmap_exit; - -dev_dbg (&client->dev,"chip id=%02x\n" , uitmp); - -if (uitmp !=0x03 ) { - ret = -ENODEV ; - goto err_regmap_0_regmap_exit; - } -/* * Chip has three I2C addresses for different register banks. Used * addresses are 0x18, 0x1a and 0x1c. We register two dummy clients,
@@ -533,6 +521,18 @@ static int mn88473_probe(struct i2c_client *client, }i2c_set_clientdata (dev->client[2 ], dev); +/* Check demod answers with correct chip id */ + ret =regmap_read (dev->regmap[2 ],0xff , &uitmp); +if (ret) + goto err_regmap_2_regmap_exit; + +dev_dbg (&client->dev,"chip id=%02x\n" , uitmp); + +if (uitmp !=0x03 ) { + ret = -ENODEV ; + goto err_regmap_2_regmap_exit; + } +/* Sleep because chip is active by default */ ret =regmap_write (dev->regmap[2 ],0x05 ,0x3e );if (ret)
drivers/media/i2c/tvp5150.c +1 -0
@@ -815,6 +815,7 @@ static int tvp5150_s_ctrl(struct v4l2_ctrl *ctrl)return 0 ;case V4L2_CID_HUE :tvp5150_write (sd,TVP5150_HUE_CTL , ctrl->val); +break ;case V4L2_CID_TEST_PATTERN : decoder->enable = ctrl->val ? false : true;tvp5150_selmux (sd);
drivers/media/pci/solo6x10/solo6x10.h +3 -0
@@ -284,7 +284,10 @@ static inline u32 solo_reg_read(struct solo_dev *solo_dev, int reg)static inline void solo_reg_write (struct solo_dev *solo_dev,int reg,u32 data) { +u16 val; +writel (data, solo_dev->reg_base + reg); +pci_read_config_word (solo_dev->pdev,PCI_STATUS , &val); }static inline void solo_irq_on (struct solo_dev *dev,u32 mask)
drivers/media/platform/s5p-mfc/s5p_mfc.c +1 -0
@@ -1082,6 +1082,7 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, idx);if (ret ==0 )return child; +device_del (child); }put_device (child);
drivers/misc/mei/client.c +1 -1
@@ -686,7 +686,7 @@ void mei_host_client_init(struct mei_device *dev)pm_runtime_mark_last_busy (dev->dev);dev_dbg (dev->dev,"rpm: autosuspend\n" ); -pm_runtime_autosuspend (dev->dev); +pm_request_autosuspend (dev->dev); }/**
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -122,6 +122,8 @@#define MEI_DEV_ID_SPT_H 0xA13A/* Sunrise Point H */ #define MEI_DEV_ID_SPT_H_2 0xA13B/* Sunrise Point H 2 */ +#define MEI_DEV_ID_LBG 0xA1BA/* Lewisburg (SPT) */ +#define MEI_DEV_ID_BXT_M 0x1A9A/* Broxton M */ #define MEI_DEV_ID_APL_I 0x5A9A/* Apollo Lake I */
drivers/misc/mei/pci-me.c +1 -0
@@ -87,6 +87,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)}, {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_sps_cfg)}, {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_sps_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, mei_me_pch8_cfg)}, {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)}, {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
drivers/mmc/core/sd.c +10 -2
@@ -223,6 +223,7 @@ static int mmc_decode_scr(struct mmc_card *card)static int mmc_read_ssr (struct mmc_card *card) {unsigned int au, es, et, eo; +u32 *raw_ssr;int i;if (!(card->csd.cmdclass &CCC_APP_SPEC )) {
@@ -231,14 +232,21 @@ static int mmc_read_ssr(struct mmc_card *card)return 0 ; } -if (mmc_app_sd_status (card, card->raw_ssr)) { + raw_ssr =kmalloc (sizeof (card->raw_ssr),GFP_KERNEL ); +if (!raw_ssr) +return -ENOMEM ; + +if (mmc_app_sd_status (card, raw_ssr)) {pr_warn ("%s: problem reading SD Status register\n" ,mmc_hostname (card->host)); +kfree (raw_ssr);return 0 ; }for (i =0 ; i <16 ; i++) - card->raw_ssr[i] =be32_to_cpu (card->raw_ssr[i]); + card->raw_ssr[i] =be32_to_cpu (raw_ssr[i]); + +kfree (raw_ssr);/* * UNSTUFF_BITS only works with four u32s so we have to offset the
drivers/mmc/host/sdhci.c +20 -4
@@ -2086,16 +2086,32 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)if (!host->tuning_done) {pr_info (DRIVER_NAME ": Timeout waiting for Buffer Read Ready interrupt during tuning procedure, falling back to fixed sampling clock\n" ); - -sdhci_do_reset (host,SDHCI_RESET_CMD ); -sdhci_do_reset (host,SDHCI_RESET_DATA ); - ctrl =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); ctrl &= ~SDHCI_CTRL_TUNED_CLK ; ctrl &= ~SDHCI_CTRL_EXEC_TUNING ;sdhci_writew (host, ctrl,SDHCI_HOST_CONTROL2 ); +sdhci_do_reset (host,SDHCI_RESET_CMD ); +sdhci_do_reset (host,SDHCI_RESET_DATA ); + err = -EIO ; + +if (cmd.opcode !=MMC_SEND_TUNING_BLOCK_HS200 ) + goto out; + +sdhci_writel (host, host->ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); + +spin_unlock_irqrestore (&host->lock, flags); + +memset (&cmd,0 ,sizeof (cmd)); + cmd.opcode =MMC_STOP_TRANSMISSION ; + cmd.flags =MMC_RSP_SPI_R1B |MMC_RSP_R1B |MMC_CMD_AC ; + cmd.busy_timeout =50 ; +mmc_wait_for_cmd (mmc, &cmd,0 ); + +spin_lock_irqsave (&host->lock, flags); + goto out; }
drivers/net/ethernet/marvell/mvpp2.c +30 -29
105 lines not on this page · raw message
drivers/net/wireless/ath/ath10k/core.c +1 -1
@@ -1534,7 +1534,7 @@ static void ath10k_core_restart(struct work_struct *work)switch (ar->state) {case ATH10K_STATE_ON : ar->state =ATH10K_STATE_RESTARTING ; -ath10k_hif_stop (ar); +ath10k_halt (ar);ath10k_scan_finish (ar);ieee80211_restart_hw (ar->hw);break ;
drivers/net/wireless/ath/ath10k/mac.c +0 -1
@@ -4449,7 +4449,6 @@ static int ath10k_start(struct ieee80211_hw *hw) ar->state =ATH10K_STATE_ON ;break ;case ATH10K_STATE_RESTARTING : -ath10k_halt (ar); ar->state =ATH10K_STATE_RESTARTED ;break ;case ATH10K_STATE_ON :
drivers/net/wireless/ath/ath9k/hw.c +1 -1
@@ -2792,7 +2792,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio)WARN_ON (1 ); } -return val; +return !!val; }EXPORT_SYMBOL (ath9k_hw_gpio_get);
drivers/net/wireless/ath/ath9k/pci.c +5 -2
@@ -26,7 +26,6 @@ static const struct pci_device_id ath_pci_id_table[] = { { PCI_VDEVICE(ATHEROS, 0x0023) }, /* PCI */ { PCI_VDEVICE(ATHEROS, 0x0024) }, /* PCI-E */ { PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */ - { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */ #ifdef CONFIG_ATH9K_PCOEM/* Mini PCI AR9220 MB92 cards: Compex WLM200NX, Wistron DNMA-92 */
@@ -37,7 +36,7 @@ static const struct pci_device_id ath_pci_id_table[] = { .driver_data = ATH9K_PCI_LED_ACT_HI },#endif - { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */ + { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */ #ifdef CONFIG_ATH9K_PCOEM { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
@@ -85,7 +84,11 @@ static const struct pci_device_id ath_pci_id_table[] = { 0x10CF, /* Fujitsu */ 0x1536), .driver_data = ATH9K_PCI_D3_L1_WAR }, +#endif + { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */ + +#ifdef CONFIG_ATH9K_PCOEM /* AR9285 card for Asus */ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 0x002B,
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -2787,7 +2787,7 @@ void ath_tx_edma_tasklet(struct ath_softc *sc) fifo_list = &txq->txq_fifo[txq->txq_tailidx];if (list_empty (fifo_list)) {ath_txq_unlock (sc, txq); -return ; +break ; } bf = list_first_entry(fifo_list, struct ath_buf, list);
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +8 -0
@@ -4372,6 +4372,13 @@ void rtl8xxxu_gen1_report_connect(struct rtl8xxxu_priv *priv,void rtl8xxxu_gen2_report_connect (struct rtl8xxxu_priv *priv,u8 macid,bool connect) { +#ifdef RTL8XXXU_GEN2_REPORT_CONNECT +/* +* Barry Day reports this causes issues with 8192eu and 8723bu +* devices reconnecting. The reason for this is unclear, but +* until it is better understood, leave the code in place but +* disabled, so it is not lost. +*/ struct h2c_cmd h2c;memset (&h2c,0 ,sizeof (struct h2c_cmd ));
@@ -4383,6 +4390,7 @@ void rtl8xxxu_gen2_report_connect(struct rtl8xxxu_priv *priv, h2c.media_status_rpt.parm &= ~BIT (0 );rtl8xxxu_gen2_h2c_cmd (priv, &h2c,sizeof (h2c.media_status_rpt)); +#endif }void rtl8xxxu_gen1_init_aggregation (struct rtl8xxxu_priv *priv)
drivers/net/wireless/realtek/rtlwifi/base.c +4 -4
@@ -1303,12 +1303,13 @@ EXPORT_SYMBOL_GPL(rtl_action_proc);static void setup_arp_tx (struct rtl_priv *rtlpriv,struct rtl_ps_ctl *ppsc) { +struct ieee80211_hw *hw = rtlpriv->hw; + rtlpriv->ra.is_special_data = true;if (rtlpriv->cfg->ops->get_btc_status ()) rtlpriv->btcoexist.btc_ops->btc_special_packet_notify ( rtlpriv,1 ); - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); +rtl_lps_leave (hw); ppsc->last_delaylps_stamp_jiffies = jiffies; }
@@ -1381,8 +1382,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,if (is_tx) { rtlpriv->ra.is_special_data = true; - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); +rtl_lps_leave (hw); ppsc->last_delaylps_stamp_jiffies = jiffies; }
drivers/net/wireless/realtek/rtlwifi/core.c +3 -6
@@ -1150,10 +1150,8 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, }else { mstatus =RT_MEDIA_DISCONNECT ; -if (mac->link_state ==MAC80211_LINKED ) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); - } +if (mac->link_state ==MAC80211_LINKED ) +rtl_lps_leave (hw);if (ppsc->p2p_ps_info.p2p_ps_mode >P2P_PS_NONE )rtl_p2p_ps_cmd (hw,P2P_PS_DISABLE ); mac->link_state =MAC80211_NOLINK ;
@@ -1431,8 +1429,7 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw, }if (mac->link_state ==MAC80211_LINKED ) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); +rtl_lps_leave (hw); mac->link_state =MAC80211_LINKED_SCANNING ; }else {rtl_ips_nic_on (hw);
drivers/net/wireless/realtek/rtlwifi/pci.c +5 -9
@@ -663,11 +663,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) }if (((rtlpriv->link_info.num_rx_inperiod + - rtlpriv->link_info.num_tx_inperiod) >8 ) || - (rtlpriv->link_info.num_rx_inperiod >2 )) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); - } + rtlpriv->link_info.num_tx_inperiod) >8 ) || + (rtlpriv->link_info.num_rx_inperiod >2 )) +rtl_lps_leave (hw); } static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw,
@@ -918,10 +916,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) }if (((rtlpriv->link_info.num_rx_inperiod + rtlpriv->link_info.num_tx_inperiod) >8 ) || - (rtlpriv->link_info.num_rx_inperiod >2 )) { - rtlpriv->enter_ps = false; -schedule_work (&rtlpriv->works.lps_change_work); - } + (rtlpriv->link_info.num_rx_inperiod >2 )) +rtl_lps_leave (hw); skb = new_skb; no_new:if (rtlpriv->use_new_trx_flow) {
drivers/net/wireless/realtek/rtlwifi/ps.c +28 -8
@@ -407,8 +407,8 @@ void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode) } } -/*Enter the leisure power save mode.*/ -void rtl_lps_enter (struct ieee80211_hw *hw) +/* Interrupt safe routine to enter the leisure power save mode.*/ +static void rtl_lps_enter_core (struct ieee80211_hw *hw) {struct rtl_mac *mac =rtl_mac (rtl_priv (hw));struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));
@@ -444,10 +444,9 @@ void rtl_lps_enter(struct ieee80211_hw *hw)spin_unlock_irqrestore (&rtlpriv->locks.lps_lock, flag); } -EXPORT_SYMBOL (rtl_lps_enter); -/*Leave the leisure power save mode.*/ -void rtl_lps_leave (struct ieee80211_hw *hw) +/* Interrupt safe routine to leave the leisure power save mode.*/ +static void rtl_lps_leave_core (struct ieee80211_hw *hw) {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));
@@ -477,7 +476,6 @@ void rtl_lps_leave(struct ieee80211_hw *hw) }spin_unlock_irqrestore (&rtlpriv->locks.lps_lock, flag); } -EXPORT_SYMBOL (rtl_lps_leave);/* For sw LPS*/ void rtl_swlps_beacon (struct ieee80211_hw *hw,void *data,unsigned int len)
@@ -670,12 +668,34 @@ void rtl_lps_change_work_callback(struct work_struct *work)struct rtl_priv *rtlpriv =rtl_priv (hw);if (rtlpriv->enter_ps) -rtl_lps_enter (hw); +rtl_lps_enter_core (hw);else -rtl_lps_leave (hw); +rtl_lps_leave_core (hw); }EXPORT_SYMBOL_GPL (rtl_lps_change_work_callback); +void rtl_lps_enter (struct ieee80211_hw *hw) +{ +struct rtl_priv *rtlpriv =rtl_priv (hw); + +if (!in_interrupt ()) +return rtl_lps_enter_core (hw); + rtlpriv->enter_ps = true; +schedule_work (&rtlpriv->works.lps_change_work); +} +EXPORT_SYMBOL_GPL (rtl_lps_enter); + +void rtl_lps_leave (struct ieee80211_hw *hw) +{ +struct rtl_priv *rtlpriv =rtl_priv (hw); + +if (!in_interrupt ()) +return rtl_lps_leave_core (hw); + rtlpriv->enter_ps = false; +schedule_work (&rtlpriv->works.lps_change_work); +} +EXPORT_SYMBOL_GPL (rtl_lps_leave); +void rtl_swlps_wq_callback (void *data) { struct rtl_works *rtlworks = container_of_dwork_rtl(data,
drivers/nvdimm/pfn_devs.c +1 -1
@@ -108,7 +108,7 @@ static ssize_t align_show(struct device *dev, {struct nd_pfn *nd_pfn =to_nd_pfn_safe (dev); -return sprintf (buf,"%lx\n" , nd_pfn->align); +return sprintf (buf,"%ld\n" , nd_pfn->align); }static ssize_t __align_store (struct nd_pfn *nd_pfn,const char *buf)
drivers/of/of_numa.c +6 -1
@@ -176,7 +176,12 @@ int of_node_to_nid(struct device_node *device) np->name);of_node_put (np); -if (!r) +/* +* If numa=off passed on command line, or with a defective +* device tree, the nid may not be in the set of possible +* nodes. Check for this case and return NUMA_NO_NODE. +*/ +if (!r && nid <MAX_NUMNODES &&node_possible (nid))return nid;return NUMA_NO_NODE ;
drivers/pci/pci.c +4 -0
@@ -2106,6 +2106,10 @@ bool pci_dev_run_wake(struct pci_dev *dev)if (!dev->pme_support)return false; +/* PME-capable in principle, but not from the intended sleep state */ +if (!pci_pme_capable (dev,pci_target_state (dev))) +return false; +while (bus->parent) {struct pci_dev *bridge = bus->self;
drivers/platform/x86/asus-nb-wmi.c +9 -0
@@ -175,6 +175,15 @@ static const struct dmi_system_id asus_quirks[] = { }, { .callback = dmi_matched, + .ident = "ASUSTeK COMPUTER INC. X45U", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "X45U"), + }, + .driver_data = &quirk_asus_wapf4, + }, + { + .callback = dmi_matched, .ident = "ASUSTeK COMPUTER INC. X456UA", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
drivers/regulator/stw481x-vmmc.c +2 -1
@@ -47,7 +47,8 @@ static struct regulator_desc vmmc_regulator = { .volt_table = stw481x_vmmc_voltages, .enable_time = 200, /* FIXME: look this up */ .enable_reg = STW_CONF1, - .enable_mask = STW_CONF1_PDN_VMMC, + .enable_mask = STW_CONF1_PDN_VMMC | STW_CONF1_MMC_LS_STATUS, + .enable_val = STW_CONF1_PDN_VMMC, .vsel_reg = STW_CONF1, .vsel_mask = STW_CONF1_VMMC_MASK, };
drivers/s390/char/vmlogrdr.c +1 -1
@@ -870,7 +870,7 @@ static int __init vmlogrdr_init(void) goto cleanup;for (i=0 ; i <MAXMINOR ; ++i ) { - sys_ser[i].buffer = (char *)get_zeroed_page (GFP_KERNEL ); + sys_ser[i].buffer = (char *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sys_ser[i].buffer) { rc = -ENOMEM ;break ;
drivers/s390/scsi/zfcp_dbf.c +14 -3
@@ -289,11 +289,12 @@ void zfcp_dbf_rec_trig(char *tag, struct zfcp_adapter *adapter,/** -* zfcp_dbf_rec_run - trace event related to running recovery +* zfcp_dbf_rec_run_lvl - trace event related to running recovery +* @level: trace level to be used for event * @tag: identifier for event * @erp: erp_action running */ -void zfcp_dbf_rec_run (char *tag,struct zfcp_erp_action *erp) +void zfcp_dbf_rec_run_lvl (int level,char *tag,struct zfcp_erp_action *erp) {struct zfcp_dbf *dbf = erp->adapter->dbf;struct zfcp_dbf_rec *rec = &dbf->rec_buf;
@@ -319,11 +320,21 @@ void zfcp_dbf_rec_run(char *tag, struct zfcp_erp_action *erp)else rec->u.run.rec_count =atomic_read (&erp->adapter->erp_counter); -debug_event (dbf->rec,1 , rec,sizeof (*rec)); +debug_event (dbf->rec, level, rec,sizeof (*rec));spin_unlock_irqrestore (&dbf->rec_lock, flags); }/** +* zfcp_dbf_rec_run - trace event related to running recovery +* @tag: identifier for event +* @erp: erp_action running +*/ +void zfcp_dbf_rec_run (char *tag,struct zfcp_erp_action *erp) +{ +zfcp_dbf_rec_run_lvl (1 , tag, erp); +} + +/** * zfcp_dbf_rec_run_wka - trace wka port event with info like running recovery * @tag: identifier for event * @wka_port: well known address port
drivers/s390/scsi/zfcp_dbf.h +39 -2
63 lines not on this page · raw message
drivers/s390/scsi/zfcp_erp.c +59 -2
85 lines not on this page · raw message
drivers/s390/scsi/zfcp_ext.h +3 -1
@@ -3,7 +3,7 @@* * External function declarations. * -* Copyright IBM Corp. 2002, 2015 +* Copyright IBM Corp. 2002, 2016 */ #ifndef ZFCP_EXT_H
@@ -35,6 +35,8 @@ extern void zfcp_dbf_adapter_unregister(struct zfcp_adapter *);extern void zfcp_dbf_rec_trig (char *,struct zfcp_adapter *,struct zfcp_port *,struct scsi_device *,u8 ,u8 );extern void zfcp_dbf_rec_run (char *,struct zfcp_erp_action *); +extern void zfcp_dbf_rec_run_lvl (int level,char *tag, +struct zfcp_erp_action *erp);extern void zfcp_dbf_rec_run_wka (char *,struct zfcp_fc_wka_port *,u64 );extern void zfcp_dbf_hba_fsf_uss (char *,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_fsf_res (char *,int ,struct zfcp_fsf_req *);
drivers/s390/scsi/zfcp_fsf.h +2 -1
@@ -3,7 +3,7 @@* * Interface to the FSF support functions. * -* Copyright IBM Corp. 2002, 2015 +* Copyright IBM Corp. 2002, 2016 */ #ifndef FSF_H
@@ -78,6 +78,7 @@#define FSF_APP_TAG_CHECK_FAILURE 0x00000082#define FSF_REF_TAG_CHECK_FAILURE 0x00000083#define FSF_ADAPTER_STATUS_AVAILABLE 0x000000AD +#define FSF_FCP_RSP_AVAILABLE 0x000000AF#define FSF_UNKNOWN_COMMAND 0x000000E2#define FSF_UNKNOWN_OP_SUBTYPE 0x000000E3#define FSF_INVALID_COMMAND_OPTION 0x000000E5
drivers/s390/scsi/zfcp_reqlist.h +29 -1
@@ -4,7 +4,7 @@* Data structure and helper functions for tracking pending FSF * requests. * -* Copyright IBM Corp. 2009 +* Copyright IBM Corp. 2009, 2016 */ #ifndef ZFCP_REQLIST_H
@@ -180,4 +180,32 @@ static inline void zfcp_reqlist_move(struct zfcp_reqlist *rl, spin_unlock_irqrestore(&rl->lock, flags); } +/** +* zfcp_reqlist_apply_for_all() - apply a function to every request. +* @rl: the requestlist that contains the target requests. +* @f: the function to apply to each request; the first parameter of the +* function will be the target-request; the second parameter is the same +* pointer as given with the argument @data. +* @data: freely chosen argument; passed through to @f as second parameter. +* +* Uses :c:macro:`list_for_each_entry` to iterate over the lists in the hash- +* table (not a 'safe' variant, so don't modify the list). +* +* Holds @rl->lock over the entire request-iteration. +*/ +static inline void +zfcp_reqlist_apply_for_all (struct zfcp_reqlist *rl, +void (*f)(struct zfcp_fsf_req *,void *),void *data) +{ +struct zfcp_fsf_req *req; +unsigned long flags; +unsigned int i; + +spin_lock_irqsave (&rl->lock, flags); +for (i =0 ; i <ZFCP_REQ_LIST_BUCKETS ; i++) +list_for_each_entry (req, &rl->buckets[i], list) +f (req, data); +spin_unlock_irqrestore (&rl->lock, flags); +} +#endif /* ZFCP_REQLIST_H */
drivers/s390/scsi/zfcp_scsi.c +56 -5
86 lines not on this page · raw message
drivers/scsi/aacraid/linit.c +0 -2
@@ -160,7 +160,6 @@ static const struct pci_device_id aac_pci_tbl[] = { { 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Series 6 (Tupelo) */ { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ - { 0x9005, 0x028f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 65 }, /* Adaptec PMC Series 9 */ { 0,} };MODULE_DEVICE_TABLE (pci, aac_pci_tbl);
@@ -239,7 +238,6 @@ static struct aac_driver_ident aac_drivers[] = { { aac_src_init, "aacraid", "ADAPTEC ", "RAID ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 6 (Tupelo) */ { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 7 (Denali) */ { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 8 */ - { aac_srcv_init, "aacraid", "ADAPTEC ", "RAID ", 2, AAC_QUIRK_SRC } /* Adaptec PMC Series 9 */ };/**
drivers/scsi/megaraid/megaraid_sas_fusion.c +5 -4
@@ -2000,6 +2000,8 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, io_request->DevHandle = pd_sync->seq[pd_index].devHandle; pRAID_Context->regLockFlags |= (MR_RL_FLAGS_SEQ_NUM_ENABLE |MR_RL_FLAGS_GRANT_DESTINATION_CUDA ); + pRAID_Context->Type =MPI2_TYPE_CUDA ; + pRAID_Context->nseg =0x1 ; }else if (fusion->fast_path_io) { pRAID_Context->VirtualDiskTgtId =cpu_to_le16 (device_id); pRAID_Context->configSeqNum =0 ;
@@ -2035,12 +2037,10 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, pRAID_Context->timeoutValue =cpu_to_le16 ((os_timeout_value > timeout_limit) ? timeout_limit : os_timeout_value); -if (fusion->adapter_type ==INVADER_SERIES ) { - pRAID_Context->Type =MPI2_TYPE_CUDA ; - pRAID_Context->nseg =0x1 ; +if (fusion->adapter_type ==INVADER_SERIES ) io_request->IoFlags |=cpu_to_le16 (MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH ); - } + cmd->request_desc->SCSIIO.RequestFlags = (MPI2_REQ_DESCRIPT_FLAGS_FP_IO <<MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT );
@@ -2823,6 +2823,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,dev_err (&instance->pdev->dev,"pending commands remain after waiting, " "will reset adapter scsi%d.\n" , instance->host->host_no); + *convert =1 ; retval =1 ; } out:
drivers/scsi/scsi_sysfs.c +0 -4
@@ -1204,10 +1204,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)struct request_queue *rq = sdev->request_queue;struct scsi_target *starget = sdev->sdev_target; - error =scsi_device_set_state (sdev,SDEV_RUNNING ); -if (error) -return error; - error =scsi_target_add (starget);if (error)return error;
drivers/scsi/sg.c +3 -0
@@ -581,6 +581,9 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)sg_io_hdr_t *hp;unsigned char cmnd[SG_MAX_CDB_SIZE ]; +if (unlikely (segment_eq (get_fs (),KERNEL_DS ))) +return -EINVAL ; +if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))return -ENXIO ; SCSI_LOG_TIMEOUT(3, sg_printk(KERN_INFO, sdp,
drivers/ssb/pci.c +1 -0
@@ -909,6 +909,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,if (err) {ssb_warn ("WARNING: Using fallback SPROM failed (err %d)\n" , err); + goto out_free; }else {ssb_dbg ("Using SPROM revision %d provided by platform\n" , sprom->revision);
drivers/staging/comedi/drivers/ni_mio_common.c +3 -4
@@ -1832,7 +1832,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, unsigned int *data) {struct ni_private *devpriv = dev->private; -unsigned int mask = (s->maxdata +1 ) >>1 ; +unsigned int mask = s->maxdata;int i, n;unsigned int signbits;unsigned int d;
@@ -1875,7 +1875,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,return -ETIME ; } d += signbits; - data[n] = d; + data[n] = d &0xffff ; } }else if (devpriv->is_6143) {for (n =0 ; n < insn->n; n++) {
@@ -1924,9 +1924,8 @@ static int ni_ai_insn_read(struct comedi_device *dev, data[n] = dl; }else { d =ni_readw (dev,NI_E_AI_FIFO_DATA_REG ); -/* subtle: needs to be short addition */ d += signbits; - data[n] = d; + data[n] = d &0xffff ; } } }
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +4 -4
@@ -356,10 +356,10 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl)u32 recalc_interval_sec;int count; - recalc_interval_sec =ktime_get_seconds () - pl->pl_recalc_time; + recalc_interval_sec =ktime_get_real_seconds () - pl->pl_recalc_time;if (recalc_interval_sec >0 ) {spin_lock (&pl->pl_lock); - recalc_interval_sec =ktime_get_seconds () - pl->pl_recalc_time; + recalc_interval_sec =ktime_get_real_seconds () - pl->pl_recalc_time;if (recalc_interval_sec >0 ) {/*
@@ -382,7 +382,7 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl) count); } - recalc_interval_sec = pl->pl_recalc_time -ktime_get_seconds () + + recalc_interval_sec = pl->pl_recalc_time -ktime_get_real_seconds () + pl->pl_recalc_period;if (recalc_interval_sec <=0 ) {/* DEBUG: should be re-removed after LU-4536 is fixed */
@@ -657,7 +657,7 @@ int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,spin_lock_init (&pl->pl_lock);atomic_set (&pl->pl_granted,0 ); - pl->pl_recalc_time =ktime_get_seconds (); + pl->pl_recalc_time =ktime_get_real_seconds ();atomic_set (&pl->pl_lock_volume_factor,1 );atomic_set (&pl->pl_grant_rate,0 );
drivers/staging/lustre/lustre/osc/osc_page.c +3 -2
@@ -542,7 +542,6 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,struct cl_object *clobj =NULL ;struct cl_page **pvec;struct osc_page *opg; -struct osc_page *temp;int maxscan =0 ;long count =0 ;int index =0 ;
@@ -569,13 +568,15 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,spin_lock (&cli->cl_lru_list_lock); maxscan =min (target <<1 ,atomic_long_read (&cli->cl_lru_in_list)); -list_for_each_entry_safe (opg, temp, &cli->cl_lru_list, ops_lru) { +while (!list_empty (&cli->cl_lru_list)) {struct cl_page *page;bool will_free = false;if (--maxscan <0 )break ; + opg = list_entry(cli->cl_lru_list.next, struct osc_page, + ops_lru); page = opg->ops_cl.cpl_page;if (lru_page_busy (cli, page)) {list_move_tail (&opg->ops_lru, &cli->cl_lru_list);
drivers/target/iscsi/iscsi_target_configfs.c +3 -1
@@ -100,8 +100,10 @@ static ssize_t lio_target_np_driver_store(struct config_item *item, tpg_np_new =iscsit_tpg_add_network_portal (tpg, &np->np_sockaddr, tpg_np, type); -if (IS_ERR (tpg_np_new)) +if (IS_ERR (tpg_np_new)) { + rc =PTR_ERR (tpg_np_new); goto out; + } }else { tpg_np_new =iscsit_tpg_locate_child_np (tpg_np, type);if (tpg_np_new) {
drivers/target/target_core_user.c +0 -2
@@ -685,8 +685,6 @@ static int tcmu_check_expired_cmd(int id, void *p, void *data)target_complete_cmd (cmd->se_cmd,SAM_STAT_CHECK_CONDITION ); cmd->se_cmd =NULL ; -kmem_cache_free (tcmu_cmd_cache, cmd); -return 0 ; }
drivers/thermal/thermal_hwmon.c +1 -1
@@ -98,7 +98,7 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)int temperature;int ret; - ret = tz->ops->get_trip_temp (tz,0 , &temperature); + ret = tz->ops->get_crit_temp (tz, &temperature);if (ret)return ret;
drivers/tty/serial/sc16is7xx.c +1 -1
@@ -1264,7 +1264,7 @@ static int sc16is7xx_probe(struct device *dev,/* Setup interrupt */ ret =devm_request_irq (dev, irq, sc16is7xx_irq, -IRQF_ONESHOT | flags,dev_name (dev), s); + flags,dev_name (dev), s);if (!ret)return 0 ;
drivers/tty/vt/keyboard.c +1 -1
@@ -982,7 +982,7 @@ static void kbd_led_trigger_activate(struct led_classdev *cdev) KBD_LED_TRIGGER((_led_bit) + 8, _name)static struct kbd_led_trigger kbd_led_triggers[] = { -KBD_LED_TRIGGER (VC_SCROLLOCK ,"kbd-scrollock" ), +KBD_LED_TRIGGER (VC_SCROLLOCK ,"kbd-scrolllock" ),KBD_LED_TRIGGER (VC_NUMLOCK ,"kbd-numlock" ),KBD_LED_TRIGGER (VC_CAPSLOCK ,"kbd-capslock" ),KBD_LED_TRIGGER (VC_KANALOCK ,"kbd-kanalock" ),
fs/bad_inode.c +51 -4
71 lines not on this page · raw message
fs/block_dev.c +6 -1
@@ -1950,6 +1950,7 @@ void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg)spin_lock (&blockdev_superblock->s_inode_list_lock);list_for_each_entry (inode, &blockdev_superblock->s_inodes, i_sb_list) {struct address_space *mapping = inode->i_mapping; +struct block_device *bdev;spin_lock (&inode->i_lock); if (inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW) ||
@@ -1970,8 +1971,12 @@ void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg)*/ iput (old_inode); old_inode = inode; + bdev =I_BDEV (inode); -func (I_BDEV (inode), arg); +mutex_lock (&bdev->bd_mutex); +if (bdev->bd_openers) +func (bdev, arg); +mutex_unlock (&bdev->bd_mutex);spin_lock (&blockdev_superblock->s_inode_list_lock); }
fs/nfs/file.c +1 -1
@@ -374,7 +374,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,*/ if (!PageUptodate (page)) {unsigned pglen =nfs_page_length (page); -unsigned end = offset + len; +unsigned end = offset + copied;if (pglen ==0 ) { zero_user_segments(page, 0, offset,
fs/nfs/flexfilelayout/flexfilelayout.c +4 -0
@@ -28,6 +28,9 @@static struct group_info *ff_zero_group; +static void ff_layout_read_record_layoutstats_done (struct rpc_task *task, +struct nfs_pgio_header *hdr); +static struct pnfs_layout_hdr *ff_layout_alloc_layout_hdr (struct inode *inode,gfp_t gfp_flags) {
@@ -1293,6 +1296,7 @@ static int ff_layout_read_done_cb(struct rpc_task *task, hdr->pgio_mirror_idx + 1, &hdr->pgio_mirror_idx)) goto out_eagain; +ff_layout_read_record_layoutstats_done (task, hdr);pnfs_read_resend_pnfs (hdr);return task->tk_status;case -NFS4ERR_RESET_TO_MDS :
fs/nfs/pnfs.c +21 -10
@@ -299,6 +299,14 @@ pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo) } } +static void +pnfs_clear_layoutreturn_info (struct pnfs_layout_hdr *lo) +{ + lo->plh_return_iomode =0 ; + lo->plh_return_seq =0 ; +clear_bit (NFS_LAYOUT_RETURN_REQUESTED , &lo->plh_flags); +} +/* * Mark a pnfs_layout_hdr and all associated layout segments as invalid *
@@ -317,6 +325,7 @@ pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo, };set_bit (NFS_LAYOUT_INVALID_STID , &lo->plh_flags); +pnfs_clear_layoutreturn_info (lo);return pnfs_mark_matching_lsegs_invalid (lo, lseg_list, &range,0 ); }
@@ -411,7 +420,9 @@ pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo,list_del_init (&lseg->pls_list);/* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */ atomic_dec (&lo->plh_refcount); -if (list_empty (&lo->plh_segs)) { +if (list_empty (&lo->plh_segs) && + !test_bit (NFS_LAYOUT_RETURN_REQUESTED , &lo->plh_flags) && + !test_bit (NFS_LAYOUT_RETURN , &lo->plh_flags)) {if (atomic_read (&lo->plh_outstanding) ==0 )set_bit (NFS_LAYOUT_INVALID_STID , &lo->plh_flags);clear_bit (NFS_LAYOUT_BULK_RECALL , &lo->plh_flags);
@@ -816,14 +827,6 @@ pnfs_destroy_all_layouts(struct nfs_client *clp)pnfs_destroy_layouts_byclid (clp, false); } -static void -pnfs_clear_layoutreturn_info (struct pnfs_layout_hdr *lo) -{ - lo->plh_return_iomode =0 ; - lo->plh_return_seq =0 ; -clear_bit (NFS_LAYOUT_RETURN_REQUESTED , &lo->plh_flags); -} -/* update lo->plh_stateid with new if is more recent */ void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,
@@ -944,6 +947,7 @@ static void pnfs_clear_layoutcommit(struct inode *inode,void pnfs_clear_layoutreturn_waitbit (struct pnfs_layout_hdr *lo) {clear_bit_unlock (NFS_LAYOUT_RETURN , &lo->plh_flags); +clear_bit (NFS_LAYOUT_RETURN_LOCK , &lo->plh_flags);smp_mb__after_atomic ();wake_up_bit (&lo->plh_flags,NFS_LAYOUT_RETURN );rpc_wake_up (&NFS_SERVER (lo->plh_inode)->roc_rpcwaitq);
@@ -957,8 +961,9 @@ pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo,/* Serialise LAYOUTGET/LAYOUTRETURN */ if (atomic_read (&lo->plh_outstanding) !=0 )return false; -if (test_and_set_bit (NFS_LAYOUT_RETURN , &lo->plh_flags)) +if (test_and_set_bit (NFS_LAYOUT_RETURN_LOCK , &lo->plh_flags))return false; +set_bit (NFS_LAYOUT_RETURN , &lo->plh_flags);pnfs_get_layout_hdr (lo);if (test_bit (NFS_LAYOUT_RETURN_REQUESTED , &lo->plh_flags)) {if (stateid !=NULL ) {
@@ -1950,6 +1955,8 @@ void pnfs_error_mark_layout_for_return(struct inode *inode,spin_lock (&inode->i_lock);pnfs_set_plh_return_info (lo, range.iomode,0 ); +/* Block LAYOUTGET */ +set_bit (NFS_LAYOUT_RETURN , &lo->plh_flags);/* * mark all matching lsegs so that we are sure to have no live * segments at hand when sending layoutreturn. See pnfs_put_lseg()
@@ -2286,6 +2293,10 @@ void pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr)struct nfs_pageio_descriptor pgio;if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) { +/* Prevent deadlocks with layoutreturn! */ +pnfs_put_lseg (hdr->lseg); + hdr->lseg =NULL ; +nfs_pageio_init_read (&pgio, hdr->inode, false, hdr->completion_ops); hdr->task.tk_status =nfs_pageio_resend (&pgio, hdr);
fs/nfs/pnfs.h +1 -0
@@ -96,6 +96,7 @@ enum {NFS_LAYOUT_RW_FAILED ,/* get rw layout failed stop trying */ NFS_LAYOUT_BULK_RECALL ,/* bulk recall affecting layout */ NFS_LAYOUT_RETURN ,/* layoutreturn in progress */ +NFS_LAYOUT_RETURN_LOCK ,/* Serialise layoutreturn */ NFS_LAYOUT_RETURN_REQUESTED ,/* Return this layout ASAP */ NFS_LAYOUT_INVALID_STID ,/* layout stateid id is invalid */ NFS_LAYOUT_FIRST_LAYOUTGET, /* Serialize first layoutget */
fs/notify/inode_mark.c +9 -36
70 lines not on this page · raw message
include/net/cfg80211.h +11 -0
@@ -4584,6 +4584,17 @@ void cfg80211_rx_assoc_resp(struct net_device *dev,void cfg80211_assoc_timeout (struct net_device *dev,struct cfg80211_bss *bss);/** +* cfg80211_abandon_assoc - notify cfg80211 of abandoned association attempt +* @dev: network device +* @bss: The BSS entry with which association was abandoned. +* +* Call this whenever - for reasons reported through other API, like deauth RX, +* an association attempt was abandoned. +* This function may sleep. The caller must hold the corresponding wdev's mutex. +*/ +void cfg80211_abandon_assoc (struct net_device *dev,struct cfg80211_bss *bss); + +/** * cfg80211_tx_mlme_mgmt - notification of transmitted deauth/disassoc frame * @dev: network device * @buf: 802.11 frame (header + body)
include/rdma/ib_addr.h +4 -2
@@ -205,10 +205,12 @@ static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr, dev =dev_get_by_index (&init_net, dev_addr->bound_dev_if);if (dev) { - ip4 = (struct in_device *)dev->ip_ptr; -if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) + ip4 =in_dev_get (dev); +if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) {ipv6_addr_set_v4mapped (ip4->ifa_list->ifa_address, (struct in6_addr *)gid); +in_dev_put (ip4); + }dev_put (dev); } }
kernel/time/timekeeping.c +2 -2
@@ -299,10 +299,10 @@ u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset;static inline u32 arch_gettimeoffset (void ) {return 0 ; }#endif -static inline s64 timekeeping_delta_to_ns (struct tk_read_base *tkr, +static inline u64 timekeeping_delta_to_ns (struct tk_read_base *tkr,cycle_t delta) { -s64 nsec; +u64 nsec; nsec = delta * tkr->mult + tkr->xtime_nsec; nsec >>= tkr->shift;
kernel/trace/trace_functions_graph.c +14 -3
@@ -842,6 +842,10 @@ print_graph_entry_leaf(struct trace_iterator *iter, cpu_data =per_cpu_ptr (data->cpu_data, cpu); +/* If a graph tracer ignored set_graph_notrace */ +if (call->depth <-1 ) + call->depth +=FTRACE_NOTRACE_DEPTH ; +/* * Comments display at + 1 to depth. Since * this is a leaf function, keep the comments
@@ -850,7 +854,8 @@ print_graph_entry_leaf(struct trace_iterator *iter, cpu_data->depth = call->depth -1 ;/* No need to keep this function around for this depth */ -if (call->depth <FTRACE_RETFUNC_DEPTH ) +if (call->depth <FTRACE_RETFUNC_DEPTH && + !WARN_ON_ONCE (call->depth <0 )) cpu_data->enter_funcs[call->depth] =0 ; }
@@ -880,11 +885,16 @@ print_graph_entry_nested(struct trace_iterator *iter,struct fgraph_cpu_data *cpu_data;int cpu = iter->cpu; +/* If a graph tracer ignored set_graph_notrace */ +if (call->depth <-1 ) + call->depth +=FTRACE_NOTRACE_DEPTH ; + cpu_data =per_cpu_ptr (data->cpu_data, cpu); cpu_data->depth = call->depth;/* Save this function pointer to see if the exit matches */ -if (call->depth <FTRACE_RETFUNC_DEPTH ) +if (call->depth <FTRACE_RETFUNC_DEPTH && + !WARN_ON_ONCE (call->depth <0 )) cpu_data->enter_funcs[call->depth] = call->func; }
@@ -1114,7 +1124,8 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,*/ cpu_data->depth = trace->depth -1 ; -if (trace->depth <FTRACE_RETFUNC_DEPTH ) { +if (trace->depth <FTRACE_RETFUNC_DEPTH && + !WARN_ON_ONCE (trace->depth <0 )) {if (cpu_data->enter_funcs[trace->depth] != trace->func) func_match =0 ; cpu_data->enter_funcs[trace->depth] =0 ;
net/ceph/messenger.c +13 -0
@@ -2027,6 +2027,19 @@ static int process_connect(struct ceph_connection *con)dout ("process_connect on %p tag %d\n" , con, (int )con->in_tag); +if (con->auth_reply_buf) { +/* +* Any connection that defines ->get_authorizer() +* should also define ->verify_authorizer_reply(). +* See get_connect_authorizer(). +*/ + ret = con->ops->verify_authorizer_reply (con,0 ); +if (ret <0 ) { + con->error_msg ="bad authorize reply" ; +return ret; + } + } +switch (con->in_reply.tag) {case CEPH_MSGR_TAG_FEATURES : pr_err("%s%lld %s feature set mismatch,"
net/mac80211/mlme.c +12 -9
@@ -2510,7 +2510,7 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata, }static void ieee80211_destroy_assoc_data (struct ieee80211_sub_if_data *sdata, -bool assoc) +bool assoc,bool abandon) {struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data;
@@ -2533,6 +2533,9 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata,mutex_lock (&sdata->local->mtx);ieee80211_vif_release_channel (sdata);mutex_unlock (&sdata->local->mtx); + +if (abandon) +cfg80211_abandon_assoc (sdata->dev, assoc_data->bss); }kfree (assoc_data);
@@ -2762,7 +2765,7 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata, bssid, reason_code, ieee80211_get_reason_code_string(reason_code));
Lines of this file are not shown. View the raw message.
net/vmw_vsock/virtio_transport_common.c +7 -7
Lines of this file are not shown. View the raw message.
scripts/gcc-plugins/latent_entropy_plugin.c +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.