Linux 4.8.5
Greg KH
maintainerI'm announcing the release of the 4.8.5 kernel.
All users of the 4.8 kernel series must upgrade.
The updated 4.8.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.8.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-class-cxl | 7 Documentation/kernel-parameters.txt | 9 - Makefile | 2 arch/arc/kernel/signal.c | 8 arch/arm64/include/asm/kvm_emulate.h | 11 - arch/arm64/include/asm/module.h | 5 arch/arm64/include/asm/percpu.h | 120 ++++++-------- arch/arm64/include/asm/uaccess.h | 8 arch/arm64/kernel/armv8_deprecated.c | 36 ++-- arch/arm64/kernel/head.S | 3 arch/arm64/kernel/traps.c | 27 +-- arch/arm64/kvm/hyp/entry.S | 2 arch/metag/include/asm/atomic.h | 3 arch/mips/include/asm/ptrace.h | 2 arch/mips/vdso/Makefile | 2 arch/parisc/include/asm/pgtable.h | 6 arch/parisc/kernel/setup.c | 8 arch/parisc/kernel/time.c | 6 arch/parisc/kernel/vmlinux.lds.S | 7 arch/powerpc/Kconfig | 2 arch/powerpc/kernel/eeh_driver.c | 8 arch/powerpc/kernel/vdso64/datapage.S | 2 arch/powerpc/kernel/vdso64/gettimeofday.S | 2 arch/powerpc/lib/copyuser_64.S | 2 arch/powerpc/mm/copro_fault.c | 2 arch/powerpc/mm/hash_utils_64.c | 2 arch/powerpc/platforms/powernv/eeh-powernv.c | 9 - arch/powerpc/platforms/powernv/pci.c | 4 arch/powerpc/platforms/pseries/lpar.c | 4 arch/powerpc/sysdev/cpm1.c | 2 arch/powerpc/sysdev/cpm2.c | 4 arch/powerpc/sysdev/cpm_common.c | 15 + arch/powerpc/xmon/spr_access.S | 4 arch/s390/kvm/intercept.c | 9 - arch/x86/kernel/e820.c | 2 arch/x86/kernel/smpboot.c | 16 + arch/x86/kvm/ioapic.c | 2 arch/x86/platform/uv/bios_uv.c | 10 + block/blk-cgroup.c | 4 drivers/base/platform.c | 4 drivers/clk/imx/clk-imx6q.c | 46 ++++- drivers/cpufreq/cpufreq-dt-platdev.c | 2 drivers/cpufreq/cpufreq_conservative.c | 19 +- drivers/cpufreq/intel_pstate.c | 10 - drivers/gpio/gpio-mpc8xxx.c | 2 drivers/infiniband/core/verbs.c | 2 drivers/infiniband/ulp/srp/ib_srp.c | 8 drivers/input/mouse/elantech.c | 25 ++- drivers/input/serio/i8042-io.h | 2 drivers/input/serio/i8042-ip22io.h | 2 drivers/input/serio/i8042-ppcio.h | 2 drivers/input/serio/i8042-sparcio.h | 2 drivers/input/serio/i8042-unicore32io.h | 2 drivers/input/serio/i8042-x86ia64io.h | 96 +++++++++++ drivers/input/serio/i8042.c | 55 +++++- drivers/irqchip/irq-eznps.c | 4 drivers/irqchip/irq-gic-v3.c | 2 drivers/md/dm-crypt.c | 24 +- drivers/md/dm-mpath.c | 6 drivers/md/dm-rq.c | 19 +- drivers/md/dm.c | 10 - drivers/media/dvb-frontends/mb86a20s.c | 104 ++++++------ drivers/media/usb/cx231xx/cx231xx-avcore.c | 5 drivers/media/usb/cx231xx/cx231xx-cards.c | 2 drivers/media/usb/cx231xx/cx231xx-core.c | 27 ++- drivers/memstick/host/rtsx_usb_ms.c | 6 drivers/misc/cxl/api.c | 9 + drivers/misc/cxl/context.c | 3 drivers/misc/cxl/cxl.h | 24 ++ drivers/misc/cxl/file.c | 11 + drivers/misc/cxl/guest.c | 3 drivers/misc/cxl/main.c | 42 +++++ drivers/misc/cxl/pci.c | 2 drivers/misc/cxl/sysfs.c | 27 ++- drivers/misc/mei/amthif.c | 2 drivers/misc/mei/bus.c | 2 drivers/misc/mei/hw-me-regs.h | 3 drivers/misc/mei/main.c | 2 drivers/misc/mei/pci-me.c | 3 drivers/mmc/card/block.c | 5 drivers/mmc/card/queue.h | 2 drivers/mmc/core/mmc.c | 10 + drivers/mmc/host/rtsx_usb_sdmmc.c | 7 drivers/mmc/host/sdhci.c | 2 drivers/mtd/ubi/wl.c | 21 ++ drivers/net/wireless/ath/ath10k/ce.c | 7 drivers/net/wireless/realtek/rtlwifi/regd.c | 4 drivers/pci/host/pci-tegra.c | 2 drivers/pci/quirks.c | 1 drivers/pinctrl/intel/pinctrl-baytrail.c | 3 drivers/pinctrl/intel/pinctrl-intel.c | 25 ++- drivers/regulator/tps65910-regulator.c | 6 drivers/s390/scsi/zfcp_dbf.c | 162 +++++++++++++++++--- drivers/s390/scsi/zfcp_dbf.h | 14 + drivers/s390/scsi/zfcp_erp.c | 12 + drivers/s390/scsi/zfcp_ext.h | 8 drivers/s390/scsi/zfcp_fsf.c | 22 ++ drivers/s390/scsi/zfcp_fsf.h | 4 drivers/s390/scsi/zfcp_scsi.c | 8 drivers/scsi/scsi_scan.c | 2 drivers/soc/fsl/qe/gpio.c | 3 drivers/soc/fsl/qe/qe_common.c | 8 drivers/target/target_core_transport.c | 27 +-- drivers/target/target_core_xcopy.c | 34 +++- drivers/target/tcm_fc/tfc_cmd.c | 2 drivers/video/fbdev/efifb.c | 6 drivers/watchdog/mt7621_wdt.c | 1 drivers/watchdog/rt2880_wdt.c | 1 fs/ceph/file.c | 3 fs/cifs/cifs_debug.c | 1 fs/cifs/cifsfs.c | 3 fs/cifs/cifsglob.h | 30 +-- fs/cifs/cifssmb.c | 4 fs/cifs/connect.c | 16 + fs/cifs/file.c | 66 ++++---- fs/cifs/misc.c | 15 - fs/cifs/readdir.c | 6 fs/cifs/smb2glob.h | 10 + fs/cifs/smb2inode.c | 6 fs/cifs/smb2misc.c | 16 - fs/cifs/smb2ops.c | 12 - fs/cifs/smb2pdu.c | 25 ++- fs/cifs/smb2pdu.h | 2 fs/crypto/crypto.c | 15 - fs/crypto/policy.c | 4 fs/ext4/sysfs.c | 4 fs/isofs/inode.c | 8 fs/jbd2/transaction.c | 3 fs/nfs/blocklayout/blocklayout.c | 3 fs/nfs/delegation.c | 16 + fs/nfs/dir.c | 16 + fs/nfs/nfs42proc.c | 1 fs/nfs/nfs4state.c | 3 fs/nfsd/nfssvc.c | 18 +- fs/overlayfs/copy_up.c | 12 + fs/overlayfs/dir.c | 5 fs/pstore/ram.c | 17 +- fs/pstore/ram_core.c | 49 ------ fs/super.c | 6 fs/ubifs/xattr.c | 2 include/dt-bindings/clock/imx6qdl-clock.h | 4 include/linux/cpufreq.h | 104 ++++++------ include/linux/devfreq-event.h | 5 include/linux/irqchip/arm-gic-v3.h | 2 include/target/target_core_base.h | 1 kernel/sched/fair.c | 38 +++- net/sunrpc/xprtsock.c | 11 + sound/pci/hda/dell_wmi_helper.c | 2 sound/pci/hda/thinkpad_helper.c | 2 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 38 ++++ tools/perf/util/intel-pt.c | 15 + tools/spi/spidev_test.c | 2 152 files changed, 1416 insertions(+), 612 deletions(-)
Aaro Koskinen (1):
cpufreq: skip invalid entries when searching the frequency
Adrian Hunter (3):
perf intel-pt: Fix snapshot overlap detection decoder errors perf intel-pt: Fix estimated timestamps for cycle-accurate mode perf intel-pt: Fix MTC timestamp calculation for large MTC periods
Al Viro (1):
arc: don't leak bits of kernel stack into coredump
Alan Stern (1):
memstick: rtsx_usb_ms: Runtime resume the device when polling for cards
Alex Thorlton (1):
x86/platform/UV: Fix support for EFI_OLD_MEMMAP after BIOS callback updates
Alexander Usyskin (1):
mei: me: add kaby point device ids
Andre Przywara (1):
arm64: Cortex-A53 errata workaround: check for kernel addresses
Andrew Bresticker (1):
pstore/ram: Use memcpy_fromio() to save old buffer
Aneesh Kumar K.V (1):
powerpc/mm: Update FORCE_MAX_ZONEORDER range to allow hugetlb w/4K
Anton Blanchard (1):
powerpc/vdso64: Use double word compare on pointers
Ard Biesheuvel (1):
arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y
Aurelien Aptel (1):
fs/cifs: keep guid when assigning fid to fileinfo
Bart Van Assche (3):
dm: mark request_queue dead before destroying the DM device
IB/srp: Fix infinite loop when FMR sg[0].offset != 0
blkcg: Unlock blkcg_pol_mutex only once when cpd == NULLBenjamin Coddington (1):
pnfs/blocklayout: fix last_write_offset incorrectly set to page boundary
Bjorn Helgaas (1):
PCI: tegra: Fix argument order in tegra_pcie_phy_disable()
Christian Borntraeger (1):
KVM: s390: reject invalid modes for runtime instrumentation
Christophe Leroy (2):
soc/fsl/qe: fix gpio save_regs functions soc/fsl/qe: fix Oops on CPM1 (and likely CPM2)
Dan Carpenter (2):
scsi: zfcp: spin_lock_irqsave() is not nestable irqchip/gicv3: Handle loop timeout proper
Dan Williams (1):
x86/e820: Don't merge consecutive E820_PRAM ranges
Daniel Glöckner (1):
mmc: block: don't use CMD23 with very old MMC cards
Dave Gerlach (1):
cpufreq: ti: Use generic platdev driver
David Vrabel (1):
sunrpc: fix write space race causing stalls
Dinesh Israni (1):
target: Don't override EXTENDED_COPY xcopy_pt_cmd SCSI status code
Dmitry Torokhov (1):
Input: elantech - add Fujitsu Lifebook E556 to force crc_enabled
Eric Biggers (3):
fscrypto: make XTS tweak initialization endian-independent
fscrypto: lock inode while setting encryption policy
ext4: do not advertise encryption support when disabled
Frederic Barrat (1):
powerpc/mm: Prevent unlikely crash in copro_calculate_slb()
Furquan Shaikh (1):
pstore/ram: Use memcpy_toio instead of memcpy
Gavin Shan (3):
powerpc/powernv: Pass CPU-endian PE number to opal_pci_eeh_freeze_clear() powerpc/powernv: Use CPU-endian hub diag-data type in pnv_eeh_get_and_dump_hub_diag() powerpc/powernv: Use CPU-endian PEST in pnv_pci_dump_p7ioc_diag_data()
Geert Uytterhoeven (1):
spi: spidev_test: Fix buffer overflow in unescape()
Greg Kroah-Hartman (1):
Linux 4.8.5
Guenter Roeck (2):
watchdog: mt7621_wdt: Remove assignment of dev pointer
metag: Only define atomic_dec_if_positive conditionally
Haibo Chen (1):
mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
Hannes Reinecke (1):
target/tcm_fc: use CPU affinity for responses
Helge Deller (4):
parisc: Increase KERNEL_INITIAL_SIZE for 32-bit SMP kernels
parisc: Fix self-detected CPU stall warnings on Mako machines
parisc: Fix kernel memory layout regarding position of __gp
parisc: Increase initial kernel mapping size
Hui Wang (1):
ALSA: hda - Fix a failure of micmute led when having multi adcs
James Hogan (1):
MIPS: Fix -mabi=64 build of vdso.lds
Jan Kara (1):
isofs: Do not return EACCES for unknown filesystems
Jan Remmet (1):
regulator: tps65910: Work around silicon erratum SWCZ010
Jeff Layton (1):
NFSv4.2: Fix a reference leak in nfs42_proc_layoutstats_generic
Jiri Slaby (2):
kvm: x86: memset whole irq_eoi
mmc: core: Annotate cmd_hdr as __le32
Larry Finger (1):
rtlwifi: Fix missing country code for Great Britain
Laurent Dufour (1):
powerpc/pseries: Fix stack corruption in htpe code
Lin Huang (1):
PM / devfreq: event: remove duplicate devfreq_event_get_drvdata()
Liu Gang (1):
gpio: mpc8xxx: Correct irq handler function
Lucas Stach (2):
clk: imx6: initialize GPU clocks
clk: imx6: fix i.MX6DL clock tree to reflect reality
Maik Broemme (1):
PCI: Mark Atheros AR9580 to avoid bus reset
Marc Zyngier (1):
arm64: kernel: Init MDCR_EL2 even in the absence of a PMU
Marcin Nowakowski (1):
MIPS: ptrace: Fix regs_return_value for kernel context
Marcos Paulo de Souza (1):
Input: i8042 - skip selftest on ASUS laptops
Matt Redfearn (1):
watchdog: rt2880_wdt: Remove assignment of dev pointer
Matti Kurkela (1):
Input: elantech - force needed quirks on Fujitsu H760
Mauro Carvalho Chehab (5):
mb86a20s: fix the locking logic
mb86a20s: fix demod settings
cx231xx: don't return error on success
cx231xx: fix GPIOs for Pixelview SBTVD hybrid
cx231xx: can't proceed if I2C bus register fails
Max Staudt (1):
fbdev/efifb: Fix 16 color palette entry calculation
Michael Ellerman (2):
powerpc/xmon: Don't use ld on 32-bit powerpc/mm/hash64: Fix might_have_hea() check
Mika Westerberg (1):
pinctrl: intel: Only restore pins that are used by the driver
Mike Snitzer (2):
dm rq: take request_queue lock while clearing QUEUE_FLAG_STOPPED dm mpath: check if path's request_queue is dying in activate_path()
Miklos Szeredi (1):
ovl: copy_up_xattr(): use strnlen
Minfei Huang (1):
dm: return correct error code in dm_resume()'s retry loop
Ming Lei (1):
scsi: Fix use-after-free
Nicholas Bellinger (3):
target: Re-add missing SCF_ACK_KREF assignment in v4.1.y
target: Make EXTENDED_COPY 0xe4 failure return COPY TARGET DEVICE NOT REACHABLE Revert "target: Fix residual overflow handling in target_complete_cmd_with_length"
Nikolay Borisov (1):
ceph: fix error handling in ceph_read_iter
Noam Camus (1):
irqchip/eznps: Acknowledge NPS_IPI before calling the handler
Oleg Nesterov (1):
fs/super.c: fix race between freeze_super() and thaw_super()
Paul Mackerras (1):
powerpc/64: Fix incorrect return value from __copy_tofrom_user
Peter Zijlstra (1):
sched/fair: Fix min_vruntime tracking
Rabin Vincent (1):
dm crypt: fix crash on exit
Rafael J. Wysocki (1):
cpufreq: conservative: Fix next frequency selection
Rajkumar Manoharan (1):
ath10k: fix copy engine 5 destination ring stuck
Richard Weinberger (3):
ubi: Deal with interrupted erasures in WL
ovl: Fix info leak in ovl_lookup_temp()
ubifs: Fix xattr_names length in exit paths
Ross Lagerwall (1):
cifs: Limit the overall credit acquired
Russell Currey (1):
powerpc/eeh: Null check uses of eeh_pe_bus_get
Sachin Prabhu (1):
Fix regression which breaks DFS mounting
Sebastian Andrzej Siewior (2):
pstore/ramoops: fixup driver removal
pstore/core: drop cmpxchg based updates
Sergei Shtylyov (1):
platform: don't return 0 from platform_get_irq[_byname]() on error
Sergey Senozhatsky (1):
cpufreq: fix overflow in cpufreq_table_find_index_dl()
Shawn Lin (1):
mmc: core: switch to 1V8 or 1V2 for hs400es mode
Srinivas Pandruvada (1):
cpufreq: intel_pstate: Fix unsafe HWP MSR access
Steffen Maier (10):
zfcp: fix fc_host port_type with NPIV
zfcp: fix ELS/GS request&response length for hardware data router
zfcp: close window with unblocked rport during rport gone
zfcp: retain trace level for SCSI and HBA FSF response records
zfcp: restore: Dont use 0 to indicate invalid LUN in rec trace
zfcp: trace on request for open and close of WKA port
zfcp: restore tracing of handle for port and LUN with HBA records
zfcp: fix D_ID field with actual value on tracing SAN responses
zfcp: fix payload trace length for SAN request&response
zfcp: trace full payload of all SAN records (req,resp,iels)
Steve French (6):
Clarify locking of cifs file and tcon structures and make more granular Display number of credits available
Set previous session id correctly on SMB3 reconnect
SMB3: GUIDs should be constructed as random but valid uuids Do not send SMB3 SET_INFO request if nothing is changing Cleanup missing frees on some ioctls
Steve Wise (1):
IB/core: correctly handle rdma_rw_init_mrs() failure
Taesoo Kim (1):
jbd2: fix incorrect unlock on j_list_lock
Tomas Winkler (1):
mei: fix return value on disconnection
Trond Myklebust (4):
NFS: Fix inode corruption in nfs_prime_dcache()
NFSv4: Don't report revoked delegations as valid in nfs_have_delegation()
NFSv4: nfs4_copy_delegation_stateid() must fail if the delegation is invalid
NFSv4: Open state recovery must account for file permission changes
Ulf Hansson (3):
memstick: rtsx_usb_ms: Manage runtime PM when accessing the device
mmc: rtsx_usb_sdmmc: Avoid keeping the device runtime resumed when unused
mmc: rtsx_usb_sdmmc: Handle runtime PM while changing the led
Vaibhav Jain (1):
cxl: Prevent adapter reset if an active context exists
Vasily Averin (1):
NFSD: fix corruption in notifier registration
Ville Syrjälä (2):
x86/boot/smp: Don't try to poke disabled/non-existent APIC
pinctrl: baytrail: Fix lockdep
Vincent Guittot (1):
sched/fair: Fix incorrect task group ->load_avg
Vladimir Murzin (2):
arm64: KVM: VHE: reset PSTATE.PAN on entry to EL2 irqchip/gic-v3-its: Fix entry size mask for GITS_BASER
Will Deacon (3):
arm64: swp emulation: bound LL/SC retries before rescheduling
arm64: percpu: rewrite ll/sc loops in assembly
arm64: KVM: Take S1 walks into account when determining S2 write faults
Greg KH
maintainerDocumentation/ABI/testing/sysfs-class-cxl +5 -2
@@ -220,8 +220,11 @@ What: /sys/class/cxl/<card>/reset Date: October 2014 Contact: [email protected] Description: write only - Writing 1 will issue a PERST to card which may cause the card - to reload the FPGA depending on load_image_on_perst. + Writing 1 will issue a PERST to card provided there are no + contexts active on any one of the card AFUs. This may cause + the card to reload the FPGA depending on load_image_on_perst. + Writing -1 will do a force PERST irrespective of any active + contexts on the card AFUs. Users: https://github.com/ibm-capi/libcxl What: /sys/class/cxl/<card>/perst_reloads_same_image (not in a guest)
Documentation/kernel-parameters.txt +8 -1
@@ -1457,7 +1457,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX controllers i8042.notimeout [HW] Ignore timeout condition signalled by controller - i8042.reset [HW] Reset the controller during init and cleanup + i8042.reset [HW] Reset the controller during init, cleanup and + suspend-to-ram transitions, only during s2r + transitions, or never reset + Format: { 1 | Y | y | 0 | N | n } + 1, Y, y: always reset controller + 0, N, n: don't ever reset controller + Default: only on s2r transitions on x86; most other + architectures force reset to be always executed i8042.unlock [HW] Unlock (ignore) the keylock i8042.kbdreset [HW] Reset device connected to KBD port
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 8 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Psychotic Stoned Sheep
arch/arc/kernel/signal.c +4 -4
@@ -107,13 +107,13 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)struct user_regs_struct uregs; err =__copy_from_user (&set, &sf->uc.uc_sigmask,sizeof (set)); -if (!err) -set_current_blocked (&set); - err |=__copy_from_user (&uregs.scratch, &(sf->uc.uc_mcontext.regs.scratch),sizeof (sf->uc.uc_mcontext.regs.scratch)); +if (err) +return err; +set_current_blocked (&set); regs->bta = uregs.scratch.bta; regs->lp_start = uregs.scratch.lp_start; regs->lp_end = uregs.scratch.lp_end;
@@ -138,7 +138,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) regs->r0 = uregs.scratch.r0; regs->sp = uregs.scratch.sp; -return err; +return 0 ; }static inline int is_do_ss_needed (unsigned int magic)
arch/arm64/include/asm/kvm_emulate.h +6 -5
@@ -167,11 +167,6 @@ static inline bool kvm_vcpu_dabt_isvalid(const struct kvm_vcpu *vcpu)return !!(kvm_vcpu_get_hsr (vcpu) & ESR_ELx_ISV); } -static inline bool kvm_vcpu_dabt_iswrite (const struct kvm_vcpu *vcpu) -{ -return !!(kvm_vcpu_get_hsr (vcpu) & ESR_ELx_WNR); -} -static inline bool kvm_vcpu_dabt_issext (const struct kvm_vcpu *vcpu) {return !!(kvm_vcpu_get_hsr (vcpu) & ESR_ELx_SSE);
@@ -192,6 +187,12 @@ static inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu)return !!(kvm_vcpu_get_hsr (vcpu) & ESR_ELx_S1PTW); } +static inline bool kvm_vcpu_dabt_iswrite (const struct kvm_vcpu *vcpu) +{ +return !!(kvm_vcpu_get_hsr (vcpu) & ESR_ELx_WNR) || +kvm_vcpu_dabt_iss1tw (vcpu);/* AF/DBM update */ +} +static inline bool kvm_vcpu_dabt_is_cm (const struct kvm_vcpu *vcpu) {return !!(kvm_vcpu_get_hsr (vcpu) & ESR_ELx_CM);
arch/arm64/include/asm/module.h +5 -0
@@ -17,6 +17,7 @@#define __ASM_MODULE_H#include <asm-generic/module.h> +#include <asm/memory.h> #define MODULE_ARCH_VERMAGIC "aarch64"
@@ -32,6 +33,10 @@ u64 module_emit_plt_entry(struct module *mod, const Elf64_Rela *rela, Elf64_Sym *sym);#ifdef CONFIG_RANDOMIZE_BASE +#ifdef CONFIG_MODVERSIONS +#define ARCH_RELOCATES_KCRCTAB +#define reloc_start (kimage_vaddr - KIMAGE_VADDR) +#endif extern u64 module_alloc_base;#else #define module_alloc_base ((u64)_etext - MODULES_VSIZE)
arch/arm64/include/asm/percpu.h +56 -64
148 lines not on this page · raw message
arch/arm64/include/asm/uaccess.h +8 -0
@@ -21,6 +21,7 @@/* * User space memory access functions */ +#include <linux/bitops.h> #include <linux/kasan-checks.h> #include <linux/string.h> #include <linux/thread_info.h>
@@ -102,6 +103,13 @@ static inline void set_fs(mm_segment_t fs) flag; \ }) +/* +* When dealing with data aborts or instruction traps we may end up with +* a tagged userland pointer. Clear the tag to get a sane pointer to pass +* on to access_ok(), for instance. +*/ +#define untagged_addr (addr) sign_extend64(addr, 55) +#define access_ok (type, addr, size) __range_ok(addr, size)#define user_addr_max get_fs
arch/arm64/kernel/armv8_deprecated.c +22 -14
@@ -280,35 +280,43 @@ static void __init register_insn_emulation_sysctl(struct ctl_table *table)/* * Error-checking SWP macros implemented using ldxr{b}/stxr{b} */ -#define __user_swpX_asm (data, addr, res, temp,B ) \ + +/* Arbitrary constant to ensure forward-progress of the LL/SC loop */ +#define __SWP_LL_SC_LOOPS 4 + +#define __user_swpX_asm (data, addr, res, temp, temp2,B ) \ __asm__ __volatile__( \ + " mov %w3, %w7\n" \ ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_HAS_PAN, \ CONFIG_ARM64_PAN) \ - "0: ldxr"B" %w2, [%3]\n" \ - "1: stxr"B" %w0, %w1, [%3]\n" \ + "0: ldxr"B" %w2, [%4]\n" \ + "1: stxr"B" %w0, %w1, [%4]\n" \ " cbz %w0, 2f\n" \ - " mov %w0, %w4\n" \ + " sub %w3, %w3, #1\n" \ + " cbnz %w3, 0b\n" \ + " mov %w0, %w5\n" \ " b 3f\n" \ "2:\n" \ " mov %w1, %w2\n" \ "3:\n" \ " .pushsection .fixup,\"ax\"\n" \ " .align 2\n" \ - "4: mov %w0, %w5\n" \ + "4: mov %w0, %w6\n" \ " b 3b\n" \ " .popsection" \ _ASM_EXTABLE(0b, 4b) \ _ASM_EXTABLE(1b, 4b) \ ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN, \ CONFIG_ARM64_PAN) \ - : "=&r" (res), "+r" (data), "=&r" (temp) \ - : "r" (addr), "i" (-EAGAIN), "i" (-EFAULT) \ + : "=&r" (res), "+r" (data), "=&r" (temp), "=&r" (temp2) \ + : "r" (addr), "i" (-EAGAIN), "i" (-EFAULT), \ + "i" (__SWP_LL_SC_LOOPS) \ : "memory") -#define __user_swp_asm (data, addr, res, temp) \ - __user_swpX_asm(data, addr, res, temp, "") -#define __user_swpb_asm (data, addr, res, temp) \ - __user_swpX_asm(data, addr, res, temp, "b") +#define __user_swp_asm (data, addr, res, temp, temp2) \ + __user_swpX_asm(data, addr, res, temp, temp2, "") +#define __user_swpb_asm (data, addr, res, temp, temp2) \ + __user_swpX_asm(data, addr, res, temp, temp2, "b")/* * Bit 22 of the instruction encoding distinguishes between
@@ -328,12 +336,12 @@ static int emulate_swpX(unsigned int address, unsigned int *data, }while (1 ) { -unsigned long temp; +unsigned long temp, temp2;if (type ==TYPE_SWPB ) -__user_swpb_asm (*data, address, res, temp); +__user_swpb_asm (*data, address, res, temp, temp2);else -__user_swp_asm (*data, address, res, temp); +__user_swp_asm (*data, address, res, temp, temp2);if (likely (res != -EAGAIN ) ||signal_pending (current))break ;
arch/arm64/kernel/head.S +2 -1
@@ -578,8 +578,9 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems b.lt 4f // Skip if no PMU present mrs x0, pmcr_el0 // Disable debug access traps ubfx x0, x0, #11, #5 // to EL2 and allow access to - msr mdcr_el2, x0 // all PMU counters from EL1 4: + csel x0, xzr, x0, lt // all PMU counters from EL1 + msr mdcr_el2, x0 // (if they exist) /* Stage-2 translation */ msr vttbr_el2, xzr
arch/arm64/kernel/traps.c +15 -12
@@ -434,18 +434,21 @@ void cpu_enable_cache_maint_trap(void *__unused) }#define __user_cache_maint (insn, address, res) \ - asm volatile ( \ - "1: " insn ", %1\n" \ - " mov %w0, #0\n" \ - "2:\n" \ - " .pushsection .fixup,\"ax\"\n" \ - " .align 2\n" \ - "3: mov %w0, %w2\n" \ - " b 2b\n" \ - " .popsection\n" \ - _ASM_EXTABLE(1b, 3b) \ - : "=r" (res) \ - : "r" (address), "i" (-EFAULT) ) + if (untagged_addr(address) >= user_addr_max()) \ + res = -EFAULT; \ + else \ + asm volatile ( \ + "1: " insn ", %1\n" \ + " mov %w0, #0\n" \ + "2:\n" \ + " .pushsection .fixup,\"ax\"\n" \ + " .align 2\n" \ + "3: mov %w0, %w2\n" \ + " b 2b\n" \ + " .popsection\n" \ + _ASM_EXTABLE(1b, 3b) \ + : "=r" (res) \ + : "r" (address), "i" (-EFAULT) ) asmlinkage void __exception do_sysinstr(unsigned int esr, struct pt_regs *regs) {
arch/arm64/kvm/hyp/entry.S +2 -0
@@ -98,6 +98,8 @@ ENTRY(__guest_exit) // x4-x29,lr: vcpu regs // vcpu x0-x3 on the stack + ALTERNATIVE(nop, SET_PSTATE_PAN(1), ARM64_HAS_PAN, CONFIG_ARM64_PAN) + add x2, x0, #VCPU_CONTEXT stp x4, x5, [x2, #CPU_XREG_OFFSET(4)]
arch/metag/include/asm/atomic.h +1 -2
@@ -39,11 +39,10 @@#define atomic_dec (v) atomic_sub(1, (v))#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0) +#define atomic_dec_if_positive (v) atomic_sub_if_positive(1, v)#endif -#define atomic_dec_if_positive (v) atomic_sub_if_positive(1, v) -#include <asm-generic/atomic64.h> #endif /* __ASM_METAG_ATOMIC_H */
arch/mips/include/asm/ptrace.h +1 -1
@@ -152,7 +152,7 @@ static inline int is_syscall_success(struct pt_regs *regs)static inline long regs_return_value (struct pt_regs *regs) { -if (is_syscall_success (regs)) +if (is_syscall_success (regs) || !user_mode (regs))return regs->regs[2 ];else return -regs->regs[2 ];
arch/mips/vdso/Makefile +1 -1
@@ -82,7 +82,7 @@ obj-vdso := $(obj-vdso-y:%.o=$(obj)/%.o) $(obj-vdso): KBUILD_CFLAGS := $(cflags-vdso) $(native-abi) $(obj-vdso): KBUILD_AFLAGS := $(aflags-vdso) $(native-abi) -$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(native-abi) +$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi) $(obj)/vdso.so.dbg.raw: $(obj)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold)
arch/parisc/include/asm/pgtable.h +3 -3
@@ -83,10 +83,10 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)printk ("%s:%d: bad pgd %08lx.\n" , __FILE__, __LINE__, (unsigned long )pgd_val (e)) /* This is the size of the initially mapped kernel memory */ -#ifdef CONFIG_64BIT -#define KERNEL_INITIAL_ORDER 25/* 1<<25 = 32MB */ +#if defined(CONFIG_64BIT ) +#define KERNEL_INITIAL_ORDER 26/* 1<<26 = 64MB */ #else -#define KERNEL_INITIAL_ORDER 24/* 1<<24 = 16MB */ +#define KERNEL_INITIAL_ORDER 25/* 1<<25 = 32MB */ #endif #define KERNEL_INITIAL_SIZE (1 << KERNEL_INITIAL_ORDER)
arch/parisc/kernel/setup.c +8 -0
@@ -38,6 +38,7 @@#include <linux/export.h> #include <asm/processor.h> +#include <asm/sections.h> #include <asm/pdc.h> #include <asm/led.h> #include <asm/machdep.h> /* for pa7300lc_init() proto */
@@ -140,6 +141,13 @@ void __init setup_arch(char **cmdline_p)#endif printk (KERN_CONT ".\n" ); +/* +* Check if initial kernel page mappings are sufficient. +* panic early if not, else we may access kernel functions +* and variables which can't be reached. +*/ +if (__pa ((unsigned long ) &_end) >=KERNEL_INITIAL_SIZE ) +panic ("KERNEL_INITIAL_ORDER too small!" );pdc_console_init ();
arch/parisc/kernel/time.c +0 -6
@@ -226,12 +226,6 @@ void __init start_cpu_itimer(void)unsigned int cpu =smp_processor_id ();unsigned long next_tick =mfctl (16 ) + clocktick; -#if defined(CONFIG_HAVE_UNSTABLE_SCHED_CLOCK ) && defined(CONFIG_64BIT ) -/* With multiple 64bit CPUs online, the cr16's are not syncronized. */ -if (cpu !=0 ) -clear_sched_clock_stable (); -#endif -mtctl (next_tick,16 );/* kick off Interval Timer (CR16) */ per_cpu (cpu_data, cpu).it_value = next_tick;
arch/parisc/kernel/vmlinux.lds.S +5 -2
@@ -89,8 +89,9 @@ SECTIONS /* Start of data section */ _sdata = .; - RO_DATA_SECTION(8) - + /* Architecturally we need to keep __gp below 0x1000000 and thus + * in front of RO_DATA_SECTION() which stores lots of tracepoint + * and ftrace symbols. */ #ifdef CONFIG_64BIT . = ALIGN(16); /* Linkage tables */
@@ -105,6 +106,8 @@ SECTIONS } #endif + RO_DATA_SECTION(8) + /* unwind info */ .PARISC.unwind : { __start___unwind = .;
arch/powerpc/Kconfig +1 -1
@@ -637,7 +637,7 @@ config FORCE_MAX_ZONEORDER int "Maximum zone order" range 8 9 if PPC64 && PPC_64K_PAGES default "9" if PPC64 && PPC_64K_PAGES - range 9 13 if PPC64 && !PPC_64K_PAGES + range 13 13 if PPC64 && !PPC_64K_PAGES default "13" if PPC64 && !PPC_64K_PAGES range 9 64 if PPC32 && PPC_16K_PAGES default "9" if PPC32 && PPC_16K_PAGES
arch/powerpc/kernel/eeh_driver.c +8 -0
@@ -994,6 +994,14 @@ static void eeh_handle_special_event(void)/* Notify all devices to be down */ eeh_pe_state_clear (pe,EEH_PE_PRI_BUS ); bus =eeh_pe_bus_get (phb_pe); +if (!bus) { +pr_err ("%s: Cannot find PCI bus for " +"PHB#%d-PE#%x\n" , + __func__, + pe->phb->global_number, + pe->addr); +break ; + }eeh_pe_dev_traverse (pe, eeh_report_failure,NULL );pci_hp_remove_devices (bus);
arch/powerpc/kernel/vdso64/datapage.S +1 -1
@@ -59,7 +59,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) bl V_LOCAL_FUNC(__get_datapage) mtlr r12 addi r3,r3,CFG_SYSCALL_MAP64 - cmpli cr0,r4,0 + cmpldi cr0,r4,0 crclr cr0*4+so beqlr li r0,NR_syscalls
arch/powerpc/kernel/vdso64/gettimeofday.S +1 -1
@@ -145,7 +145,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) bne cr0,99f li r3,0 - cmpli cr0,r4,0 + cmpldi cr0,r4,0 crclr cr0*4+so beqlr lis r5,CLOCK_REALTIME_RES@h
arch/powerpc/lib/copyuser_64.S +1 -1
@@ -359,6 +359,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) addi r3,r3,8 171: 177: +179: addi r3,r3,8 370: 372:
@@ -373,7 +374,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) 173: 174: 175: -179: 181: 184: 186:
arch/powerpc/mm/copro_fault.c +2 -0
@@ -106,6 +106,8 @@ int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb)switch (REGION_ID (ea)) {case USER_REGION_ID :pr_devel ("%s: 0x%llx -- USER_REGION_ID\n" , __func__, ea); +if (mm ==NULL ) +return 1 ; psize =get_slice_psize (mm, ea); ssize =user_segment_size (ea); vsid =get_vsid (mm->context.id, ea, ssize);
arch/powerpc/mm/hash_utils_64.c +1 -1
@@ -526,7 +526,7 @@ static bool might_have_hea(void)*/ #ifdef CONFIG_IBMEBUS return !cpu_has_feature (CPU_FTR_ARCH_207S ) && - !firmware_has_feature (FW_FEATURE_SPLPAR ); +firmware_has_feature (FW_FEATURE_SPLPAR );#else return false;#endif
arch/powerpc/platforms/powernv/eeh-powernv.c +7 -2
@@ -1091,6 +1091,11 @@ static int pnv_eeh_reset(struct eeh_pe *pe, int option) } bus =eeh_pe_bus_get (pe); +if (!bus) { +pr_err ("%s: Cannot find PCI bus for PHB#%d-PE#%x\n" , + __func__, pe->phb->global_number, pe->addr); +return -EIO ; + }if (pe->type &EEH_PE_VF )return pnv_eeh_reset_vf_pe (pe, option);
@@ -1306,7 +1311,7 @@ static void pnv_eeh_get_and_dump_hub_diag(struct pci_controller *hose)return ; } -switch (data->type) { +switch (be16_to_cpu (data->type)) {case OPAL_P7IOC_DIAG_TYPE_RGC :pr_info ("P7IOC diag-data for RGC\n\n" );pnv_eeh_dump_hub_diag_common (data);
@@ -1538,7 +1543,7 @@ static int pnv_eeh_next_error(struct eeh_pe **pe)/* Try best to clear it */ opal_pci_eeh_freeze_clear (phb->opal_id, - frozen_pe_no, +be64_to_cpu (frozen_pe_no),OPAL_EEH_ACTION_CLEAR_FREEZE_ALL ); ret =EEH_NEXT_ERR_NONE ; } else if ((*pe)->state & EEH_PE_ISOLATED ||
arch/powerpc/platforms/powernv/pci.c +2 -2
@@ -309,8 +309,8 @@ static void pnv_pci_dump_p7ioc_diag_data(struct pci_controller *hose, be64_to_cpu(data->dma1ErrorLog1));for (i =0 ; i <OPAL_P7IOC_NUM_PEST_REGS ; i++) { -if ((data->pestA[i] >>63 ) ==0 && - (data->pestB[i] >>63 ) ==0 ) +if ((be64_to_cpu (data->pestA[i]) >>63 ) ==0 && + (be64_to_cpu (data->pestB[i]) >>63 ) ==0 )continue ; pr_info("PE[%3d] A/B: %016llx %016llx\n",
arch/powerpc/platforms/pseries/lpar.c +2 -2
@@ -393,7 +393,7 @@ static void __pSeries_lpar_hugepage_invalidate(unsigned long *slot, unsigned long *vpn, int count, int psize, int ssize) { - unsigned long param[8]; + unsigned long param[PLPAR_HCALL9_BUFSIZE];int i =0 , pix =0 , rc;unsigned long flags =0 ;int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE );
@@ -522,7 +522,7 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)unsigned long flags =0 ;struct ppc64_tlb_batch *batch =this_cpu_ptr (&ppc64_tlb_batch);int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE ); -unsigned long param[9 ]; +unsigned long param[PLPAR_HCALL9_BUFSIZE ];unsigned long hash, index, shift, hidx, slot;real_pte_t pte;int psize, ssize;
arch/powerpc/sysdev/cpm1.c +0 -2
@@ -233,8 +233,6 @@ void __init cpm_reset(void)else out_be32 (&siu_conf->sc_sdcr,1 );immr_unmap (siu_conf); - -cpm_muram_init (); }static DEFINE_SPINLOCK (cmd_lock);
arch/powerpc/sysdev/cpm2.c +0 -4
@@ -66,10 +66,6 @@ void __init cpm2_reset(void) cpm2_immr =ioremap (get_immrbase (),CPM_MAP_SIZE );#endif -/* Reclaim the DP memory for our use. -*/ -cpm_muram_init (); -/* Tell everyone where the comm processor resides. */ cpmp = &cpm2_immr->im_cpm;
arch/powerpc/sysdev/cpm_common.c +15 -0
@@ -37,6 +37,21 @@#include <linux/of_gpio.h> #endif +static int __init cpm_init (void ) +{ +struct device_node *np; + + np =of_find_compatible_node (NULL ,NULL ,"fsl,cpm1" ); +if (!np) + np =of_find_compatible_node (NULL ,NULL ,"fsl,cpm2" ); +if (!np) +return -ENODEV ; +cpm_muram_init (); +of_node_put (np); +return 0 ; +} +subsys_initcall (cpm_init); +#ifdef CONFIG_PPC_EARLY_DEBUG_CPM static u32 __iomem *cpm_udbg_txdesc;static u8 __iomem *cpm_udbg_txbuf;
arch/powerpc/xmon/spr_access.S +2 -2
@@ -2,12 +2,12 @@ /* unsigned long xmon_mfspr(sprn, default_value) */ _GLOBAL(xmon_mfspr) - ld r5, .Lmfspr_table@got(r2) + PPC_LL r5, .Lmfspr_table@got(r2) b xmon_mxspr /* void xmon_mtspr(sprn, new_value) */ _GLOBAL(xmon_mtspr) - ld r5, .Lmtspr_table@got(r2) + PPC_LL r5, .Lmtspr_table@got(r2) b xmon_mxspr /*
arch/s390/kvm/intercept.c +7 -2
@@ -118,8 +118,13 @@ static int handle_validity(struct kvm_vcpu *vcpu) vcpu->stat.exit_validity++;trace_kvm_s390_intercept_validity (vcpu, viwhy); -WARN_ONCE (true,"kvm: unhandled validity intercept 0x%x\n" , viwhy); -return -EOPNOTSUPP ; +KVM_EVENT (3 ,"validity intercept 0x%x for pid %u (kvm 0x%pK)" , viwhy, + current->pid, vcpu->kvm); + +/* do not warn on invalid runtime instrumentation mode */ +WARN_ONCE (viwhy !=0x44 ,"kvm: unhandled validity intercept 0x%x\n" , + viwhy); +return -EINVAL ; }static int handle_instruction (struct kvm_vcpu *vcpu)
arch/x86/kernel/e820.c +1 -1
@@ -348,7 +348,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,* continue building up new bios map based on this * information */ -if (current_type != last_type) { +if (current_type != last_type || current_type ==E820_PRAM ) {if (last_type !=0 ) { new_bios[new_bios_entry].size = change_point[chgidx]->addr - last_addr;
arch/x86/kernel/smpboot.c +9 -7
@@ -1408,15 +1408,17 @@ __init void prefill_possible_map(void)/* No boot processor was found in mptable or ACPI MADT */ if (!num_processors) { -int apicid = boot_cpu_physical_apicid; -int cpu =hard_smp_processor_id (); +if (boot_cpu_has (X86_FEATURE_APIC )) { +int apicid = boot_cpu_physical_apicid; +int cpu =hard_smp_processor_id (); -pr_warn ("Boot CPU (id %d) not listed by BIOS\n" , cpu); +pr_warn ("Boot CPU (id %d) not listed by BIOS\n" , cpu); -/* Make sure boot cpu is enumerated */ -if (apic->cpu_present_to_apicid (0 ) ==BAD_APICID && - apic->apic_id_valid (apicid)) -generic_processor_info (apicid, boot_cpu_apic_version); +/* Make sure boot cpu is enumerated */ +if (apic->cpu_present_to_apicid (0 ) ==BAD_APICID && + apic->apic_id_valid (apicid)) +generic_processor_info (apicid, boot_cpu_apic_version); + }if (!num_processors) num_processors =1 ;
arch/x86/kvm/ioapic.c +1 -1
@@ -594,7 +594,7 @@ static void kvm_ioapic_reset(struct kvm_ioapic *ioapic) ioapic->irr =0 ; ioapic->irr_delivered =0 ; ioapic->id =0 ; -memset (ioapic->irq_eoi,0x00 ,IOAPIC_NUM_PINS ); +memset (ioapic->irq_eoi,0x00 ,sizeof (ioapic->irq_eoi));rtc_irq_eoi_tracking_reset (ioapic); }
arch/x86/platform/uv/bios_uv.c +9 -1
@@ -40,7 +40,15 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)*/ return BIOS_STATUS_UNIMPLEMENTED ; - ret =efi_call_virt_pointer (tab, function, (u64 )which, a1, a2, a3, a4, a5); +/* +* If EFI_OLD_MEMMAP is set, we need to fall back to using our old EFI +* callback method, which uses efi_call() directly, with the kernel page tables: +*/ +if (unlikely (test_bit (EFI_OLD_MEMMAP , &efi.flags))) + ret =efi_call ((void *)__va (tab->function), (u64 )which, a1, a2, a3, a4, a5); +else + ret =efi_call_virt_pointer (tab, function, (u64 )which, a1, a2, a3, a4, a5); +return ret; }EXPORT_SYMBOL_GPL (uv_bios_call);
block/blk-cgroup.c +1 -3
@@ -1340,10 +1340,8 @@ int blkcg_policy_register(struct blkcg_policy *pol)struct blkcg_policy_data *cpd; cpd = pol->cpd_alloc_fn (GFP_KERNEL ); -if (!cpd) { -mutex_unlock (&blkcg_pol_mutex); +if (!cpd) goto err_free_cpds; - } blkcg->cpd[pol->plid] = cpd; cpd->blkcg = blkcg;
drivers/base/platform.c +2 -2
@@ -97,7 +97,7 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)int ret; ret =of_irq_get (dev->dev.of_node, num); -if (ret >=0 || ret == -EPROBE_DEFER ) +if (ret >0 || ret == -EPROBE_DEFER )return ret; }
@@ -175,7 +175,7 @@ int platform_get_irq_byname(struct platform_device *dev, const char *name)int ret; ret =of_irq_get_byname (dev->dev.of_node, name); -if (ret >=0 || ret == -EPROBE_DEFER ) +if (ret >0 || ret == -EPROBE_DEFER )return ret; }
drivers/clk/imx/clk-imx6q.c +34 -12
81 lines not on this page · raw message
drivers/cpufreq/cpufreq-dt-platdev.c +2 -0
@@ -68,6 +68,8 @@ static const struct of_device_id machines[] __initconst = { { .compatible = "sigma,tango4" }, + { .compatible = "ti,am33xx", }, + { .compatible = "ti,dra7", }, { .compatible = "ti,omap2", }, { .compatible = "ti,omap3", }, { .compatible = "ti,omap4", },
drivers/cpufreq/cpufreq_conservative.c +16 -3
@@ -17,6 +17,7 @@struct cs_policy_dbs_info {struct policy_dbs_info policy_dbs;unsigned int down_skip; +unsigned int requested_freq; };static inline struct cs_policy_dbs_info *to_dbs_info (struct policy_dbs_info *policy_dbs)
@@ -61,6 +62,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy) {struct policy_dbs_info *policy_dbs = policy->governor_data;struct cs_policy_dbs_info *dbs_info =to_dbs_info (policy_dbs); +unsigned int requested_freq = dbs_info->requested_freq;struct dbs_data *dbs_data = policy_dbs->dbs_data;struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;unsigned int load =dbs_update (policy);
@@ -72,10 +74,16 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)if (cs_tuners->freq_step ==0 ) goto out; +/* +* If requested_freq is out of range, it is likely that the limits +* changed in the meantime, so fall back to current frequency in that +* case. +*/ +if (requested_freq > policy->max || requested_freq < policy->min) + requested_freq = policy->cur; +/* Check for frequency increase */ if (load > dbs_data->up_threshold) { -unsigned int requested_freq = policy->cur; - dbs_info->down_skip =0 ;/* if we are already at full speed then break out early */
@@ -83,8 +91,11 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy) goto out; requested_freq +=get_freq_target (cs_tuners, policy); +if (requested_freq > policy->max) + requested_freq = policy->max;__cpufreq_driver_target (policy, requested_freq,CPUFREQ_RELATION_H ); + dbs_info->requested_freq = requested_freq; goto out; }
@@ -95,7 +106,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)/* Check for frequency decrease */ if (load < cs_tuners->down_threshold) { -unsigned int freq_target, requested_freq = policy->cur; +unsigned int freq_target;/* * if we cannot reduce the frequency anymore, break out early */
@@ -109,6 +120,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy) requested_freq = policy->min;__cpufreq_driver_target (policy, requested_freq,CPUFREQ_RELATION_L ); + dbs_info->requested_freq = requested_freq; } out:
@@ -287,6 +299,7 @@ static void cs_start(struct cpufreq_policy *policy)struct cs_policy_dbs_info *dbs_info =to_dbs_info (policy->governor_data); dbs_info->down_skip =0 ; + dbs_info->requested_freq = policy->cur; }static struct dbs_governor cs_governor = {
drivers/cpufreq/intel_pstate.c +5 -5
@@ -556,12 +556,12 @@ static void intel_pstate_hwp_set(const struct cpumask *cpumask)int min, hw_min, max, hw_max, cpu, range, adj_range;u64 value, cap; -rdmsrl (MSR_HWP_CAPABILITIES , cap); - hw_min =HWP_LOWEST_PERF (cap); - hw_max =HWP_HIGHEST_PERF (cap); - range = hw_max - hw_min; -for_each_cpu (cpu, cpumask) { +rdmsrl_on_cpu (cpu,MSR_HWP_CAPABILITIES , &cap); + hw_min =HWP_LOWEST_PERF (cap); + hw_max =HWP_HIGHEST_PERF (cap); + range = hw_max - hw_min; +rdmsrl_on_cpu (cpu,MSR_HWP_REQUEST , &value); adj_range = limits->min_perf_pct * range /100 ; min = hw_min + adj_range;
drivers/gpio/gpio-mpc8xxx.c +1 -1
@@ -239,7 +239,7 @@ static int mpc8xxx_gpio_irq_map(struct irq_domain *h, unsigned int irq, irq_hw_number_t hwirq) {irq_set_chip_data (irq, h->host_data); -irq_set_chip_and_handler (irq, &mpc8xxx_irq_chip, handle_level_irq); +irq_set_chip_and_handler (irq, &mpc8xxx_irq_chip, handle_edge_irq);return 0 ; }
drivers/infiniband/core/verbs.c +1 -1
@@ -821,7 +821,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,if (ret) {pr_err ("failed to init MR pool ret= %d\n" , ret);ib_destroy_qp (qp); - qp =ERR_PTR (ret); +return ERR_PTR (ret); } }
drivers/infiniband/ulp/srp/ib_srp.c +5 -3
@@ -1400,7 +1400,9 @@ static int srp_map_sg_entry(struct srp_map_state *state,while (dma_len) {unsigned offset = dma_addr & ~dev->mr_page_mask; -if (state->npages == dev->max_pages_per_mr || offset !=0 ) { + +if (state->npages == dev->max_pages_per_mr || + (state->npages >0 && offset !=0 )) { ret =srp_map_finish_fmr (state, ch);if (ret)return ret;
@@ -1417,12 +1419,12 @@ static int srp_map_sg_entry(struct srp_map_state *state, }/* -* If the last entry of the MR wasn't a full page, then we need to +* If the end of the MR is not on a page boundary then we need to * close it out and start a new one -- we can only merge at page * boundaries. */ ret =0 ; -if (len != dev->mr_page_size) +if ((dma_addr & ~dev->mr_page_mask) !=0 ) ret =srp_map_finish_fmr (state, ch);return ret; }
drivers/input/mouse/elantech.c +23 -2
@@ -1159,6 +1159,13 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = { DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H730"), }, }, + { +/* Fujitsu H760 also has a middle button */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H760"), + }, + }, #endif { } };
@@ -1503,10 +1510,10 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { -/* Fujitsu LIFEBOOK E554 does not work with crc_enabled == 0 */ +/* Fujitsu H760 does not work with crc_enabled == 0 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E554"), + DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H760"), }, }, {
@@ -1517,6 +1524,20 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { +/* Fujitsu LIFEBOOK E554 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E554"), + }, + }, + { +/* Fujitsu LIFEBOOK E556 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E556"), + }, + }, + {/* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
drivers/input/serio/i8042-io.h +1 -1
@@ -81,7 +81,7 @@ static inline int i8042_platform_init(void)return -EBUSY ;#endif - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-ip22io.h +1 -1
@@ -61,7 +61,7 @@ static inline int i8042_platform_init(void)return -EBUSY ;#endif - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-ppcio.h +1 -1
@@ -44,7 +44,7 @@ static inline void i8042_write_command(int val)static inline int i8042_platform_init (void ) { - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-sparcio.h +1 -1
@@ -130,7 +130,7 @@ static int __init i8042_platform_init(void) } } - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-unicore32io.h +1 -1
@@ -61,7 +61,7 @@ static inline int i8042_platform_init(void)if (!request_mem_region (I8042_REGION_START ,I8042_REGION_SIZE ,"i8042" ))return -EBUSY ; - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-x86ia64io.h +93 -3
111 lines not on this page · raw message
drivers/input/serio/i8042.c +44 -11
105 lines not on this page · raw message
drivers/irqchip/irq-eznps.c +2 -2
@@ -85,7 +85,7 @@ static void nps400_irq_eoi_global(struct irq_data *irqd)nps_ack_gic (); } -static void nps400_irq_eoi (struct irq_data *irqd) +static void nps400_irq_ack (struct irq_data *irqd) {unsigned int __maybe_unused irq =irqd_to_hwirq (irqd);
@@ -103,7 +103,7 @@ static struct irq_chip nps400_irq_chip_percpu = { .name = "NPS400 IC", .irq_mask = nps400_irq_mask, .irq_unmask = nps400_irq_unmask, - .irq_eoi = nps400_irq_eoi, + .irq_ack = nps400_irq_ack, }; static int nps400_irq_map(struct irq_domain *d, unsigned int virq,
drivers/irqchip/irq-gic-v3.c +1 -1
@@ -153,7 +153,7 @@ static void gic_enable_redist(bool enable)return ;/* No PM support in this redistributor */ } -while (count--) { +while (--count) { val =readl_relaxed (rbase +GICR_WAKER );if (enable ^ (bool )(val & GICR_WAKER_ChildrenAsleep))break ;
drivers/md/dm-crypt.c +10 -14
@@ -113,8 +113,7 @@ struct iv_tcw_private {* and encrypts / decrypts at the same time. */ enum flags {DM_CRYPT_SUSPENDED ,DM_CRYPT_KEY_VALID , -DM_CRYPT_SAME_CPU ,DM_CRYPT_NO_OFFLOAD , -DM_CRYPT_EXIT_THREAD }; +DM_CRYPT_SAME_CPU ,DM_CRYPT_NO_OFFLOAD };/* * The fields in here must be read only after initialization.
@@ -1207,18 +1206,20 @@ continue_locked:if (!RB_EMPTY_ROOT (&cc->write_tree)) goto pop_from_list; -if (unlikely (test_bit (DM_CRYPT_EXIT_THREAD , &cc->flags))) { -spin_unlock_irq (&cc->write_thread_wait.lock); -break ; - } - -__set_current_state (TASK_INTERRUPTIBLE ); +set_current_state (TASK_INTERRUPTIBLE );__add_wait_queue (&cc->write_thread_wait, &wait);spin_unlock_irq (&cc->write_thread_wait.lock); +if (unlikely (kthread_should_stop ())) { +set_task_state (current,TASK_RUNNING ); +remove_wait_queue (&cc->write_thread_wait, &wait); +break ; + } +schedule (); +set_task_state (current,TASK_RUNNING );spin_lock_irq (&cc->write_thread_wait.lock);__remove_wait_queue (&cc->write_thread_wait, &wait); goto continue_locked;
@@ -1533,13 +1534,8 @@ static void crypt_dtr(struct dm_target *ti)if (!cc)return ; -if (cc->write_thread) { -spin_lock_irq (&cc->write_thread_wait.lock); -set_bit (DM_CRYPT_EXIT_THREAD , &cc->flags); -wake_up_locked (&cc->write_thread_wait); -spin_unlock_irq (&cc->write_thread_wait.lock); +if (cc->write_thread)kthread_stop (cc->write_thread); - }if (cc->io_queue)destroy_workqueue (cc->io_queue);
drivers/md/dm-mpath.c +3 -3
@@ -1521,10 +1521,10 @@ static void activate_path(struct work_struct *work) {struct pgpath *pgpath = container_of(work, struct pgpath, activate_path.work); +struct request_queue *q =bdev_get_queue (pgpath->path.dev->bdev); -if (pgpath->is_active) -scsi_dh_activate (bdev_get_queue (pgpath->path.dev->bdev), - pg_init_done, pgpath); +if (pgpath->is_active && !blk_queue_dying (q)) +scsi_dh_activate (q, pg_init_done, pgpath);else pg_init_done (pgpath,SCSI_DH_DEV_OFFLINED ); }
drivers/md/dm-rq.c +14 -5
@@ -73,15 +73,24 @@ static void dm_old_start_queue(struct request_queue *q)spin_unlock_irqrestore (q->queue_lock, flags); } +static void dm_mq_start_queue (struct request_queue *q) +{ +unsigned long flags; + +spin_lock_irqsave (q->queue_lock, flags); +queue_flag_clear (QUEUE_FLAG_STOPPED , q); +spin_unlock_irqrestore (q->queue_lock, flags); + +blk_mq_start_stopped_hw_queues (q, true); +blk_mq_kick_requeue_list (q); +} +void dm_start_queue (struct request_queue *q) {if (!q->mq_ops)dm_old_start_queue (q); -else { -queue_flag_clear_unlocked (QUEUE_FLAG_STOPPED , q); -blk_mq_start_stopped_hw_queues (q, true); -blk_mq_kick_requeue_list (q); - } +else +dm_mq_start_queue (q); }static void dm_old_stop_queue (struct request_queue *q)
drivers/md/dm.c +7 -3
@@ -1873,6 +1873,7 @@ EXPORT_SYMBOL_GPL(dm_device_name);static void __dm_destroy (struct mapped_device *md,bool wait) { +struct request_queue *q =dm_get_md_queue (md);struct dm_table *map;int srcu_idx;
@@ -1883,6 +1884,10 @@ static void __dm_destroy(struct mapped_device *md, bool wait)set_bit (DMF_FREEING , &md->flags);spin_unlock (&_minor_lock); +spin_lock_irq (q->queue_lock); +queue_flag_set (QUEUE_FLAG_DYING , q); +spin_unlock_irq (q->queue_lock); +if (dm_request_based (md) && md->kworker_task)flush_kthread_worker (&md->kworker);
@@ -2249,10 +2254,11 @@ static int __dm_resume(struct mapped_device *md, struct dm_table *map)int dm_resume (struct mapped_device *md) { -int r = -EINVAL ; +int r;struct dm_table *map =NULL ; retry: + r = -EINVAL ;mutex_lock_nested (&md->suspend_lock,SINGLE_DEPTH_NESTING );if (!dm_suspended_md (md))
@@ -2276,8 +2282,6 @@ retry: goto out;clear_bit (DMF_SUSPENDED , &md->flags); - - r =0 ; out:mutex_unlock (&md->suspend_lock);
drivers/media/dvb-frontends/mb86a20s.c +53 -51
156 lines not on this page · raw message
drivers/media/usb/cx231xx/cx231xx-avcore.c +4 -1
@@ -1264,7 +1264,10 @@ int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev, dev->board.agc_analog_digital_select_gpio, analog_or_digital); -return status; +if (status <0 ) +return status; + +return 0 ; }int cx231xx_enable_i2c_port_3 (struct cx231xx *dev,bool is_port_3)
drivers/media/usb/cx231xx/cx231xx-cards.c +1 -1
@@ -486,7 +486,7 @@ struct cx231xx_board cx231xx_boards[] = { .output_mode = OUT_MODE_VIP11, .demod_xfer_mode = 0, .ctl_pin_status_mask = 0xFFFFFFC4, - .agc_analog_digital_select_gpio = 0x00, /* According with PV cxPolaris.inf file */ + .agc_analog_digital_select_gpio = 0x1c, .tuner_sif_gpio = -1, .tuner_scl_gpio = -1, .tuner_sda_gpio = -1,
drivers/media/usb/cx231xx/cx231xx-core.c +21 -6
@@ -712,6 +712,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)break ;case CX231XX_BOARD_CNXT_RDE_253S :case CX231XX_BOARD_CNXT_RDU_253S : +case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID : errCode =cx231xx_set_agc_analog_digital_mux_select (dev,1 );break ;case CX231XX_BOARD_HAUPPAUGE_EXETER :
@@ -738,7 +739,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID :case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL :case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC : - errCode =cx231xx_set_agc_analog_digital_mux_select (dev,0 ); + errCode =cx231xx_set_agc_analog_digital_mux_select (dev,0 );break ;default :break ;
@@ -1301,15 +1302,29 @@ int cx231xx_dev_init(struct cx231xx *dev) dev->i2c_bus[2 ].i2c_reserve =0 ;/* register I2C buses */ -cx231xx_i2c_register (&dev->i2c_bus[0 ]); -cx231xx_i2c_register (&dev->i2c_bus[1 ]); -cx231xx_i2c_register (&dev->i2c_bus[2 ]); + errCode =cx231xx_i2c_register (&dev->i2c_bus[0 ]); +if (errCode <0 ) +return errCode; + errCode =cx231xx_i2c_register (&dev->i2c_bus[1 ]); +if (errCode <0 ) +return errCode; + errCode =cx231xx_i2c_register (&dev->i2c_bus[2 ]); +if (errCode <0 ) +return errCode; errCode =cx231xx_i2c_mux_create (dev); +if (errCode <0 ) { +dev_err (dev->dev, +"%s: Failed to create I2C mux\n" , __func__); +return errCode; + } + errCode =cx231xx_i2c_mux_register (dev,0 ); +if (errCode <0 ) +return errCode; + + errCode =cx231xx_i2c_mux_register (dev,1 );if (errCode <0 )return errCode; -cx231xx_i2c_mux_register (dev,0 ); -cx231xx_i2c_mux_register (dev,1 );/* scan the real bus segments in the order of physical port numbers */ cx231xx_do_i2c_scan (dev,I2C_0 );
drivers/memstick/host/rtsx_usb_ms.c +6 -0
@@ -524,6 +524,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work)int rc;if (!host->req) { +pm_runtime_get_sync (ms_dev (host)); do { rc = memstick_next_req(msh, &host->req); dev_dbg(ms_dev(host), "next req %d\n", rc);
@@ -544,6 +545,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work) host->req->error); } }while (!rc); +pm_runtime_put (ms_dev (host)); } }
@@ -570,6 +572,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh,dev_dbg (ms_dev (host),"%s: param = %d, value = %d\n" , __func__, param, value); +pm_runtime_get_sync (ms_dev (host));mutex_lock (&ucr->dev_mutex); err =rtsx_usb_card_exclusive_check (ucr,RTSX_USB_MS_CARD );
@@ -635,6 +638,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh, } out:mutex_unlock (&ucr->dev_mutex); +pm_runtime_put (ms_dev (host));/* power-on delay */ if (param ==MEMSTICK_POWER && value ==MEMSTICK_POWER_ON )
@@ -681,6 +685,7 @@ static int rtsx_usb_detect_ms_card(void *__host)int err;for (;;) { +pm_runtime_get_sync (ms_dev (host));mutex_lock (&ucr->dev_mutex);/* Check pending MS card changes */
@@ -703,6 +708,7 @@ static int rtsx_usb_detect_ms_card(void *__host) } poll_again: +pm_runtime_put (ms_dev (host));if (host->eject)break ;
drivers/misc/cxl/api.c +9 -0
@@ -229,6 +229,14 @@ int cxl_start_context(struct cxl_context *ctx, u64 wed,if (ctx->status ==STARTED ) goto out;/* already started */ +/* +* Increment the mapped context count for adapter. This also checks +* if adapter_context_lock is taken. +*/ + rc =cxl_adapter_context_get (ctx->afu->adapter); +if (rc) + goto out; +if (task) { ctx->pid =get_task_pid (task,PIDTYPE_PID ); ctx->glpid =get_task_pid (task->group_leader,PIDTYPE_PID );
@@ -240,6 +248,7 @@ int cxl_start_context(struct cxl_context *ctx, u64 wed,if ((rc = cxl_ops->attach_process (ctx, kernel, wed,0 ))) {put_pid (ctx->pid); +cxl_adapter_context_put (ctx->afu->adapter);cxl_ctx_put (); goto out; }
drivers/misc/cxl/context.c +3 -0
@@ -238,6 +238,9 @@ int __detach_context(struct cxl_context *ctx)put_pid (ctx->glpid);cxl_ctx_put (); + +/* Decrease the attached context count on the adapter */ +cxl_adapter_context_put (ctx->afu->adapter);return 0 ; }
drivers/misc/cxl/cxl.h +24 -0
@@ -615,6 +615,14 @@ struct cxl {bool perst_select_user;bool perst_same_image;bool psl_timebase_synced; + +/* +* number of contexts mapped on to this card. Possible values are: +* >0: Number of contexts mapped and new one can be mapped. +* 0: No active contexts and new ones can be mapped. +* -1: No contexts mapped and new ones cannot be mapped. +*/ +atomic_t contexts_num; };int cxl_pci_alloc_one_irq (struct cxl *adapter);
@@ -940,4 +948,20 @@ bool cxl_pci_is_vphb_device(struct pci_dev *dev);/* decode AFU error bits in the PSL register PSL_SERR_An */ void cxl_afu_decode_psl_serr (struct cxl_afu *afu,u64 serr); + +/* +* Increments the number of attached contexts on an adapter. +* In case an adapter_context_lock is taken the return -EBUSY. +*/ +int cxl_adapter_context_get (struct cxl *adapter); + +/* Decrements the number of attached contexts on an adapter */ +void cxl_adapter_context_put (struct cxl *adapter); + +/* If no active contexts then prevents contexts from being attached */ +int cxl_adapter_context_lock (struct cxl *adapter); + +/* Unlock the contexts-lock if taken. Warn and force unlock otherwise */ +void cxl_adapter_context_unlock (struct cxl *adapter); +#endif
drivers/misc/cxl/file.c +11 -0
@@ -205,11 +205,22 @@ static long afu_ioctl_start_work(struct cxl_context *ctx, ctx->pid =get_task_pid (current,PIDTYPE_PID ); ctx->glpid =get_task_pid (current->group_leader,PIDTYPE_PID ); +/* +* Increment the mapped context count for adapter. This also checks +* if adapter_context_lock is taken. +*/ + rc =cxl_adapter_context_get (ctx->afu->adapter); +if (rc) { +afu_release_irqs (ctx, ctx); + goto out; + } +trace_cxl_attach (ctx, work.work_element_descriptor, work.num_interrupts, amr);if ((rc = cxl_ops->attach_process (ctx, false, work.work_element_descriptor, amr))) {afu_release_irqs (ctx, ctx); +cxl_adapter_context_put (ctx->afu->adapter); goto out; }
drivers/misc/cxl/guest.c +3 -0
@@ -1152,6 +1152,9 @@ struct cxl *cxl_guest_init_adapter(struct device_node *np, struct platform_devicif ((rc =cxl_sysfs_adapter_add (adapter))) goto err_put1; +/* release the context lock as the adapter is configured */ +cxl_adapter_context_unlock (adapter); +return adapter; err_put1:
drivers/misc/cxl/main.c +41 -1
55 lines not on this page · raw message
drivers/misc/cxl/pci.c +2 -0
@@ -1484,6 +1484,8 @@ static int cxl_configure_adapter(struct cxl *adapter, struct pci_dev *dev)if ((rc =cxl_native_register_psl_err_irq (adapter))) goto err; +/* Release the context lock as adapter is configured */ +cxl_adapter_context_unlock (adapter);return 0 ; err:
drivers/misc/cxl/sysfs.c +23 -4
@@ -75,12 +75,31 @@ static ssize_t reset_adapter_store(struct device *device,int val; rc =sscanf (buf,"%i" , &val); -if ((rc !=1 ) || (val !=1 )) +if ((rc !=1 ) || (val !=1 && val !=-1 ))return -EINVAL ; -if ((rc = cxl_ops->adapter_reset (adapter))) -return rc; -return count; +/* +* See if we can lock the context mapping that's only allowed +* when there are no contexts attached to the adapter. Once +* taken this will also prevent any context from getting activated. +*/ +if (val ==1 ) { + rc =cxl_adapter_context_lock (adapter); +if (rc) + goto out; + + rc = cxl_ops->adapter_reset (adapter); +/* In case reset failed release context lock */ +if (rc) +cxl_adapter_context_unlock (adapter); + + }else if (val ==-1 ) { +/* Perform a forced adapter reset */ + rc = cxl_ops->adapter_reset (adapter); + } + +out: +return rc ? rc : count; } static ssize_t load_image_on_perst_show(struct device *device,
drivers/misc/mei/amthif.c +1 -1
@@ -139,7 +139,7 @@ int mei_amthif_read(struct mei_device *dev, struct file *file,return -ERESTARTSYS ;if (!mei_cl_is_connected (cl)) { - rets = -EBUSY ; + rets = -ENODEV ; goto out; }
drivers/misc/mei/bus.c +1 -1
@@ -142,7 +142,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)mutex_lock (&bus->device_lock);if (!mei_cl_is_connected (cl)) { - rets = -EBUSY ; + rets = -ENODEV ; goto out; } }
drivers/misc/mei/hw-me-regs.h +3 -0
@@ -125,6 +125,9 @@#define MEI_DEV_ID_BXT_M 0x1A9A/* Broxton M */ #define MEI_DEV_ID_APL_I 0x5A9A/* Apollo Lake I */ +#define MEI_DEV_ID_KBP 0xA2BA/* Kaby Point */ +#define MEI_DEV_ID_KBP_2 0xA2BB/* Kaby Point 2 */ +/* * MEI HW Section */
drivers/misc/mei/main.c +1 -1
@@ -202,7 +202,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,mutex_lock (&dev->device_lock);if (!mei_cl_is_connected (cl)) { - rets = -EBUSY ; + rets = -ENODEV ; goto out; } }
drivers/misc/mei/pci-me.c +3 -0
@@ -91,6 +91,9 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)}, {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)}, +/* required last entry */ {0, } };
drivers/mmc/card/block.c +3 -2
@@ -1778,7 +1778,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,struct mmc_blk_data *md = mq->data;struct mmc_packed *packed = mqrq->packed;bool do_rel_wr, do_data_tag; -u32 *packed_cmd_hdr; +__le32 *packed_cmd_hdr;u8 hdr_blocks;u8 i =1 ;
@@ -2303,7 +2303,8 @@ again:set_capacity (md->disk, size);if (mmc_host_cmd23 (card->host)) { -if (mmc_card_mmc (card) || +if ((mmc_card_mmc (card) && + card->csd.mmca_vsn >=CSD_SPEC_VER_3 ) || (mmc_card_sd (card) && card->scr.cmds &SD_SCR_CMD23_SUPPORT )) md->flags |=MMC_BLK_CMD23 ;
drivers/mmc/card/queue.h +1 -1
@@ -31,7 +31,7 @@ enum mmc_packed_type {struct mmc_packed {struct list_head list; -u32 cmd_hdr[1024 ]; +__le32 cmd_hdr[1024 ];unsigned int blocks;u8 nr_entries;u8 retries;
drivers/mmc/core/mmc.c +10 -0
@@ -1259,6 +1259,16 @@ static int mmc_select_hs400es(struct mmc_card *card) goto out_err; } +if (card->mmc_avail_type &EXT_CSD_CARD_TYPE_HS400_1_2V ) + err =__mmc_set_signal_voltage (host,MMC_SIGNAL_VOLTAGE_120 ); + +if (err && card->mmc_avail_type &EXT_CSD_CARD_TYPE_HS400_1_8V ) + err =__mmc_set_signal_voltage (host,MMC_SIGNAL_VOLTAGE_180 ); + +/* If fails try again during next card power cycle */ +if (err) + goto out_err; + err =mmc_select_bus_width (card);if (err <0 ) goto out_err;
drivers/mmc/host/rtsx_usb_sdmmc.c +2 -5
@@ -1138,11 +1138,6 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)dev_dbg (sdmmc_dev (host),"%s\n" , __func__);mutex_lock (&ucr->dev_mutex); -if (rtsx_usb_card_exclusive_check (ucr,RTSX_USB_SD_CARD )) { -mutex_unlock (&ucr->dev_mutex); -return ; - } -sd_set_power_mode (host, ios->power_mode);sd_set_bus_width (host, ios->bus_width);sd_set_timing (host, ios->timing, &host->ddr_mode);
@@ -1314,6 +1309,7 @@ static void rtsx_usb_update_led(struct work_struct *work) container_of(work, struct rtsx_usb_sdmmc, led_work);struct rtsx_ucr *ucr = host->ucr; +pm_runtime_get_sync (sdmmc_dev (host));mutex_lock (&ucr->dev_mutex);if (host->led.brightness ==LED_OFF )
@@ -1322,6 +1318,7 @@ static void rtsx_usb_update_led(struct work_struct *work)rtsx_usb_turn_on_led (ucr);mutex_unlock (&ucr->dev_mutex); + pm_runtime_put(sdmmc_dev(host)); }#endif
drivers/mmc/host/sdhci.c +1 -1
@@ -687,7 +687,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)* host->clock is in Hz. target_timeout is in us. * Hence, us = 1000000 * cycles / Hz. Round up. */ - val =1000000 * data->timeout_clks; + val =1000000ULL * data->timeout_clks;if (do_div (val, host->clock)) target_timeout++; target_timeout += val;
drivers/mtd/ubi/wl.c +19 -2
@@ -644,7 +644,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, int shutdown) {int err, scrubbing =0 , torture =0 , protect =0 , erroneous =0 ; -int vol_id =-1 , lnum =-1 ; +int erase =0 , keep =0 , vol_id =-1 , lnum =-1 ;#ifdef CONFIG_MTD_UBI_FASTMAP int anchor = wrk->anchor;#endif
@@ -780,6 +780,16 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, e1->pnum); scrubbing =1 ; goto out_not_moved; + }else if (ubi->fast_attach && err ==UBI_IO_BAD_HDR_EBADMSG ) { +/* +* While a full scan would detect interrupted erasures +* at attach time we can face them here when attached from +* Fastmap. +*/ +dbg_wl ("PEB %d has ECC errors, maybe from an interrupted erasure" , + e1->pnum); + erase =1 ; + goto out_not_moved; } ubi_err(ubi, "error %d while reading VID header from PEB %d",
@@ -815,6 +825,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,* Target PEB had bit-flips or write error - torture it. */ torture =1 ; + keep =1 ; goto out_not_moved; }
@@ -901,7 +912,7 @@ out_not_moved: ubi->erroneous_peb_count +=1 ; }else if (scrubbing)wl_tree_add (e1, &ubi->scrub); -else +else if (keep)wl_tree_add (e1, &ubi->used);if (dst_leb_clean) {wl_tree_add (e2, &ubi->free);
@@ -922,6 +933,12 @@ out_not_moved: goto out_ro; } +if (erase) { + err =do_sync_erase (ubi, e1, vol_id, lnum,1 ); +if (err) + goto out_ro; + } +mutex_unlock (&ubi->move_mutex);return 0 ;
drivers/net/wireless/ath/ath10k/ce.c +7 -0
@@ -433,6 +433,13 @@ void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries)unsigned int nentries_mask = dest_ring->nentries_mask;unsigned int write_index = dest_ring->write_index;u32 ctrl_addr = pipe->ctrl_addr; +u32 cur_write_idx =ath10k_ce_dest_ring_write_index_get (ar, ctrl_addr); + +/* Prevent CE ring stuck issue that will occur when ring is full. +* Make sure that write index is 1 less than read index. +*/ +if ((cur_write_idx + nentries) == dest_ring->sw_index) + nentries -=1 ; write_index =CE_RING_IDX_ADD (nentries_mask, write_index, nentries);ath10k_ce_dest_ring_write_index_set (ar, ctrl_addr, write_index);
drivers/net/wireless/realtek/rtlwifi/regd.c +3 -1
@@ -345,9 +345,9 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select(return &rtl_regdom_no_midband;case COUNTRY_CODE_IC :return &rtl_regdom_11; -case COUNTRY_CODE_ETSI :case COUNTRY_CODE_TELEC_NETGEAR :return &rtl_regdom_60_64; +case COUNTRY_CODE_ETSI :case COUNTRY_CODE_SPAIN :case COUNTRY_CODE_FRANCE :case COUNTRY_CODE_ISRAEL :
@@ -406,6 +406,8 @@ static u8 channel_plan_to_country_code(u8 channelplan)return COUNTRY_CODE_WORLD_WIDE_13 ;case 0x22 :return COUNTRY_CODE_IC ; +case 0x25 : +return COUNTRY_CODE_ETSI ;case 0x32 :return COUNTRY_CODE_TELEC_NETGEAR ;case 0x41 :
drivers/pci/host/pci-tegra.c +1 -1
@@ -856,7 +856,7 @@ static int tegra_pcie_phy_disable(struct tegra_pcie *pcie)/* override IDDQ */ value =pads_readl (pcie,PADS_CTL ); value |=PADS_CTL_IDDQ_1L ; -pads_writel (pcie,PADS_CTL , value); +pads_writel (pcie, value,PADS_CTL );/* reset PLL */ value =pads_readl (pcie, soc->pads_pll_ctl);
drivers/pci/quirks.c +1 -0
@@ -3198,6 +3198,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0030 , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0032 , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x003c , quirk_no_bus_reset); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0033 , quirk_no_bus_reset);static void quirk_no_pm_reset (struct pci_dev *dev) {
drivers/pinctrl/intel/pinctrl-baytrail.c +2 -1
@@ -1808,6 +1808,8 @@ static int byt_pinctrl_probe(struct platform_device *pdev)return PTR_ERR (vg->pctl_dev); } +raw_spin_lock_init (&vg->lock); + ret =byt_gpio_probe (vg);if (ret) {pinctrl_unregister (vg->pctl_dev);
@@ -1815,7 +1817,6 @@ static int byt_pinctrl_probe(struct platform_device *pdev) }platform_set_drvdata (pdev, vg); -raw_spin_lock_init (&vg->lock);pm_runtime_enable (&pdev->dev);return 0 ;
drivers/pinctrl/intel/pinctrl-intel.c +23 -2
@@ -19,6 +19,7 @@#include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf-generic.h> +#include "../core.h" #include "pinctrl-intel.h" /* Offset from regs */
@@ -1079,6 +1080,26 @@ int intel_pinctrl_remove(struct platform_device *pdev)EXPORT_SYMBOL_GPL (intel_pinctrl_remove);#ifdef CONFIG_PM_SLEEP +static bool intel_pinctrl_should_save (struct intel_pinctrl *pctrl,unsigned pin) +{ +const struct pin_desc *pd =pin_desc_get (pctrl->pctldev, pin); + +if (!pd || !intel_pad_usable (pctrl, pin)) +return false; + +/* +* Only restore the pin if it is actually in use by the kernel (or +* by userspace). It is possible that some pins are used by the +* BIOS during resume and those are not always locked down so leave +* them alone. +*/ +if (pd->mux_owner || pd->gpio_owner || +gpiochip_line_is_irq (&pctrl->chip, pin)) +return true; + +return false; +} +int intel_pinctrl_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);
@@ -1092,7 +1113,7 @@ int intel_pinctrl_suspend(struct device *dev)const struct pinctrl_pin_desc *desc = &pctrl->soc->pins[i];u32 val; -if (!intel_pad_usable (pctrl, desc->number)) +if (!intel_pinctrl_should_save (pctrl, desc->number))continue ; val =readl (intel_get_padcfg (pctrl, desc->number,PADCFG0 ));
@@ -1153,7 +1174,7 @@ int intel_pinctrl_resume(struct device *dev)void __iomem *padcfg;u32 val; -if (!intel_pad_usable (pctrl, desc->number)) +if (!intel_pinctrl_should_save (pctrl, desc->number))continue ; padcfg =intel_get_padcfg (pctrl, desc->number,PADCFG0 );
drivers/regulator/tps65910-regulator.c +6 -0
@@ -1111,6 +1111,12 @@ static int tps65910_probe(struct platform_device *pdev) pmic->num_regulators =ARRAY_SIZE (tps65910_regs); pmic->ext_sleep_control = tps65910_ext_sleep_control; info = tps65910_regs; +/* Work around silicon erratum SWCZ010: output programmed +* voltage level can go higher than expected or crash +* Workaround: use no synchronization of DCDC clocks +*/ +tps65910_reg_clear_bits (pmic->mfd,TPS65910_DCDCCTRL , +DCDCCTRL_DCDCCKSYNC_MASK );break ;case TPS65911 : pmic->get_ctrl_reg = &tps65911_get_ctrl_register;
drivers/s390/scsi/zfcp_dbf.c +144 -18
244 lines not on this page · raw message
drivers/s390/scsi/zfcp_dbf.h +11 -3
@@ -2,7 +2,7 @@* zfcp device driver * debug feature declarations * -* Copyright IBM Corp. 2008, 2010 +* Copyright IBM Corp. 2008, 2015 */ #ifndef ZFCP_DBF_H
@@ -17,6 +17,11 @@#define ZFCP_DBF_INVALID_LUN 0xFFFFFFFFFFFFFFFFull +enum zfcp_dbf_pseudo_erp_act_type { +ZFCP_PSEUDO_ERP_ACTION_RPORT_ADD =0xff , +ZFCP_PSEUDO_ERP_ACTION_RPORT_DEL =0xfe , +}; +/** * struct zfcp_dbf_rec_trigger - trace record for triggered recovery action * @ready: number of ready recovery actions
@@ -110,6 +115,7 @@ struct zfcp_dbf_san {u32 d_id;#define ZFCP_DBF_SAN_MAX_PAYLOAD (FC_CT_HDR_LEN + 32)char payload[ZFCP_DBF_SAN_MAX_PAYLOAD ]; +u16 pl_len; } __packed;/**
@@ -126,6 +132,8 @@ struct zfcp_dbf_hba_res {u8 prot_status_qual[FSF_PROT_STATUS_QUAL_SIZE ];u32 fsf_status;u8 fsf_status_qual[FSF_STATUS_QUALIFIER_SIZE ]; +u32 port_handle; +u32 lun_handle; } __packed;/**
@@ -279,7 +287,7 @@ static inlinevoid zfcp_dbf_hba_fsf_resp (char *tag,int level,struct zfcp_fsf_req *req) {if (debug_level_enabled (req->adapter->dbf->hba, level)) -zfcp_dbf_hba_fsf_res (tag, req); +zfcp_dbf_hba_fsf_res (tag, level, req); }/**
@@ -318,7 +326,7 @@ void _zfcp_dbf_scsi(char *tag, int level, struct scsi_cmnd *scmd, scmd->device->host->hostdata[0 ];if (debug_level_enabled (adapter->dbf->scsi, level)) -zfcp_dbf_scsi (tag, scmd, req); +zfcp_dbf_scsi (tag, level, scmd, req); }/**
drivers/s390/scsi/zfcp_erp.c +9 -3
@@ -3,7 +3,7 @@* * Error Recovery Procedures (ERP). * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2015 */ #define KMSG_COMPONENT "zfcp"
@@ -1217,8 +1217,14 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)break ;case ZFCP_ERP_ACTION_REOPEN_PORT : -if (result ==ZFCP_ERP_SUCCEEDED ) -zfcp_scsi_schedule_rport_register (port); +/* This switch case might also happen after a forced reopen +* was successfully done and thus overwritten with a new +* non-forced reopen at `ersfs_2'. In this case, we must not +* do the clean-up of the non-forced version. +*/ +if (act->step !=ZFCP_ERP_STEP_UNINITIALIZED ) +if (result ==ZFCP_ERP_SUCCEEDED ) +zfcp_scsi_schedule_rport_register (port);/* fall through */ case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED :put_device (&port->dev);
drivers/s390/scsi/zfcp_ext.h +5 -3
@@ -3,7 +3,7 @@* * External function declarations. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2015 */ #ifndef ZFCP_EXT_H
@@ -35,8 +35,9 @@ 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_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 *,struct zfcp_fsf_req *); +extern void zfcp_dbf_hba_fsf_res (char *,int ,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_bit_err (char *,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_berr (struct zfcp_dbf *,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_def_err (struct zfcp_adapter *,u64 ,u16 ,void **);
@@ -44,7 +45,8 @@ extern void zfcp_dbf_hba_basic(char *, struct zfcp_adapter *);extern void zfcp_dbf_san_req (char *,struct zfcp_fsf_req *,u32 );extern void zfcp_dbf_san_res (char *,struct zfcp_fsf_req *);extern void zfcp_dbf_san_in_els (char *,struct zfcp_fsf_req *); -extern void zfcp_dbf_scsi (char *,struct scsi_cmnd *,struct zfcp_fsf_req *); +extern void zfcp_dbf_scsi (char *,int ,struct scsi_cmnd *, +struct zfcp_fsf_req *);/* zfcp_erp.c */ extern void zfcp_erp_set_adapter_status (struct zfcp_adapter *,u32 );
drivers/s390/scsi/zfcp_fsf.c +17 -5
@@ -3,7 +3,7 @@* * Implementation of FSF commands. * -* Copyright IBM Corp. 2002, 2013 +* Copyright IBM Corp. 2002, 2015 */ #define KMSG_COMPONENT "zfcp"
@@ -508,7 +508,10 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)fc_host_port_type (shost) =FC_PORTTYPE_PTP ;break ;case FSF_TOPO_FABRIC : -fc_host_port_type (shost) =FC_PORTTYPE_NPORT ; +if (bottom->connection_features &FSF_FEATURE_NPIV_MODE ) +fc_host_port_type (shost) =FC_PORTTYPE_NPIV ; +else +fc_host_port_type (shost) =FC_PORTTYPE_NPORT ;break ;case FSF_TOPO_AL :fc_host_port_type (shost) =FC_PORTTYPE_NLPORT ;
@@ -613,7 +616,6 @@ static void zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *req)if (adapter->connection_features &FSF_FEATURE_NPIV_MODE ) {fc_host_permanent_port_name (shost) = bottom->wwpn; -fc_host_port_type (shost) =FC_PORTTYPE_NPIV ; }else fc_host_permanent_port_name (shost) =fc_host_port_name (shost);fc_host_maxframe_size (shost) = bottom->maximum_frame_size;
@@ -982,8 +984,12 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,if (zfcp_adapter_multi_buffer_active (adapter)) {if (zfcp_qdio_sbals_from_sg (qdio, &req->qdio_req, sg_req))return -EIO ; + qtcb->bottom.support.req_buf_length = +zfcp_qdio_real_bytes (sg_req);if (zfcp_qdio_sbals_from_sg (qdio, &req->qdio_req, sg_resp))return -EIO ; + qtcb->bottom.support.resp_buf_length = +zfcp_qdio_real_bytes (sg_resp);zfcp_qdio_set_data_div (qdio, &req->qdio_req,zfcp_qdio_sbale_count (sg_req));
@@ -1073,6 +1079,7 @@ int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *wka_port, req->handler = zfcp_fsf_send_ct_handler; req->qtcb->header.port_handle = wka_port->handle; + ct->d_id = wka_port->d_id; req->data = ct;zfcp_dbf_san_req ("fssct_1" , req, wka_port->d_id);
@@ -1169,6 +1176,7 @@ int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,hton24 (req->qtcb->bottom.support.d_id, d_id); req->handler = zfcp_fsf_send_els_handler; + els->d_id = d_id; req->data = els;zfcp_dbf_san_req ("fssels1" , req, d_id);
@@ -1575,7 +1583,7 @@ out:int zfcp_fsf_open_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req; +struct zfcp_fsf_req *req =NULL ;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1604,6 +1612,8 @@ int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)zfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); +if (req && !IS_ERR (req)) +zfcp_dbf_rec_run_wka ("fsowp_1" , wka_port, req->req_id);return retval; }
@@ -1628,7 +1638,7 @@ static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req)int zfcp_fsf_close_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req; +struct zfcp_fsf_req *req =NULL ;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1657,6 +1667,8 @@ int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)zfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); +if (req && !IS_ERR (req)) +zfcp_dbf_rec_run_wka ("fscwp_1" , wka_port, req->req_id);return retval; }
drivers/s390/scsi/zfcp_fsf.h +3 -1
@@ -3,7 +3,7 @@* * Interface to the FSF support functions. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2015 */ #ifndef FSF_H
@@ -436,6 +436,7 @@ struct zfcp_blk_drv_data {* @handler_data: data passed to handler function * @port: Optional pointer to port for zfcp internal ELS (only test link ADISC) * @status: used to pass error status to calling function +* @d_id: Destination ID of either open WKA port for CT or of D_ID for ELS */ struct zfcp_fsf_ct_els {struct scatterlist *req;
@@ -444,6 +445,7 @@ struct zfcp_fsf_ct_els {void *handler_data;struct zfcp_port *port;int status; + u32 d_id; };#endif /* FSF_H */
drivers/s390/scsi/zfcp_scsi.c +7 -1
@@ -3,7 +3,7 @@* * Interface to Linux SCSI midlayer. * -* Copyright IBM Corp. 2002, 2013 +* Copyright IBM Corp. 2002, 2015 */ #define KMSG_COMPONENT "zfcp"
@@ -556,6 +556,9 @@ static void zfcp_scsi_rport_register(struct zfcp_port *port) ids.port_id = port->d_id; ids.roles =FC_RPORT_ROLE_FCP_TARGET ; +zfcp_dbf_rec_trig ("scpaddy" , port->adapter, port,NULL , +ZFCP_PSEUDO_ERP_ACTION_RPORT_ADD , +ZFCP_PSEUDO_ERP_ACTION_RPORT_ADD ); rport =fc_remote_port_add (port->adapter->scsi_host,0 , &ids);if (!rport) { dev_err(&port->adapter->ccw_device->dev,
@@ -577,6 +580,9 @@ static void zfcp_scsi_rport_block(struct zfcp_port *port)struct fc_rport *rport = port->rport;if (rport) { +zfcp_dbf_rec_trig ("scpdely" , port->adapter, port,NULL , +ZFCP_PSEUDO_ERP_ACTION_RPORT_DEL , +ZFCP_PSEUDO_ERP_ACTION_RPORT_DEL );fc_remote_port_delete (rport); port->rport =NULL ; }
drivers/scsi/scsi_scan.c +1 -1
@@ -1472,12 +1472,12 @@ retry: out_err:kfree (lun_data); out: -scsi_device_put (sdev);if (scsi_device_created (sdev))/* * the sdev we used didn't appear in the report luns scan */ __scsi_remove_device (sdev); +scsi_device_put (sdev);return ret; }
drivers/soc/fsl/qe/gpio.c +2 -1
@@ -41,7 +41,8 @@ struct qe_gpio_chip {static void qe_gpio_save_regs (struct of_mm_gpio_chip *mm_gc) { -struct qe_gpio_chip *qe_gc =gpiochip_get_data (&mm_gc->gc); +struct qe_gpio_chip *qe_gc = + container_of(mm_gc, struct qe_gpio_chip, mm_gc);struct qe_pio_regs __iomem *regs = mm_gc->regs; qe_gc->cpdata =in_be32 (®s->cpdata);
drivers/soc/fsl/qe/qe_common.c +8 -0
@@ -70,6 +70,11 @@ int cpm_muram_init(void) } muram_pool =gen_pool_create (0 ,-1 ); +if (!muram_pool) { +pr_err ("Cannot allocate memory pool for CPM/QE muram" ); + ret = -ENOMEM ; + goto out_muram; + } muram_pbase =of_translate_address (np, zero);if (muram_pbase == (phys_addr_t )OF_BAD_ADDR ) {pr_err ("Cannot translate zero through CPM muram node" );
@@ -116,6 +121,9 @@ static unsigned long cpm_muram_alloc_common(unsigned long size,struct muram_block *entry;unsigned long start; +if (!muram_pool &&cpm_muram_init ()) + goto out2; + start =gen_pool_alloc_algo (muram_pool, size, algo, data);if (!start) goto out2;
drivers/target/target_core_transport.c +11 -16
@@ -754,15 +754,7 @@ EXPORT_SYMBOL(target_complete_cmd);void target_complete_cmd_with_length (struct se_cmd *cmd,u8 scsi_status,int length) { -if (scsi_status !=SAM_STAT_GOOD ) { -return ; - } - -/* -* Calculate new residual count based upon length of SCSI data -* transferred. -*/ -if (length < cmd->data_length) { +if (scsi_status ==SAM_STAT_GOOD && length < cmd->data_length) {if (cmd->se_cmd_flags &SCF_UNDERFLOW_BIT ) { cmd->residual_count += cmd->data_length - length; }else {
@@ -771,12 +763,6 @@ void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int len } cmd->data_length = length; - }else if (length > cmd->data_length) { - cmd->se_cmd_flags |=SCF_OVERFLOW_BIT ; - cmd->residual_count = length - cmd->data_length; - }else { - cmd->se_cmd_flags &= ~(SCF_OVERFLOW_BIT |SCF_UNDERFLOW_BIT ); - cmd->residual_count =0 ; }target_complete_cmd (cmd, scsi_status);
@@ -1706,6 +1692,7 @@ void transport_generic_request_failure(struct se_cmd *cmd,case TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED :case TCM_LOGICAL_BLOCK_APP_TAG_CHECK_FAILED :case TCM_LOGICAL_BLOCK_REF_TAG_CHECK_FAILED : +case TCM_COPY_TARGET_DEVICE_NOT_REACHABLE :break ;case TCM_OUT_OF_RESOURCES : sense_reason =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ;
@@ -2547,8 +2534,10 @@ int target_get_sess_cmd(struct se_cmd *se_cmd, bool ack_kref)* fabric acknowledgement that requires two target_put_sess_cmd() * invocations before se_cmd descriptor release. */ -if (ack_kref) +if (ack_kref) {kref_get (&se_cmd->cmd_kref); + se_cmd->se_cmd_flags |=SCF_ACK_KREF ; + }spin_lock_irqsave (&se_sess->sess_cmd_lock, flags);if (se_sess->sess_tearing_down) {
@@ -2871,6 +2860,12 @@ static const struct sense_info sense_info_table[] = { .ascq = 0x03, /* LOGICAL BLOCK REFERENCE TAG CHECK FAILED */ .add_sector_info = true, }, + [TCM_COPY_TARGET_DEVICE_NOT_REACHABLE] = { + .key = COPY_ABORTED, + .asc = 0x0d, + .ascq = 0x02, /* COPY TARGET DEVICE NOT REACHABLE */ + + }, [TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE] = {/* * Returning ILLEGAL REQUEST would cause immediate IO errors on
drivers/target/target_core_xcopy.c +26 -8
@@ -104,7 +104,7 @@ static int target_xcopy_locate_se_dev_e4(struct se_cmd *se_cmd, struct xcopy_op }mutex_unlock (&g_device_mutex); -pr_err ("Unable to locate 0xe4 descriptor for EXTENDED_COPY\n" ); +pr_debug_ratelimited ("Unable to locate 0xe4 descriptor for EXTENDED_COPY\n" );return -EINVAL ; }
@@ -185,7 +185,7 @@ static int target_xcopy_parse_tiddesc_e4(struct se_cmd *se_cmd, struct xcopy_opstatic int target_xcopy_parse_target_descriptors (struct se_cmd *se_cmd,struct xcopy_op *xop,unsigned char *p, -unsigned short tdll) +unsigned short tdll,sense_reason_t *sense_ret) {struct se_device *local_dev = se_cmd->se_dev;unsigned char *desc = p;
@@ -193,6 +193,8 @@ static int target_xcopy_parse_target_descriptors(struct se_cmd *se_cmd,unsigned short start =0 ;bool src = true; + *sense_ret =TCM_INVALID_PARAMETER_LIST ; +if (offset !=0 ) {pr_err ("XCOPY target descriptor list length is not" " multiple of %d\n" ,XCOPY_TARGET_DESC_LEN );
@@ -243,9 +245,16 @@ static int target_xcopy_parse_target_descriptors(struct se_cmd *se_cmd, rc =target_xcopy_locate_se_dev_e4 (se_cmd, xop, true); else rc =target_xcopy_locate_se_dev_e4 (se_cmd, xop, false); - -if (rc <0 ) +/* +* If a matching IEEE NAA 0x83 descriptor for the requested device +* is not located on this node, return COPY_ABORTED with ASQ/ASQC +* 0x0d/0x02 - COPY_TARGET_DEVICE_NOT_REACHABLE to request the +* initiator to fall back to normal copy method. +*/ +if (rc <0 ) { + *sense_ret =TCM_COPY_TARGET_DEVICE_NOT_REACHABLE ; goto out; + }pr_debug ("XCOPY TGT desc: Source dev: %p NAA IEEE WWN: 0x%16phN\n" , xop->src_dev, &xop->src_tid_wwn[0 ]);
@@ -653,6 +662,7 @@ static int target_xcopy_read_source( rc =target_xcopy_setup_pt_cmd (xpt_cmd, xop, src_dev, &cdb[0 ], remote_port, true);if (rc <0 ) { + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;transport_generic_free_cmd (se_cmd,0 );return rc; }
@@ -664,6 +674,7 @@ static int target_xcopy_read_source( rc =target_xcopy_issue_pt_cmd (xpt_cmd);if (rc <0 ) { + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;transport_generic_free_cmd (se_cmd,0 );return rc; }
@@ -714,6 +725,7 @@ static int target_xcopy_write_destination( remote_port, false);if (rc <0 ) {struct se_cmd *src_cmd = &xop->src_pt_cmd->se_cmd; + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;/* * If the failure happened before the t_mem_list hand-off in * target_xcopy_setup_pt_cmd(), Reset memory + clear flag so that
@@ -729,6 +741,7 @@ static int target_xcopy_write_destination( rc =target_xcopy_issue_pt_cmd (xpt_cmd);if (rc <0 ) { + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status; se_cmd->se_cmd_flags &= ~SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC ;transport_generic_free_cmd (se_cmd,0 );return rc;
@@ -815,9 +828,14 @@ static void target_xcopy_do_work(struct work_struct *work) out:xcopy_pt_undepend_remotedev (xop);kfree (xop); - -pr_warn ("target_xcopy_do_work: Setting X-COPY CHECK_CONDITION -> sending response\n" ); - ec_cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; +/* +* Don't override an error scsi status if it has already been set +*/ +if (ec_cmd->scsi_status ==SAM_STAT_GOOD ) { +pr_warn_ratelimited ("target_xcopy_do_work: rc: %d, Setting X-COPY" +" CHECK_CONDITION -> sending response\n" , rc); + ec_cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; + }target_complete_cmd (ec_cmd,SAM_STAT_CHECK_CONDITION ); }
@@ -875,7 +893,7 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd)" tdll: %hu sdll: %u inline_dl: %u\n" , list_id, list_id_usage, tdll, sdll, inline_dl); - rc =target_xcopy_parse_target_descriptors (se_cmd, xop, &p[16 ], tdll); + rc =target_xcopy_parse_target_descriptors (se_cmd, xop, &p[16 ], tdll, &ret);if (rc <=0 ) goto out;
drivers/target/tcm_fc/tfc_cmd.c +1 -1
@@ -572,7 +572,7 @@ static void ft_send_work(struct work_struct *work)if (target_submit_cmd (&cmd->se_cmd, cmd->sess->se_sess, fcp->fc_cdb, &cmd->ft_sense_buffer[0 ],scsilun_to_int (&fcp->fc_lun),ntohl (fcp->fc_dl), task_attr, data_dir, -TARGET_SCF_ACK_KREF )) +TARGET_SCF_ACK_KREF |TARGET_SCF_USE_CPUID )) goto err;pr_debug ("r_ctl %x alloc target_submit_cmd\n" , fh->fh_r_ctl);
drivers/video/fbdev/efifb.c +3 -3
@@ -50,9 +50,9 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,return 1 ;if (regno <16 ) { - red >>=8 ; - green >>=8 ; - blue >>=8 ; + red >>=16 - info->var.red.length; + green >>=16 - info->var.green.length; + blue >>=16 - info->var.blue.length; ((u32 *)(info->pseudo_palette))[regno] = (red << info->var.red.offset) | (green << info->var.green.offset) |
drivers/watchdog/mt7621_wdt.c +0 -1
@@ -139,7 +139,6 @@ static int mt7621_wdt_probe(struct platform_device *pdev)if (!IS_ERR (mt7621_wdt_reset))reset_control_deassert (mt7621_wdt_reset); - mt7621_wdt_dev.dev = &pdev->dev; mt7621_wdt_dev.bootstatus =mt7621_wdt_bootcause (); watchdog_init_timeout(&mt7621_wdt_dev, mt7621_wdt_dev.max_timeout,
drivers/watchdog/rt2880_wdt.c +0 -1
@@ -158,7 +158,6 @@ static int rt288x_wdt_probe(struct platform_device *pdev) rt288x_wdt_freq =clk_get_rate (rt288x_wdt_clk) /RALINK_WDT_PRESCALE ; - rt288x_wdt_dev.dev = &pdev->dev; rt288x_wdt_dev.bootstatus =rt288x_wdt_bootcause (); rt288x_wdt_dev.max_timeout = (0xfffful / rt288x_wdt_freq); rt288x_wdt_dev.parent = &pdev->dev;
fs/ceph/file.c +2 -1
@@ -1272,7 +1272,8 @@ again: statret =__ceph_do_getattr (inode, page,CEPH_STAT_CAP_INLINE_DATA , !!page);if (statret <0 ) { -__free_page (page); +if (page) +__free_page (page);if (statret == -ENODATA ) {BUG_ON (retry_op !=READ_INLINE ); goto again;
fs/cifs/cifs_debug.c +1 -0
@@ -152,6 +152,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)list_for_each (tmp1, &cifs_tcp_ses_list) { server = list_entry(tmp1, struct TCP_Server_Info, tcp_ses_list); +seq_printf (m,"\nNumber of credits: %d" , server->credits); i++;list_for_each (tmp2, &server->smb_ses_list) { ses = list_entry(tmp2, struct cifs_ses,
fs/cifs/cifsfs.c +1 -2
@@ -271,7 +271,7 @@ cifs_alloc_inode(struct super_block *sb) cifs_inode->createtime =0 ; cifs_inode->epoch =0 ;#ifdef CONFIG_CIFS_SMB2 -get_random_bytes (cifs_inode->lease_key,SMB2_LEASE_KEY_SIZE ); +generate_random_uuid (cifs_inode->lease_key);#endif /* * Can not set i_flags here - they get immediately overwritten to zero
@@ -1271,7 +1271,6 @@ init_cifs(void) GlobalTotalActiveXid =0 ; GlobalMaxActiveXid =0 ;spin_lock_init (&cifs_tcp_ses_lock); -spin_lock_init (&cifs_file_list_lock);spin_lock_init (&GlobalMid_Lock);get_random_bytes (&cifs_lock_secret,sizeof (cifs_lock_secret));
fs/cifs/cifsglob.h +15 -15
@@ -833,6 +833,7 @@ struct cifs_tcon {struct list_head tcon_list;int tc_count;struct list_head openFileList; +spinlock_t open_file_lock;/* protects list above */ struct cifs_ses *ses;/* pointer to session associated with */ char treeName[MAX_TREE_SIZE +1 ];/* UNC name of resource in ASCII */ char *nativeFileSystem;
@@ -889,7 +890,7 @@ struct cifs_tcon {#endif /* CONFIG_CIFS_STATS2 */ __u64 bytes_read;__u64 bytes_written; -spinlock_t stat_lock; +spinlock_t stat_lock;/* protects the two fields above */ #endif /* CONFIG_CIFS_STATS */ FILE_SYSTEM_DEVICE_INFO fsDevInfo;FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo;/* ok if fs name truncated */
@@ -1040,8 +1041,10 @@ struct cifs_fid_locks { };struct cifsFileInfo { +/* following two lists are protected by tcon->open_file_lock */ struct list_head tlist;/* pointer to next fid owned by tcon */ struct list_head flist;/* next fid (file instance) for this inode */ +/* lock list below protected by cifsi->lock_sem */ struct cifs_fid_locks *llist;/* brlocks held by this fid */ kuid_t uid;/* allows finding which FileInfo structure */ __u32 pid;/* process id who opened file */
@@ -1049,11 +1052,12 @@ struct cifsFileInfo {/* BB add lock scope info here if needed */ ;/* lock scope id (0 if none) */ struct dentry *dentry; -unsigned int f_flags;struct tcon_link *tlink; +unsigned int f_flags; bool invalidHandle:1; /* file closed via session abend */ bool oplock_break_cancelled:1; -int count;/* refcount protected by cifs_file_list_lock */ +int count; +spinlock_t file_info_lock;/* protects four flag/count fields above */ struct mutex fh_mutex;/* prevents reopen race after dead ses*/ struct cifs_search_info srch_inf;struct work_struct oplock_break;/* work for oplock breaks */
@@ -1120,7 +1124,7 @@ struct cifs_writedata {/* * Take a reference on the file private data. Must be called with -* cifs_file_list_lock held. +* cfile->file_info_lock held. */ static inline void cifsFileInfo_get_locked (struct cifsFileInfo *cifs_file)
@@ -1514,8 +1518,10 @@ require use of the stronger protocol */* GlobalMid_Lock protects: * list operations on pending_mid_q and oplockQ * updates to XID counters, multiplex id and SMB sequence numbers -* cifs_file_list_lock protects: -* list operations on tcp and SMB session lists and tCon lists +* tcp_ses_lock protects: +* list operations on tcp and SMB session lists +* tcon->open_file_lock protects the list of open files hanging off the tcon +* cfile->file_info_lock protects counters and fields in cifs file struct * f_owner.lock protects certain per file struct operations * mapping->page_lock protects certain per page operations *
@@ -1547,18 +1553,12 @@ GLOBAL_EXTERN struct list_head cifs_tcp_ses_list;* tcp session, and the list of tcon's per smb session. It also protects * the reference counters for the server, smb session, and tcon. Finally, * changes to the tcon->tidStatus should be done while holding this lock. +* generally the locks should be taken in order tcp_ses_lock before +* tcon->open_file_lock and that before file->file_info_lock since the +* structure order is cifs_socket-->cifs_ses-->cifs_tcon-->cifs_file */ GLOBAL_EXTERN spinlock_t cifs_tcp_ses_lock; -/* -* This lock protects the cifs_file->llist and cifs_file->flist -* list operations, and updates to some flags (cifs_file->invalidHandle) -* It will be moved to either use the tcon->stat_lock or equivalent later. -* If cifs_tcp_ses_lock and the lock below are both needed to be held, then -* the cifs_tcp_ses_lock must be grabbed first and released last. -*/ -GLOBAL_EXTERN spinlock_t cifs_file_list_lock; -#ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ /* Outstanding dir notify requests */ GLOBAL_EXTERN struct list_head GlobalDnotifyReqList;
fs/cifs/cifssmb.c +2 -2
@@ -98,13 +98,13 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon)struct list_head *tmp1;/* list all files open on tree connection and mark them invalid */ -spin_lock (&cifs_file_list_lock); +spin_lock (&tcon->open_file_lock);list_for_each_safe (tmp, tmp1, &tcon->openFileList) { open_file = list_entry(tmp, struct cifsFileInfo, tlist); open_file->invalidHandle = true; open_file->oplock_break_cancelled = true; } -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);/* * BB Add call to invalidate_inodes(sb) for all superblocks mounted * to this tcon.
fs/cifs/connect.c +9 -7
@@ -2163,7 +2163,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info)memcpy (&tcp_ses->dstaddr, &volume_info->dstaddr,sizeof (tcp_ses->dstaddr));#ifdef CONFIG_CIFS_SMB2 -get_random_bytes (tcp_ses->client_guid,SMB2_CLIENT_GUID_SIZE ); +generate_random_uuid (tcp_ses->client_guid);
Lines of this file are not shown. View the raw message.
fs/cifs/file.c +39 -27
66 lines not on this page · raw message
fs/pstore/ram_core.c +5 -44
49 lines not on this page · raw message
include/dt-bindings/clock/imx6qdl-clock.h +3 -1
Lines of this file are not shown. View the raw message.
include/linux/cpufreq.h +52 -52
104 lines not on this page · raw message
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +38 -0
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.