03 Jan, 2013

2 commits

  • Pull watchdog fixes from Wim Van Sebroeck:
    "This fixes some small errors in the new da9055 driver, eliminates a
    compiler warning and adds DT support for the twl4030_wdt driver (so
    that we can have multiple watchdogs with DT on the omap platforms)."

    * git://www.linux-watchdog.org/linux-watchdog:
    watchdog: twl4030_wdt: add DT support
    watchdog: omap_wdt: eliminate unused variable and a compiler warning
    watchdog: da9055: Don't update wdt_dev->timeout in da9055_wdt_set_timeout error path
    watchdog: da9055: Fix invalid free of devm_ allocated data

    Linus Torvalds
     
  • Pull PCI updates from Bjorn Helgaas:
    "Some fixes for v3.8. They include a fix for the new SR-IOV sysfs
    management support, an expanded quirk for Ricoh SD card readers, a
    Stratus DMI quirk fix, and a PME polling fix."

    * tag '3.8-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz
    PCI/PM: Do not suspend port if any subordinate device needs PME polling
    PCI: Add PCIe Link Capability link speed and width names
    PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)
    PCI: Remove spurious error for sriov_numvfs store and simplify flow

    Linus Torvalds
     

02 Jan, 2013

1 commit


31 Dec, 2012

1 commit

  • Pull late ARM cleanups for omap from Olof Johansson:
    "From Tony Lindgren:

    Here are few more patches to finish the omap changes for multiplatform
    conversion that are not strictly fixes, but were too complex to do
    with the dependencies during the merge window. Those are to move of
    serial-omap.h to platform_data, and the removal of remaining
    cpu_is_omap macro usage outside mach-omap2.

    Then there are several trivial fixes for typos and few minimal
    omap2plus_defconfig updates."

    * tag 'omap-late-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON
    OMAP2: Fix a typo - replace regist with register.
    ARM/omap: use module_platform_driver macro
    ARM: OMAP2+: PMU: Remove unused header
    ARM: OMAP4: remove duplicated include from omap_hwmod_44xx_data.c
    ARM: OMAP2+: omap2plus_defconfig: enable twl4030 SoC audio
    ARM: OMAP2+: omap2plus_defconfig: Add tps65217 support
    ARM: OMAP2+: enable devtmpfs and devtmpfs automount
    ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
    ARM: OMAP2+: Drop plat/cpu.h for omap2plus
    ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage
    MAINTAINERS: Add an entry for omap related .dts files

    Linus Torvalds
     

27 Dec, 2012

1 commit

  • Commit 284f5f9 was intended to disable the "only_one_child()" optimization
    on Stratus ftServer systems, but its DMI check is wrong. It looks for
    DMI_SYS_VENDOR that contains "ftServer", when it should look for
    DMI_SYS_VENDOR containing "Stratus" and DMI_PRODUCT_NAME containing
    "ftServer".

    Tested on Stratus ftServer 6400.

    Reported-by: Fadeeva Marina
    Reference: https://bugzilla.kernel.org/show_bug.cgi?id=51331
    Signed-off-by: Myron Stowe
    Signed-off-by: Bjorn Helgaas
    CC: stable@vger.kernel.org # v3.5+

    Myron Stowe
     

24 Dec, 2012

2 commits


22 Dec, 2012

2 commits

  • Pull asm-generic cleanup from Arnd Bergmann:
    "These are a few cleanups for asm-generic:

    - a set of patches from Lars-Peter Clausen to generalize asm/mmu.h
    and use it in the architectures that don't need any special
    handling.
    - A patch from Will Deacon to remove the {read,write}s{b,w,l} as
    discussed during the arm64 review
    - A patch from James Hogan that helps with the meta architecture
    series."

    * tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
    xtensa: Use generic asm/mmu.h for nommu
    h8300: Use generic asm/mmu.h
    c6x: Use generic asm/mmu.h
    asm-generic/mmu.h: Add support for FDPIC
    asm-generic/mmu.h: Remove unused vmlist field from mm_context_t
    asm-generic: io: remove {read,write} string functions
    asm-generic/io.h: remove asm/cacheflush.h include

    Linus Torvalds
     
  • Commit db5b0ae00712 ("Merge tag 'dt' of git://git.kernel.org/.../arm-soc")
    causes a duplicated build target. This patch fixes it and sorts out the
    build target alphabetically so that we can recognize something wrong
    easily.

    Cc: Olof Johansson
    Cc: Arnd Bergmann
    Signed-off-by: Kukjin Kim
    Signed-off-by: Linus Torvalds

    Kukjin Kim
     

