d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use int for the pcpu_ssbd argument. This is included from userland and may

Browse Source 
not include the needed headers to get the bool definition.

Reported by:	manu
Pointy hat to:	andrew
Sponsored by:	DARPA, AFRL
This commit is contained in:
Andrew Turner 2018-07-31 15:08:02 +00:00
parent 97df4fd158
commit 100a6d1905
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm64/arm64/cpu_errata.c
View File

@ -126,10 +126,10 @@ install_ssbd_workaround(void)
switch(ssbd_method) {
case SSBD_FORCE_ON:
smccc_arch_workaround_2(true);
smccc_arch_workaround_2(1);
break;
case SSBD_FORCE_OFF:
smccc_arch_workaround_2(false);
smccc_arch_workaround_2(0);
break;
case SSBD_KERNEL:
default:

2
sys/arm64/include/pcpu.h
View File

@ -36,7 +36,7 @@
#define ALT_STACK_SIZE 128
typedef int (*pcpu_bp_harden)(void);
typedef int (*pcpu_ssbd)(bool);
typedef int (*pcpu_ssbd)(int);
#define PCPU_MD_FIELDS \
u_int pc_acpi_id; /* ACPI CPU id */ \

4
sys/dev/psci/smccc.c
View File

@ -93,10 +93,10 @@ smccc_arch_workaround_1(void)
}
int
smccc_arch_workaround_2(bool enable)
smccc_arch_workaround_2(int enable)
{
KASSERT(smccc_version != SMCCC_VERSION_1_0,
("SMCCC arch workaround 2 called with an invalid SMCCC interface"));
return (psci_call(SMCCC_ARCH_WORKAROUND_2, enable ? 1 : 0, 0, 0));
return (psci_call(SMCCC_ARCH_WORKAROUND_2, enable, 0, 0));
}

2
sys/dev/psci/smccc.h
View File

@ -69,7 +69,7 @@
int32_t smccc_arch_features(uint32_t);
int smccc_arch_workaround_1(void);
int smccc_arch_workaround_2(bool);
int smccc_arch_workaround_2(int);
#endif /* _PSCI_SMCCC_H_ */