@@ -553,8 +553,7 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax)
553553 early_apply_microcode (cpuid_1_eax , cp .data , cp .size , false);
554554}
555555
556- static enum ucode_state
557- load_microcode_amd (bool save , u8 family , const u8 * data , size_t size );
556+ static enum ucode_state load_microcode_amd (u8 family , const u8 * data , size_t size );
558557
559558int __init save_microcode_in_initrd_amd (unsigned int cpuid_1_eax )
560559{
@@ -572,7 +571,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)
572571 if (!desc .mc )
573572 return - EINVAL ;
574573
575- ret = load_microcode_amd (true, x86_family (cpuid_1_eax ), desc .data , desc .size );
574+ ret = load_microcode_amd (x86_family (cpuid_1_eax ), desc .data , desc .size );
576575 if (ret > UCODE_UPDATED )
577576 return - EINVAL ;
578577
@@ -851,8 +850,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,
851850 return UCODE_OK ;
852851}
853852
854- static enum ucode_state
855- load_microcode_amd (bool save , u8 family , const u8 * data , size_t size )
853+ static enum ucode_state load_microcode_amd (u8 family , const u8 * data , size_t size )
856854{
857855 struct ucode_patch * p ;
858856 enum ucode_state ret ;
@@ -876,10 +874,6 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size)
876874 ret = UCODE_NEW ;
877875 }
878876
879- /* save BSP's matching patch for early load */
880- if (!save )
881- return ret ;
882-
883877 memset (amd_ucode_patch , 0 , PATCH_MAX_SIZE );
884878 memcpy (amd_ucode_patch , p -> data , min_t (u32 , p -> size , PATCH_MAX_SIZE ));
885879
@@ -906,14 +900,9 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device)
906900{
907901 char fw_name [36 ] = "amd-ucode/microcode_amd.bin" ;
908902 struct cpuinfo_x86 * c = & cpu_data (cpu );
909- bool bsp = c -> cpu_index == boot_cpu_data .cpu_index ;
910903 enum ucode_state ret = UCODE_NFOUND ;
911904 const struct firmware * fw ;
912905
913- /* reload ucode container only on the boot cpu */
914- if (!bsp )
915- return UCODE_OK ;
916-
917906 if (c -> x86 >= 0x15 )
918907 snprintf (fw_name , sizeof (fw_name ), "amd-ucode/microcode_amd_fam%.2xh.bin" , c -> x86 );
919908
@@ -926,7 +915,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device)
926915 if (!verify_container (fw -> data , fw -> size , false))
927916 goto fw_release ;
928917
929- ret = load_microcode_amd (bsp , c -> x86 , fw -> data , fw -> size );
918+ ret = load_microcode_amd (c -> x86 , fw -> data , fw -> size );
930919
931920 fw_release :
932921 release_firmware (fw );
0 commit comments