summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-15Merge tag 'tegra-for-5.1-dt-bindings' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt dt-bindings: tegra: Changes for v5.1-rc1 This contains device tree binding updates for CPU frequency scaling on Tegra210, BPMP support on Tegra210 and support for NVIDIA Shield TV. * tag 'tegra-for-5.1-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: dt-bindings: cpufreq: tegra124: remove cpu_lp clock from required properties dt-bindings: cpufreq: tegra124: remove vdd-cpu-supply from required properties dt-bindings: clock: tegra124-dfll: add Tegra210 support dt-bindings: clock: tegra124-dfll: Update DFLL binding for PWM regulator dt-bindings: firmware: tegra186-bpmp: Remove name property dt-bindings: firmware: Add bindings for Tegra210 BPMP dt-bindings: tegra: Add Shield TV device tree binding documentation Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'renesas-arm-dt-for-v5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt Renesas ARM Based SoC DT Updates for v5.1 * R-Car H2 (r8a7790) based Stout board - Convert to new LVDS DT bindings * R-Car H1 (r8a7779) and M1A (r8a7778) SoCs - Describe HSCIF0/1 devices in DT * RZ/G1M (r8a7743) SoC - Correct sort order of the RWDT node - Remove aliases: should be defined in board rather than SoC DT if needed - Remove generic compatible string from iic3: it is not compatible * RZ/G1N (r8a7744) SoC - Describe LVDS and DU devices in DT - Correct sort order of VSP and MSIOF noces * RZ/G1C (r8a7747) based iWave SBC - Enable RTC * RZ/A2M (r7s9210) SoC and EVB - Initial support * tag 'renesas-arm-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: r8a7744: Add LVDS support ARM: dts: r8a7744: Add DU support ARM: dts: r7s9210-rza2mevb: Add support for RZ/A2M EVB ARM: dts: r7s9210: Initial SoC device tree ARM: dts: r8a7779: Add HSCIF0/1 device nodes ARM: dts: r8a7778: Add HSCIF0/1 support ARM: dts: r8a7743: Fix sorting of rwdt node ARM: dts: r8a7743: Remove aliases from SoC dtsi ARM: dts: r8a7743: Remove generic compatible string from iic3 ARM: dts: r8a7744: Fix sorting of vsp and msiof nodes ARM: dts: iwg23s-sbc: Enable RTC ARM: dts: stout: Convert to new LVDS DT bindings Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'renesas-arm64-dt2-for-v5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt Second Round of Renesas ARM64 Based SoC DT Updates for v5.1 * R-Car Gen3 SoC based Salvator-X, Salvator-XS and ULCB boards - Enable HS400 support for eMMC * R-Car E3 (r7a77990) SoC - Add OPPs table for cpu devices * RZ/G2E (r8a774c0) SoC - Describe TMU, CMT, SDHI devices in DT - Describe pincontrol support for SCIF2 device in DT - Add OPPs table for cpu devices * RZ/G2E (r8a774c0) based EK874 board and CAT875 sub-board, and CAT874 board - Initial support * tag 'renesas-arm64-dt2-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: dts: renesas: cat875: Enable PCIe support arm64: dts: renesas: r8a774c0-cat874: Add pciec0 support arm64: dts: renesas: r8a774c0: Add TMU device nodes arm64: dts: renesas: r8a774c0: Add CMT device nodes arm64: dts: renesas: r8a774c0: Add OPPs table for cpu devices arm64: dts: renesas: r8a77990: Add OPPs table for cpu devices arm64: dts: renesas: enable HS400 on R-Car Gen3 arm64: dts: renesas: cat875: Add ethernet support arm64: dts: renesas: r8a774c0-cat874: Add uSD support arm64: dts: renesas: r8a774c0-cat874: Add pincontrol support to scif2 arm64: dts: renesas: Add Si-Linux EK874 board support arm64: dts: renesas: Add Si-Linux CAT874 board support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'sunxi-dt-for-5.1-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt Allwinner DT changes for 5.1, take 2 Our usual bunch of DT changes for the Allwinner arm SoCs: - LCD support for the Q8 A13 tablets - GMAC support for the A80 - PMIC power supplies for the A83t * tag 'sunxi-dt-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: dts: sun8i: a83t: Enable PMIC power supplies on various boards ARM: dts: sun9i: cubieboard4: Enable GMAC ARM: dts: sun9i: a80-optimus: Enable GMAC ARM: dts: sun9i: Add A80 GMAC RGMII pinmux setting ARM: dts: sun9i: Add A80 GMAC gigabit ethernet controller node ARM: dts: sun9i: Add GMAC clock node ARM: dts: sun9i: cubieboard4: Add GPIO pin-bank regulator supplies ARM: dts: sun9i: a80-optimus: Add GPIO pin-bank regulator supplies ARM: dts: sun9i: a80-optimus: Add node for AXP809's unused dc1sw regulator ARM: dts: sun5i: q8-tablet: Use bananapi,s070wv20-ct16 panel compatible ARM: dts: sun5i: q8-tablet: Add LCD Panel power supply ARM: dts: sun5i: q8-tablet: Add LCD Panel enable GPIO ARM: dts: sun5i: q8-tablet: Move panel properties to correct node level ARM: dts: sun5i: Add backlight GPIO for reference design tablet Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'sunxi-dt64-for-5.1-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt Allwinner arm64 DT changes for 5.1, take 2 Our usual round of DT changes for the arm64 Allwinner SoCs: - Enabling of the various power supplies on most a64 boards - H6 SRAM controller support - A64 CSI support * tag 'sunxi-dt64-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: a64: Enable PMIC power supplies on various boards arm64: dts: allwinner: a64: teres-i: enable power supplies arm64: dts: allwinner: h6: Add support for the SRAM C1 section dt-bindings: sram: sunxi: Add compatible for the H6 SRAM C1 arm64: dts: allwinner: a64: Add A64 CSI controller arm64: dts: allwinner: h6: Move GIC device node fix base address ordering Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'sunxi-h3-h5-for-5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt Allwinner H3 and H5 changes for 5.1 Our usual round of DT changes shared between arm and arm64. We have a bunch of changes for board, improving the eMMC support on the H5 variant of the All-H3-CC, enabling HDMI and reworking the CSI driver. * tag 'sunxi-h3-h5-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: h5: libretech-all-h3-cc: Mark eMMC HS-DDR 3.3V capable ARM: dts: sunxi: h3/h5: Drop A31 fallback compatible for CSI controller ARM: dts: sun8i-h3: nanopi-m1-plus: enable HDMI Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'socfpga_dts_for_v5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt SoCFPGA DTS updates for v5.1 - Add SMMU node for Stratix10 - Add vendor prefix fo Novtech - Add a new 96Boards Chameleon96 board that uses a Cyclone5 SoCFPGA - Add missing reset properties for all IP on Cyclone5 and Arria10 * tag 'socfpga_dts_for_v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: dts: socfpga: update more missing reset properties ARM: dts: socfpga: update missing reset property peripherals ARM: dts: Add support for 96Boards Chameleon96 board dt-bindings: vendor-prefixes: Add Novtech Vendor Prefix arm64: dts: stratix10: Add Stratix10 SMMU support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'hisi-arm64-dt-for-5.1v2' of git://github.com/hisilicon/linux-hisi ↵Arnd Bergmann
into arm/dt ARM64: DT: Hisilicon SoCs DT updates for 5.1 * Hi6220 SoC and related boards: - Add DMA entries to enable DMA for Bluetooth transfers - Add power-on delay to make wifi stable - Revert HS200 mode to avoid eMMC controller resets and block read failures * Hi3660 SoC and related boards: - Fix SD card detection via setting cd-gpios correctly * Hi3798 SoC and related boards: - Fix malformed SPDX license identifier * tag 'hisi-arm64-dt-for-5.1v2' of git://github.com/hisilicon/linux-hisi: arm64: dts: hikey: Revert "Enable HS200 mode on eMMC" arm64: dts: hikey: Give wifi some time after power-on arm64: dts: hi3798cv200: fix malformed SPDX license identifier arm64: dts: hikey960: fix SDcard detection arm64: dts: hikey: Add DMA entries for Bluetooth UART Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'qcom-dts-for-5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/dt Qualcomm Device Tree Changes for v5.1 * Fixup GIC IRQ flags and GSBI state on MSM8660 * Add USB OTG, gpio ranges, and Wifi support on MSM8974 Hammerhead * Remove skeleton.dtsi on IPQ4019 * tag 'qcom-dts-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: dts: ipq4019: Remove skeleton.dtsi ARM: dts: qcom: msm8974-hammerhead: add USB OTG support ARM: dts: qcom: msm8974: add gpio-ranges ARM: dts: qcom: msm8974-hammerhead: add WiFi support ARM: dts: msm8660: Fix up GIC IRQ flags ARM: dts: msm8660: Mark two GSBI blocks "disabled" Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15netfilter: nf_tables: fix flush after rule deletion in the same batchPablo Neira Ayuso
Flush after rule deletion bogusly hits -ENOENT. Skip rules that have been already from nft_delrule_by_chain() which is always called from the flush path. Fixes: cf9dc09d0949 ("netfilter: nf_tables: fix missing rules flushing per table") Reported-by: Phil Sutter <phil@nwl.cc> Acked-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2019-02-15Merge tag 'qcom-arm64-for-5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/dt Qualcomm ARM64 Updates for v5.1 * Add MSM8998 RPMCC, I2C, and USB related nodes * Add MSM8996 rpmpd node * Fix typo in MSM8996 pin definitions * Disable MSM8996 VFE smmu to fix security violation * Add I2C, SPI, rpmcc, uart, and WCN3990 wlan nodes on QCS404 * Enable SDCC1 HS400 support on QCS404 * Add a multitude of nodes on SDM845: SD, UFS, USB, LPASS, SCM, QSPI, PDC, DPU, videocc, GPU, RPMh bus interconnect, WCN3990 WLAN * Add gpio ranges to SDM845 TLMM * Fix regulator load on sdcard on MSM8998-mtp board * tag 'qcom-arm64-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (41 commits) arm64: dts: sdm845: Add interconnect provider DT nodes arm64: dts: qcom: msm8996: Disabled VFE SMMU arm64: dts: qcom: qcs404: Add rpmcc node arm64: dts: qcom: msm8998: Add rpmcc node arm64: dts: qcom: msm8998: Add USB-related nodes arm64: dts: qcom: qcs404: Add QUP I2C and SPI nodes arm64: dts: qcom: qcs404: Define remaining UARTs arm64: dts: qcom: qcs404: Specify pinctrl state for UART arm64: dts: qcom: sdm845: Fix lpasscc reg arm64: dts: qcom: sdm845: Remove the duplicate header inclusion arm64: dts: qcom: sdm845: Add reserve-memory nodes arm64: dts: qcom: sdm845: Add gpio-ranges to TLMM node arm64: dts: qcom: sdm845: Extend ranges and describe DMA space arm64: dts: qcom: sdm845: Increase address and size cells for soc arm64: dts: sdm845: Add rpmh powercontroller node arm64: dts: msm8996: Add rpmpd device node arm64: dts: sdm845: Add WCN3990 WLAN module device node arm64: dts: qcom: sdm845: Add PDC Global reset driver node arm64: dts: qcom: sdm845: Add SCM DT node arm64: dts: qcom: sdm845: Fix pcs_misc region address for UNI PHY ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'lpc32xx-dt-for-5.1' of ↵Arnd Bergmann
https://github.com/vzapolskiy/linux-lpc32xx into arm/dt ARM: lpc32xx: devicetree updates for v5.1 Here are the changes for ARM NXP LPC32xx and ARM NXP LPC18xx/LPC43xx devicetree files: * added dts file for MYIR Tech MYD-LPC4357 development board, * two missing properties are added to LPC32xx keypad controller device tree node, this fixes a long-standing problem with its initialization, * LPC32xx PL11x LCD controller device node got corrected properties, which allows to use it with a new PL11x DRM driver, * output voltage level on one of Phytec phyCORE-LPC3250 fixed regulators is corrected, the fix is needed to remove duplicating platform data, * Phytec phyCORE-LPC3250 board gets a description of a kit LCD panel, this completes setup of CLCD device tree node for the board, * added unit addresses to memory device nodes on EA and Phytec boards, * fixes of ordinary warnings in dts formatting like leading zeroes, unused address and size cell properties and so on. * tag 'lpc32xx-dt-for-5.1' of https://github.com/vzapolskiy/linux-lpc32xx: ARM: dts: lpc32xx: ea3250: beautify gpio keys children nodes ARM: dts: lpc32xx: ea3250: add unit address to memory device node ARM: dts: lpc32xx: phy3250: add unit address to memory device node ARM: dts: lpc32xx: phy3250: setup LCD controller to panel interface ARM: dts: lpc32xx: phy3250: remove regulators umbrella device node ARM: dts: lpc32xx: phy3250: fix SD card regulator voltage ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller clocks property ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller variant ARM: dts: lpc32xx: reparent keypad controller to SIC1 ARM: dts: lpc32xx: add required clocks property to keypad device node ARM: dts: Add DT for MYIR Tech MYD-LPC4357 Development Board ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation ARM: dts: lpc435x: remove address and size cells from gpio-keys-polled nodes Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'arm-soc/for-5.1/devicetree-arm64' of ↵Arnd Bergmann
https://github.com/Broadcom/stblinux into arm/dt This pull request contains Broadcom ARM64-based SoCs Device Tree updates for 5.1, please pull the following: - Stefan adds support for the Raspberry Pi 3 A+ by using the same mechanism of creating a symbolic reference to the ARM 32-bit DTS file * tag 'arm-soc/for-5.1/devicetree-arm64' of https://github.com/Broadcom/stblinux: arm64: dts: broadcom: Add reference to RPi 3 A+ ARM: dts: add Raspberry Pi 3 A+ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15libbpf: Introduce bpf_object__btfAndrey Ignatov
Add new accessor for bpf_object to get opaque struct btf * from it. struct btf * is needed for all operations with BTF and it's present in bpf_object. The only thing missing is a way to get it. Example use-case is to get BTF key_type_id and value_type_id for a map in bpf_object. It can be done with btf__get_map_kv_tids() but that function requires struct btf *. Similar API can be added for struct btf_ext but no use-case for it yet. Signed-off-by: Andrey Ignatov <rdna@fb.com> Acked-by: Yonghong Song <yhs@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2019-02-15libbpf: Introduce bpf_map__resizeAndrey Ignatov
Add bpf_map__resize() to change max_entries for a map. Quite often necessary map size is unknown at compile time and can be calculated only at run time. Currently the following approach is used to do so: * bpf_object__open_buffer() to open Elf file from a buffer; * bpf_object__find_map_by_name() to find relevant map; * bpf_map__def() to get map attributes and create struct bpf_create_map_attr from them; * update max_entries in bpf_create_map_attr; * bpf_create_map_xattr() to create new map with updated max_entries; * bpf_map__reuse_fd() to replace the map in bpf_object with newly created one. And after all this bpf_object can finally be loaded. The map will have new size. It 1) is quite a lot of steps; 2) doesn't take BTF into account. For "2)" even more steps should be made and some of them require changes to libbpf (e.g. to get struct btf * from bpf_object). Instead the whole problem can be solved by introducing simple bpf_map__resize() API that checks the map and sets new max_entries if the map is not loaded yet. So the new steps are: * bpf_object__open_buffer() to open Elf file from a buffer; * bpf_object__find_map_by_name() to find relevant map; * bpf_map__resize() to update max_entries. That's much simpler and works with BTF. Signed-off-by: Andrey Ignatov <rdna@fb.com> Acked-by: Yonghong Song <yhs@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2019-02-15x86/platform/UV: Use efi_runtime_lock to serialise BIOS callsHedi Berriche
Calls into UV firmware must be protected against concurrency, expose the efi_runtime_lock to the UV platform, and use it to serialise UV BIOS calls. Signed-off-by: Hedi Berriche <hedi.berriche@hpe.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Russ Anderson <rja@hpe.com> Reviewed-by: Dimitri Sivanich <sivanich@hpe.com> Reviewed-by: Mike Travis <mike.travis@hpe.com> Cc: Andy Shevchenko <andy@infradead.org> Cc: Bhupesh Sharma <bhsharma@redhat.com> Cc: Darren Hart <dvhart@infradead.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: linux-efi <linux-efi@vger.kernel.org> Cc: platform-driver-x86@vger.kernel.org Cc: stable@vger.kernel.org # v4.9+ Cc: Steve Wahl <steve.wahl@hpe.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/20190213193413.25560-5-hedi.berriche@hpe.com
2019-02-15net: bpf: remove XDP_QUERY_XSK_UMEM enumeratorJan Sokolowski
Commit c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") moved the umem query code to the AF_XDP core, and therefore removed the need to query the netdevice for a umem. This patch removes XDP_QUERY_XSK_UMEM and all code that implement that behavior, which is just dead code. Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com> Acked-by: Björn Töpel <bjorn.topel@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2019-02-15Merge tag 'arm-soc/for-5.1/devicetree' of ↵Arnd Bergmann
https://github.com/Broadcom/stblinux into arm/dt This pull request contains Broadcom ARM-based SoCs Device Tree updates for 5.1, please pull the following: - Dan relicenses the Luxul DTS files to GPL 2.0+/MIT - Hao adds support for the Phicomm K3 which is a BCM4709 SoC with dual BCM4366 radio - Stefan adds support for the Raspberry Pi A+: binding and DTS files. He also provides a bunch of DTC warning fixes for the different RPi DTS(i) files and adds support for missing GPIO lines on RPi 2/3 * tag 'arm-soc/for-5.1/devicetree' of https://github.com/Broadcom/stblinux: ARM: dts: bcm2835-rpi-zero-w: Drop unnecessary pinctrl ARM: dts: bcm283x: Add missing GPIO line names ARM: dts: bcm2837-rpi-3-b-plus: Clarify label for STATUS_LED ARM: dts: bcm2837-rpi-3-b: Use consistent label for HDMI hotplug ARM: dts: bcm2835: Fix labels for GPIO 0,1 ARM: dts: bcm2835-rpi: Drop unnecessary #address-cells/#size-cells ARM: dts: bcm283x: Fix DTC warning for memory node ARM: dts: add Raspberry Pi 3 A+ dt-bindings: bcm: Add Raspberry Pi 3 A+ ARM: dts: BCM5301X: Add basic DT for Phicomm K3 ARM: dts: BCM53573: Relicense Luxul files to the GPL 2.0+ / MIT Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'samsung-dt-5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt Samsung DTS ARM changes for v5.1 1. Extend support for Aries family of mobile devices (e.g. Samsung Galaxy S) based on S5Pv210 SoC: DRM Rotator, FIMD, PWM vibrator, power off, touchscreen, Broadcom BCM4329 Bluetooth and cpufreq. 2. Remove hardcoded bootargs on Galaxy S family (proper support in U-Boot). 3. Fix minor DTC warnings. 4. Fix Exynos4412 Odroid X2/U3 conflicting eMMC GPIO settings and regulator properties. 5. Fix the eMMC RTSN pin breaking proper reboot on X2. * tag 'samsung-dt-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Fix pinctrl definition for eMMC RTSN line on Odroid X2/U3 ARM: dts: exynos: Fix eMMC regulator properties on Odroid U3 boards ARM: dts: exynos: Fix conflicting fixed-regulator GPIO flags and properties ARM: dts: s3c2416: Fix xti node's missing reg property warning ARM: dts: s5pv210: Fix onenand's unit address format warning ARM: dts: s5pv210: Add DMC nodes ARM: dts: s5pv210: Add support for more devices present on Aries ARM: dts: s5pv210: Add reserved memory for MFC on Aries ARM: dts: s5pv210: Remove hardcoded bootargs on Galaxy S and Fascinate 4G ARM: dts: s5pv210: Use correct fimd variant ARM: dts: s5pv210: Add node for exynos-rotator Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'stm32-dt-for-v5.1-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/dt STM32 DT updates for v5.1, round 1 Highlights: ---------- MPU part: -Enable Digital Thermal Sensor (dts) on stm32mp157c-ed1 (and so ev1). MCU part: -Add SPI support on stm32f429 SOC (4 SPIs instances). * tag 'stm32-dt-for-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: ARM: dts: stm32: Enable thermal sensor support on STM32MP157c-ed1 ARM: dts: stm32: add SPI support on STM32F429 SoC Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'v5.1-rockchip-dts64-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt New boards are the Rock Pi 4, NanoPC-T4 and NanoPi-M4, with the last two being part of a family and sharing bigger parts of the devicetree. rk3328 got sound-related upgrades and a wider patch drops mmc display-wp fields from nodes which shouldn't use it. * tag 'v5.1-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: clean up the abuse of disable-wp arm64: dts: rockchip: 'Fix' nanopi4 uSD card detect arm64: dts: rockchip: Add NanoPC-T4 IR receiver arm64: dts: rockchip: Refine nanopi4 differences arm64: dts: rockchip: Add DT for NanoPi M4 arm64: dts: rockchip: add ROCK Pi 4 DTS support arm64: dts: rockchip: Add devicetree for NanoPC-T4 arm64: dts: rockchip: enable analog audio node for rock64 arm64: dts: rockchip: move rk3328 #sound-dai-cells to the soc dtsi arm64: dts: rockchip: add rk3328 ACODEC node Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'v5.1-rockchip-dts32-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt New board the Elgin-R1 based on the rv1108 soc and a number of small improvements for rv1108 as well. RK3066 got support for the core display components and the Edison tablet got its touchscreen added. Apart from that a wider fix to drop display-wp usage from places where it shouldn't be used, a pin fix for Edison and a cleanup to prevent rk3036 board from defining sound-dai-cells for core components in each board separately. * tag 'v5.1-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: clean up the abuse of disable-wp ARM: dts: rv1108: Add support for rv1108-elgin-r1 board dt-bindings: Add vendor prefix for elgin ARM: dts: rockchip: rv1108: Add spim0 and spim1 pinctrl groups ARM: dts: rockchip: Add missing dma-names SPI support for rv1108 ARM: dts: rockchip: add rk3066 vop display nodes ARM: dts: rockchip: add focaltech touchscreen to rk3188-bqedison2qc ARM: dts: rockchip: fix cif1_pdn pin on rk3188-bqedison2qc ARM: dts: rockchip: add HCLK_HDMI to rk3066 vio power-domain ARM: dts: rockchip: move rk3036 i2s sound-dail-cells into soc dtsi Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'am654-for-v5.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux into arm/dt AM65x DT changes for v5.1. Includes: - EMMC support for am654-evm board * tag 'am654-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux: arm64: dts: ti: k3-am654-base-board: Add eMMC Support arm64: dts: ti: k3-am654: Add Support for eMMC host controller Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'davinci-for-v5.1/dt' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/dt DaVinci device-tree updates for v5.1 contains a patch to enable analog mic input on da850 LCDK board. * tag 'davinci-for-v5.1/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: dts: da850-lcdk: Enable the analog mic input Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'omap-for-v5.1/dt-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt dts updates for omap variants for v5.1 merge window This series contains board specific dts updates and few minor clean-up changes: - add stdout-path for am335x-chiliboard - add wlcore wakeirq for omap3-evm, pandaboard and omap4-droid4 - remove unnecessary address-cells and io-cells for am33xx - replace deprecated linux,wakeup with wakeup-source property - use spdx license for am335x-shc - configure ethernet pins for omap4-sdp * tag 'omap-for-v5.1/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap4-sdp: Make ethernet working even if booted with latest u-boot ARM: dts: am335x-shc.dts: Switch to SPDX identifier ARM: dts: am437x: replace linux,wakeup with wakeup-source property ARM: dts: am33xx: Remove unnecessary properties ARM: dts: omap4-droid4: Configure wlcore wakeirq ARM: dts: Configure wlcore wakeirq for pandaboard ARM: dts: Add wlcore wakeirq for omap3-evm ARM: dts: am335x-chiliboard: Add stdout-path property Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'omap-for-v5.1/dt-ti-81xx-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt dts updates for ti81xx for v5.1 merge window Two changes to add support for McGill University's IceBoard telescope ARM + FPGA instrumentation board. This board is used for several telescopes around the world, see the related device tree commit for some interesting links for more information. Note that these changes are based on the related ti81xx soc changes. * tag 'omap-for-v5.1/dt-ti-81xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Adds device tree file for McGill's IceBoard, based on TI AM3874 ARM: dts: ti81xx: Add dts boilerplate for all GPIO and SPI peripherals Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'omap-for-v5.1/soc-ti-81xx-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt SoC updates for ti81xx for v5.1 merge window Two changes to add legacy hwmod data for gpio and spi peripherals on ti81xx. We have not yet updated ti81xx to probe devices with ti-sysc interconnect target module driver, so these changes are still needed to make devices usable for the related device tree changes. * tag 'omap-for-v5.1/soc-ti-81xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: ti81xx: Add hwmod boilerplate for all GPIO and SPI peripherals ARM: ti81xx: Move I2C entries in omap_hwmod_81xx to maintain grouping Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-02-15Merge tag 'imx-fixes-5.0-3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes i.MX fixes for 5.0, 3rd round: It contains a fix for i.MX8MQ EVK board device tree, which makes the broken eMMC support work as expected. * tag 'imx-fixes-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8mq: Fix boot from eMMC
2019-02-15Merge tag 'v5.0-rockchip-dts64fixes-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes Fix for new dtc graph warnings and a regulator fix for rock64. * tag 'v5.0-rockchip-dts64fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64 arm64: dts: rockchip: fix graph_port warning on rk3399 bob kevin and excavator
2019-02-15Merge tag 'v5.0-rockchip-dts32fixes-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes Drop one non-existent component from powerdomain list. * tag 'v5.0-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: remove qos_cif1 from rk3188 power-domain
2019-02-15Merge tag 'omap-for-v5.0/fixes-rc4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes SoC fixes for omaps for v5.0-rc cycle This series contains two SoC regression fixes and one uninitialized variable fix: - Fix inverted nirq pin handling for omap5 that started producing warnings with earlier GIC direction checks and took a while to understand and confirm. Basically there are two sys_nirq pins that are bypassing peripheral modules and inverted automatically by the SoC and need to be handled with a custom irq_set_type() - Recent ti-sysc changes caused a regression to the pwm-omap-dmtimer code where the device tree handling code for timer source clock gets confused. It looks like we can remove that code eventually, but for now we just drop a bogus pm_runtime_irq_safe() for the timers with the related quirks caused by pm_runtime_irq_safe(), and have the standard assigned-clocks and assigned-clock-parents deal with setting the source clock - Fix potentially uninitialized value for display init code if regmap_read() fails * tag 'omap-for-v5.0/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized ARM: dts: Configure clock parent for pwm vibra bus: ti-sysc: Fix timer handling with drop pm_runtime_irq_safe() ARM: OMAP5+: Fix inverted nirq pin interrupts with irq_set_type clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
2019-02-15mac80211: Restore vif beacon interval if start ap failsRakesh Pillai
The starting of AP interface can fail due to invalid beacon interval, which does not match the minimum gcd requirement set by the wifi driver. In such case, the beacon interval of that interface gets updated with that invalid beacon interval. The next time that interface is brought up in AP mode, an interface combination check is performed and the beacon interval is taken from the previously set value. In a case where an invalid beacon interval, i.e. a beacon interval value which does not satisfy the minimum gcd criteria set by the driver, is set, all the subsequent trials to bring that interface in AP mode will fail, even if the subsequent trials have a valid beacon interval. To avoid this, in case of a failure in bringing up an interface in AP mode due to interface combination error, the interface beacon interval which is stored in bss conf, needs to be restored with the last working value of beacon interval. Tested on ath10k using WCN3990. Cc: stable@vger.kernel.org Fixes: 0c317a02ca98 ("cfg80211: support virtual interfaces with different beacon intervals") Signed-off-by: Rakesh Pillai <pillair@codeaurora.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2019-02-15mac80211: Free mpath object when rhashtable insertion failsHerbert Xu
When rhashtable insertion fails the mesh table code doesn't free the now-orphan mesh path object. This patch fixes that. Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2019-02-15mac80211: Use linked list instead of rhashtable walk for mesh tablesHerbert Xu
The mesh table code walks over hash tables for two purposes. First of all it's used as part of a netlink dump process, but it is also used for looking up entries to delete using criteria other than the hash key. The second purpose is directly contrary to the design specification of rhashtable walks. It is only meant for use by netlink dumps. This is because rhashtable is resizable and you cannot obtain a stable walk over it during a resize process. In fact mesh's use of rhashtable for dumping is bogus too. Rather than using rhashtable walk's iterator to keep track of the current position, it always converts the current position to an integer which defeats the purpose of the iterator. Therefore this patch converts all uses of rhashtable walk into a simple linked list. This patch also adds a new spin lock to protect the hash table insertion/removal as well as the walk list modifications. In fact the previous code was buggy as the removals can race with each other, potentially resulting in a double-free. Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2019-02-15PM / Domains: Mark "name" const in dev_pm_domain_attach_by_name()Douglas Anderson
As of the patch ("PM / Domains: Mark "name" const in genpd_dev_pm_attach_by_name()") it's clear that the name in dev_pm_domain_attach_by_name() can be const. Mark it as so. This allows drivers to pass in a name that was declared "const" in a driver. Fixes: 27dceb81f445 ("PM / Domains: Introduce dev_pm_domain_attach_by_name()") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2019-02-15PM / Domains: Mark "name" const in genpd_dev_pm_attach_by_name()Douglas Anderson
The genpd_dev_pm_attach_by_name() simply takes the name and passes it to of_property_match_string() where the argument is "const char *". Adding a const here allows a later patch to add a const to dev_pm_domain_attach_by_name() which allows drivers to pass in a name that was declared "const" in a driver. Fixes: 5d6be70add65 ("PM / Domains: Introduce option to attach a device by name to genpd") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2019-02-15intel_idle: add support for JacobsvilleZhang Rui
Jacobsville uses the same C-states as Denverton. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2019-02-15arm64: dts: rockchip: Add on-board WiFi/BT support for Rock960 boardsManivannan Sadhasivam
Add on-board WiFi/BT support for Rock960 boards such as Rock960 based on AP6356S and Ficus based on AP6354 wireless modules. Firmwares for the respective boards are available here: http://people.linaro.org/~manivannan.sadhasivam/rock960_wifi/ http://people.linaro.org/~manivannan.sadhasivam/ficus_wifi/ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2019-02-15arm64: dts: rockchip: fix rk3328-roc-cc gmac2io stability issuesPeter Geis
This patch is a port of the fix from commit 73e42e186699 ("arm64: dts: rockchip: fix rock64 gmac2io stability issues") As per that patch, enabling thresh dma mode force disables checksuming. This is necessary as tx checksuming does not work with packets larger than 1498. The rk3328-roc-cc board exhibits tx stability issues with large packets similar to rock64's issues. This patch resolves that issue. Signed-off-by: Peter Geis <pgwipeout@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2019-02-15arm64: dts: rockchip: rockpro64 dts add usb regulatorAkash Gajjar
vcc5v0_host and vcc5v0_typec is supplied by vcc5v0_usb and not vcc5v0_sys. add node for vcc5v0_usb fixed regulator. Signed-off-by: Akash Gajjar <Akash_Gajjar@mentor.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2019-02-15Merge tag 'perf-core-for-mingo-5.1-20190214' of ↵Ingo Molnar
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: perf list: Jiri Olsa: - Display metric expressions for --details option perf record: Alexey Budankov: - Implement --affinity=node|cpu option, leftover, the other patches in this kit were already applied. perf trace: Arnaldo Carvalho de Melo: - Fix segfaults due to not properly handling negative file descriptor syscall args. - Fix segfault related to the 'waitid' 'options' prefix showing logic. - Filter out 'gnome-terminal*' if it is a parent of 'perf trace', to reduce the syscall feedback loop in system wide sessions. BPF: Song Liu: - Silence "Couldn't synthesize bpf events" warning for EPERM. Build system: Arnaldo Carvalho de Melo: - Fix the test-all.c feature detection fast path that was broken for quite a while leading to longer build times. Event parsing: Jiri Olsa: - Fix legacy events symbol separator parsing cs-etm: Mathieu Poirier: - Fix some error path return errors and plug some memory leaks. - Add proper header file for symbols - Remove unused structure fields. - Modularize auxtrace_buffer fetch, decoder and packet processing loop. Vendor events: Paul Clarke: - Add assorted metrics for the Power8 and Power9 architectures. perf report: Thomas Richter: - Add s390 diagnostic sampling descriptor size Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-02-15arm64: dts: rockchip: rockpro64 dts remove unused lcd-reset pinmuxAkash Gajjar
lcd panel pinmux is unused and the pin actually for something different, so removing it. Signed-off-by: Akash Gajjar <Akash_Gajjar@mentor.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2019-02-15arm64: dts: rockchip: rockpro64 dts make regulator more readableAkash Gajjar
rename dc12, vcc_sys, vcc1v8_pmu regulators and make it more redable as per the schematic of rk3399-rockpro64. Signed-off-by: Akash Gajjar <Akash_Gajjar@mentor.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2019-02-15arm64: dts: rockchip: Add nanopi4 bluetoothRobin Murphy
Describe the Bluetooth portion of the Ampak combo module - this is either an AP6356S or an AP6212 depending on the board variant, but there are no relevant compatibility differences between the two. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2019-02-15i2c: bcm2835: Clear current buffer pointers and counts after a transferPaul Kocialkowski
The driver's interrupt handler checks whether a message is currently being handled with the curr_msg pointer. When it is NULL, the interrupt is considered to be unexpected. Similarly, the i2c_start_transfer routine checks for the remaining number of messages to handle in num_msgs. However, these values are never cleared and always keep the message and number relevant to the latest transfer (which might be done already and the underlying message memory might have been freed). When an unexpected interrupt hits with the DONE bit set, the isr will then try to access the flags field of the curr_msg structure, leading to a fatal page fault. The msg_buf and msg_buf_remaining fields are also never cleared at the end of the transfer, which can lead to similar pitfalls. Fix these issues by introducing a cleanup function and always calling it after a transfer is finished. Fixes: e2474541032d ("i2c: bcm2835: Fix hang for writing messages larger than 16 bytes") Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Acked-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
2019-02-15i2c: cadence: Fix the hold bit settingShubhrajyoti Datta
In case the hold bit is not needed we are carrying the old values. Fix the same by resetting the bit when not needed. Fixes the sporadic i2c bus lockups on National Instruments Zynq-based devices. Fixes: df8eb5691c48 ("i2c: Add driver for Cadence I2C controller") Reported-by: Kyle Roeschley <kyle.roeschley@ni.com> Acked-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Tested-by: Kyle Roeschley <kyle.roeschley@ni.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
2019-02-15arm64: dts: ti: k3-am65-mcu: Add ADC nodesVignesh R
TI AM654 SoC has two ADC instances in the MCU domain. Add DT nodes for the same. Signed-off-by: Vignesh R <vigneshr@ti.com> Signed-off-by: Tero Kristo <t-kristo@ti.com>
2019-02-15dt-bindings: input: ti-tsc-adc: Add new compatible for AM654 SoCsVignesh R
AM654 SoCs has ADC IP which is similar to AM335x, but without the touchscreen part. Add new compatible to handle AM654 SoCs. Also, it seems that existing compatible strings used in the kernel DTs were never documented. So, document them now. Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Rob Herring <robh@kernel.org> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Tero Kristo <t-kristo@ti.com>
2019-02-15arm64: dts: ti: k3-am654-base-board: enable USB1Roger Quadros
Add pinmux for USB1 and enable it as a dual role port. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tero Kristo <t-kristo@ti.com>
2019-02-15arm64: dts: ti: k3-am6: add USB supportRoger Quadros
Adds support for USB0 and USB1 instances on the AM6 SoC. USB0 is limited to high-speed for now. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tero Kristo <t-kristo@ti.com>