21 Dec, 2012

12 commits

  • Pull VFS update from Al Viro:
    "fscache fixes, ESTALE patchset, vmtruncate removal series, assorted
    misc stuff."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (79 commits)
    vfs: make lremovexattr retry once on ESTALE error
    vfs: make removexattr retry once on ESTALE
    vfs: make llistxattr retry once on ESTALE error
    vfs: make listxattr retry once on ESTALE error
    vfs: make lgetxattr retry once on ESTALE
    vfs: make getxattr retry once on an ESTALE error
    vfs: allow lsetxattr() to retry once on ESTALE errors
    vfs: allow setxattr to retry once on ESTALE errors
    vfs: allow utimensat() calls to retry once on an ESTALE error
    vfs: fix user_statfs to retry once on ESTALE errors
    vfs: make fchownat retry once on ESTALE errors
    vfs: make fchmodat retry once on ESTALE errors
    vfs: have chroot retry once on ESTALE error
    vfs: have chdir retry lookup and call once on ESTALE error
    vfs: have faccessat retry once on an ESTALE error
    vfs: have do_sys_truncate retry once on an ESTALE error
    vfs: fix renameat to retry on ESTALE errors
    vfs: make do_unlinkat retry once on ESTALE errors
    vfs: make do_rmdir retry once on ESTALE errors
    vfs: add a flags argument to user_path_parent
    ...

    Linus Torvalds
     
  • Pull signal handling cleanups from Al Viro:
    "sigaltstack infrastructure + conversion for x86, alpha and um,
    COMPAT_SYSCALL_DEFINE infrastructure.

    Note that there are several conflicts between "unify
    SS_ONSTACK/SS_DISABLE definitions" and UAPI patches in mainline;
    resolution is trivial - just remove definitions of SS_ONSTACK and
    SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and
    include/uapi/linux/signal.h contains the unified variant."

    Fixed up conflicts as per Al.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
    alpha: switch to generic sigaltstack
    new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those
    generic compat_sys_sigaltstack()
    introduce generic sys_sigaltstack(), switch x86 and um to it
    new helper: compat_user_stack_pointer()
    new helper: restore_altstack()
    unify SS_ONSTACK/SS_DISABLE definitions
    new helper: current_user_stack_pointer()
    missing user_stack_pointer() instances
    Bury the conditionals from kernel_thread/kernel_execve series
    COMPAT_SYSCALL_DEFINE: infrastructure

    Linus Torvalds
     
  • Pull ARM fixes from Russell King:
    "A number of smallish fixes scattered around the ARM code. Probably
    the most serious one is the one from Al addressing the missing locking
    in the swap emulation code."

    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
    ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards
    ARM: 7606/1: cache: flush to LoUU instead of LoUIS on uniprocessor CPUs
    ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
    ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata
    ARM: 7602/1: Pass real "__machine_arch_type" variable to setup_machine_tags() procedure
    ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S

    Linus Torvalds
     
  • Pull ARM SoC fixes part 2 from Olof Johansson:
    "Here are a few more fixes for 3.8. Two branches of fixes for Samsung
    platforms, including fixes for the audio build errors on all non-DT
    platforms. There's also a fixup to the sunxi device-tree file renames
    due to a bad patch application by me, and a fix for OMAP due to
    function renames merged through the powerpc tree."

    * tag 'fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: OMAP2+: Fix compillation error in mach-omap2/timer.c
    ARM: sunxi: rename device tree source files
    ARM: EXYNOS: Avoid passing the clks through platform data
    ARM: S5PV210: Avoid passing the clks through platform data
    ARM: S5P64X0: Add I2S clkdev support
    ARM: S5PC100: Add I2S clkdev support
    ARM: S3C64XX: Add I2S clkdev support
    ARM: EXYNOS: Fix MSHC clocks instance names
    ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
    ARM: EXYNOS: Fix NULL pointer dereference bug in SMDK4X12
    ARM: EXYNOS: Fix NULL pointer dereference bug in Origen
    ARM: SAMSUNG: Add missing include guard to gpio-core.h
    pinctrl: exynos5440/samsung: Staticize pcfgs
    pinctrl: samsung: Fix a typo in pinctrl-samsung.h
    ARM: EXYNOS: fix skip scu_enable() for EXYNOS5440
    ARM: EXYNOS: fix GIC using for EXYNOS5440
    ARM: EXYNOS: fix build error when MFC is not selected

    Linus Torvalds
     
  • Where we can pass in LOOKUP_DIRECTORY or LOOKUP_REVAL. Any other flags
    passed in here are currently ignored.

    Signed-off-by: Jeff Layton
    Signed-off-by: Al Viro

    Jeff Layton
     
  • Commit 787314c35fbb ("Merge tag 'iommu-updates-v3.8' of
    git://git./linux/kernel/git/joro/iommu") did not account for the changed
    header location.

    The headers were made local to mach-omap2 as they are specific to omap2+
    only, and we wanted to get most of the #include headers fixed
    up anyways for the ARM multiplatform support.

    We attempted to avoid this kind of merge conflict early on by setting up
    a minimal git branch shared by the arm-soc tree and the iommu tree, but
    looks like we still hit a merge issue there as the branches got merged
    as various topic branches.

    Cc: Joerg Roedel
    Signed-off-by: Tony Lindgren
    Signed-off-by: Linus Torvalds

    Tony Lindgren
     
  • Pull IOMMU updates from Joerg Roedel:
    "A few new features this merge-window. The most important one is
    probably, that dma-debug now warns if a dma-handle is not checked with
    dma_mapping_error by the device driver. This requires minor changes
    to some architectures which make use of dma-debug. Most of these
    changes have the respective Acks by the Arch-Maintainers.

    Besides that there are updates to the AMD IOMMU driver for refactor
    the IOMMU-Groups support and to make sure it does not trigger a
    hardware erratum.

    The OMAP changes (for which I pulled in a branch from Tony Lindgren's
    tree) have a conflict in linux-next with the arm-soc tree. The
    conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is
    deleted in the arm-soc tree. It is safe to delete the file too so
    solve the conflict. Similar changes are done in the arm-soc tree in
    the common clock framework migration. A missing hunk from the patch
    in the IOMMU tree will be submitted as a seperate patch when the
    merge-window is closed."

    * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits)
    ARM: dma-mapping: support debug_dma_mapping_error
    ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks
    iommu/omap: Adapt to runtime pm
    iommu/omap: Migrate to hwmod framework
    iommu/omap: Keep mmu enabled when requested
    iommu/omap: Remove redundant clock handling on ISR
    iommu/amd: Remove obsolete comment
    iommu/amd: Don't use 512GB pages
    iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch
    iommu/tegra: gart: Move bus_set_iommu after probe for multi arch
    iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all
    tile: dma_debug: add debug_dma_mapping_error support
    sh: dma_debug: add debug_dma_mapping_error support
    powerpc: dma_debug: add debug_dma_mapping_error support
    mips: dma_debug: add debug_dma_mapping_error support
    microblaze: dma-mapping: support debug_dma_mapping_error
    ia64: dma_debug: add debug_dma_mapping_error support
    c6x: dma_debug: add debug_dma_mapping_error support
    ARM64: dma_debug: add debug_dma_mapping_error support
    intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
    ...

    Linus Torvalds
     
  • prom_add_property() has been renamed to of_add_property()
    This patch fixes the following comilation error:

    arch/arm/mach-omap2/timer.c: In function ‘omap_get_timer_dt’:
    arch/arm/mach-omap2/timer.c:178:3: error: implicit declaration of function ‘prom_add_property’ [-Werror=implicit-function-declaration]
    cc1: some warnings being treated as errors
    make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
    make[1]: *** Waiting for unfinished jobs....

    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Tony Lindgren
    Signed-off-by: Olof Johansson

    Peter Ujfalusi
     
  • …rnel/git/kgene/linux-samsung into fixes

    From Kukjin Kim:

    This is for fix the following build error in dev-audio.c on current Samsung
    platforms :-(

    arch/arm/mach-exynos/dev-audio.c:58:4: error: unknown field 'src_clk'
    specified in initializer
    arch/arm/mach-exynos/dev-audio.c:58:4: warning: initialization makes integer
    from pointer without a cast [enabled by default]
    arch/arm/mach-exynos/dev-audio.c:58:4: warning: (near initialization for
    'i2sv5_pdata.type.i2s.idma_addr') [enabled by default]
    arch/arm/mach-exynos/dev-audio.c:91:4: error: unknown field 'src_clk'
    specified in initializer
    arch/arm/mach-exynos/dev-audio.c:91:4: warning: initialization makes integer
    from pointer without a cast [enabled by default]
    arch/arm/mach-exynos/dev-audio.c:91:4: warning: (near initialization for
    'i2sv3_pdata.type.i2s.idma_addr') [enabled by default]

    * 'v3.8-samsung-fixes-audio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: EXYNOS: Avoid passing the clks through platform data
    ARM: S5PV210: Avoid passing the clks through platform data
    ARM: S5P64X0: Add I2S clkdev support
    ARM: S5PC100: Add I2S clkdev support
    ARM: S3C64XX: Add I2S clkdev support

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …/git/kgene/linux-samsung into fixes

    From Kukjin Kim:

    Here is Samsung fixes-1 for v3.8-rc1.
    Most of them are trivial fixes which are for NULL pointer dereference, MSHC
    clocks instance names and exynos5440 stuff.

    * 'v3.8-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: EXYNOS: Fix MSHC clocks instance names
    ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
    ARM: EXYNOS: Fix NULL pointer dereference bug in SMDK4X12
    ARM: EXYNOS: Fix NULL pointer dereference bug in Origen
    ARM: SAMSUNG: Add missing include guard to gpio-core.h
    pinctrl: exynos5440/samsung: Staticize pcfgs
    pinctrl: samsung: Fix a typo in pinctrl-samsung.h
    ARM: EXYNOS: fix skip scu_enable() for EXYNOS5440
    ARM: EXYNOS: fix GIC using for EXYNOS5440
    ARM: EXYNOS: fix build error when MFC is not selected

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • This is the rename portion of "ARM: sunxi: Change device tree naming
    scheme for sunxi" that were missed when the patch was applied.

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Merge commit 752451f01c45 ("Merge branch 'i2c-embedded/for-next' of
    git://git.pengutronix.de/git/wsa/linux") resulted in a build breakage
    for OMAP

    arch/arm/mach-omap2/i2c.c: In function 'omap_pm_set_max_mpu_wakeup_lat_compat':
    arch/arm/mach-omap2/i2c.c:130:2: error: implicit declaration of function 'omap_pm_set_max_mpu_wakeup_lat'
    make[1]: *** [arch/arm/mach-omap2/i2c.o] Error 1

    Fix this by including the appropriate header file with the function
    prototype.

    Reported-by: Fengguang Wu
    Signed-off-by: Vaibhav Bedia
    Signed-off-by: Linus Torvalds

    Vaibhav Bedia
     

20 Dec, 2012

19 commits

  • Pull sound fixes from Takashi Iwai:
    "This update contains overall only driver-specific fixes. Slightly
    large LOC are seen in usb-audio driver for a couple of new device
    quirks and cs42l71 ASoC driver for enhanced features. The others are
    a few small (regression) fixes HD-audio, and yet other small / trival
    ASoC fixes."

    * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: usb-audio: Support for Digidesign Mbox 2 USB sound card:
    ALSA: HDA: Fix sound resume hang
    ALSA: hda - bug fix for invalid connection list of Haswell HDMI codec pins
    ALSA: hda - Fix the wrong pincaps set in ALC861VD dallas/hp fixup
    ALSA: hda - Set codec->single_adc_amp flag for Realtek codecs
    ASoC: atmel-ssc: change disable to disable in dts node
    ASoC: Prevent pop_wait overwrite
    ALSA: usb-audio: ignore-quirk for HP Wireless Audio
    ALSA: hda - Always turn on pins for HDMI/DP
    ALSA: hda - Fix pin configuration of HP Pavilion dv7
    ASoC: core: Fix splitting of log messages
    ASoC: cs42l73: Change VSPIN/VSPOUT to VSPINOUT
    ASoC: cs42l73: Add DAPM events for power down.
    ASoC: cs42l73: Add DMIC's as DAPM inputs.
    ASoC: sigmadsp: Fix endianness conversion issue
    ASoC: tpa6130a2: Use devm_* APIs

    Linus Torvalds
     
  • Linus Torvalds
     
  • Pull CRIS changes from Jesper Nilsson.

    ... mainly the UAPI disintegration.

    * tag 'cris-for-linus-3.8' of git://jni.nu/cris:
    UAPI: Fix up empty files in arch/cris/
    CRIS: locking: fix the return value of arch_read_trylock()
    CRIS: use kbuild.h instead of defining macros in asm-offset.c
    UAPI: (Scripted) Disintegrate arch/cris/include/asm
    UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
    UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "This is a batch of fixes for arm-soc platforms, most of it is for OMAP
    but there are others too (i.MX, Tegra, ep93xx). Fixes warnings, some
    broken platforms and drivers, etc. A bit all over the map really."

    There was some concern about commit 68136b10 ("RM: sunxi: Change device
    tree naming scheme for sunxi"), but Tony says:
    "Looks like that's trivial to fix as needed, no need to rebuild the
    branch to fix that AFAIK.

    The fix can be done once Olof is available online again.

    Linus, I suggest that you go ahead and pull this if there are no other
    issues with this branch."

    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
    ARM: sunxi: Change device tree naming scheme for sunxi
    ARM: ux500: fix missing include
    ARM: u300: delete custom pin hog code
    ARM: davinci: fix build break due to missing include
    ARM: exynos: Fix warning due to missing 'inline' in stub
    ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
    ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
    ARM: dts: mx27: Fix the AIPI bus for FEC
    ARM: OMAP2+: common: remove use of vram
    ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings
    ARM: OMAP4: clock data: DPLLs are missing bypass clocks in their parent lists
    ARM: OMAP4: clock data: div_iva_hs_clk is a power-of-two divider
    ARM: OMAP4: Fix EMU clock domain always on
    ARM: OMAP4460: Workaround ABE DPLL failing to turn-on
    ARM: OMAP4: Enhance support for DPLLs with 4X multiplier
    ARM: OMAP4: Add function table for non-M4X dplls
    ARM: OMAP4: Update timer clock aliases
    ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
    ARM: dts: Add build target for omap4-panda-a4
    ARM: dts: OMAP2420: Correct H4 board memory size
    ...

    Linus Torvalds
     
  • Fix up three empty files in arch/cris/ by sticking placeholder comments in
    there to prevent the patch program from deleting them.

    I decided not to delete the arch-v*/Kbuild files as it's possibly someone might
    want to use them for genhdr-y lines in the future, but they could be deleted
    and the pointer lines removed from asm/Kbuild. The uapi/arch-v*/Kbuild files
    ought to be uneffected by such a change.

    asm/swab.h didn't have anything outside of __KERNEL__ so nothing appeared in
    uapi/asm/swab.h. The latter, however, is exported by Kbuild.asm.

    This needs to be applied after the CRIS UAPI disintegration patch.

    Signed-off-by: David Howells
    Signed-off-by: Jesper Nilsson

    David Howells
     
  • arch_write_trylock() should return 'ret' instead of always
    return 1.

    dpatch engine is used to auto generate this patch.
    (https://github.com/weiyj/dpatch)

    Signed-off-by: Wei Yongjun
    Signed-off-by: Jesper Nilsson

    Wei Yongjun
     
  • …/linux-headers into for-linus2

    UAPI Disintegration 2012-10-09

    * tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
    UAPI: (Scripted) Disintegrate arch/cris/include/asm
    UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
    UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch

    Jesper Nilsson
     
  • This is modelled on commits such as the one below:

    Commit fc1c3a003edb8a6778e64e10ef671a38c76c969e ("sh: use kbuild.h
    instead of defining macros in asm-offsets.c") introduced in v2.6.26.

    Signed-off-by: James Hogan
    Signed-off-by: Jesper Nilsson

    James Hogan
     
  • Signed-off-by: David Howells
    Acked-by: Arnd Bergmann
    Acked-by: Thomas Gleixner
    Acked-by: Michael Kerrisk
    Acked-by: Paul E. McKenney
    Acked-by: Dave Jones
    Acked-by: Lennox Wu
    Acked-by: Liqin Chen

    David Howells
     
  • Commit 34ae6c96a6a7 ("ARM: 7298/1: realview: fix mapping of MPCore
    private memory region") accidentally broke the definition for the base
    address of the private peripheral region on revision B Realview-EB
    boards.

    This patch uses the correct address for REALVIEW_EB11MP_PRIV_MEM_BASE.

    Cc:
    Acked-by: Marc Zyngier
    Tested-by: Florian Fainelli
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • flush_cache_louis flushes the D-side caches to the point of unification
    inner-shareable. On uniprocessor CPUs, this is defined as zero and
    therefore no flushing will take place. Rather than invent a new interface
    for UP systems, instead use our SMP_ON_UP patching code to read the
    LoUU from the CLIDR instead.

    Cc:
    Cc: Lorenzo Pieralisi
    Tested-by: Guennadi Liakhovetski
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • find_vma() is *not* safe when somebody else is removing vmas. Not just
    the return value might get bogus just as you are getting it (this instance
    doesn't try to dereference the resulting vma), the search itself can get
    buggered in rather spectacular ways. IOW, ->mmap_sem really, really is
    not optional here.

    Signed-off-by: Al Viro
    Cc:
    Signed-off-by: Russell King

    Al Viro
     
  • Pull sparc fixes from David Miller:
    "Please pull to get these sparc AES/DES/CAMELLIA crypto bug fixes as
    well as an addition of a pte_accessible() define for sparc64 and a
    hugetlb fix from Dave Kleikamp."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
    sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code.
    sparc64: Fix ECB looping constructs in AES code.
    sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
    sparc64: Fix AES ctr mode block size.
    sparc64: Fix unrolled AES 256-bit key loops.
    sparc64: Define pte_accessible()
    sparc: huge_ptep_set_* functions need to call set_huge_pte_at()

    Linus Torvalds
     
  • We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Things works better when you increment the source buffer pointer
    properly.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Like the generic versions, we need to support a block size
    of '1' for CTR mode AES.

    This was discovered thanks to all of the new test cases added by
    Jussi Kivilinna.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • The basic scheme of the block mode assembler is that we start by
    enabling the FPU, loading the key into the floating point registers,
    then iterate calling the encrypt/decrypt routine for each block.

    For the 256-bit key cases, we run short on registers in the unrolled
    loops.

    So the {ENCRYPT,DECRYPT}_256_2() macros reload the key registers that
    get clobbered.

    The unrolled macros, {ENCRYPT,DECRYPT}_256(), are not mindful of this.

    So if we have a mix of multi-block and single-block calls, the
    single-block unrolled 256-bit encrypt/decrypt can run with some
    of the key registers clobbered.

    Handle this by always explicitly loading those registers before using
    the non-unrolled 256-bit macro.

    This was discovered thanks to all of the new test cases added by
    Jussi Kivilinna.

    Signed-off-by: David S. Miller

    David S. Miller