Revert "boot_loader: load intel microcode update data file"

This reverts commit a732059324.

It broke the build on most boot platforms (including EFI.)

headers/private/kernel/boot/arch/x86/arch_cpu.h

@@ -21,9 +21,4 @@ void calculate_cpu_conversion_factor(uint8 channel);
 }
 #endif
 
-#include <boot/vfs.h>
-
-void ucode_load(BootVolume& volume);
-
-
 #endif	/* BOOT_ARCH_CPU_H */

headers/private/kernel/boot/platform.h

@@ -43,7 +43,6 @@ extern void platform_switch_to_logo(void);
 extern void platform_switch_to_text_mode(void);
 extern void platform_start_kernel(void);
 extern void platform_exit(void);
-extern void platform_load_ucode(BootVolume& volume);
 
 #ifdef __cplusplus
 }

src/system/boot/arch/x86/cpu.cpp

@@ -17,7 +17,6 @@
 #include <boot/stdio.h>
 
 #include <arch/cpu.h>
-#include <arch/x86/arch_cpu.h>
 #include <arch_kernel.h>
 #include <arch_system_info.h>
 
@@ -312,62 +311,6 @@ slower_sample:
 	}
 }
 
-extern int open_maybe_packaged(BootVolume& volume, const char* path,
-	int openMode);
-
-void
-ucode_load(BootVolume& volume)
-{
-	cpuid_info info;
-	if (get_current_cpuid(&info, 0, 0) != B_OK
-		|| strncmp(info.eax_0.vendor_id, "GenuineIntel", 12) != 0)
-		return;
-
-	if (get_current_cpuid(&info, 1, 0) != B_OK)
-		return;
-
-	char path[128];
-	int family = info.eax_1.family;
-	int model = info.eax_1.model;
-	if (family == 0x6 || family == 0xf) {
-		family += info.eax_1.extended_family;
-		model += (info.eax_1.extended_model << 4);
-	}
-	snprintf(path, sizeof(path), "system/data/firmware/intel-ucode/"
-		"%02x-%02x-%02x", family, model, info.eax_1.stepping);
-	dprintf("ucode_load: %s\n", path);
-
-	int fd = open_maybe_packaged(volume, path, O_RDONLY);
-	if (fd < B_OK) {
-		dprintf("ucode_load: couldn't find microcode\n");
-		return;
-	}
-	struct stat stat;
-	if (fstat(fd, &stat) < 0) {
-		dprintf("ucode_load: couldn't stat microcode file\n");
-		close(fd);
-		return;
-	}
-
-	ssize_t length = stat.st_size;
-	const uint32 alignment = 16;
-#define ALIGN(size, align)	(((size) + align - 1) & ~(align - 1))
-	void *buffer = kernel_args_malloc(length + alignment - 1);
-	if (buffer != NULL) {
-		buffer = (void*)ALIGN((addr_t)buffer, alignment);
-		if (read(fd, buffer, length) != length) {
-			dprintf("ucode_load: couldn't read microcode file\n");
-			kernel_args_free(buffer);
-		} else {
-			gKernelArgs.ucode_data = buffer;
-			gKernelArgs.ucode_data_size = length;
-			dprintf("ucode_load: microcode file read in memory\n");
-		}
-	}
-
-	close(fd);
-}
-
 
 extern "C" bigtime_t
 system_time()

src/system/boot/loader/loader.cpp

@@ -55,7 +55,7 @@ static const char *sAddonPaths[] = {
 };
 
 
-int
+static int
 open_maybe_packaged(BootVolume& volume, const char* path, int openMode)
 {
 	if (strncmp(path, kSystemDirectoryPrefix, strlen(kSystemDirectoryPrefix))

src/system/boot/loader/main.cpp

@@ -128,7 +128,6 @@ main(stage2_args *args)
 
 			gKernelArgs.ucode_data = NULL;
 			gKernelArgs.ucode_data_size = 0;
-			platform_load_ucode(bootVolume);
 
 			// apply boot settings
 			apply_boot_settings();

src/system/boot/platform/bios_ia32/cpu.cpp

@@ -70,10 +70,3 @@ cpu_init()
 	gKernelArgs.num_cpus = 1;
 		// this will eventually be corrected later on
 }
-
-
-extern "C" void
-platform_load_ucode(BootVolume& volume)
-{
-	ucode_load(volume);
-}

src/system/boot/platform/bios_ia32/long.cpp

@@ -244,7 +244,6 @@ convert_kernel_args()
 	fix_address(gKernelArgs.debug_output);
 	fix_address(gKernelArgs.previous_debug_output);
 	fix_address(gKernelArgs.boot_splash);
-	fix_address(gKernelArgs.ucode_data);
 	fix_address(gKernelArgs.arch_args.apic);
 	fix_address(gKernelArgs.arch_args.hpet);
 

src/system/boot/platform/efi/cpu.cpp

@@ -16,10 +16,3 @@ cpu_init()
 	gKernelArgs.num_cpus = 1;
 		// this will eventually be corrected later on
 }
-
-
-extern "C" void
-platform_load_ucode(BootVolume& volume)
-{
-	ucode_load(volume);
-}

src/system/boot/platform/efi/start.cpp

@@ -90,7 +90,6 @@ convert_kernel_args()
 	fix_address(gKernelArgs.debug_output);
 	fix_address(gKernelArgs.boot_splash);
 	#if defined(__x86_64__) || defined(__x86__)
-	fix_address(gKernelArgs.ucode_data);
 	fix_address(gKernelArgs.arch_args.apic);
 	fix_address(gKernelArgs.arch_args.hpet);
 	#endif