1. 15 Nov, 2013 4 commits
    • Olof Johansson's avatar
      Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into fixes · ca439c9b
      Olof Johansson authored
      From Nicolas Ferre, fixes for early boot hangs on at91:
      
      Fixes for RTT & RTC interrupts that can fire early during boot process
      and kill the system.
      
      * tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
        ARM: at91: fix hanged boot due to early rtt-interrupt
        ARM: at91: fix hanged boot due to early rtc-interrupt
      ca439c9b
    • Johan Hovold's avatar
      ARM: at91: fix hanged boot due to early rtt-interrupt · 94c4c79f
      Johan Hovold authored
      Make sure the RTT-interrupts are masked at boot by adding a new helper
      function to be used at SOC-init.
      
      This fixes hanged boot on all AT91 SOCs with an RTT, for example, if an
      RTT-alarm goes off after a non-clean shutdown (e.g. when using RTC
      wakeup).
      
      The RTC and RTT-peripherals are powered by backup power (VDDBU) (on all
      AT91 SOCs but RM9200) and are not reset on wake-up, user, watchdog or
      software reset. This means that their interrupts may be enabled during
      early boot if, for example, they where not disabled during a previous
      shutdown (e.g. due to a buggy driver or a non-clean shutdown such as a
      user reset). Furthermore, an RTC or RTT-alarm may also be active.
      
      The RTC and RTT-interrupts use the shared system-interrupt line, which
      is also used by the PIT, and if an interrupt occurs before a handler
      (e.g. RTC-driver) has been installed this leads to the system interrupt
      being disabled and prevents the system from booting.
      
      Note that when boot hangs due to an early RTC or RTT-interrupt, the only
      way to get the system to start again is to remove the backup power (e.g.
      battery) or to disable the interrupt manually from the bootloader. In
      particular, a user reset is not sufficient.
      Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Cc: stable@vger.kernel.org # 3.11.x
      94c4c79f
    • Johan Hovold's avatar
      ARM: at91: fix hanged boot due to early rtc-interrupt · 6de714c2
      Johan Hovold authored
      Make sure the RTC-interrupts are masked at boot by adding a new helper
      function to be used at SOC-init.
      
      This fixes hanged boot on all AT91 SOCs with an RTC (but RM9200), for
      example, after a reset during an RTC-update or if an RTC-alarm goes off
      after shutdown (e.g. when using RTC wakeup).
      
      The RTC and RTT-peripherals are powered by backup power (VDDBU) (on all
      AT91 SOCs but RM9200) and are not reset on wake-up, user, watchdog or
      software reset. This means that their interrupts may be enabled during
      early boot if, for example, they where not disabled during a previous
      shutdown (e.g. due to a buggy driver or a non-clean shutdown such as a
      user reset). Furthermore, an RTC or RTT-alarm may also be active.
      
      The RTC and RTT-interrupts use the shared system-interrupt line, which
      is also used by the PIT, and if an interrupt occurs before a handler
      (e.g. RTC-driver) has been installed this leads to the system interrupt
      being disabled and prevents the system from booting.
      
      Note that when boot hangs due to an early RTC or RTT-interrupt, the only
      way to get the system to start again is to remove the backup power (e.g.
      battery) or to disable the interrupt manually from the bootloader. In
      particular, a user reset is not sufficient.
      Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Cc: stable@vger.kernel.org # 3.11.x
      6de714c2
    • Olof Johansson's avatar
      video: exynos_mipi_dsim: Remove unused variable · ba52b7d4
      Olof Johansson authored
      commit 7e0be9f9 ('video: exynos_mipi_dsim:
      Use the generic PHY driver') resulted in a warning about an unused
      variable:
      
      drivers/video/exynos/exynos_mipi_dsi.c:144:26: warning: unused variable
          'pdev' [-Wunused-variable]
      
      It is indeed unused; remove it.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
      Acked-by: default avatarInki Dae <inki.dae@samsung.com>
      ba52b7d4
  2. 14 Nov, 2013 5 commits
  3. 11 Nov, 2013 21 commits
    • Olof Johansson's avatar
      Merge tag 'imx-fixes-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 004f47bc
      Olof Johansson authored
      From Shawn Guo, imx fixes for 3.13:
       - A couple of imx5 and imx6 clock fixes
       - Two follow-up patches for improving/fixing the commit "ARM: imx:
         replace imx6q_restart()with mxc_restart()"
       - One compile fix for imx6sl with randconfig
       - Commits to fix pllv3 relock/power issues found in IPU/HDMI testing
      
      * tag 'imx-fixes-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: dts: i.MX51: Fix OTG PHY clock
        ARM: imx: set up pllv3 POWER and BYPASS sequentially
        ARM: imx: pllv3 needs relock in .set_rate() call
        ARM: imx: add sleep for pllv3 relock
        ARM: imx6q: add missing sentinel to divider table
        ARM: imx: v7_cpu_resume() is needed by imx6sl build
        ARM: imx: improve mxc_restart() on the SRC bit writes
        ARM: imx: remove imx_src_prepare_restart() call
        ARM: i.MX6q: fix the wrong parent of can_root clock
      004f47bc
    • Linus Walleij's avatar
      MAINTAINERS: drop discontinued mailing list · 4d7e8061
      Linus Walleij authored
      The ST-internal Nomadik mailing list is going down. Remove
      it from the MAINTAINERS file.
      
      Cc: Olivier CLERGEAUD <olivier.clergeaud@st.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      4d7e8061
    • Alexander Shiyan's avatar
      ARM: dts: i.MX51: Fix OTG PHY clock · 036e2991
      Alexander Shiyan authored
      Proper clock ID for USB OTG PHY is "usb_phy_gate".
      The patch changes this mismatch.
      Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      036e2991
    • Shawn Guo's avatar
      ARM: imx: set up pllv3 POWER and BYPASS sequentially · 43c9b9e8
      Shawn Guo authored
      Currently, POWER and BYPASS bits are set up in a single write to pllv3
      register.  This causes problem occasionally from the IPU/HDMI testing.
      Let's follow FSL BSP code to set up POWER bit, relock, and then BYPASS
      sequentially.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      43c9b9e8
    • Shawn Guo's avatar
      ARM: imx: pllv3 needs relock in .set_rate() call · bc3b84da
      Shawn Guo authored
      The pllv3 nees relock not only when powering up but also when rate
      changes.  The patch creates a helper function clk_pllv3_wait_lock() and
      moves the relock code from clk_pllv3_prepare() into there, so that
      both .prepare() and .set_rate() hooks of pllv3 can call into the helper
      for relocking.
      
      Since relock is only needed when PLL is powered up while clk_set_rate()
      could be called before clk is prepared, we need to add a check in
      clk_pllv3_wait_lock() to skip the relock if PLL is not powered.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      bc3b84da
    • Shawn Guo's avatar
      ARM: imx: add sleep for pllv3 relock · 322503a1
      Shawn Guo authored
      The pllv3 relock time varies in the range of 50us ~ 500us, depending on
      the specific PLL type, e.g. 50us for ARM PLL and 450us for Audio/Video
      PLL.  Let's add a usleep_range() call instead of doing busy wait during
      relock.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      322503a1
    • Lothar Waßmann's avatar
      ARM: imx6q: add missing sentinel to divider table · ec9de6cd
      Lothar Waßmann authored
      The clk_enet_ref_table[] is missing a final empty entry as end of list
      marker. Also make the existing markers more obvious.
      Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      ec9de6cd
    • Shawn Guo's avatar
      ARM: imx: v7_cpu_resume() is needed by imx6sl build · 5d482172
      Shawn Guo authored
      Building a kernel with the following options,
      
        CONFIG_SMP=n
        CONFIG_PM=y
        CONFIG_SOC_IMX6SL=y
        CONFIG_SOC_IMX6Q=n
      
      we will see the build error below.
      
        arch/arm/mach-imx/built-in.o: In function `imx6q_pm_enter':
        platform-spi_imx.c:(.text+0x2648): undefined reference to `v7_cpu_resume'
        make[1]: *** [vmlinux] Error 1
      
      This is because that v7_cpu_resume() implemented in headsmp.S is also
      needed by imx6sl build.  Let's build headsmp.S for CONFIG_SOC_IMX6SL as
      well.
      Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      5d482172
    • Shawn Guo's avatar
      ARM: imx: improve mxc_restart() on the SRC bit writes · 2c11b57a
      Shawn Guo authored
      The current comment in the code does not make it clear why the double writes
      on SRC bit is needed.  Let's quote the errata to get it clear.  Also, to
      ensure there are at least 2 writes happen in the same one 32kHz period,
      we actually need 3 writes.  Let's add the third one.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      2c11b57a
    • Shawn Guo's avatar
      ARM: imx: remove imx_src_prepare_restart() call · b6e23bb6
      Shawn Guo authored
      There is ~10% possibility that the following emergency restart command
      fails to reboot imx6q.
      
      $ echo b > /proc/sysrq-trigger
      
      The IMX restart routine mxc_restart() assumes that it will always run on
      primary core, and will call imx_src_prepare_restart() to disable
      secondary cores in order to get them come to online in the following
      boot.  However, the assumption is only true for normal kernel_restart()
      case where migrate_to_reboot_cpu() will be called to migrate to primary
      core, but not necessarily true for emergency_restart() case.  So when
      emergency_restart() calls into mxc_restart() on any secondary core,
      system will hang immediately once imx_src_prepare_restart() is called
      to disabled secondary cores.  Since emergency_restart() is defined as a
      function that is safe to call in interrupt context, we cannot just call
      migrate_to_reboot_cpu() to fix the issue.
      
      Fortunately, we just found that the issue can be fixed at imx6q platform
      level.  We used to call imx_src_prepare_restart() to disable all
      secondary cores before resetting hardware.  Otherwise, the secondary
      will fail come to online in the reboot.  However, we recently found that
      after commit 6050d181 (ARM: imx: reset core along with enable/disable
      operation) comes to play, we do not need to reset the secondary cores
      any more.  That said, mxc_restart() now can run on any core to reboot
      the system, as long as we remove the imx_src_prepare_restart() call from
      mxc_restart().
      
      So let's simply remove imx_src_prepare_restart() call to fix the above
      emergency restart failure.
      Reported-by: default avatarJiada Wang <jiada_wang@mentor.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      b6e23bb6
    • Jiada Wang's avatar
      ARM: i.MX6q: fix the wrong parent of can_root clock · 9b3d4237
      Jiada Wang authored
      instead of pll3_usb_otg the parent of can_root clock
      should be pll3_60m.
      Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      9b3d4237
    • Linus Torvalds's avatar
      Merge tag 'arc-v3.13-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · edae583a
      Linus Torvalds authored
      Pull ARC changes from Vineet Gupta:
       - Towards a working SMP setup (ASID allocation, TLB Flush,...)
       - Support for TRACE_IRQFLAGS, LOCKDEP
       - cacheflush backend consolidation for I/D
       - Lots of allmodconfig fixlets from Chen
       - Other improvements/fixes
      
      * tag 'arc-v3.13-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (25 commits)
        ARC: [plat-arcfpga] defconfig update
        smp, ARC: kill SMP single function call interrupt
        ARC: [SMP] Disallow RTSC
        ARC: [SMP] Fix build failures for large NR_CPUS
        ARC: [SMP] enlarge possible NR_CPUS
        ARC: [SMP] TLB flush
        ARC: [SMP] ASID allocation
        arc: export symbol for pm_power_off in reset.c
        arc: export symbol for save_stack_trace() in stacktrace.c
        arc: remove '__init' for get_hw_config_num_irq()
        arc: remove '__init' for first_lines_of_secondary()
        arc: remove '__init' for setup_processor() and arc_init_IRQ()
        arc: kgdb: add default implementation for kgdb_roundup_cpus()
        ARC: Fix bogus gcc warning and micro-optimise TLB iteration loop
        ARC: Add support for irqflags tracing and lockdep
        ARC: Reset the value of Interrupt Priority Register
        ARC: Reduce #ifdef'ery for unaligned access emulation
        ARC: Change calling convention of do_page_fault()
        ARC: cacheflush optim - PTAG can be loop invariant if V-P is const
        ARC: cacheflush refactor #3: Unify the {d,i}cache flush leaf helpers
        ...
      edae583a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 0a759b24
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
       "Summary:
         - __put_user_unaligned may/will be used by btrfs
         - m68k part of a global cleanup"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Remove deprecated IRQF_DISABLED
        m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()
      0a759b24
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 78d4a420
      Linus Torvalds authored
      Pull parisc update from Helge Deller:
       - a bugfix for sticon (parisc text console driver) to not crash the
         64bit kernel on machines with more than 4GB RAM
       - added kernel audit support
       - made udelay() implementation SMP-safe
       - "make install" now does not depend on vmlinux
       - added defconfigs for 32- and 64-kernels
      
      * 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: add generic 32- and 64-bit defconfigs
        parisc: sticon - unbreak on 64bit kernel
        parisc: signal fixup - SIGBUS vs. SIGSEGV
        parisc: implement full version of access_ok()
        parisc: correctly display number of active CPUs
        parisc: do not count IPI calls twice
        parisc: make udelay() SMP-safe
        parisc: remove duplicate define
        parisc: make "make install" not depend on vmlinux
        parisc: add kernel audit feature
        parisc: provide macro to create exception table entries
      78d4a420
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f9efbce6
      Linus Torvalds authored
      Pull ARM SoC DT updates from Olof Johansson:
       "Most of this branch consists of updates, additions and general churn
        of the device tree source files in the kernel (arch/arm/boot/dts).
        Besides that, there are a few things to point out:
      
         - Lots of platform conversion on OMAP2+, with removal of old board
           files for various platforms.
         - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as
           well
         - Some updates to pinctrl and other subsystems.  Most of these are
           for DT-enablement of the various platforms and acks have been
           collected"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits)
        ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
        ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
        ARM: dts: bcm281xx: Add card detect GPIO
        ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
        ARM: bcm281xx: Add device node for the GPIO controller
        ARM: mvebu: Add Netgear ReadyNAS 104 board
        ARM: tegra: fix Tegra114 IOMMU register address
        ARM: kirkwood: add support for OpenBlocks A7 platform
        ARM: dts: omap4-panda: add DPI pinmuxing
        ARM: dts: AM33xx: Add RNG node
        ARM: dts: AM33XX: Add hwspinlock node
        ARM: dts: OMAP5: Add hwspinlock node
        ARM: dts: OMAP4: Add hwspinlock node
        ARM: dts: use 'status' property for PCIe nodes
        ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
        ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
        ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
        ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
        ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
        ARM: mvebu: Add the core-divider clock to Armada 370/XP
        ...
      f9efbce6
    • Linus Torvalds's avatar
      Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 53575aa9
      Linus Torvalds authored
      Pull ARM driver updates from Olof Johansson:
       "Updates of SoC-near drivers and other driver updates that makes more
        sense to take through our tree.  In this case it's involved:
      
         - Some Davinci driver updates that has required corresponding
           platform code changes (gpio mostly)
         - CCI bindings and a few driver updates
         - Marvell mvebu patches for PCI MSI support (could have gone through
           the PCI tree for this release, but they were acked by Bjorn for
           3.12 so we kept them through arm-soc).
         - Marvell dove switch-over to DT-based PCIe configuration
         - Misc updates for Samsung platform dmaengine drivers"
      
      * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        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
        PCI: mvebu: make local functions static
        PCI: mvebu: add I/O access wrappers
        PCI: mvebu: Dynamically detect if the PEX link is up to enable hot plug
        ARM: mvebu: fix gated clock documentation
        ARM: dove: remove legacy pcie and clock init
        ARM: dove: switch to DT probed mbus address windows
        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
        PCI: mvebu: add support for Marvell Dove SoCs
        PCI: mvebu: add support for reset on GPIO
        PCI: mvebu: remove subsys_initcall
        PCI: mvebu: increment nports only for registered ports
        PCI: mvebu: move clock enable before register access
        PCI: mvebu: add support for MSI
        irqchip: armada-370-xp: implement MSI support
        ...
      53575aa9
    • Linus Torvalds's avatar
      Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d5aabbca
      Linus Torvalds authored
      Pull ARM SoC board updates from Olof Johansson:
       "Board-related updates.  This branch is getting smaller and smaller,
        which is the whole idea so that's reassuring.
      
        Right now by far most of the code is related to shmobile updates, and
        they are now switching over to removal of board code and migration to
        multiplatform, so we'll see their board code base shrink in the near
        future too, I hope.
      
        In addition to that is some defconfig updates, some display updates
        for OMAP and a bit of new board support for Rockchip boards"
      
      * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (56 commits)
        ARM: rockchip: add support for rk3188 and Radxa Rock board
        ARM: rockchip: add dts for bqcurie2 tablet
        ARM: rockchip: enable arm-global-timer
        ARM: rockchip: move shared dt properties to common source file
        ARM: OMAP2+: display: Create omap_vout device inside omap_display_init
        ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init
        ARM: OMAP2+: display: Create omapdrm device inside omap_display_init
        ARM: OMAP2+: drm: Don't build device for DMM
        ARM: tegra: defconfig updates
        RX-51: Add support for OMAP3 ROM Random Number Generator
        ARM: OMAP3: RX-51: ARM errata 430973 workaround
        ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc #1
        ARM: shmobile: marzen: enable INTC IRQ
        ARM: shmobile: bockw: add SMSC support on reference
        ARM: shmobile: Use SMP on Koelsch
        ARM: shmobile: Remove KZM9D reference DTS
        ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
        ARM: shmobile: Remove non-multiplatform KZM9D reference support
        ARM: shmobile: Use KZM9D without reference for multiplatform
        ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
        ...
      d5aabbca
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · aac59e3e
      Linus Torvalds authored
      Pull ARM SoC platform changes from Olof Johansson:
       "New and updated SoC support.  Among the things new for this release
        are:
      
         - More support for the AM33xx platforms from TI
         - Tegra 124 support, and some updates to older tegra families as well
         - imx cleanups and updates across the board
         - A rename of Broadcom's Mobile platforms which were introduced as
           ARCH_BCM, and turned out to be too broad a name.  New name is
           ARCH_BCM_MOBILE.
         - A whole bunch of updates and fixes for integrator, making the
           platform code more modern and switches over to DT-only booting.
         - Support for two new Renesas shmobile chipsets.  Next up for them is
           more work on consolidation instead of introduction of new
           non-multiplatform SoCs, we're all looking forward to that!
         - Misc cleanups for older Samsung platforms, some Allwinner updates,
           etc"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (159 commits)
        ARM: bcm281xx: Add ARCH_BCM_MOBILE to bcm config
        ARM: bcm_defconfig: Run "make savedefconfig"
        ARM: bcm281xx: Add ARCH Timers to config
        rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
        ARM: vexpress: Enable platform-specific options in defconfig
        ARM: vexpress: Make defconfig work again
        ARM: sunxi: remove .init_time hooks
        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
        ...
      aac59e3e
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 21604cdc
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "This branch contains code cleanups, moves and removals for 3.13.
      
        Qualcomm msm targets had a bunch of code removal for legacy non-DT
        platforms.  Nomadik saw more device tree conversions and cleanup of
        old code.  Tegra has some code refactoring, etc.
      
        One longish patch series from Sebastian Hasselbarth changes the
        init_time hooks and tries to use a generic implementation for most
        platforms, since they were all doing more or less the same things.
      
        Finally the "shark" platform is removed in this release.  It's been
        abandoned for a while and nobody seems to care enough to keep it
        around.  If someone comes along and wants to resurrect it, the removal
        can easily be reverted and code brought back.
      
        Beyond this, mostly a bunch of removals of stale content across the
        board, etc"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (79 commits)
        ARM: gemini: convert to GENERIC_CLOCKEVENTS
        ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options
        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
        MAINTAINERS: Add patterns for DTS files for AT91
        ARM: at91: remove init_machine() as default is suitable
        ARM: at91/dt: split sama5d3 peripheral definitions
        ARM: at91/dt: split sam9x5 peripheral definitions
        ARM: Remove temporary sched_clock.h header
        ARM: clps711x: Use linux/sched_clock.h
        MAINTAINERS: Add DTS files to patterns for Samsung platform
        ARM: EXYNOS: remove unnecessary header inclusions from exynos4/5 dt machine file
        ARM: tegra: fix ARCH_TEGRA_114_SOC select sort order
        clk: nomadik: fix missing __init on nomadik_src_init
        ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
        ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX
        ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support
        ...
      21604cdc
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · beb5bfe4
      Linus Torvalds authored
      Pull ARM SoC low-priority fixes from Olof Johansson:
       "A set of fixes for various platforms that weren't considered bad
        enough to include in 3.12 (nor -stable).  Mostly simple typo fixes,
        etc"
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: OMAP2+: irq, AM33XX add missing register check
        ARM: OMAP2+: wakeupgen: AM43x adaptation
        ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected
        ARM: dts: fix PL330 MDMA1 address in DT for Universal C210 board
        ARM: dts: Work around lack of cpufreq regulator lookup for exynos4210-origen and trats boards
        ARM: dts: Fix typo earlyprintk in exynos5440-sd5v1 and ssdk5440 boards
        ARM: dts: Correct typo in use of samsung,pin-drv for exynos5250
        ARM: rockchip: remove obsolete rockchip,config properties
        ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS
        ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations.
        ARM: OMAP1: fix incorrect placement of __initdata tag
        ARM: OMAP: remove deprecated IRQF_DISABLED
        ARM: OMAP2+: throw the die id into the entropy pool
      beb5bfe4
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 05ad391d
      Linus Torvalds authored
      Pull ARM64 update from Catalin Marinas:
       "Main features:
         - Ticket-based spinlock implementation and lockless lockref support
         - Big endian support
         - CPU hotplug support, currently for PSCI (Power State Coordination
           Interface) capable firmware
         - Virtual address space extended to 42-bit in the 64K page
           configuration (maximum VA space with 2 levels of page tables)
         - Compat (AArch32) kuser helpers updated to ARMv8 (make use of
           load-acquire/store-release instructions)
         - Code cleanup, defconfig update and minor fixes"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (43 commits)
        ARM64: /proc/interrupts: display IPIs of online CPUs only
        arm64: locks: Remove CONFIG_GENERIC_LOCKBREAK
        arm64: KVM: vgic: byteswap GICv2 access on world switch if BE
        arm64: KVM: initialize HYP mode following the kernel endianness
        arm64: compat: Clear the IT state independent of the 32-bit ARM or Thumb-2 mode
        arm64: Use 42-bit address space with 64K pages
        arm64: module: ensure instruction is little-endian before manipulation
        arm64: defconfig: Enable CONFIG_PREEMPT by default
        arm64: fix access to preempt_count from assembly code
        arm64: move enabling of GIC before CPUs are set online
        arm64: use generic RW_DATA_SECTION macro in linker script
        arm64: Slightly improve the warning on CPU0 enable-method
        ARM64: simplify cpu_read_bootcpu_ops using OF/DT helper
        ARM64: DT: define ARM64 specific arch_match_cpu_phys_id
        arm64: allow ioremap_cache() to use existing RAM mappings
        arm64: update 32-bit kuser helpers to ARMv8
        arm64: perf: fix event number mask
        arm64: kconfig: allow CPU_BIG_ENDIAN to be selected
        arm64: Fix the endianness of arch_spinlock_t
        arm64: big-endian: write CPU holding pen address as LE
        ...
      05ad391d
  4. 10 Nov, 2013 1 commit
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 8b5baa46
      Linus Torvalds authored
      Pull gfs2 updates from Steven Whitehouse:
       "The main feature of interest this time is quota updates.  There are
        some clean ups and some patches to use the new generic lru list code.
      
        There is still plenty of scope for some further changes in due course -
        faster lookups of quota structures is very much on the todo list.
        Also, a start has been made towards the more tricky issue of using the
        generic lru code with glocks, but that will have to be completed in a
        subsequent merge window.
      
        The other, more minor feature, is that there have been a number of
        performance patches which relate to block allocation.  In particular
        they will improve performance when the disk is nearly full"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Use generic list_lru for quota
        GFS2: Rename quota qd_lru_lock qd_lock
        GFS2: Use reflink for quota data cache
        GFS2: Use lockref for glocks
        GFS2: Protect quota sync generation
        GFS2: Inline qd_trylock into gfs2_quota_unlock
        GFS2: Make two similar quota code fragments into a function
        GFS2: Remove obsolete quota tunable
        GFS2: Move gfs2_icbit_munge into quota.c
        GFS2: Speed up starting point selection for block allocation
        GFS2: Add allocation parameters structure
        GFS2: Clean up reservation removal
        GFS2: fix dentry leaks
        GFS2: new function gfs2_rbm_incr
        GFS2: Introduce rbm field bii
        GFS2: Do not reset flags on active reservations
        GFS2: introduce bi_blocks for optimization
        GFS2: optimize rbm_from_block wrt bi_start
        GFS2: d_splice_alias() can't return error
      8b5baa46
  5. 07 Nov, 2013 9 commits
    • Linus Torvalds's avatar
      Merge tag 'ftrace-urgent-3.12-v2' of... · 6c86ae29
      Linus Torvalds authored
      Merge tag 'ftrace-urgent-3.12-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull perf/ftrace fix from Steven Rostedt:
       "Dave Jones's trinity program was able to enable the function tracer
        from a normal user account via the perf syscall "perf_event_open()".
        When I was able to reproduce it with trinity, I was able to track down
        exactly how it happened.
      
        I discovered that the check for whether the function tracepoint should
        be activated or not was using the "perf_paranoid_kernel()" check which
        by default, lets the user continue.  The user should not by default be
        able to enable function tracing.
      
        The fix is to use "perf_paranoid_tracepoint_raw()" which will not let
        the user enable function tracing.  This is a security fix as normal
        users should never be allowed to enable the function tracer"
      
      * tag 'ftrace-urgent-3.12-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        perf/ftrace: Fix paranoid level for enabling function tracer
      6c86ae29
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3ae423fe
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       - Some minor work bringing the Cobalt MIPS platforms in line with other
         MIPS platforms
       - Make vmlinux.32 and vmlinux.64 build messages less verbose
       - Always register the R4k clocksource when selected, the clock source's
         rating will decide if this or another clock source is actually going
         to be used
       - Drop support for the Cisco (formerly Scientific Atlanta) PowerTV
         platform.  There appears to be nobody left who cares and the USB
         driver went stale while waiting for years to be merged
       - Some cleanup of Loongson 2 related #ifdefery
       - Various minor cleanups
       - Major rework on all things related to tracing / ptrace on MIPS,
         including switching the MIPS ELF core dumper to regsets, enabling the
         entries for SIGSYS in struct siginfo for MIPS, enabling ftrace
         syscall trace points
       - Some more work to bring DECstation support code in line with other
         more modern code
       - Report the name of the detected CPU, not just its CP0 PrID value
       - Some more BCM 47xx and atheros ath79xx work
       - Support for compressed kernels using the XZ compression scheme
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (53 commits)
        MIPS: remove duplicate define
        MIPS: Random whitespace clean-ups
        MIPS: traps: Reformat notify_die invocations to 80 columns.
        MIPS: Print correct PC in trace dump after NMI exception
        MIPS: kernel: cpu-probe: Report CPU id during probe
        MIPS: Remove unused defines in piix4.h
        MIPS: Get rid of hard-coded values for Malta PIIX4 fixups
        MIPS: Always register R4K clock when selected
        MIPS: Loongson: Get rid of Loongson 2 #ifdefery all over arch/mips.
        MIPS: cacheops.h: Increase indentation by one tab.
        MIPS: Remove bogus BUG_ON()
        MIPS: PowerTV: Remove support code.
        MIPS: ftrace: Add support for syscall tracepoints.
        MIPS: ptrace: Switch syscall reporting to tracehook_report_syscall_entry().
        MIPS: Move audit_arch() helper function to __syscall_get_arch().
        MIPS: Enable HAVE_ARCH_TRACEHOOK.
        MIPS: Switch ELF core dumper to use regsets.
        MIPS: Implement task_user_regset_view.
        MIPS: ptrace: Use tracehook helpers.
        MIPS: O32 / 32-bit: Always copy 4 stack arguments.
        ...
      3ae423fe
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 280c84d1
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The bulk of the patches for the 3.13 merge window.
      
        Heiko spent quite a bit of work to improve the code generation for the
        kernel.  That includes the exploitation of the interlocked-access
        facility for the atomics and bitops implementation and the improvement
        for the -march and -mtune compiler settings.
      
        Another important change is the removal of the user_mode=home option,
        user processes now always run in primary space.  The storage keys are
        not initialized at system startup any more, with that the storage key
        removal work is complete.  For the PCI support the hibernation hooks
        have been implemented.
      
        And as usual cleanup and fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (62 commits)
        s390/scm_blk: fix endless loop for requests != REQ_TYPE_FS
        s390/mm,tlb: correct tlb flush on page table upgrade
        s390/mm: page_table_realloc returns failure
        s390: allow to set gcc -mtune flag
        s390/percpu: remove this_cpu_xor() implementation
        s390/vtime: correct idle time calculation
        s390/time: fix get_tod_clock_ext inline assembly
        tty/hvc_iucv: remove redundant NULL check
        s390/dasd: Write to profile data area only if it is available
        s390: convert use of typedef ctl_table to struct ctl_table
        s390/pci: cleanup function information block
        s390/pci: remove CONFIG_PCI_DEBUG dependancy
        s390/pci: message cleanup
        Update default configuration
        s390: add a couple of useful defconfigs
        s390/percpu: make use of interlocked-access facility 1 instructions
        s390/percpu: use generic percpu ops for CONFIG_32BIT
        s390/compat: make psw32_user_bits a constant value again
        s390: fix handling of runtime instrumentation psw bit
        s390: fix save and restore of the floating-point-control register
        ...
      280c84d1
    • Helge Deller's avatar
      parisc: add generic 32- and 64-bit defconfigs · dce0ce46
      Helge Deller authored
      New defconfigs which should be able to boot on any 32/64bit machine.
      Many drivers are selected to be compiled-in to avoid the need for an
      additional initrd and still being able to boot.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      dce0ce46
    • Helge Deller's avatar
      parisc: sticon - unbreak on 64bit kernel · 0219132f
      Helge Deller authored
      STI text console (sticon) was broken on 64bit machines with more than
      4GB RAM and this lead in some cases to a kernel crash.
      
      Since sticon uses the 32bit STI API it needs to keep pointers to memory
      below 4GB. But on a 64bit kernel some memory regions (e.g. the kernel
      stack) might be above 4GB which then may crash the kernel in the STI
      functions.
      
      Additionally sticon didn't selected the built-in framebuffer fonts by
      default. This is now fixed.
      
      On a side-note: Theoretically we could enhance the sticon driver to
      use the 64bit STI API. But - beside the fact that some machines don't
      provide a 64bit STI ROM - this would just add complexity.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Cc: stable@vger.kernel.org # 3.8+
      0219132f
    • Helge Deller's avatar
      parisc: signal fixup - SIGBUS vs. SIGSEGV · 1f2048fd
      Helge Deller authored
      Clean up code to send correct signal on invalid memory accesses:
      Send SIGBUS instead of SIGSEGV for memory accesses outside of mmap'ed
      areas
      
      This fixes the mmap13 testcase from the Linux Test Project.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      1f2048fd
    • Helge Deller's avatar
      parisc: implement full version of access_ok() · 63379c13
      Helge Deller authored
      Up to now PA-RISC could live with a trivial version of access_ok().
      Our fault handlers can correctly handle fault cases.
      
      But testcases showed that we need a better access check else we won't
      always return correct errno failure codes to userspace.
      
      Problem showed up during 32bit userspace tests in which writev() used a
      32bit memory area and length which would then wrap around on 64bit
      kernel.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      63379c13
    • Helge Deller's avatar
      parisc: correctly display number of active CPUs · 3a7452b4
      Helge Deller authored
      In case we fail to power up other CPUs in a SMP system, the kernel
      currently shows a wrong number of online CPUs. This change makes the
      output more verbose on how many of the CPUs are online. Example:
      
      CPU(s): 1 out of 2 PA8800 (Mako) at 900.000000 MHz online.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      3a7452b4
    • Helge Deller's avatar
      parisc: do not count IPI calls twice · 6f0c4aa6
      Helge Deller authored
      The number of IPI calls is already visible as per-cpu IPI irq counters
      in/proc/cpuinfo, so let's drop this additional counting.
      
      This partly reverts:
      cd85d551 parisc: more irq statistics in /proc/interrupts
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      6f0c4aa6