From 368873ced315fb00b1052b5e5633d2d157a8f0a1 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 20 May 2020 02:42:41 +0200 Subject: soc/amd/picasso/soc_util: change return type of soc_is_* All callers just check for zero/non-zero. Change-Id: I795763ce882d879d12c97b71e7a0b35423378c36 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/41559 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Raul Rangel --- src/soc/amd/picasso/include/soc/soc_util.h | 12 +++++++----- src/soc/amd/picasso/soc_util.c | 10 +++++----- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/soc/amd/picasso/include/soc/soc_util.h b/src/soc/amd/picasso/include/soc/soc_util.h index 9077195a88..6515761a8a 100644 --- a/src/soc/amd/picasso/include/soc/soc_util.h +++ b/src/soc/amd/picasso/include/soc/soc_util.h @@ -3,6 +3,8 @@ #ifndef __PICASSO_SOC_UTIL_H__ #define __PICASSO_SOC_UTIL_H__ +#include + enum socket_type { SOCKET_FP5 = 0, SOCKET_AM4 = 2, @@ -11,10 +13,10 @@ enum socket_type { void print_socket_type(void); -int soc_is_pollock(void); -int soc_is_dali(void); -int soc_is_picasso(void); -int soc_is_raven2(void); -int soc_is_zen_plus(void); +bool soc_is_pollock(void); +bool soc_is_dali(void); +bool soc_is_picasso(void); +bool soc_is_raven2(void); +bool soc_is_zen_plus(void); #endif /* __PICASSO_SOC_UTIL_H__ */ diff --git a/src/soc/amd/picasso/soc_util.c b/src/soc/amd/picasso/soc_util.c index f82811053c..89aa0a40ff 100644 --- a/src/soc/amd/picasso/soc_util.c +++ b/src/soc/amd/picasso/soc_util.c @@ -37,7 +37,7 @@ void print_socket_type(void) } } -int soc_is_pollock(void) +bool soc_is_pollock(void) { return soc_is_zen_plus() && get_socket_type() == SOCKET_FT5; } @@ -46,23 +46,23 @@ int soc_is_pollock(void) * TODO: This detection works for the Dali SKUs used in Chrome-devices, but fails for other * Dali SKUs, since other Dali SKUs have a Zen+ CPUID and not a Raven2 one. */ -int soc_is_dali(void) +bool soc_is_dali(void) { return soc_is_raven2() && get_socket_type() == SOCKET_FP5; } -int soc_is_picasso(void) +bool soc_is_picasso(void) { return soc_is_zen_plus() && get_socket_type() == SOCKET_FP5; } -int soc_is_raven2(void) +bool soc_is_raven2(void) { /* mask lower model number nibble and stepping */ return cpuid_eax(1) >> 8 == RAVEN2_CPUID >> 8; } -int soc_is_zen_plus(void) +bool soc_is_zen_plus(void) { /* mask lower model number nibble and stepping */ return cpuid_eax(1) >> 8 == PICASSO_CPUID >> 8; -- cgit v1.2.3