Unverified Commit 904d8467 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13964 v3 arm64: mm: Stop use spinlock during pbha early init 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J6QNJC4GPNQIDWKLHW7TQUYJUD4IB63U/ 
 
https://gitee.com/openeuler/kernel/issues/I96IZH 
 
Link:https://gitee.com/openeuler/kernel/pulls/13964

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents b40c2021 77df75b6

arch/arm64/kernel/cpufeature.c

+5 −10
Original line number Diff line number Diff line
@@ -1796,16 +1796,14 @@ void __init early_pbha_init(void) 
	const u8 *prop;

	int size;



	spin_lock(&pbha_dt_lock);



	fdt = get_early_fdt_ptr();

	if (!fdt)

		goto unlock;

		return;



	/* arm,pbha-performance-only may exist in both chosen and cpus node */

	node = fdt_path_offset(fdt, "/chosen");

	if (node < 0)

		goto unlock;

		return;



	prop = fdt_getprop(fdt, node, "arm,pbha-performance-only", &size);

	if (prop)
@@ -1813,15 +1811,15 @@ void __init early_pbha_init(void) 


	node = fdt_path_offset(fdt, "/cpus");

	if (node < 0)

		goto unlock;

		return;



	prop = fdt_getprop(fdt, node, "arm,pbha-performance-only", &size);

	if (prop)

		goto unlock;

		return;



found:

	if (!cpu_has_pbha())

		goto unlock;

		return;



	update_pbha_perf_only_bit(prop, size);

	enable_pbha_inner();
@@ -1829,9 +1827,6 @@ void __init early_pbha_init(void) 
	pbha_enabled = true;



	early_pbha_bit0_init();



unlock:

	spin_unlock(&pbha_dt_lock);

}



/*