Commit a61ac80a authored by Borislav Petkov's avatar Borislav Petkov

x86/microcode: Kill refresh_fw

request_microcode_fw() can always request firmware now so drop this
superfluous argument.
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarAshok Raj <ashok.raj@intel.com>
Link: https://lore.kernel.org/r/20221028142638.28498-4-bp@alien8.de
parent 2071c0ae
...@@ -33,8 +33,7 @@ enum ucode_state { ...@@ -33,8 +33,7 @@ enum ucode_state {
}; };
struct microcode_ops { struct microcode_ops {
enum ucode_state (*request_microcode_fw) (int cpu, struct device *, enum ucode_state (*request_microcode_fw) (int cpu, struct device *);
bool refresh_fw);
void (*microcode_fini_cpu) (int cpu); void (*microcode_fini_cpu) (int cpu);
......
...@@ -891,8 +891,7 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size) ...@@ -891,8 +891,7 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size)
* *
* These might be larger than 2K. * These might be larger than 2K.
*/ */
static enum ucode_state request_microcode_amd(int cpu, struct device *device, static enum ucode_state request_microcode_amd(int cpu, struct device *device)
bool refresh_fw)
{ {
char fw_name[36] = "amd-ucode/microcode_amd.bin"; char fw_name[36] = "amd-ucode/microcode_amd.bin";
struct cpuinfo_x86 *c = &cpu_data(cpu); struct cpuinfo_x86 *c = &cpu_data(cpu);
...@@ -901,7 +900,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, ...@@ -901,7 +900,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
const struct firmware *fw; const struct firmware *fw;
/* reload ucode container only on the boot cpu */ /* reload ucode container only on the boot cpu */
if (!refresh_fw || !bsp) if (!bsp)
return UCODE_OK; return UCODE_OK;
if (c->x86 >= 0x15) if (c->x86 >= 0x15)
......
...@@ -477,7 +477,7 @@ static ssize_t reload_store(struct device *dev, ...@@ -477,7 +477,7 @@ static ssize_t reload_store(struct device *dev,
if (ret) if (ret)
goto put; goto put;
tmp_ret = microcode_ops->request_microcode_fw(bsp, &microcode_pdev->dev, true); tmp_ret = microcode_ops->request_microcode_fw(bsp, &microcode_pdev->dev);
if (tmp_ret != UCODE_NEW) if (tmp_ret != UCODE_NEW)
goto put; goto put;
......
...@@ -885,8 +885,7 @@ static bool is_blacklisted(unsigned int cpu) ...@@ -885,8 +885,7 @@ static bool is_blacklisted(unsigned int cpu)
return false; return false;
} }
static enum ucode_state request_microcode_fw(int cpu, struct device *device, static enum ucode_state request_microcode_fw(int cpu, struct device *device)
bool refresh_fw)
{ {
struct cpuinfo_x86 *c = &cpu_data(cpu); struct cpuinfo_x86 *c = &cpu_data(cpu);
const struct firmware *firmware; const struct firmware *firmware;
......
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