Linux 4.9.5
Greg KH
maintainerI'm announcing the release of the 4.9.5 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/mfd/tps65086.txt | 2 Makefile | 2 arch/arm64/mm/hugetlbpage.c | 22 - arch/powerpc/include/asm/book3s/64/mmu-hash.h | 47 ++ arch/powerpc/kernel/ibmebus.c | 16 arch/powerpc/mm/hash_native_64.c | 30 + arch/powerpc/mm/pgtable-radix.c | 4 arch/powerpc/platforms/powernv/pci-ioda.c | 2 arch/powerpc/platforms/ps3/htab.c | 2 arch/powerpc/platforms/pseries/lpar.c | 2 arch/x86/include/asm/cpufeatures.h | 2 arch/x86/kernel/cpu/amd.c | 58 +-- arch/x86/kernel/cpu/common.c | 2 arch/x86/kernel/process.c | 3 arch/x86/kvm/emulate.c | 249 +++++++++++++-- arch/x86/kvm/lapic.c | 6 arch/x86/kvm/lapic.h | 1 arch/x86/kvm/x86.c | 3 arch/x86/platform/efi/efi.c | 66 ++++ arch/x86/platform/efi/quirks.c | 4 block/blk-mq.c | 4 block/cfq-iosched.c | 2 drivers/acpi/apei/ghes.c | 7 drivers/acpi/cppc_acpi.c | 4 drivers/block/virtio_blk.c | 4 drivers/block/zram/zram_drv.c | 19 - drivers/bus/vexpress-config.c | 7 drivers/char/mem.c | 10 drivers/cpufreq/powernv-cpufreq.c | 8 drivers/dma/omap-dma.c | 30 + drivers/extcon/extcon.c | 2 drivers/firmware/efi/fake_mem.c | 3 drivers/firmware/efi/libstub/efistub.h | 8 drivers/firmware/efi/libstub/fdt.c | 87 +++-- drivers/firmware/efi/memmap.c | 38 ++ drivers/gpio/gpiolib.c | 2 drivers/gpu/drm/amd/amdgpu/si_dpm.c | 70 +--- drivers/gpu/drm/drm_atomic_helper.c | 4 drivers/gpu/drm/drm_irq.c | 4 drivers/gpu/drm/drm_mm.c | 1 drivers/gpu/drm/i915/intel_display.c | 32 - drivers/gpu/drm/i915/intel_pm.c | 38 -- drivers/gpu/drm/panel/panel-simple.c | 2 drivers/gpu/drm/radeon/si.c | 60 +-- drivers/gpu/drm/radeon/si_dpm.c | 13 drivers/gpu/drm/savage/savage_state.c | 1 drivers/gpu/drm/tegra/dpaux.c | 4 drivers/gpu/drm/vc4/vc4_gem.c | 9 drivers/i2c/busses/i2c-piix4.c | 22 + drivers/i2c/i2c-core.c | 2 drivers/i2c/i2c-dev.c | 2 drivers/i2c/muxes/i2c-mux-pca954x.c | 5 drivers/infiniband/hw/cxgb4/device.c | 4 drivers/input/joystick/xpad.c | 6 drivers/input/serio/i8042-x86ia64io.h | 6 drivers/input/touchscreen/elants_i2c.c | 4 drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 drivers/net/wireless/intersil/orinoco/mic.c | 44 +- drivers/net/wireless/intersil/orinoco/mic.h | 3 drivers/net/wireless/intersil/orinoco/orinoco.h | 4 drivers/nvme/host/core.c | 7 drivers/pinctrl/freescale/pinctrl-imx.c | 8 drivers/pinctrl/meson/pinctrl-meson.c | 2 drivers/pinctrl/sh-pfc/core.c | 15 drivers/pinctrl/sh-pfc/core.h | 4 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 343 ++++++++++----------- drivers/pinctrl/sh-pfc/pinctrl.c | 3 drivers/pinctrl/sh-pfc/sh_pfc.h | 6 drivers/power/supply/bq24190_charger.c | 2 drivers/power/supply/bq27xxx_battery.c | 41 ++ drivers/power/supply/bq27xxx_battery_i2c.c | 4 drivers/powercap/intel_rapl.c | 25 + drivers/regulator/axp20x-regulator.c | 12 drivers/regulator/helpers.c | 6 drivers/regulator/tps65086-regulator.c | 54 +-- drivers/remoteproc/Kconfig | 5 drivers/remoteproc/Makefile | 5 drivers/remoteproc/qcom_wcnss.c | 25 + drivers/remoteproc/qcom_wcnss.h | 2 drivers/remoteproc/qcom_wcnss_iris.c | 8 drivers/remoteproc/st_remoteproc.c | 4 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 drivers/tty/serial/8250/8250_core.c | 2 drivers/tty/serial/8250/8250_port.c | 2 drivers/tty/serial/atmel_serial.c | 22 - drivers/tty/sysrq.c | 4 drivers/usb/host/xhci-ring.c | 11 drivers/usb/host/xhci.c | 13 drivers/usb/musb/musb_debugfs.c | 20 + drivers/usb/serial/ch341.c | 84 +++-- drivers/usb/serial/kl5kusb105.c | 9 drivers/usb/wusbcore/crypto.c | 3 drivers/vme/bridges/vme_ca91cx42.c | 2 fs/btrfs/async-thread.c | 15 fs/btrfs/extent-tree.c | 5 fs/dcache.c | 7 fs/namespace.c | 64 ++- fs/nfs/dir.c | 15 fs/nfs/filelayout/filelayoutdev.c | 3 fs/nfs/pnfs.c | 8 fs/nfs/super.c | 2 fs/ocfs2/dlmglue.c | 10 fs/ocfs2/stackglue.c | 6 fs/ocfs2/stackglue.h | 3 fs/proc/proc_sysctl.c | 3 fs/xfs/xfs_aops.c | 19 - include/linux/blkdev.h | 2 include/linux/efi.h | 2 include/linux/jump_label_ratelimit.h | 5 include/linux/memcontrol.h | 26 + include/linux/mm_inline.h | 2 include/linux/power/bq27xxx_battery.h | 3 include/linux/swap.h | 3 include/sound/hdmi-codec.h | 8 include/trace/events/btrfs.h | 22 - kernel/jump_label.c | 7 kernel/memremap.c | 4 kernel/pid_namespace.c | 10 lib/iov_iter.c | 54 +-- mm/filemap.c | 2 mm/huge_memory.c | 6 mm/hugetlb.c | 37 +- mm/memcontrol.c | 18 - mm/slab.c | 8 mm/swapfile.c | 20 + mm/vmscan.c | 27 + net/bridge/br_netfilter_hooks.c | 2 net/iucv/af_iucv.c | 25 - net/wireless/nl80211.c | 16 tools/testing/selftests/Makefile | 2 tools/testing/selftests/net/run_netsocktests | 2 virt/lib/irqbypass.c | 4 132 files changed, 1515 insertions(+), 821 deletions(-)
Akinobu Mita (1):
sysrq: attach sysrq handler correctly for 32-bit kernel
Al Viro (1):
fix a fencepost error in pipe_advance()
Alex Deucher (3):
drm/radeon: update smc firmware selection for SI drm/radeon: drop verde dpm quirks drm/amdgpu: drop verde dpm quirks
Andrei Vagin (1):
pid: fix lockdep deadlock warning due to ucount_lock
Andrew F. Davis (2):
regulator: tps65086: Fix 25mV ranges for BUCK regulators
power: supply: bq27xxx_battery: Fix register map for BQ27510 and BQ27520
Andrew Lutomirski (1):
orinoco: Use shash instead of ahash for MIC calculations
Andy Lutomirski (1):
wusbcore: Fix one more crypto-on-the-stack bug
Ard Biesheuvel (1):
efi/libstub/arm*: Pass latest memory map to the kernel
Arnd Bergmann (1):
drm: avoid uninitialized timestamp use in wait_vblank
Artur Molchanov (1):
bridge: netfilter: Fix dropping packets that moving through bridge interface
Augusto Mecking Caringi (1):
vme: Fix wrong pointer utilization in ca91cx42_slave_get
Bin Liu (1):
usb: musb: fix runtime PM in debugfs
Bjorn Andersson (1):
remoteproc: qcom_wcnss: Fix circular module dependency
Borislav Petkov (1):
x86/CPU/AMD: Fix Bulldozer topology
Bryant G. Ly (1):
ibmvscsis: Fix srp_transfer_data fail return code
Charles Keepax (1):
regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap
Chen-Yu Tsai (2):
regulator: axp20x: Fix axp809 ldo_io registration error on cold boot drm/panel: simple: Check against num_timings when setting preferred for timing
Chris Wilson (1):
drm: Initialise drm_mm.head_node.allocated
Christoph Hellwig (1):
virtio_blk: avoid DMA to stack for the sense buffer
Christophe Jaillet (1):
drm/tegra: dpaux: Fix error handling
Dan Carpenter (3):
drm/vc4: Fix a couple error codes in vc4_cl_lookup_bos() drm/savage: dereferencing an error pointer ACPI / CPPC: set an error code on probe error path
Dan Williams (1):
mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}Daniel Jedrychowski (1):
Clearing FIFOs in RS485 emulation mode causes subsequent transmits to break
Daniel Jurgens (1):
net/mlx5: Only cancel recovery work when cleaning up device
David Matlack (2):
jump_labels: API for flushing deferred jump label updates
KVM: x86: flush pending lapic jump label updates on module unload
David Sterba (1):
btrfs: fix crash when tracepoint arguments are freed by wq callbacks
Denis Kirjanov (1):
cpufreq: powernv: Disable preemption while checking CPU throttling state
Eric Ren (1):
ocfs2: fix crash caused by stale lvb with fsdlm plugin
Eric W. Biederman (1):
mnt: Protect the mountpoint hashtable with mount_lock
Flora Cui (1):
drm/amdgpu: update si kicker smc firmware
Gabriel Krisman Bertazi (1):
blk-mq: Always schedule hctx->next_cpu
Gary Bisson (1):
pinctrl: imx: fix imx_pinctrl_desc initialization
Geert Uytterhoeven (1):
gpio: Move freeing of GPIO hogs before numbing of the device
Greg Kroah-Hartman (1):
Linux 4.9.5
Guenter Roeck (1):
Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data
Guilherme G. Piccoli (1):
nvme: apply DELAY_BEFORE_CHK_RDY quirk at probe time too
Herbert Xu (1):
Revert "tty: serial: 8250: add CON_CONSDEV to flags"
Huang Shijie (3):
arm64: hugetlb: fix the wrong address for several functions
arm64: hugetlb: remove the wrong pmd check in find_num_contig()
arm64: hugetlb: fix the wrong return value for huge_ptep_set_access_flags
Imre Deak (2):
drm/i915/gen9: Fix PCODE polling timeout in stable backport drm/i915/gen9: Fix PCODE polling during SAGV disabling
Jacob Pan (1):
powercap/intel_rapl: fix and tidy up error handling
Jan Kara (1):
xfs: Timely free truncated dirty pages
Jeff Mahoney (2):
btrfs: fix locking when we put back a delayed ref that's too new
btrfs: fix error handling when run_delayed_extent_op fails
Johan Hovold (10):
USB: serial: kl5kusb105: fix line-state error handling
USB: serial: ch341: fix initial modem-control state
USB: serial: ch341: fix resume after reset
USB: serial: ch341: fix open error handling
USB: serial: ch341: fix control-message error handling
USB: serial: ch341: fix open and resume after B0
USB: serial: ch341: fix modem-control and B0 handling
bus: vexpress-config: fix device reference leak powerpc/ibmebus: Fix further device reference leaks powerpc/ibmebus: Fix device reference leaks in sysfs interface
Johannes Berg (1):
nl80211: fix sched scan netlink socket owner destruction
John Garry (1):
i2c: print correct device invalid address
John Sperbeck (1):
mm/slab.c: fix SLAB freelist randomization duplicate entries
Julian Wiedmann (1):
net/af_iucv: don't use paged skbs for TX on HiperSockets
Laurent Pinchart (1):
drm: Clean up planes in atomic commit helper failure path
Lukasz Odzioba (1):
x86/cpu: Fix bootup crashes by sanitizing the argument of the 'clearcpuid=' command-line option
Marcos Paulo de Souza (1):
Input: i8042 - add Pegatron touchpad to noloop table
Mathias Nyman (1):
xhci: fix deadlock at host remove by running watchdog correctly
Michal Hocko (1):
mm, memcg: fix the active list aging for lowmem requests when memcg is enabled
Mike Kravetz (1):
mm/hugetlb.c: fix reservation race when freeing surplus pages
Minchan Kim (4):
zram: revalidate disk under init_lock
zram: support BDI_CAP_STABLE_WRITES
mm: pmd dirty emulation in page fault handler
mm: support anonymous stable page
Neil Armstrong (1):
pinctrl: meson: fix gpio request disabling other modes
NeilBrown (1):
NFSv4.1: nfs4_fl_prepare_ds must be careful about reporting success.
Nicolai Stange (1):
x86/efi: Don't allocate memmap through memblock after mm_init()
Niklas Söderlund (3):
pinctrl: sh-pfc: r8a7795: Use lookup function for bias data
pinctrl: sh-pfc: Add helper to handle bias lookup table
pinctrl: sh-pfc: Do not unconditionally support PIN_CONFIG_BIAS_DISABLE
Pan Bian (1):
extcon: return error code on failure
Paolo Bonzini (1):
KVM: x86: fix emulation of "MOV SS, null selector"
Paul Mackerras (1):
powerpc/64: Simplify adaptation to new ISA v3.00 HPTE format
Pavel Rojtberg (1):
Input: xpad - use correct product id for x360w controllers
Peter Jones (1):
efi/x86: Prune invalid memory map entries and fix boot regression
Peter Ujfalusi (1):
dmaengine: omap-dma: Fix dynamic lch_map allocation
Prarit Bhargava (1):
ACPI / APEI: Fix NMI notification handling
Radim Krčmář (3):
KVM: x86: add Align16 instruction flag
KVM: x86: add asm_safe wrapper
KVM: x86: emulate FXSAVE and FXRSTOR
Ricardo Ribalda Delgado (1):
i2c: piix4: Avoid race conditions with IMC
Richard Genoud (2):
tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done tty/serial: atmel_serial: BUG: stop DMA from transmitting in stop_tx
Robin Murphy (1):
drivers: char: mem: Fix thinkos in kmem address checks
Rolf Eike Beer (2):
selftests: do not require bash to run netsocktests testcase
selftests: do not require bash for the generated test
Ross Zwisler (1):
dax: fix deadlock with DAX 4k holes
Russell Currey (1):
powerpc/powernv: Don't warn on PE init if unfreeze is unsupported
Russell King (1):
i2c: mux: pca954x: fix i2c mux selection caching
Steve Rutherford (1):
KVM: x86: Introduce segmented_write_std
Suraj Jitindar Singh (1):
powerpc/mm: Correct process and partition table max size
Takashi Sakamoto (1):
ASoC: hdmi-codec: use unsigned type to structure members with bit-field
Tejun Heo (1):
block: cfq_cpd_alloc() should use @gfp
Thomas Gleixner (1):
x86/bugs: Separate AMD E400 erratum and C1E bug
Tobias Klauser (1):
block: Change extern inline to static inline
Tony Lindgren (1):
bq24190_charger: Fix PM runtime use for bq24190_battery_set_property
Trond Myklebust (2):
pNFS: Fix race in pnfs_wait_on_layoutreturn
NFS: Fix a performance regression in readdir
Ville Syrjälä (1):
drm/i915: Move the min_pixclk[] handling to the end of readout
Vlad Tsyrklevich (1):
i2c: fix kernel memory disclosure in dev interface
Wanpeng Li (2):
KVM: eventfd: fix NULL deref irqbypass consumer
KVM: x86: fix NULL deref in vcpu_scan_ioapic
Wei Yongjun (3):
NFS: fix typo in parameter description
remoteproc: st: Fix error return code in st_rproc_probe()
iw_cxgb4: Fix error return code in c4iw_rdev_open()
Yazen Ghannam (1):
x86/cpu/AMD: Clean up cpu_llc_id assignment per topology feature
Zhou Chengming (1):
sysctl: Drop reference added by grab_header in proc_sys_readdir
Greg KH
maintainerDocumentation/devicetree/bindings/mfd/tps65086.txt +1 -1
@@ -23,7 +23,7 @@ Required properties: defined below. Optional regulator properties: - - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this + - ti,regulator-step-size-25mv : This is applicable for buck[1-6], set this if the regulator is factory set with a 25mv step voltage mapping. - ti,regulator-decay : This is applicable for buck[1-6], set this if
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Roaring Lionus
arch/arm64/mm/hugetlbpage.c +5 -17
@@ -51,20 +51,8 @@ static int find_num_contig(struct mm_struct *mm, unsigned long addr, *pgsize =PAGE_SIZE ;if (!pte_cont (pte))return 1 ; -if (!pgd_present (*pgd)) { -VM_BUG_ON (!pgd_present (*pgd)); -return 1 ; - } pud =pud_offset (pgd, addr); -if (!pud_present (*pud)) { -VM_BUG_ON (!pud_present (*pud)); -return 1 ; - } pmd =pmd_offset (pud, addr); -if (!pmd_present (*pmd)) { -VM_BUG_ON (!pmd_present (*pmd)); -return 1 ; - }if ((pte_t *)pmd == ptep) { *pgsize =PMD_SIZE ;return CONT_PMDS ;
@@ -212,7 +200,7 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, ncontig =find_num_contig (mm, addr, cpte, *cpte, &pgsize);/* save the 1st pte to return */ pte =ptep_get_and_clear (mm, addr, cpte); -for (i =1 ; i < ncontig; ++i) { +for (i =1 , addr += pgsize; i < ncontig; ++i, addr += pgsize) {/* * If HW_AFDBM is enabled, then the HW could * turn on the dirty bit for any of the page
@@ -250,8 +238,8 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, pfn =pte_pfn (*cpte); ncontig =find_num_contig (vma->vm_mm, addr, cpte, *cpte, &pgsize); -for (i =0 ; i < ncontig; ++i, ++cpte) { - changed =ptep_set_access_flags (vma, addr, cpte, +for (i =0 ; i < ncontig; ++i, ++cpte, addr += pgsize) { + changed |=ptep_set_access_flags (vma, addr, cpte,pfn_pte (pfn, hugeprot), dirty);
@@ -273,7 +261,7 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, cpte =huge_pte_offset (mm, addr); ncontig =find_num_contig (mm, addr, cpte, *cpte, &pgsize); -for (i =0 ; i < ncontig; ++i, ++cpte) +for (i =0 ; i < ncontig; ++i, ++cpte, addr += pgsize)ptep_set_wrprotect (mm, addr, cpte); }else {ptep_set_wrprotect (mm, addr, ptep);
@@ -291,7 +279,7 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma, cpte =huge_pte_offset (vma->vm_mm, addr); ncontig =find_num_contig (vma->vm_mm, addr, cpte, *cpte, &pgsize); -for (i =0 ; i < ncontig; ++i, ++cpte) +for (i =0 ; i < ncontig; ++i, ++cpte, addr += pgsize)ptep_clear_flush (vma, addr, cpte); }else {ptep_clear_flush (vma, addr, ptep);
arch/powerpc/include/asm/book3s/64/mmu-hash.h +39 -8
84 lines not on this page · raw message
arch/powerpc/kernel/ibmebus.c +12 -4
@@ -180,6 +180,7 @@ static int ibmebus_create_device(struct device_node *dn)static int ibmebus_create_devices (const struct of_device_id *matches) {struct device_node *root, *child; +struct device *dev;int ret =0 ; root =of_find_node_by_path ("/" );
@@ -188,9 +189,12 @@ static int ibmebus_create_devices(const struct of_device_id *matches)if (!of_match_node (matches, child))continue ; -if (bus_find_device (&ibmebus_bus_type,NULL , child, - ibmebus_match_node)) + dev =bus_find_device (&ibmebus_bus_type,NULL , child, + ibmebus_match_node); +if (dev) { +put_device (dev);continue ; + } ret =ibmebus_create_device (child);if (ret) {
@@ -262,6 +266,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus, const char *buf, size_t count) {struct device_node *dn =NULL ; +struct device *dev;char *path;ssize_t rc =0 ;
@@ -269,8 +274,10 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,if (!path)return -ENOMEM ; -if (bus_find_device (&ibmebus_bus_type,NULL , path, - ibmebus_match_path)) { + dev =bus_find_device (&ibmebus_bus_type,NULL , path, + ibmebus_match_path); +if (dev) { +put_device (dev);printk (KERN_WARNING "%s: %s has already been probed\n" , __func__, path); rc = -EEXIST ;
@@ -307,6 +314,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,if ((dev =bus_find_device (&ibmebus_bus_type,NULL , path, ibmebus_match_path))) {of_device_unregister (to_platform_device (dev)); +put_device (dev);kfree (path);return count;
arch/powerpc/mm/hash_native_64.c +24 -6
@@ -221,13 +221,18 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long vpn,return -1 ; hpte_v =hpte_encode_v (vpn, psize, apsize, ssize) | vflags |HPTE_V_VALID ; - hpte_r =hpte_encode_r (pa, psize, apsize, ssize) | rflags; + hpte_r =hpte_encode_r (pa, psize, apsize) | rflags;if (!(vflags &HPTE_V_BOLTED )) {DBG_LOW (" i=%x hpte_v=%016lx, hpte_r=%016lx\n" , i, hpte_v, hpte_r); } +if (cpu_has_feature (CPU_FTR_ARCH_300 )) { + hpte_r =hpte_old_to_new_r (hpte_v, hpte_r); + hpte_v =hpte_old_to_new_v (hpte_v); + } + hptep->r =cpu_to_be64 (hpte_r);/* Guarantee the second dword is visible before the valid bit */ eieio ();
@@ -295,6 +300,8 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp, vpn, want_v & HPTE_V_AVPN, slot, newpp); hpte_v =be64_to_cpu (hptep->v); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + hpte_v =hpte_new_to_old_v (hpte_v,be64_to_cpu (hptep->r));/* * We need to invalidate the TLB always because hpte_remove doesn't do * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less
@@ -309,6 +316,8 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,native_lock_hpte (hptep);/* recheck with locks held */ hpte_v =be64_to_cpu (hptep->v); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + hpte_v =hpte_new_to_old_v (hpte_v,be64_to_cpu (hptep->r));if (unlikely (!HPTE_V_COMPARE (hpte_v, want_v) || !(hpte_v &HPTE_V_VALID ))) { ret =-1 ;
@@ -350,6 +359,8 @@ static long native_hpte_find(unsigned long vpn, int psize, int ssize)for (i =0 ; i <HPTES_PER_GROUP ; i++) { hptep = htab_address + slot; hpte_v =be64_to_cpu (hptep->v); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + hpte_v =hpte_new_to_old_v (hpte_v,be64_to_cpu (hptep->r));if (HPTE_V_COMPARE (hpte_v, want_v) && (hpte_v &HPTE_V_VALID ))/* HPTE matches */
@@ -409,6 +420,8 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn, want_v =hpte_encode_avpn (vpn, bpsize, ssize);native_lock_hpte (hptep); hpte_v =be64_to_cpu (hptep->v); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + hpte_v =hpte_new_to_old_v (hpte_v,be64_to_cpu (hptep->r));/* * We need to invalidate the TLB always because hpte_remove doesn't do
@@ -467,6 +480,8 @@ static void native_hugepage_invalidate(unsigned long vsid, want_v =hpte_encode_avpn (vpn, psize, ssize);native_lock_hpte (hptep); hpte_v =be64_to_cpu (hptep->v); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + hpte_v =hpte_new_to_old_v (hpte_v,be64_to_cpu (hptep->r));/* Even if we miss, we need to invalidate the TLB */ if (!HPTE_V_COMPARE (hpte_v, want_v) || !(hpte_v &HPTE_V_VALID ))
@@ -504,6 +519,10 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot,/* Look at the 8 bit LP value */ unsigned int lp = (hpte_r >>LP_SHIFT ) & ((1 <<LP_BITS ) -1 ); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) { + hpte_v =hpte_new_to_old_v (hpte_v, hpte_r); + hpte_r =hpte_new_to_old_r (hpte_r); + }if (!(hpte_v &HPTE_V_LARGE )) { size =MMU_PAGE_4K ; a_size =MMU_PAGE_4K ;
@@ -512,11 +531,7 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot, a_size = hpte_page_sizes[lp] >>4 ; }/* This works for all page sizes, and for 256M and 1T segments */ -if (cpu_has_feature (CPU_FTR_ARCH_300 )) - *ssize = hpte_r >>HPTE_R_3_0_SSIZE_SHIFT ; -else - *ssize = hpte_v >>HPTE_V_SSIZE_SHIFT ; - + *ssize = hpte_v >>HPTE_V_SSIZE_SHIFT ; shift = mmu_psize_defs[size].shift; avpn = (HPTE_V_AVPN_VAL (hpte_v) & ~mmu_psize_defs[size].avpnm);
@@ -639,6 +654,9 @@ static void native_flush_hash_range(unsigned long number, int local) want_v =hpte_encode_avpn (vpn, psize, ssize);native_lock_hpte (hptep); hpte_v =be64_to_cpu (hptep->v); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + hpte_v =hpte_new_to_old_v (hpte_v, +be64_to_cpu (hptep->r));if (!HPTE_V_COMPARE (hpte_v, want_v) || !(hpte_v &HPTE_V_VALID ))native_unlock_hpte (hptep);
arch/powerpc/mm/pgtable-radix.c +2 -2
@@ -159,7 +159,7 @@ static void __init radix_init_pgtable(void)* Allocate Partition table and process table for the * host. */ -BUILD_BUG_ON_MSG ((PRTB_SIZE_SHIFT >23 ),"Process table size too large." ); +BUILD_BUG_ON_MSG ((PRTB_SIZE_SHIFT >36 ),"Process table size too large." ); process_tb =early_alloc_pgtable (1UL <<PRTB_SIZE_SHIFT );/* * Fill in the process table.
@@ -181,7 +181,7 @@ static void __init radix_init_partition_table(void) rts_field =radix__get_tree_size (); -BUILD_BUG_ON_MSG ((PATB_SIZE_SHIFT >24 ),"Partition table size too large." ); +BUILD_BUG_ON_MSG ((PATB_SIZE_SHIFT >36 ),"Partition table size too large." ); partition_tb =early_alloc_pgtable (1UL <<PATB_SIZE_SHIFT ); partition_tb->patb0 =cpu_to_be64 (rts_field |__pa (init_mm.pgd) |RADIX_PGD_INDEX_SIZE |PATB_HR );
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -145,7 +145,7 @@ static struct pnv_ioda_pe *pnv_ioda_init_pe(struct pnv_phb *phb, int pe_no)*/ rc =opal_pci_eeh_freeze_clear (phb->opal_id, pe_no,OPAL_EEH_ACTION_CLEAR_FREEZE_ALL ); -if (rc !=OPAL_SUCCESS ) +if (rc !=OPAL_SUCCESS && rc !=OPAL_UNSUPPORTED )pr_warn ("%s: Error %lld unfreezing PHB#%d-PE#%d\n" , __func__, rc, phb->hose->global_number, pe_no);
arch/powerpc/platforms/ps3/htab.c +1 -1
@@ -63,7 +63,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn, vflags &= ~HPTE_V_SECONDARY ; hpte_v =hpte_encode_v (vpn, psize, apsize, ssize) | vflags |HPTE_V_VALID ; - hpte_r =hpte_encode_r (ps3_mm_phys_to_lpar (pa), psize, apsize, ssize) | rflags; + hpte_r =hpte_encode_r (ps3_mm_phys_to_lpar (pa), psize, apsize) | rflags;spin_lock_irqsave (&ps3_htab_lock, flags);
arch/powerpc/platforms/pseries/lpar.c +1 -1
@@ -145,7 +145,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group, hpte_group, vpn, pa, rflags, vflags, psize); hpte_v =hpte_encode_v (vpn, psize, apsize, ssize) | vflags |HPTE_V_VALID ; - hpte_r =hpte_encode_r (pa, psize, apsize, ssize) | rflags; + hpte_r =hpte_encode_r (pa, psize, apsize) | rflags;if (!(vflags &HPTE_V_BOLTED ))pr_devel (" hpte_v=%016lx, hpte_r=%016lx\n" , hpte_v, hpte_r);
arch/x86/include/asm/cpufeatures.h +2 -0
@@ -311,4 +311,6 @@#define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ #define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote CPU */ +#define X86_BUG_AMD_E400 X86_BUG(13)/* CPU is among the affected by Erratum 400 */ +#endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/kernel/cpu/amd.c +32 -26
102 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +1 -1
@@ -1275,7 +1275,7 @@ static __init int setup_disablecpuid(char *arg) {int bit; -if (get_option (&arg, &bit) && bit <NCAPINTS *32 ) +if (get_option (&arg, &bit) && bit >=0 && bit <NCAPINTS *32 )setup_clear_cpu_cap (bit);else return 0 ;
arch/x86/kernel/process.c +1 -2
@@ -448,8 +448,7 @@ void select_idle_routine(const struct cpuinfo_x86 *c)if (x86_idle || boot_option_idle_override ==IDLE_POLL )return ; -if (cpu_has_bug (c,X86_BUG_AMD_APIC_C1E )) { -/* E400: APIC timer interrupt does not wake up CPU from C1e */ +if (boot_cpu_has_bug (X86_BUG_AMD_E400 )) {pr_info ("using AMD E400 aware idle routine\n" ); x86_idle = amd_e400_idle; }else if (prefer_mwait_c1_over_halt (c)) {
arch/x86/kvm/emulate.c +217 -32
338 lines not on this page · raw message
arch/x86/kvm/lapic.c +6 -0
@@ -2360,3 +2360,9 @@ void kvm_lapic_init(void)jump_label_rate_limit (&apic_hw_disabled,HZ );jump_label_rate_limit (&apic_sw_disabled,HZ ); } + +void kvm_lapic_exit (void ) +{ +static_key_deferred_flush (&apic_hw_disabled); +static_key_deferred_flush (&apic_sw_disabled); +}
arch/x86/kvm/lapic.h +1 -0
@@ -108,6 +108,7 @@ static inline bool kvm_hv_vapic_assist_page_enabled(struct kvm_vcpu *vcpu)int kvm_lapic_enable_pv_eoi (struct kvm_vcpu *vcpu,u64 data);void kvm_lapic_init (void ); +void kvm_lapic_exit (void );#define VEC_POS (v) ((v) & (32 - 1))#define REG_POS (v) (((v) >> 5) << 4)
arch/x86/kvm/x86.c +3 -0
@@ -3308,6 +3308,8 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,switch (cap->cap) {case KVM_CAP_HYPERV_SYNIC : +if (!irqchip_in_kernel (vcpu->kvm)) +return -EINVAL ;return kvm_hv_activate_synic (vcpu);default :return -EINVAL ;
@@ -5963,6 +5965,7 @@ int kvm_arch_init(void *opaque)void kvm_arch_exit (void ) { +kvm_lapic_exit ();perf_unregister_guest_info_callbacks (&kvm_guest_cbs);if (!boot_cpu_has (X86_FEATURE_CONSTANT_TSC ))
arch/x86/platform/efi/efi.c +66 -0
78 lines not on this page · raw message
arch/x86/platform/efi/quirks.c +2 -2
@@ -214,7 +214,7 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) new_size = efi.memmap.desc_size * num_entries; - new_phys =memblock_alloc (new_size,0 ); + new_phys =efi_memmap_alloc (num_entries);if (!new_phys) {pr_err ("Could not allocate boot services memmap\n" );return ;
@@ -355,7 +355,7 @@ void __init efi_free_boot_services(void) } new_size = efi.memmap.desc_size * num_entries; - new_phys =memblock_alloc (new_size,0 ); + new_phys =efi_memmap_alloc (num_entries);if (!new_phys) {pr_err ("Failed to allocate new EFI memmap\n" );return ;
block/blk-mq.c +1 -3
@@ -895,7 +895,7 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)return WORK_CPU_UNBOUND ;if (--hctx->next_cpu_batch <=0 ) { -int cpu = hctx->next_cpu, next_cpu; +int next_cpu; next_cpu =cpumask_next (hctx->next_cpu, hctx->cpumask);if (next_cpu >= nr_cpu_ids)
@@ -903,8 +903,6 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx) hctx->next_cpu = next_cpu; hctx->next_cpu_batch =BLK_MQ_CPU_WORK_BATCH ; - -return cpu; }return hctx->next_cpu;
block/cfq-iosched.c +1 -1
@@ -1596,7 +1596,7 @@ static struct blkcg_policy_data *cfq_cpd_alloc(gfp_t gfp) {struct cfq_group_data *cgd; - cgd =kzalloc (sizeof (*cgd),GFP_KERNEL ); + cgd =kzalloc (sizeof (*cgd), gfp);if (!cgd)return NULL ;return &cgd->cpd;
drivers/acpi/apei/ghes.c +4 -3
@@ -852,6 +852,8 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)if (ghes_read_estatus (ghes,1 )) {ghes_clear_estatus (ghes);continue ; + }else { + ret =NMI_HANDLED ; } sev =ghes_severity (ghes->estatus->error_severity);
@@ -863,12 +865,11 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)__process_error (ghes);ghes_clear_estatus (ghes); - - ret =NMI_HANDLED ; }#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG -irq_work_queue (&ghes_proc_irq_work); +if (ret ==NMI_HANDLED ) +irq_work_queue (&ghes_proc_irq_work);#endif atomic_dec (&ghes_in_nmi);return ret;
drivers/acpi/cppc_acpi.c +3 -1
@@ -784,8 +784,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)/* Add per logical CPU nodes for reading its feedback counters. */ cpu_dev =get_cpu_device (pr->id); -if (!cpu_dev) +if (!cpu_dev) { + ret = -EINVAL ; goto out_free; + } ret =kobject_init_and_add (&cpc_ptr->kobj, &cppc_ktype, &cpu_dev->kobj,"acpi_cppc" );
drivers/block/virtio_blk.c +3 -1
@@ -56,6 +56,7 @@ struct virtblk_req {struct virtio_blk_outhdr out_hdr;struct virtio_scsi_inhdr in_hdr;u8 status; +u8 sense[SCSI_SENSE_BUFFERSIZE ];struct scatterlist sg[]; };
@@ -102,7 +103,8 @@ static int __virtblk_add_req(struct virtqueue *vq, }if (type ==cpu_to_virtio32 (vq->vdev,VIRTIO_BLK_T_SCSI_CMD )) { -sg_init_one (&sense, vbr->req->sense,SCSI_SENSE_BUFFERSIZE ); +memcpy (vbr->sense, vbr->req->sense,SCSI_SENSE_BUFFERSIZE ); +sg_init_one (&sense, vbr->sense,SCSI_SENSE_BUFFERSIZE ); sgs[num_out + num_in++] = &sense;sg_init_one (&inhdr, &vbr->in_hdr,sizeof (vbr->in_hdr)); sgs[num_out + num_in++] = &inhdr;
drivers/block/zram/zram_drv.c +11 -8
@@ -25,6 +25,7 @@#include <linux/genhd.h> #include <linux/highmem.h> #include <linux/slab.h> +#include <linux/backing-dev.h> #include <linux/string.h> #include <linux/vmalloc.h> #include <linux/err.h>
@@ -111,6 +112,14 @@ static inline bool is_partial_io(struct bio_vec *bvec)return bvec->bv_len !=PAGE_SIZE ; } +static void zram_revalidate_disk (struct zram *zram) +{ +revalidate_disk (zram->disk); +/* revalidate_disk reset the BDI_CAP_STABLE_WRITES so set again */ + zram->disk->queue->backing_dev_info.capabilities |= +BDI_CAP_STABLE_WRITES ; +} +/* * Check if request is within bounds and aligned on zram logical blocks. */
@@ -1094,15 +1103,9 @@ static ssize_t disksize_store(struct device *dev, zram->comp = comp; zram->disksize = disksize;set_capacity (zram->disk, zram->disksize >>SECTOR_SHIFT ); +zram_revalidate_disk (zram);up_write (&zram->init_lock); -/* -* Revalidate disk out of the init_lock to avoid lockdep splat. -* It's okay because disk's capacity is protected by init_lock -* so that revalidate_disk always sees up-to-date capacity. -*/ -revalidate_disk (zram->disk); -return len; out_destroy_comp:
@@ -1148,7 +1151,7 @@ static ssize_t reset_store(struct device *dev,/* Make sure all the pending I/O are finished */ fsync_bdev (bdev);zram_reset_device (zram); -revalidate_disk (zram->disk); +zram_revalidate_disk (zram);bdput (bdev);mutex_lock (&bdev->bd_mutex);
drivers/bus/vexpress-config.c +6 -1
@@ -171,6 +171,7 @@ static int vexpress_config_populate(struct device_node *node) {struct device_node *bridge;struct device *parent; +int ret; bridge =of_parse_phandle (node,"arm,vexpress,config-bridge" ,0 );if (!bridge)
@@ -182,7 +183,11 @@ static int vexpress_config_populate(struct device_node *node)if (WARN_ON (!parent))return -ENODEV ; -return of_platform_populate (node,NULL ,NULL , parent); + ret =of_platform_populate (node,NULL ,NULL , parent); + +put_device (parent); + +return ret; }static int __init vexpress_config_init (void )
drivers/char/mem.c +4 -6
@@ -381,9 +381,6 @@ static ssize_t read_kmem(struct file *file, char __user *buf,char *kbuf;/* k-addr because vread() takes vmlist_lock rwlock */ int err =0 ; -if (!pfn_valid (PFN_DOWN (p))) -return -EIO ; - read =0 ;if (p < (unsigned long ) high_memory) { low_count = count;
@@ -412,6 +409,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,* by the kernel or data corruption may occur */ kbuf =xlate_dev_kmem_ptr ((void *)p); +if (!virt_addr_valid (kbuf)) +return -ENXIO ;if (copy_to_user (buf, kbuf, sz))return -EFAULT ;
@@ -482,6 +481,8 @@ static ssize_t do_write_kmem(unsigned long p, const char __user *buf,* corruption may occur. */ ptr =xlate_dev_kmem_ptr ((void *)p); +if (!virt_addr_valid (ptr)) +return -ENXIO ; copied =copy_from_user (ptr, buf, sz);if (copied) {
@@ -512,9 +513,6 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,char *kbuf;/* k-addr because vwrite() takes vmlist_lock rwlock */ int err =0 ; -if (!pfn_valid (PFN_DOWN (p))) -return -EIO ; -if (p < (unsigned long ) high_memory) { unsigned long to_write = min_t(unsigned long, count, (unsigned long )high_memory - p);
drivers/cpufreq/powernv-cpufreq.c +7 -1
@@ -647,8 +647,14 @@ static int powernv_cpufreq_target_index(struct cpufreq_policy *policy,if (unlikely (rebooting) && new_index !=get_nominal_index ())return 0 ; -if (!throttled) +if (!throttled) { +/* we don't want to be preempted while +* checking if the CPU frequency has been throttled +*/ +preempt_disable ();powernv_cpufreq_throttle_check (NULL ); +preempt_enable (); + } cur_msec =jiffies_to_msecs (get_jiffies_64 ());
drivers/dma/omap-dma.c +21 -9
@@ -1339,6 +1339,7 @@ static int omap_dma_probe(struct platform_device *pdev)struct omap_dmadev *od;struct resource *res;int rc, i, irq; +u32 lch_count; od =devm_kzalloc (&pdev->dev,sizeof (*od),GFP_KERNEL );if (!od)
@@ -1381,20 +1382,31 @@ static int omap_dma_probe(struct platform_device *pdev)spin_lock_init (&od->lock);spin_lock_init (&od->irq_lock); -if (!pdev->dev.of_node) { - od->dma_requests = od->plat->dma_attr->lch_count; -if (unlikely (!od->dma_requests)) - od->dma_requests =OMAP_SDMA_REQUESTS ; - }else if (of_property_read_u32 (pdev->dev.of_node,"dma-requests" , - &od->dma_requests)) { +/* Number of DMA requests */ + od->dma_requests =OMAP_SDMA_REQUESTS ; +if (pdev->dev.of_node &&of_property_read_u32 (pdev->dev.of_node, +"dma-requests" , + &od->dma_requests)) {dev_info (&pdev->dev,"Missing dma-requests property, using %u.\n" ,OMAP_SDMA_REQUESTS ); - od->dma_requests =OMAP_SDMA_REQUESTS ; } - od->lch_map =devm_kcalloc (&pdev->dev, od->dma_requests, -sizeof (*od->lch_map),GFP_KERNEL ); +/* Number of available logical channels */ +if (!pdev->dev.of_node) { + lch_count = od->plat->dma_attr->lch_count; +if (unlikely (!lch_count)) + lch_count =OMAP_SDMA_CHANNELS ; + }else if (of_property_read_u32 (pdev->dev.of_node,"dma-channels" , + &lch_count)) { +dev_info (&pdev->dev, +"Missing dma-channels property, using %u.\n" , +OMAP_SDMA_CHANNELS ); + lch_count =OMAP_SDMA_CHANNELS ; + } + + od->lch_map =devm_kcalloc (&pdev->dev, lch_count,sizeof (*od->lch_map), +GFP_KERNEL );if (!od->lch_map)return -ENOMEM ;
drivers/extcon/extcon.c +1 -1
@@ -453,7 +453,7 @@ int extcon_sync(struct extcon_dev *edev, unsigned int id)dev_err (&edev->dev,"out of memory in extcon_set_state\n" );kobject_uevent (&edev->dev.kobj,KOBJ_CHANGE ); -return 0 ; +return -ENOMEM ; } length =name_show (&edev->dev,NULL , prop_buf);
drivers/firmware/efi/fake_mem.c +1 -2
@@ -71,8 +71,7 @@ void __init efi_fake_memmap(void) }/* allocate memory for new EFI memmap */ - new_memmap_phy =memblock_alloc (efi.memmap.desc_size * new_nr_map, -PAGE_SIZE ); + new_memmap_phy =efi_memmap_alloc (new_nr_map);if (!new_memmap_phy)return ;
drivers/firmware/efi/libstub/efistub.h +0 -8
@@ -30,14 +30,6 @@ efi_status_t efi_file_close(void *handle);unsigned long get_dram_base (efi_system_table_t *sys_table_arg); -efi_status_t update_fdt (efi_system_table_t *sys_table,void *orig_fdt, -unsigned long orig_fdt_size, -void *fdt,int new_fdt_size,char *cmdline_ptr, -u64 initrd_addr,u64 initrd_size, -efi_memory_desc_t *memory_map, -unsigned long map_size,unsigned long desc_size, -u32 desc_ver); - efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, void *handle, unsigned long *new_fdt_addr,
drivers/firmware/efi/libstub/fdt.c +56 -31
155 lines not on this page · raw message
drivers/firmware/efi/memmap.c +38 -0
@@ -9,6 +9,44 @@#include <linux/efi.h> #include <linux/io.h> #include <asm/early_ioremap.h> +#include <linux/memblock.h> +#include <linux/slab.h> + +static phys_addr_t __init __efi_memmap_alloc_early (unsigned long size) +{ +return memblock_alloc (size,0 ); +} + +static phys_addr_t __init __efi_memmap_alloc_late (unsigned long size) +{ +unsigned int order =get_order (size); +struct page *p =alloc_pages (GFP_KERNEL , order); + +if (!p) +return 0 ; + +return PFN_PHYS (page_to_pfn (p)); +} + +/** +* efi_memmap_alloc - Allocate memory for the EFI memory map +* @num_entries: Number of entries in the allocated map. +* +* Depending on whether mm_init() has already been invoked or not, +* either memblock or "normal" page allocation is used. +* +* Returns the physical address of the allocated memory map on +* success, zero on failure. +*/ +phys_addr_t __init efi_memmap_alloc (unsigned int num_entries) +{ +unsigned long size = num_entries * efi.memmap.desc_size; + +if (slab_is_available ()) +return __efi_memmap_alloc_late (size); + +return __efi_memmap_alloc_early (size); +}/** * __efi_memmap_init - Common code for mapping the EFI memory map
drivers/gpio/gpiolib.c +1 -1
@@ -1317,12 +1317,12 @@ void gpiochip_remove(struct gpio_chip *chip)/* FIXME: should the legacy sysfs handling be moved to gpio_device? */ gpiochip_sysfs_unregister (gdev); +gpiochip_free_hogs (chip);/* Numb the device, cancelling all outstanding operations */ gdev->chip =NULL ;gpiochip_irqchip_remove (chip);acpi_gpiochip_remove (chip);gpiochip_remove_pin_ranges (chip); -gpiochip_free_hogs (chip);of_gpiochip_remove (chip);/* * We accept no more calls into the driver from this point, so
drivers/gpu/drm/amd/amdgpu/si_dpm.c +28 -42
103 lines not on this page · raw message
drivers/gpu/drm/drm_atomic_helper.c +3 -1
@@ -1253,8 +1253,10 @@ int drm_atomic_helper_commit(struct drm_device *dev,if (!nonblock) { ret =drm_atomic_helper_wait_for_fences (dev, state, true); -if (ret) +if (ret) { +drm_atomic_helper_cleanup_planes (dev, state);return ret; + } }/*
drivers/gpu/drm/drm_irq.c +3 -1
@@ -952,8 +952,10 @@ static u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,u32 vblank_count;unsigned int seq; -if (WARN_ON (pipe >= dev->num_crtcs)) +if (WARN_ON (pipe >= dev->num_crtcs)) { + *vblanktime = (struct timeval ) {0 };return 0 ; + } do { seq = read_seqbegin(&vblank->seqlock);
drivers/gpu/drm/drm_mm.c +1 -0
@@ -839,6 +839,7 @@ void drm_mm_init(struct drm_mm * mm, u64 start, u64 size)/* Clever trick to avoid a special case in the free hole tracking. */ INIT_LIST_HEAD (&mm->head_node.node_list); + mm->head_node.allocated =0 ; mm->head_node.hole_follows =1 ; mm->head_node.scanned_block =0 ; mm->head_node.scanned_prev_free =0 ;
drivers/gpu/drm/i915/intel_display.c +16 -16
@@ -16749,7 +16749,6 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)for_each_intel_crtc (dev, crtc) {struct intel_crtc_state *crtc_state = crtc->config; -int pixclk =0 ;__drm_atomic_helper_crtc_destroy_state (&crtc_state->base);memset (crtc_state,0 ,sizeof (*crtc_state));
@@ -16761,23 +16760,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.enabled = crtc_state->base.enable; crtc->active = crtc_state->base.active; -if (crtc_state->base.active) { +if (crtc_state->base.active) dev_priv->active_crtcs |=1 << crtc->pipe; -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) - pixclk =ilk_pipe_pixel_rate (crtc_state); -else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) - pixclk = crtc_state->base.adjusted_mode.crtc_clock; -else -WARN_ON (dev_priv->display.modeset_calc_cdclk); - -/* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ -if (IS_BROADWELL (dev_priv) && crtc_state->ips_enabled) - pixclk =DIV_ROUND_UP (pixclk *100 ,95 ); - } - - dev_priv->min_pixclk[crtc->pipe] = pixclk; -readout_plane_state (crtc); DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n",
@@ -16851,6 +16836,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) }for_each_intel_crtc (dev, crtc) { +int pixclk =0 ; + crtc->base.hwmode = crtc->config->base.adjusted_mode;memset (&crtc->base.mode,0 ,sizeof (crtc->base.mode));
@@ -16878,10 +16865,23 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)*/ crtc->base.state->mode.private_flags =I915_MODE_FLAG_INHERITED ; +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) + pixclk =ilk_pipe_pixel_rate (crtc->config); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + pixclk = crtc->config->base.adjusted_mode.crtc_clock; +else +WARN_ON (dev_priv->display.modeset_calc_cdclk); + +/* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ +if (IS_BROADWELL (dev_priv) && crtc->config->ips_enabled) + pixclk =DIV_ROUND_UP (pixclk *100 ,95 ); +drm_calc_timestamping_constants (&crtc->base, &crtc->base.hwmode);update_scanline_offset (crtc); } + dev_priv->min_pixclk[crtc->pipe] = pixclk; +intel_pipe_config_sanity_check (dev_priv, crtc->config); } }
drivers/gpu/drm/i915/intel_pm.c +11 -27
@@ -2955,24 +2955,10 @@ intel_enable_sagv(struct drm_i915_private *dev_priv)return 0 ; } -static int -intel_do_sagv_disable (struct drm_i915_private *dev_priv) -{ -int ret; -uint32_t temp =GEN9_SAGV_DISABLE ; - - ret =sandybridge_pcode_read (dev_priv,GEN9_PCODE_SAGV_CONTROL , - &temp); -if (ret) -return ret; -else -return temp &GEN9_SAGV_IS_DISABLED ; -} -int intel_disable_sagv (struct drm_i915_private *dev_priv) { -int ret, result; +int ret;if (!intel_has_sagv (dev_priv))return 0 ;
@@ -2984,25 +2970,23 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)mutex_lock (&dev_priv->rps.hw_lock);/* bspec says to keep retrying for at least 1 ms */ - ret =wait_for (result =intel_do_sagv_disable (dev_priv),1 ); + ret =skl_pcode_request (dev_priv,GEN9_PCODE_SAGV_CONTROL , +GEN9_SAGV_DISABLE , +GEN9_SAGV_IS_DISABLED ,GEN9_SAGV_IS_DISABLED , +1 );mutex_unlock (&dev_priv->rps.hw_lock); -if (ret == -ETIMEDOUT ) { -DRM_ERROR ("Request to disable SAGV timed out\n" ); -return -ETIMEDOUT ; - } -/* * Some skl systems, pre-release machines in particular, * don't actually have an SAGV. */ -if (IS_SKYLAKE (dev_priv) && result == -ENXIO ) { +if (IS_SKYLAKE (dev_priv) && ret == -ENXIO ) {DRM_DEBUG_DRIVER ("No SAGV found on system, ignoring\n" ); dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ;return 0 ; - }else if (result <0 ) { -DRM_ERROR ("Failed to disable the SAGV\n" ); -return result; + }else if (ret <0 ) { +DRM_ERROR ("Failed to disable the SAGV (%d)\n" , ret); +return ret; } dev_priv->sagv_status =I915_SAGV_DISABLED ;
@@ -8015,14 +7999,14 @@ int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request,* worst case) _and_ PCODE was busy for some reason even after a * (queued) request and @timeout_base_ms delay. As a workaround retry * the poll with preemption disabled to maximize the number of -* requests. Increase the timeout from @timeout_base_ms to 50ms to +* requests. Increase the timeout from @timeout_base_ms to 10ms to * account for interrupts that could reduce the number of these * requests. */ DRM_DEBUG_KMS ("PCODE timeout, retrying with preemption disabled\n" );WARN_ON_ONCE (timeout_base_ms >3 );preempt_disable (); - ret =wait_for_atomic (COND ,50 ); + ret =wait_for_atomic (COND ,10 );preempt_enable (); out:
drivers/gpu/drm/panel/panel-simple.c +1 -1
@@ -120,7 +120,7 @@ static int panel_simple_get_fixed_modes(struct panel_simple *panel) mode->type |=DRM_MODE_TYPE_DRIVER ; -if (panel->desc->num_modes ==1 ) +if (panel->desc->num_timings ==1 ) mode->type |=DRM_MODE_TYPE_PREFERRED ;drm_mode_probed_add (connector, mode);
drivers/gpu/drm/radeon/si.c +28 -32
96 lines not on this page · raw message
drivers/gpu/drm/radeon/si_dpm.c +0 -13
@@ -3008,19 +3008,6 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, (rdev->pdev->device == 0x6817) || (rdev->pdev->device == 0x6806)) max_mclk =120000 ; - }else if (rdev->family ==CHIP_VERDE ) { -if ((rdev->pdev->revision ==0x81 ) || - (rdev->pdev->revision ==0x83 ) || - (rdev->pdev->revision ==0x87 ) || - (rdev->pdev->device ==0x6820 ) || - (rdev->pdev->device ==0x6821 ) || - (rdev->pdev->device ==0x6822 ) || - (rdev->pdev->device ==0x6823 ) || - (rdev->pdev->device ==0x682A ) || - (rdev->pdev->device ==0x682B )) { - max_sclk =75000 ; - max_mclk =80000 ; - } }else if (rdev->family ==CHIP_OLAND ) { if ((rdev->pdev->revision == 0xC7) || (rdev->pdev->revision == 0x80) ||
drivers/gpu/drm/savage/savage_state.c +1 -0
@@ -1004,6 +1004,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_ kvb_addr =memdup_user (cmdbuf->vb_addr, cmdbuf->vb_size);if (IS_ERR (kvb_addr)) { ret =PTR_ERR (kvb_addr); + kvb_addr =NULL ; goto done; } cmdbuf->vb_addr = kvb_addr;
drivers/gpu/drm/tegra/dpaux.c +2 -2
@@ -539,9 +539,9 @@ static int tegra_dpaux_probe(struct platform_device *pdev) dpaux->desc.owner =THIS_MODULE ; dpaux->pinctrl =devm_pinctrl_register (&pdev->dev, &dpaux->desc, dpaux); -if (!dpaux->pinctrl) { +if (IS_ERR (dpaux->pinctrl)) {dev_err (&pdev->dev,"failed to register pincontrol\n" ); -return -ENODEV ; +return PTR_ERR (dpaux->pinctrl); }#endif /* enable and clear all interrupts */
drivers/gpu/drm/vc4/vc4_gem.c +5 -4
@@ -544,14 +544,15 @@ vc4_cl_lookup_bos(struct drm_device *dev, handles =drm_malloc_ab (exec->bo_count,sizeof (uint32_t ));if (!handles) { + ret = -ENOMEM ;DRM_ERROR ("Failed to allocate incoming GEM handles\n" ); goto fail; } - ret =copy_from_user (handles, - (void __user *)(uintptr_t )args->bo_handles, - exec->bo_count *sizeof (uint32_t )); -if (ret) { +if (copy_from_user (handles, + (void __user *)(uintptr_t )args->bo_handles, + exec->bo_count *sizeof (uint32_t ))) { + ret = -EFAULT ;DRM_ERROR ("Failed to copy in GEM handles\n" ); goto fail; }
drivers/i2c/busses/i2c-piix4.c +22 -0
@@ -585,10 +585,29 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr, u8 command, int size, union i2c_smbus_data *data) { struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap); +unsigned short piix4_smba = adapdata->smba; +int retries =MAX_TIMEOUT ; +int smbslvcnt;u8 smba_en_lo;u8 port;int retval; +/* Request the SMBUS semaphore, avoid conflicts with the IMC */ + smbslvcnt =inb_p (SMBSLVCNT ); +do { +outb_p (smbslvcnt |0x10 ,SMBSLVCNT ); + +/* Check the semaphore status */ + smbslvcnt =inb_p (SMBSLVCNT ); +if (smbslvcnt &0x10 ) +break ; + +usleep_range (1000 ,2000 ); + }while (--retries); +/* SMBus is still owned by the IMC, we give up */ +if (!retries) +return -EBUSY ; +mutex_lock (&piix4_mutex_sb800);outb_p (piix4_port_sel_sb800,SB800_PIIX4_SMB_IDX );
@@ -606,6 +625,9 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,mutex_unlock (&piix4_mutex_sb800); +/* Release the semaphore */ +outb_p (smbslvcnt |0x20 ,SMBSLVCNT ); +return retval; }
drivers/i2c/i2c-core.c +1 -1
@@ -1657,7 +1657,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,if (i2c_check_addr_validity (addr, info.flags)) {dev_err (&adap->dev,"of_i2c: invalid addr=%x on %s\n" , - info.addr, node->full_name); + addr, node->full_name);return ERR_PTR (-EINVAL ); }
drivers/i2c/i2c-dev.c +1 -1
@@ -331,7 +331,7 @@ static noinline int i2cdev_ioctl_smbus(struct i2c_client *client, unsigned long arg) {struct i2c_smbus_ioctl_data data_arg; -union i2c_smbus_data temp; +union i2c_smbus_data temp = {};int datasize, res; if (copy_from_user(&data_arg,
drivers/i2c/muxes/i2c-mux-pca954x.c +4 -1
@@ -151,6 +151,9 @@ static int pca954x_reg_write(struct i2c_adapter *adap, buf[0 ] = val; msg.buf = buf; ret =__i2c_transfer (adap, &msg,1 ); + +if (ret >=0 && ret !=1 ) + ret = -EREMOTEIO ; }else {union i2c_smbus_data data; ret = adap->algo->smbus_xfer(adap, client->addr,
@@ -179,7 +182,7 @@ static int pca954x_select_chan(struct i2c_mux_core *muxc, u32 chan)/* Only select the channel if its different from the last channel */ if (data->last_chan != regval) { ret =pca954x_reg_write (muxc->parent, client, regval); - data->last_chan = ret ?0 : regval; + data->last_chan = ret <0 ?0 : regval; }return ret;
drivers/infiniband/hw/cxgb4/device.c +3 -1
@@ -828,8 +828,10 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev) } rdev->status_page = (struct t4_dev_status_page *)__get_free_page (GFP_KERNEL ); -if (!rdev->status_page) +if (!rdev->status_page) { + err = -ENOMEM ; goto destroy_ocqp_pool; + } rdev->status_page->qp_start = rdev->lldi.vr->qp.start; rdev->status_page->qp_size = rdev->lldi.vr->qp.size; rdev->status_page->cq_start = rdev->lldi.vr->cq.start;
drivers/input/joystick/xpad.c +6 -0
@@ -1376,6 +1376,12 @@ static int xpad_init_input(struct usb_xpad *xpad) input_dev->name = xpad->name; input_dev->phys = xpad->phys;usb_to_input_id (xpad->udev, &input_dev->id); + +if (xpad->xtype ==XTYPE_XBOX360W ) { +/* x360w controllers and the receiver have different ids */ + input_dev->id.product =0x02a1 ; + } + input_dev->dev.parent = &xpad->intf->dev;input_set_drvdata (input_dev, xpad);
drivers/input/serio/i8042-x86ia64io.h +6 -0
@@ -211,6 +211,12 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"), + DMI_MATCH(DMI_PRODUCT_NAME, "C15B"), + }, + }, { } };
drivers/input/touchscreen/elants_i2c.c +2 -2
@@ -914,9 +914,9 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev)case QUEUE_HEADER_NORMAL : report_count = ts->buf[FW_HDR_COUNT ]; -if (report_count >3 ) { +if (report_count ==0 || report_count >3 ) {dev_err (&client->dev, -"too large report count: %*ph\n" , +"bad report count: %*ph\n" ,HEADER_SIZE , ts->buf);break ; }
drivers/net/ethernet/mellanox/mlx5/core/main.c +4 -2
@@ -1158,7 +1158,8 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, {int err =0 ; -mlx5_drain_health_wq (dev); +if (cleanup) +mlx5_drain_health_wq (dev);mutex_lock (&dev->intf_state_mutex);if (test_bit (MLX5_INTERFACE_STATE_DOWN , &dev->intf_state)) {
@@ -1320,9 +1321,10 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev,mlx5_enter_error_state (dev);mlx5_unload_one (dev, priv, false); -/* In case of kernel call save the pci state */ +/* In case of kernel call save the pci state and drain the health wq */ if (state) {pci_save_state (pdev); +mlx5_drain_health_wq (dev);mlx5_pci_disable_device (dev); }
drivers/net/wireless/intersil/orinoco/mic.c +26 -18
75 lines not on this page · raw message
drivers/net/wireless/intersil/orinoco/mic.h +2 -1
@@ -6,6 +6,7 @@#define _ORINOCO_MIC_H_#include <linux/types.h> +#include <crypto/hash.h> #define MICHAEL_MIC_LEN 8
@@ -15,7 +16,7 @@ struct crypto_ahash;int orinoco_mic_init (struct orinoco_private *priv);void orinoco_mic_free (struct orinoco_private *priv); -int orinoco_mic (struct crypto_ahash *tfm_michael,u8 *key, +int orinoco_mic (struct crypto_shash *tfm_michael,u8 *key,u8 *da,u8 *sa,u8 priority,u8 *data,size_t data_len,u8 *mic);
drivers/net/wireless/intersil/orinoco/orinoco.h +2 -2
@@ -152,8 +152,8 @@ struct orinoco_private {u8 *wpa_ie;int wpa_ie_len; -struct crypto_ahash *rx_tfm_mic; -struct crypto_ahash *tx_tfm_mic; +struct crypto_shash *rx_tfm_mic; +struct crypto_shash *tx_tfm_mic; unsigned int wpa_enabled:1; unsigned int tkip_cm_active:1;
drivers/nvme/host/core.c +1 -6
@@ -1122,12 +1122,7 @@ int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap)if (ret)return ret; -/* Checking for ctrl->tagset is a trick to avoid sleeping on module -* load, since we only need the quirk on reset_controller. Notice -* that the HGST device needs this delay only in firmware activation -* procedure; unfortunately we have no (easy) way to verify this. -*/ -if ((ctrl->quirks &NVME_QUIRK_DELAY_BEFORE_CHK_RDY ) && ctrl->tagset) +if (ctrl->quirks &NVME_QUIRK_DELAY_BEFORE_CHK_RDY )msleep (NVME_QUIRK_DELAY_AMOUNT );return nvme_wait_ready (ctrl, cap, false);
drivers/pinctrl/freescale/pinctrl-imx.c +4 -4
@@ -778,10 +778,10 @@ int imx_pinctrl_probe(struct platform_device *pdev, imx_pinctrl_desc->name =dev_name (&pdev->dev); imx_pinctrl_desc->pins = info->pins; imx_pinctrl_desc->npins = info->npins; - imx_pinctrl_desc->pctlops = &imx_pctrl_ops, - imx_pinctrl_desc->pmxops = &imx_pmx_ops, - imx_pinctrl_desc->confops = &imx_pinconf_ops, - imx_pinctrl_desc->owner =THIS_MODULE , + imx_pinctrl_desc->pctlops = &imx_pctrl_ops; + imx_pinctrl_desc->pmxops = &imx_pmx_ops; + imx_pinctrl_desc->confops = &imx_pinconf_ops; + imx_pinctrl_desc->owner =THIS_MODULE ; ret =imx_pinctrl_probe_dt (pdev, info);if (ret) {
drivers/pinctrl/meson/pinctrl-meson.c +1 -1
@@ -212,7 +212,7 @@ static int meson_pmx_request_gpio(struct pinctrl_dev *pcdev, {struct meson_pinctrl *pc =pinctrl_dev_get_drvdata (pcdev); -meson_pmx_disable_other_groups (pc, range->pin_base + offset,-1 ); +meson_pmx_disable_other_groups (pc, offset,-1 );return 0 ; }
drivers/pinctrl/sh-pfc/core.c +15 -0
@@ -389,6 +389,21 @@ int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type)return 0 ; } +const struct sh_pfc_bias_info * +sh_pfc_pin_to_bias_info (const struct sh_pfc_bias_info *info, +unsigned int num,unsigned int pin) +{ +unsigned int i; + +for (i =0 ; i < num; i++) +if (info[i].pin == pin) +return &info[i]; + +WARN_ONCE (1 ,"Pin %u is not in bias info list\n" , pin); + +return NULL ; +} +static int sh_pfc_init_ranges (struct sh_pfc *pfc) {struct sh_pfc_pin_range *range;
drivers/pinctrl/sh-pfc/core.h +4 -0
@@ -33,4 +33,8 @@ void sh_pfc_write_reg(struct sh_pfc *pfc, u32 reg, unsigned int width,int sh_pfc_get_pin_index (struct sh_pfc *pfc,unsigned int pin);int sh_pfc_config_mux (struct sh_pfc *pfc,unsigned mark,int pinmux_type); +const struct sh_pfc_bias_info * +sh_pfc_pin_to_bias_info (const struct sh_pfc_bias_info *info, +unsigned int num,unsigned int pin); +#endif /* __SH_PFC_CORE_H__ */
drivers/pinctrl/sh-pfc/pfc-r8a7795.c +172 -171
371 lines not on this page · raw message
drivers/pinctrl/sh-pfc/pinctrl.c +2 -1
@@ -570,7 +570,8 @@ static bool sh_pfc_pinconf_validate(struct sh_pfc *pfc, unsigned int _pin,switch (param) {case PIN_CONFIG_BIAS_DISABLE : -return true; +return pin->configs & + (SH_PFC_PIN_CFG_PULL_UP |SH_PFC_PIN_CFG_PULL_DOWN );case PIN_CONFIG_BIAS_PULL_UP :return pin->configs &SH_PFC_PIN_CFG_PULL_UP ;
drivers/pinctrl/sh-pfc/sh_pfc.h +6 -0
@@ -189,6 +189,12 @@ struct sh_pfc_window {unsigned long size; }; +struct sh_pfc_bias_info { +u16 pin; +u16 reg :11 ; +u16 bit :5 ; +}; +struct sh_pfc_pin_range ;struct sh_pfc {
drivers/power/supply/bq24190_charger.c +1 -1
@@ -1141,7 +1141,7 @@ static int bq24190_battery_set_property(struct power_supply *psy,dev_dbg (bdi->dev,"prop: %d\n" , psp); -pm_runtime_put_sync (bdi->dev); +pm_runtime_get_sync (bdi->dev);switch (psp) {case POWER_SUPPLY_PROP_ONLINE :
drivers/power/supply/bq27xxx_battery.c +40 -1
65 lines not on this page · raw message
drivers/power/supply/bq27xxx_battery_i2c.c +2 -2
@@ -149,8 +149,8 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = { { "bq27200", BQ27000 }, { "bq27210", BQ27010 }, { "bq27500", BQ27500 }, - { "bq27510", BQ27500 }, - { "bq27520", BQ27500 }, + { "bq27510", BQ27510 }, + { "bq27520", BQ27510 }, { "bq27530", BQ27530 }, { "bq27531", BQ27530 }, { "bq27541", BQ27541 },
drivers/powercap/intel_rapl.c +24 -1
@@ -442,6 +442,7 @@ static int contraint_to_pl(struct rapl_domain *rd, int cid)return i; } } +pr_err ("Cannot find matching power limit for constraint %d\n" , cid);return -EINVAL ; }
@@ -457,6 +458,10 @@ static int set_power_limit(struct powercap_zone *power_zone, int cid,get_online_cpus (); rd =power_zone_to_rapl_domain (power_zone); id =contraint_to_pl (rd, cid); +if (id <0 ) { + ret = id; + goto set_exit; + } rp = rd->rp;
@@ -496,6 +501,11 @@ static int get_current_power_limit(struct powercap_zone *power_zone, int cid,get_online_cpus (); rd =power_zone_to_rapl_domain (power_zone); id =contraint_to_pl (rd, cid); +if (id <0 ) { + ret = id; + goto get_exit; + } +switch (rd->rpl[id].prim_id) {case PL1_ENABLE : prim =POWER_LIMIT1 ;
@@ -512,6 +522,7 @@ static int get_current_power_limit(struct powercap_zone *power_zone, int cid,else *data = val; +get_exit:put_online_cpus ();return ret;
@@ -527,6 +538,10 @@ static int set_time_window(struct powercap_zone *power_zone, int cid,get_online_cpus (); rd =power_zone_to_rapl_domain (power_zone); id =contraint_to_pl (rd, cid); +if (id <0 ) { + ret = id; + goto set_time_exit; + }switch (rd->rpl[id].prim_id) {case PL1_ENABLE :
@@ -538,6 +553,8 @@ static int set_time_window(struct powercap_zone *power_zone, int cid,default : ret = -EINVAL ; } + +set_time_exit:put_online_cpus ();return ret; }
@@ -552,6 +569,10 @@ static int get_time_window(struct powercap_zone *power_zone, int cid, u64 *data)get_online_cpus (); rd =power_zone_to_rapl_domain (power_zone); id =contraint_to_pl (rd, cid); +if (id <0 ) { + ret = id; + goto get_time_exit; + }switch (rd->rpl[id].prim_id) {case PL1_ENABLE :
@@ -566,6 +587,8 @@ static int get_time_window(struct powercap_zone *power_zone, int cid, u64 *data) }if (!ret) *data = val; + +get_time_exit:put_online_cpus ();return ret;
@@ -707,7 +730,7 @@ static u64 rapl_unit_xlate(struct rapl_domain *rd, enum unit_type type,case ENERGY_UNIT : scale =ENERGY_UNIT_SCALE ;/* per domain unit takes precedence */ -if (rd && rd->domain_energy_unit) +if (rd->domain_energy_unit) units = rd->domain_energy_unit;else units = rp->energy_unit;
drivers/regulator/axp20x-regulator.c +10 -2
@@ -337,10 +337,18 @@ static const struct regulator_desc axp809_regulators[] = { AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)),AXP_DESC (AXP809 ,ELDO3 ,"eldo3" ,"eldoin" ,700 ,3300 ,100 ,AXP22X_ELDO3_V_OUT ,0x1f ,AXP22X_PWR_OUT_CTRL2 ,BIT (2 )), -AXP_DESC_IO (AXP809 ,LDO_IO0 ,"ldo_io0" ,"ips" ,700 ,3300 ,100 , +/* +* Note the datasheet only guarantees reliable operation up to +* 3.3V, this needs to be enforced via dts provided constraints +*/ +AXP_DESC_IO (AXP809 ,LDO_IO0 ,"ldo_io0" ,"ips" ,700 ,3800 ,100 ,AXP22X_LDO_IO0_V_OUT ,0x1f ,AXP20X_GPIO0_CTRL ,0x07 ,AXP22X_IO_ENABLED ,AXP22X_IO_DISABLED ), -AXP_DESC_IO (AXP809 ,LDO_IO1 ,"ldo_io1" ,"ips" ,700 ,3300 ,100 , +/* +* Note the datasheet only guarantees reliable operation up to +* 3.3V, this needs to be enforced via dts provided constraints +*/ +AXP_DESC_IO (AXP809 ,LDO_IO1 ,"ldo_io1" ,"ips" ,700 ,3800 ,100 ,AXP22X_LDO_IO1_V_OUT ,0x1f ,AXP20X_GPIO1_CTRL ,0x07 ,AXP22X_IO_ENABLED ,AXP22X_IO_DISABLED ), AXP_DESC_FIXED(AXP809, RTC_LDO, "rtc_ldo", "ips", 1800),
drivers/regulator/helpers.c +5 -1
@@ -454,13 +454,17 @@ EXPORT_SYMBOL_GPL(regulator_set_bypass_regmap);int regulator_get_bypass_regmap (struct regulator_dev *rdev,bool *enable) {unsigned int val; +unsigned int val_on = rdev->desc->bypass_val_on;int ret; ret =regmap_read (rdev->regmap, rdev->desc->bypass_reg, &val);if (ret !=0 )return ret; - *enable = (val & rdev->desc->bypass_mask) == rdev->desc->bypass_val_on; +if (!val_on) + val_on = rdev->desc->bypass_mask; + + *enable = (val & rdev->desc->bypass_mask) == val_on;return 0 ; }
drivers/regulator/tps65086-regulator.c +28 -26
103 lines not on this page · raw message
drivers/remoteproc/Kconfig +0 -5
@@ -91,17 +91,12 @@ config QCOM_Q6V5_PIL Say y here to support the Qualcomm Peripherial Image Loader for the Hexagon V5 based remote processors. -config QCOM_WCNSS_IRIS - tristate - depends on OF && ARCH_QCOM - config QCOM_WCNSS_PIL tristate "Qualcomm WCNSS Peripheral Image Loader" depends on OF && ARCH_QCOM depends on QCOM_SMEM select QCOM_MDT_LOADER select QCOM_SCM - select QCOM_WCNSS_IRIS select REMOTEPROC help Say y here to support the Peripheral Image Loader for the Qualcomm
drivers/remoteproc/Makefile +3 -2
@@ -13,6 +13,7 @@ obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o obj-$(CONFIG_QCOM_MDT_LOADER) += qcom_mdt_loader.o obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o -obj-$(CONFIG_QCOM_WCNSS_IRIS) += qcom_wcnss_iris.o -obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss.o +obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o +qcom_wcnss_pil-y += qcom_wcnss.o +qcom_wcnss_pil-y += qcom_wcnss_iris.o obj-$(CONFIG_ST_REMOTEPROC) += st_remoteproc.o
drivers/remoteproc/qcom_wcnss.c +23 -2
@@ -143,7 +143,6 @@ void qcom_wcnss_assign_iris(struct qcom_wcnss *wcnss,mutex_unlock (&wcnss->iris_lock); } -EXPORT_SYMBOL_GPL (qcom_wcnss_assign_iris);static int wcnss_load (struct rproc *rproc,const struct firmware *fw) {
@@ -619,6 +618,28 @@ static struct platform_driver wcnss_driver = { }, }; -module_platform_driver (wcnss_driver); +static int __init wcnss_init (void ) +{ +int ret; + + ret =platform_driver_register (&wcnss_driver); +if (ret) +return ret; + + ret =platform_driver_register (&qcom_iris_driver); +if (ret) +platform_driver_unregister (&wcnss_driver); + +return ret; +} +module_init (wcnss_init); + +static void __exit wcnss_exit(void) +{ +platform_driver_unregister (&qcom_iris_driver); +platform_driver_unregister (&wcnss_driver); +} +module_exit (wcnss_exit); +MODULE_DESCRIPTION ("Qualcomm Peripherial Image Loader for Wireless Subsystem" );MODULE_LICENSE ("GPL v2" );
drivers/remoteproc/qcom_wcnss.h +2 -0
@@ -4,6 +4,8 @@struct qcom_iris ;struct qcom_wcnss ; +extern struct platform_driver qcom_iris_driver; +struct wcnss_vreg_info {const char *const name;int min_voltage;
drivers/remoteproc/qcom_wcnss_iris.c +1 -7
@@ -94,14 +94,12 @@ int qcom_iris_enable(struct qcom_iris *iris)return ret; } -EXPORT_SYMBOL_GPL (qcom_iris_enable);void qcom_iris_disable (struct qcom_iris *iris) {clk_disable_unprepare (iris->xo_clk);regulator_bulk_disable (iris->num_vregs, iris->vregs); } -EXPORT_SYMBOL_GPL (qcom_iris_disable);static int qcom_iris_probe (struct platform_device *pdev) {
@@ -174,7 +172,7 @@ static const struct of_device_id iris_of_match[] = { {} }; -static struct platform_driver wcnss_driver = { +struct platform_driver qcom_iris_driver = { .probe = qcom_iris_probe, .remove = qcom_iris_remove, .driver = {
@@ -182,7 +180,3 @@ static struct platform_driver wcnss_driver = { .of_match_table = iris_of_match, }, }; - -module_platform_driver (wcnss_driver); -MODULE_DESCRIPTION ("Qualcomm Wireless Subsystem Iris driver" ); -MODULE_LICENSE ("GPL v2" );
drivers/remoteproc/st_remoteproc.c +3 -1
@@ -245,8 +245,10 @@ static int st_rproc_probe(struct platform_device *pdev) goto free_rproc; enabled =st_rproc_state (pdev); -if (enabled <0 ) +if (enabled <0 ) { + ret = enabled; goto free_rproc; + }if (enabled) {atomic_inc (&rproc->power);
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +1 -1
@@ -3702,7 +3702,7 @@ static int ibmvscsis_write_pending(struct se_cmd *se_cmd) 1, 1);if (rc) {pr_err ("srp_transfer_data() failed: %d\n" , rc); -return -EAGAIN ; +return -EIO ; }/* * We now tell TCM to add this WRITE CDB directly into the TCM storage
drivers/tty/serial/8250/8250_core.c +1 -1
@@ -675,7 +675,7 @@ static struct console univ8250_console = { .device = uart_console_device, .setup = univ8250_console_setup, .match = univ8250_console_match, - .flags = CON_PRINTBUFFER | CON_ANYTIME | CON_CONSDEV, + .flags = CON_PRINTBUFFER | CON_ANYTIME, .index = -1, .data = &serial8250_reg, };
drivers/tty/serial/8250/8250_port.c +1 -1
@@ -1411,7 +1411,7 @@ static void __do_stop_tx_rs485(struct uart_8250_port *p)* Enable previously disabled RX interrupts. */ if (!(p->port.rs485.flags &SER_RS485_RX_DURING_TX )) { -serial8250_clear_fifos (p); +serial8250_clear_and_reinit_fifos (p); p->ier |=UART_IER_RLSI |UART_IER_RDI ;serial_port_out (&p->port,UART_IER , p->ier);
drivers/tty/serial/atmel_serial.c +16 -6
@@ -481,6 +481,14 @@ static void atmel_stop_tx(struct uart_port *port)/* disable PDC transmit */ atmel_uart_writel (port,ATMEL_PDC_PTCR ,ATMEL_PDC_TXTDIS ); } + +/* +* Disable the transmitter. +* This is mandatory when DMA is used, otherwise the DMA buffer +* is fully transmitted. +*/ +atmel_uart_writel (port,ATMEL_US_CR ,ATMEL_US_TXDIS ); +/* Disable interrupts */ atmel_uart_writel (port,ATMEL_US_IDR , atmel_port->tx_done_mask);
@@ -513,6 +521,9 @@ static void atmel_start_tx(struct uart_port *port)/* Enable interrupts */ atmel_uart_writel (port,ATMEL_US_IER , atmel_port->tx_done_mask); + +/* re-enable the transmitter */ +atmel_uart_writel (port,ATMEL_US_CR ,ATMEL_US_TXEN ); }/*
@@ -798,6 +809,11 @@ static void atmel_complete_tx_dma(void *arg)*/ if (!uart_circ_empty (xmit))atmel_tasklet_schedule (atmel_port, &atmel_port->tasklet_tx); +else if ((port->rs485.flags &SER_RS485_ENABLED ) && + !(port->rs485.flags &SER_RS485_RX_DURING_TX )) { +/* DMA done, stop TX, start RX for RS485 */ +atmel_start_rx (port); + }spin_unlock_irqrestore (&port->lock, flags); }
@@ -900,12 +916,6 @@ static void atmel_tx_dma(struct uart_port *port) desc->callback = atmel_complete_tx_dma; desc->callback_param = atmel_port; atmel_port->cookie_tx =dmaengine_submit (desc); - - }else { -if (port->rs485.flags &SER_RS485_ENABLED ) { -/* DMA done, stop TX, start RX for RS485 */ -atmel_start_rx (port); - } }if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )
drivers/tty/sysrq.c +2 -2
@@ -946,8 +946,8 @@ static const struct input_device_id sysrq_ids[] = { { .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
Lines of this file are not shown. View the raw message.
drivers/usb/serial/ch341.c +54 -30
84 lines not on this page · raw message
fs/namespace.c +45 -19
64 lines not on this page · raw message
lib/iov_iter.c +31 -23
54 lines not on this page · raw message
tools/testing/selftests/net/run_netsocktests +1 -1
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.