1. 11 Jul, 2018 1 commit
  2. 10 Jul, 2018 1 commit
    • Yoshihiro Shimoda's avatar
      dmaengine: sh: rcar-dmac: avoid to write CHCR.TE to 1 if TCR is set to 0 · 538603c6
      Yoshihiro Shimoda authored
      This patch fixes an issue that unexpected retransfering happens
      if TCR is set to 0 before rcar_dmac_sync_tcr() writes DE bit to
      the CHCR register. For example, sh-sci driver can reproduce this
      issue like below:
      
       In rx_timer_fn():		/* CHCR DE bit may be set to 1 */
        dmaengine_tx_status()
         rcar_dmac_tx_status()
          rcar_dmac_chan_get_residue()
           rcar_dmac_sync_tcr()	/* TCR is possible to be set to 0 */
      
      According to the description of commit 73a47bd0 ("dmaengine:
      rcar-dmac: use TCRB instead of TCR for residue"), "this buffered data
      will be transferred if CHCR::DE bit was cleared". So, this patch
      doesn't need to check TCRB register.
      
      Fixes: 73a47bd0 ("dmaengine: rcar-dmac: use TCRB instead of TCR for residue")
      Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
      Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
      538603c6
  3. 09 Jul, 2018 2 commits
    • Kuninori Morimoto's avatar
      dmaengine: rcar-dmac: clear channel register when error · e919417b
      Kuninori Morimoto authored
      We need to clear channel register in error case as recovery.
      The channel is already stopped in such case, thus we don't need to call
      rcar_dmac_chan_halt() before clearing.
      
      rcar_dmac_chan_halt() will clear and confirm DE bit.
      But it will be failed because channel is already stopped in error case.
      In other words, we shouldn't call it then.
      Reported-by: default avatarHiroki Negishi <hiroki.negishi.bx@renesas.com>
      Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Reviewed-by: default avatarHiroki Negishi <hiroki.negishi.bx@renesas.com>
      Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
      e919417b
    • Geert Uytterhoeven's avatar
      dmaengine: rcar-dmac: Disable interrupts while stopping channels · 45c9a603
      Geert Uytterhoeven authored
      During system reboot or halt, with lockdep enabled:
      
          ================================
          WARNING: inconsistent lock state
          4.18.0-rc1-salvator-x-00002-g9203dbec #41 Tainted: G        W
          --------------------------------
          inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
          reboot/2779 [HC0[0]:SC0[0]:HE1:SE1] takes:
          0000000098ae4ad3 (&(&rchan->lock)->rlock){?.-.}, at: rcar_dmac_shutdown+0x58/0x6c
          {IN-HARDIRQ-W} state was registered at:
            lock_acquire+0x208/0x238
            _raw_spin_lock+0x40/0x54
            rcar_dmac_isr_channel+0x28/0x200
            __handle_irq_event_percpu+0x1c0/0x3c8
            handle_irq_event_percpu+0x34/0x88
            handle_irq_event+0x48/0x78
            handle_fasteoi_irq+0xc4/0x12c
            generic_handle_irq+0x18/0x2c
            __handle_domain_irq+0xa8/0xac
            gic_handle_irq+0x78/0xbc
            el1_irq+0xec/0x1c0
            arch_cpu_idle+0xe8/0x1bc
            default_idle_call+0x2c/0x30
            do_idle+0x144/0x234
            cpu_startup_entry+0x20/0x24
            rest_init+0x27c/0x290
            start_kernel+0x430/0x45c
          irq event stamp: 12177
          hardirqs last  enabled at (12177): [<ffffff800881d804>] _raw_spin_unlock_irq+0x2c/0x4c
          hardirqs last disabled at (12176): [<ffffff800881d638>] _raw_spin_lock_irq+0x1c/0x60
          softirqs last  enabled at (11948): [<ffffff8008081da8>] __do_softirq+0x160/0x4ec
          softirqs last disabled at (11935): [<ffffff80080ec948>] irq_exit+0xa0/0xfc
      
          other info that might help us debug this:
           Possible unsafe locking scenario:
      
      	   CPU0
      	   ----
            lock(&(&rchan->lock)->rlock);
            <Interrupt>
      	lock(&(&rchan->lock)->rlock);
      
           *** DEADLOCK ***
      
          3 locks held by reboot/2779:
           #0: 00000000bfabfa74 (reboot_mutex){+.+.}, at: sys_reboot+0xdc/0x208
           #1: 00000000c75d8c3a (&dev->mutex){....}, at: device_shutdown+0xc8/0x1c4
           #2: 00000000ebec58ec (&dev->mutex){....}, at: device_shutdown+0xd8/0x1c4
      
          stack backtrace:
          CPU: 6 PID: 2779 Comm: reboot Tainted: G        W         4.18.0-rc1-salvator-x-00002-g9203dbec #41
          Hardware name: Renesas Salvator-X 2nd version board based on r8a7795 ES2.0+ (DT)
          Call trace:
           dump_backtrace+0x0/0x148
           show_stack+0x14/0x1c
           dump_stack+0xb0/0xf0
           print_usage_bug.part.26+0x1c4/0x27c
           mark_lock+0x38c/0x610
           __lock_acquire+0x3fc/0x14d4
           lock_acquire+0x208/0x238
           _raw_spin_lock+0x40/0x54
           rcar_dmac_shutdown+0x58/0x6c
           platform_drv_shutdown+0x20/0x2c
           device_shutdown+0x160/0x1c4
           kernel_restart_prepare+0x34/0x3c
           kernel_restart+0x14/0x5c
           sys_reboot+0x160/0x208
           el0_svc_naked+0x30/0x34
      
      rcar_dmac_stop_all_chan() takes the channel lock while stopping a
      channel, but does not disable interrupts, leading to a deadlock when a
      DMAC interrupt comes in.  Before, the same code block was called from an
      interrupt handler, hence taking the spinlock was sufficient.
      
      Fix this by disabling local interrupts while taking the spinlock.
      
      Fixes: 9203dbec ("dmaengine: rcar-dmac: don't use DMAC error interrupt")
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
      45c9a603
  4. 06 Jul, 2018 1 commit
  5. 28 Jun, 2018 1 commit
  6. 23 Jun, 2018 1 commit
  7. 16 Jun, 2018 8 commits
    • Linus Torvalds's avatar
      Linux 4.18-rc1 · ce397d21
      Linus Torvalds authored
      ce397d21
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20180616' of git://git.kernel.dk/linux-block · 265c5596
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A collection of fixes that should go into -rc1. This contains:
      
         - bsg_open vs bsg_unregister race fix (Anatoliy)
      
         - NVMe pull request from Christoph, with fixes for regressions in
           this window, FC connect/reconnect path code unification, and a
           trace point addition.
      
         - timeout fix (Christoph)
      
         - remove a few unused functions (Christoph)
      
         - blk-mq tag_set reinit fix (Roman)"
      
      * tag 'for-linus-20180616' of git://git.kernel.dk/linux-block:
        bsg: fix race of bsg_open and bsg_unregister
        block: remov blk_queue_invalidate_tags
        nvme-fabrics: fix and refine state checks in __nvmf_check_ready
        nvme-fabrics: handle the admin-only case properly in nvmf_check_ready
        nvme-fabrics: refactor queue ready check
        blk-mq: remove blk_mq_tagset_iter
        nvme: remove nvme_reinit_tagset
        nvme-fc: fix nulling of queue data on reconnect
        nvme-fc: remove reinit_request routine
        blk-mq: don't time out requests again that are in the timeout handler
        nvme-fc: change controllers first connect to use reconnect path
        nvme: don't rely on the changed namespace list log
        nvmet: free smart-log buffer after use
        nvme-rdma: fix error flow during mapping request data
        nvme: add bio remapping tracepoint
        nvme: fix NULL pointer dereference in nvme_init_subsystem
        blk-mq: reinit q->tag_set_list entry only after grace period
      265c5596
    • Linus Torvalds's avatar
      Merge tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental · 5e7b9212
      Linus Torvalds authored
      Pull documentation fixes from Mauro Carvalho Chehab:
       "This solves a series of broken links for files under Documentation,
        and improves a script meant to detect such broken links (see
        scripts/documentation-file-ref-check).
      
        The changes on this series are:
      
         - can.rst: fix a footnote reference;
      
         - crypto_engine.rst: Fix two parsing warnings;
      
         - Fix a lot of broken references to Documentation/*;
      
         - improve the scripts/documentation-file-ref-check script, in order
           to help detecting/fixing broken references, preventing
           false-positives.
      
        After this patch series, only 33 broken references to doc files are
        detected by scripts/documentation-file-ref-check"
      
      * tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental: (26 commits)
        fix a series of Documentation/ broken file name references
        Documentation: rstFlatTable.py: fix a broken reference
        ABI: sysfs-devices-system-cpu: remove a broken reference
        devicetree: fix a series of wrong file references
        devicetree: fix name of pinctrl-bindings.txt
        devicetree: fix some bindings file names
        MAINTAINERS: fix location of DT npcm files
        MAINTAINERS: fix location of some display DT bindings
        kernel-parameters.txt: fix pointers to sound parameters
        bindings: nvmem/zii: Fix location of nvmem.txt
        docs: Fix more broken references
        scripts/documentation-file-ref-check: check tools/*/Documentation
        scripts/documentation-file-ref-check: get rid of false-positives
        scripts/documentation-file-ref-check: hint: dash or underline
        scripts/documentation-file-ref-check: add a fix logic for DT
        scripts/documentation-file-ref-check: accept more wildcards at filenames
        scripts/documentation-file-ref-check: fix help message
        media: max2175: fix location of driver's companion documentation
        media: v4l: fix broken video4linux docs locations
        media: dvb: point to the location of the old README.dvb-usb file
        ...
      5e7b9212
    • Linus Torvalds's avatar
      Merge tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · dbb2816f
      Linus Torvalds authored
      Pull fsnotify updates from Jan Kara:
       "fsnotify cleanups unifying handling of different watch types.
      
        This is the shortened fsnotify series from Amir with the last five
        patches pulled out. Amir has modified those patches to not change
        struct inode but obviously it's too late for those to go into this
        merge window"
      
      * tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: add fsnotify_add_inode_mark() wrappers
        fanotify: generalize fanotify_should_send_event()
        fsnotify: generalize send_to_group()
        fsnotify: generalize iteration of marks by object type
        fsnotify: introduce marks iteration helpers
        fsnotify: remove redundant arguments to handle_event()
        fsnotify: use type id to identify connector object type
      dbb2816f
    • Linus Torvalds's avatar
      Merge tag 'fbdev-v4.18' of git://github.com/bzolnier/linux · 644f2639
      Linus Torvalds authored
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here, few small fixes, some cleanups and
        dead drivers removal:
      
         - mark omapfb drivers as orphans in MAINTAINERS file (Tomi Valkeinen)
      
         - add missing module license tags to omap/omapfb driver (Arnd
           Bergmann)
      
         - add missing GPIOLIB dependendy to omap2/omapfb driver (Arnd
           Bergmann)
      
         - convert savagefb, aty128fb & radeonfb drivers to use msleep & co.
           (Jia-Ju Bai)
      
         - allow COMPILE_TEST build for viafb driver (media part was reviewed
           by media subsystem Maintainer)
      
         - remove unused MERAM support from sh_mobile_lcdcfb and shmob-drm
           drivers (drm parts were acked by shmob-drm driver Maintainer)
      
         - remove unused auo_k190xfb drivers
      
         - misc cleanups (Souptick Joarder, Wolfram Sang, Markus Elfring, Andy
           Shevchenko, Colin Ian King)"
      
      * tag 'fbdev-v4.18' of git://github.com/bzolnier/linux: (26 commits)
        fb_omap2: add gpiolib dependency
        video/omap: add module license tags
        MAINTAINERS: make omapfb orphan
        video: fbdev: pxafb: match_string() conversion fixup
        video: fbdev: nvidia: fix spelling mistake: "scaleing" -> "scaling"
        video: fbdev: fix spelling mistake: "frambuffer" -> "framebuffer"
        video: fbdev: pxafb: Convert to use match_string() helper
        video: fbdev: via: allow COMPILE_TEST build
        video: fbdev: remove unused sh_mobile_meram driver
        drm: shmobile: remove unused MERAM support
        video: fbdev: sh_mobile_lcdcfb: remove unused MERAM support
        video: fbdev: remove unused auo_k190xfb drivers
        video: omap: Improve a size determination in omapfb_do_probe()
        video: sm501fb: Improve a size determination in sm501fb_probe()
        video: fbdev-MMP: Improve a size determination in path_init()
        video: fbdev-MMP: Delete an error message for a failed memory allocation in two functions
        video: auo_k190x: Delete an error message for a failed memory allocation in auok190x_common_probe()
        video: sh_mobile_lcdcfb: Delete an error message for a failed memory allocation in two functions
        video: sh_mobile_meram: Delete an error message for a failed memory allocation in sh_mobile_meram_probe()
        video: fbdev: sh_mobile_meram: Drop SUPERH platform dependency
        ...
      644f2639
    • Linus Torvalds's avatar
      Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 35773c93
      Linus Torvalds authored
      Pull AFS updates from Al Viro:
       "Assorted AFS stuff - ended up in vfs.git since most of that consists
        of David's AFS-related followups to Christoph's procfs series"
      
      * 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        afs: Optimise callback breaking by not repeating volume lookup
        afs: Display manually added cells in dynamic root mount
        afs: Enable IPv6 DNS lookups
        afs: Show all of a server's addresses in /proc/fs/afs/servers
        afs: Handle CONFIG_PROC_FS=n
        proc: Make inline name size calculation automatic
        afs: Implement network namespacing
        afs: Mark afs_net::ws_cell as __rcu and set using rcu functions
        afs: Fix a Sparse warning in xdr_decode_AFSFetchStatus()
        proc: Add a way to make network proc files writable
        afs: Rearrange fs/afs/proc.c to remove remaining predeclarations.
        afs: Rearrange fs/afs/proc.c to move the show routines up
        afs: Rearrange fs/afs/proc.c by moving fops and open functions down
        afs: Move /proc management functions to the end of the file
      35773c93
    • Linus Torvalds's avatar
      Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 29d6849d
      Linus Torvalds authored
      Pull compat updates from Al Viro:
       "Some biarch patches - getting rid of assorted (mis)uses of
        compat_alloc_user_space().
      
        Not much in that area this cycle..."
      
      * 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        orangefs: simplify compat ioctl handling
        signalfd: lift sigmask copyin and size checks to callers of do_signalfd4()
        vmsplice(): lift importing iovec into vmsplice(2) and compat counterpart
      29d6849d
    • Linus Torvalds's avatar
      Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · a5b729ea
      Linus Torvalds authored
      Pull aio fixes from Al Viro:
       "Assorted AIO followups and fixes"
      
      * 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        eventpoll: switch to ->poll_mask
        aio: only return events requested in poll_mask() for IOCB_CMD_POLL
        eventfd: only return events requested in poll_mask()
        aio: mark __aio_sigset::sigmask const
      a5b729ea
  8. 15 Jun, 2018 25 commits