@@ -484,7 +484,7 @@ static void scan_containers(u8 *ucode, size_t size, struct cont_desc *desc)
484
484
}
485
485
}
486
486
487
- static int __apply_microcode_amd (struct microcode_amd * mc , unsigned int psize )
487
+ static bool __apply_microcode_amd (struct microcode_amd * mc , unsigned int psize )
488
488
{
489
489
unsigned long p_addr = (unsigned long )& mc -> hdr .data_code ;
490
490
u32 rev , dummy ;
@@ -508,9 +508,9 @@ static int __apply_microcode_amd(struct microcode_amd *mc, unsigned int psize)
508
508
native_rdmsr (MSR_AMD64_PATCH_LEVEL , rev , dummy );
509
509
510
510
if (rev != mc -> hdr .patch_id )
511
- return -1 ;
511
+ return false ;
512
512
513
- return 0 ;
513
+ return true ;
514
514
}
515
515
516
516
/*
@@ -544,7 +544,7 @@ static bool early_apply_microcode(u32 old_rev, void *ucode, size_t size)
544
544
if (old_rev > mc -> hdr .patch_id )
545
545
return ret ;
546
546
547
- return ! __apply_microcode_amd (mc , desc .psize );
547
+ return __apply_microcode_amd (mc , desc .psize );
548
548
}
549
549
550
550
static bool get_builtin_microcode (struct cpio_data * cp )
@@ -763,7 +763,7 @@ void reload_ucode_amd(unsigned int cpu)
763
763
rdmsr (MSR_AMD64_PATCH_LEVEL , rev , dummy );
764
764
765
765
if (rev < mc -> hdr .patch_id ) {
766
- if (! __apply_microcode_amd (mc , p -> size ))
766
+ if (__apply_microcode_amd (mc , p -> size ))
767
767
pr_info_once ("reload revision: 0x%08x\n" , mc -> hdr .patch_id );
768
768
}
769
769
}
@@ -816,7 +816,7 @@ static enum ucode_state apply_microcode_amd(int cpu)
816
816
goto out ;
817
817
}
818
818
819
- if (__apply_microcode_amd (mc_amd , p -> size )) {
819
+ if (! __apply_microcode_amd (mc_amd , p -> size )) {
820
820
pr_err ("CPU%d: update failed for patch_level=0x%08x\n" ,
821
821
cpu , mc_amd -> hdr .patch_id );
822
822
return UCODE_ERROR ;
0 commit comments