Unverified Commit 1c54aad4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9817 arm64: mm: Pass pbha-performance-only bit under chosen node 

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

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 11c42ef5 f6771b69

arch/arm64/kernel/cpufeature.c

+11 −1
Original line number Diff line number Diff line
@@ -1802,14 +1802,24 @@ void __init early_pbha_init(void) 
	if (!fdt)

		goto unlock;



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

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

	if (node < 0)

		goto unlock;



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

	if (prop)

		goto found;



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

	if (node < 0)

		goto unlock;



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

	if (!prop)

	if (prop)

		goto unlock;



found:

	if (!cpu_has_pbha())

		goto unlock;

drivers/firmware/efi/libstub/fdt.c

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ static efi_status_t fdt_init_hbm_mode(void *fdt, int node) 
	if (status)

		return EFI_LOAD_ERROR;



	node = fdt_subnode_offset(fdt, 0, "cpus");

	if (node < 0) {

		node = fdt_add_subnode(fdt, 0, "cpus");

		if (node < 0)

			return EFI_LOAD_ERROR;

	}



	/* Current PBHA bit59 is need to enable PBHA bit0 mode. */

	status = fdt_setprop_var(fdt, node, "arm,pbha-performance-only", arr);

	if (status) {