x86/microcode/AMD: Move verify_patch_size() up in the file (3974b681) · Commits · 戴 / test

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

+41 −41

Original line number	Diff line number	Diff line
		@@ -174,6 +174,47 @@ static bool verify_patch_section(const u8 *buf, size_t buf_size, bool early)
		return true;
		}

		/*
		* Check whether the passed remaining file @size is large enough to contain a
		* patch of the indicated @patch_size (and also whether this size does not
		* exceed the per-family maximum).
		*/
		static unsigned int verify_patch_size(u8 family, u32 patch_size, unsigned int size)
		{
		u32 max_size;

		#define F1XH_MPB_MAX_SIZE 2048
		#define F14H_MPB_MAX_SIZE 1824
		#define F15H_MPB_MAX_SIZE 4096
		#define F16H_MPB_MAX_SIZE 3458
		#define F17H_MPB_MAX_SIZE 3200

		switch (family) {
		case 0x14:
		max_size = F14H_MPB_MAX_SIZE;
		break;
		case 0x15:
		max_size = F15H_MPB_MAX_SIZE;
		break;
		case 0x16:
		max_size = F16H_MPB_MAX_SIZE;
		break;
		case 0x17:
		max_size = F17H_MPB_MAX_SIZE;
		break;
		default:
		max_size = F1XH_MPB_MAX_SIZE;
		break;
		}

		if (patch_size > min_t(u32, size, max_size)) {
		pr_err("patch size mismatch\n");
		return 0;
		}

		return patch_size;
		}

		/*
		* This scans the ucode blob for the proper container as we can have multiple
		* containers glued together. Returns the equivalence ID from the equivalence
		@@ -562,47 +603,6 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
		return 0;
		}

		/*
		* Check whether the passed remaining file @size is large enough to contain a
		* patch of the indicated @patch_size (and also whether this size does not
		* exceed the per-family maximum).
		*/
		static unsigned int verify_patch_size(u8 family, u32 patch_size, unsigned int size)
		{
		u32 max_size;

		#define F1XH_MPB_MAX_SIZE 2048
		#define F14H_MPB_MAX_SIZE 1824
		#define F15H_MPB_MAX_SIZE 4096
		#define F16H_MPB_MAX_SIZE 3458
		#define F17H_MPB_MAX_SIZE 3200

		switch (family) {
		case 0x14:
		max_size = F14H_MPB_MAX_SIZE;
		break;
		case 0x15:
		max_size = F15H_MPB_MAX_SIZE;
		break;
		case 0x16:
		max_size = F16H_MPB_MAX_SIZE;
		break;
		case 0x17:
		max_size = F17H_MPB_MAX_SIZE;
		break;
		default:
		max_size = F1XH_MPB_MAX_SIZE;
		break;
		}

		if (patch_size > min_t(u32, size, max_size)) {
		pr_err("patch size mismatch\n");
		return 0;
		}

		return patch_size;
		}

		static enum ucode_state apply_microcode_amd(int cpu)
		{
		struct cpuinfo_x86 *c = &cpu_data(cpu);

Admin message