1. 25 Oct, 2013 23 commits
  2. 23 Oct, 2013 2 commits
  3. 19 Oct, 2013 1 commit
  4. 18 Oct, 2013 14 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · bdeeab62
      Linus Torvalds authored
      Pull btrfs fix from Chris Mason:
       "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a
        regression in our initial rc1 pull.  When doing nocow writes we were
        sometimes starting a transaction with locks held"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: release path before starting transaction in can_nocow_extent
      bdeeab62
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 797afdf7
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - intel_pstate fix for misbehavior after system resume if sysfs
         attributes are set in a specific way before the corresponding suspend
         from Dirk Brandewie.
      
       - A recent intel_pstate fix has no effect if unsigned long is 32-bit,
         so fix it up to cover that case as well.
      
       - The s3c64xx cpufreq driver was not updated when the index field of
         struct cpufreq_frequency_table was replaced with driver_data, so
         update it now.  From Charles Keepax.
      
       - The Kconfig help text for ACPI_BUTTON still refers to
         /proc/acpi/event that has been dropped recently, so modify it to
         remove that reference.  From Krzysztof Mazur.
      
       - A Lan Tianyu's change adds a missing mutex unlock to an error code
         path in acpi_resume_power_resources().
      
       - Some code related to ACPI power resources, whose very purpose is
         questionable to put it lightly, turns out to cause problems to happen
         during testing on real systems, so remove it completely (we may
         revisit that in the future if there's a compelling enough reason).
         From Rafael J Wysocki and Aaron Lu.
      
      * tag 'pm+acpi-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PM: Drop two functions that are not used any more
        ATA / ACPI: remove power dependent device handling
        cpufreq: s3c64xx: Rename index to driver_data
        ACPI / power: Drop automaitc resume of power resource dependent devices
        intel_pstate: Fix type mismatch warning
        cpufreq / intel_pstate: Fix max_perf_pct on resume
        ACPI: remove /proc/acpi/event from ACPI_BUTTON help
        ACPI / power: Release resource_lock after acpi_power_get_state() return error
      797afdf7
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9219cec5
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Two fixlets:
      
         - fix a (rare-config) build bug
         - fix a next-gen SGI/UV hw/firmware enumeration bug"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Update UV3 hub revision ID
        x86/microcode: Correct Kconfig dependencies
      9219cec5
    • Josef Bacik's avatar
      Btrfs: release path before starting transaction in can_nocow_extent · 1bda19eb
      Josef Bacik authored
      We can't be holding tree locks while we try to start a transaction, we will
      deadlock.  Thanks,
      Reported-by: default avatarSage Weil <sage@inktank.com>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      1bda19eb
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-fixes' · 981984cb
      Rafael J. Wysocki authored
      * acpi-fixes:
        ACPI / PM: Drop two functions that are not used any more
        ATA / ACPI: remove power dependent device handling
        ACPI / power: Drop automaitc resume of power resource dependent devices
        ACPI: remove /proc/acpi/event from ACPI_BUTTON help
        ACPI / power: Release resource_lock after acpi_power_get_state() return error
      981984cb
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-fixes' · bdbff716
      Rafael J. Wysocki authored
      * pm-fixes:
        cpufreq: s3c64xx: Rename index to driver_data
        intel_pstate: Fix type mismatch warning
        cpufreq / intel_pstate: Fix max_perf_pct on resume
      bdbff716
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 04919afb
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "Five small cifs fixes (includes fixes for: unmount hang, 2 security
        related, symlink, large file writes)"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: ntstatus_to_dos_map[] is not terminated
        cifs: Allow LANMAN auth method for servers supporting unencapsulated authentication methods
        cifs: Fix inability to write files >2GB to SMB2/3 shares
        cifs: Avoid umount hangs with smb2 when server is unresponsive
        do not treat non-symlink reparse points as valid symlinks
      04919afb
    • Trent Piepho's avatar
      spi: spi-mxs: Use u32 instead of uint32_t · 42e182f8
      Trent Piepho authored
      It's consistent with all the other spi drivers that way.
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      42e182f8
    • Trent Piepho's avatar
      spi: spi-mxs: Don't set clock for each xfer · a560943e
      Trent Piepho authored
      mxs_spi_setup_transfer() would set the SSP SCK rate every time it was
      called, which is before every transfer.  It is uncommon for the SCK rate to
      change between transfers (or at all of that matter) and this causes many
      unnecessary reprogrammings of the clock registers.
      
      Code changed to only set the rate when it changes.  This significantly
      speeds up short SPI messages, especially messages made up of many transfers,
      as the calculation of the clock divisors is rather costly.  On an iMX287,
      using spidev with messages that consist of 511 transfers of 4 bytes each at
      an SCK of 48 MHz, the effective transfer rate more than doubles from about
      290 KB/sec to 600 KB/sec!
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      a560943e
    • Trent Piepho's avatar
      spi: spi-mxs: Clean up setup_transfer function · aa9e0c6f
      Trent Piepho authored
      It can't be called with a NULL transfer anymore so it can be simplified
      to not check for that.
      
      Fix indention of line-wrapped code to Linux standard.
      
      The transfer pointer can be const.
      
      It's not necessary to check if the spi_transfer's speed_hz is zero, as
      the spi core also fills it in from the spi_device.  However, the spi
      core does not check if spi_device's speed is zero so we have to do
      that still.
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      aa9e0c6f
    • Trent Piepho's avatar
      spi: spi-mxs: Remove check of spi mode bits · d426eadb
      Trent Piepho authored
      The spi core already checks for a slave setting mode bits that we
      didn't list as supported when the master was registered.  There is no
      need to do it again in the master driver.
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      d426eadb
    • Trent Piepho's avatar
      spi: spi-mxs: Fix race in setup method · 9c97e342
      Trent Piepho authored
      Despite many warnings in the SPI documentation and code, the spi-mxs
      driver sets shared chip registers in the ->setup method.  This method can
      be called when transfers are in progress on other slaves controlled by the
      master.  Setting registers or any other shared state will corrupt those
      transfers.
      
      So fix mxs_spi_setup() to not call mxs_spi_setup_transfer().
      mxs_spi_setup_transfer() is already called for each transfer when they
      are actually performed in mxs_spi_transfer_one(), so the call in
      mxs_spi_setup() isn't necessary to setup anything.
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      9c97e342
    • Trent Piepho's avatar
      spi: spi-mxs: Remove bogus setting of ssp clk rate field · 1a33073f
      Trent Piepho authored
      The ssp struct has a clock rate field, to provide the actual value, in Hz,
      of the SSP output clock (the rate of SSP_SCK) after mxs_ssp_set_clk_rate()
      is called.  It is set by mxs_ssp_set_clk_rate(), for SSP using drivers (like
      SPI and MMC) to *read* if they want to know the actual clock rate.  The SPI
      driver isn't supposed to *write* to it.
      
      For some reason the spi-mxs driver decides to write to this field on init,
      and sets it to the value of the SSP input clock (clk_sspN, from the MXS
      clocking block) in kHz.  It shouldn't be setting the value, and certainly
      shouldn't be setting it with the wrong clock in the wrong units.
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      1a33073f
    • Trent Piepho's avatar
      spi: spi-mxs: Remove full duplex check, spi core already does it · 210f65fe
      Trent Piepho authored
      Because the driver sets the SPI_MASTER_HALF_DUPLEX flag, the spi core
      will check transfers to insure they are not full duplex.  It's not
      necessary to check that in the spi-mxs driver as well.
      Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
      Cc: Marek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      210f65fe