1. 30 Jan, 2015 4 commits
    • Arnd Bergmann's avatar
      pinctrl: hide PCONFDUMP in #ifdef · 4f06266a
      Arnd Bergmann authored
      The zynq and qcom-spmi pinctrl drivers both use pin_config_item arrays
      to provide extra interfaces in debugfs. This structure and the
      PCONFDUMP macro are not defined if CONFIG_DEBUG_FS is turned off,
      so we get build errors like:
      
      pinctrl/qcom/pinctrl-spmi-gpio.c:139:37: error: array type has incomplete element type
       static const struct pin_config_item pmic_conf_items[ARRAY_SIZE(pmic_gpio_bindings)] = {
                                           ^
      pinctrl/qcom/pinctrl-spmi-gpio.c:140:2: error: implicit declaration of function 'PCONFDUMP' [-Werror=implicit-function-declaration]
        PCONFDUMP(PMIC_GPIO_CONF_PULL_UP,  "pull up strength", NULL, true),
        ^
      pinctrl/qcom/pinctrl-spmi-gpio.c:139:37: warning: 'pmic_conf_items' defined but not used [-Wunused-variable]
       static const struct pin_config_item pmic_conf_items[ARRAY_SIZE(pmic_gpio_bindings)] = {
      
      Lacking any better idea to solve this nicely, this patch uses #ifdef
      to hide the structures, just like the pinctrl core does.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      4f06266a
    • Doug Anderson's avatar
      pinctrl: rockchip: Only mask interrupts; never disable · 5ae0c7ad
      Doug Anderson authored
      The Rockchip GPIO interrupt controller totally throws away all status
      about an interrupt when you "disable" the interrupt.  That has
      unfortunate consequences in the following situation:
      
      1. An edge-triggered interrupt is enabled and should wake the system.
      2. System suspend happens: interrupt is disabled and marked for wake.
      3. rockchip_irq_suspend() reenables the interrupt so we can wake.
      4. Interrupt happens when asleep.
      5. rockchip_irq_resume() redisables the interrupt.
      6. Disabling the interrupt throws away all status about it.
      7. Normal system resume happens and we enable the interrupt again,
         since we threw away status about the interrupt we don't know it
         fired while suspended.  Even worse: if we need both edges of the
         interrupt the logic to swap edges never runs.
      
      Note: even if we somehow can post the status about wakeup interrupts
      in rockchip_irq_resume() we would still have a window of losing any
      edges that came in while interrupts were disabled.
      
      If we use mask only then we don't need to worry.  The GPIO Interrupt
      controller keeps track of pending interrupts that are enabled and just
      masked.
      
      There was no real strong reason to support the enable/disable
      functionality (other than that it seemed right), so let's go back to
      just supporting mask/unmask but actually map it to the real
      mask/unmask.  This ends up with slightly different (and more correct)
      behavior than before (f2dd028c pinctrl: rockchip: Fix
      enable/disable/mask/unmask).
      Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
      Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      5ae0c7ad
    • Linus Walleij's avatar
      Merge tag 'v3.19-rc6' into devel · b6afdbe8
      Linus Walleij authored
      Linux 3.19-rc6
      b6afdbe8
    • Andreas Färber's avatar
      pinctrl: zynq: Fix usb0 pins · 8090f791
      Andreas Färber authored
      Fix usb0 pin 19 -> 29 (matching ethernet1 pins and manual).
      Pin 19 is used for ethernet0 on the Parallella board.
      
      Fixes: add958ce ("pinctrl: Add driver for Zynq")
      Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
      Reviewed-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      8090f791
  2. 29 Jan, 2015 2 commits
  3. 27 Jan, 2015 2 commits
  4. 26 Jan, 2015 9 commits
    • Beniamino Galvani's avatar
      pinctrl: add driver for Amlogic Meson SoCs · 6ac73095
      Beniamino Galvani authored
      This is a driver for the pinmux and GPIO controller available in
      Amlogic Meson SoCs. It currently supports only Meson8, however the
      common code should be generic enough to work also for other SoCs after
      having defined the proper set of functions and groups.
      
      GPIO interrupts are not supported at the moment due to lack of
      documentation.
      Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      6ac73095
    • Linus Torvalds's avatar
      Linux 3.19-rc6 · 26bc420b
      Linus Torvalds authored
      26bc420b
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 14746306
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       "Hopefully the last round of fixes for 3.19
      
         - regression fix for the LDT changes
         - regression fix for XEN interrupt handling caused by the APIC
           changes
         - regression fixes for the PAT changes
         - last minute fixes for new the MPX support
         - regression fix for 32bit UP
         - fix for a long standing relocation issue on 64bit tagged for stable
         - functional fix for the Hyper-V clocksource tagged for stable
         - downgrade of a pr_err which tends to confuse users
      
        Looks a bit on the large side, but almost half of it are valuable
        comments"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tsc: Change Fast TSC calibration failed from error to info
        x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
        x86, mm: Change cachemode exports to non-gpl
        x86, tls: Interpret an all-zero struct user_desc as "no segment"
        x86, tls, ldt: Stop checking lm in LDT_empty
        x86, mpx: Strictly enforce empty prctl() args
        x86, mpx: Fix potential performance issue on unmaps
        x86, mpx: Explicitly disable 32-bit MPX support on 64-bit kernels
        x86, hyperv: Mark the Hyper-V clocksource as being continuous
        x86: Don't rely on VMWare emulating PAT MSR correctly
        x86, irq: Properly tag virtualization entry in /proc/interrupts
        x86, boot: Skip relocs when load address unchanged
        x86/xen: Override ACPI IRQ management callback __acpi_unregister_gsi
        ACPI: pci: Do not clear pci_dev->irq in acpi_pci_irq_disable()
        x86/xen: Treat SCI interrupt as normal GSI interrupt
      14746306
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4d2f0ef1
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "From the irqchip departement you get:
      
         - regression fix for omap-intc
      
         - regression fix for atmel-aic-common
      
         - functional correctness fix for hip04
      
         - type mismatch fix for gic-v3-its
      
         - proper error pointer check for mtd-sysirq
      
        Mostly one and two liners except for the omap regression fix which is
        slightly larger than desired"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type
        irqchip: omap-intc: Fix legacy DMA regression
        irqchip: gic-v3-its: Fix use of max with decimal constant
        irqchip: hip04: Initialize hip04_cpu_map to 0xffff
        irqchip: mtk-sysirq: Use IS_ERR() instead of NULL pointer check
      4d2f0ef1
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b73f0c8f
      Linus Torvalds authored
      Pull timer fixes from Thomas Gleixner:
       "A set of small fixes:
      
         - regression fix for exynos_mct clocksource
      
         - trivial build fix for kona clocksource
      
         - functional one liner fix for the sh_tmu clocksource
      
         - two validation fixes to prevent (root only) data corruption in the
           kernel via settimeofday and adjtimex.  Tagged for stable"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        time: adjtimex: Validate the ADJ_FREQUENCY values
        time: settimeofday: Validate the values of tv from user
        clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast
        clocksource: kona: fix __iomem annotation
        clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write
      b73f0c8f
    • Linus Torvalds's avatar
      Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 71a59b12
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A week's worth of fixes for various ARM platforms.  Diff wise, the
        largest fix is for OMAP to deal with how GIC now registers interrupts
        (irq_domain_add_legacy() -> irq_domain_add_linear() changes).
      
        Besides this, a few more renesas platforms needed the GIC instatiation
        done for legacy boards.  There's also a fix that disables coherency of
        mvebu due to issues, and a few other smaller fixes"
      
      * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: dts: add baud rate to Juno stdout-path
        ARM: dts: imx25: Fix PWM "per" clocks
        bus: mvebu-mbus: fix support of MBus window 13
        Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes
        ARM: mvebu: completely disable hardware I/O coherency
        ARM: OMAP: Work around hardcoded interrupts
        ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds
        ARM: shmobile: r8a7778: Instantiate GIC from C board code in legacy builds
        arm: boot: dts: dra7: enable dwc3 suspend PHY quirk
      71a59b12
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 80a75554
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "A couple of fixes - deadlock in CIFS and build breakage in cris serial
        driver (resurfaced f_dentry in there)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        VFS: Convert file->f_dentry->d_inode to file_inode()
        fix deadlock in cifs_ioctl_clone()
      80a75554
    • Linus Torvalds's avatar
      Merge tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · bfc835b5
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
       "Two stable fixes for dm-cache and one 3.19 DM core fix:
      
         - fix potential for dm-cache metadata corruption via stale metadata
           buffers being used when switching an inactive cache table to
           active; this could occur due to each table having it's own bufio
           client rather than sharing the client between tables.
      
         - fix dm-cache target to properly account for discard IO while
           suspending otherwise IO quiescing could complete prematurely.
      
         - fix DM core's handling of multiple internal suspends by maintaining
           an 'internal_suspend_count' and only resuming the device when this
           count drops to zero"
      
      * tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: fix handling of multiple internal suspends
        dm cache: fix problematic dual use of a single migration count variable
        dm cache: share cache-metadata object across inactive and active DM tables
      bfc835b5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 8e908e99
      Linus Torvalds authored
      Pull two block layer fixes from Jens Axboe:
       "Two small patches that should make it into 3.19:
      
         - a fixup from me for NVMe, making the cq_vector a signed variable.
           Otherwise our -1 comparison fails, and commit 2b25d981 doesn't
           do what it was supposed to.
      
         - a fixup for the hotplug handling for blk-mq from Ming Lei, using
           the proper kobject referencing to ensure we release resources at
           the right time"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: fix hctx/ctx kobject use-after-free
        NVMe: cq_vector should be signed
      8e908e99
  5. 24 Jan, 2015 11 commits
  6. 23 Jan, 2015 12 commits