RISC-V: provide some accelerated cryptography implementations using vector extensions

[bjoto]

Pull request for series with
subject: RISC-V: provide some accelerated cryptography implementations using vector extensions
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=796538

[bjoto]

Upstream branch: 3fec323
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=796538
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=796538
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: RISC-V: add helper function to read the vector VLEN
Using index info to reconstruct a base tree...
M	arch/riscv/include/asm/vector.h
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/include/asm/vector.h
CONFLICT (content): Merge conflict in arch/riscv/include/asm/vector.h
Patch failed at 0001 RISC-V: add helper function to read the vector VLEN
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc arch/riscv/include/asm/vector.h
index c5ee07b3df07,1fd3e5510b64..000000000000
--- a/arch/riscv/include/asm/vector.h
+++ b/arch/riscv/include/asm/vector.h
@@@ -216,4 -238,21 +216,24 @@@ static inline bool riscv_v_vstate_ctrl_
  
  #endif /* CONFIG_RISCV_ISA_V */
  
++<<<<<<< HEAD
++=======
+ #ifdef CONFIG_RISCV_ISA_V_PREEMPTIVE
+ void kernel_vector_allow_preemption(void);
+ #else
+ #define kernel_vector_allow_preemption()	do {} while (0)
+ #endif
+ 
+ /*
+  * Return the implementation's vlen value.
+  *
+  * riscv_v_vsize contains the value of "32 vector registers with vlenb length"
+  * so rebuild the vlen value in bits from it.
+  */
+ static inline int riscv_vector_vlen(void)
+ {
+ 	return riscv_v_vsize / 32 * 8;
+ }
+ 
++>>>>>>> RISC-V: add helper function to read the vector VLEN
  #endif /* ! __ASM_RISCV_VECTOR_H */

[bjoto]

At least one diff in series https://patchwork.kernel.org/project/linux-riscv/list/?series=796538 expired. Closing PR.

[bjoto]

Upstream branch: 3ca112b
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=804412
version: 2

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=804412
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: RISC-V: add helper function to read the vector VLEN
Using index info to reconstruct a base tree...
M	arch/riscv/include/asm/vector.h
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/include/asm/vector.h
CONFLICT (content): Merge conflict in arch/riscv/include/asm/vector.h
Patch failed at 0001 RISC-V: add helper function to read the vector VLEN
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc arch/riscv/include/asm/vector.h
index 87aaef656257,1fd3e5510b64..000000000000
--- a/arch/riscv/include/asm/vector.h
+++ b/arch/riscv/include/asm/vector.h
@@@ -216,4 -238,21 +216,24 @@@ static inline bool riscv_v_vstate_ctrl_
  
  #endif /* CONFIG_RISCV_ISA_V */
  
++<<<<<<< HEAD
++=======
+ #ifdef CONFIG_RISCV_ISA_V_PREEMPTIVE
+ void kernel_vector_allow_preemption(void);
+ #else
+ #define kernel_vector_allow_preemption()	do {} while (0)
+ #endif
+ 
+ /*
+  * Return the implementation's vlen value.
+  *
+  * riscv_v_vsize contains the value of "32 vector registers with vlenb length"
+  * so rebuild the vlen value in bits from it.
+  */
+ static inline int riscv_vector_vlen(void)
+ {
+ 	return riscv_v_vsize / 32 * 8;
+ }
+ 
++>>>>>>> RISC-V: add helper function to read the vector VLEN
  #endif /* ! __ASM_RISCV_VECTOR_H */