1. 20 6月, 2016 6 次提交
  2. 19 6月, 2016 3 次提交
    • N
      i2c: qup: use address helper function in read transfer · 0130944b
      Naveen Kaje 提交于
      qup_i2c_issue_read() derives the address from i2c_msg.
      This called in the read path when I2C_M_RD flag is set.
      Therefore, use the 8 bit address helper function.
      Signed-off-by: NNaveen Kaje <nkaje@codeaurora.org>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      0130944b
    • S
      i2c: qup: Fix error handling · fbf9921f
      Sricharan R 提交于
      Among the bus errors reported from the QUP_MASTER_STATUS register
      only NACK is considered and transfer gets suspended, while
      other errors are ignored. Correct this and suspend the transfer
      for other errors as well. This avoids unnecessary 'timeouts' which
      happens when waiting for events that would never happen when there
      is already an error condition on the bus. Also the error handling
      procedure should be the same for both NACK and other bus errors in
      case of dma mode. So correct that as well.
      Signed-off-by: NSricharan R <sricharan@codeaurora.org>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      fbf9921f
    • S
      i2c: qup: Fix broken dma when CONFIG_DEBUG_SG is enabled · 685983f4
      Sricharan R 提交于
      With CONFIG_DEBUG_SG is enabled and when dma mode is used, below dump is seen,
      
      ------------[ cut here ]------------
      kernel BUG at include/linux/scatterlist.h:140!
      Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
      Modules linked in:
      CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.4.0-00459-g9f087b9-dirty #7
      Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT)
      task: ffffffc036868000 ti: ffffffc036870000 task.ti: ffffffc036870000
      PC is at qup_sg_set_buf.isra.13+0x138/0x154
      LR is at qup_sg_set_buf.isra.13+0x50/0x154
      pc : [<ffffffc0005a0ed8>] lr : [<ffffffc0005a0df0>] pstate: 60000145
      sp : ffffffc0368735c0
      x29: ffffffc0368735c0 x28: ffffffc036873752
      x27: ffffffc035233018 x26: ffffffc000c4e000
      x25: 0000000000000000 x24: 0000000000000004
      x23: 0000000000000000 x22: ffffffc035233668
      x21: ffffff80004e3000 x20: ffffffc0352e0018
      x19: 0000004000000000 x18: 0000000000000028
      x17: 0000000000000004 x16: ffffffc0017a39c8
      x15: 0000000000001cdf x14: ffffffc0019929d8
      x13: ffffffc0352e0018 x12: 0000000000000000
      x11: 0000000000000001 x10: 0000000000000001
      x9 : ffffffc0012b2d70 x8 : ffffff80004e3000
      x7 : 0000000000000018 x6 : 0000000030000000
      x5 : ffffffc00199f018 x4 : ffffffc035233018
      x3 : 0000000000000004 x2 : 00000000c0000000
      x1 : 0000000000000003 x0 : 0000000000000000
      
      Process swapper/0 (pid: 1, stack limit = 0xffffffc036870020)
      Stack: (0xffffffc0368735c0 to 0xffffffc036874000)
      
      sg_set_bug expects that the buf parameter passed in should be from
      lowmem and a valid pageframe. This is not true for pages from
      dma_alloc_coherent which can be carveouts, hence the check fails.
      Change allocation of sg buffers from dma_coherent memory to kzalloc
      to fix the issue. Note that now dma_map/unmap is used to make the
      kzalloc'ed buffers coherent before passing it to the dmaengine.
      Signed-off-by: NSricharan R <sricharan@codeaurora.org>
      Reviewed-by: NAndy Gross <andy.gross@linaro.org>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      685983f4
  3. 17 6月, 2016 10 次提交
  4. 14 6月, 2016 4 次提交
  5. 12 6月, 2016 8 次提交
    • L
      Linux 4.7-rc3 · 5edb5649
      Linus Torvalds 提交于
      5edb5649
    • L
      Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 57120fac
      Linus Torvalds 提交于
      Pull thermal management fixes from Zhang Rui:
      
       - fix an ordering issue in cpu cooling that cooling device is
         registered before it's ready (freq_table being populated).
         (Lukasz Luba)
      
       - fix a missing comment update (Caesar Wang)
      
      * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: add the note for set_trip_temp
        thermal: cpu_cooling: fix improper order during initialization
      57120fac
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 8714f8f5
      Linus Torvalds 提交于
      Pull block layer fixes from Jens Axboe:
       "A small collection of fixes for the current series.  This contains:
      
         - Two fixes for xen-blkfront, from Bob Liu.
      
         - A bug fix for NVMe, releasing only the specific resources we
           requested.
      
         - Fix for a debugfs flags entry for nbd, from Josef.
      
         - Plug fix from Omar, fixing up a case of code being switched between
           two functions.
      
         - A missing bio_put() for the new discard callers of
           submit_bio_wait(), fixing a regression causing a leak of the bio.
           From Shaun.
      
         - Improve dirty limit calculation precision in the writeback code,
           fixing a case where setting a limit lower than 1% of memory would
           end up being zero.  From Tejun"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        NVMe: Only release requested regions
        xen-blkfront: fix resume issues after a migration
        xen-blkfront: don't call talk_to_blkback when already connected to blkback
        nbd: pass the nbd pointer for flags debugfs
        block: missing bio_put following submit_bio_wait
        blk-mq: really fix plug list flushing for nomerge queues
        writeback: use higher precision calculation in domain_dirty_limits()
      8714f8f5
    • L
      Merge tag 'gpio-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 3a7c114d
      Linus Torvalds 提交于
      Pull GPIO fixes from Linus Walleij:
       "A new bunch of GPIO fixes for v4.7.
      
        This time I am very grateful that Ricardo Ribalda Delgado went in and
        fixed my stupid refcounting mistakes in the removal path for GPIO
        chips.  I had a feeling something was wrong here and so it was.  It
        exploded on OMAP and it fixes their problem.  Now it should be (more)
        solid.
      
        The rest i compilation, Kconfig and driver fixes.  Some tagged for
        stable.
      
        Summary:
      
         - Fix a NULL pointer dereference when we are searching the GPIO
           device list but one of the devices have been removed (struct
           gpio_chip pointer is NULL).
      
         - Fix unaligned reference counters: we were ending on +3 after all
           said and done.  It should be 0.  Remove an extraneous get_device(),
           and call cdev_del() followed by device_del() in gpiochip_remove()
           instead and the count goes to zero and calls the release() function
           properly.
      
         - Fix a compile warning due to a missing #include in the OF/device
           tree portions.
      
         - Select ANON_INODES for GPIOLIB, we're using that for our character
           device.  Some randconfig tests disclosed the problem.
      
         - Make sure the Zynq driver clock runs also without CONFIG_PM enabled
      
         - Fix an off-by-one error in the 104-DIO-48E driver
      
         - Fix warnings in bcm_kona_gpio_reset()"
      
      * tag 'gpio-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: bcm-kona: fix bcm_kona_gpio_reset() warnings
        gpio: select ANON_INODES
        gpio: include <linux/io-mapping.h> in gpiolib-of
        gpiolib: Fix unaligned used of reference counters
        gpiolib: Fix NULL pointer deference
        gpio: zynq: initialize clock even without CONFIG_PM
        gpio: 104-dio-48e: Fix control port offset computation off-by-one error
      3a7c114d
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 45b00c94
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Two current fixes:
      
         - one affects Qemu CD ROM emulation, which stopped working after the
           updates in SCSI to require VPD pages from all conformant devices.
      
           Fix temporarily by blacklisting Qemu (we can relax later when they
           come into compliance).
      
         - The other is a fix to the optimal transfer size.  We set up a
           minefield for ourselves by being confused about whether the limits
           are in bytes or sectors (SCSI optimal is in blocks and the queue
           parameter is in bytes).
      
           This tries to fix the problem (wrong setting for queue limits
           max_sectors) and make the problem more obvious by introducing a
           wrapper function"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        sd: Fix rw_max for devices that report an optimal xfer size
        scsi: Add QEMU CD-ROM to VPD Inquiry Blacklist
      45b00c94
    • L
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 5d1f7023
      Linus Torvalds 提交于
      Pull i2c fixes from Wolfram Sang:
      
       - a bigger fix for i801 to finally be able to be loaded on some
         machines again
      
       - smaller driver fixes
      
       - documentation update because of a renamed file
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: mux: reg: Provide of_match_table
        i2c: mux: refer to i2c-mux.txt
        i2c: octeon: Avoid printk after too long SMBUS message
        i2c: octeon: Missing AAK flag in case of I2C_M_RECV_LEN
        i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR
      5d1f7023
    • L
      Merge tag 'devicetree-fixes-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 90735c99
      Linus Torvalds 提交于
      Pull DeviceTree fixes from Rob Herring:
      
       - fix unflatten_dt_nodes when dad parameter is set.
      
       - add vendor prefixes for TechNexion and UniWest
      
       - documentation fix for Marvell BT
      
       - OF IRQ kerneldoc fixes
      
       - restrict CMA alignment adjustments to non dma-coherent
      
       - a couple of warning fixes in reserved-memory code
      
       - DT maintainers updates
      
      * tag 'devicetree-fixes-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch
        drivers/of: Fix depth for sub-tree blob in unflatten_dt_nodes()
        drivers: of: Fix of_pci.h header guard
        dt-bindings: Add vendor prefix for TechNexion
        of: add vendor prefix for UniWest
        dt: bindings: fix documentation for MARVELL's bt-sd8xxx wireless device
        of: add missing const for of_parse_phandle_with_args() in !CONFIG_OF
        of: silence warnings due to max() usage
        drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent
        of: irq: fix of_irq_get[_byname]() kernel-doc
        MAINTAINERS: DeviceTree maintainer updates
      90735c99
    • L
      Merge tag '20160610_uvc_compat_for_linus' of... · f1c32afd
      Linus Torvalds 提交于
      Merge tag '20160610_uvc_compat_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux
      
      Pull uvc compat XU ioctl fixes from Andy Lutomirski:
       "uvc's compat XU ioctls go through tons of potentially buggy
        indirection.  The first patch removes the indirection.  The second one
        cleans up the code.
      
        Compile-tested only.  I have the hardware, but I have absolutely no
        idea what XU does, how to use it, what software to recompile as
        32-bit, or what to test in that software"
      
      * tag '20160610_uvc_compat_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux:
        uvc_v4l2: Simplify compat ioctl implementation
        uvc: Forward compat ioctls to their handlers directly
      f1c32afd
  6. 11 6月, 2016 9 次提交
    • A
      uvc_v4l2: Simplify compat ioctl implementation · f89dec72
      Andy Lutomirski 提交于
      The uvc compat ioctl implementation seems to have copied user data
      for no good reason.  Remove a bunch of copies.
      Signed-off-by: NAndy Lutomirski <luto@kernel.org>
      f89dec72
    • A
      uvc: Forward compat ioctls to their handlers directly · a44323e2
      Andy Lutomirski 提交于
      The current code goes through a lot of indirection just to call a
      known handler.  Simplify it: just call the handlers directly.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NAndy Lutomirski <luto@kernel.org>
      a44323e2
    • L
      Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 3d0f0b6a
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "Has some fixes and some new self tests for btrfs.  The self tests are
        usually disabled in the .config file (unless you're doing btrfs dev
        work), and this bunch is meant to find problems with the 64K page size
        patches.
      
        Jeff has a patch to help people see if they are using the hardware
        assist crc32c module, which really helps us nail down problems when
        people ask why crcs are using so much CPU.
      
        Otherwise, it's small fixes"
      
      * 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: self-tests: Fix extent buffer bitmap test fail on BE system
        Btrfs: self-tests: Fix test_bitmaps fail on 64k sectorsize
        Btrfs: self-tests: Use macros instead of constants and add missing newline
        Btrfs: self-tests: Support testing all possible sectorsizes and nodesizes
        Btrfs: self-tests: Execute page straddling test only when nodesize < PAGE_SIZE
        btrfs: advertise which crc32c implementation is being used at module load
        Btrfs: add validadtion checks for chunk loading
        Btrfs: add more validation checks for superblock
        Btrfs: clear uptodate flags of pages in sys_array eb
        Btrfs: self-tests: Support non-4k page size
        Btrfs: Fix integer overflow when calculating bytes_per_bitmap
        Btrfs: test_check_exists: Fix infinite loop when searching for free space entries
        Btrfs: end transaction if we abort when creating uuid root
        btrfs: Use __u64 in exported linux/btrfs.h.
      3d0f0b6a
    • L
      Merge tag 'powerpc-4.7-3Michael Ellerman:' of... · ccf55f73
      Linus Torvalds 提交于
      Merge tag 'powerpc-4.7-3Michael Ellerman:' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
      
      Pull powerpc fixes from
       - ptrace: Fix out of bounds array access warning from Khem Raj
       - pseries: Fix PCI config address for DDW from Gavin Shan
       - pseries: Fix IBM_ARCH_VEC_NRCORES_OFFSET since POWER8NVL was added
         from Michael Ellerman
       - of: fix autoloading due to broken modalias with no 'compatible' from
         Wolfram Sang
       - radix: Fix always false comparison against MMU_NO_CONTEXT from Aneesh
         Kumar K.V
       - hash: Compute the segment size correctly for ISA 3.0 from Aneesh
         Kumar K.V
       - nohash: Fix build break with 64K pages from Michael Ellerman
      
      * tag 'powerpc-4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/nohash: Fix build break with 64K pages
        powerpc/mm/hash: Compute the segment size correctly for ISA 3.0
        powerpc/mm/radix: Fix always false comparison against MMU_NO_CONTEXT
        of: fix autoloading due to broken modalias with no 'compatible'
        powerpc/pseries: Fix IBM_ARCH_VEC_NRCORES_OFFSET since POWER8NVL was added
        powerpc/pseries: Fix PCI config address for DDW
        powerpc/ptrace: Fix out of bounds array access warning
      ccf55f73
    • L
      Merge tag 'hwmon-for-linus-v4.7-rc3' of... · c8f17d60
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
      
       - fix regression in fam15h_power driver
      
       - minor variable type fix in lm90 driver
      
       - document compatible statement for ina2xx driver
      
      * tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (lm90) use proper type for update_interval
        hwmon: (ina2xx) Document compatible for INA231
        hwmon: (fam15h_power) Disable preemption when reading registers
      c8f17d60
    • L
      Merge branch 'stacking-fixes' (vfs stacking fixes from Jann) · f5364c15
      Linus Torvalds 提交于
      Merge filesystem stacking fixes from Jann Horn.
      
      * emailed patches from Jann Horn <jannh@google.com>:
        sched: panic on corrupted stack end
        ecryptfs: forbid opening files without mmap handler
        proc: prevent stacking filesystems on top
      f5364c15
    • J
      sched: panic on corrupted stack end · 29d64551
      Jann Horn 提交于
      Until now, hitting this BUG_ON caused a recursive oops (because oops
      handling involves do_exit(), which calls into the scheduler, which in
      turn raises an oops), which caused stuff below the stack to be
      overwritten until a panic happened (e.g.  via an oops in interrupt
      context, caused by the overwritten CPU index in the thread_info).
      
      Just panic directly.
      Signed-off-by: NJann Horn <jannh@google.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      29d64551
    • J
      ecryptfs: forbid opening files without mmap handler · 2f36db71
      Jann Horn 提交于
      This prevents users from triggering a stack overflow through a recursive
      invocation of pagefault handling that involves mapping procfs files into
      virtual memory.
      Signed-off-by: NJann Horn <jannh@google.com>
      Acked-by: NTyler Hicks <tyhicks@canonical.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2f36db71
    • J
      proc: prevent stacking filesystems on top · e54ad7f1
      Jann Horn 提交于
      This prevents stacking filesystems (ecryptfs and overlayfs) from using
      procfs as lower filesystem.  There is too much magic going on inside
      procfs, and there is no good reason to stack stuff on top of procfs.
      
      (For example, procfs does access checks in VFS open handlers, and
      ecryptfs by design calls open handlers from a kernel thread that doesn't
      drop privileges or so.)
      Signed-off-by: NJann Horn <jannh@google.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e54ad7f1