summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2017-01-30powerpc/powernv: Initialise nest mmuAlistair Popple
POWER9 contains an off core mmu called the nest mmu (NMMU). This is used by other hardware units on the chip to translate virtual addresses into real addresses. The unit attempting an address translation provides the majority of the context required for the translation request except for the base address of the partition table (ie. the PTCR) which needs to be programmed into the NMMU. This patch adds a call to OPAL to set the PTCR for the nest mmu in opal_init(). Signed-off-by: Alistair Popple <alistair@popple.id.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-30x86/microcode: Do not access the initrd after it has been freedBorislav Petkov
When we look for microcode blobs, we first try builtin and if that doesn't succeed, we fallback to the initrd supplied to the kernel. However, at some point doing boot, that initrd gets jettisoned and we shouldn't access it anymore. But we do, as the below KASAN report shows. That's because find_microcode_in_initrd() doesn't check whether the initrd is still valid or not. So do that. ================================================================== BUG: KASAN: use-after-free in find_cpio_data Read of size 1 by task swapper/1/0 page:ffffea0000db9d40 count:0 mapcount:0 mapping: (null) index:0x1 flags: 0x100000000000000() raw: 0100000000000000 0000000000000000 0000000000000001 00000000ffffffff raw: dead000000000100 dead000000000200 0000000000000000 0000000000000000 page dumped because: kasan: bad access detected CPU: 1 PID: 0 Comm: swapper/1 Tainted: G W 4.10.0-rc5-debug-00075-g2dbde22 #3 Hardware name: Dell Inc. XPS 13 9360/0839Y6, BIOS 1.2.3 12/01/2016 Call Trace: dump_stack ? _atomic_dec_and_lock ? __dump_page kasan_report_error ? pointer ? find_cpio_data __asan_report_load1_noabort ? find_cpio_data find_cpio_data ? vsprintf ? dump_stack ? get_ucode_user ? print_usage_bug find_microcode_in_initrd __load_ucode_intel ? collect_cpu_info_early ? debug_check_no_locks_freed load_ucode_intel_ap ? collect_cpu_info ? trace_hardirqs_on ? flat_send_IPI_mask_allbutself load_ucode_ap ? get_builtin_firmware ? flush_tlb_func ? do_raw_spin_trylock ? cpumask_weight cpu_init ? trace_hardirqs_off ? play_dead_common ? native_play_dead ? hlt_play_dead ? syscall_init ? arch_cpu_idle_dead ? do_idle start_secondary start_cpu Memory state around the buggy address: ffff880036e74f00: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff880036e74f80: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff >ffff880036e75000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ^ ffff880036e75080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff880036e75100: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ================================================================== Reported-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Tested-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20170126165833.evjemhbqzaepirxo@pd.tnic Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-01-30PM / OPP: Update OPP users to put referenceViresh Kumar
This patch updates dev_pm_opp_find_freq_*() routines to get a reference to the OPPs returned by them. Also updates the users of dev_pm_opp_find_freq_*() routines to call dev_pm_opp_put() after they are done using the OPPs. As it is guaranteed the that OPPs wouldn't get freed while being used, the RCU read side locking present with the users isn't required anymore. Drop it as well. This patch also updates all users of devfreq_recommended_opp() which was returning an OPP received from the OPP core. Note that some of the OPP core routines have gained rcu_read_{lock|unlock}() calls, as those still use RCU specific APIs within them. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> [Devfreq] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2017-01-30ARM: dts: sun9i: Switch to new clock bindingsChen-Yu Tsai
Now that we have a full clock driver for sun9i, switch to it. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-01-30powerpc/mm: Allow memory hotplug into an offline nodeReza Arbab
Relax the check preventing us from hotplugging into an offline node. This limitation was added in commit 482ec7c403d2 ("[PATCH] powerpc numa: Support sparse online node map") to prevent adding resources to an uninitialized node. These days, there is no harm in doing so. The addition will actually cause the node to be initialized and onlined; add_memory_resource() calls hotadd_new_pgdat() (if necessary) and node_set_online(). Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-30powerpc/mm: Simplify loop control in parse_numa_properties()Reza Arbab
The flow of the main loop in parse_numa_properties() is overly complicated. Simplify it to be less confusing and easier to read. No functional change. The end of the main loop in parse_numa_properties() looks like this: for_each_node_by_type(...) { ... if (!condition) { if (--ranges) goto new_range; else continue; } statement(); if (--ranges) goto new_range; /* else * continue; <- implicit, this is the end of the loop */ } The only effect of !condition is to skip execution of statement(). This can be rewritten in a simpler way: for_each_node_by_type(...) { ... if (condition) statement(); if (--ranges) goto new_range; } Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-30powerpc/fadump: Fix the race in crash_fadump().Mahesh Salgaonkar
There are chances that multiple CPUs can call crash_fadump() simultaneously and would start duplicating same info to vmcoreinfo ELF note section. This causes makedumpfile to fail during kdump capture. One example is, triggering dumprestart from HMC which sends system reset to all the CPUs at once. makedumpfile --dump-dmesg /proc/vmcore read_vmcoreinfo_basic_info: Invalid data in /tmp/vmcoreinfoyjgxlL: CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971 makedumpfile Failed. Running makedumpfile --dump-dmesg /proc/vmcore failed (1). makedumpfile -d 31 -l /proc/vmcore read_vmcoreinfo_basic_info: Invalid data in /tmp/vmcoreinfo1mmVdO: CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971CRASHTIME=1475605971 makedumpfile Failed. Running makedumpfile -d 31 -l /proc/vmcore failed (1). Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-30powerpc/mm/hash: Properly mask the ESID bits when building proto VSIDAneesh Kumar K.V
The proto VSID is built using both the MMU context id and effective segment ID (ESID). We should not have overlapping bits between those. That could result in us having a VSID collision. With the current code we missed masking the top bits of the ESID. This implies for kernel address we ended up using the top 4 bits of the ESID as part of the proto VSID, which is wrong. The current code use the top 4 context values (0x7fffc - 0x7ffff) for the kernel. With those context IDs used for the kernel, we don't run into VSID collisions because we get the same proto VSID irrespective of whether we mask the ESID bits or not. eg: ea = 0xf000000000000000 context = 0x7ffff w/out masking: proto_vsid = (0x7ffff << 6 | 0xf000000000000000 >> 40) = (0x1ffffc0 | 0xf00000) = 0x1ffffc0 with masking: proto_vsid = (0x7ffff << 6 | ((0xf000000000000000 >> 40) & 0x3f)) = (0x1ffffc0 | (0xf00000 & 0x3f)) = 0x1ffffc0 | 0) = 0x1ffffc0 So although there is no bug, the code is still overly subtle, so fix it to save ourselves pain in future. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-29Merge tag 'samsung-soc-4.11-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc Samsung mach/soc update for v4.11, second round: 1. Remove mach code for Exynos4415 as a continuation of removal of this SoC. 2. Remove obsolete property from the bindings documentation. * tag 'samsung-soc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property ARM: EXYNOS: Remove Exynos4415 arch code (SoC not supported anymore) Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'samsung-dt-4.11-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Samsung DeviceTree update for v4.11, second round: 1. Use bigger reserved memory region for Multi Format Codec on all Exynos chipsets so it could decode FullHD easily. * tag 'samsung-dt-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Fix indentation of EHCI and OHCI ports ARM: dts: exynos: Increase MFC left reserved memory region size Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'samsung-drivers-soc-pmu-4.11-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers Continuation of improvements for Exynos PM drivers for v4.11: 1. Add support for Exynos5433 to Power Management Unit (PMU) and Power Domains drivers. 2. Cleanups of duplicated and unused defines. * tag 'samsung-drivers-soc-pmu-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register soc: samsung: pmu: Remove unused and duplicated defines soc: samsung: pm_domains: Add new Exynos5433 compatible soc: samsung: pmu: Add dummy support for Exynos5433 SoC Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DTMasahiro Yamada
Enable the NAND framework and the Denali NAND controller driver. This NAND controller is used on UniPhier SoCs. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29arm64: defconfig: enable CONFIG_MTD_BLOCKMasahiro Yamada
Enable the block layer support for MTD devices. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'zte-dt64-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64 ZTE arm64 device tree update for 4.11: - Enable cpufreq support for zx296718 by using new operating-points-v2 bindings, so that it works with the generic cpufreq-dt driver. * tag 'zte-dt64-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: zx: support cpu-freq for zx296718 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'imx-defconfig-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig i.MX defconfig updates for 4.11: - Select wireless extensions option for imx_v6_v7_defconfig, so that wireless works out of box with userspace tools such as 'iwconfig'. - Enable EXT4 filesystem support for vf610m4_defconfig. * tag 'imx-defconfig-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: vf610m4: defconfig: enable EXT4 filesystem ARM: imx_v6_v7_defconfig: Select wireless extensions option Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'imx-dt64-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64 Freescale arm64 device tree updates for 4.11: - Add support for LS1012A SoC which is an ARMv8 SoC with single Cortex-A53 core, and the corresponding board support: FRDM, QDS and RDB. - Enable TMU (Thermal Monitoring Unit) support for LS1046A SoC. - Enable PCA9547 device for ls2080a-rdb board by removing 'disabled' status setting. * tag 'imx-dt64-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: clockgen: Add compatible string for LS1012A Documentation: DT: add LS1012A compatible for SCFG and DCFG Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards arm64: dts: ls1046a: Add TMU device tree support arm64: dts: Add support for FSL's LS1012A SoC arm64: dts: ls2080a-rdb: remove disable status of pca9547 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'imx-dt-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt i.MX device tree updates for 4.11: - New board support: vf610-zii-dev-rev-c, imx6ul-opos6uldev, imx6ul-isiot, imx6qdl-savageboard, imx6q-mccmon6. - A patch from Alexandre to correct the mangled license text which has been copied & pasted all over the i.MX device tree files. - Update cpu nodes of some i.MX SoCs to make them consistent and match ePAPR spec. - Add OCOTP device for i.MX6UL SoC. - Add security violation interrupt for i.MX25 DryIce. - Enable USB OTG, WIFI and Bluetooth support for i.MX6SX Udoo Neo board. - Enable S/PDIF and 2nd display pipeline support for CompuLab board.. - Add SPI and LTC3676 PMIC support for Gateworks Ventana boards. - A few random device addition for various boards: TVE DAC regulators for imx53-qsb, EEPROM for vf610-zii-dev, eMMC and NAND support for i.MX6UL Engicam boards. - Cleanups on obsoleted or unused properties. * tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (32 commits) ARM: dts: udoo_neo: Add Bluetooth support ARM: dts: udoo_neo: Add Wifi support ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL NAND initial support ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL eMMC initial support ARM: dts: imx6qdl: Fix "ERROR: code indent should use tabs where possible" ARM: dts: vf610-zii-dev: add EEPROM entry to Rev C ARM: dts: add Armadeus Systems OPOS6UL and OPOS6ULDEV support ARM: dts: imx6q-utilite-pro: enable 2nd display pipeline ARM: dts: vf610-zii-dev: Add .dts file for rev. C ARM: dts: vf610-zii-dev-rev-b: Remove leftover PWM pingroup ARM: dts: imx6: Support Savageboard quad ARM: dts: imx6: Support Savageboard dual ARM: dts: imx6: Add Savageboard common file ARM: dts: imx53-qsb: Provide the TVE DAC regulators ARM: dts: imx6q: Add mccmon6 board support Doc: devicetree: bindings: Add vendor prefix entry - lwn ARM: dts: imx/vf: Correct license text ARM: dts: imx25.dtsi: DryIce security violation interrupt ARM: dts: imx: Add ocotp node for imx6ul ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'imx-cleanup-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc i.MX cleanup for 4.11: - Remove unused flexcan and esdhc device definitions for i.MX25. - A series from Fabio to remove camera device initialization code from i.MX platform support, since the corresponding media driver has been deprecated and removed from kernel tree. * tag 'imx-cleanup-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: mach-mx27_3ds: Remove camera support ARM: mach-pcm037: Remove camera support ARM: mach-mx35_3ds: Remove camera support ARM: mx31moboard-smartbot: Remove camera support ARM: mx31moboard-marxbot: Remove camera support ARM: mach-mx31_3ds: Remove camera support ARM: imx: remove unused device definitions Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'imx-fixes-nc-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt i.MX non-critical device tree fixes for 4.11: - A couple of fixes on anatop regulator voltage and constraints according to hardware datasheet. - Correct FEC interrupt routing for i.MX6QP which has got the hardware bug found on i.MX6Q fixed. - Remove unit address from i.MX6 LDB device node to fix DTC warning. - A fix on imx53-qsb board FEC pinmux config to remove the dependency on firmware for setting up pins. - A series from Sascha to fix LPSR pins for i.MX7 boards. * tag 'imx-fixes-nc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx53-qsb-common: fix FEC pinmux config ARM: imx6: remove unit address from LDB node ARM: imx6qp: adapt DT to changed FEC interrupts ARM: imx6: fix regulator constraints on anatop 1p1 and 2p5 ARM: imx6: fix min/max voltage of anatop 2p5 regulator ARM: dts: imx7: Add "LPSR" to LPSR iomux pin names ARM: dts: imx7d-cl-som: Fix OTG power pinctrl ARM: dts: imx7d-sdb: Fix watchdog and pwm pinmux ARM: dts: imx7s-warp: Fix watchdog pinmux Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'stm32-defconfig-for-v4.11-1' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig STM32 defconfig updates for v4.11, round 1. Highlights: ---------- - Enable ADC - Enable RTC * tag 'stm32-defconfig-for-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: ARM: configs: stm32: Add RTC support in STM32 defconfig ARM: configs: stm32: enable ADC driver Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'mvebu-dt64-4.11-2' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson
next/dt64 mvebu dt64 for 4.11 (part 2) - Add a new Armada 8K based board: MACCHIATOBin - Enable AHCI on the Armada 7K/8K SoCs * tag 'mvebu-dt64-4.11-2' of git://git.infradead.org/linux-mvebu: arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci arm64: dts: marvell: Add DT for MACCHIATOBin board Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson
mvebu dt for 4.11 (part 2) Switch device tree files to the new DSA binding * tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood-rd88f6281: Utilize new DSA binding ARM: dts: kirkwood-mv88f6281gtw-ge: Utilize new DSA binding ARM: dts: kirkwood-linksys-viper: Utilize new DSA binding ARM: dts: kirkwood-dir665: Utilize new DSA binding ARM: dts: armada-xp-linksys-mamba: Utilize new DSA binding ARM: dts: armada-388-clearfog: Utilize new DSA binding ARM: dts: armada-385-linksys: Utilize new DSA binding ARM: dts: armada-370-rd: Utilize new DSA binding Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'mvebu-soc-4.11-1' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson
next/soc mvebu soc for 4.11 (part 1) Cleanup up on dove pmu and mv78x00 pci * tag 'mvebu-soc-4.11-1' of git://git.infradead.org/linux-mvebu: soc: dove: constify reset_control_ops structures ARM: mv78xx0: fix possible PCI buffer overflow Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge branch 'sti-dt-for-v4.11-round2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt * 'sti-dt-for-v4.11-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: ARM: dts: STiH407-family: Add missing pwm irq Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'sti-dt-for-v4.10-rc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into fixes STi DT fix: Since v4.10-rc1, xhci is complaining in loop with : [ 801.953836] usb usb6-port1: Cannot enable. Maybe the USB cable is bad? [ 801.960455] xhci-hcd xhci-hcd.0.auto: Cannot set link state. [ 801.966611] usb usb6-port1: cannot disable (err = -32) set property "snps,dis_u3_susphy_quirk" in DT fix it. * tag 'sti-dt-for-v4.10-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: ARM: dts: STiH407-family: set snps,dis_u3_susphy_quirk Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'tegra-for-4.11-arm64-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64 arm64: tegra: Device tree changes for v4.11-rc1 This contains three patches that reintroduce symbolic identifiers for clocks, resets and mailboxes. These had been converted to literals in the v4.10 release to avoid complicated dependencies between branches. * tag 'tegra-for-4.11-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: tegra: Use symbolic reset identifiers arm64: tegra: Use symbolic clock identifiers arm64: tegra: Use symbolic HSP identifiers Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'tegra-for-4.11-arm-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt ARM: tegra: Device tree changes for v4.11-rc1 This contains a set of patches that add hardware compatibility for newer revisions of the Toradex Apalis TK1. Also included is a fix to the PAZ00 that stabilizes panel initialization on boot as well as a patch to add card detection for the µSD card slot on TrimSlice. To round things off there are a couple of fixes and changes to the Nyan device tree files to fix the battery charger, add compatibility with new revisions of Nyan Blaze and Nyan Big, as well as properly support the TPM. * tag 'tegra-for-4.11-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: nyan-blaze: Proper pinmux for TPM I2C ARM: tegra: nyan-big: Proper pinmux for TPM I2C ARM: tegra: nyan-blaze: Include compatible revisions for proper detection ARM: tegra: nyan-big: Include compatible revisions for proper detection ARM: tegra: nyan: Use external control for bq24735 charger ARM: tegra: nyan: Use proper IRQ type definitions ARM: dts: tegra: Fix missing card detection in Trimslice µSD card slot ARM: tegra: paz00: Mark panel regulator as enabled on boot ARM: tegra: apalis-tk1: Update compatibility comment ARM: tegra: apalis-tk1: Fix SD card detect on v1.1 HW ARM: tegra: apalis-tk1: Adjust pin muxing for v1.1 HW ARM: tegra: apalis-tk1: Optional DisplayPort hot-plug detect ARM: tegra: apalis-tk1: Pull-up temperature alert Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'tegra-for-4.11-soc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc ARM: tegra: Core SoC changes for v4.11-rc1 This contains a single cleanup patch for the placement of the __initdata annotation, as suggested by checkpatch. * tag 'tegra-for-4.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: paz00: Fix __initdata placement Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'renesas-arm64-dt2-for-v4.11' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 Second Round of Renesas ARM64 Based SoC DT Updates for v4.11 r8a779[56] SoCs: * Mark EthernetAVB device node disabled in DT for r8a779[56] SoCs - They are enabled as appropriate in board DT files * Link ARM GIC to clock and clock domain on r8a779[56] SoCs * Add thermal support r8a7795 SoC: * Tidyup audma definition order on r8a7795 SoC * Add missing power-domains property for SATA r8a7795/h3ulcb board: * Add MIX/CTU support as per support present in DT for r8a7796 * tag 'renesas-arm64-dt2-for-v4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: dts: r8a7796: Mark EthernetAVB device node disabled arm64: dts: r8a7795: Mark EthernetAVB device node disabled arm64: dts: r8a7795: tidyup audma definition order arm64: dts: r8a7796: Link ARM GIC to clock and clock domain arm64: dts: r8a7795: Link ARM GIC to clock and clock domain arm64: dts: r8a7796: Add R-Car Gen3 thermal support arm64: dts: r8a7795: Add R-Car Gen3 thermal support arm64: dts: r8a7795: Add missing power-domains property for sata arm64: dts: h3ulcb: follow sound CTU/MIX supports Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'at91-ab-4.11-dt2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt DT for 4.11 #2: - Enable the DMA on sama5d2 and sama5d4 xplained to fix an issue seen by kernelci * tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: dts: at91: Enable DMA on sama5d2_xplained console ARM: dts: at91: Enable DMA on sama5d4_xplained console Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'renesas-soc2-for-v4.11' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Second Round of Renesas ARM Based SoC Updates for v4.11 * Add more register documentation to R-Car Gen2 PM * tag 'renesas-soc2-for-v4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: rcar-gen2: Add more register documentation Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'renesas-dt2-for-v4.11' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Second Round of Renesas ARM Based SoC DT Updates for v4.11 Enhancements: - Add power-domains to mmcif on r7s72100 SoC - Add OSTM to rskrza1/r7s72100 - Link ARM GIC to clock and clock domain on r8a774[35] SoCs Clean-up: - Correct SATA device status on r8a7779/marzen * tag 'renesas-dt2-for-v4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: r7s72100: add power-domains to mmcif ARM: dts: rskrza1: add ostm DT support ARM: dts: r7s72100: add ostm to device tree ARM: dts: r7s72100: add ostm clock to device tree ARM: dts: r8a7745: Link ARM GIC to clock and clock domain ARM: dts: r8a7743: Link ARM GIC to clock and clock domain ARM: dts: r8a7779, marzen: Fix sata device status Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-30powerpc/mm: Use the correct pointer when setting a 2MB pteReza Arbab
When setting a 2MB pte, radix__map_kernel_page() is using the address ptep = (pte_t *)pudp; Fix this conversion to use pmdp instead. Use pmdp_ptep() to do this instead of casting the pointer. Fixes: 2bfd65e45e87 ("powerpc/mm/radix: Add radix callbacks for early init routines") Cc: stable@vger.kernel.org # v4.7+ Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-01-29Merge tag 'pxa-for-4.11' of https://github.com/rjarzmik/linux into next/socOlof Johansson
This is the pxa changes for v4.11 cycle. This cycle is a minor fixes one, covering : - build fixes from Arnd, mainly include related - transfer of maintainance of Motorala phone to Robert * tag 'pxa-for-4.11' of https://github.com/rjarzmik/linux: MAINTAINERS: transfer maintainership for the EZX platform ARM: pxa: include linux/leds.h ARM: pxa: ezx: fix a910 camera data Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29arm64: defconfig: enable CONFIG_MMC_SDHCI_CADENCEMasahiro Yamada
Enable the Cadence SD/SDIO/eMMC controller. This is used on Socionext UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'hisi-armv7-soc-for-4.11' of git://github.com/hisilicon/linux-hisi ↵Olof Johansson
into next/soc ARM: mach-hisi: Hisilicon SoC updates for 4.11 - Drop the declaration of the unimplemented hip01_cpu_die * tag 'hisi-armv7-soc-for-4.11' of git://github.com/hisilicon/linux-hisi: arm: hisi: drop extern hip01_cpu_die Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi ↵Olof Johansson
into next/defconfig ARM64: hisilicon: defconfig updates for 4.11 - Enable ARM_SMMU_V3 in the arm64 defconfig - Enable NUMA and NUMA_BALANCING in the arm64 defconfig * tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi: arm64: defconfig: Enable NUMA and NUMA_BALANCING arm64: defconfig: enable SMMUv3 config Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'hisi-arm64-dt-for-4.11' of git://github.com/hisilicon/linux-hisi ↵Olof Johansson
into next/dt64 ARM64: DT: Hisilicon SoC DT updates for 4.11 - Add binding for Hi3660 SoC and HiKey960 Board - Add binding for ARM Cortex-A73 - Add dts files for HiKey960 development board * tag 'hisi-arm64-dt-for-4.11' of git://github.com/hisilicon/linux-hisi: arm64: dts: Add dts files for Hisilicon Hi3660 SoC dt-bindings: Add a support cpu type for cortex-a73 document: dt: add binding for Hi3660 SoC Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'v4.10-next-dts' of https://github.com/mbgg/linux-mediatek into ↵Olof Johansson
next/dt64 For mt8173: - set mm_sel clock to 400 MHz to support 4K HDMI - adjust power efficiency between the little and big cores - add a node for thermal calibration via e-fuse data * tag 'v4.10-next-dts' of https://github.com/mbgg/linux-mediatek: arm64: dts: mt8173: add node for thermal calibration arm64: dts: mt8173: Fix cpu_thermal cooling-maps contributions arm64: dts: mt8173: add mmsel clocks for 4K support Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'v4.10-next-dts32' of https://github.com/mbgg/linux-mediatek into ↵Olof Johansson
next/dt Lots of updates for mt2701: Rearrange the dt nodes and fix unit address for pincontroler Add nodes for: - clock controller subsystems - scpsys controller - iommu and smi - spi - nand - auxadc - thermal controller and zones Email address updated for mt7623 devicetree files. * tag 'v4.10-next-dts32' of https://github.com/mbgg/linux-mediatek: arm: dts: mt2701: Add thermal device node. arm: dts: mt2701: Add auxadc device node. arm: dts: mt2701: Add nand device node arm: dts: mt2701: Add spi device node ARM: dts: mt2701: add iommu/smi dtsi node for mt2701 ARM: dts: mediatek: update my email address arm: dts: mt2701: Add power domain controller device node arm: dts: mt2701: Add subsystem clock controller device nodes arm: dts: mt2701: Sort DT nodes by register address Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'omap-for-v4.11/defconfig-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig Few omap2plus_defconfig changes for v4.11 merge window: - Switch to use LIS3LV02DL IIO driver instead of the LIS3LC02D misc driver - Set CONFIG_SERIAL_8250_RUNTIME_UARTS=6 to avoid runtime warnings on omap5 and dra7 - Enable ksz9021 phy and m41t80 rtc as they are used at least on phyCORE-AM335x * tag 'omap-for-v4.11/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Enable support for RTC M41T80 ARM: omap2plus_defconfig: Enable support for micrell phys ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6 ARM: defconfig: omap2plus: switch LIS3LV02DL driver Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'omap-for-v4.11/dt-signed-v2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Device tree changes for omaps for v4.11 merge window. These changes add earlycon stdout-path propety for the SoCs so far tested with it. The other changes are addition of BeagleBone green and making WLAN work on BeagleBone black wireless and green wireless. The rest of the changes are the usual enabling features on various devices: - Enable devices on am335x-sl50 - Changes to dra7-evm boards to enable enable irqs for dp83867 eth phys, add pinmux configuration for mmc, remov erratum i869 pinmux configurations, disable NAND support because of pin conflict, add pcf8575 used for lcd - Remove NAND partition table for omap3-igep - Configure USB Ethernet MAC from device tree for beagleboard xm, pandaboard, omap5-uevm and igepv5 - Configure am335x-chilisom to wake from RTC-only state - Update Nanobone for external FRAM chip - Clean up n900 dts - Update am335x-phycore and am335x-wega for various devices - Changes for am57xx-beagle-x15 to implement rgmii2 errata * tag 'omap-for-v4.11/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (35 commits) ARM: dts: dra72/1-evm: add pcf8575 used for lcd ARM: dts: dra7xx: Add stdout-path property ARM: dts: am57xx: Add stdout-path property ARM: dts: am43xx: Add stdout-path property ARM: dts: am33xx: Add stdout-path property ARM: dts: am335x-sl50: Enable the Ambient Light Sensor. ARM: dts: am335x-sl50: Enable the MCP23017 GPIO Expander. ARM: dts: am335x-sl50: Enable BQ32000 Real Time Clock. ARM: dts: am335x-sl50: Enable SPI0 interface and Flash Memory. ARM: dts: am335x-sl50: Enable UART1. ARM: dts: am335x-sl50: Remove I2C1 node. ARM: dts: omap3-igep: Remove NAND partition table ARM: dts: am57xx-beagle-x15: implement errata "Ethernet RGMII2 Limited to 10/100 Mbps" ARM: dts: am335x-phycore-som: Remove partition tables ARM: dts: dra72-evm-revc: enable irqs for dp83867 eth phys ARM: dts: Configure BeagleBone peripheral USB VBUS irq ARM: dts: omap5-igep0050: Allow bootloader to configure USB Ethernet MAC ARM: dts: omap5-uevm: Allow bootloader to configure USB Ethernet MAC ARM: dts: pandaboard: Allow bootloader to configure USB Ethernet MAC ARM: omap3: beagleboard-xm: dt: Add ethernet to the device tree ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'omap-for-v4.11/soc-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC changes for omaps for v4.11 merge window. This adds support for keeping the interconnect target module active for uart if earlycon is specified. And we're adding Aaro Koskinen as a co-maintainer for omap1 to make sure things stay working for omap1. The other changes are mostly clean-up of old legacy code: - Remove unused omap_display_init() - Make omapdss_find_dss_of_node() function static - Add support for earlycon - Tidy up omap1 usb logging output with pr_cont - Make omap_otg_init() static - Delete redundant CPU class checks for omap1 - Remove unused mpurate cmdline option that has not done anything for past 1.5 years at least * tag 'omap-for-v4.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: clock: Remove unused mpurate cmdline option ARM: OMAP2+: omap_hwmod: Add support for earlycon MAINTAINERS: Add Aaro Koskinen as TI omap1 SoC co-maintainer ARM: OMAP1: USB: delete redundant CPU class checks ARM: OMAP1: USB: make omap_otg_init() static ARM: OMAP1: USB: tidy up logging output ARM: OMAP2+: Make the omapdss_find_dss_of_node() function static ARM: OMAP2+: Remove unused omap_display_init() function Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'omap-for-v4.11/fixes-not-urgent-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical Non-urgent fixes for omaps for v4.11 merge window. These all are fixes for things that have never worked or have been broken for a long time and nobody noticed: - Fix omap3 off mode pull defines - Allow multiple pdata quirks instead of just one - Fix am335x and dm814x scm syscon to probe children too - Fix compatible for ti81xx to allow use with 8250_omap as well - Fix 8250_omap on omap5 by adding HWMOD_SWSUP_SIDLE_ACT flag - Fix SoC detection for omap36/37 SoCs * tag 'omap-for-v4.11/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: Fix SoC detection of OMAP36/37 Family ARM: OMAP5: Add HWMOD_SWSUP_SIDLE_ACT flag for UART ARM: dts: Fix compatible for ti81xx uarts for 8250 ARM: dts: Fix am335x and dm814x scm syscon to probe children ARM: OMAP2+: Fix init for multiple quirks for the same SoC ARM: dts: Fix omap3 off mode pull defines Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29ARM: Import tango4_defconfigMarc Gonzalez
Import a minimal defconfig for tango4 boards. Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'davinci-for-v4.11/defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig Enable config options for DaVinci VPIF, LCDC, PWM, Pull up/down pinconf driver and IIO in davinci_all_defconfig * tag 'davinci-for-v4.11/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable iio ARM: davinci_all_defconfig: Enable PWM modules ARM: davinci_all_defconfig: enable DA8xx pinconf ARM: davinci_all_defconfig: enable pwm-beeper ARM: davinci_all_defconfig: enable dumb vga-dac drm bridge ARM: davinci_all_defconfig: enable video capture as modules Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'davinci-for-v4.11/dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt Device tree updates for DaVinci DA850 * GPIO keys on DA850 LCDK * LCDC display on DA850 LCDK * USB OHCI on DA850 LCDK * VPIF (video input) on DA850 LCDK * Add a DA8xx specific compatible for UARTs * Introduce support for Lego Mindstorms EV3 * tag 'davinci-for-v4.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: dts: Add LEGO MINDSTORMS EV3 dts dt-bindings: add "microchip,24c128" compatible string dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification dt-bindings: Add vendor prefix for LEGO ARM: dts: da850: Add ti,da830-uart compatible for serial ports ARM: dts: davinci: da850-lcdk: enable VPIF ARM: dts: davinci: da850-evm: enable VPIF ARM: dts: davinci: da850: VPIF: add node and muxing ARM: dts: da850-lcdk: Enable ohci for omapl138 lcdk ARM: dts: da850: Add usb device node ARM: dts: da850: specify the maximum pixel clock rate for tilcdc ARM: dts: da850-lcdk: add the vga-bridge node ARM: dts: da850: rename the display node label ARM: dts: da850-lcdk: add gpio-keys Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'davinci-for-v4.11/fixes-non-critical' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical Non-critical DaVinci fixes for v4.11 * Coding style and typo fix * Make PLL0 rate setting API for DA850 less confusing to use. * tag 'davinci-for-v4.11/fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: bus: da850-mstpri: fix my e-mail address ARM: davinci: da850: fix da850_set_pll0rate() ARM: davinci: da850: coding style fix Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29Merge tag 'qcom-dts-for-4.11' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt Qualcomm Device Tree Changes for v4.11 * Add Coresight components for APQ8064 * Fixup PM8058 nodes * Add APQ8060 gyro and accel support * Enable SD600 HDMI support * Add RIVA supprort for Sony Yuga and SD600 * Add PM8821 support * Add MSM8974 ADSP, USB gadget, SMD, and SMP2P support * Fix IPQ8064 clock frequencies * tag 'qcom-dts-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: dts: qcom: Add apq8064 CoreSight components ARM: dts: Add gyro and accel to APQ8060 Dragonboard ARM: dts: reference PM8058 as IRQ parent ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058 ARM: dts: sd-600eval: enable 1.8v regulator on LS expansion ARM: dts: sd-600eval: add hdmi support ARM: dts: move hdmi pinctrl out of board file. ARM: dts: qcom: sd600eval: Enable riva-pil ARM: dts: qcom: sd600-eval: pm8921_s2 regulator properties ARM: dts: qcom: apq8064-sony-yuga: Enable riva-pil ARM: dts: qcom: apq8064: Add riva-pil node ARM: dts: apq8064: add support to pm8821 arm: dts: qcom: Fix ipq board clock rates ARM: dts: msm8974: Remove "unused" reserved region ARM: dts: msm8974: Add ADSP PIL node ARM: dts: msm8974: Add ADSP smp2p and smd nodes ARM: dts: qcom: msm8974: Add USB gadget nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2017-01-29x86/xen: Fix APIC id mismatch warning on IntelMohit Gambhir
This patch fixes the following warning message seen when booting the kernel as Dom0 with Xen on Intel machines. [0.003000] [Firmware Bug]: CPU1: APIC id mismatch. Firmware: 0 APIC: 1] The code generating the warning in validate_apic_and_package_id() matches cpu_data(cpu).apicid (initialized in init_intel()-> detect_extended_topology() using cpuid) against the apicid returned from xen_apic_read(). Now, xen_apic_read() makes a hypercall to retrieve apicid for the boot cpu but returns 0 otherwise. Hence the warning gets thrown for all but the boot cpu. The idea behind xen_apic_read() returning 0 for apicid is that the guests (even Dom0) should not need to know what physical processor their vcpus are running on. This is because we currently do not have topology information in Xen and also because xen allows more vcpus than physical processors. However, boot cpu's apicid is required for loading xen-acpi-processor driver on AMD machines. Look at following patch for details: commit 558daa289a40 ("xen/apic: Return the APIC ID (and version) for CPU 0.") So to get rid of the warning, this patch modifies xen_cpu_present_to_apicid() to return cpu_data(cpu).apicid instead of calling xen_apic_read(). The warning is not seen on AMD machines because init_amd() populates cpu_data(cpu).apicid by calling hard_smp_processor_id()->xen_apic_read() as opposed to using apicid from cpuid as is done on Intel machines. Signed-off-by: Mohit Gambhir <mohit.gambhir@oracle.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>