Eric Lee / smarc-ti-linux-kernel

27 May, 2012

1 commit

  • 279534370   Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »
    2

    Pull arm-soc clock driver changes from Olof Johansson:
    "The new clock subsystem was merged in linux-3.4 without any users,
    this now moves the first three platforms over to it: imx, mxs and
    spear.

    The series also contains the changes for the clock subsystem itself,
    since Mike preferred to have it together with the platforms that
    require these changes, in order to avoid interdependencies and
    conflicts."

    Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
    removed in one branch, added OF support in another) and
    drivers/dma/imx-sdma.c (independent changes next to each other).

    * tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
    clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
    clk: Provide dummy clk_unregister()
    SPEAr: Update defconfigs
    SPEAr: Add SMI NOR partition info in dts files
    SPEAr: Switch to common clock framework
    SPEAr: Call clk_prepare() before calling clk_enable
    SPEAr: clk: Add General Purpose Timer Synthesizer clock
    SPEAr: clk: Add Fractional Synthesizer clock
    SPEAr: clk: Add Auxiliary Synthesizer clock
    SPEAr: clk: Add VCO-PLL Synthesizer clock
    SPEAr: Add DT bindings for SPEAr's timer
    ARM i.MX: remove now unused clock files
    ARM: i.MX6: implement clocks using common clock framework
    ARM i.MX35: implement clocks using common clock framework
    ARM i.MX5: implement clocks using common clock framework
    ARM: Kirkwood: Replace clock gating
    ARM: Orion: Audio: Add clk/clkdev support
    ARM: Orion: PCIE: Add support for clk
    ARM: Orion: XOR: Add support for clk
    ARM: Orion: CESA: Add support for clk
    ...

    Linus Torvalds
     

24 May, 2012

2 commits

  • 0bd3fbd4a   Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Browse Code »

    Pull crypto updates from Herbert Xu:
    - New cipher/hash driver for ARM ux500.
    - Code clean-up for aesni-intel.
    - Misc fixes.

    Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
    frankly some of it made no sense at all (the pull brought in a
    declaration for the dbx500_add_platform_device_noirq() function, which
    neither exists nor is used anywhere).

    Also some trivial add-add context conflicts in the Kconfig file in
    drivers/{char/hw_random,crypto}/

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    crypto: aesni-intel - move more common code to ablk_init_common
    crypto: aesni-intel - use crypto_[un]register_algs
    crypto: ux500 - Cleanup hardware identification
    crypto: ux500 - Update DMA handling for 3.4
    mach-ux500: crypto - core support for CRYP/HASH module.
    crypto: ux500 - Add driver for HASH hardware
    crypto: ux500 - Add driver for CRYP hardware
    hwrng: Kconfig - modify default state for atmel-rng driver
    hwrng: omap - use devm_request_and_ioremap
    crypto: crypto4xx - move up err_request_irq label
    crypto, xor: Sanitize checksumming function selection output
    crypto: caam - add backward compatible string sec4.0

    Linus Torvalds
     
  • 6f73b3629   Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    Pull powerpc updates from Benjamin Herrenschmidt:
    "Here are the powerpc goodies for 3.5. Main highlights are:

    - Support for the NX crypto engine in Power7+
    - A bunch of Anton goodness, including some micro optimization of our
    syscall entry on Power7
    - I converted a pile of our thermal control drivers to the new i2c
    APIs (essentially turning the old therm_pm72 into a proper set of
    windfarm drivers). That's one more step toward removing the
    deprecated i2c APIs, there's still a few drivers to fix, but we are
    getting close
    - kexec/kdump support for 47x embedded cores

    The big missing thing here is no updates from Freescale. Not sure
    what's up here, but with Kumar not working for them anymore things are
    a bit in a state of flux in that area."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
    powerpc: Fix irq distribution
    Revert "powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags"
    powerpc: Fixing a cputhread code documentation
    powerpc/crypto: Enable the PFO-based encryption device
    powerpc/crypto: Build files for the nx device driver
    powerpc/crypto: debugfs routines and docs for the nx device driver
    powerpc/crypto: SHA512 hash routines for nx encryption
    powerpc/crypto: SHA256 hash routines for nx encryption
    powerpc/crypto: AES-XCBC mode routines for nx encryption
    powerpc/crypto: AES-GCM mode routines for nx encryption
    powerpc/crypto: AES-ECB mode routines for nx encryption
    powerpc/crypto: AES-CTR mode routines for nx encryption
    powerpc/crypto: AES-CCM mode routines for nx encryption
    powerpc/crypto: AES-CBC mode routines for nx encryption
    powerpc/crypto: nx driver code supporting nx encryption
    powerpc/pseries: Enable the PFO-based RNG accelerator
    powerpc/pseries/hwrng: PFO-based hwrng driver
    powerpc/pseries: Add PFO support to the VIO bus
    powerpc/pseries: Add pseries update notifier for OFDT prop changes
    powerpc/pseries: Add new hvcall constants to support PFO
    ...

    Linus Torvalds
     

