1. 15 10月, 2017 1 次提交
  2. 08 10月, 2017 1 次提交
  3. 01 10月, 2017 2 次提交
  4. 26 9月, 2017 2 次提交
  5. 25 9月, 2017 1 次提交
    • G
      Merge tag 'iio-fixes-for-4.14a' of... · b2e31206
      Greg Kroah-Hartman 提交于
      Merge tag 'iio-fixes-for-4.14a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      First round of IIO fixes for the 4.14 cycle
      
      Note this includes fixes from recent merge window.  As such the tree
      is based on top of a prior staging/staging-next tree.
      
      * iio core
        - return and error for a failed read_reg debugfs call rather than
          eating the error.
      * ad7192
        - Use the dedicated reset function in the ad_sigma_delta library
          instead of an spi transfer with the data on the stack which
          could cause problems with DMA.
      * ad7793
        - Implement a dedicate reset function in the ad_sigma_delta library
          and use it to correctly reset this part.
      * bme280
        - ctrl_reg write must occur after any register writes
        for updates to take effect.
      * mcp320x
        - negative voltage readout was broken.
        - Fix an oops on module unload due to spi_set_drvdata not being called
          in probe.
      * st_magn
        - Fix the data ready line configuration for the lis3mdl. It is not
          configurable so the st_magn core was assuming it didn't exist
          and so wasn't consuming interrupts resulting in an unhandled
          interrupt.
      * stm32-adc
        - off by one error on max channels checking.
      * stm32-timer
        - preset should not be buffered - reorganising register writes avoids
        this.
        - fix a corner case in which write preset goes wrong when a timer is
        used first as a trigger then as a counter with preset. Odd case but
        you never know.
      * ti-ads1015
        - Fix setting of comparator polarity by fixing bitfield definition.
      * twl4030
        - Error path handling fix to cleanup in event of regulator
          registration failure.
        - Disable the vusb3v1 regulator correctly in error handling
        - Don't paper over a regulator enable failure.
      b2e31206
  6. 24 9月, 2017 13 次提交
  7. 22 9月, 2017 2 次提交
  8. 18 9月, 2017 6 次提交
    • S
      staging: vchiq_2835_arm: Fix NULL ptr dereference in free_pagelist · 974d4d03
      Stefan Wahren 提交于
      This fixes a NULL pointer dereference on RPi 2 with multi_v7_defconfig.
      The function page_address() could return NULL with enabled CONFIG_HIGHMEM.
      So fix this by using kmap() instead.
      Signed-off-by: NStefan Wahren <stefan.wahren@i2se.com>
      Fixes: 71bad7f0 ("staging: add bcm2708 vchiq driver")
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      974d4d03
    • O
      staging: speakup: fix speakup-r empty line lockup · e5f5d0e2
      Okash Khawaja 提交于
      When cursor is at beginning of an empty or whitespace-only line and
      speakup-r typed, kernel locks up. This happens because deadlock of in
      input_event function over dev->event_lock, as demonstrated by lockdep
      logs. The reason for that is speakup simulates a down arrow - because
      cursor is at an empty line - while inside key press notifier handler
      which is ultimately triggered from input_event function. The simulated
      key press leads to input_event being called again, this time under its
      own context. So the spinlock is dev->event_lock is acquired while still
      being held.
      
      This patch ensures that key press is not simulated from inside key press
      notifier handler. Instead it delegates to cursor_timer. It starts the
      timer and passes RA_DOWN_ARROW as argument. When timer handler runs and
      sees RA_DOWN_ARROW, it will then call kbd_fakekey2(RA_DOWN_ARROW) which
      will correctly simulate the keypress inside timer context.
      
      When not inside key press notifier callback, the behaviour will remain
      the same as before this patch.
      Signed-off-by: NOkash Khawaja <okash.khawaja@gmail.com>
      Reviewed-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      e5f5d0e2
    • G
      staging: pi433: Move limit check to switch default to kill warning · b72703e2
      Geert Uytterhoeven 提交于
      With gcc-4.1.2:
      
          drivers/staging/pi433/rf69.c: In function ‘rf69_set_dio_mapping’:
          drivers/staging/pi433/rf69.c:566: warning: ‘regaddr’ may be used uninitialized in this function
          drivers/staging/pi433/rf69.c:565: warning: ‘shift’ may be used uninitialized in this function
          drivers/staging/pi433/rf69.c:564: warning: ‘mask’ may be used uninitialized in this function
      
      While this is a false positive, it can easily be fixed by moving the
      limit check into the "default" case of the switch statement.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b72703e2
    • C
      staging: r8822be: fix null pointer dereferences with a null driver_adapter · e1bf2886
      Colin Ian King 提交于
      The call to _rtl_dbg_trace via macro HALMAC_RT_TRACE will trigger a null
      pointer deference on a null driver_adapter.  Fix this by assigning
      driver_adapter earlier to halmac_adapter->driver_adapter before the tracing
      call so that a non-null driver_adapter is passed instead.
      
      I should have spotted these with an earlier patch I sent, but I overlooked
      these in the rather large CoverityScan logs.
      
      Detected by CoverityScan, CID#1454550, CID#1454554, CID#1454565,
      CID#1454591, CID#1454598 ("Explicit null dereferenced")
      
      Fixes: 938a0447 ("staging: r8822be: Add code for halmac sub-driver")
      Signed-off-by: NColin Ian King <colin.king@canonical.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      e1bf2886
    • A
      staging: mt29f_spinand: Enable the read ECC before program the page · a3563b09
      Arun Nagendran 提交于
      Current program_page function did following operation:
      
      1. read page (with ECC OFF)
      2. modify the page
      3. write the page (with ECC ON)
      
      For some case(buggy flash Chip), while read the page without ECC ON,
      we may read the page with bit flip error and modify that bad page without
      knowing the bit flip error on that page.
      also we re-calculate the hash for bad page and write it.
      This could bring potential in-consistency problem with Flash data.
      
      Verify this logic with GIGA DEVICE Part(GD5F2GQ4RCFIG):
      we see this in-conststency problem wit Giga Device and fix on
      this patch resovle that issue.
      Signed-off-by: NArun Nagendran <arunrasppi@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a3563b09
    • A
      staging: unisys/visorbus: add __init/__exit annotations · 056e4fc2
      Arnd Bergmann 提交于
      gcc-4.6 causes a harmless warning about the init function:
      
      WARNING: vmlinux.o(.text+0xed62c2): Section mismatch in reference from the function init_unisys() to the function .init.text:visorutil_spar_detect()
      The function init_unisys() references
      the function __init visorutil_spar_detect().
      This is often because init_unisys lacks a __init
      annotation or the annotation of visorutil_spar_detect is wrong.
      
      It appears that newer versions inline visorutil_spar_detect(),
      end up with an empty __init section. This marks the module
      entry points as __init and __exit respectively, which avoids
      the warning and slightly reduces the runtime code size.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      056e4fc2
  9. 17 9月, 2017 9 次提交
  10. 16 9月, 2017 3 次提交
    • L
      Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 73184130
      Linus Torvalds 提交于
      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for 4.14 for MIPS; below a summary of
        the non-merge commits:
      
        CM:
         - Rename mips_cm_base to mips_gcr_base
         - Specify register size when generating accessors
         - Use BIT/GENMASK for register fields, order & drop shifts
         - Add cluster & block args to mips_cm_lock_other()
      
        CPC:
         - Use common CPS accessor generation macros
         - Use BIT/GENMASK for register fields, order & drop shifts
         - Introduce register modify (set/clear/change) accessors
         - Use change_*, set_* & clear_* where appropriate
         - Add CM/CPC 3.5 register definitions
         - Use GlobalNumber macros rather than magic numbers
         - Have asm/mips-cps.h include CM & CPC headers
         - Cluster support for topology functions
         - Detect CPUs in secondary clusters
      
        CPS:
         - Read GIC_VL_IDENT directly, not via irqchip driver
      
        DMA:
         - Consolidate coherent and non-coherent dma_alloc code
         - Don't use dma_cache_sync to implement fd_cacheflush
      
        FPU emulation / FP assist code:
         - Another series of 14 commits fixing corner cases such as NaN
           propgagation and other special input values.
         - Zero bits 32-63 of the result for a CLASS.D instruction.
         - Enhanced statics via debugfs
         - Do not use bools for arithmetic. GCC 7.1 moans about this.
         - Correct user fault_addr type
      
        Generic MIPS:
         - Enhancement of stack backtraces
         - Cleanup from non-existing options
         - Handle non word sized instructions when examining frame
         - Fix detection and decoding of ADDIUSP instruction
         - Fix decoding of SWSP16 instruction
         - Refactor handling of stack pointer in get_frame_info
         - Remove unreachable code from force_fcr31_sig()
         - Convert to using %pOF instead of full_name
         - Remove the R6000 support.
         - Move FP code from *_switch.S to *_fpu.S
         - Remove unused ST_OFF from r2300_switch.S
         - Allow platform to specify multiple its.S files
         - Add #includes to various files to ensure code builds reliable and
           without warning..
         - Remove __invalidate_kernel_vmap_range
         - Remove plat_timer_setup
         - Declare various variables & functions static
         - Abstract CPU core & VP(E) ID access through accessor functions
         - Store core & VP IDs in GlobalNumber-style variable
         - Unify checks for sibling CPUs
         - Add CPU cluster number accessors
         - Prevent direct use of generic_defconfig
         - Make CONFIG_MIPS_MT_SMP default y
         - Add __ioread64_copy
         - Remove unnecessary inclusions of linux/irqchip/mips-gic.h
      
        GIC:
         - Introduce asm/mips-gic.h with accessor functions
         - Use new GIC accessor functions in mips-gic-timer
         - Remove counter access functions from irq-mips-gic.c
         - Remove gic_read_local_vp_id() from irq-mips-gic.c
         - Simplify shared interrupt pending/mask reads in irq-mips-gic.c
         - Simplify gic_local_irq_domain_map() in irq-mips-gic.c
         - Drop gic_(re)set_mask() functions in irq-mips-gic.c
         - Remove gic_set_polarity(), gic_set_trigger(), gic_set_dual_edge(),
           gic_map_to_pin() and gic_map_to_vpe() from irq-mips-gic.c.
         - Convert remaining shared reg access, local int mask access and
           remaining local reg access to new accessors
         - Move GIC_LOCAL_INT_* to asm/mips-gic.h
         - Remove GIC_CPU_INT* macros from irq-mips-gic.c
         - Move various definitions to the driver
         - Remove gic_get_usm_range()
         - Remove __gic_irq_dispatch() forward declaration
         - Remove gic_init()
         - Use mips_gic_present() in place of gic_present and remove
           gic_present
         - Move gic_get_c0_*_int() to asm/mips-gic.h
         - Remove linux/irqchip/mips-gic.h
         - Inline __gic_init()
         - Inline gic_basic_init()
         - Make pcpu_masks a per-cpu variable
         - Use pcpu_masks to avoid reading GIC_SH_MASK*
         - Clean up mti, reserved-cpu-vectors handling
         - Use cpumask_first_and() in gic_set_affinity()
         - Let the core set struct irq_common_data affinity
      
        microMIPS:
         - Fix microMIPS stack unwinding on big endian systems
      
        MIPS-GIC:
         - SYNC after enabling GIC region
      
        NUMA:
         - Remove the unused parent_node() macro
      
        R6:
         - Constify r2_decoder_tables
         - Add accessor & bit definitions for GlobalNumber
      
        SMP:
         - Constify smp ops
         - Allow boot_secondary SMP op to return errors
      
        VDSO:
         - Drop gic_get_usm_range() usage
         - Avoid use of linux/irqchip/mips-gic.h
      
        Platform changes:
      
        Alchemy:
         - Add devboard machine type to cpuinfo
         - update cpu feature overrides
         - Threaded carddetect irqs for devboards
      
        AR7:
         - allow NULL clock for clk_get_rate
      
        BCM63xx:
         - Fix ENETDMA_6345_MAXBURST_REG offset
         - Allow NULL clock for clk_get_rate
      
        CI20:
         - Enable GPIO and RTC drivers in defconfig
         - Add ethernet and fixed-regulator nodes to DTS
      
        Generic platform:
         - Move Boston and NI 169445 FIT image source to their own files
         - Include asm/bootinfo.h for plat_fdt_relocated()
         - Include asm/time.h for get_c0_*_int()
         - Include asm/bootinfo.h for plat_fdt_relocated()
         - Include asm/time.h for get_c0_*_int()
         - Allow filtering enabled boards by requirements
         - Don't explicitly disable CONFIG_USB_SUPPORT
         - Bump default NR_CPUS to 16
      
        JZ4700:
         - Probe the jz4740-rtc driver from devicetree
      
        Lantiq:
         - Drop check of boot select from the spi-falcon driver.
         - Drop check of boot select from the lantiq-flash MTD driver.
         - Access boot cause register in the watchdog driver through regmap
         - Add device tree binding documentation for the watchdog driver
         - Add docs for the RCU DT bindings.
         - Convert the fpi bus driver to a platform_driver
         - Remove ltq_reset_cause() and ltq_boot_select(
         - Switch to a proper reset driver
         - Switch to a new drivers/soc GPHY driver
         - Add an USB PHY driver for the Lantiq SoCs using the RCU module
         - Use of_platform_default_populate instead of __dt_register_buses
         - Enable MFD_SYSCON to be able to use it for the RCU MFD
         - Replace ltq_boot_select() with dummy implementation.
      
        Loongson 2F:
         - Allow NULL clock for clk_get_rate
      
        Malta:
         - Use new GIC accessor functions
      
        NI 169445:
         - Add support for NI 169445 board.
         - Only include in 32r2el kernels
      
        Octeon:
         - Add support for watchdog of 78XX SOCs.
         - Add support for watchdog of CN68XX SOCs.
         - Expose support for mips32r1, mips32r2 and mips64r1
         - Enable more drivers in config file
         - Add support for accessing the boot vector.
         - Remove old boot vector code from watchdog driver
         - Define watchdog registers for 70xx, 73xx, 78xx, F75xx.
         - Make CSR functions node aware.
         - Allow access to CIU3 IRQ domains.
         - Misc cleanups in the watchdog driver
      
        Omega2+:
         - New board, add support and defconfig
      
        Pistachio:
         - Enable Root FS on NFS in defconfig
      
        Ralink:
         - Add Mediatek MT7628A SoC
         - Allow NULL clock for clk_get_rate
         - Explicitly request exclusive reset control in the pci-mt7620 PCI driver.
      
        SEAD3:
         - Only include in 32 bit kernels by default
      
        VoCore:
         - Add VoCore as a vendor t0 dt-bindings
         - Add defconfig file"
      
      * '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (167 commits)
        MIPS: Refactor handling of stack pointer in get_frame_info
        MIPS: Stacktrace: Fix microMIPS stack unwinding on big endian systems
        MIPS: microMIPS: Fix decoding of swsp16 instruction
        MIPS: microMIPS: Fix decoding of addiusp instruction
        MIPS: microMIPS: Fix detection of addiusp instruction
        MIPS: Handle non word sized instructions when examining frame
        MIPS: ralink: allow NULL clock for clk_get_rate
        MIPS: Loongson 2F: allow NULL clock for clk_get_rate
        MIPS: BCM63XX: allow NULL clock for clk_get_rate
        MIPS: AR7: allow NULL clock for clk_get_rate
        MIPS: BCM63XX: fix ENETDMA_6345_MAXBURST_REG offset
        mips: Save all registers when saving the frame
        MIPS: Add DWARF unwinding to assembly
        MIPS: Make SAVE_SOME more standard
        MIPS: Fix issues in backtraces
        MIPS: jz4780: DTS: Probe the jz4740-rtc driver from devicetree
        MIPS: Ci20: Enable RTC driver
        watchdog: octeon-wdt: Add support for 78XX SOCs.
        watchdog: octeon-wdt: Add support for cn68XX SOCs.
        watchdog: octeon-wdt: File cleaning.
        ...
      73184130
    • L
      Merge tag 'pci-v4.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 8d93c7a4
      Linus Torvalds 提交于
      Pull PCI fix from Bjorn Helgaas:
       "Revert an attempt to fix a race while enabling upstream bridges
        because it broke iwlwifi firmware loading"
      
      * tag 'pci-v4.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        Revert "PCI: Avoid race while enabling upstream bridges"
      8d93c7a4
    • L
      Merge tag 'drm-fixes-for-v4.14-rc1' of git://people.freedesktop.org/~airlied/linux · 02cfe977
      Linus Torvalds 提交于
      Pull drm AMD fixes from Dave Airlie:
       "Just had a single AMD fixes pull from Alex for rc1"
      
      * tag 'drm-fixes-for-v4.14-rc1' of git://people.freedesktop.org/~airlied/linux:
        drm/amdgpu: revert "fix deadlock of reservation between cs and gpu reset v2"
        drm/amdgpu: remove duplicate return statement
        drm/amdgpu: check memory allocation failure
        drm/amd/amdgpu: fix BANK_SELECT on Vega10 (v2)
        drm/amdgpu: inline amdgpu_ttm_do_bind again
        drm/amdgpu: fix amdgpu_ttm_bind
        drm/amdgpu: remove the GART copy hack
        drm/ttm:fix wrong decoding of bo_count
        drm/ttm: fix missing inc bo_count
        drm/amdgpu: set sched_hw_submission higher for KIQ (v3)
        drm/amdgpu: move default gart size setting into gmc modules
        drm/amdgpu: refine default gart size
        drm/amd/powerplay: ACG frequency added in PPTable
        drm/amdgpu: discard commands of killed processes
        drm/amdgpu: fix and cleanup shadow handling
        drm/amdgpu: add automatic per asic settings for gart_size
        drm/amdgpu/gfx8: fix spelling typo in mqd allocation
        drm/amd/powerplay: unhalt mec after loading
        drm/amdgpu/virtual_dce: Virtual display doesn't support disable vblank immediately
        drm/amdgpu: Fix huge page updates with CPU
      02cfe977