1. Jul 06, 2015
    • Baruch Siach's avatar
      crypto: arm - ignore generated SHA2 assembly files · 4d666dbe
      Baruch Siach authored
      These files are generated since commits f2f770d7 (crypto: arm/sha256 - Add
      optimized SHA-256/224, 2015-04-03) and c80ae7ca
      
       (crypto: arm/sha512 -
      accelerated SHA-512 using ARM generic ASM and NEON, 2015-05-08).
      
      Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
      Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      4d666dbe
    • Nishanth Aravamudan's avatar
      crypto: nx - do not emit extra output if status is disabled · 7abd75bf
      Nishanth Aravamudan authored
      
      
      If the device-tree indicates the nx-842 device's status is 'disabled',
      we emit two messages:
      
      nx_compress_pseries ibm,compression-v1: nx842_OF_upd_status: status 'disabled' is not 'okay'.
      nx_compress_pseries ibm,compression-v1: nx842_OF_upd: device disabled
      
      Given that 'disabled' is a valid state, and we are going to emit that
      the device is disabled, only print out a non-'okay' status if it is not
      'disabled'.
      
      Signed-off-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      7abd75bf
    • Nishanth Aravamudan's avatar
      crypto: nx - rename nx842_{init, exit} to nx842_pseries_{init, exit} · ec13bcbe
      Nishanth Aravamudan authored
      
      
      While there is no technical reason that both nx-842.c and
      nx-842-pseries.c can have the same name for the init/exit functions, it
      is a bit confusing with initcall_debug. Rename the pseries specific
      functions appropriately
      
      Signed-off-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      ec13bcbe
    • Nishanth Aravamudan's avatar
      crypto: nx - nx842_OF_upd_status should return ENODEV if device is not 'okay' · fa9a9a08
      Nishanth Aravamudan authored
      
      
      The current documention mentions explicitly that EINVAL should be
      returned if the device is not available, but nx842_OF_upd_status()
      always returns 0. However, nx842_probe() specifically checks for
      non-ENODEV returns from nx842_of_upd() (which in turn calls
      nx842_OF_upd_status()) and emits an extra error in that case. It seems
      like the proper return code of a disabled device is ENODEV.
      
      Signed-off-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      fa9a9a08
    • Tom Lendacky's avatar
      crypto: ccp - Provide support to autoload CCP driver · 6170511a
      Tom Lendacky authored
      
      
      Add the necessary module device tables to the platform support to allow
      for autoloading of the CCP driver. This will allow for the CCP's hwrng
      support to be available without having to manually load the driver. The
      module device table entry for the pci support is already present.
      
      Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      6170511a
    • Vutla, Lokesh's avatar
      crypto: omap-des - Fix unmapping of dma channels · acb33cc5
      Vutla, Lokesh authored
      
      
      dma_unmap_sg() is being called twice after completing the
      task. Looks like this is a copy paste error when creating
      des driver.
      With this the following warn appears during boot:
      
      [    4.210457] ------------[ cut here ]------------
      [    4.215114] WARNING: CPU: 0 PID: 0 at lib/dma-debug.c:1080 check_unmap+0x710/0x9a0()
      [    4.222899] omap-des 480a5000.des: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x00000000ab2ce000] [size=8 bytes]
      [    4.236785] Modules linked in:
      [    4.239860] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.14.39-02999-g1bc045a-dirty #182
      [    4.247918] [<c001678c>] (unwind_backtrace) from [<c0012574>] (show_stack+0x10/0x14)
      [    4.255710] [<c0012574>] (show_stack) from [<c05a37e8>] (dump_stack+0x84/0xb8)
      [    4.262977] [<c05a37e8>] (dump_stack) from [<c0046464>] (warn_slowpath_common+0x68/0x8c)
      [    4.271107] [<c0046464>] (warn_slowpath_common) from [<c004651c>] (warn_slowpath_fmt+0x30/0x40)
      [    4.279854] [<c004651c>] (warn_slowpath_fmt) from [<c02d50a4>] (check_unmap+0x710/0x9a0)
      [    4.287991] [<c02d50a4>] (check_unmap) from [<c02d5478>] (debug_dma_unmap_sg+0x90/0x19c)
      [    4.296128] [<c02d5478>] (debug_dma_unmap_sg) from [<c04a77d8>] (omap_des_done_task+0x1cc/0x3e4)
      [    4.304963] [<c04a77d8>] (omap_des_done_task) from [<c004a090>] (tasklet_action+0x84/0x124)
      [    4.313370] [<c004a090>] (tasklet_action) from [<c004a4ac>] (__do_softirq+0xf0/0x20c)
      [    4.321235] [<c004a4ac>] (__do_softirq) from [<c004a840>] (irq_exit+0x98/0xec)
      [    4.328500] [<c004a840>] (irq_exit) from [<c000f9ac>] (handle_IRQ+0x50/0xb0)
      [    4.335589] [<c000f9ac>] (handle_IRQ) from [<c0008688>] (gic_handle_irq+0x28/0x5c)
      
      Removing the duplicate call to dma_unmap_sg().
      
      Cc: stable@vger.kernel.org
      Reported-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      acb33cc5
    • Linus Torvalds's avatar
      Linux 4.2-rc1 · d770e558
      Linus Torvalds authored
      d770e558
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.2-2' of... · a585d2b7
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull late x86 platform driver updates from Darren Hart:
       "The following came in a bit later and I wanted them to bake in next a
        few more days before submitting, thus the second pull.
      
        A new intel_pmc_ipc driver, a symmetrical allocation and free fix in
        dell-laptop, a couple minor fixes, and some updated documentation in
        the dell-laptop comments.
      
        intel_pmc_ipc:
         - Add Intel Apollo Lake PMC IPC driver
      
        tc1100-wmi:
         - Delete an unnecessary check before the function call "kfree"
      
        dell-laptop:
         - Fix allocating & freeing SMI buffer page
         - Show info about WiGig and UWB in debugfs
         - Update information about wireless control"
      
      * tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        intel_pmc_ipc: Add Intel Apollo Lake PMC IPC driver
        tc1100-wmi: Delete an unnecessary check before the function call "kfree"
        dell-laptop: Fix allocating & freeing SMI buffer page
        dell-laptop: Show info about WiGig and UWB in debugfs
        dell-laptop: Update information about wireless control
      a585d2b7
  2. Jul 05, 2015