x86/mce/: Make cmci_supported() return bool

Commit Message

Nikolay Borisov Dec. 17, 2024, 2:51 p.m. UTC

It's the last function in this file which is not returning bool when it
should. Rectify this, no functional changes.

Signed-off-by: Nikolay Borisov <[e-mail]>
---
 arch/x86/kernel/cpu/mce/intel.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Zhuo, Qiuxu Dec. 18, 2024, 1:21 a.m. UTC | #1

+Boris & Tony,

> From: Nikolay Borisov <[e-mail]>
> Sent: Tuesday, December 17, 2024 10:51 PM
> To: [e-mail]
> Cc: [e-mail]; [e-mail]; Nikolay Borisov
> <[e-mail]>
> Subject: [PATCH] x86/mce/: Make cmci_supported() return bool
> 
> It's the last function in this file which is not returning bool when it should.
> Rectify this, no functional changes.
> 
> Signed-off-by: Nikolay Borisov <[e-mail]>
> ---
>  arch/x86/kernel/cpu/mce/intel.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
> index b3cd2c61b11d..db0436e9c891 100644
> --- a/arch/x86/kernel/cpu/mce/intel.c
> +++ b/arch/x86/kernel/cpu/mce/intel.c

Hi Nikolay,

I've included this change in the following link, which you've reviewed before 

Nikolay Borisov Dec. 18, 2024, 9:04 a.m. UTC | #2

On 18.12.24 г. 3:21 ч., Zhuo, Qiuxu wrote:
> +Boris & Tony,
> 
>> From: Nikolay Borisov <[e-mail]>
>> Sent: Tuesday, December 17, 2024 10:51 PM
>> To: [e-mail]
>> Cc: [e-mail]; [e-mail]; Nikolay Borisov
>> <[e-mail]>
>> Subject: [PATCH] x86/mce/: Make cmci_supported() return bool
>>
>> It's the last function in this file which is not returning bool when it should.
>> Rectify this, no functional changes.
>>
>> Signed-off-by: Nikolay Borisov <[e-mail]>
>> ---
>>   arch/x86/kernel/cpu/mce/intel.c | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
>> index b3cd2c61b11d..db0436e9c891 100644
>> --- a/arch/x86/kernel/cpu/mce/intel.c
>> +++ b/arch/x86/kernel/cpu/mce/intel.c
> 
> Hi Nikolay,
> 
> I've included this change in the following link, which you've reviewed before 

Zhuo, Qiuxu Dec. 18, 2024, 1:46 p.m. UTC | #3

> From: Nikolay Borisov <[e-mail]>
> Sent: Wednesday, December 18, 2024 5:04 PM
> To: Zhuo, Qiuxu <[e-mail]>; [e-mail];
> Borislav Petkov <[e-mail]>; Luck, Tony <[e-mail]>
> Cc: [e-mail]; [e-mail]
> Subject: Re: [PATCH] x86/mce/: Make cmci_supported() return bool
> On 18.12.24 г. 3:21 ч., Zhuo, Qiuxu wrote:
> > +Boris & Tony,
> >
> >> From: Nikolay Borisov <[e-mail]>
> >> Sent: Tuesday, December 17, 2024 10:51 PM
> >> To: [e-mail]
> >> Cc: [e-mail]; [e-mail]; Nikolay Borisov
> >> <[e-mail]>
> >> Subject: [PATCH] x86/mce/: Make cmci_supported() return bool
> >>
> >> It's the last function in this file which is not returning bool when it should.
> >> Rectify this, no functional changes.
> >>
> >> Signed-off-by: Nikolay Borisov <[e-mail]>
> >> ---
> >>   arch/x86/kernel/cpu/mce/intel.c | 8 ++++----
> >>   1 file changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/arch/x86/kernel/cpu/mce/intel.c
> >> b/arch/x86/kernel/cpu/mce/intel.c index b3cd2c61b11d..db0436e9c891
> >> 100644
> >> --- a/arch/x86/kernel/cpu/mce/intel.c
> >> +++ b/arch/x86/kernel/cpu/mce/intel.c
> >
> > Hi Nikolay,
> >
> > I've included this change in the following link, which you've reviewed
> > before 

Patch

diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
index b3cd2c61b11d..db0436e9c891 100644
--- a/arch/x86/kernel/cpu/mce/intel.c
+++ b/arch/x86/kernel/cpu/mce/intel.c
@@ -75,12 +75,12 @@  static u16 cmci_threshold[MAX_NR_BANKS];
  */
 #define CMCI_STORM_THRESHOLD	32749
 
-static int cmci_supported(int *banks)
+static bool cmci_supported(int *banks)
 {
 	u64 cap;
 
 	if (mca_cfg.cmci_disabled || mca_cfg.ignore_ce)
-		return 0;
+		return false;
 
 	/*
 	 * Vendor check is not strictly needed, but the initial
@@ -89,10 +89,10 @@  static int cmci_supported(int *banks)
 	 */
 	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL &&
 	    boot_cpu_data.x86_vendor != X86_VENDOR_ZHAOXIN)
-		return 0;
+		return false;
 
 	if (!boot_cpu_has(X86_FEATURE_APIC) || lapic_get_maxlvt() < 6)
-		return 0;
+		return false;
 	rdmsrl(MSR_IA32_MCG_CAP, cap);
 	*banks = min_t(unsigned, MAX_NR_BANKS, cap & MCG_BANKCNT_MASK);
 	return !!(cap & MCG_CMCI_P);