riscv: Add fine-tuned checksum functions

[bjoto]

Pull request for series with
subject: riscv: Add fine-tuned checksum functions
version: 8
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=797256

[bjoto]

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

[bjoto]

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

[bjoto]

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

[bjoto]

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

[bjoto]

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

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: asm-generic: Improve csum_fold
Applying: riscv: Add static key for misaligned accesses
Using index info to reconstruct a base tree...
M	arch/riscv/include/asm/cpufeature.h
M	arch/riscv/kernel/cpufeature.c
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/riscv/kernel/cpufeature.c
Auto-merging arch/riscv/include/asm/cpufeature.h
Patch failed at 0002 riscv: Add static key for misaligned accesses
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/kernel/cpufeature.c
index b3785ffc1570,8935481d32da..000000000000
--- a/arch/riscv/kernel/cpufeature.c
+++ b/arch/riscv/kernel/cpufeature.c
@@@ -8,8 -8,8 +8,9 @@@
  
  #include <linux/acpi.h>
  #include <linux/bitmap.h>
 +#include <linux/cpuhotplug.h>
  #include <linux/ctype.h>
+ #include <linux/jump_label.h>
  #include <linux/log2.h>
  #include <linux/memory.h>
  #include <linux/module.h>
@@@ -722,12 -666,35 +723,44 @@@ out
  
  arch_initcall(check_unaligned_access_all_cpus);
  
++<<<<<<< HEAD
 +void riscv_user_isa_enable(void)
 +{
 +	if (riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICBOZ))
 +		csr_set(CSR_SENVCFG, ENVCFG_CBZE);
 +}
 +
++=======
+ DEFINE_STATIC_KEY_FALSE(fast_misaligned_access_speed_key);
+ 
+ static int set_unaligned_access_static_branches(void)
+ {
+ 	/*
+ 	 * This will be called after check_unaligned_access_all_cpus so the
+ 	 * result of unaligned access speed for all cpus will be available.
+ 	 */
+ 
+ 	int cpu;
+ 	bool fast_misaligned_access_speed = true;
+ 
+ 	for_each_online_cpu(cpu) {
+ 		int this_perf = per_cpu(misaligned_access_speed, cpu);
+ 
+ 		if (this_perf != RISCV_HWPROBE_MISALIGNED_FAST) {
+ 			fast_misaligned_access_speed = false;
+ 			break;
+ 		}
+ 	}
+ 
+ 	if (fast_misaligned_access_speed)
+ 		static_branch_enable(&fast_misaligned_access_speed_key);
+ 
+ 	return 0;
+ }
+ 
+ arch_initcall_sync(set_unaligned_access_static_branches);
+ 
++>>>>>>> riscv: Add static key for misaligned accesses
  #ifdef CONFIG_RISCV_ALTERNATIVE
  /*
   * Alternative patch sites consider 48 bits when determining when to patch

[bjoto]

Upstream branch: eb46a00
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=809482
version: 12