android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto

Browse Source 
Merge crypto to resolve conflict in crypto/Kconfig.
This commit is contained in:
Herbert Xu 2013-06-21 15:13:27 +08:00
commit 02c0241b60
5 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
arch/x86/crypto/aesni-intel_asm.S
View File

@ -2681,56 +2681,68 @@ ENTRY(aesni_xts_crypt8)
addq %rcx, KEYP addq %rcx, KEYP
movdqa IV, STATE1 movdqa IV, STATE1
pxor 0x00(INP), STATE1 movdqu 0x00(INP), INC
pxor INC, STATE1
movdqu IV, 0x00(OUTP) movdqu IV, 0x00(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE2 movdqa IV, STATE2
pxor 0x10(INP), STATE2 movdqu 0x10(INP), INC
pxor INC, STATE2
movdqu IV, 0x10(OUTP) movdqu IV, 0x10(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE3 movdqa IV, STATE3
pxor 0x20(INP), STATE3 movdqu 0x20(INP), INC
pxor INC, STATE3
movdqu IV, 0x20(OUTP) movdqu IV, 0x20(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE4 movdqa IV, STATE4
pxor 0x30(INP), STATE4 movdqu 0x30(INP), INC
pxor INC, STATE4
movdqu IV, 0x30(OUTP) movdqu IV, 0x30(OUTP)
call *%r11 call *%r11
pxor 0x00(OUTP), STATE1 movdqu 0x00(OUTP), INC
pxor INC, STATE1
movdqu STATE1, 0x00(OUTP) movdqu STATE1, 0x00(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE1 movdqa IV, STATE1
pxor 0x40(INP), STATE1 movdqu 0x40(INP), INC
pxor INC, STATE1
movdqu IV, 0x40(OUTP) movdqu IV, 0x40(OUTP)
pxor 0x10(OUTP), STATE2 movdqu 0x10(OUTP), INC
pxor INC, STATE2
movdqu STATE2, 0x10(OUTP) movdqu STATE2, 0x10(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE2 movdqa IV, STATE2
pxor 0x50(INP), STATE2 movdqu 0x50(INP), INC
pxor INC, STATE2
movdqu IV, 0x50(OUTP) movdqu IV, 0x50(OUTP)
pxor 0x20(OUTP), STATE3 movdqu 0x20(OUTP), INC
pxor INC, STATE3
movdqu STATE3, 0x20(OUTP) movdqu STATE3, 0x20(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE3 movdqa IV, STATE3
pxor 0x60(INP), STATE3 movdqu 0x60(INP), INC
pxor INC, STATE3
movdqu IV, 0x60(OUTP) movdqu IV, 0x60(OUTP)
pxor 0x30(OUTP), STATE4 movdqu 0x30(OUTP), INC
pxor INC, STATE4
movdqu STATE4, 0x30(OUTP) movdqu STATE4, 0x30(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
movdqa IV, STATE4 movdqa IV, STATE4
pxor 0x70(INP), STATE4 movdqu 0x70(INP), INC
pxor INC, STATE4
movdqu IV, 0x70(OUTP) movdqu IV, 0x70(OUTP)
_aesni_gf128mul_x_ble() _aesni_gf128mul_x_ble()
@ -2738,16 +2750,20 @@ ENTRY(aesni_xts_crypt8)
call *%r11 call *%r11
pxor 0x40(OUTP), STATE1 movdqu 0x40(OUTP), INC
pxor INC, STATE1
movdqu STATE1, 0x40(OUTP) movdqu STATE1, 0x40(OUTP)
pxor 0x50(OUTP), STATE2 movdqu 0x50(OUTP), INC
pxor INC, STATE2
movdqu STATE2, 0x50(OUTP) movdqu STATE2, 0x50(OUTP)
pxor 0x60(OUTP), STATE3 movdqu 0x60(OUTP), INC
pxor INC, STATE3
movdqu STATE3, 0x60(OUTP) movdqu STATE3, 0x60(OUTP)
pxor 0x70(OUTP), STATE4 movdqu 0x70(OUTP), INC
pxor INC, STATE4
movdqu STATE4, 0x70(OUTP) movdqu STATE4, 0x70(OUTP)
ret ret

2
arch/x86/crypto/sha256-avx-asm.S
View File

@ -118,7 +118,7 @@ y2 = %r15d
_INP_END_SIZE = 8 _INP_END_SIZE = 8
_INP_SIZE = 8 _INP_SIZE = 8
_XFER_SIZE = 8 _XFER_SIZE = 16
_XMM_SAVE_SIZE = 0 _XMM_SAVE_SIZE = 0
_INP_END = 0 _INP_END = 0

2
arch/x86/crypto/sha256-ssse3-asm.S
View File

@ -111,7 +111,7 @@ y2 = %r15d
_INP_END_SIZE = 8 _INP_END_SIZE = 8
_INP_SIZE = 8 _INP_SIZE = 8
_XFER_SIZE = 8 _XFER_SIZE = 16
_XMM_SAVE_SIZE = 0 _XMM_SAVE_SIZE = 0
_INP_END = 0 _INP_END = 0

4
drivers/crypto/caam/caamalg.c
View File

@ -1154,7 +1154,7 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,
dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained);
sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1,
DMA_BIDIRECTIONAL, assoc_chained); DMA_TO_DEVICE, assoc_chained);
if (likely(req->src == req->dst)) { if (likely(req->src == req->dst)) {
sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1,
DMA_BIDIRECTIONAL, src_chained); DMA_BIDIRECTIONAL, src_chained);
@ -1336,7 +1336,7 @@ static struct aead_edesc *aead_giv_edesc_alloc(struct aead_givcrypt_request
dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained);
sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1,
DMA_BIDIRECTIONAL, assoc_chained); DMA_TO_DEVICE, assoc_chained);
if (likely(req->src == req->dst)) { if (likely(req->src == req->dst)) {
sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1,
DMA_BIDIRECTIONAL, src_chained); DMA_BIDIRECTIONAL, src_chained);

2
drivers/crypto/sahara.c
View File

@ -863,7 +863,7 @@ static struct of_device_id sahara_dt_ids[] = {
{ .compatible = "fsl,imx27-sahara" }, { .compatible = "fsl,imx27-sahara" },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(platform, sahara_dt_ids); MODULE_DEVICE_TABLE(of, sahara_dt_ids);
static int sahara_probe(struct platform_device *pdev) static int sahara_probe(struct platform_device *pdev)
{ {