1. 18 12月, 2019 9 次提交
  2. 16 12月, 2019 2 次提交
  3. 14 12月, 2019 12 次提交
    • L
      Merge tag 'nios2-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 · e31736d9
      Linus Torvalds 提交于
      Pull nios2 fix from Ley Foon Tan:
       "Fix nios2 ioremap regression"
      
      * tag 'nios2-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
        nios2: Fix ioremap
      e31736d9
    • L
      Merge tag 'devicetree-fixes-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 1482e664
      Linus Torvalds 提交于
      Pull Devicetree fixes from Rob Herring:
      
       - Fix for dependency tracking caused by unittest interaction
      
       - Fix some schema errors in Tegra memory controller schema
      
       - Update Maxime Ripard's email address
      
       - Review fixes to TI cpsw-switch
      
       - Add wakeup-source prop for STM32 rproc. Got dropped in the schema
         conversion.
      
      * tag 'devicetree-fixes-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        of/platform: Unconditionally pause/resume sync state during kernel init
        dt-bindings: memory-controllers: tegra: Fix type references
        dt-bindings: Change maintainer address
        dt-bindings: net: ti: cpsw-switch: update to fix comments
        dt-bindings: remoteproc: stm32: add wakeup-source property
      1482e664
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · dd79b536
      Linus Torvalds 提交于
      Pull virtio fixes from Michael Tsirkin:
       "Some fixes and cleanup patches"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_balloon: divide/multiply instead of shifts
        virtio_balloon: name cleanups
        virtio-balloon: fix managed page counts when migrating pages between zones
      dd79b536
    • L
      Merge tag 'pci-v5.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 1d76c079
      Linus Torvalds 提交于
      Pull PCI fix from Bjorn Helgaas:
       "Fix rockchip outbound ATU issue that prevented Google Kevin
        Chromebooks from booting (Enric Balletbo i Serra)"
      
      * tag 'pci-v5.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: rockchip: Fix IO outbound ATU register number
      1d76c079
    • L
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 3b2ee614
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
      
       - removal of an old API where all in-kernel users have been converted
         as of this merge window.
      
       - a kdoc fix
      
       - a new helper that will make dependencies for the next API conversion
         a tad easier
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: add helper to check if a client has a driver attached
        i2c: fix header file kernel-doc warning
        i2c: remove i2c_new_dummy() API
      3b2ee614
    • L
      Merge tag 'pm-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 6bd2c87a
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These add PM QoS support to devfreq and fix a few issues in that
        subsystem, fix two cpuidle issues and do one minor cleanup in there,
        and address an ACPI power management problem related to devices with
        special power management requirements, like fans.
      
        Specifics:
      
         - Add PM QoS support, based on the frequency QoS introduced during
           the 5.4 cycle, to devfreq (Leonard Crestez).
      
         - Fix some assorted devfreq issues (Leonard Crestez).
      
         - Fix an unintentional cpuidle behavior change (introduced during the
           5.4 cycle) related to the active polling time limit (Marcelo
           Tosatti).
      
         - Fix a recently introduced cpuidle helper function and do a minor
           cleanup in the cpuidle core (Rafael Wysocki).
      
         - Avoid adding devices with special power management requirements,
           like fans, to the generic ACPI PM domain (Rafael Wysocki)"
      
      * tag 'pm-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: Drop unnecessary type cast in cpuidle_poll_time()
        cpuidle: Fix cpuidle_driver_state_disabled()
        ACPI: PM: Avoid attaching ACPI PM domain to certain devices
        cpuidle: use first valid target residency as poll time
        PM / devfreq: Use PM QoS for sysfs min/max_freq
        PM / devfreq: Add PM QoS support
        PM / devfreq: Don't fail devfreq_dev_release if not in list
        PM / devfreq: Introduce get_freq_range helper
        PM / devfreq: Set scaling_max_freq to max on OPP notifier error
        PM / devfreq: Fix devfreq_notifier_call returning errno
      6bd2c87a
    • L
      Merge tag 'sound-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b61c5622
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "A small collection of fixes.
      
        The main changes are fixes for a couple of regressions in AMD HD-audio
        and FireWire that were introduced in 5.5-rc1. The rest are small fixes
        for echoaudio and FireWire, as well as a usual Dell HD-audio fixup"
      
      * tag 'sound-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda/realtek - Line-out jack doesn't work on a Dell AIO
        ALSA: hda/hdmi - Fix duplicate unref of pci_dev
        ALSA: fireface: fix return value in error path of isochronous resources reservation
        ALSA: oxfw: fix return value in error path of isochronous resources reservation
        ALSA: firewire-motu: fix double unlocked 'motu->mutex'
        ALSA: echoaudio: simplify get_audio_levels
      b61c5622
    • L
      Merge tag 'drm-fixes-2019-12-13' of git://anongit.freedesktop.org/drm/drm · b2cb931d
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Usual round of rc2 fixes.
      
        i915 and amdgpu leading the charge, but a few others in here,
        including some nouveau fixes, all seems pretty for rc2, but hey it's a
        Fri 13th pull so I'm sure it'll cause untold bad fortune.
      
        dma-buf:
         - memory leak fix
         - expand MAINTAINERS scope
      
        core:
         - fix mode matching for drivers not using picture_aspect_ratio
      
        nouveau:
         - panel scaling fix
         - MST BPC fix
         - atomic fixes
      
        i915:
         - GPU hang on idle transition
         - GLK+ FBC corruption fix
         - non-priv OA access on Tigerlake
         - HDCP state fix
         - CI found race fixes
      
        amdgpu:
         - renoir DC fixes
         - GFX8 fence flush alignment with userspace
         - Arcturus power profile fix
         - DC aux + i2c over aux fixes
         - GPUVM invalidation semaphore fixes
         - gfx10 golden registers update
      
        mgag200:
         - expand startadd fix
      
        panfrost:
         - devfreq fix
         - memory fixes
      
        mcde:
         - DSI pointer deref fix"
      
      * tag 'drm-fixes-2019-12-13' of git://anongit.freedesktop.org/drm/drm: (51 commits)
        drm/amdgpu: add invalidate semaphore limit for SRIOV in gmc10
        drm/amdgpu: add invalidate semaphore limit for SRIOV and picasso in gmc9
        drm/amdgpu: avoid using invalidate semaphore for picasso
        Revert "drm/amdgpu: dont schedule jobs while in reset"
        drm/amdgpu: fix license on Kconfig and Makefiles
        drm/amdgpu/gfx10: update gfx golden settings for navi14
        drm/amdgpu/gfx10: update gfx golden settings
        drm/amdgpu/gfx10: update gfx golden settings for navi14
        drm/amdgpu/gfx10: update gfx golden settings
        drm/i915: Serialise with remote retirement
        drm/amd/display: include linux/slab.h where needed
        drm/amd/display: fix undefined struct member reference
        drm/nouveau/kms/nv50-: fix panel scaling
        drm/nouveau/kms/nv50-: Limit MST BPC to 8
        drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom
        drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN
        drm/nouveau: Fix drm-core using atomic code-paths on pre-nv50 hardware
        drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit
        drm/i915/gt: Detect if we miss WaIdleLiteRestore
        drm/i915/hdcp: Nuke intel_hdcp_transcoder_config()
        ...
      b2cb931d
    • L
      Merge tag 'for-linus-20191212' of git://git.kernel.dk/linux-block · f1fcd778
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
      
       - stable fix for the bi_size overflow. Not a corruption issue, but a
         case wher we could merge but disallowed (Andreas)
      
       - NVMe pull request via Keith, with various fixes.
      
       - MD pull request from Song.
      
       - Merge window regression fix for the rq passthrough stats (Logan)
      
       - Remove unused blkcg_drain_queue() function (Guoqing)
      
      * tag 'for-linus-20191212' of git://git.kernel.dk/linux-block:
        blk-cgroup: remove blkcg_drain_queue
        block: fix NULL pointer dereference in account statistics with IDE
        md: make sure desc_nr less than MD_SB_DISKS
        md: raid1: check rdev before reference in raid1_sync_request func
        raid5: need to set STRIPE_HANDLE for batch head
        block: fix "check bi_size overflow before merge"
        nvme/pci: Fix read queue count
        nvme/pci Limit write queue sizes to possible cpus
        nvme/pci: Fix write and poll queue types
        nvme/pci: Remove last_cq_head
        nvme: Namepace identification descriptor list is optional
        nvme-fc: fix double-free scenarios on hw queues
        nvme: else following return is not needed
        nvme: add error message on mismatching controller ids
        nvme_fc: add module to ops template to allow module references
        nvmet-loop: Avoid preallocating big SGL for data
        nvme-fc: Avoid preallocating big SGL for data
        nvme-rdma: Avoid preallocating big SGL for data
      f1fcd778
    • L
      Merge tag 'io_uring-5.5-20191212' of git://git.kernel.dk/linux-block · 5bd831a4
      Linus Torvalds 提交于
      Pull io_uring fixes from Jens Axboe:
      
       - A tweak to IOSQE_IO_LINK (also marked for stable) to allow links that
         don't sever if the result is < 0.
      
         This is mostly for linked timeouts, where if we ask for a pure
         timeout we always get -ETIME. This makes links useless for that case,
         hence allow a case where it works.
      
       - Five minor optimizations to fix and improve cases that regressed
         since v5.4.
      
       - An SQTHREAD locking fix.
      
       - A sendmsg/recvmsg iov assignment fix.
      
       - Net fix where read_iter/write_iter don't honor IOCB_NOWAIT, and
         subsequently ensuring that works for io_uring.
      
       - Fix a case where for an invalid opcode we might return -EBADF instead
         of -EINVAL, if the ->fd of that sqe was set to an invalid fd value.
      
      * tag 'io_uring-5.5-20191212' of git://git.kernel.dk/linux-block:
        io_uring: ensure we return -EINVAL on unknown opcode
        io_uring: add sockets to list of files that support non-blocking issue
        net: make socket read/write_iter() honor IOCB_NOWAIT
        io_uring: only hash regular files for async work execution
        io_uring: run next sqe inline if possible
        io_uring: don't dynamically allocate poll data
        io_uring: deferred send/recvmsg should assign iov
        io_uring: sqthread should grab ctx->uring_lock for submissions
        io-wq: briefly spin for new work after finishing work
        io-wq: remove worker->wait waitqueue
        io_uring: allow unbreakable links
      5bd831a4
    • L
      Merge tag 'for-5.5/dm-fixes' of... · 15da849c
      Linus Torvalds 提交于
      Merge tag 'for-5.5/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper fixes from Mike Snitzer:
      
       - Fix DM multipath by restoring full path selector functionality for
         bio-based configurations that don't haave a SCSI device handler.
      
       - Fix dm-btree removal to ensure non-root btree nodes have at least
         (max_entries / 3) entries. This resolves userspace thin_check
         utility's report of "too few entries in btree_node".
      
       - Fix both the DM thin-provisioning and dm-clone targets to properly
         flush the data device prior to metadata commit. This resolves the
         potential for inconsistency across a power loss event when the data
         device has a volatile writeback cache.
      
       - Small documentation fixes to dm-clone and dm-integrity.
      
      * tag 'for-5.5/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        docs: dm-integrity: remove reference to ARC4
        dm thin: Flush data device before committing metadata
        dm thin metadata: Add support for a pre-commit callback
        dm clone: Flush destination device before committing metadata
        dm clone metadata: Use a two phase commit
        dm clone metadata: Track exact changes per transaction
        dm btree: increase rebalance threshold in __rebalance2()
        dm: add dm-clone to the documentation index
        dm mpath: remove harmful bio-based optimization
      15da849c
    • L
      Merge tag 'sizeof_field-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 22ff311a
      Linus Torvalds 提交于
      Pull FIELD_SIZEOF conversion from Kees Cook:
       "A mostly mechanical treewide conversion from FIELD_SIZEOF() to
        sizeof_field(). This avoids the redundancy of having 2 macros
        (actually 3) doing the same thing, and consolidates on sizeof_field().
        While "field" is not an accurate name, it is the common name used in
        the kernel, and doesn't result in any unintended innuendo.
      
        As there are still users of FIELD_SIZEOF() in -next, I will clean up
        those during this coming development cycle and send the final old
        macro removal patch at that time"
      
      * tag 'sizeof_field-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        treewide: Use sizeof_field() macro
        MIPS: OCTEON: Replace SIZEOF_FIELD() macro
      22ff311a
  4. 13 12月, 2019 13 次提交
  5. 12 12月, 2019 4 次提交
    • L
      block: fix NULL pointer dereference in account statistics with IDE · ecb6186c
      Logan Gunthorpe 提交于
      The IDE driver creates some passthru requests which never get
      submitted to the block layer in such a way that blk_account_io_start()
      gets called. However, the driver still calls __blk_mq_end_request() in
      ide_end_rq() which will call blk_account_io_completion() which tries
      to dereferences req->part which is never set. See ide_prep_sense() for
      an example of where these requests come from.
      
      To fix this, blk_account_io_completion() and blk_account_io_done()
      should do nothing if req->part is not set.
      
      The back trace of this bug is:
      
          BUG: kernel NULL pointer dereference, address: 000002ac
          #PF: supervisor write access in kernel mode
          #PF: error_code(0x0002) - not-present page
          *pde = 00000000
          Oops: 0002 [#1]
          CPU: 0 PID: 237 Comm: kworker/0:1H Not tainted
          5.4.0-rc2-00011-g48d9b0d4 #1
          Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1
          04/01/2014
          Workqueue: kblockd drive_rq_insert_work
          EIP: blk_account_io_completion+0x7a/0xf0
          Code: 89 54 24 08 31 d2 89 4c 24 04 31 c9 c7 04 24 02 00 00 00 c1 ee
          09 e8 f5 21 a6 ff e8 70 5c a7 ff 8b 53 60 8d 04 bd 00 00 00 00 <01> b4
          02 ac 02 00 00 8b 9a 88 02 00 00 85 db 74 11 85 d2 74 51 8b
          EAX: 00000000 EBX: f5b80000 ECX: 00000000 EDX: 00000000
          ESI: 00000000 EDI: 00000000 EBP: f3031e70 ESP: f3031e54
          DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068 EFLAGS: 00010046
          CR0: 80050033 CR2: 000002ac CR3: 03c25000 CR4: 000406d0
          Call Trace:
           <IRQ>
            blk_update_request+0x85/0x420
            ide_end_rq+0x38/0xa0
            ide_complete_rq+0x3d/0x70
            cdrom_newpc_intr+0x258/0xba0
            ide_intr+0x135/0x250
            __handle_irq_event_percpu+0x3e/0x250
            handle_irq_event_percpu+0x1f/0x50
            handle_irq_event+0x32/0x60
            handle_level_irq+0x6c/0x110
            handle_irq+0x72/0xa0
            </IRQ>
            do_IRQ+0x45/0xad
            common_interrupt+0x115/0x11c
      
      Fixes: 48d9b0d4 ("block: account statistics for passthrough requests")
      Reported-by: Nkernel test robot <rong.a.chen@intel.com>
      Signed-off-by: NLogan Gunthorpe <logang@deltatee.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      ecb6186c
    • C
      drm/amdgpu: avoid using invalidate semaphore for picasso · 413fc385
      changzhu 提交于
      It may cause timeout waiting for sem acquire in VM flush when using
      invalidate semaphore for picasso. So it needs to avoid using invalidate
      semaphore for piasso.
      Signed-off-by: Nchangzhu <Changfeng.Zhu@amd.com>
      Reviewed-by: NHuang Rui <ray.huang@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      413fc385
    • A
      Revert "drm/amdgpu: dont schedule jobs while in reset" · a680aea0
      Alex Deucher 提交于
      This reverts commit f2efc6e6.
      
      This was fixed properly for 5.5, but came back via 5.4 merge
      into drm-next, so revert it again.
      Reviewed-by: NChristian König <christian.koenig@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      a680aea0
    • G
      nios2: Fix ioremap · e32ea127
      Guenter Roeck 提交于
      Commit 5ace77e0 ("nios2: remove __ioremap") removed the following code,
      with the argument that cacheflag is always 0 and the expression would
      therefore always be false.
      
      	if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&
      	    IS_MAPPABLE_UNCACHEABLE(last_addr) &&
      	    !(cacheflag & _PAGE_CACHED))
      		return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);
      
      This did not take the "!" in the expression into account. Result is that
      nios2 images no longer boot. Restoring the removed code fixes the problem.
      
      Fixes: 5ace77e0 ("nios2: remove __ioremap")
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NLey Foon Tan <ley.foon.tan@intel.com>
      e32ea127