forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "Here is the crypto update for 4.3: API: - the AEAD interface transition is now complete. - add top-level skcipher interface. Drivers: - x86-64 acceleration for chacha20/poly1305. - add sunxi-ss Allwinner Security System crypto accelerator. - add RSA algorithm to qat driver. - add SRIOV support to qat driver. - add LS1021A support to caam. - add i.MX6 support to caam" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (163 commits) crypto: algif_aead - fix for multiple operations on AF_ALG sockets crypto: qat - enable legacy VFs MPI: Fix mpi_read_buffer crypto: qat - silence a static checker warning crypto: vmx - Fixing opcode issue crypto: caam - Use the preferred style for memory allocations crypto: caam - Propagate the real error code in caam_probe crypto: caam - Fix the error handling in caam_probe crypto: caam - fix writing to JQCR_MS when using service interface crypto: hash - Add AHASH_REQUEST_ON_STACK crypto: testmgr - Use new skcipher interface crypto: skcipher - Add top-level skcipher interface crypto: cmac - allow usage in FIPS mode crypto: sahara - Use dmam_alloc_coherent crypto: caam - Add support for LS1021A crypto: qat - Don't move data inside output buffer crypto: vmx - Fixing GHASH Key issue on little endian crypto: vmx - Fixing AES-CTR counter bug crypto: null - Add missing Kconfig tristate for NULL2 crypto: nx - Add forward declaration for struct crypto_aead ...
- Loading branch information
Showing
154 changed files
with
15,834 additions
and
7,538 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
* Allwinner Security System found on A20 SoC | ||
|
||
Required properties: | ||
- compatible : Should be "allwinner,sun4i-a10-crypto". | ||
- reg: Should contain the Security System register location and length. | ||
- interrupts: Should contain the IRQ line for the Security System. | ||
- clocks : List of clock specifiers, corresponding to ahb and ss. | ||
- clock-names : Name of the functional clock, should be | ||
* "ahb" : AHB gating clock | ||
* "mod" : SS controller clock | ||
|
||
Optional properties: | ||
- resets : phandle + reset specifier pair | ||
- reset-names : must contain "ahb" | ||
|
||
Example: | ||
crypto: crypto-engine@01c15000 { | ||
compatible = "allwinner,sun4i-a10-crypto"; | ||
reg = <0x01c15000 0x1000>; | ||
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; | ||
clocks = <&ahb_gates 5>, <&ss_clk>; | ||
clock-names = "ahb", "mod"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -556,6 +556,12 @@ S: Maintained | |
F: Documentation/i2c/busses/i2c-ali1563 | ||
F: drivers/i2c/busses/i2c-ali1563.c | ||
|
||
ALLWINNER SECURITY SYSTEM | ||
M: Corentin Labbe <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/crypto/sunxi-ss/ | ||
|
||
ALPHA PORT | ||
M: Richard Henderson <[email protected]> | ||
M: Ivan Kokshaysky <[email protected]> | ||
|
@@ -5078,9 +5084,21 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git | |
S: Maintained | ||
F: arch/ia64/ | ||
|
||
IBM Power VMX Cryptographic instructions | ||
M: Leonidas S. Barbosa <[email protected]> | ||
M: Paulo Flabiano Smorigo <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
F: drivers/crypto/vmx/Makefile | ||
F: drivers/crypto/vmx/Kconfig | ||
F: drivers/crypto/vmx/vmx.c | ||
F: drivers/crypto/vmx/aes* | ||
F: drivers/crypto/vmx/ghash* | ||
F: drivers/crypto/vmx/ppc-xlate.pl | ||
|
||
IBM Power in-Nest Crypto Acceleration | ||
M: Marcelo Henrique Cerri <mhcerri@linux.vnet.ibm.com> | ||
M: Fionnuala Gunter <fin@linux.vnet.ibm.com> | ||
M: Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com> | ||
M: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com> | ||
L: [email protected] | ||
S: Supported | ||
F: drivers/crypto/nx/Makefile | ||
|
@@ -5092,7 +5110,7 @@ F: drivers/crypto/nx/nx_csbcpb.h | |
F: drivers/crypto/nx/nx_debugfs.h | ||
|
||
IBM Power 842 compression accelerator | ||
M: Dan Streetman <ddstreet@us.ibm.com> | ||
M: Dan Streetman <ddstreet@ieee.org> | ||
S: Supported | ||
F: drivers/crypto/nx/Makefile | ||
F: drivers/crypto/nx/Kconfig | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
aesbs-core.S | ||
sha256-core.S | ||
sha512-core.S |
Oops, something went wrong.