Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3438330 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 microcode loading updates from Ingo Molnar:
 "Misc smaller cleanups"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, microcode, intel: Fix total_size computation
  x86, microcode, intel: Rename apply_microcode and declare it static
  x86, microcode, intel: Fix typos
  x86, microcode, intel: Add missing static declarations
  x86, microcode, amd: Fix missing static declaration
parents c7b228ad 44afe602

arch/x86/include/asm/microcode_intel.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct extended_sigtable { 
#define DWSIZE			(sizeof(u32))



#define get_totalsize(mc) \

	(((struct microcode_intel *)mc)->hdr.totalsize ? \

	(((struct microcode_intel *)mc)->hdr.datasize ? \

	 ((struct microcode_intel *)mc)->hdr.totalsize : \

	 DEFAULT_UCODE_TOTALSIZE)

arch/x86/kernel/cpu/microcode/amd_early.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static u32 ucode_new_rev; 
u8 amd_ucode_patch[PATCH_MAX_SIZE];

static u16 this_equiv_id;



struct cpio_data ucode_cpio;

static struct cpio_data ucode_cpio;



/*

 * Microcode patch container file is prepended to the initrd in cpio format.

arch/x86/kernel/cpu/microcode/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int get_matching_mc(struct microcode_intel *mc_intel, int cpu) 
	return get_matching_microcode(csig, cpf, mc_intel, crev);

}



int apply_microcode(int cpu)

static int apply_microcode_intel(int cpu)

{

	struct microcode_intel *mc_intel;

	struct ucode_cpu_info *uci;
@@ -314,7 +314,7 @@ static struct microcode_ops microcode_intel_ops = { 
	.request_microcode_user		  = request_microcode_user,

	.request_microcode_fw             = request_microcode_fw,

	.collect_cpu_info                 = collect_cpu_info,

	.apply_microcode                  = apply_microcode,

	.apply_microcode                  = apply_microcode_intel,

	.microcode_fini_cpu               = microcode_fini_cpu,

};

arch/x86/kernel/cpu/microcode/intel_early.c

+5 −5
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <asm/tlbflush.h>

#include <asm/setup.h>



unsigned long mc_saved_in_initrd[MAX_UCODE_COUNT];

struct mc_saved_data {

static unsigned long mc_saved_in_initrd[MAX_UCODE_COUNT];

static struct mc_saved_data {

	unsigned int mc_saved_count;

	struct microcode_intel **mc_saved;

} mc_saved_data;
@@ -415,7 +415,7 @@ static void __ref show_saved_mc(void) 
	struct ucode_cpu_info uci;



	if (mc_saved_data.mc_saved_count == 0) {

		pr_debug("no micorcode data saved.\n");

		pr_debug("no microcode data saved.\n");

		return;

	}

	pr_debug("Total microcode saved: %d\n", mc_saved_data.mc_saved_count);
@@ -506,7 +506,7 @@ int save_mc_for_early(u8 *mc) 


	if (mc_saved && mc_saved_count)

		memcpy(mc_saved_tmp, mc_saved,

		       mc_saved_count * sizeof(struct mirocode_intel *));

		       mc_saved_count * sizeof(struct microcode_intel *));

	/*

	 * Save the microcode patch mc in mc_save_tmp structure if it's a newer

	 * version.
@@ -526,7 +526,7 @@ int save_mc_for_early(u8 *mc) 
	show_saved_mc();



	/*

	 * Free old saved microcod data.

	 * Free old saved microcode data.

	 */

	if (mc_saved) {

		for (i = 0; i < mc_saved_count_init; i++)