3 files changed, 138 insertions, 12 deletions

diff --git a/sys/crypto/openssl/powerpc/chachap10-ppc.S b/sys/crypto/openssl/powerpc/chachap10-ppc.S
index d187e23ca26c..2f33c8d9a5e7 100644
--- a/sys/crypto/openssl/powerpc/chachap10-ppc.S
+++ b/sys/crypto/openssl/powerpc/chachap10-ppc.S
@@ -405,7 +405,7 @@ ChaCha20_ctr32_vsx_p10:
 .type	ChaCha20_ctr32_vsx_8x,@function
 .align	5
 ChaCha20_ctr32_vsx_8x:
-	stwu	1,-232(1)
+	stwu	1,-400(1)
 	mflr	0
 	li	10,103
 	li	11,119
@@ -424,9 +424,30 @@ ChaCha20_ctr32_vsx_8x:
 	addi	11,11,32
 	stvx	30,10,1
 	stvx	31,11,1
+	stfd	14,232(1)
+	stfd	15,240(1)
+	stfd	16,248(1)
+	stfd	17,256(1)
+	stfd	18,264(1)
+	stfd	19,272(1)
+	stfd	20,280(1)
+	stfd	21,288(1)
+	stfd	22,296(1)
+	stfd	23,304(1)
+	stfd	24,312(1)
+	stfd	25,320(1)
+	stfd	26,328(1)
+	li	10,351
+	li	11,367
+	stvx	20,10,1
+	addi	10,10,32
+	stvx	21,11,1
+	addi	11,11,32
+	stvx	22,10,1
+	stvx	23,11,1
 	stw	12,228(1)
 	li	12,-4096+63
-	stw	0, 236(1)
+	stw	0, 404(1)
 	mtspr	256,12
 
 	bl	.Lconsts
@@ -1131,9 +1152,30 @@ ChaCha20_ctr32_vsx_8x:
 
 .Ldone_vsx_8x:
 	lwz	12,228(1)
+	lfd	14,232(1)
+	lfd	15,240(1)
+	lfd	16,248(1)
+	lfd	17,256(1)
+	lfd	18,264(1)
+	lfd	19,272(1)
+	lfd	20,280(1)
+	lfd	21,288(1)
+	lfd	22,296(1)
+	lfd	23,304(1)
+	lfd	24,312(1)
+	lfd	25,320(1)
+	lfd	26,328(1)
+	li	10,351
+	li	11,367
+	lvx	20,10,1
+	addi	10,10,32
+	lvx	21,11,1
+	addi	11,11,32
+	lvx	22,10,1
+	lvx	23,11,1
 	li	10,103
 	li	11,119
-	lwz	0, 236(1)
+	lwz	0, 404(1)
 	mtspr	256,12
 	lvx	24,10,1
 	addi	10,10,32
@@ -1150,7 +1192,7 @@ ChaCha20_ctr32_vsx_8x:
 	lvx	30,10,1
 	lvx	31,11,1
 	mtlr	0
-	addi	1,1,232
+	addi	1,1,400
 	blr	
 
 .align	4
diff --git a/sys/crypto/openssl/powerpc64/chachap10-ppc.S b/sys/crypto/openssl/powerpc64/chachap10-ppc.S
index 239c0e1297e1..79953054bb41 100644
--- a/sys/crypto/openssl/powerpc64/chachap10-ppc.S
+++ b/sys/crypto/openssl/powerpc64/chachap10-ppc.S
@@ -409,7 +409,7 @@ ChaCha20_ctr32_vsx_p10:
 ChaCha20_ctr32_vsx_8x:
 .localentry	ChaCha20_ctr32_vsx_8x,0
 
-	stdu	1,-256(1)
+	stdu	1,-424(1)
 	mflr	0
 	li	10,127
 	li	11,143
@@ -428,9 +428,30 @@ ChaCha20_ctr32_vsx_8x:
 	addi	11,11,32
 	stvx	30,10,1
 	stvx	31,11,1
+	stfd	14,256(1)
+	stfd	15,264(1)
+	stfd	16,272(1)
+	stfd	17,280(1)
+	stfd	18,288(1)
+	stfd	19,296(1)
+	stfd	20,304(1)
+	stfd	21,312(1)
+	stfd	22,320(1)
+	stfd	23,328(1)
+	stfd	24,336(1)
+	stfd	25,344(1)
+	stfd	26,352(1)
+	li	10,375
+	li	11,391
+	stvx	20,10,1
+	addi	10,10,32
+	stvx	21,11,1
+	addi	11,11,32
+	stvx	22,10,1
+	stvx	23,11,1
 	stw	12,252(1)
 	li	12,-4096+63
