1. 02 8月, 2016 16 次提交
    • L
      Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux · 731c7d3a
      Linus Torvalds 提交于
      Merge drm updates from Dave Airlie:
       "This is the main drm pull request for 4.8.
      
        I'm down with a cold at the moment so hopefully this isn't in too bad
        a state, I finished pulling stuff last week mostly (nouveau fixes just
        went in today), so only this message should be influenced by illness.
        Apologies to anyone who's major feature I missed :-)
      
        Core:
              Lockless GEM BO freeing
              Non-blocking atomic work
              Documentation changes (rst/sphinx)
              Prep for new fencing changes
              Simple display helpers
              Master/auth changes
              Register/unregister rework
              Loads of trivial patches/fixes.
      
        New stuff:
              ARM Mali display driver (not the 3D chip)
              sii902x RGB->HDMI bridge
      
        Panel:
              Support for new panels
              Improved backlight support
      
        Bridge:
              Convert ADV7511 to bridge driver
              ADV7533 support
              TC358767 (DSI/DPI to eDP) encoder chip support
      
        i915:
              BXT support enabled by default
              GVT-g infrastructure
              GuC command submission and fixes
              BXT workarounds
              SKL/BKL workarounds
              Demidlayering device registration
              Thundering herd fixes
              Missing pci ids
              Atomic updates
      
        amdgpu/radeon:
              ATPX improvements for better dGPU power control on PX systems
              New power features for CZ/BR/ST
              Pipelined BO moves and evictions in TTM
              GPU scheduler improvements
              GPU reset improvements
              Overclocking on dGPUs with amdgpu
              Polaris powermanagement enabled
      
        nouveau:
              GK20A/GM20B volt and clock improvements.
              Initial support for GP100/GP104 GPUs, GP104 will not yet support
              acceleration due to NVIDIA having not released firmware for them as of yet.
      
        exynos:
              Exynos5433 SoC with IOMMU support.
      
        vc4:
              Shader validation for branching
      
        imx-drm:
              Atomic mode setting conversion
              Reworked DMFC FIFO allocation
              External bridge support
      
        analogix-dp:
              RK3399 eDP support
              Lots of fixes.
      
        rockchip:
              Lots of small fixes.
      
        msm:
              DT bindings cleanups
              Shrinker and madvise support
              ASoC HDMI codec support
      
        tegra:
              Host1x driver cleanups
              SOR reworking for DP support
              Runtime PM support
      
        omapdrm:
              PLL enhancements
              Header refactoring
              Gamma table support
      
        arcgpu:
              Simulator support
      
        virtio-gpu:
              Atomic modesetting fixes.
      
        rcar-du:
              Misc fixes.
      
        mediatek:
              MT8173 HDMI support
      
        sti:
              ASOC HDMI codec support
              Minor fixes
      
        fsl-dcu:
              Suspend/resume support
              Bridge support
      
        amdkfd:
              Minor fixes.
      
        etnaviv:
              Enable GPU clock gating
      
        hisilicon:
              Vblank and other fixes"
      
      * tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux: (1575 commits)
        drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
        drm/nouveau/acpi: fix lockup with PCIe runtime PM
        drm/nouveau/acpi: check for function 0x1B before using it
        drm/nouveau/acpi: return supported DSM functions
        drm/nouveau/acpi: ensure matching ACPI handle and supported functions
        drm/nouveau/fbcon: fix font width not divisible by 8
        drm/amd/powerplay: remove enable_clock_power_gatings_tasks from initialize and resume events
        drm/amd/powerplay: move clockgating to after ungating power in pp for uvd/vce
        drm/amdgpu: add query device id and revision id into system info entry at CGS
        drm/amdgpu: add new definition in bif header
        drm/amd/powerplay: rename smum header guards
        drm/amdgpu: enable UVD context buffer for older HW
        drm/amdgpu: fix default UVD context size
        drm/amdgpu: fix incorrect type of info_id
        drm/amdgpu: make amdgpu_cgs_call_acpi_method as static
        drm/amdgpu: comment out unused defaults_staturn_pro static const structure to fix the build
        drm/amdgpu: enable UVD VM only on polaris
        drm/amdgpu: increase timeout of IB test
        drm/amdgpu: add destroy session when generate VCE destroy msg.
        drm/amd: fix deadlock of job_list_lock V2
        ...
      731c7d3a
    • S
      clocksource/drivers/clps_711x: fixup for "ARM: clps711x: · 77a87824
      Stephen Rothwell 提交于
       Switch to MULTIPLATFORM"
      
      Missed conflict between commit c86f5173 ("ARM: clps711x: Switch to
      MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3
      ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the
      clockevents tree.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      77a87824
    • D
      Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-next · 753e7c8c
      Dave Airlie 提交于
      Runtime PM fixes, fbcon and nv30 fix.
      * 'linux-4.8' of git://github.com/skeggsb/linux:
        drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
        drm/nouveau/acpi: fix lockup with PCIe runtime PM
        drm/nouveau/acpi: check for function 0x1B before using it
        drm/nouveau/acpi: return supported DSM functions
        drm/nouveau/acpi: ensure matching ACPI handle and supported functions
        drm/nouveau/fbcon: fix font width not divisible by 8
      753e7c8c
    • L
      Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · e48af7aa
      Linus Torvalds 提交于
      Pull ia64 updates from Tony Luck:
       "Miscellaneous ia64 cleanups"
      
      * tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: salinfo: use a waitqueue instead a sema down/up combo
        ia64: efi: use timespec64 for persistent clock
      e48af7aa
    • L
      Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ed780686
      Linus Torvalds 提交于
      Pull 64-bit ARM DT updates from Olof Johansson:
       "Just as the 32-bit contents, the 64-bit device tree branch also
        contains a number of additions this release cycle.
      
        New platforms:
         - LG LG1313
         - Mediatek MT6755
         - Renesas r8a7796
         - Broadcom 2837
      
        Other platforms with larger updates are:
         - Nvidia X1 platforms (USB 3.0, regulators, display subsystem)
         - Mediatek MT8173 (display subsystem added)
         - Rockchip RK3399 (a lot of new peripherals)
         - ARM Juno reference implementation (SCPI power domains, coresight,
           thermal)"
      
      * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
        arm64: tegra: Enable HDMI on Jetson TX1
        arm64: tegra: Add sor1_src clock
        arm64: tegra: Add XUSB powergates on Tegra210
        arm64: tegra: Add DPAUX pinctrl bindings
        arm64: tegra: Add ACONNECT bus node for Tegra210
        arm64: tegra: Add audio powergate node for Tegra210
        arm64: tegra: Add regulators for Tegra210 Smaug
        arm64: tegra: Correct Tegra210 XUSB mailbox interrupt
        arm64: tegra: Enable XUSB controller on Jetson TX1
        arm64: tegra: Enable debug serial on Jetson TX1
        arm64: tegra: Add Tegra210 XUSB controller
        arm64: tegra: Add Tegra210 XUSB pad controller
        arm64: tegra: Add DSI panel on Jetson TX1
        arm64: tegra: p2597: Add SDMMC power supplies
        arm64: tegra: Add PMIC support on Jetson TX1
        Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"
        arm64: dts: hi6220: Add pl031 RTC support
        arm64: dts: r8a7796/salvator-x: Enable watchdog timer
        arm64: dts: r8a7796: Add RWDT node
        arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
        ...
      ed780686
    • L
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 043248cd
      Linus Torvalds 提交于
      Pull ARM DT updates from Olof Johansson:
       "Device tree contents continue to be the largest branches we submit.
        This time around, some of the contents worth pointing out is:
      
        New SoC platforms:
         - Freescale i.MX 7Solo
         - Broadcom BCM23550
         - Cirrus Logic EP7209 and EP7211 (clps711x platforms)_
         - Hisilicon HI3519
         - Renesas R8A7792
      
        Some of the other delta that is sticking out, line-count wise:
         - Exynos moves of IP blocks under an SoC bus, which causes a large
           delta due to indentation changes
         - a new Tegra K1 board: Apalis
         - a bunch of small updates to many Allwinner platforms; new hardware
           support, some cleanup, etc"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (426 commits)
        ARM: dts: sun8i: Add dts file for inet86dz board
        ARM: dts: sun8i: Add dts file for Polaroid MID2407PXE03 tablet
        ARM: dts: sun8i: Use sun8i-reference-design-tablet for ga10h dts
        ARM: dts: sun8i: Use sun8i-reference-design-tablet for polaroid mid2809pxe04
        ARM: dts: sun8i: reference-design-tablet: Add drivevbus-supply
        ARM: dts: Copy sun8i-q8-common.dtsi sun8i-reference-design-tablet.dtsi
        ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for utoo p66 dts
        ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for dit4350 dts
        ARM: dts: sun5i: reference-design-tablet: Remove mention of q8
        ARM: dts: sun5i: reference-design-tablet: Set lradc vref to avcc
        ARM: dts: sun5i: Rename sun5i-q8-common.dtsi sun5i-reference-design-tablet.dtsi
        ARM: dts: sun5i: Move q8 display bits to sun5i-a13-q8-tablet.dts
        ARM: dts: sunxi: Rename sunxi-q8-common.dtsi sunxi-reference-design-tablet.dtsi
        ARM: dts: at91: Don't build unnecessary dtbs
        ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
        ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
        ARM: dts: at91: move isi definition to at91sam9g25ek
        ARM: dts: at91: fix i2c-gpio node name
        ARM: dts: at91: vinco: fix regulator name
        ARM: dts: at91: ariag25 : fix onewire node
        ...
      043248cd
    • L
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 43a0a98a
      Linus Torvalds 提交于
      Pull ARM SoC driver updates from Olof Johansson:
       "Driver updates for ARM SoCs.
      
        A slew of changes this release cycle.  The reset driver tree, that we
        merge through arm-soc for historical reasons, is also sizable this
        time around.
      
        Among the changes:
      
         - clps711x: Treewide changes to compatible strings, merged here for simplicity.
         - Qualcomm: SCM firmware driver cleanups, move to platform driver
         - ux500: Major cleanups, removal of old mach-specific infrastructure.
         - Atmel external bus memory driver
         - Move of brcmstb platform to the rest of bcm
         - PMC driver updates for tegra, various fixes and improvements
         - Samsung platform driver updates to support 64-bit Exynos platforms
         - Reset controller cleanups moving to devm_reset_controller_register() APIs
         - Reset controller driver for Amlogic Meson
         - Reset controller driver for Hisilicon hi6220
         - ARM SCPI power domain support"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (100 commits)
        ARM: ux500: consolidate base platform files
        ARM: ux500: move soc_id driver to drivers/soc
        ARM: ux500: call ux500_setup_id later
        ARM: ux500: consolidate soc_device code in id.c
        ARM: ux500: remove cpu_is_u* helpers
        ARM: ux500: use CLK_OF_DECLARE()
        ARM: ux500: move l2x0 init to .init_irq
        mfd: db8500 stop passing around platform data
        ASoC: ab8500-codec: remove platform data based probe
        ARM: ux500: move ab8500_regulator_plat_data into driver
        ARM: ux500: remove unused regulator data
        soc: raspberrypi-power: add CONFIG_OF dependency
        firmware: scpi: add CONFIG_OF dependency
        video: clps711x-fb: Changing the compatibility string to match with the smallest supported chip
        input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip
        pwm: clps711x: Changing the compatibility string to match with the smallest supported chip
        serial: clps711x: Changing the compatibility string to match with the smallest supported chip
        irqchip: clps711x: Changing the compatibility string to match with the smallest supported chip
        clocksource: clps711x: Changing the compatibility string to match with the smallest supported chip
        clk: clps711x: Changing the compatibility string to match with the smallest supported chip
        ...
      43a0a98a
    • L
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6911a528
      Linus Torvalds 提交于
      Pull ARM SoC defconfig updates from Olof Johansson:
       "Defconfig additions, removals, etc.
      
        Most of these are small changes adding the options for newly
        upstreamed drivers, or drivers needed for new board support.
      
        - removed Broadcom bcm_defconfig, targets are all covered in
          multi_v7_defconfig
      
        - new defconfig: multi_v4t_defconfig"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
        ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
        ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
        ARM: configs: lpc18xx: enable adc and dac iio drivers
        ARM: config: Add a multi_v4t_defconfig
        ARM: multi_v7_defconfig: add ACT8945A
        ARM: at91/defconfig: Add ACT8945A driver
        ARM: imx_v6_v7_defconfig: Select ADS7846 support
        ARM: configs: qualcomm: Add MDM9615 missing defconfigs
        ARM: multi_v7_defconfig: Enable vivid driver as a module
        ARM: exynos_defconfig: Enable vivid driver as a module
        ARM: defconfig: enable the MSM8660 pin controller
        ARM: imx_v6_v7_defconfig: enable USB FFS gadget
        ARM: socfpga: enable PL330 DMA in socfpga_defconfig
        ARM: socfpga: add PCIe to socfpga_defconfig
        ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
        ARM: shmobile: defconfig: Enable r8a7792 SoC
        ARM: Remove bcm_defconfig
        ARM: multi_v7_defconfig: Enable Broadcom Kona watchdog
        ARM: multi_v7_defconfig: Enable Broadcom STB PWM
        ...
      6911a528
    • L
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 3fbff9c8
      Linus Torvalds 提交于
      Pull 64-bit ARM SoC updates from Olof Johansson:
       "Changes to platform code for 64-bit ARM platforms.
      
        Nearly all of these are defconfig updates to enable new drivers or old
        drivers still used on these 64-bit platforms.
      
        Added platforms for this release are:
      
         - Broadcom BCM2837
         - Renesas R8A7796"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
        arm64: remove duplicate PWM entry in defconfig
        arm64: Update default configuration
        arm64: defconfig: Enable more IP blocks for Exynos7 and Exynos5433
        arm64: amlogic: select gxbb clk driver
        arm64: defconfig: Enable S2MPS11 clock and S3C RTC driver
        arm64: marvell: enable Armada 3700 clock drivers
        arm64: defconfig: enable msm8996 pinctrl support
        arm64: defconfig: Enable qcom msm8996 clk drivers
        arm: defconfig: Enable PM8941 pwr key
        arm64: defconfig: enable stmmac and realtek PHY as modules
        arm64: Kconfig: select PM{,_GENERIC_DOMAINS} for ARCH_VEXPRESS
        arm64: defconfig: enable SENSORS_ARM_SCPI
        arm64: defconfig: enable Generic on-chip SRAM driver
        arm64: configs: enable PCIe driver for Armada 7K/8K
        arm64: Add platform selection for BCM2835.
        arm64: defconfig: disable plain NEON implementation of AES
        arm64: Allow for different DMA and CPU bus offsets
        arm64: defconfig: enable Renesas R8A7796 SoC
        arm64: defconfig: Enable Cadence MACB/GEM support
        ARM64: Kconfig: Select the Amlogic Meson pin controller driver
        ...
      3fbff9c8
    • L
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fbae5cbb
      Linus Torvalds 提交于
      Pull ARM SoC platform updates from Olof Johansson:
       "Improved and new platform support for various SoCs:
      
        New SoC support:
         - Broadcom BCM23550
         - Freescale i.MX7Solo
         - Qualcomm MDM9615
         - Renesas r8a7792
      
        Improvements:
         - convert clps711x to multiplatform
         - debug uart improvements for Atmel platforms
         - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram
         - OMAP tweaks and improvements to hwmod
         - OMAP support for kexec on SMP"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
        ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
        ARM: s3c64xx: smartq: Avoid sparse warnings
        ARM: sti: Implement dummy L2 cache's write_sec
        ARM: STi: Update machine _namestr to be more generic.
        arm: meson: explicitly select clk drivers
        ARM: tango: add Suspend-to-RAM support
        ARM: hisi: consolidate the hisilicon machine entries
        ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
        MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
        MAINTAINERS: Update BCM63XX entry
        MAINTAINERS: Add NS2 entry
        MAINTAINERS: Fix nsp false-positives
        MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
        ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
        ARM: clps711x: Switch to MULTIPLATFORM
        ARM: clps711x: Remove boards support
        ARM: clps711x: Add basic DT support
        ARM: clps711x: Reduce static map size
        ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
        ARM: oxnas: Change OX810SE default driver config
        ...
      fbae5cbb
    • L
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6f888fe3
      Linus Torvalds 提交于
      Pull ARM SoC cleanups from Olof Johansson:
       "The cleanup branch keeps going down in size as we've completed a lot
        of the major legacy platform removals and conversions.
      
        A handful of changes this time around, some of the themes or larger
        sets are:
      
         - A bunch of i.MX cleanups around platform detection, init call cleanups
         - Misc fixes of missing/implicit includes
         - Removal of ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB"
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
        ARM: mps2: fix typo
        ARM: s3c64xx: avoid warning about 'struct device_node'
        bus: mvebu-mbus: make mvebu_mbus_syscore_ops static
        bus: mvebu-mbus: fix __iomem on register pointers
        ARM: tegra: Remove board_init_funcs array
        ARM: iop: Fix indentation
        ARM: imx: remove cpu_is_mx*()
        ARM: imx: remove last call to cpu_is_mx5*
        ARM: imx: rework mx27_pm_init() call
        ARM: imx: deconstruct mx3_idle
        ARM: imx: deconstruct mxc_rnga initialization
        ARM: imx: remove cpu_is_mx1 check
        ARM: i.MX: Do not explicitly call l2x0_of_init()
        ARM: i.MX: system.c: Tweak prefetch settings for performance
        ARM: i.MX: system.c: Replace magic numbers
        ARM: i.MX: system.c: Remove redundant errata 752271 code
        ARM: i.MX: system.c: Convert goto to if statement
        ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
        ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
        ARM: orion5x: make orion5x_legacy_handle_irq static
        ...
      6f888fe3
    • L
      Merge tag 'linux-kselftest-4.8-rc1-update' of... · 5dd0bf62
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
       "This contains new tests and fixes:
      
         - a few fixes to existing tests
      
         - new media tests for testing driver unbind, and device removal paths
           while an user application is actively making system calls and
           ioctls"
      
      * tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: media_tests add a new video device test
        selftests: media_tests - Add media_device_open to .gitignore
        selftests: add media controller regression test scripts and document
        selftests: add media_device_open test
        selftests: media_device_test change it to randomize loop count
        selftests/vm: Don't mlockall MCL_CURRENT in on-fault-limit test
        selftests/vm: write strlen length instead of sizeof to nr_hugepages
        selftests/lib: set printf.sh executable
      5dd0bf62
    • L
      Merge tag 'linux-kselftest-4.8-rc1-fixes' of... · 1571a03d
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fixes from Shuah Khan:
      
       - Add a new timer set-tz test case
      
       - Fix a bug in exec test Makefile dependency list
      
      * tag 'linux-kselftest-4.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/exec: Makefile is a run-time dependency, add it to the install list
        kselftests: timers: Add set-tz test case
      1571a03d
    • L
      Merge tag 'hwmon-for-linus-v4.8-2' of... · 2790aed0
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull more hwmon updates from Guenter Roeck:
      
       - Improved error handling in tmp102, lm75, and lm90 drivers
      
       - Bug fixes in sht3x, ftsteutates, iio_hwmon, and adt7411 drivers
      
      * tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (adt7411) set sane values for CFG1 and CFG3
        hwmon: (iio_hwmon) fix memory leak in name attribute
        hwmon: (ftsteutates) Fix potential memory access error
        hwmon: (tmp102) Improve error handling
        hwmon: (lm75) Improve error handling
        hwmon: (lm90) Improve error handling
        hwmon: (lm90) Add missing assignment
        hwmon: (sht3x) set initial jiffies to last_update
      2790aed0
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · f38d2e53
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes a number of regressions in the marvell cesa driver caused
        by the chaining work, and a regression in lib/mpi that leads to a
        GFP_KERNEL allocation with preemption disabled"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: marvell - Don't copy IV vectors from the _process op for ciphers
        lib/mpi: Fix SG miter leak
        crypto: marvell - Update cache with input sg only when it is unmapped
        crypto: marvell - Don't chain at DMA level when backlog is disabled
        crypto: marvell - Fix memory leaks in TDMA chain for cipher requests
      f38d2e53
    • L
      Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · aeb35d6b
      Linus Torvalds 提交于
      Pull x86 header cleanups from Ingo Molnar:
       "This tree is a cleanup of the x86 tree reducing spurious uses of
        module.h - which should improve build performance a bit"
      
      * 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
        x86/apic: Remove duplicated include from probe_64.c
        x86/ce4100: Remove duplicated include from ce4100.c
        x86/headers: Include spinlock_types.h in x8664_ksyms_64.c for missing spinlock_t
        x86/platform: Delete extraneous MODULE_* tags fromm ts5500
        x86: Audit and remove any remaining unnecessary uses of module.h
        x86/kvm: Audit and remove any unnecessary uses of module.h
        x86/xen: Audit and remove any unnecessary uses of module.h
        x86/platform: Audit and remove any unnecessary uses of module.h
        x86/lib: Audit and remove any unnecessary uses of module.h
        x86/kernel: Audit and remove any unnecessary uses of module.h
        x86/mm: Audit and remove any unnecessary uses of module.h
        x86: Don't use module.h just for AUTHOR / LICENSE tags
      aeb35d6b
  2. 01 8月, 2016 15 次提交
    • L
      Merge tag 'backlight-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 7a66ecfd
      Linus Torvalds 提交于
      Pull backlight updates from Lee Jones:
       "Add support for an enable regulator to lp855x_bl"
      
      * tag 'backlight-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: lp855x: Add enable regulator
      7a66ecfd
    • L
      Merge tag 'mfd-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 06e23d51
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "Core Framework:
         - New API to call bespoke pre/post IRQ handlers; Regmap
      
        New Device Support:
         - Add support for RN5T567 to rn5t618
         - Add support for COMe-cSL6 and COMe-mAL10 to kempld-core
      
        New Functionality:
         - Add support for USB Power Supply to axp20x
         - Add support for Power Key to hi655x-pmic
      
        Fix-ups:
         - Update MAINTAINERS; Dialog, Altera
         - Remove module support; max77843, max77620, max8998, max8997, max8925-i2c
         - Add module support; max14577
         - Constifying; max77620
         - Allow bespoke IRQ masking/unmasking; max77620
         - Remove superfluous code; arizona, qcom_rpm, smsc-ece1099
         - Power Management fixups; arizona-core
         - Error-path improvement; twl-core, dm355evm_msp, smsc-ece1099, hi655x
         - Clocking fixups; twl6040
         - Trivial (spelling, headers, coding-style, whitespace, (re)naming);
             si476x-i2c, omap-usb-tll, ti_am335x_tscadc, tps6507, hi655x-pmic
      
        Bug Fixes:
         - Fix offset error for MSM8660; qcom_rpm
         - Fix possible spurious IRQs; arizona, hi655x-pmic"
      
      * tag 'mfd-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (42 commits)
        mfd: qcom_rpm: Parametrize also ack selector size
        mfd: twl6040: Handle mclk used for HPPLL and optional internal clock source
        mfd: Add support for COMe-cSL6 and COMe-mAL10 to Kontron PLD driver
        mfd: hi655x: Fix return value check in hi655x_pmic_probe()
        mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe()
        mfd: smsc-ece1099: Delete an unnecessary variable initialisation in smsc_i2c_probe()
        mfd: dm355evm_msp: Return directly after a failed platform_device_alloc() in add_child()
        mfd: twl-core: Refactoring for add_numbered_child()
        mfd: twl-core: Return directly after a failed platform_device_alloc() in add_numbered_child()
        mfd: arizona: Add missing disable of PM runtime on probe error path
        mfd: stmpe: Move platform data into MFD driver
        mfd: max14577: Allow driver to be built as a module
        mfd: max14577: Use module_init() instead of subsys_initcall()
        mfd: arizona: Remove some duplicate defines
        mfd: qcom_rpm: Remove unused define
        mfd: hi655x-pmic: Add powerkey device to hi655x PMIC driver
        mfd: hi655x-pmic: Rename some interrupt macro names
        mfd: hi655x-pmic: Fixup issue with un-acked interrupts
        mfd: arizona: Check if AOD interrupts are pending before dispatching
        mfd: qcom_rpm: Fix offset error for msm8660
        ...
      06e23d51
    • L
      Merge tag 'iommu-updates-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · dd967117
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
      
       - big-endian support and preparation for defered probing for the Exynos
         IOMMU driver
      
       - simplifications in iommu-group id handling
      
       - support for Mediatek generation one IOMMU hardware
      
       - conversion of the AMD IOMMU driver to use the generic IOVA allocator.
         This driver now also benefits from the recent scalability
         improvements in the IOVA code.
      
       - preparations to use generic DMA mapping code in the Rockchip IOMMU
         driver
      
       - device tree adaption and conversion to use generic page-table code
         for the MSM IOMMU driver
      
       - an iova_to_phys optimization in the ARM-SMMU driver to greatly
         improve page-table teardown performance with VFIO
      
       - various other small fixes and conversions
      
      * tag 'iommu-updates-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (59 commits)
        iommu/amd: Initialize dma-ops domains with 3-level page-table
        iommu/amd: Update Alias-DTE in update_device_table()
        iommu/vt-d: Return error code in domain_context_mapping_one()
        iommu/amd: Use container_of to get dma_ops_domain
        iommu/amd: Flush iova queue before releasing dma_ops_domain
        iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back
        iommu/amd: Use dev_data->domain in get_domain()
        iommu/amd: Optimize map_sg and unmap_sg
        iommu/amd: Introduce dir2prot() helper
        iommu/amd: Implement timeout to flush unmap queues
        iommu/amd: Implement flush queue
        iommu/amd: Allow NULL pointer parameter for domain_flush_complete()
        iommu/amd: Set up data structures for flush queue
        iommu/amd: Remove align-parameter from __map_single()
        iommu/amd: Remove other remains of old address allocator
        iommu/amd: Make use of the generic IOVA allocator
        iommu/amd: Remove special mapping code for dma_ops path
        iommu/amd: Pass gfp-flags to iommu_map_page()
        iommu/amd: Implement apply_dm_region call-back
        iommu/amd: Create a list of reserved iova addresses
        ...
      dd967117
    • L
      Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 77d9ada2
      Linus Torvalds 提交于
      Pull mailbox updates from Jussi Brar:
       "Broadcom:
         - New PDC controller driver and bindings
      
        Misc:
         - PL320 - Convert from 'raw' IO to 'relaxed' version
         - Test - fix dangling pointer"
      
      * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: Fix format and type mismatches in Broadcom PDC driver
        mailbox: Add Broadcom PDC mailbox driver
        dt-bindings: add bindings documentation for PDC driver.
        mailbox: pl320: remove __raw IO
        mailbox: mailbox-test: set tdev->signal to NULL after freeing
      77d9ada2
    • L
      Merge tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc · 07f00f06
      Linus Torvalds 提交于
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - A couple of changes to improve the support for erase/discard/trim cmds
         - Add eMMC HS400 enhanced strobe support
         - Show OCR and DSR registers in SYSFS for MMC/SD cards
         - Correct and improve busy detection logic for MMC switch (CMD6) cmds
         - Disable HPI cmds for certain broken Hynix eMMC cards
         - Allow MMC hosts to specify non-support for SD and MMC cmds
         - Some minor additional fixes
      
        MMC host:
         - sdhci: Re-works, fixes and clean-ups
         - sdhci: Add HW auto re-tuning support
         - sdhci: Re-factor code to prepare for adding support for eMMC CMDQ
         - sdhci-esdhc-imx: Fixes and clean-ups
         - sdhci-esdhc-imx: Update system PM support
         - sdhci-esdhc-imx: Enable HW auto re-tuning
         - sdhci-bcm2835: Remove driver as sdhci-iproc is used instead
         - sdhci-brcmstb: Add new driver for Broadcom BRCMSTB SoCs
         - sdhci-msm: Add support for UHS cards
         - sdhci-tegra: Improve support for UHS cards
         - sdhci-of-arasan: Update phy support for Rockchip SoCs
         - sdhci-of-arasan: Deploy enhanced strobe support
         - dw_mmc: Some fixes and clean-ups
         - dw_mmc: Enable support for erase/discard/trim cmds
         - dw_mmc: Enable CMD23 support
         - mediatek: Some fixes related to the eMMC HS400 support
         - sh_mmcif: Improve support for HW busy detection
         - rtsx_pci: Enable support for erase/discard/trim cmds"
      
      * tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc: (135 commits)
        mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue
        mmc: rtsx_pci: Enable MMC_CAP_ERASE to allow erase/discard/trim requests
        mmc: rtsx_pci: Use the provided busy timeout from the mmc core
        mmc: sdhci-pltfm: Drop define for SDHCI_PLTFM_PMOPS
        mmc: sdhci-pltfm: Convert to use the SET_SYSTEM_SLEEP_PM_OPS
        mmc: sdhci-pltfm: Make sdhci_pltfm_suspend|resume() static
        mmc: sdhci-esdhc-imx: Use common sdhci_suspend|resume_host()
        mmc: sdhci-esdhc-imx: Assign system PM ops within #ifdef CONFIG_PM_SLEEP
        mmc: sdhci-sirf: Remove non needed #ifdef CONFIG_PM* for dev_pm_ops
        mmc: sdhci-s3c: Remove non needed #ifdef CONFIG_PM for dev_pm_ops
        mmc: sdhci-pxav3: Remove non needed #ifdef CONFIG_PM for dev_pm_ops
        mmc: sdhci-of-esdhc: Simplify code by using SIMPLE_DEV_PM_OPS
        mmc: sdhci-acpi: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
        mmc: sdhci-pci-core: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
        mmc: Change the max discard sectors and erase response when HW busy detect
        phy: rockchip-emmc: Wait even longer for the DLL to lock
        phy: rockchip-emmc: Be tolerant to card clock of 0 in power on
        mmc: sdhci-of-arasan: Revert: Always power the PHY off/on when clock changes
        mmc: sdhci-msm: Add support for UHS cards
        mmc: sdhci-msm: Add set_uhs_signaling() implementation
        ...
      07f00f06
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 27acbec3
      Linus Torvalds 提交于
      Pull watchdog updates from Wim Van Sebroeck:
       "Core:
         - min and max timeout improvements, WDOG_HW_RUNNING improvements,
           status funtionality
         - Add a device managed API for watchdog_register_device()
      
        New watchdog drivers:
         -  Aspeed SoCs
         -  Maxim PMIC MAX77620
         -  Amlogic Meson GXBB SoC
      
        Enhancements:
         - support for the r8a7796 watchdog device
         - support for F81866 watchdog device
         - support for 5th variation of Apollo Lake
         - support for MCP78S chipset
         - clean-up of softdog.c watchdog device driver
         - pic32-wdt and pic32-dmt fixes
         - Documentation/watchdog: watchdog-test improvements
         - several other fixes and improvements"
      
      * git://www.linux-watchdog.org/linux-watchdog: (50 commits)
        watchdog: gpio_wdt: Fix missing platform_set_drvdata() in gpio_wdt_probe()
        watchdog: core: Clear WDOG_HW_RUNNING before calling the stop function
        watchdog: core: Fix error handling of watchdog_dev_init()
        watchdog: pic32-wdt: Fix return value check in pic32_wdt_drv_probe()
        watchdog: pic32-dmt: Remove .owner field for driver
        watchdog: pic32-wdt: Remove .owner field for driver
        watchdog: renesas-wdt: Add support for the r8a7796 wdt
        Documentation/watchdog: check return value for magic close
        watchdog: sbsa: Drop status function
        watchdog: Implement status function in watchdog core
        watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout
        watchdog: change watchdog_need_worker logic
        watchdog: add support for MCP78S chipset in nv_tco
        watchdog: bcm2835_wdt: remove redundant ->set_timeout callback
        watchdog: bcm2835_wdt: constify _ops and _info structures
        dt-bindings: watchdog: Add Meson GXBB Watchdog bindings
        watchdog: Add Meson GXBB Watchdog Driver
        watchdog: qcom: configure BARK time in addition to BITE time
        watchdog: qcom: add option for standalone watchdog not in timer block
        watchdog: qcom: update device tree bindings
        ...
      27acbec3
    • L
      Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ba929b66
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "This pull is dedicated to Josef's enospc rework, which we've been
        testing for a few releases now.  It fixes some early enospc problems
        and is dramatically faster.
      
        This also includes an updated fix for the delalloc accounting that
        happens after a fault in copy_from_user.  My patch in v4.7 was almost
        but not quite enough"
      
      * 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix delalloc accounting after copy_from_user faults
        Btrfs: avoid deadlocks during reservations in btrfs_truncate_block
        Btrfs: use FLUSH_LIMIT for relocation in reserve_metadata_bytes
        Btrfs: fill relocation block rsv after allocation
        Btrfs: always use trans->block_rsv for orphans
        Btrfs: change how we calculate the global block rsv
        Btrfs: use root when checking need_async_flush
        Btrfs: don't bother kicking async if there's nothing to reclaim
        Btrfs: fix release reserved extents trace points
        Btrfs: add fsid to some tracepoints
        Btrfs: add tracepoints for flush events
        Btrfs: fix delalloc reservation amount tracepoint
        Btrfs: trace pinned extents
        Btrfs: introduce ticketed enospc infrastructure
        Btrfs: add tracepoint for adding block groups
        Btrfs: warn_on for unaccounted spaces
        Btrfs: change delayed reservation fallback behavior
        Btrfs: always reserve metadata for delalloc extents
        Btrfs: fix callers of btrfs_block_rsv_migrate
        Btrfs: add bytes_readonly to the spaceinfo at once
      ba929b66
    • M
      hwmon: (adt7411) set sane values for CFG1 and CFG3 · 601807bb
      Michael Walle 提交于
      According to the datasheet we have to set some bits as 0 and others as 1.
      Make sure we do this for CFG1 and CFG3.
      Signed-off-by: NMichael Walle <michael@walle.cc>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      601807bb
    • Q
      hwmon: (iio_hwmon) fix memory leak in name attribute · 5d17d3b4
      Quentin Schulz 提交于
      The "name" variable's memory is now freed when the device is destructed
      thanks to devm function.
      Signed-off-by: NQuentin Schulz <quentin.schulz@free-electrons.com>
      Reported-by: NGuenter Roeck <linux@roeck-us.net>
      Fixes: e0f8a24e ("staging:iio::hwmon interface client driver.")
      Fixes: 61bb53bc ("hwmon: (iio_hwmon) Add support for humidity sensors")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      5d17d3b4
    • G
      hwmon: (ftsteutates) Fix potential memory access error · 4c8702b3
      Guenter Roeck 提交于
      Using set_bit() to set a bit in an integer is not a good idea, since
      the function expects an unsigned long as argument, which can be 64 bit
      wide. Coverity reports this problem as
      
      >>>     CID 1364488:  Memory - illegal accesses  (INCOMPATIBLE_CAST)
      >>>     Pointer "&ret" points to an object whose effective type is "int"
      >>>	(32 bits, signed) but is dereferenced as a wider "unsigned
      +long" (64 bits, unsigned).  This may lead to memory corruption.
      245                     set_bit(1, (unsigned long *)&ret);
      
      Just use BIT instead.
      
      Cc: Thilo Cestonaro <thilo@cestona.ro>
      Fixes: 08426eda ("hwmon: Add driver for FTS BMC chip "Teutates"")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      4c8702b3
    • G
      hwmon: (tmp102) Improve error handling · 1aa4f028
      Guenter Roeck 提交于
      Use devm_add_action_or_reset() instead of devm_add_action(), and
      check its return code.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      1aa4f028
    • G
      hwmon: (lm75) Improve error handling · 90e2b545
      Guenter Roeck 提交于
      Use devm_add_action_or_reset() instead of devm_add_action(), and
      check its return value.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      90e2b545
    • G
      hwmon: (lm90) Improve error handling · c5fcf01b
      Guenter Roeck 提交于
      Replace devm_add_action() with devm_add_action_or_reset(),
      and check its return value.
      Reviewed-by: NJean Delvare <jdelvare@suse.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      c5fcf01b
    • G
      hwmon: (lm90) Add missing assignment · be9d6374
      Guenter Roeck 提交于
      Coverity reports the following error.
      
      >>>     CID 1364474:  Error handling issues  (CHECKED_RETURN)
      >>>     Calling "lm90_read_reg" without checking return value (as is done
      >>>     elsewhere 28 out of 29 times).
      532             lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH);
      533             if (val < 0)
      534                     return val;
      
      Fixes: 10bfef47 ("hwmon: (lm90) Read limit registers only once")
      Reviewed-by: NJean Delvare <jdelvare@suse.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      be9d6374
    • M
      hwmon: (sht3x) set initial jiffies to last_update · 991f9fa9
      Matt Ranostay 提交于
      Handling the wraparound requires the data->last_update to be set to an
      initial jiffies value. Otherwise on 32-bit systems you will not be able
      to request a reading till the 5 minute jiffies rollover happens.
      
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: David Frey <david.frey@sensirion.com>
      Signed-off-by: NMatt Ranostay <mranostay@gmail.com>
      Reviewed-by: NJean Delvare <jdelvare@suse.de>
      Fixes: 7c84f7f8 ("hwmon: add support for Sensirion SHT3x sensors")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      991f9fa9
  3. 31 7月, 2016 9 次提交
    • L
      Merge tag 'sound-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · c9b95e59
      Linus Torvalds 提交于
      Pull sound updates from Takashi Iwai:
       "The majority of this update is about ASoC, including a few new
        drivers, and the rest are mostly minor changes.  The only substantial
        change in ALSA core is about the additional error handling in the
        compress-offload API.  Below are highlights:
      
         - Add the error propagating support in compress-offload API
      
         - HD-audio: a usual Dell headset fixup, an Intel HDMI/DP fix, and the
           default mixer setup change ot turn off the loopback
      
         - Lots of updates for ASoC Intel drivers, mostly board support and
           bug fixing, and to the NAU8825 driver
      
         - Work on generalizing bits of simple-card to allow more code sharing
           with the Renesas rsrc-card (which can't use simple-card due to DPCM)
      
         - Removal of the Odroid X2 driver due to replacement with simple-card
      
         - Support for several new Mediatek platforms and associated boards
      
         - New ASoC drivers for Allwinner A10, Analog Devices ADAU7002,
           Broadcom Cygnus, Cirrus Logic CS35L33 and CS53L30, Maxim MAX8960
           and MAX98504, Realtek RT5514 and Wolfson WM8758"
      
      * tag 'sound-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (278 commits)
        sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()
        ASoC: Intel: Skylake: Delete an unnecessary check before the function call "release_firmware"
        ASoC: Intel: Skylake: Fix NULL Pointer exception in dynamic_debug.
        ASoC: samsung: Specify DMA channels through struct snd_dmaengine_pcm_config
        ASoC: samsung: Fix error paths in the I2S driver's probe()
        ASoC: cs53l30: Fix bit shift issue of TDM mode
        ASoC: cs53l30: Fix a bug for TDM slot location validation
        ASoC: rockchip: correct the spdif clk
        ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members
        ASoC: rsrc-card: use asoc_simple_card_parse_card_name()
        ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai
        ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name()
        ASoC: simple-card: use asoc_simple_card_parse_card_name()
        ASoC: simple-card-utils: add asoc_simple_card_parse_card_name()
        ASoC: simple-card: use asoc_simple_card_parse_dailink_name()
        ASoC: simple-card-utils: add asoc_simple_card_set_dailink_name()
        ASoC: nau8825: drop redundant idiom when converting integer to boolean
        ASoC: nau8825: jack connection decision with different insertion logic
        ASoC: mediatek: Add HDMI dai-links to the mt8173-rt5650 machine driver
        ASoC: mediatek: mt2701: fix non static symbol warning
        ...
      c9b95e59
    • L
      Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · bad60e6f
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
       "Highlights:
         - PowerNV PCI hotplug support.
         - Lots more Power9 support.
         - eBPF JIT support on ppc64le.
         - Lots of cxl updates.
         - Boot code consolidation.
      
        Bug fixes:
         - Fix spin_unlock_wait() from Boqun Feng
         - Fix stack pointer corruption in __tm_recheckpoint() from Michael
           Neuling
         - Fix multiple bugs in memory_hotplug_max() from Bharata B Rao
         - mm: Ensure "special" zones are empty from Oliver O'Halloran
         - ftrace: Separate the heuristics for checking call sites from
           Michael Ellerman
         - modules: Never restore r2 for a mprofile-kernel style mcount() call
           from Michael Ellerman
         - Fix endianness when reading TCEs from Alexey Kardashevskiy
         - start rtasd before PCI probing from Greg Kurz
         - PCI: rpaphp: Fix slot registration for multiple slots under a PHB
           from Tyrel Datwyler
         - powerpc/mm: Add memory barrier in __hugepte_alloc() from Sukadev
           Bhattiprolu
      
        Cleanups & fixes:
         - Drop support for MPIC in pseries from Rashmica Gupta
         - Define and use PPC64_ELF_ABI_v2/v1 from Michael Ellerman
         - Remove unused symbols in asm-offsets.c from Rashmica Gupta
         - Fix SRIOV not building without EEH enabled from Russell Currey
         - Remove kretprobe_trampoline_holder from Thiago Jung Bauermann
         - Reduce log level of PCI I/O space warning from Benjamin
           Herrenschmidt
         - Add array bounds checking to crash_shutdown_handlers from Suraj
           Jitindar Singh
         - Avoid -maltivec when using clang integrated assembler from Anton
           Blanchard
         - Fix array overrun in ppc_rtas() syscall from Andrew Donnellan
         - Fix error return value in cmm_mem_going_offline() from Rasmus
           Villemoes
         - export cpu_to_core_id() from Mauricio Faria de Oliveira
         - Remove old symbols from defconfigs from Andrew Donnellan
         - Update obsolete comments in setup_32.c about entry conditions from
           Benjamin Herrenschmidt
         - Add comment explaining the purpose of setup_kdump_trampoline() from
           Benjamin Herrenschmidt
         - Merge the RELOCATABLE config entries for ppc32 and ppc64 from Kevin
           Hao
         - Remove RELOCATABLE_PPC32 from Kevin Hao
         - Fix .long's in tlb-radix.c to more meaningful from Balbir Singh
      
        Minor cleanups & fixes:
         - Andrew Donnellan, Anna-Maria Gleixner, Anton Blanchard, Benjamin
           Herrenschmidt, Bharata B Rao, Christophe Leroy, Colin Ian King,
           Geliang Tang, Greg Kurz, Madhavan Srinivasan, Michael Ellerman,
           Michael Ellerman, Stephen Rothwell, Stewart Smith.
      
        Freescale updates from Scott:
         - "Highlights include more 8xx optimizations, device tree updates,
           and MVME7100 support."
      
        PowerNV PCI hotplug from Gavin Shan:
         - PCI: Add pcibios_setup_bridge()
         - Override pcibios_setup_bridge()
         - Remove PCI_RESET_DELAY_US
         - Move pnv_pci_ioda_setup_opal_tce_kill() around
         - Increase PE# capacity
         - Allocate PE# in reverse order
         - Create PEs in pcibios_setup_bridge()
         - Setup PE for root bus
         - Extend PCI bridge resources
         - Make pnv_ioda_deconfigure_pe() visible
         - Dynamically release PE
         - Update bridge windows on PCI plug
         - Delay populating pdn
         - Support PCI slot ID
         - Use PCI slot reset infrastructure
         - Introduce pnv_pci_get_slot_id()
         - Functions to get/set PCI slot state
         - PCI/hotplug: PowerPC PowerNV PCI hotplug driver
         - Print correct PHB type names
      
        Power9 idle support from Shreyas B. Prabhu:
         - set power_save func after the idle states are initialized
         - Use PNV_THREAD_WINKLE macro while requesting for winkle
         - make hypervisor state restore a function
         - Rename idle_power7.S to idle_book3s.S
         - Rename reusable idle functions to hardware agnostic names
         - Make pnv_powersave_common more generic
         - abstraction for saving SPRs before entering deep idle states
         - Add platform support for stop instruction
         - cpuidle/powernv: Use CPUIDLE_STATE_MAX instead of MAX_POWERNV_IDLE_STATES
         - cpuidle/powernv: cleanup cpuidle-powernv.c
         - cpuidle/powernv: Add support for POWER ISA v3 idle states
         - Use deepest stop state when cpu is offlined
      
        Power9 PMU from Madhavan Srinivasan:
         - factor out power8 pmu macros and defines
         - factor out power8 pmu functions
         - factor out power8 __init_pmu code
         - Add power9 event list macros for generic and cache events
         - Power9 PMU support
         - Export Power9 generic and cache events to sysfs
      
        Power9 preliminary interrupt & PCI support from Benjamin Herrenschmidt:
         - Add XICS emulation APIs
         - Move a few exception common handlers to make room
         - Add support for HV virtualization interrupts
         - Add mechanism to force a replay of interrupts
         - Add ICP OPAL backend
         - Discover IODA3 PHBs
         - pci: Remove obsolete SW invalidate
         - opal: Add real mode call wrappers
         - Rename TCE invalidation calls
         - Remove SWINV constants and obsolete TCE code
         - Rework accessing the TCE invalidate register
         - Fallback to OPAL for TCE invalidations
         - Use the device-tree to get available range of M64's
         - Check status of a PHB before using it
         - pci: Don't try to allocate resources that will be reassigned
      
        Other Power9:
         - Send SIGBUS on unaligned copy and paste from Chris Smart
         - Large Decrementer support from Oliver O'Halloran
         - Load Monitor Register Support from Jack Miller
      
        Performance improvements from Anton Blanchard:
         - Avoid load hit store in __giveup_fpu() and __giveup_altivec()
         - Avoid load hit store in setup_sigcontext()
         - Remove assembly versions of strcpy, strcat, strlen and strcmp
         - Align hot loops of some string functions
      
        eBPF JIT from Naveen N. Rao:
         - Fix/enhance 32-bit Load Immediate implementation
         - Optimize 64-bit Immediate loads
         - Introduce rotate immediate instructions
         - A few cleanups
         - Isolate classic BPF JIT specifics into a separate header
         - Implement JIT compiler for extended BPF
      
        Operator Panel driver from Suraj Jitindar Singh:
         - devicetree/bindings: Add binding for operator panel on FSP machines
         - Add inline function to get rc from an ASYNC_COMP opal_msg
         - Add driver for operator panel on FSP machines
      
        Sparse fixes from Daniel Axtens:
         - make some things static
         - Introduce asm-prototypes.h
         - Include headers containing prototypes
         - Use #ifdef __BIG_ENDIAN__ #else for REG_BYTE
         - kvm: Clarify __user annotations
         - Pass endianness to sparse
         - Make ppc_md.{halt, restart} __noreturn
      
        MM fixes & cleanups from Aneesh Kumar K.V:
         - radix: Update LPCR HR bit as per ISA
         - use _raw variant of page table accessors
         - Compile out radix related functions if RADIX_MMU is disabled
         - Clear top 16 bits of va only on older cpus
         - Print formation regarding the the MMU mode
         - hash: Update SDR1 size encoding as documented in ISA 3.0
         - radix: Update PID switch sequence
         - radix: Update machine call back to support new HCALL.
         - radix: Add LPID based tlb flush helpers
         - radix: Add a kernel command line to disable radix
         - Cleanup LPCR defines
      
        Boot code consolidation from Benjamin Herrenschmidt:
         - Move epapr_paravirt_early_init() to early_init_devtree()
         - cell: Don't use flat device-tree after boot
         - ge_imp3a: Don't use the flat device-tree after boot
         - mpc85xx_ds: Don't use the flat device-tree after boot
         - mpc85xx_rdb: Don't use the flat device-tree after boot
         - Don't test for machine type in rtas_initialize()
         - Don't test for machine type in smp_setup_cpu_maps()
         - dt: Add of_device_compatible_match()
         - Factor do_feature_fixup calls
         - Move 64-bit feature fixup earlier
         - Move 64-bit memory reserves to setup_arch()
         - Use a cachable DART
         - Move FW feature probing out of pseries probe()
         - Put exception configuration in a common place
         - Remove early allocation of the SMU command buffer
         - Move MMU backend selection out of platform code
         - pasemi: Remove IOBMAP allocation from platform probe()
         - mm/hash: Don't use machine_is() early during boot
         - Don't test for machine type to detect HEA special case
         - pmac: Remove spurrious machine type test
         - Move hash table ops to a separate structure
         - Ensure that ppc_md is empty before probing for machine type
         - Move 64-bit probe_machine() to later in the boot process
         - Move 32-bit probe() machine to later in the boot process
         - Get rid of ppc_md.init_early()
         - Move the boot time info banner to a separate function
         - Move setting of {i,d}cache_bsize to initialize_cache_info()
         - Move the content of setup_system() to setup_arch()
         - Move cache info inits to a separate function
         - Re-order the call to smp_setup_cpu_maps()
         - Re-order setup_panic()
         - Make a few boot functions __init
         - Merge 32-bit and 64-bit setup_arch()
      
        Other new features:
         - tty/hvc: Use IRQF_SHARED for OPAL hvc consoles from Sam Mendoza-Jonas
         - tty/hvc: Use opal irqchip interface if available from Sam Mendoza-Jonas
         - powerpc: Add module autoloading based on CPU features from Alastair D'Silva
         - crypto: vmx - Convert to CPU feature based module autoloading from Alastair D'Silva
         - Wake up kopald polling thread before waiting for events from Benjamin Herrenschmidt
         - xmon: Dump ISA 2.06 SPRs from Michael Ellerman
         - xmon: Dump ISA 2.07 SPRs from Michael Ellerman
         - Add a parameter to disable 1TB segs from Oliver O'Halloran
         - powerpc/boot: Add OPAL console to epapr wrappers from Oliver O'Halloran
         - Assign fixed PHB number based on device-tree properties from Guilherme G. Piccoli
         - pseries: Add pseries hotplug workqueue from John Allen
         - pseries: Add support for hotplug interrupt source from John Allen
         - pseries: Use kernel hotplug queue for PowerVM hotplug events from John Allen
         - pseries: Move property cloning into its own routine from Nathan Fontenot
         - pseries: Dynamic add entires to associativity lookup array from Nathan Fontenot
         - pseries: Auto-online hotplugged memory from Nathan Fontenot
         - pseries: Remove call to memblock_add() from Nathan Fontenot
      
        cxl:
         - Add set and get private data to context struct from Michael Neuling
         - make base more explicitly non-modular from Paul Gortmaker
         - Use for_each_compatible_node() macro from Wei Yongjun
         - Frederic Barrat
         - Abstract the differences between the PSL and XSL
         - Make vPHB device node match adapter's
         - Philippe Bergheaud
         - Add mechanism for delivering AFU driver specific events
         - Ignore CAPI adapters misplaced in switched slots
         - Refine slice error debug messages
         - Andrew Donnellan
         - static-ify variables to fix sparse warnings
         - PCI/hotplug: pnv_php: export symbols and move struct types needed by cxl
         - PCI/hotplug: pnv_php: handle OPAL_PCI_SLOT_OFFLINE power state
         - Add cxl_check_and_switch_mode() API to switch bi-modal cards
         - remove dead Kconfig options
         - fix potential NULL dereference in free_adapter()
         - Ian Munsie
         - Update process element after allocating interrupts
         - Add support for CAPP DMA mode
         - Fix allowing bogus AFU descriptors with 0 maximum processes
         - Fix allocating a minimum of 2 pages for the SPA
         - Fix bug where AFU disable operation had no effect
         - Workaround XSL bug that does not clear the RA bit after a reset
         - Fix NULL pointer dereference on kernel contexts with no AFU interrupts
         - powerpc/powernv: Split cxl code out into a separate file
         - Add cxl_slot_is_supported API
         - Enable bus mastering for devices using CAPP DMA mode
         - Move cxl_afu_get / cxl_afu_put to base
         - Allow a default context to be associated with an external pci_dev
         - Do not create vPHB if there are no AFU configuration records
         - powerpc/powernv: Add support for the cxl kernel api on the real phb
         - Add support for using the kernel API with a real PHB
         - Add kernel APIs to get & set the max irqs per context
         - Add preliminary workaround for CX4 interrupt limitation
         - Add support for interrupts on the Mellanox CX4
         - Workaround PE=0 hardware limitation in Mellanox CX4
         - powerpc/powernv: Fix pci-cxl.c build when CONFIG_MODULES=n
      
        selftests:
         - Test unaligned copy and paste from Chris Smart
         - Load Monitor Register Tests from Jack Miller
         - Cyril Bur
         - exec() with suspended transaction
         - Use signed long to read perf_event_paranoid
         - Fix usage message in context_switch
         - Fix generation of vector instructions/types in context_switch
         - Michael Ellerman
         - Use "Delta" rather than "Error" in normal output
         - Import Anton's mmap & futex micro benchmarks
         - Add a test for PROT_SAO"
      
      * tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (263 commits)
        powerpc/mm: Parenthesise IS_ENABLED() in if condition
        tty/hvc: Use opal irqchip interface if available
        tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
        selftests/powerpc: exec() with suspended transaction
        powerpc: Improve comment explaining why we modify VRSAVE
        powerpc/mm: Drop unused externs for hpte_init_beat[_v3]()
        powerpc/mm: Rename hpte_init_lpar() and move the fallback to a header
        powerpc/mm: Fix build break when PPC_NATIVE=n
        crypto: vmx - Convert to CPU feature based module autoloading
        powerpc: Add module autoloading based on CPU features
        powerpc/powernv/ioda: Fix endianness when reading TCEs
        powerpc/mm: Add memory barrier in __hugepte_alloc()
        powerpc/modules: Never restore r2 for a mprofile-kernel style mcount() call
        powerpc/ftrace: Separate the heuristics for checking call sites
        powerpc: Merge 32-bit and 64-bit setup_arch()
        powerpc/64: Make a few boot functions __init
        powerpc: Re-order setup_panic()
        powerpc: Re-order the call to smp_setup_cpu_maps()
        powerpc/32: Move cache info inits to a separate function
        powerpc/64: Move the content of setup_system() to setup_arch()
        ...
      bad60e6f
    • M
      random: Fix crashes with sparse node ids · dd0f0cf5
      Michael Ellerman 提交于
      On a system with sparse node ids, eg. a powerpc system with 4 nodes
      numbered like so:
      
        node   0: [mem 0x0000000000000000-0x00000007ffffffff]
        node   1: [mem 0x0000000800000000-0x0000000fffffffff]
        node  16: [mem 0x0000001000000000-0x00000017ffffffff]
        node  17: [mem 0x0000001800000000-0x0000001fffffffff]
      
      The code in rand_initialize() will allocate 4 pointers for the pool
      array, and initialise them correctly.
      
      However when go to use the pool, in eg. extract_crng(), we use the
      numa_node_id() to index into the array. For the higher numbered node ids
      this leads to random memory corruption, depending on what was kmalloc'ed
      adjacent to the pool array.
      
      Fix it by using nr_node_ids to size the pool array.
      
      Fixes: 1e7f583a ("random: make /dev/urandom scalable for silly userspace programs")
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dd0f0cf5
    • L
      Merge tag 'nfs-for-4.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 7f155c70
      Linus Torvalds 提交于
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
        Stable bugfixes:
         - nfs: don't create zero-length requests
      
         - several LAYOUTGET bugfixes
      
        Features:
         - several performance related features
      
         - more aggressive caching when we can rely on close-to-open
           cache consistency
      
         - remove serialisation of O_DIRECT reads and writes
      
         - optimise several code paths to not flush to disk unnecessarily.
      
           However allow for the idiosyncracies of pNFS for those layout
           types that need to issue a LAYOUTCOMMIT before the metadata can
           be updated on the server.
      
         - SUNRPC updates to the client data receive path
      
         - pNFS/SCSI support RH/Fedora dm-mpath device nodes
      
         - pNFS files/flexfiles can now use unprivileged ports when
           the generic NFS mount options allow it.
      
        Bugfixes:
         - Don't use RDMA direct data placement together with data
           integrity or privacy security flavours
      
         - Remove the RDMA ALLPHYSICAL memory registration mode as
           it has potential security holes.
      
         - Several layout recall fixes to improve NFSv4.1 protocol
           compliance.
      
         - Fix an Oops in the pNFS files and flexfiles connection
           setup to the DS
      
         - Allow retry of operations that used a returned delegation
            stateid
      
         - Don't mark the inode as revalidated if a LAYOUTCOMMIT is
           outstanding
      
         - Fix writeback races in nfs4_copy_range() and
           nfs42_proc_deallocate()"
      
      * tag 'nfs-for-4.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (104 commits)
        pNFS: Actively set attributes as invalid if LAYOUTCOMMIT is outstanding
        NFSv4: Clean up lookup of SECINFO_NO_NAME
        NFSv4.2: Fix warning "variable ‘stateids’ set but not used"
        NFSv4: Fix warning "no previous prototype for ‘nfs4_listxattr’"
        SUNRPC: Fix a compiler warning in fs/nfs/clnt.c
        pNFS: Remove redundant smp_mb() from pnfs_init_lseg()
        pNFS: Cleanup - do layout segment initialisation in one place
        pNFS: Remove redundant stateid invalidation
        pNFS: Remove redundant pnfs_mark_layout_returned_if_empty()
        pNFS: Clear the layout metadata if the server changed the layout stateid
        pNFS: Cleanup - don't open code pnfs_mark_layout_stateid_invalid()
        NFS: pnfs_mark_matching_lsegs_return() should match the layout sequence id
        pNFS: Do not set plh_return_seq for non-callback related layoutreturns
        pNFS: Ensure layoutreturn acts as a completion for layout callbacks
        pNFS: Fix CB_LAYOUTRECALL stateid verification
        pNFS: Always update the layout barrier seqid on LAYOUTGET
        pNFS: Always update the layout stateid if NFS_LAYOUT_INVALID_STID is set
        pNFS: Clear the layout return tracking on layout reinitialisation
        pNFS: LAYOUTRETURN should only update the stateid if the layout is valid
        nfs: don't create zero-length requests
        ...
      7f155c70
    • L
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d761f3ed
      Linus Torvalds 提交于
      Pull x86 microcode updates from Thomas Gleixner:
      
       - more work to make the microcode loader robust
      
       - a fix for the micro code load precedence
      
       - fixes for initrd loading with randomized memory
      
       - less printk noise on SMP machines
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/asm, x86/microcode: Add __PAGE_OFFSET_BASE define on 32-bit
        x86/microcode/intel: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y
        x86/microcode: Remove unused symbol exports
        x86/microcode/intel: Do not issue microcode updates messages on each CPU
        Documentation/microcode: Document some aspects for more clarity
        x86/microcode/AMD: Make amd_ucode_patch[] static
        x86/microcode/intel: Unexport save_mc_for_early()
        x86/microcode/intel: Rename load_microcode_early() to find_microcode_patch()
        x86/microcode: Propagate save_microcode_in_initrd() retval
        x86/microcode: Get rid of find_cpio_data()'s dummy offset arg
        lib/cpio: Make find_cpio_data()'s offset arg optional
        x86/microcode: Fix suspend to RAM with builtin microcode
        x86/microcode: Fix loading precedence
      d761f3ed
    • L
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b325e04e
      Linus Torvalds 提交于
      Pull x86 cpufeature updates from Thomas Gleixner:
      
       - a workaround for the MONITOR instruction erratum of Goldmont CPUs
      
       - small fixes and cleanups here and there
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpu: Add workaround for MONITOR instruction erratum on Goldmont based CPUs
        x86/cpu: Rename "WESTMERE2" family to "NEHALEM_G"
        x86/amd_nb: Clean up init path
        x86/cpufeature: Add helper macro for mask check macros
        x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated
        x86/cpufeature: Update cpufeaure macros
      b325e04e
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7f7d5564
      Linus Torvalds 提交于
      Pull perf fixes from Thomas Gleixner:
       "This update contains:
      
         - a fix for the bpf tools to use the new EM_BPF code
      
         - a fix for the module parser of perf to retrieve the
           proper text start address
      
         - add str_error_c to libapi to avoid linking against
           tools/lib/str_error_r.o"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tools lib api: Add str_error_c to libapi
        perf s390: Fix 'start' address of module's map
        tools lib bpf: Use official ELF e_machine value
      7f7d5564
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 228ffba2
      Linus Torvalds 提交于
      Pull misc fixes from Thomas Gleixner:
       "This update contains:
      
         - a fix for stomp-machine so the nmi_watchdog wont trigger on the cpu
           waiting for the others to execute the callback
      
         - various fixes and updates to objtool including an resync of the
           instruction decoder to match the kernel's decoder"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Un-capitalize "Warning" for out-of-sync instruction decoder
        objtool: Resync x86 instruction decoder with the kernel's
        objtool: Support new GCC 6 switch jump table pattern
        stop_machine: Touch_nmi_watchdog() after MULTI_STOP_PREPARE
        objtool: Add 'fixdep' to objtool/.gitignore
      228ffba2
    • L
      Merge tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · f64d6e2a
      Linus Torvalds 提交于
      Pull DeviceTree updates from Rob Herring:
      
       - remove most of_platform_populate() calls in arch code.  Now the DT
         core code calls it in the default case and platforms only need to
         call it if they have special needs
      
       - use pr_fmt on all the DT core print statements
      
       - CoreSight binding doc improvements to block name descriptions
      
       - add dt_to_config script which can parse dts files and list
         corresponding kernel config options
      
       - fix memory leak hit with a PowerMac DT
      
       - correct a bunch of STMicro compatible strings to use the correct
         vendor prefix
      
       - fix DA9052 PMIC binding doc to match what is actually used in dts
         files
      
      * tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (35 commits)
        documentation: da9052: Update regulator bindings names to match DA9052/53 DTS expectations
        xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table"
        xtensa: Fix build error due to missing include file
        MIPS: ath79: Add missing include file
        Fix spelling errors in Documentation/devicetree
        ARM: dts: fix STMicroelectronics compatible strings
        powerpc/dts: fix STMicroelectronics compatible strings
        Documentation: dt: i2c: use correct STMicroelectronics vendor prefix
        scripts/dtc: dt_to_config - kernel config options for a devicetree
        of: fdt: mark unflattened tree as detached
        of: overlay: add resolver error prints
        coresight: document binding acronyms
        Documentation/devicetree: document cavium-pip rx-delay/tx-delay properties
        of: use pr_fmt prefix for all console printing
        of/irq: Mark initialised interrupt controllers as populated
        of: fix memory leak related to safe_name()
        Revert "of/platform: export of_default_bus_match_table"
        of: unittest: use of_platform_default_populate() to populate default bus
        memory: omap-gpmc: use of_platform_default_populate() to populate default bus
        bus: uniphier-system-bus: use of_platform_default_populate() to populate default bus
        ...
      f64d6e2a