Linux 4.18.7
Greg KH
maintainerI'm announcing the release of the 4.18.7 kernel.
All users of the 4.18 kernel series must upgrade.
The updated 4.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/alpha/kernel/osf_sys.c | 51 ++++----- arch/arm/boot/dts/am571x-idk.dts | 4 arch/arm/boot/dts/am572x-idk-common.dtsi | 4 arch/arm/boot/dts/am57xx-idk-common.dtsi | 7 + arch/arm/boot/dts/tegra30-cardhu.dtsi | 1 arch/arm64/Kconfig | 1 arch/arm64/crypto/sm4-ce-glue.c | 2 arch/powerpc/include/asm/fadump.h | 3 arch/powerpc/include/asm/nohash/pgtable.h | 9 - arch/powerpc/include/asm/pkeys.h | 11 - arch/powerpc/kernel/fadump.c | 91 +++++++++++++--- arch/powerpc/kernel/process.c | 1 arch/powerpc/kvm/book3s_hv.c | 1 arch/powerpc/mm/mmu_context_book3s64.c | 8 - arch/powerpc/mm/mmu_context_iommu.c | 17 +-- arch/powerpc/mm/pgtable-book3s64.c | 17 +-- arch/powerpc/mm/pkeys.c | 134 +++++++----------------- arch/powerpc/platforms/powernv/pci-ioda.c | 37 ++++++ arch/powerpc/platforms/pseries/ras.c | 2 arch/sparc/kernel/sys_sparc_32.c | 22 ++- arch/sparc/kernel/sys_sparc_64.c | 20 ++- arch/x86/crypto/aesni-intel_asm.S | 66 +++++------ arch/x86/kernel/kexec-bzimage64.c | 2 arch/x86/kvm/vmx.c | 26 ++-- arch/xtensa/include/asm/cacheasm.h | 69 +++++++----- block/bfq-cgroup.c | 3 block/blk-core.c | 61 ++++++---- block/blk-lib.c | 10 + block/blk-sysfs.c | 15 ++ block/blk.h | 1 certs/system_keyring.c | 3 crypto/asymmetric_keys/pkcs7_key_type.c | 2 drivers/acpi/acpica/hwsleep.c | 11 - drivers/acpi/acpica/psloop.c | 17 +-- drivers/block/zram/zram_drv.c | 7 + drivers/cpufreq/cpufreq_governor.c | 12 +- drivers/cpuidle/governors/menu.c | 47 ++++++-- drivers/crypto/caam/caamalg_qi.c | 6 - drivers/crypto/caam/caampkc.c | 20 +-- drivers/crypto/caam/jr.c | 3 drivers/crypto/vmx/aes_cbc.c | 30 ++--- drivers/crypto/vmx/aes_xts.c | 21 ++- drivers/dma-buf/reservation.c | 6 - drivers/extcon/extcon.c | 3 drivers/hv/channel.c | 40 ++++--- drivers/hv/channel_mgmt.c | 10 + drivers/i2c/busses/i2c-designware-master.c | 1 drivers/i2c/busses/i2c-designware-platdrv.c | 7 + drivers/iio/accel/sca3000.c | 1 drivers/iio/frequency/ad9523.c | 4 drivers/infiniband/hw/mlx5/main.c | 2 drivers/infiniband/hw/mlx5/qp.c | 6 - drivers/infiniband/sw/rxe/rxe_comp.c | 1 drivers/infiniband/ulp/srpt/ib_srpt.c | 34 ++++-- drivers/infiniband/ulp/srpt/ib_srpt.h | 4 drivers/iommu/dmar.c | 6 - drivers/iommu/intel-iommu.c | 18 +++ drivers/iommu/ipmmu-vmsa.c | 7 + drivers/mailbox/mailbox-xgene-slimpro.c | 6 - drivers/md/bcache/writeback.c | 4 drivers/md/dm-cache-metadata.c | 13 +- drivers/md/dm-crypt.c | 10 - drivers/md/dm-integrity.c | 6 - drivers/md/dm-thin.c | 2 drivers/md/dm-writecache.c | 2 drivers/media/i2c/tvp5150.c | 2 drivers/mfd/hi655x-pmic.c | 2 drivers/misc/cxl/main.c | 2 drivers/misc/ocxl/link.c | 24 ++-- drivers/misc/vmw_balloon.c | 67 +++++++----- drivers/mmc/core/queue.c | 12 +- drivers/mmc/core/queue.h | 1 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 10 + drivers/net/wireless/marvell/libertas/dev.h | 1 drivers/net/wireless/marvell/libertas/if_sdio.c | 30 ++++- drivers/nvdimm/bus.c | 4 drivers/nvdimm/dimm_devs.c | 31 +++++ drivers/nvdimm/namespace_devs.c | 6 - drivers/nvdimm/nd-core.h | 8 + drivers/nvdimm/region_devs.c | 24 ++++ drivers/pwm/pwm-omap-dmtimer.c | 5 drivers/pwm/pwm-tiehrpwm.c | 14 -- drivers/rtc/rtc-omap.c | 18 +-- drivers/spi/spi-cadence.c | 2 drivers/spi/spi-davinci.c | 2 drivers/spi/spi-fsl-dspi.c | 24 ++-- drivers/spi/spi-pxa2xx.c | 4 drivers/tty/serial/serial_core.c | 17 ++- drivers/video/fbdev/core/fbmem.c | 38 +++++- drivers/video/fbdev/udlfb.c | 105 ++++++++++-------- fs/9p/xattr.c | 6 - fs/lockd/clntlock.c | 2 fs/lockd/clntproc.c | 2 fs/lockd/svclock.c | 16 +- fs/lockd/svcsubs.c | 4 fs/nfs/blocklayout/dev.c | 2 fs/nfs/callback_proc.c | 14 +- fs/nfs/nfs4proc.c | 9 + fs/nfs/pnfs_nfs.c | 16 +- fs/nfsd/nfs4state.c | 2 fs/overlayfs/readdir.c | 19 +++ fs/quota/quota.c | 2 fs/ubifs/dir.c | 5 fs/ubifs/journal.c | 21 +++ fs/ubifs/lprops.c | 8 - fs/ubifs/xattr.c | 24 ++++ fs/udf/super.c | 31 +++-- fs/xattr.c | 2 include/linux/blk-cgroup.h | 18 +++ include/linux/hyperv.h | 2 include/linux/intel-iommu.h | 8 - include/linux/lockd/lockd.h | 4 include/linux/mm_types.h | 5 include/linux/overflow.h | 31 +++++ include/linux/sunrpc/clnt.h | 1 include/linux/verification.h | 6 + include/uapi/linux/eventpoll.h | 8 - include/video/udlfb.h | 5 kernel/livepatch/core.c | 6 + kernel/memremap.c | 1 kernel/power/Kconfig | 1 kernel/printk/printk_safe.c | 4 kernel/rcu/tree_exp.h | 9 + kernel/sched/idle.c | 2 kernel/sys.c | 95 ++++++++--------- kernel/trace/blktrace.c | 4 kernel/trace/trace.c | 4 kernel/trace/trace_uprobe.c | 2 kernel/user_namespace.c | 24 +--- kernel/utsname_sysctl.c | 41 ++++--- mm/hmm.c | 2 mm/memory.c | 9 - mm/readahead.c | 12 +- net/9p/client.c | 2 net/9p/trans_fd.c | 7 + net/9p/trans_rdma.c | 3 net/9p/trans_virtio.c | 13 ++ net/9p/trans_xen.c | 3 net/ieee802154/6lowpan/tx.c | 21 +++ net/mac802154/tx.c | 15 ++ net/sunrpc/clnt.c | 28 +++-- scripts/kconfig/Makefile | 5 security/apparmor/secid.c | 1 security/commoncap.c | 2 sound/ac97/bus.c | 4 sound/ac97/snd_ac97_compat.c | 19 +++ tools/perf/util/auxtrace.c | 3 148 files changed, 1373 insertions(+), 765 deletions(-)
Adrian Hunter (2):
mmc: block: Fix unsupported parallel dispatch of requests perf auxtrace: Fix queue resize
Alexander Aring (2):
net: 6lowpan: fix reserved space for single frames
net: mac802154: tx: expand tailroom if necessary
Amir Goldstein (2):
ovl: fix wrong use of impure dir cache in ovl_iterate()
nfsd: fix leaked file lock with nfs exported overlayfs
Ard Biesheuvel (1):
crypto: arm64/sm4-ce - check for the right CPU feature bit
Bart Van Assche (9):
blkcg: Introduce blkg_root_lookup()
block: Introduce blk_exit_queue()
block: Ensure that a request queue is dissociated from the cgroup controller IB/srpt: Fix srpt_cm_req_recv() error path (1/2)
IB/srpt: Fix srpt_cm_req_recv() error path (2/2)
IB/srpt: Support HCAs with more than two ports
ib_srpt: Fix a use-after-free in srpt_close_ch()
ib_srpt: Fix a use-after-free in __srpt_close_all_ch() RDMA/rxe: Set wqe->status correctly if an unexpected response is received
Bartosz Golaszewski (1):
spi: davinci: fix a NULL pointer dereference
Benjamin Herrenschmidt (1):
powerpc/powernv/pci: Work around races in PCI bridge enabling
Bill Baker (1):
NFSv4 client live hangs after live data migration recovery
Boqun Feng (1):
rcu: Make expedited GPs handle CPU 0 being offline
Chanwoo Choi (1):
extcon: Release locking when sending the notification of connector state
Chirantan Ekbote (1):
9p/net: Fix zero-copy path in the 9p virtio transport
Christian Brauner (1):
getxattr: use correct xattr length
Christophe Leroy (1):
powerpc/nohash: fix pte_access_permitted()
Dan Carpenter (1):
pnfs/blocklayout: off by one in bl_map_stripe()
Dan Williams (1):
mm, dev_pagemap: Do not clear ->mapping on final put
Daniel Mack (1):
libertas: fix suspend and resume for SDIO connected cards
Dave Watson (1):
crypto: aesni - Use unaligned loads from gcm_context_data
David Rivshin (1):
pwm: omap-dmtimer: Return -EPROBE_DEFER if no dmtimer platform data
Dexuan Cui (2):
Drivers: hv: vmbus: Fix the offer_in_progress in vmbus_process_offer()
Drivers: hv: vmbus: Reset the channel callback in vmbus_onoffer_rescind()
Dmitry Osipenko (1):
iommu/ipmmu-vmsa: Don't register as BUS IOMMU if machine doesn't have IPMMU-VMSA
Eddie.Horng (1):
cap_inode_getsecurity: use d_find_any_alias() instead of d_find_alias()
Erik Schmauss (1):
ACPICA: AML Parser: skip opcodes that open a scope upon parse failure
Frederic Barrat (1):
ocxl: Fix page fault handler in case of fault on dying process
Greg Kroah-Hartman (2):
eventpoll.h: wrap casts in () properly
Linux 4.18.7
Gustavo A. R. Silva (2):
mailbox: xgene-slimpro: Fix potential NULL pointer dereference
iio: sca3000: Fix missing return in switch
Hans de Goede (1):
i2c: designware: Re-init controllers with pm_disabled set on resume
Hari Bathini (1):
powerpc/fadump: handle crash memory ranges array index overflow
Henry Willard (1):
cpufreq: governor: Avoid accessing invalid governor_data
Horia Geantă (3):
crypto: caam - fix DMA mapping direction for RSA forms 2 & 3
crypto: caam/jr - fix descriptor DMA unmapping
crypto: caam/qi - fix error path in xts setkey
Hou Tao (1):
dm thin: stop no_space_timeout worker when switching to write-mode
Ilya Dryomov (1):
dm cache metadata: set dirty on all cache blocks after a crash
Jacob Pan (2):
iommu/vt-d: Add definitions for PFSID
iommu/vt-d: Fix dev iotlb pfsid use
James Morse (1):
arm64: mm: always enable CONFIG_HOLES_IN_ZONE
Jan Kara (1):
udf: Fix mounting of Win7 created UDF filesystems
Janek Kotas (1):
spi: cadence: Change usleep_range() to udelay(), for atomic context
Jann Horn (2):
sys: don't hold uts_sem while accessing userspace memory
userns: move user access out of the mutex
Jason Gunthorpe (2):
IB/mlx5: Fix leaking stack memory to userspace overflow.h: Add arithmetic shift helper
Javier Martinez Canillas (1):
media: Revert "[media] tvp5150: fix pad format frame height"
Jeremy Cline (1):
fs/quota: Fix spectre gadget in do_quotactl
Johan Hovold (2):
rtc: omap: fix resource leak in registration error path
rtc: omap: fix potential crash on power off
John Johansen (1):
apparmor: fix bad debug check in apparmor_secid_to_secctx()
Jon Hunter (1):
ARM: tegra: Fix Tegra30 Cardhu PCA954x reset
Kamalesh Babulal (1):
livepatch: Validate module/old func name length
Keith Busch (1):
libnvdimm: Use max contiguous area for namespace size
Krzysztof Kozlowski (1):
spi: spi-fsl-dspi: Fix imprecise abort on VF500 during probe
Lars-Peter Clausen (2):
iio: ad9523: Fix displayed phase
iio: ad9523: Fix return value for ad952x_store()
Leon Romanovsky (1):
RDMA/mlx5: Fix shift overflow in mlx5_ib_create_wq
Lihua Yao (3):
ALSA: ac97: fix device initialization in the compat layer
ALSA: ac97: fix check of pm_runtime_get_sync failure
ALSA: ac97: fix unbalanced pm_runtime_enable
Luke Dashjr (1):
powerpc64/ftrace: Include ftrace.h needed for enable/disable calls
Maciej S. Szmigiero (1):
block, bfq: return nbytes and not zero from struct cftype .write() method
Mahesh Salgaonkar (1):
powerpc/pseries: Fix endianness while restoring of r3 in MCE handler.
Markus Stockhausen (1):
readahead: stricter check for bdi io_pages
Masahiro Yamada (1):
kconfig: fix "Can't open ..." in parallel build
Max Filippov (2):
xtensa: limit offsets in __loop_cache_{all,page}
xtensa: increase ranges in ___invalidate_{i,d}cache_all
Michel Dänzer (1):
dma-buf: Move BUG_ON from _add_shared_fence to _add_shared_inplace
Mika Westerberg (1):
spi: pxa2xx: Add support for Intel Ice Lake
Mike Snitzer (1):
dm cache metadata: save in-core policy_hint_size to on-disk superblock
Mikulas Patocka (12):
block: fix infinite loop if the device loses discard capability dm integrity: change 'suspending' variable from bool to int dm crypt: don't decrease device limits
dm writecache: fix a crash due to reading past end of dirty_bitmap
fb: fix lost console when the user unplugs a USB adapter
udlfb: fix semaphore value leak
udlfb: fix display corruption of the last line
udlfb: don't switch if we are switching to the same videomode
udlfb: set optimal write delay
udlfb: make a local copy of fb_ops
udlfb: handle allocation failure
udlfb: set line_length in dlfb_ops_set_par
Ming Lei (1):
block: really disable runtime-pm for blk-mq
Nadav Amit (4):
vmw_balloon: fix inflation of 64-bit GFNs
vmw_balloon: do not use 2MB without batching
vmw_balloon: VMCI_DOORBELL_SET does not check status
vmw_balloon: fix VMCI use when balloon built into kernel
Nicholas Piggin (1):
powerpc/64s: Fix page table fragment refcount race vs speculative references
Ondrej Mosnacek (1):
crypto: vmx - Fix sleep-in-atomic bugs
Paolo Bonzini (1):
KVM: VMX: fixes for vmentry_l1d_flush module parameter
Parav Pandit (1):
IB/mlx5: Honor cnt_set_id_valid flag instead of set_id
Paul Mackerras (1):
KVM: PPC: Book3S: Fix guest DMA when guest partially backed by THP pages
Peter Kalauskas (1):
drivers/block/zram/zram_drv.c: fix bug storing backing_dev
Peter Zijlstra (1):
mm/tlb: Remove tlb_remove_table() non-concurrent condition
Rafael David Tinoco (1):
mfd: hi655x: Fix regmap area declared size for hi655x
Rafael J. Wysocki (4):
ACPICA: Clear status of all events when entering sleep states
sched: idle: Avoid retaining the tick when it has been stopped
cpuidle: menu: Handle stopped tick more aggressively
cpuidle: menu: Retain tick when shallow state is selected
Ram Pai (6):
powerpc/pkeys: Give all threads control of their key permissions powerpc/pkeys: Deny read/write/execute by default powerpc/pkeys: key allocation/deallocation must not change pkey registers powerpc/pkeys: Save the pkey registers before fork powerpc/pkeys: Fix calculation of total pkeys. powerpc/pkeys: Preallocate execute-only key
Richard Weinberger (6):
ubifs: Fix memory leak in lprobs self-check Revert "UBIFS: Fix potential integer overflow in allocation"
ubifs: Check data node size before truncate
ubifs: xattr: Don't operate on deleted inodes
ubifs: Fix directory size calculation for symlinks
ubifs: Fix synced_i_size calculation for xattr inodes
Roger Quadros (1):
ARM: dts: am57xx-idk: Enable dual role for USB2 port
Sergei Shtylyov (2):
mmc: renesas_sdhi_internal_dmac: mask DMAC interrupts
mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
Shan Hai (1):
bcache: release dc->writeback_lock properly in bch_writeback_thread()
Steven Rostedt (VMware) (4):
tracing: Do not call start/stop() functions when tracing_on does not change tracing/blktrace: Fix to allow setting same value printk/tracing: Do not trace printk_nmi_enter()
uprobes: Use synchronize_rcu() not synchronize_sched()
Tomas Bortoli (3):
9p: fix multiple NULL-pointer-dereferences
net/9p/client.c: version pointer uninitialized net/9p/trans_fd.c: fix race-condition by flushing workqueue before the kfree()
Trond Myklebust (2):
NFSv4: Fix locking in pnfs_generic_recover_commit_reqs
NFSv4: Fix a sleep in atomic context in nfs4_callback_sequence()
Tycho Andersen (1):
uart: fix race between uart_put_char() and uart_shutdown()
Vaibhav Jain (1):
cxl: Fix wrong comparison in cxl_adapter_context_get()
Vignesh R (2):
pwm: tiehrpwm: Don't use emulation mode bits to control PWM output
pwm: tiehrpwm: Fix disabling of output of PWMs
Vishal Verma (1):
libnvdimm: fix ars_status output length calculation
Yannik Sembritzki (2):
Replace magic for trusting the secondary keyring with #define Fix kexec forbidding kernels signed with keys in the secondary keyring to boot
jiangyiwen (1):
9p/virtio: fix off-by-one error in sg list bounds check
piaojun (1):
fs/9p/xattr.c: catch the error of p9_client_clunk when setting xattr failed
xiao jin (1):
block: blk_init_allocated_queue() set q->fq as NULL in the fail case
zhangyi (F) (1):
PM / sleep: wakeup: Fix build error caused by missing SRCU support
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 18 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = NAME = Merciless Moray
arch/alpha/kernel/osf_sys.c +24 -27
92 lines not on this page · raw message
arch/arm/boot/dts/am571x-idk.dts +0 -4
@@ -66,10 +66,6 @@ }; }; -&omap_dwc3_2 { - extcon = <&extcon_usb2>; -}; - &extcon_usb2 { id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>; vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/am572x-idk-common.dtsi +0 -4
@@ -57,10 +57,6 @@ }; }; -&omap_dwc3_2 { - extcon = <&extcon_usb2>; -}; - &extcon_usb2 { id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>; vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/am57xx-idk-common.dtsi +6 -1
@@ -395,8 +395,13 @@ dr_mode = "host"; }; +&omap_dwc3_2 { + extcon = <&extcon_usb2>; +}; + &usb2 { - dr_mode = "peripheral"; + extcon = <&extcon_usb2>; + dr_mode = "otg"; }; &mmc1 {
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -0
@@ -206,6 +206,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x70>; + reset-gpio = <&gpio TEGRA_GPIO(BB, 0) GPIO_ACTIVE_LOW>; }; };
arch/arm64/Kconfig +0 -1
@@ -754,7 +754,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK config HOLES_IN_ZONE def_bool y - depends on NUMA source kernel/Kconfig.preempt source kernel/Kconfig.hz
arch/arm64/crypto/sm4-ce-glue.c +1 -1
@@ -69,5 +69,5 @@ static void __exit sm4_ce_mod_fini(void)crypto_unregister_alg (&sm4_ce_alg); } -module_cpu_feature_match (SM3 , sm4_ce_mod_init); +module_cpu_feature_match (SM4 , sm4_ce_mod_init);module_exit (sm4_ce_mod_fini);
arch/powerpc/include/asm/fadump.h +0 -3
@@ -195,9 +195,6 @@ struct fadump_crash_info_header {struct cpumask online_mask; }; -/* Crash memory ranges */ -#define INIT_CRASHMEM_RANGES (INIT_MEMBLOCK_REGIONS + 2) -struct fad_crash_memory_ranges {unsigned long long base;unsigned long long size;
arch/powerpc/include/asm/nohash/pgtable.h +3 -6
@@ -51,17 +51,14 @@ static inline int pte_present(pte_t pte)#define pte_access_permitted pte_access_permittedstatic inline bool pte_access_permitted (pte_t pte,bool write) { -unsigned long pteval =pte_val (pte);/* * A read-only access is controlled by _PAGE_USER bit. * We have _PAGE_READ set for WRITE and EXECUTE */ -unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER; - -if (write) - need_pte_bits |= _PAGE_WRITE; +if (!pte_present (pte) || !pte_user (pte) || !pte_read (pte)) +return false; -if ((pteval & need_pte_bits) != need_pte_bits) +if (write && !pte_write (pte))return false;return true;
arch/powerpc/include/asm/pkeys.h +0 -11
@@ -94,8 +94,6 @@ static inline bool mm_pkey_is_allocated(struct mm_struct *mm, int pkey) __mm_pkey_is_allocated(mm, pkey)); } -extern void __arch_activate_pkey (int pkey); -extern void __arch_deactivate_pkey (int pkey);/* * Returns a positive, 5-bit key on success, or -1 on failure. * Relies on the mmap_sem to protect against concurrency in mm_pkey_alloc() and
@@ -124,11 +122,6 @@ static inline int mm_pkey_alloc(struct mm_struct *mm) ret =ffz ((u32 )mm_pkey_allocation_map (mm));__mm_pkey_allocated (mm, ret); -/* -* Enable the key in the hardware -*/ -if (ret >0 ) -__arch_activate_pkey (ret);return ret; }
@@ -140,10 +133,6 @@ static inline int mm_pkey_free(struct mm_struct *mm, int pkey)if (!mm_pkey_is_allocated (mm, pkey))return -EINVAL ; -/* -* Disable the key in the hardware -*/ -__arch_deactivate_pkey (pkey);__mm_pkey_free (mm, pkey);return 0 ;
arch/powerpc/kernel/fadump.c +77 -14
167 lines not on this page · raw message
arch/powerpc/kernel/process.c +1 -0
@@ -583,6 +583,7 @@ static void save_all(struct task_struct *tsk)__giveup_spe (tsk);msr_check_and_clear (msr_all_available); +thread_pkey_regs_save (&tsk->thread); }void flush_all_to_thread (struct task_struct *tsk)
arch/powerpc/kvm/book3s_hv.c +1 -0
@@ -46,6 +46,7 @@#include <linux/compiler.h> #include <linux/of.h> +#include <asm/ftrace.h> #include <asm/reg.h> #include <asm/ppc-opcode.h> #include <asm/asm-prototypes.h>
arch/powerpc/mm/mmu_context_book3s64.c +4 -4
@@ -200,9 +200,9 @@ static void pte_frag_destroy(void *pte_frag)/* drop all the pending references */ count = ((unsigned long )pte_frag & ~PAGE_MASK ) >>PTE_FRAG_SIZE_SHIFT ;/* We allow PTE_FRAG_NR fragments from a PTE page */ -if (page_ref_sub_and_test (page,PTE_FRAG_NR - count)) { +if (atomic_sub_and_test (PTE_FRAG_NR - count, &page->pt_frag_refcount)) {pgtable_page_dtor (page); -free_unref_page (page); +__free_page (page); } }
@@ -215,9 +215,9 @@ static void pmd_frag_destroy(void *pmd_frag)/* drop all the pending references */ count = ((unsigned long )pmd_frag & ~PAGE_MASK ) >>PMD_FRAG_SIZE_SHIFT ;/* We allow PTE_FRAG_NR fragments from a PTE page */ -if (page_ref_sub_and_test (page,PMD_FRAG_NR - count)) { +if (atomic_sub_and_test (PMD_FRAG_NR - count, &page->pt_frag_refcount)) {pgtable_pmd_page_dtor (page); -free_unref_page (page); +__free_page (page); } }
arch/powerpc/mm/mmu_context_iommu.c +10 -7
@@ -129,6 +129,7 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,long i, j, ret =0 , locked_entries =0 ;unsigned int pageshift;unsigned long flags; +unsigned long cur_ua;struct page *page =NULL ;mutex_lock (&mem_list_mutex);
@@ -177,7 +178,8 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries, }for (i =0 ; i < entries; ++i) { -if (1 !=get_user_pages_fast (ua + (i <<PAGE_SHIFT ), + cur_ua = ua + (i <<PAGE_SHIFT ); +if (1 !=get_user_pages_fast (cur_ua,1 /* pages */ ,1 /* iswrite */ , &page)) { ret = -EFAULT ;for (j =0 ; j < i; ++j)
@@ -196,7 +198,7 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,if (is_migrate_cma_page (page)) {if (mm_iommu_move_page_from_cma (page)) goto populate; -if (1 !=get_user_pages_fast (ua + (i <<PAGE_SHIFT ), +if (1 !=get_user_pages_fast (cur_ua,1 /* pages */ ,1 /* iswrite */ , &page)) { ret = -EFAULT ;
@@ -210,20 +212,21 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries, } populate: pageshift =PAGE_SHIFT ; -if (PageCompound (page)) { +if (mem->pageshift >PAGE_SHIFT &&PageCompound (page)) {pte_t *pte;struct page *head =compound_head (page);unsigned int compshift =compound_order (head); +unsigned int pteshift;local_irq_save (flags);/* disables as well */ - pte =find_linux_pte (mm->pgd, ua,NULL , &pageshift); -local_irq_restore (flags); + pte =find_linux_pte (mm->pgd, cur_ua,NULL , &pteshift);/* Double check it is still the same pinned page */ if (pte &&pte_page (*pte) == head && - pageshift == compshift) - pageshift = max_t(unsigned int, pageshift, + pteshift == compshift +PAGE_SHIFT ) + pageshift = max_t(unsigned int, pteshift,PAGE_SHIFT ); +local_irq_restore (flags); } mem->pageshift =min (mem->pageshift, pageshift); mem->hpas[i] =page_to_pfn (page) <<PAGE_SHIFT ;
arch/powerpc/mm/pgtable-book3s64.c +11 -6
@@ -270,6 +270,8 @@ static pmd_t *__alloc_for_pmdcache(struct mm_struct *mm)return NULL ; } +atomic_set (&page->pt_frag_refcount,1 ); + ret =page_address (page);/* * if we support only one fragment just return the
@@ -285,7 +287,7 @@ static pmd_t *__alloc_for_pmdcache(struct mm_struct *mm)* count. */ if (likely (!mm->context.pmd_frag)) { -set_page_count (page,PMD_FRAG_NR ); +atomic_set (&page->pt_frag_refcount,PMD_FRAG_NR ); mm->context.pmd_frag = ret +PMD_FRAG_SIZE ; }spin_unlock (&mm->page_table_lock);
@@ -308,9 +310,10 @@ void pmd_fragment_free(unsigned long *pmd) {struct page *page =virt_to_page (pmd); -if (put_page_testzero (page)) { +BUG_ON (atomic_read (&page->pt_frag_refcount) <=0 ); +if (atomic_dec_and_test (&page->pt_frag_refcount)) {pgtable_pmd_page_dtor (page); -free_unref_page (page); +__free_page (page); } }
@@ -352,6 +355,7 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel)return NULL ; } +atomic_set (&page->pt_frag_refcount,1 ); ret =page_address (page);/*
@@ -367,7 +371,7 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel)* count. */ if (likely (!mm->context.pte_frag)) { -set_page_count (page,PTE_FRAG_NR ); +atomic_set (&page->pt_frag_refcount,PTE_FRAG_NR ); mm->context.pte_frag = ret +PTE_FRAG_SIZE ; }spin_unlock (&mm->page_table_lock);
@@ -390,10 +394,11 @@ void pte_fragment_free(unsigned long *table, int kernel) {struct page *page =virt_to_page (table); -if (put_page_testzero (page)) { +BUG_ON (atomic_read (&page->pt_frag_refcount) <=0 ); +if (atomic_dec_and_test (&page->pt_frag_refcount)) {if (!kernel)pgtable_page_dtor (page); -free_unref_page (page); +__free_page (page); } }
arch/powerpc/mm/pkeys.c +43 -91
185 lines not on this page · raw message
arch/powerpc/platforms/powernv/pci-ioda.c +37 -0
@@ -3368,12 +3368,49 @@ static void pnv_pci_ioda_create_dbgfs(void)#endif /* CONFIG_DEBUG_FS */ } +static void pnv_pci_enable_bridge (struct pci_bus *bus) +{ +struct pci_dev *dev = bus->self; +struct pci_bus *child; + +/* Empty bus ? bail */ +if (list_empty (&bus->devices)) +return ; + +/* +* If there's a bridge associated with that bus enable it. This works +* around races in the generic code if the enabling is done during +* parallel probing. This can be removed once those races have been +* fixed. +*/ +if (dev) { +int rc =pci_enable_device (dev); +if (rc) +pci_err (dev,"Error enabling bridge (%d)\n" , rc); +pci_set_master (dev); + } + +/* Perform the same to child busses */ +list_for_each_entry (child, &bus->children, node) +pnv_pci_enable_bridge (child); +} + +static void pnv_pci_enable_bridges (void ) +{ +struct pci_controller *hose; + +list_for_each_entry (hose, &hose_list, list_node) +pnv_pci_enable_bridge (hose->bus); +} +static void pnv_pci_ioda_fixup (void ) {pnv_pci_ioda_setup_PEs ();pnv_pci_ioda_setup_iommu_api ();pnv_pci_ioda_create_dbgfs (); +pnv_pci_enable_bridges (); +#ifdef CONFIG_EEH pnv_eeh_post_init ();#endif
arch/powerpc/platforms/pseries/ras.c +1 -1
@@ -360,7 +360,7 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs) } savep =__va (regs->gpr[3 ]); - regs->gpr[3 ] = savep[0 ];/* restore original r3 */ + regs->gpr[3 ] =be64_to_cpu (savep[0 ]);/* restore original r3 */ /* If it isn't an extended log we can use the per cpu 64bit buffer */ h = (struct rtas_error_log *)&savep[1 ];
arch/sparc/kernel/sys_sparc_32.c +13 -9
@@ -197,23 +197,27 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig, SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len) { -int nlen, err; - +int nlen, err; +char tmp[__NEW_UTS_LEN +1 ]; +if (len <0 )return -EINVAL ; -down_read (&uts_sem); - +down_read (&uts_sem); + nlen =strlen (utsname ()->domainname) +1 ; err = -EINVAL ;if (nlen > len) - goto out; + goto out_unlock; +memcpy (tmp,utsname ()->domainname, nlen); - err = -EFAULT ; -if (!copy_to_user (name,utsname ()->domainname, nlen)) - err =0 ; +up_read (&uts_sem); -out: +if (copy_to_user (name, tmp, nlen)) +return -EFAULT ; +return 0 ; + +out_unlock:up_read (&uts_sem);return err; }
arch/sparc/kernel/sys_sparc_64.c +12 -8
@@ -519,23 +519,27 @@ asmlinkage void sparc_breakpoint(struct pt_regs *regs) SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len) { -int nlen, err; +int nlen, err; +char tmp[__NEW_UTS_LEN +1 ];if (len <0 )return -EINVAL ; -down_read (&uts_sem); - +down_read (&uts_sem); + nlen =strlen (utsname ()->domainname) +1 ; err = -EINVAL ;if (nlen > len) - goto out; + goto out_unlock; +memcpy (tmp,utsname ()->domainname, nlen); + +up_read (&uts_sem); - err = -EFAULT ; -if (!copy_to_user (name,utsname ()->domainname, nlen)) - err =0 ; +if (copy_to_user (name, tmp, nlen)) +return -EFAULT ; +return 0 ; -out: +out_unlock:up_read (&uts_sem);return err; }
arch/x86/crypto/aesni-intel_asm.S +33 -33
226 lines not on this page · raw message
arch/x86/kernel/kexec-bzimage64.c +1 -1
@@ -532,7 +532,7 @@ static int bzImage64_cleanup(void *loader_data)static int bzImage64_verify_sig (const char *kernel,unsigned long kernel_len) {return verify_pefile_signature (kernel, kernel_len, -NULL , +VERIFY_USE_SECONDARY_KEYRING ,VERIFYING_KEXEC_PE_SIGNATURE ); }#endif
arch/x86/kvm/vmx.c +16 -10
@@ -197,12 +197,14 @@ static enum vmx_l1d_flush_state __read_mostly vmentry_l1d_flush_param = VMENTER_static const struct {const char *option; -enum vmx_l1d_flush_state cmd; +bool for_parse; } vmentry_l1d_param[] = { - {"auto" ,VMENTER_L1D_FLUSH_AUTO }, - {"never" ,VMENTER_L1D_FLUSH_NEVER }, - {"cond" ,VMENTER_L1D_FLUSH_COND }, - {"always" ,VMENTER_L1D_FLUSH_ALWAYS }, + [VMENTER_L1D_FLUSH_AUTO ] = {"auto" , true}, + [VMENTER_L1D_FLUSH_NEVER ] = {"never" , true}, + [VMENTER_L1D_FLUSH_COND ] = {"cond" , true}, + [VMENTER_L1D_FLUSH_ALWAYS ] = {"always" , true}, + [VMENTER_L1D_FLUSH_EPT_DISABLED ] = {"EPT disabled" , false}, + [VMENTER_L1D_FLUSH_NOT_REQUIRED ] = {"not required" , false}, };#define L1D_CACHE_ORDER 4
@@ -286,8 +288,9 @@ static int vmentry_l1d_flush_parse(const char *s)if (s) {for (i =0 ; i <ARRAY_SIZE (vmentry_l1d_param); i++) { -if (sysfs_streq (s, vmentry_l1d_param[i].option)) -return vmentry_l1d_param[i].cmd; +if (vmentry_l1d_param[i].for_parse && +sysfs_streq (s, vmentry_l1d_param[i].option)) +return i; } }return -EINVAL ;
@@ -297,13 +300,13 @@ static int vmentry_l1d_flush_set(const char *s, const struct kernel_param *kp) {int l1tf, ret; -if (!boot_cpu_has (X86_BUG_L1TF )) -return 0 ; - l1tf =vmentry_l1d_flush_parse (s);if (l1tf <0 )return l1tf; +if (!boot_cpu_has (X86_BUG_L1TF )) +return 0 ; +/* * Has vmx_init() run already? If not then this is the pre init * parameter parsing. In that case just store the value and let
@@ -323,6 +326,9 @@ static int vmentry_l1d_flush_set(const char *s, const struct kernel_param *kp)static int vmentry_l1d_flush_get (char *s,const struct kernel_param *kp) { +if (WARN_ON_ONCE (l1tf_vmx_mitigation >=ARRAY_SIZE (vmentry_l1d_param))) +return sprintf (s,"???\n" ); +return sprintf (s,"%s\n" , vmentry_l1d_param[l1tf_vmx_mitigation].option); }
arch/xtensa/include/asm/cacheasm.h +42 -27
144 lines not on this page · raw message
block/bfq-cgroup.c +2 -1
@@ -913,7 +913,8 @@ static ssize_t bfq_io_set_weight(struct kernfs_open_file *of,if (ret)return ret; -return bfq_io_set_weight_legacy (of_css (of),NULL , weight); + ret =bfq_io_set_weight_legacy (of_css (of),NULL , weight); +return ret ?: nbytes; }#ifdef CONFIG_DEBUG_BLK_CGROUP
block/blk-core.c +35 -26
86 lines not on this page · raw message
block/blk-lib.c +10 -0
@@ -68,6 +68,8 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,*/ req_sects =min_t (sector_t, nr_sects, q->limits.max_discard_sectors); +if (!req_sects) + goto fail;if (req_sects >UINT_MAX >>9 ) req_sects =UINT_MAX >>9 ;
@@ -105,6 +107,14 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, *biop = bio;return 0 ; + +fail: +if (bio) { +submit_bio_wait (bio); +bio_put (bio); + } + *biop =NULL ; +return -EOPNOTSUPP ; }EXPORT_SYMBOL (__blkdev_issue_discard);
block/blk-sysfs.c +15 -0
@@ -804,6 +804,21 @@ static void __blk_release_queue(struct work_struct *work)blk_stat_remove_callback (q, q->poll_cb);blk_stat_free_callback (q->poll_cb); +if (!blk_queue_dead (q)) { +/* +* Last reference was dropped without having called +* blk_cleanup_queue(). +*/ +WARN_ONCE (blk_queue_init_done (q), +"request queue %p has been registered but blk_cleanup_queue() has not been called for that queue\n" , + q); +blk_exit_queue (q); + } + +WARN (blkg_root_lookup (q), +"request queue %p is being released but it has not yet been removed from the blkcg controller\n" , + q); +blk_free_queue_stats (q->stats);blk_exit_rl (q, &q->root_rl);
block/blk.h +1 -0
@@ -130,6 +130,7 @@ void blk_free_flush_queue(struct blk_flush_queue *q);int blk_init_rl (struct request_list *rl,struct request_queue *q,gfp_t gfp_mask);void blk_exit_rl (struct request_queue *q,struct request_list *rl); +void blk_exit_queue (struct request_queue *q);void blk_rq_bio_prep (struct request_queue *q,struct request *rq,struct bio *bio);void blk_queue_bypass_start (struct request_queue *q);
certs/system_keyring.c +2 -1
@@ -15,6 +15,7 @@#include <linux/cred.h> #include <linux/err.h> #include <linux/slab.h> +#include <linux/verification.h> #include <keys/asymmetric-type.h> #include <keys/system_keyring.h> #include <crypto/pkcs7.h>
@@ -230,7 +231,7 @@ int verify_pkcs7_signature(const void *data, size_t len,if (!trusted_keys) { trusted_keys = builtin_trusted_keys; - }else if (trusted_keys == (void *)1UL ) { + }else if (trusted_keys ==VERIFY_USE_SECONDARY_KEYRING ) {#ifdef CONFIG_SECONDARY_TRUSTED_KEYRING trusted_keys = secondary_trusted_keys;#else
crypto/asymmetric_keys/pkcs7_key_type.c +1 -1
@@ -63,7 +63,7 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep)return verify_pkcs7_signature (NULL ,0 , prep->data, prep->datalen, - (void *)1UL , usage, +VERIFY_USE_SECONDARY_KEYRING , usage, pkcs7_view_content, prep); }
drivers/acpi/acpica/hwsleep.c +3 -8
@@ -56,14 +56,9 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)if (ACPI_FAILURE (status)) {return_ACPI_STATUS (status); } -/* -* If the target sleep state is S5, clear all GPEs and fixed events too -*/ -if (sleep_state ==ACPI_STATE_S5 ) { - status =acpi_hw_clear_acpi_status (); -if (ACPI_FAILURE (status)) { -return_ACPI_STATUS (status); - } + status =acpi_hw_clear_acpi_status (); +if (ACPI_FAILURE (status)) { +return_ACPI_STATUS (status); } acpi_gbl_system_awake_and_running = FALSE;
drivers/acpi/acpica/psloop.c +11 -6
@@ -22,6 +22,7 @@#include "acdispat.h" #include "amlcode.h" #include "acconvert.h" +#include "acnamesp.h" #define _COMPONENT ACPI_PARSERACPI_MODULE_NAME ("psloop" )
@@ -527,12 +528,18 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)if (ACPI_FAILURE (status)) {return_ACPI_STATUS (status); } -if (walk_state->opcode ==AML_SCOPE_OP ) { +if (acpi_ns_opens_scope + (acpi_ps_get_opcode_info + (walk_state->opcode)->object_type)) {/* -* If the scope op fails to parse, skip the body of the -* scope op because the parse failure indicates that the -* device may not exist. +* If the scope/device op fails to parse, skip the body of +* the scope op because the parse failure indicates that +* the device may not exist. */ +ACPI_ERROR ((AE_INFO , +"Skip parsing opcode %s" , +acpi_ps_get_opcode_name + (walk_state->opcode))); walk_state->parser_state.aml = walk_state->aml +1 ; walk_state->parser_state.aml =
@@ -540,8 +547,6 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) (&walk_state->parser_state); walk_state->aml = walk_state->parser_state.aml; -ACPI_ERROR ((AE_INFO , -"Skipping Scope block" )); }continue ;
drivers/block/zram/zram_drv.c +6 -1
@@ -337,6 +337,7 @@ static ssize_t backing_dev_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) { char *file_name; +size_t sz;struct file *backing_dev =NULL ;struct inode *inode;struct address_space *mapping;
@@ -357,7 +358,11 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } -strlcpy (file_name, buf, len); +strlcpy (file_name, buf,PATH_MAX ); +/* ignore trailing newline */ + sz =strlen (file_name); +if (sz >0 && file_name[sz -1 ] =='\n' ) + file_name[sz -1 ] =0x00 ; backing_dev =filp_open (file_name,O_RDWR |O_LARGEFILE ,0 );if (IS_ERR (backing_dev)) {
drivers/cpufreq/cpufreq_governor.c +10 -2
@@ -555,12 +555,20 @@ EXPORT_SYMBOL_GPL(cpufreq_dbs_governor_stop);void cpufreq_dbs_governor_limits (struct cpufreq_policy *policy) { -struct policy_dbs_info *policy_dbs = policy->governor_data; +struct policy_dbs_info *policy_dbs; + +/* Protect gov->gdbs_data against cpufreq_dbs_governor_exit() */ +mutex_lock (&gov_dbs_data_mutex); + policy_dbs = policy->governor_data; +if (!policy_dbs) + goto out;mutex_lock (&policy_dbs->update_mutex);cpufreq_policy_apply_limits (policy);gov_update_sample_delay (policy_dbs,0 ); -mutex_unlock (&policy_dbs->update_mutex); + +out: +mutex_unlock (&gov_dbs_data_mutex); }EXPORT_SYMBOL_GPL (cpufreq_dbs_governor_limits);
drivers/cpuidle/governors/menu.c +35 -12
77 lines not on this page · raw message
drivers/crypto/caam/caamalg_qi.c +2 -4
@@ -679,10 +679,8 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,int ret =0 ;if (keylen !=2 *AES_MIN_KEY_SIZE && keylen !=2 *AES_MAX_KEY_SIZE ) { -crypto_ablkcipher_set_flags (ablkcipher, -CRYPTO_TFM_RES_BAD_KEY_LEN );dev_err (jrdev,"key size mismatch\n" ); -return -EINVAL ; + goto badkey; } ctx->cdata.keylen = keylen;
@@ -715,7 +713,7 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,return ret; badkey:crypto_ablkcipher_set_flags (ablkcipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return 0 ; +return -EINVAL ; }/*
drivers/crypto/caam/caampkc.c +10 -10
@@ -71,8 +71,8 @@ static void rsa_priv_f2_unmap(struct device *dev, struct rsa_edesc *edesc,dma_unmap_single (dev, pdb->d_dma, key->d_sz,DMA_TO_DEVICE );dma_unmap_single (dev, pdb->p_dma, p_sz,DMA_TO_DEVICE );dma_unmap_single (dev, pdb->q_dma, q_sz,DMA_TO_DEVICE ); -dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_TO_DEVICE ); -dma_unmap_single (dev, pdb->tmp2_dma, q_sz,DMA_TO_DEVICE ); +dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_BIDIRECTIONAL ); +dma_unmap_single (dev, pdb->tmp2_dma, q_sz,DMA_BIDIRECTIONAL ); } static void rsa_priv_f3_unmap(struct device *dev, struct rsa_edesc *edesc,
@@ -90,8 +90,8 @@ static void rsa_priv_f3_unmap(struct device *dev, struct rsa_edesc *edesc,dma_unmap_single (dev, pdb->dp_dma, p_sz,DMA_TO_DEVICE );dma_unmap_single (dev, pdb->dq_dma, q_sz,DMA_TO_DEVICE );dma_unmap_single (dev, pdb->c_dma, p_sz,DMA_TO_DEVICE ); -dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_TO_DEVICE ); -dma_unmap_single (dev, pdb->tmp2_dma, q_sz,DMA_TO_DEVICE ); +dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_BIDIRECTIONAL ); +dma_unmap_single (dev, pdb->tmp2_dma, q_sz,DMA_BIDIRECTIONAL ); }/* RSA Job Completion handler */
@@ -417,13 +417,13 @@ static int set_rsa_priv_f2_pdb(struct akcipher_request *req, goto unmap_p; } - pdb->tmp1_dma =dma_map_single (dev, key->tmp1, p_sz,DMA_TO_DEVICE ); + pdb->tmp1_dma =dma_map_single (dev, key->tmp1, p_sz,DMA_BIDIRECTIONAL );if (dma_mapping_error (dev, pdb->tmp1_dma)) {dev_err (dev,"Unable to map RSA tmp1 memory\n" ); goto unmap_q; } - pdb->tmp2_dma =dma_map_single (dev, key->tmp2, q_sz,DMA_TO_DEVICE ); + pdb->tmp2_dma =dma_map_single (dev, key->tmp2, q_sz,DMA_BIDIRECTIONAL );if (dma_mapping_error (dev, pdb->tmp2_dma)) {dev_err (dev,"Unable to map RSA tmp2 memory\n" ); goto unmap_tmp1;
@@ -451,7 +451,7 @@ static int set_rsa_priv_f2_pdb(struct akcipher_request *req,return 0 ; unmap_tmp1: -dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_TO_DEVICE ); +dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_BIDIRECTIONAL ); unmap_q:dma_unmap_single (dev, pdb->q_dma, q_sz,DMA_TO_DEVICE ); unmap_p:
@@ -504,13 +504,13 @@ static int set_rsa_priv_f3_pdb(struct akcipher_request *req, goto unmap_dq; } - pdb->tmp1_dma =dma_map_single (dev, key->tmp1, p_sz,DMA_TO_DEVICE ); + pdb->tmp1_dma =dma_map_single (dev, key->tmp1, p_sz,DMA_BIDIRECTIONAL );if (dma_mapping_error (dev, pdb->tmp1_dma)) {dev_err (dev,"Unable to map RSA tmp1 memory\n" ); goto unmap_qinv; } - pdb->tmp2_dma =dma_map_single (dev, key->tmp2, q_sz,DMA_TO_DEVICE ); + pdb->tmp2_dma =dma_map_single (dev, key->tmp2, q_sz,DMA_BIDIRECTIONAL );if (dma_mapping_error (dev, pdb->tmp2_dma)) {dev_err (dev,"Unable to map RSA tmp2 memory\n" ); goto unmap_tmp1;
@@ -538,7 +538,7 @@ static int set_rsa_priv_f3_pdb(struct akcipher_request *req,return 0 ; unmap_tmp1: -dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_TO_DEVICE ); +dma_unmap_single (dev, pdb->tmp1_dma, p_sz,DMA_BIDIRECTIONAL ); unmap_qinv:dma_unmap_single (dev, pdb->c_dma, p_sz,DMA_TO_DEVICE ); unmap_dq:
drivers/crypto/caam/jr.c +2 -1
@@ -190,7 +190,8 @@ static void caam_jr_dequeue(unsigned long devarg)BUG_ON (CIRC_CNT (head, tail + i,JOBR_DEPTH ) <=0 );/* Unmap just-run descriptor so we can post-process */ -dma_unmap_single (dev, jrp->outring[hw_idx].desc, +dma_unmap_single (dev, +caam_dma_to_cpu (jrp->outring[hw_idx].desc), jrp->entinfo[sw_idx].desc_size,DMA_TO_DEVICE );
drivers/crypto/vmx/aes_cbc.c +14 -16
@@ -107,24 +107,23 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, ret =crypto_skcipher_encrypt (req);skcipher_request_zero (req); }else { -preempt_disable (); -pagefault_disable (); -enable_kernel_vsx (); -blkcipher_walk_init (&walk, dst, src, nbytes); ret =blkcipher_walk_virt (desc, &walk);while ((nbytes = walk.nbytes)) { +preempt_disable (); +pagefault_disable (); +enable_kernel_vsx ();aes_p8_cbc_encrypt (walk.src.virt.addr, walk.dst.virt.addr, nbytes &AES_BLOCK_MASK , &ctx->enc_key, walk.iv,1 ); +disable_kernel_vsx (); +pagefault_enable (); +preempt_enable (); + nbytes &=AES_BLOCK_SIZE -1 ; ret =blkcipher_walk_done (desc, &walk, nbytes); } - -disable_kernel_vsx (); -pagefault_enable (); -preempt_enable (); }return ret;
@@ -147,24 +146,23 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc, ret =crypto_skcipher_decrypt (req);skcipher_request_zero (req); }else { -preempt_disable (); -pagefault_disable (); -enable_kernel_vsx (); -blkcipher_walk_init (&walk, dst, src, nbytes); ret =blkcipher_walk_virt (desc, &walk);while ((nbytes = walk.nbytes)) { +preempt_disable (); +pagefault_disable (); +enable_kernel_vsx ();aes_p8_cbc_encrypt (walk.src.virt.addr, walk.dst.virt.addr, nbytes &AES_BLOCK_MASK , &ctx->dec_key, walk.iv,0 ); +disable_kernel_vsx (); +pagefault_enable (); +preempt_enable (); + nbytes &=AES_BLOCK_SIZE -1 ; ret =blkcipher_walk_done (desc, &walk, nbytes); } - -disable_kernel_vsx (); -pagefault_enable (); -preempt_enable (); }return ret;
drivers/crypto/vmx/aes_xts.c +14 -7
@@ -116,32 +116,39 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc, ret = enc?crypto_skcipher_encrypt (req) :crypto_skcipher_decrypt (req);skcipher_request_zero (req); }else { +blkcipher_walk_init (&walk, dst, src, nbytes); + + ret =blkcipher_walk_virt (desc, &walk); +preempt_disable ();pagefault_disable ();enable_kernel_vsx (); -blkcipher_walk_init (&walk, dst, src, nbytes); - - ret =blkcipher_walk_virt (desc, &walk); iv = walk.iv;memset (tweak,0 ,AES_BLOCK_SIZE );aes_p8_encrypt (iv, tweak, &ctx->tweak_key); +disable_kernel_vsx (); +pagefault_enable (); +preempt_enable (); +while ((nbytes = walk.nbytes)) { +preempt_disable (); +pagefault_disable (); +enable_kernel_vsx ();if (enc)aes_p8_xts_encrypt (walk.src.virt.addr, walk.dst.virt.addr, nbytes &AES_BLOCK_MASK , &ctx->enc_key,NULL , tweak);else aes_p8_xts_decrypt (walk.src.virt.addr, walk.dst.virt.addr, nbytes &AES_BLOCK_MASK , &ctx->dec_key,NULL , tweak); +disable_kernel_vsx (); +pagefault_enable (); +preempt_enable (); nbytes &=AES_BLOCK_SIZE -1 ; ret =blkcipher_walk_done (desc, &walk, nbytes); } - -disable_kernel_vsx (); -pagefault_enable (); -preempt_enable (); }return ret; }
drivers/dma-buf/reservation.c +3 -3
@@ -141,6 +141,7 @@ reservation_object_add_shared_inplace(struct reservation_object *obj,if (signaled) {RCU_INIT_POINTER (fobj->shared[signaled_idx], fence); }else { +BUG_ON (fobj->shared_count >= fobj->shared_max);RCU_INIT_POINTER (fobj->shared[fobj->shared_count], fence); fobj->shared_count++; }
@@ -230,10 +231,9 @@ void reservation_object_add_shared_fence(struct reservation_object *obj, old =reservation_object_get_list (obj); obj->staged =NULL ; -if (!fobj) { -BUG_ON (old->shared_count >= old->shared_max); +if (!fobj)reservation_object_add_shared_inplace (obj, old, fence); - }else +else reservation_object_add_shared_replace (obj, old, fobj, fence); }EXPORT_SYMBOL (reservation_object_add_shared_fence);
drivers/extcon/extcon.c +2 -1
@@ -433,8 +433,8 @@ int extcon_sync(struct extcon_dev *edev, unsigned int id)return index;spin_lock_irqsave (&edev->lock, flags); - state = !!(edev->state &BIT (index)); +spin_unlock_irqrestore (&edev->lock, flags);/* * Call functions in a raw notifier chain for the specific one
@@ -448,6 +448,7 @@ int extcon_sync(struct extcon_dev *edev, unsigned int id)*/ raw_notifier_call_chain (&edev->nh_all, state, edev); +spin_lock_irqsave (&edev->lock, flags);/* This could be in interrupt handler */ prop_buf = (char *)get_zeroed_page (GFP_ATOMIC );if (!prop_buf) {
drivers/hv/channel.c +24 -16
@@ -558,11 +558,8 @@ static void reset_channel_cb(void *arg) channel->onchannel_callback =NULL ; } -static int vmbus_close_internal (struct vmbus_channel *channel) +void vmbus_reset_channel_cb (struct vmbus_channel *channel) { -struct vmbus_channel_close_channel *msg; -int ret; -/* * vmbus_on_event(), running in the per-channel tasklet, can race * with vmbus_close_internal() in the case of SMP guest, e.g., when
@@ -572,6 +569,29 @@ static int vmbus_close_internal(struct vmbus_channel *channel)*/ tasklet_disable (&channel->callback_event); + channel->sc_creation_callback =NULL ; + +/* Stop the callback asap */ +if (channel->target_cpu !=get_cpu ()) { +put_cpu (); +smp_call_function_single (channel->target_cpu, reset_channel_cb, + channel, true); + }else { +reset_channel_cb (channel); +put_cpu (); + } + +/* Re-enable tasklet for use on re-open */ +tasklet_enable (&channel->callback_event); +} + +static int vmbus_close_internal (struct vmbus_channel *channel) +{ +struct vmbus_channel_close_channel *msg; +int ret; + +vmbus_reset_channel_cb (channel); +/* * In case a device driver's probe() fails (e.g., * util_probe() -> vmbus_open() returns -ENOMEM) and the device is
@@ -585,16 +605,6 @@ static int vmbus_close_internal(struct vmbus_channel *channel) } channel->state =CHANNEL_OPEN_STATE ; - channel->sc_creation_callback =NULL ; -/* Stop callback and cancel the timer asap */ -if (channel->target_cpu !=get_cpu ()) { -put_cpu (); -smp_call_function_single (channel->target_cpu, reset_channel_cb, - channel, true); - }else { -reset_channel_cb (channel); -put_cpu (); - }/* Send a closing message */
@@ -639,8 +649,6 @@ static int vmbus_close_internal(struct vmbus_channel *channel) get_order(channel->ringbuffer_pagecount * PAGE_SIZE)); out: -/* re-enable tasklet for use on re-open */ -tasklet_enable (&channel->callback_event);return ret; }
drivers/hv/channel_mgmt.c +7 -3
@@ -527,10 +527,8 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)struct hv_device *dev = newchannel->primary_channel->device_obj; -if (vmbus_add_channel_kobj (dev, newchannel)) { -atomic_dec (&vmbus_connection.offer_in_progress); +if (vmbus_add_channel_kobj (dev, newchannel)) goto err_free_chan; - }if (channel->sc_creation_callback !=NULL ) channel->sc_creation_callback (newchannel);
@@ -894,6 +892,12 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)return ; } +/* +* Before setting channel->rescind in vmbus_rescind_cleanup(), we +* should make sure the channel callback is not running any more. +*/ +vmbus_reset_channel_cb (channel); +/* * Now wait for offer handling to complete. */
drivers/i2c/busses/i2c-designware-master.c +0 -1
@@ -693,7 +693,6 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)i2c_set_adapdata (adap, dev);if (dev->pm_disabled) { -dev_pm_syscore_device (dev->dev, true); irq_flags =IRQF_NO_SUSPEND ; }else { irq_flags =IRQF_SHARED |IRQF_COND_SUSPEND ;
drivers/i2c/busses/i2c-designware-platdrv.c +6 -1
@@ -448,6 +448,9 @@ static int dw_i2c_plat_suspend(struct device *dev) {struct dw_i2c_dev *i_dev =dev_get_drvdata (dev); +if (i_dev->pm_disabled) +return 0 ; + i_dev->disable (i_dev);i2c_dw_prepare_clk (i_dev, false);
@@ -458,7 +461,9 @@ static int dw_i2c_plat_resume(struct device *dev) {struct dw_i2c_dev *i_dev =dev_get_drvdata (dev); -i2c_dw_prepare_clk (i_dev, true); +if (!i_dev->pm_disabled) +i2c_dw_prepare_clk (i_dev, true); + i_dev->init (i_dev);return 0 ;
drivers/iio/accel/sca3000.c +1 -0
@@ -797,6 +797,7 @@ static int sca3000_write_raw(struct iio_dev *indio_dev,mutex_lock (&st->lock); ret =sca3000_write_3db_freq (st, val);mutex_unlock (&st->lock); +return ret;default :return -EINVAL ; }
drivers/iio/frequency/ad9523.c +2 -2
@@ -508,7 +508,7 @@ static ssize_t ad9523_store(struct device *dev,return ret;if (!state) -return 0 ; +return len;mutex_lock (&indio_dev->mlock);switch ((u32 )this_attr->address) {
@@ -642,7 +642,7 @@ static int ad9523_read_raw(struct iio_dev *indio_dev, code = (AD9523_CLK_DIST_DIV_PHASE_REV (ret) *3141592 ) /AD9523_CLK_DIST_DIV_REV (ret); *val = code /1000000 ; - *val2 = (code %1000000 ) *10 ; + *val2 = code %1000000 ;return IIO_VAL_INT_PLUS_MICRO ;default :return -EINVAL ;
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -4694,7 +4694,7 @@ static void mlx5_ib_dealloc_counters(struct mlx5_ib_dev *dev)int i;for (i =0 ; i < dev->num_ports; i++) { -if (dev->port[i].cnts.set_id) +if (dev->port[i].cnts.set_id_valid)mlx5_core_dealloc_q_counter (dev->mdev, dev->port[i].cnts.set_id);kfree (dev->port[i].cnts.names);
drivers/infiniband/hw/mlx5/qp.c +4 -2
@@ -1626,7 +1626,7 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd,struct mlx5_ib_resources *devr = &dev->devr;int inlen =MLX5_ST_SZ_BYTES (create_qp_in);struct mlx5_core_dev *mdev = dev->mdev; -struct mlx5_ib_create_qp_resp resp; +struct mlx5_ib_create_qp_resp resp = {};struct mlx5_ib_cq *send_cq;struct mlx5_ib_cq *recv_cq;unsigned long flags;
@@ -5365,7 +5365,9 @@ static int set_user_rq_size(struct mlx5_ib_dev *dev, rwq->wqe_count = ucmd->rq_wqe_count; rwq->wqe_shift = ucmd->rq_wqe_shift; - rwq->buf_size = (rwq->wqe_count << rwq->wqe_shift); +if (check_shl_overflow (rwq->wqe_count, rwq->wqe_shift, &rwq->buf_size)) +return -EINVAL ; + rwq->log_rq_stride = rwq->wqe_shift; rwq->log_rq_size =ilog2 (rwq->wqe_count);return 0 ;
drivers/infiniband/sw/rxe/rxe_comp.c +1 -0
@@ -276,6 +276,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE :if (wqe->wr.opcode !=IB_WR_RDMA_READ && wqe->wr.opcode !=IB_WR_RDMA_READ_WITH_INV ) { + wqe->status =IB_WC_FATAL_ERR ;return COMPST_ERROR ; }reset_retry_counters (qp);
drivers/infiniband/ulp/srpt/ib_srpt.c +23 -11
@@ -1833,8 +1833,7 @@ static bool srpt_close_ch(struct srpt_rdma_ch *ch)int ret;if (!srpt_set_ch_state (ch,CH_DRAINING )) { -pr_debug ("%s-%d: already closed\n" , ch->sess_name, - ch->qp->qp_num); +pr_debug ("%s: already closed\n" , ch->sess_name);return false; }
@@ -1940,8 +1939,8 @@ static void __srpt_close_all_ch(struct srpt_port *sport)list_for_each_entry (nexus, &sport->nexus_list, entry) {list_for_each_entry (ch, &nexus->ch_list, list) {if (srpt_disconnect_ch (ch) >=0 ) -pr_info ("Closing channel %s-%d because target %s_%d has been disabled\n" , - ch->sess_name, ch->qp->qp_num, +pr_info ("Closing channel %s because target %s_%d has been disabled\n" , + ch->sess_name, sport->sdev->device->name, sport->port);srpt_close_ch (ch); }
@@ -2087,7 +2086,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,struct rdma_conn_param rdma_cm;struct ib_cm_rep_param ib_cm; } *rep_param =NULL ; -struct srpt_rdma_ch *ch; +struct srpt_rdma_ch *ch =NULL ;char i_port_id[36 ];u32 it_iu_len;int i, ret;
@@ -2234,13 +2233,15 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,TARGET_PROT_NORMAL , i_port_id + 2, ch, NULL);if (IS_ERR_OR_NULL (ch->sess)) { +WARN_ON_ONCE (ch->sess ==NULL ); ret =PTR_ERR (ch->sess); + ch->sess =NULL ;pr_info ("Rejected login for initiator %s: ret = %d.\n" , ch->sess_name, ret); rej->reason =cpu_to_be32 (ret == -ENOMEM ?SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES :SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED ); - goto reject; + goto destroy_ib; }mutex_lock (&sport->mutex);
@@ -2279,7 +2280,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, rej->reason =cpu_to_be32 (SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES );pr_err ("rejected SRP_LOGIN_REQ because enabling RTR failed (error code = %d)\n" , ret); - goto destroy_ib; + goto reject; } pr_debug("Establish connection sess=%p name=%s ch=%p\n", ch->sess,
@@ -2358,8 +2359,11 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,srpt_free_ioctx_ring ((struct srpt_ioctx **)ch->ioctx_ring, ch->sport->sdev, ch->rq_size, ch->max_rsp_size,DMA_TO_DEVICE ); + free_ch: -if (ib_cm_id) +if (rdma_cm_id) + rdma_cm_id->context =NULL ; +else ib_cm_id->context =NULL ;kfree (ch); ch =NULL ;
@@ -2379,6 +2383,15 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,ib_send_cm_rej (ib_cm_id,IB_CM_REJ_CONSUMER_DEFINED ,NULL ,0 , rej,sizeof (*rej)); +if (ch && ch->sess) { +srpt_close_ch (ch); +/* +* Tell the caller not to free cm_id since +* srpt_release_channel_work() will do that. +*/ + ret =0 ; + } + out:kfree (rep_param);kfree (rsp);
@@ -2969,7 +2982,8 @@ static void srpt_add_one(struct ib_device *device)pr_debug ("device = %p\n" , device); - sdev =kzalloc (sizeof (*sdev),GFP_KERNEL ); + sdev =kzalloc (struct_size (sdev, port, device->phys_port_cnt), +GFP_KERNEL );if (!sdev) goto err;
@@ -3023,8 +3037,6 @@ static void srpt_add_one(struct ib_device *device) srpt_event_handler);ib_register_event_handler (&sdev->event_handler); -WARN_ON (sdev->device->phys_port_cnt >ARRAY_SIZE (sdev->port)); -for (i =1 ; i <= sdev->device->phys_port_cnt; i++) { sport = &sdev->port[i -1 ];INIT_LIST_HEAD (&sport->nexus_list);
drivers/infiniband/ulp/srpt/ib_srpt.h +2 -2
@@ -396,9 +396,9 @@ struct srpt_port {* @sdev_mutex: Serializes use_srq changes. * @use_srq: Whether or not to use SRQ. * @ioctx_ring: Per-HCA SRQ. -* @port: Information about the ports owned by this HCA. * @event_handler: Per-HCA asynchronous IB event handler. * @list: Node in srpt_dev_list. +* @port: Information about the ports owned by this HCA. */ struct srpt_device {struct ib_device *device;
@@ -410,9 +410,9 @@ struct srpt_device {struct mutex sdev_mutex;bool use_srq;struct srpt_recv_ioctx **ioctx_ring; -struct srpt_port port[2 ];struct ib_event_handler event_handler;struct list_head list; + struct srpt_port port[]; };#endif /* IB_SRPT_H */
drivers/iommu/dmar.c +3 -3
@@ -1339,8 +1339,8 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,qi_submit_sync (&desc, iommu); } -void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 qdep, -u64 addr,unsigned mask) +void qi_flush_dev_iotlb (struct intel_iommu *iommu,u16 sid,u16 pfsid, +u16 qdep,u64 addr,unsigned mask) {struct qi_desc desc;
@@ -1355,7 +1355,7 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep, qdep =0 ; desc.low =QI_DEV_IOTLB_SID (sid) |QI_DEV_IOTLB_QDEP (qdep) | -QI_DIOTLB_TYPE ; +QI_DIOTLB_TYPE |QI_DEV_IOTLB_PFSID (pfsid);qi_submit_sync (&desc, iommu); }
drivers/iommu/intel-iommu.c +17 -1
@@ -421,6 +421,7 @@ struct device_domain_info {struct list_head global;/* link to global list */ u8 bus;/* PCI bus number */ u8 devfn;/* PCI devfn number */ +u16 pfsid;/* SRIOV physical function source ID */ u8 pasid_supported:3; u8 pasid_enabled:1; u8 pri_supported:1;
@@ -1501,6 +1502,20 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)return ; pdev =to_pci_dev (info->dev); +/* For IOMMU that supports device IOTLB throttling (DIT), we assign +* PFSID to the invalidation desc of a VF such that IOMMU HW can gauge +* queue depth at PF level. If DIT is not set, PFSID will be treated as +* reserved, which should be set to 0. +*/ +if (!ecap_dit (info->iommu->ecap)) + info->pfsid =0 ; +else { +struct pci_dev *pf_pdev; + +/* pdev will be returned if device is not a vf */ + pf_pdev =pci_physfn (pdev); + info->pfsid =PCI_DEVID (pf_pdev->bus->number, pf_pdev->devfn); + }#ifdef CONFIG_INTEL_IOMMU_SVM /* The PCIe spec, in its wisdom, declares that the behaviour of
@@ -1566,7 +1581,8 @@ static void iommu_flush_dev_iotlb(struct dmar_domain *domain, sid = info->bus <<8 | info->devfn; qdep = info->ats_qdep; -qi_flush_dev_iotlb (info->iommu, sid, qdep, addr, mask); +qi_flush_dev_iotlb (info->iommu, sid, info->pfsid, + qdep, addr, mask); }spin_unlock_irqrestore (&device_domain_lock, flags); }
drivers/iommu/ipmmu-vmsa.c +7 -0
@@ -1081,12 +1081,19 @@ static struct platform_driver ipmmu_driver = {static int __init ipmmu_init (void ) { +struct device_node *np;static bool setup_done;int ret;if (setup_done)return 0 ; + np =of_find_matching_node (NULL , ipmmu_of_ids); +if (!np) +return 0 ; + +of_node_put (np); + ret =platform_driver_register (&ipmmu_driver);if (ret <0 )return ret;
drivers/mailbox/mailbox-xgene-slimpro.c +3 -3
@@ -195,9 +195,9 @@ static int slimpro_mbox_probe(struct platform_device *pdev)platform_set_drvdata (pdev, ctx); regs =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - mb_base =devm_ioremap (&pdev->dev, regs->start,resource_size (regs)); -if (!mb_base) -return -ENOMEM ; + mb_base =devm_ioremap_resource (&pdev->dev, regs); +if (IS_ERR (mb_base)) +return PTR_ERR (mb_base);/* Setup mailbox links */ for (i =0 ; i <MBOX_CNT ; i++) {
drivers/md/bcache/writeback.c +3 -1
@@ -645,8 +645,10 @@ static int bch_writeback_thread(void *arg)* data on cache. BCACHE_DEV_DETACHING flag is set in * bch_cached_dev_detach(). */ -if (test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags)) +if (test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags)) { +up_write (&dc->writeback_lock);break ; + } }up_write (&dc->writeback_lock);
drivers/md/dm-cache-metadata.c +9 -4
@@ -363,7 +363,7 @@ static int __write_initial_superblock(struct dm_cache_metadata *cmd) disk_super->version =cpu_to_le32 (cmd->version);memset (disk_super->policy_name,0 ,sizeof (disk_super->policy_name));memset (disk_super->policy_version,0 ,sizeof (disk_super->policy_version)); - disk_super->policy_hint_size =0 ; + disk_super->policy_hint_size =cpu_to_le32 (0 );__copy_sm_root (cmd, disk_super);
@@ -701,6 +701,7 @@ static int __commit_transaction(struct dm_cache_metadata *cmd, disk_super->policy_version[0 ] =cpu_to_le32 (cmd->policy_version[0 ]); disk_super->policy_version[1 ] =cpu_to_le32 (cmd->policy_version[1 ]); disk_super->policy_version[2 ] =cpu_to_le32 (cmd->policy_version[2 ]); + disk_super->policy_hint_size =cpu_to_le32 (cmd->policy_hint_size); disk_super->read_hits =cpu_to_le32 (cmd->stats.read_hits); disk_super->read_misses =cpu_to_le32 (cmd->stats.read_misses);
@@ -1322,6 +1323,7 @@ static int __load_mapping_v1(struct dm_cache_metadata *cmd,dm_oblock_t oblock;unsigned flags; +bool dirty = true;dm_array_cursor_get_value (mapping_cursor, (void **) &mapping_value_le);memcpy (&mapping, mapping_value_le,sizeof (mapping));
@@ -1332,8 +1334,10 @@ static int __load_mapping_v1(struct dm_cache_metadata *cmd,dm_array_cursor_get_value (hint_cursor, (void **) &hint_value_le);memcpy (&hint, hint_value_le,sizeof (hint)); } +if (cmd->clean_when_opened) + dirty = flags &M_DIRTY ; - r =fn (context, oblock,to_cblock (cb), flags &M_DIRTY , + r =fn (context, oblock,to_cblock (cb), dirty,le32_to_cpu (hint), hints_valid);if (r) { DMERR("policy couldn't load cache block %llu",
@@ -1361,7 +1365,7 @@ static int __load_mapping_v2(struct dm_cache_metadata *cmd,dm_oblock_t oblock;unsigned flags; -bool dirty; +bool dirty = true;dm_array_cursor_get_value (mapping_cursor, (void **) &mapping_value_le);memcpy (&mapping, mapping_value_le,sizeof (mapping));
@@ -1372,8 +1376,9 @@ static int __load_mapping_v2(struct dm_cache_metadata *cmd,dm_array_cursor_get_value (hint_cursor, (void **) &hint_value_le);memcpy (&hint, hint_value_le,sizeof (hint)); } +if (cmd->clean_when_opened) + dirty =dm_bitset_cursor_get_value (dirty_cursor); - dirty =dm_bitset_cursor_get_value (dirty_cursor); r =fn (context, oblock,to_cblock (cb), dirty,le32_to_cpu (hint), hints_valid);if (r) {
drivers/md/dm-crypt.c +5 -5
@@ -3069,11 +3069,11 @@ static void crypt_io_hints(struct dm_target *ti, struct queue_limits *limits)*/ limits->max_segment_size =PAGE_SIZE ; -if (cc->sector_size != (1 <<SECTOR_SHIFT )) { - limits->logical_block_size = cc->sector_size; - limits->physical_block_size = cc->sector_size; -blk_limits_io_min (limits, cc->sector_size); - } + limits->logical_block_size = + max_t(unsigned short, limits->logical_block_size, cc->sector_size); + limits->physical_block_size = +max_t (unsigned, limits->physical_block_size, cc->sector_size); + limits->io_min =max_t (unsigned, limits->io_min, cc->sector_size); }static struct target_type crypt_target = {
drivers/md/dm-integrity.c +3 -3
@@ -178,7 +178,7 @@ struct dm_integrity_c {__u8 sectors_per_block;unsigned char mode; -bool suspending; +int suspending;int failed;
@@ -2210,7 +2210,7 @@ static void dm_integrity_postsuspend(struct dm_target *ti)del_timer_sync (&ic->autocommit_timer); - ic->suspending = true; +WRITE_ONCE (ic->suspending,1 );queue_work (ic->commit_wq, &ic->commit_work);drain_workqueue (ic->commit_wq);
@@ -2220,7 +2220,7 @@ static void dm_integrity_postsuspend(struct dm_target *ti)dm_integrity_flush_buffers (ic); } - ic->suspending = false; +WRITE_ONCE (ic->suspending,0 );BUG_ON (!RB_EMPTY_ROOT (&ic->in_progress));
drivers/md/dm-thin.c +2 -0
@@ -2520,6 +2520,8 @@ static void set_pool_mode(struct pool *pool, enum pool_mode new_mode)case PM_WRITE :if (old_mode != new_mode)notify_of_pool_mode_change (pool,"write" ); +if (old_mode ==PM_OUT_OF_DATA_SPACE ) +cancel_delayed_work_sync (&pool->no_space_timeout); pool->out_of_data_space = false; pool->pf.error_if_no_space = pt->requested_pf.error_if_no_space;dm_pool_metadata_read_write (pool->pmd);
drivers/md/dm-writecache.c +1 -1
@@ -457,7 +457,7 @@ static void ssd_commit_flushed(struct dm_writecache *wc)COMPLETION_INITIALIZER_ONSTACK (endio.c), ATOMIC_INIT(1), }; -unsigned bitmap_bits = wc->dirty_bitmap_size *BITS_PER_LONG ; +unsigned bitmap_bits = wc->dirty_bitmap_size *8 ;unsigned i =0 ;while (1 ) {
drivers/media/i2c/tvp5150.c +1 -1
@@ -872,7 +872,7 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, f = &format->format; f->width = decoder->rect.width; - f->height = decoder->rect.height; + f->height = decoder->rect.height /2 ; f->code =MEDIA_BUS_FMT_UYVY8_2X8 ; f->field =V4L2_FIELD_ALTERNATE ;
drivers/mfd/hi655x-pmic.c +1 -1
@@ -49,7 +49,7 @@ static struct regmap_config hi655x_regmap_config = { .reg_bits = 32, .reg_stride = HI655X_STRIDE, .val_bits = 8, - .max_register = HI655X_BUS_ADDR(0xFFF), + .max_register = HI655X_BUS_ADDR(0x400) - HI655X_STRIDE, };static struct resource pwrkey_resources[] = {
drivers/misc/cxl/main.c +1 -1
@@ -287,7 +287,7 @@ int cxl_adapter_context_get(struct cxl *adapter)int rc; rc =atomic_inc_unless_negative (&adapter->contexts_num); -return rc >=0 ?0 : -EBUSY ; +return rc ?0 : -EBUSY ; }void cxl_adapter_context_put (struct cxl *adapter)
drivers/misc/ocxl/link.c +15 -9
@@ -136,7 +136,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work)int rc;/* -* We need to release a reference on the mm whenever exiting this +* We must release a reference on mm_users whenever exiting this * function (taken in the memory fault interrupt handler) */ rc = copro_handle_mm_fault(fault->pe_data.mm, fault->dar, fault->dsisr,
@@ -172,7 +172,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) } r =RESTART ; ack: -mmdrop (fault->pe_data.mm); +mmput (fault->pe_data.mm);ack_irq (spa, r); }
@@ -184,6 +184,7 @@ static irqreturn_t xsl_fault_handler(int irq, void *data)struct pe_data *pe_data;struct ocxl_process_element *pe;int lpid, pid, tid; +bool schedule = false;read_irq (spa, &dsisr, &dar, &pe_handle);trace_ocxl_fault (spa->spa_mem, pe_handle, dsisr, dar,-1 );
@@ -226,14 +227,19 @@ static irqreturn_t xsl_fault_handler(int irq, void *data) }WARN_ON (pe_data->mm->context.id != pid); - spa->xsl_fault.pe = pe_handle; - spa->xsl_fault.dar = dar; - spa->xsl_fault.dsisr = dsisr; - spa->xsl_fault.pe_data = *pe_data; -mmgrab (pe_data->mm);/* mm count is released by bottom half */ - +if (mmget_not_zero (pe_data->mm)) { + spa->xsl_fault.pe = pe_handle; + spa->xsl_fault.dar = dar; + spa->xsl_fault.dsisr = dsisr; + spa->xsl_fault.pe_data = *pe_data; + schedule = true; +/* mm_users count released by bottom half */ + }rcu_read_unlock (); -schedule_work (&spa->xsl_fault.fault_work); +if (schedule) +schedule_work (&spa->xsl_fault.fault_work); +else +ack_irq (spa,ADDRESS_ERROR );return IRQ_HANDLED ; }
drivers/misc/vmw_balloon.c +41 -26
116 lines not on this page · raw message
drivers/mmc/core/queue.c +7 -5
@@ -238,10 +238,6 @@ static void mmc_mq_exit_request(struct blk_mq_tag_set *set, struct request *req,mmc_exit_request (mq->queue, req); } -/* -* We use BLK_MQ_F_BLOCKING and have only 1 hardware queue, which means requests -* will not be dispatched in parallel. -*/ static blk_status_t mmc_mq_queue_rq (struct blk_mq_hw_ctx *hctx,const struct blk_mq_queue_data *bd) {
@@ -264,7 +260,7 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,spin_lock_irq (q->queue_lock); -if (mq->recovery_needed) { +if (mq->recovery_needed || mq->busy) {spin_unlock_irq (q->queue_lock);return BLK_STS_RESOURCE ; }
@@ -291,6 +287,9 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,break ; } +/* Parallel dispatch of requests is not supported at the moment */ + mq->busy = true; + mq->in_flight[issue_type] +=1 ; get_card = (mmc_tot_in_flight (mq) ==1 ); cqe_retune_ok = (mmc_cqe_qcnt (mq) ==1 );
@@ -333,9 +332,12 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx, mq->in_flight[issue_type] -=1 ;if (mmc_tot_in_flight (mq) ==0 ) put_card = true; + mq->busy = false;spin_unlock_irq (q->queue_lock);if (put_card)mmc_put_card (card, &mq->ctx); + }else { +WRITE_ONCE (mq->busy, false); }return ret;
drivers/mmc/core/queue.h +1 -0
@@ -81,6 +81,7 @@ struct mmc_queue {unsigned int cqe_busy;#define MMC_CQE_DCMD_BUSY BIT(0)#define MMC_CQE_QUEUE_FULL BIT(1) +bool busy;bool use_cqe;bool recovery_needed;bool in_recovery;
drivers/mmc/host/renesas_sdhi_internal_dmac.c +9 -1
@@ -45,14 +45,16 @@/* DM_CM_RST */ #define RST_DTRANRST1 BIT(9)#define RST_DTRANRST0 BIT(8) -#define RST_RESERVED_BITS GENMASK_ULL(32, 0) +#define RST_RESERVED_BITS GENMASK_ULL(31, 0)/* DM_CM_INFO1 and DM_CM_INFO1_MASK */ #define INFO1_CLEAR 0 +#define INFO1_MASK_CLEAR GENMASK_ULL(31, 0)#define INFO1_DTRANEND1 BIT(17)#define INFO1_DTRANEND0 BIT(16)/* DM_CM_INFO2 and DM_CM_INFO2_MASK */ +#define INFO2_MASK_CLEAR GENMASK_ULL(31, 0)#define INFO2_DTRANERR1 BIT(17)#define INFO2_DTRANERR0 BIT(16)
@@ -236,6 +238,12 @@ renesas_sdhi_internal_dmac_request_dma(struct tmio_mmc_host *host, {struct renesas_sdhi *priv =host_to_priv (host); +/* Disable DMAC interrupts, we don't use them */ +renesas_sdhi_internal_dmac_dm_write (host,DM_CM_INFO1_MASK , +INFO1_MASK_CLEAR ); +renesas_sdhi_internal_dmac_dm_write (host,DM_CM_INFO2_MASK , +INFO2_MASK_CLEAR ); +/* Each value is set to non-zero to assume "enabling" each DMA */ host->chan_rx = host->chan_tx = (void *)0xdeadbeaf ;
drivers/net/wireless/marvell/libertas/dev.h +1 -0
@@ -104,6 +104,7 @@ struct lbs_private {u8 fw_ready;u8 surpriseremoved;u8 setup_fw_on_resume; +u8 power_up_on_resume;int (*hw_host_to_card) (struct lbs_private *priv,u8 type,u8 *payload,u16 nb);void (*reset_card) (struct lbs_private *priv);int (*power_save) (struct lbs_private *priv);
drivers/net/wireless/marvell/libertas/if_sdio.c +24 -6
@@ -1290,15 +1290,23 @@ static void if_sdio_remove(struct sdio_func *func)static int if_sdio_suspend (struct device *dev) {struct sdio_func *func =dev_to_sdio_func (dev); -int ret;struct if_sdio_card *card =sdio_get_drvdata (func); +struct lbs_private *priv = card->priv; +int ret;mmc_pm_flag_t flags =sdio_get_host_pm_caps (func); + priv->power_up_on_resume = false;/* If we're powered off anyway, just let the mmc layer remove the * card. */ -if (!lbs_iface_active (card->priv)) -return -ENOSYS ; +if (!lbs_iface_active (priv)) { +if (priv->fw_ready) { + priv->power_up_on_resume = true; +if_sdio_power_off (card); + } + +return 0 ; + }dev_info (dev,"%s: suspend: PM flags = 0x%x\n" ,sdio_func_id (func), flags);
@@ -1306,9 +1314,14 @@ static int if_sdio_suspend(struct device *dev)/* If we aren't being asked to wake on anything, we should bail out * and let the SD stack power down the card. */ -if (card->priv->wol_criteria ==EHS_REMOVE_WAKEUP ) { +if (priv->wol_criteria ==EHS_REMOVE_WAKEUP ) {dev_info (dev,"Suspend without wake params -- powering down card\n" ); -return -ENOSYS ; +if (priv->fw_ready) { + priv->power_up_on_resume = true; +if_sdio_power_off (card); + } + +return 0 ; }if (!(flags &MMC_PM_KEEP_POWER )) {
@@ -1321,7 +1334,7 @@ static int if_sdio_suspend(struct device *dev)if (ret)return ret; - ret =lbs_suspend (card->priv); + ret =lbs_suspend (priv);if (ret)return ret;
@@ -1336,6 +1349,11 @@ static int if_sdio_resume(struct device *dev)dev_info (dev,"%s: resume: we're back\n" ,sdio_func_id (func)); +if (card->priv->power_up_on_resume) { +if_sdio_power_on (card); +wait_event (card->pwron_waitq, card->priv->fw_ready); + } + ret =lbs_resume (card->priv);return ret;
drivers/nvdimm/bus.c +2 -2
@@ -812,9 +812,9 @@ u32 nd_cmd_out_size(struct nvdimm *nvdimm, int cmd,* overshoots the remainder by 4 bytes, assume it was * including 'status'. */ -if (out_field[1 ] -8 == remainder) +if (out_field[1 ] -4 == remainder)return remainder; -return out_field[1 ] -4 ; +return out_field[1 ] -8 ; }else if (cmd ==ND_CMD_CALL ) {struct nd_cmd_pkg *pkg = (struct nd_cmd_pkg *) in_field;
drivers/nvdimm/dimm_devs.c +31 -0
@@ -536,6 +536,37 @@ resource_size_t nd_blk_available_dpa(struct nd_region *nd_region)return info.available; } +/** +* nd_pmem_max_contiguous_dpa - For the given dimm+region, return the max +* contiguous unallocated dpa range. +* @nd_region: constrain available space check to this reference region +* @nd_mapping: container of dpa-resource-root + labels +*/ +resource_size_t nd_pmem_max_contiguous_dpa (struct nd_region *nd_region, +struct nd_mapping *nd_mapping) +{ +struct nvdimm_drvdata *ndd =to_ndd (nd_mapping); +struct nvdimm_bus *nvdimm_bus; +resource_size_t max =0 ; +struct resource *res; + +/* if a dimm is disabled the available capacity is zero */ +if (!ndd) +return 0 ; + + nvdimm_bus =walk_to_nvdimm_bus (ndd->dev); +if (__reserve_free_pmem (&nd_region->dev, nd_mapping->nvdimm)) +return 0 ; +for_each_dpa_resource (ndd, res) { +if (strcmp (res->name,"pmem-reserve" ) !=0 ) +continue ; +if (resource_size (res) > max) + max =resource_size (res); + } +release_free_pmem (nvdimm_bus, nd_mapping); +return max; +} +/** * nd_pmem_available_dpa - for the given dimm+region account unallocated dpa * @nd_mapping: container of dpa-resource-root + labels
drivers/nvdimm/namespace_devs.c +3 -3
@@ -799,7 +799,7 @@ static int merge_dpa(struct nd_region *nd_region,return 0 ; } -static int __reserve_free_pmem (struct device *dev,void *data) +int __reserve_free_pmem (struct device *dev,void *data) {struct nvdimm *nvdimm = data;struct nd_region *nd_region;
@@ -836,7 +836,7 @@ static int __reserve_free_pmem(struct device *dev, void *data)return 0 ; } -static void release_free_pmem (struct nvdimm_bus *nvdimm_bus, +void release_free_pmem (struct nvdimm_bus *nvdimm_bus,struct nd_mapping *nd_mapping) {struct nvdimm_drvdata *ndd =to_ndd (nd_mapping);
@@ -1032,7 +1032,7 @@ static ssize_t __size_store(struct device *dev, unsigned long long val) allocated +=nvdimm_allocated_dpa (ndd, &label_id); } - available =nd_region_available_dpa (nd_region); + available =nd_region_allocatable_dpa (nd_region);if (val > available + allocated)return -ENOSPC ;
drivers/nvdimm/nd-core.h +8 -0
@@ -100,6 +100,14 @@ struct nd_region;struct nvdimm_drvdata ;struct nd_mapping ;void nd_mapping_free_labels (struct nd_mapping *nd_mapping); + +int __reserve_free_pmem (struct device *dev,void *data); +void release_free_pmem (struct nvdimm_bus *nvdimm_bus, +struct nd_mapping *nd_mapping); + +resource_size_t nd_pmem_max_contiguous_dpa (struct nd_region *nd_region, +struct nd_mapping *nd_mapping); +resource_size_t nd_region_allocatable_dpa (struct nd_region *nd_region);resource_size_t nd_pmem_available_dpa (struct nd_region *nd_region,struct nd_mapping *nd_mapping,resource_size_t *overlap);resource_size_t nd_blk_available_dpa (struct nd_region *nd_region);
drivers/nvdimm/region_devs.c +24 -0
@@ -389,6 +389,30 @@ resource_size_t nd_region_available_dpa(struct nd_region *nd_region)return available; } +resource_size_t nd_region_allocatable_dpa (struct nd_region *nd_region) +{ +resource_size_t available =0 ; +int i; + +if (is_memory (&nd_region->dev)) + available =PHYS_ADDR_MAX ; + +WARN_ON (!is_nvdimm_bus_locked (&nd_region->dev)); +for (i =0 ; i < nd_region->ndr_mappings; i++) { +struct nd_mapping *nd_mapping = &nd_region->mapping[i]; + +if (is_memory (&nd_region->dev)) + available =min (available, +nd_pmem_max_contiguous_dpa (nd_region, + nd_mapping)); +else if (is_nd_blk (&nd_region->dev)) + available +=nd_blk_available_dpa (nd_region); + } +if (is_memory (&nd_region->dev)) +return available * nd_region->ndr_mappings; +return available; +} +static ssize_t available_size_show (struct device *dev,struct device_attribute *attr,char *buf) {
drivers/pwm/pwm-omap-dmtimer.c +3 -2
@@ -264,8 +264,9 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev) timer_pdata =dev_get_platdata (&timer_pdev->dev);if (!timer_pdata) { -dev_err (&pdev->dev,"dmtimer pdata structure NULL\n" ); - ret = -EINVAL ; +dev_dbg (&pdev->dev, +"dmtimer pdata structure NULL, deferring probe\n" ); + ret = -EPROBE_DEFER ; goto put; }
drivers/pwm/pwm-tiehrpwm.c +3 -11
@@ -33,10 +33,6 @@#define TBCTL 0x00#define TBPRD 0x0A -#define TBCTL_RUN_MASK (BIT(15) | BIT(14)) -#define TBCTL_STOP_NEXT 0 -#define TBCTL_STOP_ON_CYCLE BIT(14) -#define TBCTL_FREE_RUN (BIT(15) | BIT(14))#define TBCTL_PRDLD_MASK BIT(3)#define TBCTL_PRDLD_SHDW 0#define TBCTL_PRDLD_IMDT BIT(3)
@@ -360,7 +356,7 @@ static int ehrpwm_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)/* Channels polarity can be configured from action qualifier module */ configure_polarity (pc, pwm->hwpwm); -/* Enable TBCLK before enabling PWM device */ +/* Enable TBCLK */ ret =clk_enable (pc->tbclk);if (ret) { dev_err(chip->dev, "Failed to enable TBCLK for %s: %d\n",
@@ -368,9 +364,6 @@ static int ehrpwm_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)return ret; } -/* Enable time counter for free_run */ -ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_RUN_MASK ,TBCTL_FREE_RUN ); -return 0 ; }
@@ -388,6 +381,8 @@ static void ehrpwm_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) aqcsfrc_mask =AQCSFRC_CSFA_MASK ; } +/* Update shadow register first before modifying active register */ +ehrpwm_modify (pc->mmio_base,AQCSFRC , aqcsfrc_mask, aqcsfrc_val);/* * Changes to immediate action on Action Qualifier. This puts * Action Qualifier control on PWM output from next TBCLK
@@ -400,9 +395,6 @@ static void ehrpwm_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)/* Disabling TBCLK on PWM disable */ clk_disable (pc->tbclk); -/* Stop Time base counter */ -ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_RUN_MASK ,TBCTL_STOP_NEXT ); -/* Disable clock on PWM disable */ pm_runtime_put_sync (chip->dev); }
drivers/rtc/rtc-omap.c +10 -8
@@ -861,13 +861,6 @@ static int omap_rtc_probe(struct platform_device *pdev) goto err; } -if (rtc->is_pmic_controller) { -if (!pm_power_off) { - omap_rtc_power_off_rtc = rtc; - pm_power_off = omap_rtc_power_off; - } - } -/* Support ext_wakeup pinconf */ rtc_pinctrl_desc.name =dev_name (&pdev->dev);
@@ -880,12 +873,21 @@ static int omap_rtc_probe(struct platform_device *pdev) ret =rtc_register_device (rtc->rtc);if (ret) - goto err; + goto err_deregister_pinctrl;rtc_nvmem_register (rtc->rtc, &omap_rtc_nvmem_config); +if (rtc->is_pmic_controller) { +if (!pm_power_off) { + omap_rtc_power_off_rtc = rtc; + pm_power_off = omap_rtc_power_off; + } + } +return 0 ; +err_deregister_pinctrl: +pinctrl_unregister (rtc->pctldev); err:clk_disable_unprepare (rtc->clk);device_init_wakeup (&pdev->dev, false);
drivers/spi/spi-cadence.c +1 -1
@@ -319,7 +319,7 @@ static void cdns_spi_fill_tx_fifo(struct cdns_spi *xspi)*/ if (cdns_spi_read (xspi,CDNS_SPI_ISR ) &CDNS_SPI_IXR_TXFULL ) -usleep_range (10 ,20 ); +udelay (10 );if (xspi->txbuf)cdns_spi_write (xspi,CDNS_SPI_TXD , *xspi->txbuf++);
drivers/spi/spi-davinci.c +1 -1
@@ -217,7 +217,7 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value) pdata = &dspi->pdata;/* program delay transfers if tx_delay is non zero */ -if (spicfg->wdelay) +if (spicfg && spicfg->wdelay) spidat1 |=SPIDAT1_WDEL ;/*
drivers/spi/spi-fsl-dspi.c +12 -12
@@ -1029,30 +1029,30 @@ static int dspi_probe(struct platform_device *pdev) goto out_master_put; } + dspi->clk =devm_clk_get (&pdev->dev,"dspi" ); +if (IS_ERR (dspi->clk)) { + ret =PTR_ERR (dspi->clk); +dev_err (&pdev->dev,"unable to get clock\n" ); + goto out_master_put; + } + ret =clk_prepare_enable (dspi->clk); +if (ret) + goto out_master_put; +dspi_init (dspi); dspi->irq =platform_get_irq (pdev,0 );if (dspi->irq <0 ) {dev_err (&pdev->dev,"can't get platform irq\n" ); ret = dspi->irq; - goto out_master_put; + goto out_clk_put; } ret =devm_request_irq (&pdev->dev, dspi->irq, dspi_interrupt,0 , pdev->name, dspi);if (ret <0 ) {dev_err (&pdev->dev,"Unable to attach DSPI interrupt\n" ); - goto out_master_put; - } - - dspi->clk =devm_clk_get (&pdev->dev,"dspi" ); -if (IS_ERR (dspi->clk)) { - ret =PTR_ERR (dspi->clk); -dev_err (&pdev->dev,"unable to get clock\n" ); - goto out_master_put; + goto out_clk_put; } - ret =clk_prepare_enable (dspi->clk); -if (ret) - goto out_master_put;if (dspi->devtype_data->trans_mode ==DSPI_DMA_MODE ) { ret =dspi_request_dma (dspi, res->start);
drivers/spi/spi-pxa2xx.c +4 -0
@@ -1391,6 +1391,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { { PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP }, +/* ICL-LP */ + { PCI_VDEVICE(INTEL, 0x34aa), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0x34ab), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0x34fb), LPSS_CNL_SSP },/* APL */ { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },
drivers/tty/serial/serial_core.c +12 -5
@@ -182,6 +182,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state, {struct uart_port *uport =uart_port_check (state);unsigned long page; +unsigned long flags =0 ;int retval =0 ;if (uport->type ==PORT_UNKNOWN )
@@ -196,15 +197,18 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,* Initialise and allocate the transmit and temporary * buffer. */ -if (!state->xmit.buf) { -/* This is protected by the per port mutex */ - page =get_zeroed_page (GFP_KERNEL ); -if (!page) -return -ENOMEM ; + page =get_zeroed_page (GFP_KERNEL ); +if (!page) +return -ENOMEM ; +uart_port_lock (state, flags); +if (!state->xmit.buf) { state->xmit.buf = (unsigned char *) page;uart_circ_clear (&state->xmit); + }else { +free_page (page); } +uart_port_unlock (uport, flags); retval = uport->ops->startup (uport);if (retval ==0 ) {
@@ -263,6 +267,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) {struct uart_port *uport =uart_port_check (state);struct tty_port *port = &state->port; +unsigned long flags =0 ;/* * Set the TTY IO error marker
@@ -295,10 +300,12 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)/* * Free the transmit buffer page. */ +uart_port_lock (state, flags);if (state->xmit.buf) {free_page ((unsigned long )state->xmit.buf); state->xmit.buf =NULL ; } +uart_port_unlock (uport, flags); }/**
drivers/video/fbdev/core/fbmem.c +32 -6
@@ -1704,12 +1704,12 @@ static int do_register_framebuffer(struct fb_info *fb_info)return 0 ; } -static int do_unregister_framebuffer (struct fb_info *fb_info) +static int unbind_console (struct fb_info *fb_info) {struct fb_event event; -int i, ret =0 ; +int ret; +int i = fb_info->node; - i = fb_info->node;if (i <0 || i >=FB_MAX || registered_fb[i] != fb_info)
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/udlfb.c +58 -47
105 lines not on this page · raw message
kernel/sys.c +45 -50
95 lines not on this page · raw message
kernel/utsname_sysctl.c +25 -16
41 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.