22 May, 2012

1 commit

  • e60b9a034   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux ... Browse Code »

    Pull s390 updates from Martin Schwidefsky:
    "Just a random collection of bug-fixes and cleanups, nothing new in
    this merge request."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (46 commits)
    s390/ap: Fix wrong or missing comments
    s390/ap: move receive callback to message struct
    s390/dasd: re-prioritize partition detection message
    s390/qeth: reshuffle initialization
    s390/qeth: cleanup drv attr usage
    s390/claw: cleanup drv attr usage
    s390/lcs: cleanup drv attr usage
    s390/ctc: cleanup drv attr usage
    s390/ccwgroup: remove ccwgroup_create_from_string
    s390/qeth: stop using struct ccwgroup driver for discipline callbacks
    s390/qeth: switch to ccwgroup_create_dev
    s390/claw: switch to ccwgroup_create_dev
    s390/lcs: switch to ccwgroup_create_dev
    s390/ctcm: switch to ccwgroup_create_dev
    s390/ccwgroup: exploit ccwdev_by_dev_id
    s390/ccwgroup: introduce ccwgroup_create_dev
    s390: fix race on TIF_MCCK_PENDING
    s390/barrier: make use of fast-bcr facility
    s390/barrier: cleanup barrier functions
    s390/claw: remove "eieio" calls
    ...

    Linus Torvalds
     

16 May, 2012

12 commits

15 May, 2012

3 commits

  • d1cbb1447   crypto: ux500 - Cleanup hardware identification ... Browse Code »

    Don't use SOC specific functions to identify
    which crypto hardware we are talking to and use
    the ID provided in the module instead.

    Signed-off-by: Andreas Westin
    Acked-by: Arnd Bergmann
    Acked-by: Linus Walleij
    Signed-off-by: Herbert Xu

    Andreas Westin
     
  • f7329e716   crypto: ux500 - Update DMA handling for 3.4 ... Browse Code »

    An update to the DMA framework added a new parameter to the
    device_prep_slave_sg call.

    Signed-off-by: Andreas Westin
    Acked-by: Arnd Bergmann
    Acked-by: Linus Walleij
    Signed-off-by: Herbert Xu

    Andreas Westin
     
  • 1ebfefcf3   crypto: mv_cesa requires on CRYPTO_HASH to build ... Browse Code »

    Without CRYPTO_HASH being selected, mv_cesa has a lot of hooks
    into undefined exports.
    ----
    MODPOST 81 modules
    Kernel: arch/arm/boot/Image is ready
    AS arch/arm/boot/compressed/head.o
    GZIP arch/arm/boot/compressed/piggy.gzip
    CC arch/arm/boot/compressed/misc.o
    CC arch/arm/boot/compressed/decompress.o
    ERROR: "crypto_ahash_type" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_shash_final" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_register_ahash" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_unregister_ahash" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_shash_update" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_shash_digest" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_shash_setkey" [drivers/crypto/mv_cesa.ko] undefined!
    ERROR: "crypto_alloc_shash" [drivers/crypto/mv_cesa.ko] undefined!
    make[1]: *** [__modpost] Error 1
    make: *** [modules] Error 2
    make: *** Waiting for unfinished jobs....
    ----

    Signed-off-by: Alexander Clouter
    Signed-off-by: Jason Cooper
    Cc: stable@vger.kernel.org

    Alexander Clouter
     

09 May, 2012

1 commit

04 May, 2012

2 commits

27 Apr, 2012

1 commit

09 Apr, 2012

1 commit

05 Apr, 2012

