From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759718AbcLPLsP (ORCPT ); Fri, 16 Dec 2016 06:48:15 -0500 Received: from mail.kernel.org ([198.145.29.136]:42226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934737AbcLPLrG (ORCPT ); Fri, 16 Dec 2016 06:47:06 -0500 From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org, ming.lei@canonical.com Cc: wagi@monom.org, teg@jklm.no, mchehab@osg.samsung.com, zajec5@gmail.com, linux-kernel@vger.kernel.org, markivx@codeaurora.org, stephen.boyd@linaro.org, broonie@kernel.org, zohar@linux.vnet.ibm.com, tiwai@suse.de, johannes@sipsolutions.net, chunkeey@googlemail.com, hauke@hauke-m.de, jwboyer@fedoraproject.org, dmitry.torokhov@gmail.com, dwmw2@infradead.org, jslaby@suse.com, torvalds@linux-foundation.org, luto@amacapital.net, fengguang.wu@intel.com, rpurdie@rpsys.net, j.anaszewski@samsung.com, Abhay_Salunke@dell.com, Julia.Lawall@lip6.fr, Gilles.Muller@lip6.fr, nicolas.palix@imag.fr, dhowells@redhat.com, bjorn.andersson@linaro.org, arend.vanspriel@broadcom.com, kvalo@codeaurora.org, "Luis R. Rodriguez" Subject: [PATCH v3 3/4] x86/microcode: convert to use sysdata API Date: Fri, 16 Dec 2016 03:46:31 -0800 Message-Id: <20161216114632.22559-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161216114632.22559-1-mcgrof@kernel.org> References: <20161216114632.22559-1-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This uses the new flexible firmware API, since we don't have to keep the firmware around the sysdata API does the freeing for us safely. v2: was not present v5: bike shed changes: sysdata/drvdata Signed-off-by: Luis R. Rodriguez --- arch/x86/kernel/cpu/microcode/amd.c | 56 +++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 6f353bdb3a25..5d08cd7284e5 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -24,7 +24,7 @@ #define pr_fmt(fmt) "microcode: " fmt #include -#include +#include #include #include #include @@ -877,6 +877,31 @@ load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size) return ret; } +struct amd_ucode_req { + int cpu; + struct cpuinfo_x86 *c; + enum ucode_state state; + const char *name; +}; + +static int request_microcode_amd_cb(void *context, + const struct drvdata *drvdata) +{ + struct amd_ucode_req *req = context; + + if (*(u32 *)drvdata->data != UCODE_MAGIC) { + pr_err("invalid magic value (0x%08x)\n", + *(u32 *)drvdata->data); + req->state = UCODE_ERROR; + return -EINVAL; + } + + req->state = load_microcode_amd(req->cpu, req->c->x86, + drvdata->data, drvdata->size); + + return 0; +} + /* * AMD microcode firmware naming convention, up to family 15h they are in * the legacy file: @@ -896,10 +921,13 @@ load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size) static enum ucode_state request_microcode_amd(int cpu, struct device *device, bool refresh_fw) { + struct amd_ucode_req req; char fw_name[36] = "amd-ucode/microcode_amd.bin"; struct cpuinfo_x86 *c = &cpu_data(cpu); - enum ucode_state ret = UCODE_NFOUND; - const struct firmware *fw; + const struct drvdata_req_params req_params = { + DRVDATA_DEFAULT_SYNC(request_microcode_amd_cb, &req), + .optional = true, + }; /* reload ucode container only on the boot cpu */ if (!refresh_fw || c->cpu_index != boot_cpu_data.cpu_index) @@ -908,24 +936,16 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, if (c->x86 >= 0x15) snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86); - if (request_firmware_direct(&fw, (const char *)fw_name, device)) { - pr_debug("failed to load file %s\n", fw_name); - goto out; - } + req.cpu = cpu; + req.c = c; + req.name = fw_name; + req.state = UCODE_NFOUND; - ret = UCODE_ERROR; - if (*(u32 *)fw->data != UCODE_MAGIC) { - pr_err("invalid magic value (0x%08x)\n", *(u32 *)fw->data); - goto fw_release; + if (drvdata_request((const char *)fw_name, &req_params, device)) { + pr_debug("failed to load file %s\n", fw_name); } - ret = load_microcode_amd(cpu, c->x86, fw->data, fw->size); - - fw_release: - release_firmware(fw); - - out: - return ret; + return req.state; } static enum ucode_state -- 2.10.1