Commit 75da02b2 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

microcode: Use request_firmware_direct()

Use the new helper, request_firmware_direct(), for avoiding the
lengthy timeout of non-existing firmware loads.  Especially the Intel
microcode driver suffers from this problem because each CPU triggers
the f/w loading, thus it ends up taking (literally) hours with many
cores.
Tested-by: default avatarPrarit Bhargava <prarit@redhat.com>
Acked-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bba3a87e
...@@ -430,7 +430,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, ...@@ -430,7 +430,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
if (c->x86 >= 0x15) if (c->x86 >= 0x15)
snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86); snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
if (request_firmware(&fw, (const char *)fw_name, device)) { if (request_firmware_direct(&fw, (const char *)fw_name, device)) {
pr_debug("failed to load file %s\n", fw_name); pr_debug("failed to load file %s\n", fw_name);
goto out; goto out;
} }
......
...@@ -278,7 +278,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device, ...@@ -278,7 +278,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
sprintf(name, "intel-ucode/%02x-%02x-%02x", sprintf(name, "intel-ucode/%02x-%02x-%02x",
c->x86, c->x86_model, c->x86_mask); c->x86, c->x86_model, c->x86_mask);
if (request_firmware(&firmware, name, device)) { if (request_firmware_direct(&firmware, name, device)) {
pr_debug("data file %s load failed\n", name); pr_debug("data file %s load failed\n", name);
return UCODE_NFOUND; return UCODE_NFOUND;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment