1. 11 Sep, 2021 21 commits
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 78e70952
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
      
       - vduse driver ("vDPA Device in Userspace") supporting emulated virtio
         block devices
      
       - virtio-vsock support for end of record with SEQPACKET
      
       - vdpa: mac and mq support for ifcvf and mlx5
      
       - vdpa: management netlink for ifcvf
      
       - virtio-i2c, gpio dt bindings
      
       - misc fixes and cleanups
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (39 commits)
        Documentation: Add documentation for VDUSE
        vduse: Introduce VDUSE - vDPA Device in Userspace
        vduse: Implement an MMU-based software IOTLB
        vdpa: Support transferring virtual addressing during DMA mapping
        vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap()
        vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()
        vhost-iotlb: Add an opaque pointer for vhost IOTLB
        vhost-vdpa: Handle the failure of vdpa_reset()
        vdpa: Add reset callback in vdpa_config_ops
        vdpa: Fix some coding style issues
        file: Export receive_fd() to modules
        eventfd: Export eventfd_wake_count to modules
        iova: Export alloc_iova_fast() and free_iova_fast()
        virtio-blk: remove unneeded "likely" statements
        virtio-balloon: Use virtio_find_vqs() helper
        vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro
        vsock_test: update message bounds test for MSG_EOR
        af_vsock: rename variables in receive loop
        virtio/vsock: support MSG_EOR bit processing
        vhost/vsock: support MSG_EOR bit processing
        ...
      78e70952
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · b79bd0d5
      Linus Torvalds authored
      Pull more RISC-V updates from Palmer Dabbelt:
      
       - A pair of defconfig additions, for NVMe and the EFI filesystem
         localization options.
      
       - A larger address space for stack randomization.
      
       - A cleanup to our install rules.
      
       - A DTS update for the Microchip Icicle board, to fix the serial
         console.
      
       - Support for build-time table sorting, which allows us to have
         __ex_table read-only.
      
      * tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        riscv: Move EXCEPTION_TABLE to RO_DATA segment
        riscv: Enable BUILDTIME_TABLE_SORT
        riscv: dts: microchip: mpfs-icicle: Fix serial console
        riscv: move the (z)install rules to arch/riscv/Makefile
        riscv: Improve stack randomisation on RV64
        riscv: defconfig: enable NLS_CODEPAGE_437, NLS_ISO8859_1
        riscv: defconfig: enable BLK_DEV_NVME
      b79bd0d5
    • Linus Torvalds's avatar
      Merge branch 'for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux · 4e1c7544
      Linus Torvalds authored
      Pull coccinelle updates from Julia Lawall:
       "These changes update some existing semantic patches with
        respect to some recent changes in the kernel.
      
        Specifically, the change to kvmalloc.cocci searches for
        kfree_sensitive rather than kzfree, and the change to
        use_after_iter.cocci adds list_entry_is_head as a valid
        use of a list iterator index variable after the end of
        the loop"
      
      * 'for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
        scripts: coccinelle: allow list_entry_is_head() to use pos
        coccinelle: api: rename kzfree to kfree_sensitive
      4e1c7544
    • Linus Torvalds's avatar
      Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block · c605c396
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
      
       - Fix an off-by-one in a BUILD_BUG_ON() check. Not a real issue right
         now as we have plenty of flags left, but could become one. (Hao)
      
       - Fix lockdep issue introduced in this merge window (me)
      
       - Fix a few issues with the worker creation (me, Pavel, Qiang)
      
       - Fix regression with wq_has_sleeper() for IOPOLL (Pavel)
      
       - Timeout link error propagation fix (Pavel)
      
      * tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
        io_uring: fix off-by-one in BUILD_BUG_ON check of __REQ_F_LAST_BIT
        io_uring: fail links of cancelled timeouts
        io-wq: fix memory leak in create_io_worker()
        io-wq: fix silly logic error in io_task_work_match()
        io_uring: drop ctx->uring_lock before acquiring sqd->lock
        io_uring: fix missing mb() before waitqueue_active
        io-wq: fix cancellation on create-worker failure
      c605c396
    • Linus Torvalds's avatar
      Merge tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block · c0f7e49f
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
      
       - NVMe pull request from Christoph:
           - fix nvmet command set reporting for passthrough controllers (Adam Manzanares)
           - update a MAINTAINERS email address (Chaitanya Kulkarni)
           - set QUEUE_FLAG_NOWAIT for nvme-multipth (me)
           - handle errors from add_disk() (Luis Chamberlain)
           - update the keep alive interval when kato is modified (Tatsuya Sasaki)
           - fix a buffer overrun in nvmet_subsys_attr_serial (Hannes Reinecke)
           - do not reset transport on data digest errors in nvme-tcp (Daniel Wagner)
           - only call synchronize_srcu when clearing current path (Daniel Wagner)
           - revalidate paths during rescan (Hannes Reinecke)
      
       - Split out the fs/block_dev into block/fops.c and block/bdev.c, which
         has been long overdue. Do this now before -rc1, to avoid annoying
         conflicts due to this (Christoph)
      
       - blk-throtl use-after-free fix (Li)
      
       - Improve plug depth for multi-device plugs, greatly increasing md
         resync performance (Song)
      
       - blkdev_show() locking fix (Tetsuo)
      
       - n64cart error check fix (Yang)
      
      * tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
        n64cart: fix return value check in n64cart_probe()
        blk-mq: allow 4x BLK_MAX_REQUEST_COUNT at blk_plug for multiple_queues
        block: move fs/block_dev.c to block/bdev.c
        block: split out operations on block special files
        blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
        block: genhd: don't call blkdev_show() with major_names_lock held
        nvme: update MAINTAINERS email address
        nvme: add error handling support for add_disk()
        nvme: only call synchronize_srcu when clearing current path
        nvme: update keep alive interval when kato is modified
        nvme-tcp: Do not reset transport on data digest errors
        nvmet: fixup buffer overrun in nvmet_subsys_attr_serial()
        nvmet: return bool from nvmet_passthru_ctrl and nvmet_is_passthru_req
        nvmet: looks at the passthrough controller when initializing CAP
        nvme: move nvme_multi_css into nvme.h
        nvme-multipath: revalidate paths during rescan
        nvme-multipath: set QUEUE_FLAG_NOWAIT
      c0f7e49f
    • Linus Torvalds's avatar
      Merge tag 'libata-5.15-2021-09-11' of git://git.kernel.dk/linux-block · 8177a5c9
      Linus Torvalds authored
      Pull libata maintainer update from Jens Axboe:
       "Damien agreed to take over maintainership of libata, and he would be a
        great candidate for it. Update the MAINTAINERS entry to reflect the
        change in maintainer and git tree"
      
      * tag 'libata-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
        libata: pass over maintainership to Damien Le Moal
      8177a5c9
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · ce4c8f88
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "Minor fixes to the processing of the bootconfig tree"
      
      * tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()
        tracing/boot: Fix to check the histogram control param is a leaf node
        tracing/boot: Fix trace_boot_hist_add_array() to check array is value
      ce4c8f88
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · a1406e42
      Linus Torvalds authored
      Pull devicetree fixes from Rob Herring:
      
       - Disable fw_devlinks on x86 DT platforms to fix OLPC
      
       - More replacing oneOf+const with enum on a few new schemas
      
       - Drop unnecessary type references on Xilinx SPI binding schema
      
      * tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        spi: dt-bindings: xilinx: Drop type reference on *-bits properties
        dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries
        of: property: Disable fw_devlink DT support for X86
      a1406e42
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 2aae0a93
      Linus Torvalds authored
      Pull clk fix from Stephen Boyd:
       "One patch to fix an unused variable warning in a Qualcomm clk driver"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: qcom: gcc-sm6350: Remove unused variable
      2aae0a93
    • Linus Torvalds's avatar
      Merge tag 'rtc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 107ccc45
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "The broken down time conversion is similar to what is done in the time
        subsystem since v5.14. The rest is fairly straightforward.
      
        Subsystem:
         - Switch to Neri and Schneider time conversion algorithm
      
        Drivers:
         - rx8025: add rx8035 support
         - s5m: modernize driver and set range"
      
      * tag 'rtc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
        rtc: rx8010: select REGMAP_I2C
        dt-bindings: rtc: add Epson RX-8025 and RX-8035
        rtc: rx8025: implement RX-8035 support
        rtc: cmos: remove stale REVISIT comments
        rtc: tps65910: Correct driver module alias
        rtc: move RTC_LIB_KUNIT_TEST to proper location
        rtc: lib_test: add MODULE_LICENSE
        rtc: Improve performance of rtc_time64_to_tm(). Add tests.
        rtc: s5m: set range
        rtc: s5m: enable wakeup only when available
        rtc: s5m: signal the core when alarm are not available
        rtc: s5m: switch to devm_rtc_allocate_device
      107ccc45
    • Linus Torvalds's avatar
      Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · 52926229
      Linus Torvalds authored
      Pull firewire updates from Stefan Richter:
      
       - Migrate the bus snooper driver 'nosy' from PCI to DMA API
      
       - Small janitorial cleanup in the IPv4/v6-over-1394 driver
      
      [ The 'nosy' change already come in as a different commit through Greg
        KH in the misc tree back in the previous merge window, so only the
        cleanup ends up being new to 5.15   - Linus ]
      
      * tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: nosy: switch from 'pci_' to 'dma_' API
        firewire: net: remove unused variable 'guid'
      52926229
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-5.15-rc1' of... · 6701e7e7
      Linus Torvalds authored
      Merge tag 'pwm/for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "The changes this time around are mostly janitorial in nature. A lot of
        this is simplifications of drivers using device-managed functions and
        improving compilation coverage.
      
        The Mediatek display PWM driver now supports the atomic API.
      
        Cleanups and minor fixes make up the remainder of this set"
      
      * tag 'pwm/for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (54 commits)
        pwm: mtk-disp: Implement atomic API .get_state()
        pwm: mtk-disp: Fix overflow in period and duty calculation
        pwm: mtk-disp: Implement atomic API .apply()
        pwm: mtk-disp: Adjust the clocks to avoid them mismatch
        dt-bindings: pwm: rockchip: Add description for rk3568
        pwm: Make pwmchip_remove() return void
        pwm: sun4i: Don't check the return code of pwmchip_remove()
        pwm: sifive: Don't check the return code of pwmchip_remove()
        pwm: samsung: Don't check the return code of pwmchip_remove()
        pwm: renesas-tpu: Don't check the return code of pwmchip_remove()
        pwm: rcar: Don't check the return code of pwmchip_remove()
        pwm: pca9685: Don't check the return code of pwmchip_remove()
        pwm: omap-dmtimer: Don't check the return code of pwmchip_remove()
        pwm: mtk-disp: Don't check the return code of pwmchip_remove()
        pwm: imx-tpm: Don't check the return code of pwmchip_remove()
        pwm: img: Don't check the return code of pwmchip_remove()
        pwm: cros-ec: Don't check the return code of pwmchip_remove()
        pwm: brcmstb: Don't check the return code of pwmchip_remove()
        pwm: atmel-tcb: Don't check the return code of pwmchip_remove()
        pwm: atmel-hlcdc: Don't check the return code of pwmchip_remove()
        ...
      6701e7e7
    • Linus Torvalds's avatar
      Merge tag 'thermal-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · dd470387
      Linus Torvalds authored
      Pull thermal updates from Daniel Lezcano:
      
       - Add the tegra3 thermal sensor and fix the compilation testing on
         tegra by adding a dependency on ARCH_TEGRA along with COMPILE_TEST
         (Dmitry Osipenko)
      
       - Fix the error code for the exynos when devm_get_clk() fails (Dan
         Carpenter)
      
       - Add the TCC cooling support for AlderLake platform (Sumeet Pawnikar)
      
       - Add support for hardware trip points for the rcar gen3 thermal driver
         and store TSC id as unsigned int (Niklas Söderlund)
      
       - Replace the deprecated CPU-hotplug functions get_online_cpus() and
         put_online_cpus (Sebastian Andrzej Siewior)
      
       - Add the thermal tools directory in the MAINTAINERS file (Daniel
         Lezcano)
      
       - Fix the Makefile and the cross compilation flags for the userspace
         'tmon' tool (Rolf Eike Beer)
      
       - Allow to use the IMOK independently from the GDDV on Int340x (Sumeet
         Pawnikar)
      
       - Fix the stub thermal_cooling_device_register() function prototype
         which does not match the real function (Arnd Bergmann)
      
       - Make the thermal trip point optional in the DT bindings (Maxime
         Ripard)
      
       - Fix a typo in a comment in the core code (Geert Uytterhoeven)
      
       - Reduce the verbosity of the trace in the SoC thermal tegra driver
         (Dmitry Osipenko)
      
       - Add the support for the LMh (Limit Management hardware) driver on the
         QCom platforms (Thara Gopinath)
      
       - Allow processing of HWP interrupt by adding a weak function in the
         Intel driver (Srinivas Pandruvada)
      
       - Prevent an abort of the sensor probe is a channel is not used
         (Matthias Kaehlcke)
      
      * tag 'thermal-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
        thermal/drivers/qcom/spmi-adc-tm5: Don't abort probing if a sensor is not used
        thermal/drivers/intel: Allow processing of HWP interrupt
        dt-bindings: thermal: Add dt binding for QCOM LMh
        thermal/drivers/qcom: Add support for LMh driver
        firmware: qcom_scm: Introduce SCM calls to access LMh
        thermal/drivers/tegra-soctherm: Silence message about clamped temperature
        thermal: Spelling s/scallbacks/callbacks/
        dt-bindings: thermal: Make trips node optional
        thermal/core: Fix thermal_cooling_device_register() prototype
        thermal/drivers/int340x: Use IMOK independently
        tools/thermal/tmon: Add cross compiling support
        thermal/tools/tmon: Improve the Makefile
        MAINTAINERS: Add missing userspace thermal tools to the thermal section
        thermal/drivers/intel_powerclamp: Replace deprecated CPU-hotplug functions.
        thermal/drivers/rcar_gen3_thermal: Store TSC id as unsigned int
        thermal/drivers/rcar_gen3_thermal: Add support for hardware trip points
        drivers/thermal/intel: Add TCC cooling support for AlderLake platform
        thermal/drivers/exynos: Fix an error code in exynos_tmu_probe()
        thermal/drivers/tegra: Correct compile-testing of drivers
        thermal/drivers/tegra: Add driver for Tegra30 thermal sensor
      dd470387
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 765092e4
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
      
       - several device tree bindings for input devices have been converted to
         yaml
      
       - dropped no longer used ixp4xx-beeper and CSR Prima2 PWRC drivers
      
       - analog joystick has been converted to use ktime API and no longer
         warn about low resolution timers
      
       - a few driver fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (24 commits)
        Input: analog - always use ktime functions
        Input: mms114 - support MMS134S
        Input: elan_i2c - reduce the resume time for controller in Whitebox
        Input: edt-ft5x06 - added case for EDT EP0110M09
        Input: adc-keys - drop bogus __refdata annotation
        Input: Fix spelling mistake in Kconfig "useable" -> "usable"
        Input: Fix spelling mistake in Kconfig "Modul" -> "Module"
        Input: remove dead CSR Prima2 PWRC driver
        Input: adp5589-keys - use the right header
        Input: adp5588-keys - use the right header
        dt-bindings: input: tsc2005: Convert to YAML schema
        Input: ep93xx_keypad - prepare clock before using it
        dt-bindings: input: sun4i-lradc: Add wakeup-source
        dt-bindings: input: Convert Regulator Haptic binding to a schema
        dt-bindings: input: Convert Pixcir Touchscreen binding to a schema
        dt-bindings: input: Convert ChipOne ICN8318 binding to a schema
        Input: pm8941-pwrkey - fix comma vs semicolon issue
        dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml
        dt-bindings: input: pm8941-pwrkey: Convert pm8941 power key binding to yaml
        dt-bindings: power: reset: Change 'additionalProperties' to true
        ...
      765092e4
    • Jisheng Zhang's avatar
      riscv: Move EXCEPTION_TABLE to RO_DATA segment · 6f55ab36
      Jisheng Zhang authored
      _ex_table section is read-only, so move it to RO_DATA.
      Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      6f55ab36
    • Jisheng Zhang's avatar
      riscv: Enable BUILDTIME_TABLE_SORT · 54fed35f
      Jisheng Zhang authored
      Enable BUILDTIME_TABLE_SORT to sort the exception table at build time
      rather than during boot.
      Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      54fed35f
    • Geert Uytterhoeven's avatar
      riscv: dts: microchip: mpfs-icicle: Fix serial console · cbba1787
      Geert Uytterhoeven authored
      Currently, nothing is output on the serial console, unless
      "console=ttyS0,115200n8" or "earlycon" are appended to the kernel
      command line.  Enable automatic console selection using
      chosen/stdout-path by adding a proper alias, and configure the expected
      serial rate.
      
      While at it, add aliases for the other three serial ports, which are
      provided on the same micro-USB connector as the first one.
      
      Fixes: 0fa6107e ("RISC-V: Initial DTS for Microchip ICICLE board")
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Reviewed-by: default avatarBin Meng <bmeng.cn@gmail.com>
      Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      cbba1787
    • Masahiro Yamada's avatar
      riscv: move the (z)install rules to arch/riscv/Makefile · 399c1ec8
      Masahiro Yamada authored
      Currently, the (z)install targets in arch/riscv/Makefile descend into
      arch/riscv/boot/Makefile to invoke the shell script, but there is no
      good reason to do so.
      
      arch/riscv/Makefile can run the shell script directly.
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      399c1ec8
    • Kefeng Wang's avatar
      riscv: Improve stack randomisation on RV64 · d5935537
      Kefeng Wang authored
      This enlarges the bits availiable for stack randomisation on RV64 from
      the default of 8MiB to 1GiB, to match arm64 and x86.
      
      Also, update the documentation to reflect our support for stack
      randomisation.
      Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
      [Palmer: commit text]
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      d5935537
    • Heinrich Schuchardt's avatar
      riscv: defconfig: enable NLS_CODEPAGE_437, NLS_ISO8859_1 · efe1e08b
      Heinrich Schuchardt authored
      The EFI system partition uses the FAT file system. Many distributions add
      an entry in /etc/fstab for the ESP. We must ensure that mounting does not
      fail.
      
      The default code page for FAT is 437 (cf. CONFIG_FAT_DEFAULT_CODEPAGE).
      The default IO character set is "iso8859-1" (cf. CONFIG_NLS_ISO8859_1).
      
      So let's enable NLS_CODEPAGE_437 and NLS_ISO8859_1 in defconfig.
      Signed-off-by: default avatarHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      efe1e08b
    • Heinrich Schuchardt's avatar
      riscv: defconfig: enable BLK_DEV_NVME · 3a87ff89
      Heinrich Schuchardt authored
      NVMe is a non-volatile storage media attached via PCIe.
      As NVMe has much higher throughput than other block devices like
      SATA it is a must have for RISC-V. Enable CONFIG_BLK_DEV_NVME.
      
      The HiFive Unmatched is a board providing M.2 slots for NVMe drives.
      Enable CONFIG_PCIE_FU740.
      Signed-off-by: default avatarHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
      Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
      Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      3a87ff89
  2. 10 Sep, 2021 19 commits
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 926de8c4
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "These prevent a confusing PRMT-related message from being printed,
        drop an unnecessary header file include and update the list of ACPICA
        maintainers.
      
        Specifics:
      
         - Prevent a message about missing PRMT from being printed on systems
           that do not support PRM, which are the majority now (Aubrey Li).
      
         - Drop unnecessary header include from scan.c (Kari Argillander).
      
         - Update the list of ACPICA maintainers after recent departure of one
           of them (Rafael Wysocki)"
      
      * tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPICA: Update the list of maintainers
        ACPI: PRM: Find PRMT table before parsing it
        ACPI: scan: Remove unneeded header linux/nls.h
      926de8c4
    • Linus Torvalds's avatar
      Merge tag 'pm-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · d6498af5
      Linus Torvalds authored
      Pull more power management updates from Rafael Wysocki:
       "These improve hybrid processors support in intel_pstate, fix an issue
        in the core devices PM code, clean up the handling of dedicated wake
        IRQs, update the Energy Model documentation and update MAINTAINERS.
      
        Specifics:
      
         - Make the HWP performance levels calibration on hybrid processors in
           intel_pstate more straightforward (Rafael Wysocki).
      
         - Prevent the PM core from leaving devices in suspend after a failing
           system-wide suspend transition in some cases when driver PM flags
           are used (Prasad Sodagudi).
      
         - Drop unused function argument from the dedicated wake IRQs handling
           code (Sergey Shtylyov).
      
         - Fix up Energy Model kerneldoc comments and include them in the
           Energy Model documentation (Lukasz Luba).
      
         - Use my kernel.org address in MAINTAINERS insead of the personal one
           (Rafael Wysocki)"
      
      * tag 'pm-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        MAINTAINERS: Change Rafael's e-mail address
        PM: sleep: core: Avoid setting power.must_resume to false
        Documentation: power: include kernel-doc in Energy Model doc
        PM: EM: fix kernel-doc comments
        cpufreq: intel_pstate: hybrid: Rework HWP calibration
        ACPI: CPPC: Introduce cppc_get_nominal_perf()
        PM: sleep: wakeirq: drop useless parameter from dev_pm_attach_wake_irq()
      d6498af5
    • Rob Herring's avatar
      spi: dt-bindings: xilinx: Drop type reference on *-bits properties · 094b147c
      Rob Herring authored
      Properties with standard unit suffixes such as '-bits' don't need a
      type.
      
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Michal Simek <michal.simek@xilinx.com>
      Cc: linux-spi@vger.kernel.org
      Cc: linux-arm-kernel@lists.infradead.org
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Acked-by: default avatarMark Brown <broonie@kernel.org>
      Link: https://lore.kernel.org/r/20210910165945.2852999-1-robh@kernel.org
      094b147c
    • Rob Herring's avatar
      dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries · 97567124
      Rob Herring authored
      'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum'
      is more concise and yields better error messages.
      
      Fix a couple more cases which have appeared.
      
      Cc: Rob Clark <robdclark@gmail.com>
      Cc: Sean Paul <sean@poorly.run>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Jonathan Marek <jonathan@marek.ca>
      Cc: Aswath Govindraju <a-govindraju@ti.com>
      Cc: Marc Zyngier <maz@kernel.org>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: dri-devel@lists.freedesktop.org
      Cc: freedreno@lists.freedesktop.org
      Cc: linux-spi@vger.kernel.org
      Cc: linux-watchdog@vger.kernel.org
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Acked-by: default avatarMark Brown <broonie@kernel.org>
      Link: https://lore.kernel.org/r/20210910165153.2843871-1-robh@kernel.org
      97567124
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e99f23c5
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - Limit the linear region to 51-bit when KVM is running in nVHE mode.
      
         Otherwise, depending on the placement of the ID map, kernel-VA to
         hyp-VA translations may produce addresses that either conflict with
         other HYP mappings or generate addresses outside of the 52-bit
         addressable range.
      
       - Instruct kmemleak not to scan the memory reserved for kdump as this
         range is removed from the kernel linear map and therefore not
         accessible.
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: kdump: Skip kmemleak scan reserved memory for kdump
        arm64: mm: limit linear region to 51 bits for KVM in nVHE mode
      e99f23c5
    • Linus Torvalds's avatar
      Merge tag 'for-5.15/parisc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 23ef827c
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
      
       - Build warning fixes in Makefile and Dino PCI driver
      
       - Fix when sched_clock is marked unstable
      
       - Drop strnlen_user() in favour of generic version
      
       - Prevent kernel to write outside userspace signal stack
      
       - Remove CONFIG_SET_FS including KERNEL_DS and USER_DS from parisc and
         switch to __get/put_kernel_nofault()
      
      * tag 'for-5.15/parisc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Implement __get/put_kernel_nofault()
        parisc: Mark sched_clock unstable only if clocks are not syncronized
        parisc: Move pci_dev_is_behind_card_dino to where it is used
        parisc: Reduce sigreturn trampoline to 3 instructions
        parisc: Check user signal stack trampoline is inside TASK_SIZE
        parisc: Drop useless debug info and comments from signal.c
        parisc: Drop strnlen_user() in favour of generic version
        parisc: Add missing FORCE prerequisite in Makefile
      23ef827c
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 589e5cab
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
      
       - Intel VT-d:
           - PASID leakage in intel_svm_unbind_mm()
           - Deadlock in intel_svm_drain_prq()
      
       - AMD IOMMU: Fixes for an unhandled page-fault bug when AVIC is used
         for a KVM guest.
      
       - Make CONFIG_IOMMU_DEFAULT_DMA_LAZY architecture instead of IOMMU
         driver dependent
      
      * tag 'iommu-fixes-v5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu: Clarify default domain Kconfig
        iommu/vt-d: Fix a deadlock in intel_svm_drain_prq()
        iommu/vt-d: Fix PASID leak in intel_svm_unbind_mm()
        iommu/amd: Remove iommu_init_ga()
        iommu/amd: Relocate GAMSup check to early_enable_iommus
      589e5cab
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 5ffc06eb
      Linus Torvalds authored
      Pull habanalabs updates from Greg KH:
       "Here is another round of misc driver patches for 5.15-rc1.
      
        In here is only updates for the Habanalabs driver. This request is
        late because the previously-objected-to dma-buf patches are all
        removed and some fixes that you and others found are now included in
        here as well.
      
        All of these have been in linux-next for well over a week with no
        reports of problems, and they are all self-contained to only this one
        driver. Full details are in the shortlog"
      
      * tag 'char-misc-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (61 commits)
        habanalabs/gaudi: hwmon default card name
        habanalabs: add support for f/w reset
        habanalabs/gaudi: block ICACHE_BASE_ADDERESS_HIGH in TPC
        habanalabs: cannot sleep while holding spinlock
        habanalabs: never copy_from_user inside spinlock
        habanalabs: remove unnecessary device status check
        habanalabs: disable IRQ in user interrupts spinlock
        habanalabs: add "in device creation" status
        habanalabs/gaudi: invalidate PMMU mem cache on init
        habanalabs/gaudi: size should be printed in decimal
        habanalabs/gaudi: define DC POWER for secured PMC
        habanalabs/gaudi: unmask out of bounds SLM access interrupt
        habanalabs: add userptr_lookup node in debugfs
        habanalabs/gaudi: fetch TPC/MME ECC errors from F/W
        habanalabs: modify multi-CS to wait on stream masters
        habanalabs/gaudi: add monitored SOBs to state dump
        habanalabs/gaudi: restore user registers when context opens
        habanalabs/gaudi: increase boot fit timeout
        habanalabs: update to latest firmware headers
        habanalabs/gaudi: minimize number of register reads
        ...
      5ffc06eb
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-scan' and 'acpi-prm' · 8fbc1c5b
      Rafael J. Wysocki authored
      * acpi-scan:
        ACPI: scan: Remove unneeded header linux/nls.h
      
      * acpi-prm:
        ACPI: PRM: Find PRMT table before parsing it
      8fbc1c5b
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em' · be2d2433
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: intel_pstate: hybrid: Rework HWP calibration
        ACPI: CPPC: Introduce cppc_get_nominal_perf()
      
      * pm-sleep:
        PM: sleep: core: Avoid setting power.must_resume to false
        PM: sleep: wakeirq: drop useless parameter from dev_pm_attach_wake_irq()
      
      * pm-em:
        Documentation: power: include kernel-doc in Energy Model doc
        PM: EM: fix kernel-doc comments
      be2d2433
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2021-09-10' of git://anongit.freedesktop.org/drm/drm · a668acb8
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Just an initial bunch of fixes for the merge window, amdgpu is most of
        them with a few ttm fixes and an fbdev avoid multiply overflow fix.
      
        core:
         - Make some dma-buf config options depend on DMA_SHARED_BUFFER
         - Handle multiplication overflow of fbdev xres/yres in the core
      
        ttm:
         - Fix ttm_bo_move_memcpy() when ttm_resource is subclassed
         - Fix ttm deadlock if target BO isn't idle
         - ttm build fix
         - ttm docs fix
      
        dma-buf:
         - config option fixes
      
        fbdev:
         - limit resolutions to avoid int overflow
      
        i915:
         - stddef change.
      
        amdgpu:
         - Misc cleanups, typo fixes
         - EEPROM fix
         - Add some new PCI IDs
         - Scatter/Gather display support for Yellow Carp
         - PCIe DPM fix for RKL platforms
         - RAS fix
      
        amdkfd:
         - SVM fix
      
        vc4:
         - static function fix
      
        mgag200:
         - fix uninit var
      
        panfrost:
         - lock_region fixes"
      
      * tag 'drm-next-2021-09-10' of git://anongit.freedesktop.org/drm/drm: (36 commits)
        drm/ttm: Fix a deadlock if the target BO is not idle during swap
        fbmem: don't allow too huge resolutions
        dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER
        dma-buf: DMABUF_DEBUG should depend on DMA_SHARED_BUFFER
        drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers"
        dma-buf: DMABUF_MOVE_NOTIFY should depend on DMA_SHARED_BUFFER
        drm/amdkfd: drop process ref count when xnack disable
        drm/amdgpu: enable more pm sysfs under SRIOV 1-VF mode
        drm/amdgpu: fix fdinfo race with process exit
        drm/amdgpu: Fix a deadlock if previous GEM object allocation fails
        drm/amdgpu: stop scheduler when calling hw_fini (v2)
        drm/amdgpu: Clear RAS interrupt status on aldebaran
        drm/amd/display: Initialize lt_settings on instantiation
        drm/amd/display: cleanup idents after a revert
        drm/amd/display: Fix memory leak reported by coverity
        drm/ttm: Fix ttm_bo_move_memcpy() for subclassed struct ttm_resource
        drm/amdgpu/swsmu: fix spelling mistake "minimun" -> "minimum"
        drm/amdgpu: Disable PCIE_DPM on Intel RKL Platform
        drm/amdgpu: show both cmd id and name when psp cmd failed
        drm/amd/display: setup system context for APUs
        ...
      a668acb8
    • Amir Goldstein's avatar
      fsnotify: fix sb_connectors leak · 4396a731
      Amir Goldstein authored
      Fix a leak in s_fsnotify_connectors counter in case of a race between
      concurrent add of new fsnotify mark to an object.
      
      The task that lost the race fails to drop the counter before freeing
      the unused connector.
      
      Following umount() hangs in fsnotify_sb_delete()/wait_var_event(),
      because s_fsnotify_connectors never drops to zero.
      
      Fixes: ec44610f ("fsnotify: count all objects with attached connectors")
      Reported-by: default avatarMurphy Zhou <jencce.kernel@gmail.com>
      Link: https://lore.kernel.org/linux-fsdevel/20210907063338.ycaw6wvhzrfsfdlp@xzhoux.usersys.redhat.com/Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4396a731
    • Saravana Kannan's avatar
      of: property: Disable fw_devlink DT support for X86 · 4a48b66b
      Saravana Kannan authored
      Andre reported fw_devlink=on breaking OLPC XO-1.5 [1].
      
      OLPC XO-1.5 is an X86 system that uses a mix of ACPI and OF to populate
      devices. The root cause seems to be ISA devices not setting their fwnode
      field. But trying to figure out how to fix that doesn't seem worth the
      trouble because the OLPC devicetree is very sparse/limited and fw_devlink
      only adds the links causing this issue. Considering that there aren't many
      users of OF in an X86 system, simply fw_devlink DT support for X86.
      
      [1] - https://lore.kernel.org/lkml/3c1f2473-92ad-bfc4-258e-a5a08ad73dd0@web.de/
      
      Fixes: ea718c69 ("Revert "Revert "driver core: Set fw_devlink=on by default""")
      Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
      Cc: Andre Muller <andre.muller@web.de>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Tested-by: default avatarAndre Müller <andre.muller@web.de>
      Link: https://lore.kernel.org/r/20210910011446.3208894-1-saravanak@google.comSigned-off-by: default avatarRob Herring <robh@kernel.org>
      4a48b66b
    • Rafael J. Wysocki's avatar
      MAINTAINERS: Change Rafael's e-mail address · 3d53afea
      Rafael J. Wysocki authored
      I have been slow to respond to messages going to rjw@rjwysocki.net
      recently, so change it to rafael@kernel.org (which works better for
      me) in MAINTAINERS.
      Signed-off-by: default avatarRafael J. Wysocki <rafael@kernel.org>
      3d53afea
    • Rafael J. Wysocki's avatar
      ACPICA: Update the list of maintainers · 22d692ba
      Rafael J. Wysocki authored
      Erik Kaneda will not be maintaining ACPICA any more, so drop his
      address (which doesn't work any more anyway) from the maintainer
      list.
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      22d692ba
    • Hao Xu's avatar
      io_uring: fix off-by-one in BUILD_BUG_ON check of __REQ_F_LAST_BIT · 32c2d33e
      Hao Xu authored
      Build check of __REQ_F_LAST_BIT should be larger than, not equal or larger
      than. It's perfectly valid to have __REQ_F_LAST_BIT be 32, as that means
      that the last valid bit is 31 which does fit in the type.
      Signed-off-by: default avatarHao Xu <haoxu@linux.alibaba.com>
      Link: https://lore.kernel.org/r/20210907032243.114190-1-haoxu@linux.alibaba.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
      32c2d33e
    • Chen Wandun's avatar
      arm64: kdump: Skip kmemleak scan reserved memory for kdump · 85f58eb1
      Chen Wandun authored
      Trying to boot with kdump + kmemleak, command will result in a crash:
      "echo scan > /sys/kernel/debug/kmemleak"
      
      crashkernel reserved: 0x0000000007c00000 - 0x0000000027c00000 (512 MB)
      Kernel command line: BOOT_IMAGE=(hd1,gpt2)/vmlinuz-5.14.0-rc5-next-20210809+ root=/dev/mapper/ao-root ro rd.lvm.lv=ao/root rd.lvm.lv=ao/swap crashkernel=512M
      Unable to handle kernel paging request at virtual address ffff000007c00000
      Mem abort info:
        ESR = 0x96000007
        EC = 0x25: DABT (current EL), IL = 32 bits
        SET = 0, FnV = 0
        EA = 0, S1PTW = 0
        FSC = 0x07: level 3 translation fault
      Data abort info:
        ISV = 0, ISS = 0x00000007
        CM = 0, WnR = 0
      swapper pgtable: 64k pages, 48-bit VAs, pgdp=00002024f0d80000
      [ffff000007c00000] pgd=1800205ffffd0003, p4d=1800205ffffd0003, pud=1800205ffffd0003, pmd=1800205ffffc0003, pte=0068000007c00f06
      Internal error: Oops: 96000007 [#1] SMP
      pstate: 804000c9 (Nzcv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
      pc : scan_block+0x98/0x230
      lr : scan_block+0x94/0x230
      sp : ffff80008d6cfb70
      x29: ffff80008d6cfb70 x28: 0000000000000000 x27: 0000000000000000
      x26: 00000000000000c0 x25: 0000000000000001 x24: 0000000000000000
      x23: ffffa88a6b18b398 x22: ffff000007c00ff9 x21: ffffa88a6ac7fc40
      x20: ffffa88a6af6a830 x19: ffff000007c00000 x18: 0000000000000000
      x17: 0000000000000000 x16: 0000000000000000 x15: ffffffffffffffff
      x14: ffffffff00000000 x13: ffffffffffffffff x12: 0000000000000020
      x11: 0000000000000000 x10: 0000000001080000 x9 : ffffa88a6951c77c
      x8 : ffffa88a6a893988 x7 : ffff203ff6cfb3c0 x6 : ffffa88a6a52b3c0
      x5 : ffff203ff6cfb3c0 x4 : 0000000000000000 x3 : 0000000000000000
      x2 : 0000000000000001 x1 : ffff20226cb56a40 x0 : 0000000000000000
      Call trace:
       scan_block+0x98/0x230
       scan_gray_list+0x120/0x270
       kmemleak_scan+0x3a0/0x648
       kmemleak_write+0x3ac/0x4c8
       full_proxy_write+0x6c/0xa0
       vfs_write+0xc8/0x2b8
       ksys_write+0x70/0xf8
       __arm64_sys_write+0x24/0x30
       invoke_syscall+0x4c/0x110
       el0_svc_common+0x9c/0x190
       do_el0_svc+0x30/0x98
       el0_svc+0x28/0xd8
       el0t_64_sync_handler+0x90/0xb8
       el0t_64_sync+0x180/0x184
      
      The reserved memory for kdump will be looked up by kmemleak, this area
      will be set invalid when kdump service is bring up. That will result in
      crash when kmemleak scan this area.
      
      Fixes: a7259df7 ("memblock: make memblock_find_in_range method private")
      Signed-off-by: default avatarChen Wandun <chenwandun@huawei.com>
      Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
      Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
      Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Link: https://lore.kernel.org/r/20210910064844.3827813-1-chenwandun@huawei.comSigned-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      85f58eb1
    • xinhui pan's avatar
      drm/ttm: Fix a deadlock if the target BO is not idle during swap · 70982eef
      xinhui pan authored
      The ret value might be -EBUSY, caller will think lru lock is still
      locked but actually NOT. So return -ENOSPC instead. Otherwise we hit
      list corruption.
      
      ttm_bo_cleanup_refs might fail too if BO is not idle. If we return 0,
      caller(ttm_tt_populate -> ttm_global_swapout ->ttm_device_swapout) will
      be stuck as we actually did not free any BO memory. This usually happens
      when the fence is not signaled for a long time.
      Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Fixes: ebd59851 ("drm/ttm: move swapout logic around v3")
      Link: https://patchwork.freedesktop.org/patch/msgid/20210907040832.1107747-1-xinhui.pan@amd.comSigned-off-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      70982eef
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-fixes-2021-09-09' of... · b011522c
      Dave Airlie authored
      Merge tag 'drm-misc-next-fixes-2021-09-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
      
      drm-misc-next-fixes for v5.15:
      - Make some dma-buf config options depend on DMA_SHARED_BUFFER.
      - Handle multiplication overflow of fbdev xres/yres in the core.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/37c5fe2e-5be8-45c3-286b-d8d536a5cef2@linux.intel.com
      b011522c