1 commit

  • 75258723d   crypto: ixp4xx - include fix ... Browse Code »

    Before commit de47725421ad5627a5c905f4e40bb844ebc06d29 ("include: replace
    linux/module.h with "struct module" wherever possible") was
    implicitly included through -> .

    Signed-off-by: Michał Wróbel
    Signed-off-by: Herbert Xu

    Michał Wróbel
     

29 Mar, 2012

1 commit

23 Mar, 2012

1 commit

  • db1417967   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux ... Browse Code »

    Pull s390 patches from Martin Schwidefsky:
    "The biggest patch is the rework of the smp code, something I wanted to
    do for some time. There are some patches for our various dump methods
    and one new thing: z/VM LGR detection. LGR stands for linux-guest-
    relocation and is the guest migration feature of z/VM. For debugging
    purposes we keep a log of the systems where a specific guest has lived."

    Fix up trivial conflict in arch/s390/kernel/smp.c due to the scheduler
    cleanup having removed some code next to removed s390 code.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    [S390] kernel: Pass correct stack for smp_call_ipl_cpu()
    [S390] Ensure that vmcore_info pointer is never accessed directly
    [S390] dasd: prevent validate server for offline devices
    [S390] Remove monolithic build option for zcrypt driver.
    [S390] stack dump: fix indentation in output
    [S390] kernel: Add OS info memory interface
    [S390] Use block_sigmask()
    [S390] kernel: Add z/VM LGR detection
    [S390] irq: external interrupt code passing
    [S390] irq: set __ARCH_IRQ_EXIT_IRQS_DISABLED
    [S390] zfcpdump: Implement async sdias event processing
    [S390] Use copy_to_absolute_zero() instead of "stura/sturg"
    [S390] rework idle code
    [S390] rework smp code
    [S390] rename lowcore field
    [S390] Fix gcc 4.6.0 compile warning

    Linus Torvalds
     

22 Mar, 2012

2 commits

  • b8716614a   Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Browse Code »

    Pull crypto update from Herbert Xu:
    "* sha512 bug fixes (already in your tree).
    * SHA224/SHA384 AEAD support in caam.
    * X86-64 optimised version of Camellia.
    * Tegra AES support.
    * Bulk algorithm registration interface to make driver registration easier.
    * padata race fixes.
    * Misc fixes."

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
    padata: Fix race on sequence number wrap
    padata: Fix race in the serialization path
    crypto: camellia - add assembler implementation for x86_64
    crypto: camellia - rename camellia.c to camellia_generic.c
    crypto: camellia - fix checkpatch warnings
    crypto: camellia - rename camellia module to camellia_generic
    crypto: tcrypt - add more camellia tests
    crypto: testmgr - add more camellia test vectors
    crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro
    crypto: twofish-x86_64/i586 - set alignmask to zero
    crypto: blowfish-x86_64 - set alignmask to zero
    crypto: serpent-sse2 - combine ablk_*_init functions
    crypto: blowfish-x86_64 - use crypto_[un]register_algs
    crypto: twofish-x86_64-3way - use crypto_[un]register_algs
    crypto: serpent-sse2 - use crypto_[un]register_algs
    crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()
    crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()
    crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0
    crypto: caam - fix gcc 4.6 warning
    crypto: Add bulk algorithm registration interface
    ...

    Linus Torvalds
     
  • 9f3938346   Merge branch 'kmap_atomic' of git://github.com/congwang/linux ... Browse Code »

    Pull kmap_atomic cleanup from Cong Wang.

    It's been in -next for a long time, and it gets rid of the (no longer
    used) second argument to k[un]map_atomic().

    Fix up a few trivial conflicts in various drivers, and do an "evil
    merge" to catch some new uses that have come in since Cong's tree.

    * 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
    feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
    highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
    drbd: remove the second argument of k[un]map_atomic()
    zcache: remove the second argument of k[un]map_atomic()
    gma500: remove the second argument of k[un]map_atomic()
    dm: remove the second argument of k[un]map_atomic()
    tomoyo: remove the second argument of k[un]map_atomic()
    sunrpc: remove the second argument of k[un]map_atomic()
    rds: remove the second argument of k[un]map_atomic()
    net: remove the second argument of k[un]map_atomic()
    mm: remove the second argument of k[un]map_atomic()
    lib: remove the second argument of k[un]map_atomic()
    power: remove the second argument of k[un]map_atomic()
    kdb: remove the second argument of k[un]map_atomic()
    udf: remove the second argument of k[un]map_atomic()
    ubifs: remove the second argument of k[un]map_atomic()
    squashfs: remove the second argument of k[un]map_atomic()
    reiserfs: remove the second argument of k[un]map_atomic()
    ocfs2: remove the second argument of k[un]map_atomic()
    ntfs: remove the second argument of k[un]map_atomic()
    ...

    Linus Torvalds
     

20 Mar, 2012

1 commit

11 Mar, 2012

1 commit

10 Mar, 2012

1 commit

04 Mar, 2012

1 commit

28 Feb, 2012

1 commit

27 Jan, 2012

1 commit

  • 3bd391f05   crypto: Add support for x86 cpuid auto loading for x86 crypto drivers ... Browse Code »

    Add support for auto-loading of crypto drivers based on cpuid features.
    This enables auto-loading of the VIA and Intel specific drivers
    for AES, hashing and CRCs.

    Requires the earlier infrastructure patch to add x86 modinfo.
    I kept it all in a single patch for now.

    I dropped the printks when the driver cpuid doesn't match (imho
    drivers never should print anything in such a case)

    One drawback is that udev doesn't know if the drivers are used or not,
    so they will be unconditionally loaded at boot up. That's better
    than not loading them at all, like it often happens.

    Cc: Dave Jones
    Cc: Kay Sievers
    Cc: Jen Axboe
    Cc: Herbert Xu
    Cc: Huang Ying
    Signed-off-by: Andi Kleen
    Signed-off-by: Thomas Renninger
    Acked-by: H. Peter Anvin
    Signed-off-by: Greg Kroah-Hartman

    Andi Kleen
     

26 Jan, 2012

1 commit

13 Jan, 2012

4 commits