summaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Collapse)Author
2013-10-28powerpc/85xx: introduce corenet_generic machineKevin Hao
In the current kernel, the board files for p2041rdb, p3041ds, p4080ds, p5020ds, p5040ds, t4240qds and b4qds are almost the same except the machine name. So this introduces a cornet_generic machine to support all these boards to avoid the code duplication. With these changes the file corenet_ds.h becomes useless. Just delete it. Signed-off-by: Kevin Hao <haokexin@gmail.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/dts/c293pcie: Add range field for IFC NANDPrabhakar Kushwaha
C290PCIe has NAND flash present on IFC Chip Select(CS) 1. So Add "ranges" field for NAND flash on CS1. Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/b4860emu: Add device tree file for b4860emuYork Sun
B4860EMU is a emualtor target with minimum peripherals. It is based on B4860QDS and trimmed down most peripherals due to either not modeled or lack of board level connections. The main purpose of this minimum dts is to speed up booting on emulator. Signed-off-by: York Sun <yorksun@freescale.com> [scottwood@freescale.com: whitespace fix] Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/t4240emu: Add device tree file for t4240emuYork Sun
T4240EMU is an emulator target with minimum peripherals. It is based on T4240QDS and trimmed down most peripherals due to either not modeled or lack of board level connections. The main purpose of this minimum dts is to speed up booting on emulator. Signed-off-by: York Sun <yorksun@freescale.com> [scottwood@freescale.com: whitespace fixes] Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/b4qds: enable coreintScott Wood
Commit 9837b43c5f3514e5d28f65f1513f4dc6759d2810 ("powerpc/85xx: enable coreint for all the 64bit boards") removed the ifdef that avoided coreint on 64-bit, but it missed b4_qds.c. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Kevin Hao <haokexin@gmail.com> Cc: Shaveta Leekha <shaveta@freescale.com>
2013-10-28powerpc/8xx: Revert commit e0908085fc2391c85b85fb814ae1df377c8e0dcbLEROY Christophe
The commit e0908085fc2391c85b85fb814ae1df377c8e0dcb ("powerpc/8xx: Fix regression introduced by cache coherency rewrite") is not needed anymore. The issue was because dcbst wrongly sets the store bit when causing a DTLB error, but this is now fixed by commit 0a2ab51ffb8dfdf51402dcfb446629648c96bc78 ("powerpc/8xx: Fixup DAR from buggy dcbX instructions.") which handles the buggy dcbx instructions on data page faults on the 8xx. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> [scottwood@freescale.com: fix commit message] Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc: Add I2C bus multiplexer node for B4 and T4240QDSHongtao Jia
In both B4 and T4240QDS platform PCA9547 I2C bus multiplexer is used. The sub-nodes are also reorganized according to right I2C topology. Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/fsl/defconfig: enable CONFIG_AT803X_PHYShengzhou Liu
Enable CONFIG_AT803X_PHY to support AR8030/8033/8035 PHY. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/dts: Correct sdhci quirk for bsc9131Haijun.Zhang
We use property "sdhci,auto-cmd12" instead of "fsl,sdhci-auto-cmd12" to distinguish if the sdhc host has quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12. Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/eSDCH: Specify voltage for T4240QDSHaijun.Zhang
Freescale T4240QDS reference board has extra voltage shifters added to allow 3.3V operation, so add 3.3v voltage support for T4240QDS. 1.8v and 3.3v is recommand for eMMC and SDHC card. Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/mpc8xx: Clearer Oops message for Software Emulation ExceptionLEROY Christophe
This patch modifies the Oops message in case of Software Emulation Exception. The existing message is quite confusing because it refers to FPU Emulation while most often the issue is due to either a non supported instruction (not necessarily FPU related) or a stale instruction due to HW issues. The new message tries to be more generic in order to make the user understand that the Oops is due to something wrong with an instruction, not necessarily due to an FPU instruction. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc: Set the NOTE type for SPE regsetSuzuki Poulose
The regset defintion for SPE doesn't have the core_note_type set, which prevents it from being dumped. Add the note type NT_PPC_SPE for SPE regset. Signed-off-by: Suzuki K Poulose <suzuki@in.ibm.com> Cc: Roland McGrath <roland@hack.frob.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/e500v2: Include Power ISA propertiesLijun Pan
bsc9131 device tree does not have these properties. Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/e6500: Include Power ISA propertiesLijun Pan
b4420 and b4860 device trees do not have these properties. Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/pci: Change the DECLARE_PCI_FIXUP_{HEADER => EARLY} macro of pci quirkChunhe Lan
Freescale platform has class code = 0x0b2000, when it boots. This makes kernel PCI bus code to setup these devices resulting into the following notice information when trying to enable them: pci 0000:00:00.0: ignoring class 0x0b2000 (doesn't match header type 01) The above information is outputted by judging value of dev->class before pci_setup_device() function, and the DECLARE_PCI_FIXUP_HEADER quirk runs after pci_setup_device() function. But the DECLARE_PCI_FIXUP_EARLY quirk runs before judging value of dev->class and pci_setup_device() function. So we use the DECLARE_PCI_FIXUP_EARLY macro to fix this issue. Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28powerpc/dts: fix sRIO error interrupt for b4860Minghuan Lian
For B4 platform, MPIC EISR register is in reversed bitmap order, instead of "Error interrupt source 0-31. Bit 0 represents SRC0." the correct ordering is "Error interrupt source 0-31. Bit 0 represents SRC31." This patch is to fix sRIO EISR bit value of error interrupt in dts node. Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2013-10-28Merge tag 'xtensa-next-20131015' of git://github.com/czankel/xtensa-linuxLinus Torvalds
Pull Xtensa patchset from Chris Zankel: "The main patch fixes a bug that can cause a kernel panic, and was introduced in rc1. The other two have been discovered by a uclibc test and 'coccinelle'" * tag 'xtensa-next-20131015' of git://github.com/czankel/xtensa-linux: xtensa: Cocci spatch "noderef" xtensa: don't use alternate signal stack on threads xtensa: fix fast_syscall_spill_registers_fixup
2013-10-28arm/versatile: Fix versatile irq specifications.Grant Likely
Two of the versatile irq definitions are incorrect, mostly because two devices have connections to more than one interrupt controller. Fix them by using the new interrupts-extended property to fan out without using an awful interrupt-map nexus node. Signed-off-by: Grant Likely <grant.likely@linaro.org>
2013-10-28of/irq: create interrupts-extended propertyGrant Likely
The standard interrupts property in device tree can only handle interrupts coming from a single interrupt parent. If a device is wired to multiple interrupt controllers, then it needs to be attached to a node with an interrupt-map property to demux the interrupt specifiers which is confusing. It would be a lot easier if there was a form of the interrupts property that allows for a separate interrupt phandle for each interrupt specifier. This patch does exactly that by creating a new interrupts-extended property which reuses the phandle+arguments pattern used by GPIOs and other core bindings. Signed-off-by: Grant Likely <grant.likely@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Kumar Gala <galak@codeaurora.org> [grant.likely: removed versatile platform hunks into separate patch] Cc: Rob Herring <rob.herring@calxeda.com>
2013-10-28ARM: gemini: convert to GENERIC_CLOCKEVENTSLinus Walleij
This converts the gemini machine to use generic clockevents by rewriting the timer driver. Cc: arm@kernel.org Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'omap-for-v3.13/dt-late' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Some more dts changes from Benoit Cousson <bcousson@baylibre.com> via Tony Lindgren: - Add a lot of N900 nodes - Add OPP table to OMAP5/DRA7 - Add support for Newflow NanoBone board - Add i2c aliases - Add McASP and audio support - Add reset/idle on init bindings for OMAP - Add more nodes for AM4272 * tag 'omap-for-v3.13/dt-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (42 commits) ARM: dts: omap5-uevm: Remove pinmux for dmic pins ARM: dts: omap5-uevm: Correct twl6040 reset GPIO pinmux ARM: dts: TWL4030: Add power button support ARM: dts: omap3-n900: Add LP5523 support ARM: dts: omap3-n900: Add TLV320AIC3X support ARM: dts: omap3-n900:: Mux RX51_LCD_RESET_GPIO in DTS ARM: dts: omap3-n900: Add NAND support ARM: dts: omap3-n900: Specify regulator info ARM: dts: TWL4030: Add missing regulators ARM: dts: omap3-n900: Add LP5523 support ARM: dts: omap3-n900: Add vibrator device ARM: dts: omap3-n900: GPIO key definitions ARM: dts: omap3-n900: Add support for SD cards ARM: dts: omap3-n900: Add UART support ARM: dts: omap3-n900: Fix i2c bus speed ARM: dts: omap3-n900: Add pinctrl for i2c devices ARM: dts: DRA7: Add CPU OPP table ARM: dts: OMAP5: Add CPU OPP table ARM: dts: dra7-evm: add smps123 supply for CPU ARM: dts: omap5-uevm: add smps123 supply for CPU ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'omap-for-v3.13/cpufreq-late' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt From Tony Lindgren: Few patches to make cpufreq work for omap3 with device tree. Note that this branch has a dependency to the patches merged with omap-for-v3.13/board-removal-signed-take2. * tag 'omap-for-v3.13/cpufreq-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot ARM: OMAP2+: add missing lateinit hook for calling pm late init ARM: OMAP3+: do not register non-dt OPP tables for device tree boot Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'omap-for-v3.13/cm-scm-cleanup-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup From Paul Walmsley <paul@pwsan.com> via Tony Lindgren: Move some of the OMAP2+ CM and System Control Module direct register accesses into CM- and System Control Module-specific "drivers" underneath arch/arm/mach-omap2/. This is a prerequisite for moving this code out of arch/arm/mach-omap2/ into drivers/. Basic test logs are available here: http://www.pwsan.com/omap/testlogs/cm_scm_cleanup_a_v3.13/20131019101809/ * tag 'omap-for-v3.13/cm-scm-cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: control: add API for setting IVA bootmode ARM: OMAP3: CM/control: move CM scratchpad save to CM driver ARM: OMAP3: McBSP: do not access CM register directly ARM: OMAP3: clock: add API to enable/disable autoidle for a single clock ARM: OMAP2: CM/PM: remove direct register accesses outside CM code + Linux 3.12-rc4 Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'omap-for-v3.13/fixes-not-urgent-part2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes-non-critical From Tony Lindgren: Few more omap fixes that are not regressions or oopses and can wait for the merge window. * tag 'omap-for-v3.13/fixes-not-urgent-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: irq, AM33XX add missing register check ARM: OMAP2+: wakeupgen: AM43x adaptation Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson
From Jason Cooper, mvebu dt changes for v3.13 (round 4): - mvebu - core divider clock driver dt binding and nodes * tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Add the core-divider clock to Armada 370/XP ARM: mvebu: Add a 2 GHz fixed-clock Armada 370/XP ARM: mvebu: Add Core Divider clock device-tree binding
2013-10-28ARM: vexpress: Enable platform-specific options in defconfigPawel Moll
This patch enables all drivers and alike to make defconfig-ed kernels use Versatile Express specific features, like power management services (PSCI, MCPM with drivers for DCCSB on Fast Models and SPC on TC2), CMA for frame buffer allocation, all virtio device drivers (for QEMU, KVM tools and Fast Models), MTD physmap drivers with squashfs and UBIFS for flash, I2C master, regulator and hwmon drivers and LEDs support with most useful triggers. The maximum amount of CPUs has been increased to 8 to facilitate big.Little systems. Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28ARM: vexpress: Make defconfig work againFathi Boudra
This patch updates the Versatile Express defconfig to a level which makes it possible to run a defconfig-ed kernel work on the board and in QEMU with modern userspace. It does: - update cmdline to contain "console=ttyAMA0" only - enable devtmpfs filesystem - enable voltage regulator support - enable ext4 filesystem - disable low level debug and early printk Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> [PM: removed DEBUG_LL - it doesn't work on qemu] [PM: reworded the commit message] Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'imx-dt-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
into next/dt From Shawn Guo: The imx/mxs device tree changes for 3.13: - Use macros for mxs pinctrl settings - New board support: VF610 Cosmic/Cosmic+, imx6q-udoo, MSR M28CU3 - Support DSPI device for vf610 - Add PCIe device for imx6qdl - Add UHS pinctrl states for imx6sl and imx6qdl - Display support for APF and imx51-babbage boards - Enable SPI NOR and USB for imx6sl-evk board - Enable LVDS for imx6q-sabrelite and SPDIF for imx6qdl-wandboard - Misc updates on boards: TX28, imx6qdl-wandboard, imx53-qsb etc. - Some random updates on imx51 device tree * tag 'imx-dt-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6: (44 commits) ARM: imx: imx6sl iomuxc syscon is compatible to imx6q ARM: dts: imx6sl-evk: enable the SPI NOR ARM: dts: imx6sl: add a pinctrl for ECSPI1 ARM: imx27: add missing #pwm-cells property ARM: dts: imx6sl: add pinctrl uhs states for usdhc ARM: dts: imx6qdl-sabresd: Add backlight support for lvds ARM: dts: imx51-babbage: Make DVI and WVGA panel functional ARM: imx27-apf27dev: Add framebuffer support ARM: imx51-apf51dev: Add parallel display support ARM: dts: imx53-qsb: Do not use GPIO1_8 as wakeup source ARM: dts: imx53-qsb: SDHC1 does not have cd-gpios ARM: dts: imx53-qsb: SDHC3 is connected in 8-bit mode ARM: dts: mxs: Add MSR M28CU3 board ARM: dts: imx6qdl-wandboard: Provide phy-reset-gpios ARM: dts: imx6qdl-sabresd: Provide phy-reset-gpios ARM: dts: imx6q-sabrelite: Add ethernet phy reset pin into hog ARM: dts: imx6qdl: add pcie device node ARM: dts: imx6q-udoo: Add initial board support ARM: dts: mxs: Add muxing options for the SSP2 MMC ARM: dts: add initial VF610 Cosmic/Cosmic+ board support ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28x86/efi: Add EFI framebuffer earlyprintk supportMatt Fleming
It's incredibly difficult to diagnose early EFI boot issues without special hardware because earlyprintk=vga doesn't work on EFI systems. Add support for writing to the EFI framebuffer, via earlyprintk=efi, which will actually give users a chance of providing debug output. Cc: H. Peter Anvin <hpa@zytor.com> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Jones <pjones@redhat.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
2013-10-28Merge tag 'imx-soc-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
into next/soc From Shawn Guo: The imx/mxs soc changes for 3.13: * Low-level debug support for Vybrid * Support soc bus/device for imx6 * Suspend support for imx6dl and imx6sl * The imx6q clock updates for PCIe and audio PLL support * IOMUXC GPR update for fec support * Some random cleanup * A few defconfig updates * tag 'imx-soc-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6: (31 commits) ARM: imx: enable suspend for imx6sl ARM: imx: ensure dsm_request signal is not asserted when setting LPM ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter() ARM: imx6q: move low-power code out of clock driver ARM: imx: drop extern with function prototypes in common.h ARM: imx: reset core along with enable/disable operation ARM: imx: do not return from imx_cpu_die() call ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO ARM: imx: replace imx6q_restart() with mxc_restart() ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt ARM: mach-imx: clk-imx51-imx53: Retrieve base address and irq from dt ARM: mxs_defconfig: Add CHIPIDEA_UDC support ARM: imx: Include linux/err.h ARM: imx_v6_v7_defconfig: Add CHIPIDEA_UDC support ARM: imx_v6_v7_defconfig: Add SPDIF support ARM: imx6q: clock and Kconfig update for PCIe support ARM: imx: Add LVDS general-purpose clocks to i.MX6Q ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'sunxi-defconfig-for-3.13' of https://github.com/mripard/linux ↵Olof Johansson
into next/soc From Maxime Ripard: Allwinner sunXi defconfig changes for 3.13 This pull request only see the introduction of a sunxi_defconfig. * tag 'sunxi-defconfig-for-3.13' of https://github.com/mripard/linux: ARM: sunxi: Add a defconfig for the Allwinner SoCs Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28ARM: sunxi: remove .init_time hooksOlof Johansson
The machine entries were split up, but the cleanup to remove .init_time removed the function that the new/split entries refer to. Remove them since they are no longer needed. Cc: Maxime Ripard <mripard@free-electrons.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux into ↵Olof Johansson
next/soc From Maxime Ripard: Allwinner sunXi SoCs machine additions for 3.13 Nothing outstanding here, mostly some documentation cleanup, and the split of the previous generic machine declaration into three different machines to handle the sun4i/sun5i, sun6i and sun7i separately. * tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux: Documentation: dt: Remove clock gates IDs list for Allwinner SoCs Documentation: dt: Remove interrupt sources list for Allwinner SoCs Documentation: sunxi: Update Allwinner SoC documentation Documentation: sunxi: Update A13 user manual dead link ARM: sunxi: Order Kconfig options alphabetically ARM: sunxi: Simplify restart setup code ARM: sunxi: Split out the DT machines for sun6i and sun7i Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge branch 'cleanup/dt-clock' into next/socOlof Johansson
Merging in dt clock cleanup as a pre-req with some of the later SoC branches. There are a handful of conflicts here -- some of the already merged SoC branches should have been based on the cleanup but weren't. In particular, a remove/add of include on highbank and two remove/remove conflicts on kirkwood were fixed up. * cleanup/dt-clock: (28 commits) ARM: vt8500: remove custom .init_time hook ARM: vexpress: remove custom .init_time hook ARM: tegra: remove custom .init_time hook ARM: sunxi: remove custom .init_time hook ARM: sti: remove custom .init_time hook ARM: socfpga: remove custom .init_time hook ARM: rockchip: remove custom .init_time hook ARM: prima2: remove custom .init_time hook ARM: nspire: remove custom .init_time hook ARM: nomadik: remove custom .init_time hook ARM: mxs: remove custom .init_time hook ARM: kirkwood: remove custom .init_time hook ARM: imx: remove custom .init_time hook ARM: highbank: remove custom .init_time hook ARM: exynos: remove custom .init_time hook ARM: dove: remove custom .init_time hook ARM: bcm2835: remove custom .init_time hook ARM: bcm: provide common arch init for DT clocks ARM: call of_clk_init from default time_init handler ARM: vt8500: prepare for arch-wide .init_time callback ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge tag 'kvm-arm-for-3.13-2' of ↵Paolo Bonzini
git://git.linaro.org/people/cdall/linux-kvm-arm into kvm-queue Updates for KVM/ARM, take 2 including: - Transparent Huge Pages and hugetlbfs support for KVM/ARM - Yield CPU when guest executes WFE to speed up CPU overcommit
2013-10-28nVMX: Report CPU_BASED_VIRTUAL_NMI_PENDING as supportedJan Kiszka
If the host supports it, we can and should expose it to the guest as well, just like we already do with PIN_BASED_VIRTUAL_NMIS. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-10-28nVMX: Fix pick-up of uninjected NMIsJan Kiszka
__vmx_complete_interrupts stored uninjected NMIs in arch.nmi_injected, not arch.nmi_pending. So we actually need to check the former field in vmcs12_save_pending_event. This fixes the eventinj unit test when run in nested KVM. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-10-28KVM: nVMX: Report 2MB EPT pages as supportedJan Kiszka
As long as the hardware provides us 2MB EPT pages, we can also expose them to the guest because our shadow EPT code already supports this feature. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-10-28arm64: update 32-bit kuser helpers to ARMv8Robin Murphy
This patch updates the barrier semantics in the kuser helper functions to take advantage of the ARMv8 additions to AArch32, which are guaranteed to be available in situations where these functions will be called. Note that this slightly changes the cmpxchg functions in that they are no longer necessarily full barriers if they return 1. However, the documentation only states they include their own barriers "as needed", not that they are obligated to act as a full barrier for the caller. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> CC: Matthew Leach <matthew.leach@arm.com> CC: Dave Martin <dave.martin@arm.com> CC: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-10-28s390: convert use of typedef ctl_table to struct ctl_tableJoe Perches
This typedef is unnecessary and should just be removed. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2013-10-27Merge most of tag 'tags/exynos-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git into next/dt From Kukjin Kim, these are device-tree updates for Exynos. Among the changes: - add MIPI PHY node for exynos4 - update regulator for origen and exynos5250-arndale - add support HDMI for exynos5250, exynos5420 * commit '93457b9cb980ffeeef020c3bcd99065c3807619b': ARM: dts: Add HDMI related I2C nodes for Arndale board ARM: dts: enable hdmi subsystem for exynos5420 smdk board ARM: dts: add dt nodes for hdmi subsystem for exynos5420 ARM: dts: add i2c device nodes for Exynos5420 ARM: dts: add clocks to hdmi dt node for exynos5250 ARM: dts: add mixer clocks to mixer node for Exynos5250 of/documentation: update with clock information for exynos hdmi subsystem ARM: dts: Disable Exynos5250 I2S controllers by default ARM: dts: Add reg property to regulator nodes in exynos5250-arndale ARM: dts: Add fixed voltage regulator to simple bus for origen ARM: dts: Add MIPI PHY node to exynos4.dtsi
2013-10-27Merge tag 's3c24xx-dma' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers From Kukjin Kim, this branch adds device-tree support to the DMA controller on the older Samsung SoCs. It also adds support for one of the missing SoCs in the family (2410). The driver has been Ack:ed by Vinod Koul, but is merged through here due to dependencies with platform code. * tag 's3c24xx-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442 dmaengine: s3c24xx-dma: add support for the s3c2410 type of controller ARM: S3C24XX: Fix possible dma selection warning ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device ARM: S3C24XX: add platform-devices for new dma driver for s3c2412 and s3c2443 dmaengine: add driver for Samsung s3c24xx SoCs ARM: S3C24XX: number the dma clocks + Linux 3.12-rc3 Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-27Merge tag 'samsung-cleanup' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup From Kukjin Kim: Samsung Cleanup for v3.13 - remove unnecessary config options and header inclusions - use CONFIG_ARCH_S3C64XX instead of PLAT_S3C64XX * tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options ARM: EXYNOS: remove unnecessary header inclusions from exynos4/5 dt machine file ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support s3c-camif: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support ARM: S3C64XX: Move if ARCH_S3C64XX statement into mach-s3c64xx Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-27Merge tag 'ux500-dt-for-v3.13-3' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt From Linus Walleij: Five incremental device tree patches around the clock handling, and adding SSP/SPI devices to the device tree. * tag 'ux500-dt-for-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: register all SSP and SPI blocks ARM: ux500: fix I2C4 clock bit ARM: ux500: fix clock for GPIO blocks 6 and 7 clk: ux500: fix erroneous bit assignment ARM: ux500: fix clock for GPIO block 8 Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-27Merge tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux into ↵Olof Johansson
next/dt From Maxime Ripard: Allwinner sunXi SoCs minor fixes for 3.13 * tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux: ARM: sun6i: Fix the APB2 clock gates register size Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-27Merge tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux into next/dtOlof Johansson
From Maxime Ripard: Allwinner sunXi SoCs device tree changes for 3.13 This DT series sees the introduction of the cubietruck DT, plus the addition of the i2c controller for the A20 based boards, and of the Security ID found in all the Allwinner SoCs but the A31. * tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux: ARM: sunxi: dts: Add support for the cubieboard3, the CubieTruck ARM: sun7i: olinuxino-micro: Enable the I2C controllers ARM: sun7i: cubieboard2: Enable the I2C controllers ARM: sun7i: Add the pin muxing options for the I2C controllers ARM: sun7i: Enable the I2C controllers ARM: sunxi: dt: Add sunxi-sid to dts for sun4i, sun5i and sun7i Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-28Merge branch 'pm-cpufreq'Rafael J. Wysocki
* pm-cpufreq: (167 commits) cpufreq: create per policy rwsem instead of per CPU cpu_policy_rwsem intel_pstate: Add Baytrail support intel_pstate: Refactor driver to support CPUs with different MSR layouts cpufreq: Implement light weight ->target_index() routine PM / OPP: rename header to linux/pm_opp.h PM / OPP: rename data structures to dev_pm equivalents PM / OPP: rename functions to dev_pm_opp* cpufreq / governor: Remove fossil comment cpufreq: exynos4210: Use the common clock framework to set APLL clock rate cpufreq: exynos4x12: Use the common clock framework to set APLL clock rate cpufreq: Detect spurious invocations of update_policy_cpu() cpufreq: pmac64: enable cpufreq on iMac G5 (iSight) model cpufreq: pmac64: provide cpufreq transition latency for older G5 models cpufreq: pmac64: speed up frequency switch cpufreq: highbank-cpufreq: Enable Midway/ECX-2000 exynos-cpufreq: fix false return check from "regulator_set_voltage" speedstep-centrino: Remove unnecessary braces acpi-cpufreq: Add comment under ACPI_ADR_SPACE_SYSTEM_IO case cpufreq: arm-big-little: use clk_get instead of clk_get_sys cpufreq: exynos: Show a list of available frequencies ... Conflicts: drivers/devfreq/exynos/exynos5_bus.c
2013-10-28Merge branch 'pm-cpuidle'Rafael J. Wysocki
* pm-cpuidle: ARM: AT91: DT: pm: Select ram controller standby based on DT ARM: AT91: pm: Factorize standby function ARM: at91: cpuidle: Move driver to drivers/cpuidle ARM: at91: cpuidle: Convert to platform driver ARM: ux500: cpuidle: fix section mismatch ARM: zynq: cpuidle: convert to platform driver ARM: zynq: cpuidle: Remove useless compatibility string drivers: cpuidle: rename ARM big.LITTLE driver config and makefile entries ARM: EXYNOS: convert cpuidle driver to be a platform driver intel_idle: mark some functions with __init tag intel_idle: mark states tables with __initdata tag intel_idle: shrink states tables
2013-10-28Merge branch 'powercap'Rafael J. Wysocki
* powercap: PowerCap: Convert class code to use dev_groups PowerCap: Introduce Intel RAPL power capping driver bitops: Introduce BIT_ULL x86 / msr: add 64bit _on_cpu access functions PowerCap: Add to drivers Kconfig and Makefile PowerCap: Add class driver PowerCap: Documentation
2013-10-28Merge branch 'acpi-assorted'Rafael J. Wysocki
* acpi-assorted: ACPI: Add Toshiba NB100 to Vista _OSI blacklist ACPI / osl: remove an unneeded NULL check ACPI / platform: add ACPI ID for a Broadcom GPS chip ACPI: improve acpi_extract_package() utility ACPI / LPSS: fix UART Auto Flow Control ACPI / platform: Add ACPI IDs for Intel SST audio device x86 / ACPI: fix incorrect placement of __initdata tag ACPI / thermal: convert printk(LEVEL...) to pr_<lvl> ACPI / sysfs: make GPE sysfs attributes only accept correct values ACPI / EC: Convert all printk() calls to dynamic debug function ACPI / button: Using input_set_capability() to mark device's event capability ACPI / osl: implement acpi_os_sleep() with msleep()