Linux 4.12.8
Greg KH
maintainerI'm announcing the release of the 4.12.8 kernel.
All users of the 4.12 kernel series must upgrade.
The updated 4.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.12.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/mips/dec/int-handler.S | 34 -- arch/mips/include/asm/cache.h | 2 arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 37 ++ arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 60 +++ arch/mips/include/asm/octeon/cvmx.h | 1 arch/powerpc/kernel/setup-common.c | 4 arch/xtensa/kernel/xtensa_ksyms.c | 2 arch/xtensa/mm/cache.c | 16 block/blk-mq.c | 4 drivers/base/firmware_class.c | 49 ++ drivers/gpu/drm/bridge/tc358767.c | 2 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 drivers/gpu/drm/i915/intel_color.c | 1 drivers/i2c/busses/i2c-designware-platdrv.c | 3 drivers/iio/accel/bmc150-accel-core.c | 9 drivers/iio/accel/st_accel_core.c | 32 + drivers/iio/adc/aspeed_adc.c | 26 + drivers/iio/adc/axp288_adc.c | 32 + drivers/iio/adc/vf610_adc.c | 2 drivers/iio/common/st_sensors/st_sensors_core.c | 29 + drivers/iio/light/tsl2563.c | 2 drivers/iio/pressure/st_pressure_core.c | 2 drivers/mmc/core/mmc.c | 2 drivers/mtd/nand/atmel/pmecc.c | 21 - drivers/mtd/nand/nand_base.c | 12 drivers/mtd/nand/nand_timings.c | 6 drivers/pci/pci.c | 165 ++++++--- drivers/pinctrl/intel/pinctrl-cherryview.c | 7 drivers/pinctrl/intel/pinctrl-merrifield.c | 6 drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 1 drivers/pinctrl/meson/pinctrl-meson-gxl.c | 1 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 drivers/pinctrl/samsung/pinctrl-exynos.c | 4 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 364 +++++++++++---------- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 383 +++++++++++------------ drivers/staging/comedi/comedi_fops.c | 3 drivers/staging/iio/resolver/ad2s1210.c | 2 drivers/target/iscsi/iscsi_target.c | 2 drivers/target/iscsi/iscsi_target_login.c | 7 drivers/target/target_core_tpg.c | 4 drivers/target/target_core_transport.c | 4 drivers/usb/core/hcd.c | 4 drivers/usb/core/hub.c | 10 drivers/usb/core/quirks.c | 4 drivers/usb/gadget/udc/renesas_usb3.c | 21 - drivers/usb/host/pci-quirks.c | 37 +- drivers/usb/host/pci-quirks.h | 1 drivers/usb/host/xhci-pci.c | 7 drivers/usb/musb/musb_host.c | 1 drivers/usb/renesas_usbhs/rcar3.c | 9 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/option.c | 2 drivers/usb/serial/pl2303.c | 2 drivers/usb/serial/pl2303.h | 1 drivers/usb/storage/unusual_uas.h | 4 drivers/usb/storage/usb.c | 18 - fs/fuse/file.c | 2 fs/nfs/Kconfig | 1 fs/nfs/flexfilelayout/flexfilelayoutdev.c | 1 fs/xfs/xfs_log_cil.c | 1 include/linux/iio/common/st_sensors.h | 7 include/linux/mtd/nand.h | 6 include/linux/pci.h | 1 include/linux/platform_data/st_sensors_pdata.h | 2 include/target/iscsi/iscsi_target_core.h | 1 kernel/futex.c | 5 mm/page_alloc.c | 2 mm/shmem.c | 12 70 files changed, 950 insertions(+), 565 deletions(-)
Akinobu Mita (1):
iio: light: tsl2563: use correct event code
Alan Stern (2):
usb-storage: fix deadlock involving host lock and scsi_done
USB: Check for dropped connection before switching to full speed
Alan Swanson (1):
uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
Andy Shevchenko (2):
pinctrl: cherryview: Add Setzer models to the Chromebook DMI quirk
pinctrl: intel: merrifield: Correct UART pin lists
Arnd Bergmann (1):
staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
Bart Van Assche (1):
block: Make blk_mq_delay_kick_requeue_list() rerun the queue at a quiet time
Bin Liu (2):
usb: musb: fix tx fifo flush handling again
usb: core: unlink urbs from the tail of the endpoint's urb_list
Boris Brezillon (3):
mtd: nand: atmel: Fix DT backward compatibility in pmecc.c
mtd: nand: Fix timing setup for NANDs that do not support SET FEATURES
mtd: nand: Declare tBERS, tR and tPROG as u64 to avoid integer overflow
Christoph Hellwig (3):
PCI: Protect pci_error_handlers->reset_notify() usage with device_lock()
PCI: Remove __pci_dev_reset() and pci_dev_reset() pnfs/blocklayout: require 64-bit sector_t
Cong Wang (1):
mm: fix list corruptions on shmem shrinklist
Greg Kroah-Hartman (2):
USB: serial: pl2303: add new ATEN device id
Linux 4.12.8
Gregory CLEMENT (1):
pinctrl: armada-37xx: Fix number of pin in south bridge
Haibo Chen (1):
mmc: mmc: correct the logic for setting HS400ES signal voltage
Hans de Goede (3):
i2c: designware: Some broken DSTDs use 1MiHz instead of 1MHz
iio: accel: bmc150: Always restore device to normal mode after suspend-resume
iio: adc: Revert "axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register modifications"
Hector Martin (1):
USB: serial: option: add D-Link DWM-222 device ID
Ian Abbott (1):
staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING
Icenowy Zheng (1):
pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
Jan Kara (1):
xfs: Fix leak of discard bio
Jonathan Toppins (1):
mm: ratelimit PFNs busy info message
Kai-Heng Feng (1):
usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
Lorenzo Bianconi (2):
iio: accel: st_accel: add SPI-3wire support
iio: pressure: st_pressure_core: disable multiread by default for LPS22HB
Lucas Stach (1):
drm/bridge: tc358767: fix probe without attached output node
Luis R. Rodriguez (3):
firmware: fix batched requests - wake all waiters
firmware: fix batched requests - send wake up on failure on direct lookups
firmware: avoid invalid fallback aborts by using killable wait
Maarten Lankhorst (1):
drm/i915: Fix out-of-bounds array access in bdw_load_gamma_lut
Maciej W. Rozycki (1):
MIPS: DEC: Fix an int-handler.S CPU_DADDI_WORKAROUNDS regression
Marc Zyngier (2):
PCI: Add pci_reset_function_locked()
xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue
Masahiro Yamada (2):
pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD11
pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD20
Mateusz Jurczyk (1):
fuse: initialize the flock flag in fuse_file on allocation
Max Filippov (3):
xtensa: fix cache aliasing handling code for WT cache
xtensa: mm/cache: add missing EXPORT_SYMBOLs
xtensa: don't limit csum_partial export by CONFIG_NET
Mel Gorman (1):
futex: Remove unnecessary warning from get_futex_key
Michael Neuling (1):
powerpc: Fix /proc/cpuinfo revision for POWER9 DD2
Miquel Raynal (1):
nand: fix wrong default oob layout for small pages using soft ecc
Mykola Kostenok (1):
iio: aspeed-adc: wait for initial sequence.
Neil Armstrong (2):
pinctrl: meson-gxbb: Add missing GPIODV_18 pin entry
pinctrl: meson-gxl: Add missing GPIODV_18 pin entry
Nicholas Bellinger (2):
iscsi-target: Fix iscsi_np reset hung task during parallel delete
target: Fix node_acl demo-mode + uncached dynamic shutdown regression
Paul Burton (1):
Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>."
Rafael J. Wysocki (1):
USB: hcd: Mark secondary HCD as dead if the primary one died
Sandeep Singh (1):
usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
Stefan Triller (1):
USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
Stefan-Gabriel Mirea (1):
iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
Steven J. Hill (1):
MIPS: Octeon: Fix broken EDAC driver.
Thomas Gleixner (1):
pinctrl: samsung: Remove bogus irq_[un]mask from resource management
Varun Prakash (1):
iscsi-target: fix memory leak in iscsit_setup_text_cmd()
Weston Andros Adamson (1):
nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
Wladimir J. van der Laan (1):
drm/etnaviv: Fix off-by-one error in reloc checking
Yoshihiro Shimoda (2):
usb: gadget: udc: renesas_usb3: Fix usb_gadget_giveback_request() calling
usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 12 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = NAME = Fearless Coyote
arch/mips/dec/int-handler.S +6 -28
@@ -147,23 +147,12 @@ * Find irq with highest priority */ # open coded PTR_LA t1, cpu_mask_nr_tbl -#if (_MIPS_SZPTR == 32) +#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) # open coded la t1, cpu_mask_nr_tbl lui t1, %hi(cpu_mask_nr_tbl) addiu t1, %lo(cpu_mask_nr_tbl) - -#endif -#if (_MIPS_SZPTR == 64) - # open coded dla t1, cpu_mask_nr_tbl - .set push - .set noat - lui t1, %highest(cpu_mask_nr_tbl) - lui AT, %hi(cpu_mask_nr_tbl) - daddiu t1, t1, %higher(cpu_mask_nr_tbl) - daddiu AT, AT, %lo(cpu_mask_nr_tbl) - dsll t1, 32 - daddu t1, t1, AT - .set pop +#else +#error GCC `-msym32' option required for 64-bit DECstation builds #endif 1: lw t2,(t1) nop
@@ -214,23 +203,12 @@ * Find irq with highest priority */ # open coded PTR_LA t1,asic_mask_nr_tbl -#if (_MIPS_SZPTR == 32) +#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) # open coded la t1, asic_mask_nr_tbl lui t1, %hi(asic_mask_nr_tbl) addiu t1, %lo(asic_mask_nr_tbl) - -#endif -#if (_MIPS_SZPTR == 64) - # open coded dla t1, asic_mask_nr_tbl - .set push - .set noat - lui t1, %highest(asic_mask_nr_tbl) - lui AT, %hi(asic_mask_nr_tbl) - daddiu t1, t1, %higher(asic_mask_nr_tbl) - daddiu AT, AT, %lo(asic_mask_nr_tbl) - dsll t1, 32 - daddu t1, t1, AT - .set pop +#else +#error GCC `-msym32' option required for 64-bit DECstation builds #endif 2: lw t2,(t1) nop
arch/mips/include/asm/cache.h +2 -0
@@ -9,6 +9,8 @@#ifndef _ASM_CACHE_H#define _ASM_CACHE_H +#include <kmalloc.h> +#define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
arch/mips/include/asm/octeon/cvmx-l2c-defs.h +36 -1
@@ -33,6 +33,10 @@#define CVMX_L2C_DBG (CVMX_ADD_IO_SEG(0x0001180080000030ull))#define CVMX_L2C_CFG (CVMX_ADD_IO_SEG(0x0001180080000000ull))#define CVMX_L2C_CTL (CVMX_ADD_IO_SEG(0x0001180080800000ull)) +#define CVMX_L2C_ERR_TDTX (block_id) \ + (CVMX_ADD_IO_SEG(0x0001180080A007E0ull) + ((block_id) & 3) * 0x40000ull) +#define CVMX_L2C_ERR_TTGX (block_id) \ + (CVMX_ADD_IO_SEG(0x0001180080A007E8ull) + ((block_id) & 3) * 0x40000ull)#define CVMX_L2C_LCKBASE (CVMX_ADD_IO_SEG(0x0001180080000058ull))#define CVMX_L2C_LCKOFF (CVMX_ADD_IO_SEG(0x0001180080000060ull))#define CVMX_L2C_PFCTL (CVMX_ADD_IO_SEG(0x0001180080000090ull))
@@ -66,9 +70,40 @@ ((offset) & 1) * 8)#define CVMX_L2C_WPAR_PPX (offset) (CVMX_ADD_IO_SEG(0x0001180080840000ull) + \ ((offset) & 31) * 8) -#define CVMX_L2D_FUS3 (CVMX_ADD_IO_SEG(0x00011800800007B8ull)) +union cvmx_l2c_err_tdtx { + uint64_t u64; + struct cvmx_l2c_err_tdtx_s { + __BITFIELD_FIELD(uint64_t dbe:1, + __BITFIELD_FIELD(uint64_t sbe:1, + __BITFIELD_FIELD(uint64_t vdbe:1, + __BITFIELD_FIELD(uint64_t vsbe:1, + __BITFIELD_FIELD(uint64_t syn:10, + __BITFIELD_FIELD(uint64_t reserved_22_49:28, + __BITFIELD_FIELD(uint64_t wayidx:18, + __BITFIELD_FIELD(uint64_t reserved_2_3:2, + __BITFIELD_FIELD(uint64_t type:2, + ;))))))))) + } s; +}; + +union cvmx_l2c_err_ttgx { + uint64_t u64; + struct cvmx_l2c_err_ttgx_s { + __BITFIELD_FIELD(uint64_t dbe:1, + __BITFIELD_FIELD(uint64_t sbe:1, + __BITFIELD_FIELD(uint64_t noway:1, + __BITFIELD_FIELD(uint64_t reserved_56_60:5, + __BITFIELD_FIELD(uint64_t syn:6, + __BITFIELD_FIELD(uint64_t reserved_22_49:28, + __BITFIELD_FIELD(uint64_t wayidx:15, + __BITFIELD_FIELD(uint64_t reserved_2_6:5, + __BITFIELD_FIELD(uint64_t type:2, + ;))))))))) + } s; +}; + union cvmx_l2c_cfg { uint64_t u64; struct cvmx_l2c_cfg_s {
arch/mips/include/asm/octeon/cvmx-l2d-defs.h new file +60 -0
60 lines not on this page · raw message
arch/mips/include/asm/octeon/cvmx.h +1 -0
@@ -62,6 +62,7 @@ enum cvmx_mips_space {#include <asm/octeon/cvmx-iob-defs.h> #include <asm/octeon/cvmx-ipd-defs.h> #include <asm/octeon/cvmx-l2c-defs.h> +#include <asm/octeon/cvmx-l2d-defs.h> #include <asm/octeon/cvmx-l2t-defs.h> #include <asm/octeon/cvmx-led-defs.h> #include <asm/octeon/cvmx-mio-defs.h>
arch/powerpc/kernel/setup-common.c +4 -0
@@ -335,6 +335,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) maj = ((pvr >>8 ) &0xFF ) -1 ; min = pvr &0xFF ;break ; +case 0x004e :/* POWER9 bits 12-15 give chip type */ + maj = (pvr >>8 ) &0x0F ; + min = pvr &0xFF ; +break ;default : maj = (pvr >>8 ) &0xFF ; min = pvr &0xFF ;
arch/xtensa/kernel/xtensa_ksyms.c +0 -2
@@ -94,13 +94,11 @@ unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v) }EXPORT_SYMBOL (__sync_fetch_and_or_4); -#ifdef CONFIG_NET /* * Networking support */ EXPORT_SYMBOL (csum_partial);EXPORT_SYMBOL (csum_partial_copy_generic); -#endif /* CONFIG_NET */ /* * Architecture-specific symbols
arch/xtensa/mm/cache.c +8 -8
@@ -103,6 +103,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr)clear_page_alias (kvaddr, paddr);preempt_enable (); } +EXPORT_SYMBOL (clear_user_highpage);void copy_user_highpage (struct page *dst,struct page *src,unsigned long vaddr,struct vm_area_struct *vma)
@@ -119,10 +120,7 @@ void copy_user_highpage(struct page *dst, struct page *src,copy_page_alias (dst_vaddr, src_vaddr, dst_paddr, src_paddr);preempt_enable (); } - -#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ - -#if (DCACHE_WAY_SIZE >PAGE_SIZE ) &&XCHAL_DCACHE_IS_WRITEBACK +EXPORT_SYMBOL (copy_user_highpage);/* * Any time the kernel writes to a user page cache page, or it is about to
@@ -176,7 +174,7 @@ void flush_dcache_page(struct page *page)/* There shouldn't be an entry in the cache for this page anymore. */ } - +EXPORT_SYMBOL (flush_dcache_page);/* * For now, flush the whole cache. FIXME??
@@ -188,6 +186,7 @@ void local_flush_cache_range(struct vm_area_struct *vma,__flush_invalidate_dcache_all ();__invalidate_icache_all (); } +EXPORT_SYMBOL (local_flush_cache_range);/* * Remove any entry in the cache for this page.
@@ -207,8 +206,9 @@ void local_flush_cache_page(struct vm_area_struct *vma, unsigned long address,__flush_invalidate_dcache_page_alias (virt, phys); __invalidate_icache_page_alias(virt, phys); } +EXPORT_SYMBOL (local_flush_cache_page); -#endif +#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ void update_mmu_cache (struct vm_area_struct * vma,unsigned long addr,pte_t *ptep)
@@ -225,7 +225,7 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep)flush_tlb_page (vma, addr); -#if (DCACHE_WAY_SIZE >PAGE_SIZE ) &&XCHAL_DCACHE_IS_WRITEBACK +#if (DCACHE_WAY_SIZE >PAGE_SIZE )if (!PageReserved (page) &&test_bit (PG_arch_1, &page->flags)) {unsigned long phys =page_to_phys (page);
@@ -256,7 +256,7 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep)* flush_dcache_page() on the page. */ -#if (DCACHE_WAY_SIZE >PAGE_SIZE ) &&XCHAL_DCACHE_IS_WRITEBACK +#if (DCACHE_WAY_SIZE >PAGE_SIZE ) void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long vaddr, void *dst, const void *src,
block/blk-mq.c +2 -2
@@ -620,8 +620,8 @@ EXPORT_SYMBOL(blk_mq_kick_requeue_list);void blk_mq_delay_kick_requeue_list (struct request_queue *q,unsigned long msecs) { -kblockd_schedule_delayed_work (&q->requeue_work, -msecs_to_jiffies (msecs)); +kblockd_mod_delayed_work_on (WORK_CPU_UNBOUND , &q->requeue_work, +msecs_to_jiffies (msecs)); }EXPORT_SYMBOL (blk_mq_delay_kick_requeue_list);
drivers/base/firmware_class.c +34 -15
110 lines not on this page · raw message
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -1255,7 +1255,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id)/* port@2 is the output port */ ret =drm_of_find_panel_or_bridge (dev->of_node,2 ,0 , &tc->panel,NULL ); -if (ret) +if (ret && ret != -ENODEV )return ret;/* Shut down GPIO is optional */
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +2 -2
@@ -270,8 +270,8 @@ static int submit_reloc(struct etnaviv_gem_submit *submit, void *stream,if (ret)return ret; -if (r->reloc_offset >= bo->obj->base.size -sizeof (*ptr)) { -DRM_ERROR ("relocation %u outside object" , i); +if (r->reloc_offset > bo->obj->base.size -sizeof (*ptr)) { +DRM_ERROR ("relocation %u outside object\n" , i);return -EINVAL ; }
drivers/gpu/drm/i915/intel_color.c +1 -0
@@ -398,6 +398,7 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) }/* Program the max register to clamp values > 1.0. */ + i = lut_size -1 ;I915_WRITE (PREC_PAL_GC_MAX (pipe,0 ),drm_color_lut_extract (lut[i].red,16 )); I915_WRITE(PREC_PAL_GC_MAX(pipe, 1),
drivers/i2c/busses/i2c-designware-platdrv.c +3 -0
@@ -254,6 +254,9 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) } acpi_speed =i2c_acpi_find_bus_speed (&pdev->dev); +/* Some broken DSTDs use 1MiHz instead of 1MHz */ +if (acpi_speed ==1048576 ) + acpi_speed =1000000 ;/* * Find bus speed from the "clock-frequency" device property, ACPI * or by using fast mode if neither is set.
drivers/iio/accel/bmc150-accel-core.c +1 -8
@@ -193,7 +193,6 @@ struct bmc150_accel_data {struct regmap *regmap;int irq;struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS ]; -atomic_t active_intr;struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS ];struct mutex mutex;u8 fifo_mode, watermark;
@@ -493,11 +492,6 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i, goto out_fix_power_state; } -if (state) -atomic_inc (&data->active_intr); -else -atomic_dec (&data->active_intr); -return 0 ; out_fix_power_state:
@@ -1710,8 +1704,7 @@ static int bmc150_accel_resume(struct device *dev)struct bmc150_accel_data *data =iio_priv (indio_dev);mutex_lock (&data->mutex); -if (atomic_read (&data->active_intr)) -bmc150_accel_set_mode (data,BMC150_ACCEL_SLEEP_MODE_NORMAL ,0 ); +bmc150_accel_set_mode (data,BMC150_ACCEL_SLEEP_MODE_NORMAL ,0 );bmc150_accel_fifo_set_mode (data);mutex_unlock (&data->mutex);
drivers/iio/accel/st_accel_core.c +32 -0
@@ -166,6 +166,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .mask_ihl = 0x02, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, + .sim = { + .addr = 0x23, + .value = BIT(0), + }, .multi_read_bit = true, .bootime = 2, },
@@ -234,6 +238,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .mask_od = 0x40, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, + .sim = { + .addr = 0x23, + .value = BIT(0), + }, .multi_read_bit = true, .bootime = 2, },
@@ -316,6 +324,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .en_mask = 0x08, }, }, + .sim = { + .addr = 0x24, + .value = BIT(0), + }, .multi_read_bit = false, .bootime = 2, },
@@ -379,6 +391,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .mask_int1 = 0x04, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, + .sim = { + .addr = 0x21, + .value = BIT(1), + }, .multi_read_bit = true, .bootime = 2, /* guess */ },
@@ -437,6 +453,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .mask_od = 0x40, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, + .sim = { + .addr = 0x21, + .value = BIT(7), + }, .multi_read_bit = false, .bootime = 2, /* guess */ },
@@ -499,6 +519,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .addr_ihl = 0x22, .mask_ihl = 0x80, }, + .sim = { + .addr = 0x23, + .value = BIT(0), + }, .multi_read_bit = true, .bootime = 2, },
@@ -547,6 +571,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .mask_int1 = 0x04, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, + .sim = { + .addr = 0x21, + .value = BIT(1), + }, .multi_read_bit = false, .bootime = 2, },
@@ -614,6 +642,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .mask_ihl = 0x02, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, + .sim = { + .addr = 0x23, + .value = BIT(0), + }, .multi_read_bit = true, .bootime = 2, },
drivers/iio/adc/aspeed_adc.c +26 -0
@@ -22,6 +22,7 @@#include <linux/iio/iio.h> #include <linux/iio/driver.h> +#include <linux/iopoll.h> #define ASPEED_RESOLUTION_BITS 10#define ASPEED_CLOCKS_PER_SAMPLE 12
@@ -38,11 +39,17 @@#define ASPEED_ENGINE_ENABLE BIT(0) +#define ASPEED_ADC_CTRL_INIT_RDY BIT(8) + +#define ASPEED_ADC_INIT_POLLING_TIME 500 +#define ASPEED_ADC_INIT_TIMEOUT 500000 +struct aspeed_adc_model_data {const char *model_name;unsigned int min_sampling_rate;// Hz unsigned int max_sampling_rate;// Hz unsigned int vref_voltage;// mV +bool wait_init_sequence; };struct aspeed_adc_data {
@@ -211,6 +218,24 @@ static int aspeed_adc_probe(struct platform_device *pdev) goto scaler_error; } + model_data =of_device_get_match_data (&pdev->dev); + +if (model_data->wait_init_sequence) { +/* Enable engine in normal mode. */ +writel (ASPEED_OPERATION_MODE_NORMAL |ASPEED_ENGINE_ENABLE , + data->base +ASPEED_REG_ENGINE_CONTROL ); + +/* Wait for initial sequence complete. */ + ret =readl_poll_timeout (data->base +ASPEED_REG_ENGINE_CONTROL , + adc_engine_control_reg_val, + adc_engine_control_reg_val & +ASPEED_ADC_CTRL_INIT_RDY , +ASPEED_ADC_INIT_POLLING_TIME , +ASPEED_ADC_INIT_TIMEOUT ); +if (ret) + goto scaler_error; + } +/* Start all channels in normal mode. */ clk_prepare_enable (data->clk_scaler->clk); adc_engine_control_reg_val = GENMASK(31, 16) |
@@ -270,6 +295,7 @@ static const struct aspeed_adc_model_data ast2500_model_data = { .vref_voltage = 1800, // mV .min_sampling_rate = 1, .max_sampling_rate = 1000000, + .wait_init_sequence = true, };static const struct of_device_id aspeed_adc_matches[] = {
drivers/iio/adc/axp288_adc.c +31 -1
@@ -28,6 +28,8 @@#include <linux/iio/driver.h> #define AXP288_ADC_EN_MASK 0xF1 +#define AXP288_ADC_TS_PIN_GPADC 0xF2 +#define AXP288_ADC_TS_PIN_ON 0xF3enum axp288_adc_id {AXP288_ADC_TS ,
@@ -121,6 +123,16 @@ static int axp288_adc_read_channel(int *val, unsigned long address,return IIO_VAL_INT ; } +static int axp288_adc_set_ts (struct regmap *regmap,unsigned int mode, +unsigned long address) +{ +/* channels other than GPADC do not need to switch TS pin */ +if (address !=AXP288_GP_ADC_H ) +return 0 ; + +return regmap_write (regmap,AXP288_ADC_TS_PIN_CTRL , mode); +} +static int axp288_adc_read_raw (struct iio_dev *indio_dev,struct iio_chan_spec const *chan,int *val,int *val2,long mask)
@@ -131,7 +143,16 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,mutex_lock (&indio_dev->mlock);switch (mask) {case IIO_CHAN_INFO_RAW : +if (axp288_adc_set_ts (info->regmap,AXP288_ADC_TS_PIN_GPADC , + chan->address)) { +dev_err (&indio_dev->dev,"GPADC mode\n" ); + ret = -EINVAL ; +break ; + } ret =axp288_adc_read_channel (val, chan->address, info->regmap); +if (axp288_adc_set_ts (info->regmap,AXP288_ADC_TS_PIN_ON , + chan->address)) +dev_err (&indio_dev->dev,"TS pin restore\n" );break ;default : ret = -EINVAL ;
@@ -141,6 +162,15 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,return ret; } +static int axp288_adc_set_state (struct regmap *regmap) +{ +/* ADC should be always enabled for internal FG to function */ +if (regmap_write (regmap,AXP288_ADC_TS_PIN_CTRL ,AXP288_ADC_TS_PIN_ON )) +return -EIO ; + +return regmap_write (regmap,AXP20X_ADC_EN1 ,AXP288_ADC_EN_MASK ); +} +static const struct iio_info axp288_adc_iio_info = { .read_raw = &axp288_adc_read_raw, .driver_module =THIS_MODULE ,
@@ -169,7 +199,7 @@ static int axp288_adc_probe(struct platform_device *pdev)* Set ADC to enabled state at all time, including system suspend. * otherwise internal fuel gauge functionality may be affected. */ - ret =regmap_write (info->regmap,AXP20X_ADC_EN1 ,AXP288_ADC_EN_MASK ); + ret =axp288_adc_set_state (axp20x->regmap);if (ret) {dev_err (&pdev->dev,"unable to enable ADC device\n" );return ret;
drivers/iio/adc/vf610_adc.c +1 -1
@@ -77,7 +77,7 @@#define VF610_ADC_ADSTS_MASK 0x300#define VF610_ADC_ADLPC_EN 0x80#define VF610_ADC_ADHSC_EN 0x400 -#define VF610_ADC_REFSEL_VALT 0x100 +#define VF610_ADC_REFSEL_VALT 0x800#define VF610_ADC_REFSEL_VBG 0x1000#define VF610_ADC_ADTRG_HARD 0x2000#define VF610_ADC_AVGS_8 0x4000
drivers/iio/common/st_sensors/st_sensors_core.c +29 -0
@@ -550,6 +550,31 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev, }EXPORT_SYMBOL (st_sensors_read_info_raw); +static int st_sensors_init_interface_mode (struct iio_dev *indio_dev, +const struct st_sensor_settings *sensor_settings) +{ +struct st_sensor_data *sdata =iio_priv (indio_dev); +struct device_node *np = sdata->dev->of_node; +struct st_sensors_platform_data *pdata; + + pdata = (struct st_sensors_platform_data *)sdata->dev->platform_data; +if (((np &&of_property_read_bool (np,"spi-3wire" )) || + (pdata && pdata->spi_3wire)) && sensor_settings->sim.addr) { +int err; + + err = sdata->tf->write_byte (&sdata->tb, sdata->dev, + sensor_settings->sim.addr, + sensor_settings->sim.value); +if (err <0 ) { +dev_err (&indio_dev->dev, +"failed to init interface mode\n" ); +return err; + } + } + +return 0 ; +} +int st_sensors_check_device_support (struct iio_dev *indio_dev,int num_sensors_list,const struct st_sensor_settings *sensor_settings)
@@ -574,6 +599,10 @@ int st_sensors_check_device_support(struct iio_dev *indio_dev,return -ENODEV ; } + err =st_sensors_init_interface_mode (indio_dev, &sensor_settings[i]); +if (err <0 ) +return err; +if (sensor_settings[i].wai_addr) { err = sdata->tf->read_byte (&sdata->tb, sdata->dev, sensor_settings[i].wai_addr, &wai);
drivers/iio/light/tsl2563.c +1 -1
@@ -626,7 +626,7 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private)struct tsl2563_chip *chip =iio_priv (dev_info); iio_push_event(dev_info, - IIO_UNMOD_EVENT_CODE(IIO_LIGHT, + IIO_UNMOD_EVENT_CODE(IIO_INTENSITY, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_EITHER),
drivers/iio/pressure/st_pressure_core.c +1 -1
@@ -456,7 +456,7 @@ static const struct st_sensor_settings st_press_sensors_settings[] = { .mask_od = 0x40, .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, }, - .multi_read_bit = true, + .multi_read_bit = false, .bootime = 2, }, };
drivers/mmc/core/mmc.c +1 -1
@@ -1288,7 +1288,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card)static int mmc_select_hs400es (struct mmc_card *card) {struct mmc_host *host = card->host; -int err =0 ; +int err = -EINVAL ;u8 val;if (!(host->caps &MMC_CAP_8_BIT_DATA )) {
drivers/mtd/nand/atmel/pmecc.c +6 -15
@@ -945,6 +945,7 @@ struct atmel_pmecc *devm_atmel_pmecc_get(struct device *userdev)*/ struct platform_device *pdev =to_platform_device (userdev);const struct atmel_pmecc_caps *caps; +const struct of_device_id *match;/* No PMECC engine available. */ if (!of_property_read_bool(userdev->of_node,
@@ -953,21 +954,11 @@ struct atmel_pmecc *devm_atmel_pmecc_get(struct device *userdev) caps = &at91sam9g45_caps; -/* -* Try to find the NFC subnode and extract the associated caps -* from there. -*/ - np =of_find_compatible_node (userdev->of_node,NULL , -"atmel,sama5d3-nfc" ); -if (np) { -const struct of_device_id *match; - - match =of_match_node (atmel_pmecc_legacy_match, np); -if (match && match->data) - caps = match->data; - -of_node_put (np); - } +/* Find the caps associated to the NAND dev node. */ + match =of_match_node (atmel_pmecc_legacy_match, + userdev->of_node); +if (match && match->data) + caps = match->data; pmecc =atmel_pmecc_create (pdev, caps,1 ,2 ); }
drivers/mtd/nand/nand_base.c +10 -2
@@ -65,8 +65,14 @@ static int nand_ooblayout_ecc_sp(struct mtd_info *mtd, int section,if (!section) { oobregion->offset =0 ; - oobregion->length =4 ; +if (mtd->oobsize ==16 ) + oobregion->length =4 ; +else + oobregion->length =3 ; }else { +if (mtd->oobsize ==8 ) +return -ERANGE ; + oobregion->offset =6 ; oobregion->length = ecc->total -4 ; }
@@ -1102,7 +1108,9 @@ static int nand_setup_data_interface(struct nand_chip *chip)* Ensure the timing mode has been changed on the chip side * before changing timings on the controller side. */ -if (chip->onfi_version) { +if (chip->onfi_version && + (le16_to_cpu (chip->onfi_params.opt_cmd) & +ONFI_OPT_CMD_SET_GET_FEATURES )) {u8 tmode_param[ONFI_SUBFEATURE_PARAM_LEN ] = { chip->onfi_timing_mode_default, };
drivers/mtd/nand/nand_timings.c +3 -3
@@ -311,9 +311,9 @@ int onfi_init_data_interface(struct nand_chip *chip,struct nand_sdr_timings *timings = &iface->timings.sdr;/* microseconds -> picoseconds */ - timings->tPROG_max =1000000UL *le16_to_cpu (params->t_prog); - timings->tBERS_max =1000000UL *le16_to_cpu (params->t_bers); - timings->tR_max =1000000UL *le16_to_cpu (params->t_r); + timings->tPROG_max =1000000ULL *le16_to_cpu (params->t_prog); + timings->tBERS_max =1000000ULL *le16_to_cpu (params->t_bers); + timings->tR_max =1000000ULL *le16_to_cpu (params->t_r);/* nanoseconds -> picoseconds */ timings->tCCS_min =1000UL *le16_to_cpu (params->t_ccs);
drivers/pci/pci.c +103 -62
245 lines not on this page · raw message
drivers/pinctrl/intel/pinctrl-cherryview.c +7 -0
@@ -1547,6 +1547,13 @@ static const struct dmi_system_id chv_no_valid_mask[] = { DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"), }, }, + { + .ident = "HP Chromebook 11 G5 (Setzer)", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HP" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Setzer"), + }, + }, { .ident ="Acer Chromebook R11 (Cyan)" , .matches = {
drivers/pinctrl/intel/pinctrl-merrifield.c +3 -3
@@ -343,9 +343,9 @@ static const struct pinctrl_pin_desc mrfld_pins[] = {static const unsigned int mrfld_sdio_pins[] = {50 ,51 ,52 ,53 ,54 ,55 ,56 };static const unsigned int mrfld_spi5_pins[] = {90 ,91 ,92 ,93 ,94 ,95 ,96 }; -static const unsigned int mrfld_uart0_pins[] = {124 ,125 ,126 ,127 }; -static const unsigned int mrfld_uart1_pins[] = {128 ,129 ,130 ,131 }; -static const unsigned int mrfld_uart2_pins[] = {132 ,133 ,134 ,135 }; +static const unsigned int mrfld_uart0_pins[] = {115 ,116 ,117 ,118 }; +static const unsigned int mrfld_uart1_pins[] = {119 ,120 ,121 ,122 }; +static const unsigned int mrfld_uart2_pins[] = {123 ,124 ,125 ,126 };static const unsigned int mrfld_pwm0_pins[] = {144 };static const unsigned int mrfld_pwm1_pins[] = {145 };static const unsigned int mrfld_pwm2_pins[] = {132 };
drivers/pinctrl/meson/pinctrl-meson-gxbb.c +1 -0
@@ -85,6 +85,7 @@ static const struct pinctrl_pin_desc meson_gxbb_periphs_pins[] = {MESON_PIN (GPIODV_15 ,EE_OFF ),MESON_PIN (GPIODV_16 ,EE_OFF ),MESON_PIN (GPIODV_17 ,EE_OFF ), +MESON_PIN (GPIODV_18 ,EE_OFF ),MESON_PIN (GPIODV_19 ,EE_OFF ),MESON_PIN (GPIODV_20 ,EE_OFF ), MESON_PIN(GPIODV_21, EE_OFF),
drivers/pinctrl/meson/pinctrl-meson-gxl.c +1 -0
@@ -89,6 +89,7 @@ static const struct pinctrl_pin_desc meson_gxl_periphs_pins[] = {MESON_PIN (GPIODV_15 ,EE_OFF ),MESON_PIN (GPIODV_16 ,EE_OFF ),MESON_PIN (GPIODV_17 ,EE_OFF ), +MESON_PIN (GPIODV_18 ,EE_OFF ),MESON_PIN (GPIODV_19 ,EE_OFF ),MESON_PIN (GPIODV_20 ,EE_OFF ), MESON_PIN(GPIODV_21, EE_OFF),
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +1 -1
@@ -176,7 +176,7 @@ const struct armada_37xx_pin_data armada_37xx_pin_nb = { };const struct armada_37xx_pin_data armada_37xx_pin_sb = { - .nr_pins =29 , + .nr_pins =30 , .name ="GPIO2" , .groups = armada_37xx_sb_groups, .ngroups =ARRAY_SIZE (armada_37xx_sb_groups),
drivers/pinctrl/samsung/pinctrl-exynos.c +0 -4
@@ -205,8 +205,6 @@ static int exynos_irq_request_resources(struct irq_data *irqd)spin_unlock_irqrestore (&bank->slock, flags); -exynos_irq_unmask (irqd); -return 0 ; }
@@ -226,8 +224,6 @@ static void exynos_irq_release_resources(struct irq_data *irqd) shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC ]; mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; -exynos_irq_mask (irqd); -spin_lock_irqsave (&bank->slock, flags); con =readl (bank->eint_base + reg_con);
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c +1 -0
@@ -811,6 +811,7 @@ static const struct sunxi_desc_pin sun4i_a10_pins[] = { SUNXI_FUNCTION(0x2, "lcd1"), /* D16 */ SUNXI_FUNCTION(0x3, "pata"), /* ATAD12 */ SUNXI_FUNCTION(0x4, "keypad"), /* IN6 */ + SUNXI_FUNCTION(0x5, "sim"), /* DET */ SUNXI_FUNCTION_IRQ(0x6, 16), /* EINT16 */ SUNXI_FUNCTION(0x7, "csi1")), /* D16 */ SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 17),
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +192 -172
396 lines not on this page · raw message
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +194 -189
419 lines not on this page · raw message
drivers/staging/comedi/comedi_fops.c +3 -0
@@ -2396,6 +2396,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,continue ; } +set_current_state (TASK_RUNNING ); wp = async->buf_write_ptr; n1 =min (n, async->prealloc_bufsz - wp); n2 = n - n1;
@@ -2528,6 +2529,8 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, }continue ; } + +set_current_state (TASK_RUNNING ); rp = async->buf_read_ptr; n1 =min (n, async->prealloc_bufsz - rp); n2 = n - n1;
drivers/staging/iio/resolver/ad2s1210.c +1 -1
@@ -472,7 +472,7 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, long m) {struct ad2s1210_state *st =iio_priv (indio_dev); -bool negative; +u16 negative;int ret =0 ;u16 pos;s16 vel;
drivers/target/iscsi/iscsi_target.c +2 -0
@@ -418,6 +418,7 @@ int iscsit_reset_np_thread(return 0 ; } np->np_thread_state =ISCSI_NP_THREAD_RESET ; +atomic_inc (&np->np_reset_count);if (np->np_thread) {spin_unlock_bh (&np->np_thread_lock);
@@ -2173,6 +2174,7 @@ iscsit_setup_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, cmd->cmd_sn =be32_to_cpu (hdr->cmdsn); cmd->exp_stat_sn =be32_to_cpu (hdr->exp_statsn); cmd->data_direction =DMA_NONE ; +kfree (cmd->text_in_ptr); cmd->text_in_ptr =NULL ;return 0 ;
drivers/target/iscsi/iscsi_target_login.c +5 -2
@@ -1237,9 +1237,11 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)flush_signals (current);spin_lock_bh (&np->np_thread_lock); -if (np->np_thread_state ==ISCSI_NP_THREAD_RESET ) { +if (atomic_dec_if_positive (&np->np_reset_count) >=0 ) { np->np_thread_state =ISCSI_NP_THREAD_ACTIVE ; +spin_unlock_bh (&np->np_thread_lock);complete (&np->np_restart_comp); +return 1 ; }else if (np->np_thread_state ==ISCSI_NP_THREAD_SHUTDOWN ) {spin_unlock_bh (&np->np_thread_lock); goto exit;
@@ -1272,7 +1274,8 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) goto exit; }else if (rc <0 ) {spin_lock_bh (&np->np_thread_lock); -if (np->np_thread_state ==ISCSI_NP_THREAD_RESET ) { +if (atomic_dec_if_positive (&np->np_reset_count) >=0 ) { + np->np_thread_state =ISCSI_NP_THREAD_ACTIVE ;spin_unlock_bh (&np->np_thread_lock);complete (&np->np_restart_comp);iscsit_put_transport (conn->conn_transport);
drivers/target/target_core_tpg.c +2 -2
@@ -364,7 +364,7 @@ void core_tpg_del_initiator_node_acl(struct se_node_acl *acl)mutex_lock (&tpg->acl_node_mutex);if (acl->dynamic_node_acl) acl->dynamic_node_acl =0 ; -list_del (&acl->acl_list); +list_del_init (&acl->acl_list);mutex_unlock (&tpg->acl_node_mutex);target_shutdown_sessions (acl);
@@ -548,7 +548,7 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)* in transport_deregister_session(). */ list_for_each_entry_safe (nacl, nacl_tmp, &node_list, acl_list) { -list_del (&nacl->acl_list); +list_del_init (&nacl->acl_list);core_tpg_wait_for_nacl_pr_ref (nacl);core_free_device_list_for_node (nacl, se_tpg);
drivers/target/target_core_transport.c +2 -2
@@ -466,7 +466,7 @@ static void target_complete_nacl(struct kref *kref) }mutex_lock (&se_tpg->acl_node_mutex); -list_del (&nacl->acl_list); +list_del_init (&nacl->acl_list);mutex_unlock (&se_tpg->acl_node_mutex);core_tpg_wait_for_nacl_pr_ref (nacl);
@@ -538,7 +538,7 @@ void transport_free_session(struct se_session *se_sess)spin_unlock_irqrestore (&se_nacl->nacl_sess_lock, flags);if (se_nacl->dynamic_stop) -list_del (&se_nacl->acl_list); +list_del_init (&se_nacl->acl_list); }mutex_unlock (&se_tpg->acl_node_mutex);
drivers/usb/core/hcd.c +3 -1
@@ -1878,7 +1878,7 @@ void usb_hcd_flush_endpoint(struct usb_device *udev,/* No more submits can occur */ spin_lock_irq (&hcd_urb_list_lock); rescan: - list_for_each_entry (urb, &ep->urb_list, urb_list) { +list_for_each_entry_reverse (urb, &ep->urb_list, urb_list) {int is_in;if (urb->unlinked)
@@ -2475,6 +2475,8 @@ void usb_hc_died (struct usb_hcd *hcd) }if (usb_hcd_is_primary_hcd (hcd) && hcd->shared_hcd) { hcd = hcd->shared_hcd; +clear_bit (HCD_FLAG_RH_RUNNING , &hcd->flags); +set_bit (HCD_FLAG_DEAD , &hcd->flags);if (hcd->rh_registered) {clear_bit (HCD_FLAG_POLL_RH , &hcd->flags);
drivers/usb/core/hub.c +6 -4
@@ -4730,7 +4730,8 @@ hub_power_remaining(struct usb_hub *hub)static void hub_port_connect (struct usb_hub *hub,int port1,u16 portstatus,u16 portchange) { -int status, i; +int status = -ENODEV ; +int i;unsigned unit_load;struct usb_device *hdev = hub->hdev;struct usb_hcd *hcd =bus_to_hcd (hdev->bus);
@@ -4934,9 +4935,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, done:hub_port_disable (hub, port1,1 ); -if (hcd->driver->relinquish_port && !hub->hdev->parent) - hcd->driver->relinquish_port (hcd, port1); - +if (hcd->driver->relinquish_port && !hub->hdev->parent) { +if (status != -ENOTCONN && status != -ENODEV ) + hcd->driver->relinquish_port (hcd, port1); + } }/* Handle physical or logical connection change events.
drivers/usb/core/quirks.c +4 -0
@@ -150,6 +150,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* appletouch */ { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Genesys Logic hub, internally used by Moshi USB to Ethernet Adapter */ + { USB_DEVICE(0x05e3, 0x0616), .driver_info = USB_QUIRK_NO_LPM }, + /* Avision AV600U */ { USB_DEVICE(0x0638, 0x0a13), .driver_info = USB_QUIRK_STRING_FETCH_255 },
@@ -249,6 +252,7 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { { USB_DEVICE(0x093a, 0x2500), .driver_info = USB_QUIRK_RESET_RESUME }, { USB_DEVICE(0x093a, 0x2510), .driver_info = USB_QUIRK_RESET_RESUME }, { USB_DEVICE(0x093a, 0x2521), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x03f0, 0x2b4a), .driver_info = USB_QUIRK_RESET_RESUME }, /* Logitech Optical Mouse M90/M100 */ { USB_DEVICE(0x046d, 0xc05a), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/gadget/udc/renesas_usb3.c +16 -5
@@ -758,21 +758,32 @@ static struct renesas_usb3_request *usb3_get_request(struct renesas_usb3_epreturn usb3_req; } -static void usb3_request_done (struct renesas_usb3_ep *usb3_ep, -struct renesas_usb3_request *usb3_req,int status) +static void __usb3_request_done (struct renesas_usb3_ep *usb3_ep, +struct renesas_usb3_request *usb3_req, +int status) {struct renesas_usb3 *usb3 =usb3_ep_to_usb3 (usb3_ep); -unsigned long flags;dev_dbg (usb3_to_dev (usb3),"giveback: ep%2d, %u, %u, %d\n" , usb3_ep->num, usb3_req->req.length, usb3_req->req.actual, status); usb3_req->req.status = status; -spin_lock_irqsave (&usb3->lock, flags); usb3_ep->started = false;list_del_init (&usb3_req->queue); -spin_unlock_irqrestore (&usb3->lock, flags); +spin_unlock (&usb3->lock);usb_gadget_giveback_request (&usb3_ep->ep, &usb3_req->req); +spin_lock (&usb3->lock); +} + +static void usb3_request_done (struct renesas_usb3_ep *usb3_ep, +struct renesas_usb3_request *usb3_req,int status) +{ +struct renesas_usb3 *usb3 =usb3_ep_to_usb3 (usb3_ep); +unsigned long flags; + +spin_lock_irqsave (&usb3->lock, flags); +__usb3_request_done (usb3_ep, usb3_req, status); +spin_unlock_irqrestore (&usb3->lock, flags); }static void usb3_irq_epc_pipe0_status_end (struct renesas_usb3 *usb3)
drivers/usb/host/pci-quirks.c +32 -5
@@ -98,6 +98,7 @@ enum amd_chipset_gen {AMD_CHIPSET_HUDSON2 ,AMD_CHIPSET_BOLTON ,AMD_CHIPSET_YANGTZE , +AMD_CHIPSET_TAISHAN , AMD_CHIPSET_UNKNOWN, };
@@ -141,6 +142,11 @@ static int amd_chipset_sb_type_init(struct amd_chipset_info *pinfo) pinfo->sb_type.gen =AMD_CHIPSET_SB700 ; else if (rev >= 0x40 && rev <= 0x4f) pinfo->sb_type.gen =AMD_CHIPSET_SB800 ; + } + pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD , +0x145c ,NULL ); +if (pinfo->smbus_dev) { + pinfo->sb_type.gen =AMD_CHIPSET_TAISHAN ; }else { pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ,NULL );
@@ -260,11 +266,12 @@ int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev) {/* Make sure amd chipset type has already been initialized */ usb_amd_find_chipset_info (); -if (amd_chipset.sb_type.gen !=AMD_CHIPSET_YANGTZE ) -return 0 ; - -dev_dbg (&pdev->dev,"QUIRK: Enable AMD remote wakeup fix\n" ); -return 1 ; +if (amd_chipset.sb_type.gen ==AMD_CHIPSET_YANGTZE || + amd_chipset.sb_type.gen ==AMD_CHIPSET_TAISHAN ) { +dev_dbg (&pdev->dev,"QUIRK: Enable AMD remote wakeup fix\n" ); +return 1 ; + } +return 0 ; }EXPORT_SYMBOL_GPL (usb_hcd_amd_remote_wakeup_quirk);
@@ -1150,3 +1157,23 @@ static void quirk_usb_early_handoff(struct pci_dev *pdev) }DECLARE_PCI_FIXUP_CLASS_FINAL (PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_SERIAL_USB ,8 , quirk_usb_early_handoff); + +bool usb_xhci_needs_pci_reset (struct pci_dev *pdev) +{ +/* +* Our dear uPD72020{1,2} friend only partially resets when +* asked to via the XHCI interface, and may end up doing DMA +* at the wrong addresses, as it keeps the top 32bit of some +* addresses from its previous programming under obscure +* circumstances. +* Give it a good wack at probe time. Unfortunately, this +* needs to happen before we've had a chance to discover any +* quirk, or the system will be in a rather bad state. +*/ +if (pdev->vendor ==PCI_VENDOR_ID_RENESAS && + (pdev->device ==0x0014 || pdev->device ==0x0015 )) +return true; + +return false; +} +EXPORT_SYMBOL_GPL (usb_xhci_needs_pci_reset);
drivers/usb/host/pci-quirks.h +1 -0
@@ -15,6 +15,7 @@ void usb_asmedia_modifyflowcontrol(struct pci_dev *pdev);void usb_enable_intel_xhci_ports (struct pci_dev *xhci_pdev);void usb_disable_xhci_ports (struct pci_dev *xhci_pdev);void sb800_prefetch (struct device *dev,int on); +bool usb_xhci_needs_pci_reset (struct pci_dev *pdev);#else struct pci_dev ;static inline void usb_amd_quirk_pll_disable (void ) {}
drivers/usb/host/xhci-pci.c +7 -0
@@ -285,6 +285,13 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) driver = (struct hc_driver *)id->driver_data; +/* For some HW implementation, a XHCI reset is just not enough... */ +if (usb_xhci_needs_pci_reset (dev)) { +dev_info (&dev->dev,"Resetting\n" ); +if (pci_reset_function_locked (dev)) +dev_warn (&dev->dev,"Reset failed" ); + } +/* Prevent runtime suspending between USB-2 and USB-3 initialization */ pm_runtime_get_noresume (&dev->dev);
drivers/usb/musb/musb_host.c +1 -0
@@ -139,6 +139,7 @@ static void musb_h_tx_flush_fifo(struct musb_hw_ep *ep)"Could not flush host TX%d fifo: csr: %04x\n" , ep->epnum, csr)) return; +mdelay (1 ); } }
drivers/usb/renesas_usbhs/rcar3.c +7 -2
@@ -20,9 +20,13 @@/* Low Power Status register (LPSTS) */ #define LPSTS_SUSPM 0x4000 -/* USB General control register 2 (UGCTRL2), bit[31:6] should be 0 */ +/* +* USB General control register 2 (UGCTRL2) +* Remarks: bit[31:11] and bit[9:6] should be 0 +*/ #define UGCTRL2_RESERVED_3 0x00000001/* bit[3:0] should be B'0001 */ #define UGCTRL2_USB0SEL_OTG 0x00000030 +#define UGCTRL2_VBUSSEL 0x00000400static void usbhs_write32 (struct usbhs_priv *priv,u32 reg,u32 data) {
@@ -34,7 +38,8 @@ static int usbhs_rcar3_power_ctrl(struct platform_device *pdev, {struct usbhs_priv *priv =usbhs_pdev_to_priv (pdev); -usbhs_write32 (priv,UGCTRL2 ,UGCTRL2_RESERVED_3 |UGCTRL2_USB0SEL_OTG ); +usbhs_write32 (priv,UGCTRL2 ,UGCTRL2_RESERVED_3 |UGCTRL2_USB0SEL_OTG | +UGCTRL2_VBUSSEL );if (enable) {usbhs_bset (priv,LPSTS ,LPSTS_SUSPM ,LPSTS_SUSPM );
drivers/usb/serial/cp210x.c +1 -0
@@ -142,6 +142,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */ { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */ { USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */ + { USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
drivers/usb/serial/option.c +2 -0
@@ -2025,6 +2025,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */
drivers/usb/serial/pl2303.c +2 -0
@@ -52,6 +52,8 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID), .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, + { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_UC485), + .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID2) }, { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) }, { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) },
drivers/usb/serial/pl2303.h +1 -0
@@ -27,6 +27,7 @@#define ATEN_VENDOR_ID 0x0557#define ATEN_VENDOR_ID2 0x0547#define ATEN_PRODUCT_ID 0x2008 +#define ATEN_PRODUCT_UC485 0x2021#define ATEN_PRODUCT_ID2 0x2118#define IODATA_VENDOR_ID 0x04bb
drivers/usb/storage/unusual_uas.h +2 -2
@@ -124,9 +124,9 @@ UNUSUAL_DEV(0x0bc2, 0xab2a, 0x0000, 0x9999,/* Reported-by: Benjamin Tissoires <[email protected]> */ UNUSUAL_DEV (0x13fd ,0x3940 ,0x0000 ,0x9999 ,"Initio Corporation" , -"" , +"INIC-3069" ,USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , -US_FL_NO_ATA_1X ), +US_FL_NO_ATA_1X |US_FL_IGNORE_RESIDUE ),/* Reported-by: Tom Arild Naess <[email protected]> */ UNUSUAL_DEV(0x152d, 0x0539, 0x0000, 0x9999,
drivers/usb/storage/usb.c +12 -6
@@ -315,6 +315,7 @@ static int usb_stor_control_thread(void * __us) {struct us_data *us = (struct us_data *)__us;struct Scsi_Host *host =us_to_host (us); +struct scsi_cmnd *srb;for (;;) {usb_stor_dbg (us,"*** thread sleeping\n" );
@@ -330,6 +331,7 @@ static int usb_stor_control_thread(void * __us)scsi_lock (host);/* When we are called with no command pending, we're done */ + srb = us->srb;if (us->srb ==NULL ) {scsi_unlock (host);mutex_unlock (&us->dev_mutex);
@@ -398,14 +400,11 @@ static int usb_stor_control_thread(void * __us)/* lock access to the state */ scsi_lock (host); -/* indicate that the command is done */ -if (us->srb->result !=DID_ABORT <<16 ) { -usb_stor_dbg (us,"scsi cmd done, result=0x%x\n" , - us->srb->result); - us->srb->scsi_done (us->srb); - }else { +/* was the command aborted? */ +if (us->srb->result ==DID_ABORT <<16 ) { SkipForAbort:usb_stor_dbg (us,"scsi command aborted\n" ); + srb =NULL ;/* Don't call srb->scsi_done() */ }/*
@@ -429,6 +428,13 @@ static int usb_stor_control_thread(void * __us)/* unlock the device pointers */ mutex_unlock (&us->dev_mutex); + +/* now that the locks are released, notify the SCSI core */ +if (srb) { +usb_stor_dbg (us,"scsi cmd done, result=0x%x\n" , + srb->result); + srb->scsi_done (srb); + } }/* for (;;) */ /* Wait until we are told to stop */
fs/fuse/file.c +1 -1
@@ -46,7 +46,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc) {struct fuse_file *ff; - ff =kmalloc (sizeof (struct fuse_file ),GFP_KERNEL ); + ff =kzalloc (sizeof (struct fuse_file ),GFP_KERNEL );if (unlikely (!ff))return NULL ;
fs/nfs/Kconfig +1 -0
@@ -121,6 +121,7 @@ config PNFS_FILE_LAYOUT config PNFS_BLOCK tristate depends on NFS_V4_1 && BLK_DEV_DM + depends on 64BIT || LBDAF default NFS_V4 config PNFS_FLEXFILE_LAYOUT
fs/nfs/flexfilelayout/flexfilelayoutdev.c +1 -0
@@ -32,6 +32,7 @@ void nfs4_ff_layout_free_deviceid(struct nfs4_ff_layout_ds *mirror_ds) {nfs4_print_deviceid (&mirror_ds->id_node.deviceid);nfs4_pnfs_ds_put (mirror_ds->ds); +kfree (mirror_ds->ds_versions);kfree_rcu (mirror_ds, id_node.rcu); }
fs/xfs/xfs_log_cil.c +1 -0
@@ -519,6 +519,7 @@ xlog_discard_endio(INIT_WORK (&ctx->discard_endio_work, xlog_discard_endio_work);queue_work (xfs_discard_wq, &ctx->discard_endio_work); +bio_put (bio); } static void
include/linux/iio/common/st_sensors.h +7 -0
@@ -105,6 +105,11 @@ struct st_sensor_fullscale {struct st_sensor_fullscale_avl fs_avl[ST_SENSORS_FULLSCALE_AVL_MAX ]; }; +struct st_sensor_sim { +u8 addr; +u8 value; +}; +/** * struct st_sensor_bdu - ST sensor device block data update * @addr: address of the register.
@@ -197,6 +202,7 @@ struct st_sensor_transfer_function {* @bdu: Block data update register. * @das: Data Alignment Selection register. * @drdy_irq: Data ready register of the sensor. +* @sim: SPI serial interface mode register of the sensor. * @multi_read_bit: Use or not particular bit for [I2C/SPI] multi-read. * @bootime: samples to discard when sensor passing from power-down to power-up. */
@@ -213,6 +219,7 @@ struct st_sensor_settings {struct st_sensor_bdu bdu;struct st_sensor_das das;struct st_sensor_data_ready_irq drdy_irq; +struct st_sensor_sim sim;bool multi_read_bit;unsigned int bootime; };
include/linux/mtd/nand.h +3 -3
@@ -638,10 +638,10 @@ struct nand_buffers {* @tWW_min: WP# transition to WE# low */ struct nand_sdr_timings { -u32 tBERS_max; +u64 tBERS_max;u32 tCCS_min; -u32 tPROG_max; -u32 tR_max; +u64 tPROG_max; +u64 tR_max;u32 tALH_min;u32 tADL_min;u32 tALS_min;
include/linux/pci.h +1 -0
@@ -1049,6 +1049,7 @@ void pcie_flr(struct pci_dev *dev);int __pci_reset_function (struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev);int pci_reset_function (struct pci_dev *dev); +int pci_reset_function_locked (struct pci_dev *dev);int pci_try_reset_function (struct pci_dev *dev);int pci_probe_reset_slot (struct pci_slot *slot);int pci_reset_slot (struct pci_slot *slot);
include/linux/platform_data/st_sensors_pdata.h +2 -0
@@ -17,10 +17,12 @@* Available only for accelerometer and pressure sensors. * Accelerometer DRDY on LSM330 available only on pin 1 (see datasheet). * @open_drain: set the interrupt line to be open drain if possible. +* @spi_3wire: enable spi-3wire mode. */ struct st_sensors_platform_data {u8 drdy_int_pin;bool open_drain; +bool spi_3wire; };#endif /* ST_SENSORS_PDATA_H */
include/target/iscsi/iscsi_target_core.h +1 -0
@@ -787,6 +787,7 @@ struct iscsi_np {int np_sock_type;enum np_thread_state_table np_thread_state;bool enabled; +atomic_t np_reset_count;enum iscsi_timer_flags_table np_login_timer_flags;u32 np_exports;enum np_flags_table np_flags;
kernel/futex.c +3 -2
@@ -670,13 +670,14 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)* this reference was taken by ihold under the page lock * pinning the inode in place so i_lock was unnecessary. The * only way for this check to fail is if the inode was -* truncated in parallel so warn for now if this happens. +* truncated in parallel which is almost certainly an +* application bug. In such a case, just retry. * * We are not calling into get_futex_key_refs() in file-backed * cases, therefore a successful atomic_inc return below will * guarantee that get_futex_key() will still imply smp_mb(); (B). */ -if (WARN_ON_ONCE (!atomic_inc_not_zero (&inode->i_count))) { +if (!atomic_inc_not_zero (&inode->i_count)) {rcu_read_unlock ();put_page (page);
mm/page_alloc.c +1 -1
@@ -7567,7 +7567,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,/* Make sure the range is really isolated. */ if (test_pages_isolated (outer_start, end, false)) { -pr_info ("%s: [%lx, %lx) PFNs busy\n" , +pr_info_ratelimited ("%s: [%lx, %lx) PFNs busy\n" , __func__, outer_start, end); ret = -EBUSY ; goto done;
mm/shmem.c +10 -2
@@ -1021,7 +1021,11 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr)*/ if (IS_ENABLED (CONFIG_TRANSPARENT_HUGE_PAGECACHE )) {spin_lock (&sbinfo->shrinklist_lock); -if (list_empty (&info->shrinklist)) { +/* +* _careful to defend against unlocked access to +* ->shrink_list in shmem_unused_huge_shrink() +*/ +if (list_empty_careful (&info->shrinklist)) {list_add_tail (&info->shrinklist, &sbinfo->shrinklist); sbinfo->shrinklist_len++;
@@ -1817,7 +1821,11 @@ alloc_nohuge: page = shmem_alloc_and_acct_page(gfp, info, sbinfo,* to shrink under memory pressure. */ spin_lock (&sbinfo->shrinklist_lock); -if (list_empty (&info->shrinklist)) { +/* +* _careful to defend against unlocked access to +* ->shrink_list in shmem_unused_huge_shrink() +*/ +if (list_empty_careful (&info->shrinklist)) {list_add_tail (&info->shrinklist, &sbinfo->shrinklist); sbinfo->shrinklist_len++;