-	std	0, 272(1)
+	std	0, 440(1)
 	or	12,12,12
 
 	bl	.Lconsts
@@ -1135,9 +1156,30 @@ ChaCha20_ctr32_vsx_8x:
 
 .Ldone_vsx_8x:
 	lwz	12,252(1)
+	lfd	14,256(1)
+	lfd	15,264(1)
+	lfd	16,272(1)
+	lfd	17,280(1)
+	lfd	18,288(1)
+	lfd	19,296(1)
+	lfd	20,304(1)
+	lfd	21,312(1)
+	lfd	22,320(1)
+	lfd	23,328(1)
+	lfd	24,336(1)
+	lfd	25,344(1)
+	lfd	26,352(1)
+	li	10,375
+	li	11,391
+	lvx	20,10,1
+	addi	10,10,32
+	lvx	21,11,1
+	addi	11,11,32
+	lvx	22,10,1
+	lvx	23,11,1
 	li	10,127
 	li	11,143
-	ld	0, 272(1)
+	ld	0, 440(1)
 	or	12,12,12
 	lvx	24,10,1
 	addi	10,10,32
@@ -1154,7 +1196,7 @@ ChaCha20_ctr32_vsx_8x:
 	lvx	30,10,1
 	lvx	31,11,1
 	mtlr	0
-	addi	1,1,256
+	addi	1,1,424
 	blr	
 
 .align	4
diff --git a/sys/crypto/openssl/powerpc64le/chachap10-ppc.S b/sys/crypto/openssl/powerpc64le/chachap10-ppc.S
index 7f8663716197..dbe3b6a62a34 100644
--- a/sys/crypto/openssl/powerpc64le/chachap10-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/chachap10-ppc.S
@@ -409,7 +409,7 @@ ChaCha20_ctr32_vsx_p10:
 ChaCha20_ctr32_vsx_8x:
 .localentry	ChaCha20_ctr32_vsx_8x,0
 
-	stdu	1,-256(1)
+	stdu	1,-424(1)
 	mflr	0
 	li	10,127
 	li	11,143
@@ -428,9 +428,30 @@ ChaCha20_ctr32_vsx_8x:
 	addi	11,11,32
 	stvx	30,10,1
 	stvx	31,11,1
+	stfd	14,256(1)
+	stfd	15,264(1)
+	stfd	16,272(1)
+	stfd	17,280(1)
+	stfd	18,288(1)
+	stfd	19,296(1)
+	stfd	20,304(1)
+	stfd	21,312(1)
+	stfd	22,320(1)
+	stfd	23,328(1)
+	stfd	24,336(1)
+	stfd	25,344(1)
+
+	li	10,375
+	li	11,391
+	stvx	20,10,1
+	addi	10,10,32
+	stvx	21,11,1
+	addi	11,11,32
+	stvx	22,10,1
+	stvx	23,11,1
 	stw	12,252(1)
 	li	12,-4096+63
-	std	0, 272(1)
+	std	0, 440(1)
 	or	12,12,12
 
 	bl	.Lconsts
@@ -1135,9 +1156,30 @@ ChaCha20_ctr32_vsx_8x:
 
 .Ldone_vsx_8x:
 	lwz	12,252(1)
+	lfd	14,256(1)
+	lfd	15,264(1)
+	lfd	16,272(1)
+	lfd	17,280(1)
+	lfd	18,288(1)
+	lfd	19,296(1)
+	lfd	20,304(1)
+	lfd	21,312(1)
+	lfd	22,320(1)
+	lfd	23,328(1)
+	lfd	24,336(1)
+	lfd	25,344(1)
+
+	li	10,375
+	li	11,391
+	lvx	20,10,1
+	addi	10,10,32
+	lvx	21,11,1
+	addi	11,11,32
+	lvx	22,10,1
+	lvx	23,11,1
 	li	10,127
 	li	11,143
-	ld	0, 272(1)
+	ld	0, 440(1)
 	or	12,12,12
 	lvx	24,10,1
 	addi	10,10,32
@@ -1154,7 +1196,7 @@ ChaCha20_ctr32_vsx_8x:
 	lvx	30,10,1
 	lvx	31,11,1
 	mtlr	0
-	addi	1,1,256
+	addi	1,1,424
 	blr	
 
 .align	4