From 65be868af3a263d03acf3c460bdf9bb8fbcb447b Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sun, 28 Jun 2020 01:46:13 -0400
Subject: [PATCH] linux: add cpu microcode to silent firmware load patch
---
.../DATA/linux/silent-accept-firmware.patch | 24 +++++++++++++++++++
helpers/make-linux | 4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/helpers/DATA/linux/silent-accept-firmware.patch b/helpers/DATA/linux/silent-accept-firmware.patch
index 8bd34921..3c16440d 100644
--- a/helpers/DATA/linux/silent-accept-firmware.patch
+++ b/helpers/DATA/linux/silent-accept-firmware.patch
@@ -1060,3 +1060,27 @@ index d71d277..f2c70e1 100644
err = request_firmware_nowait(THIS_MODULE, 1,
wowlan_fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
+diff -ru linux.orig/source/arch/x86/kernel/cpu/microcode/amd.c linux/source/arch/x86/kernel/cpu/microcode/amd.c
+--- a/arch/x86/kernel/cpu/microcode/amd.c 2020-06-27 13:12:17.000000000 -0400
++++ b/arch/x86/kernel/cpu/microcode/amd.c 2020-06-27 13:21:09.792495638 -0400
+@@ -756,7 +756,7 @@
+ 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);
++ pr_debug("failed to load file\n", fw_name);
+ goto out;
+ }
+
+diff -ru linux.orig/source/arch/x86/kernel/cpu/microcode/intel.c linux/source/arch/x86/kernel/cpu/microcode/intel.c
+--- a/arch/x86/kernel/cpu/microcode/intel.c 2020-06-27 13:12:17.000000000 -0400
++++ b/arch/x86/kernel/cpu/microcode/intel.c 2020-06-27 13:37:05.143739228 -0400
+@@ -989,7 +989,7 @@
+ c->x86, c->x86_model, c->x86_stepping);
+
+ if (request_firmware_direct(&firmware, name, device)) {
+- pr_debug("data file %s load failed\n", name);
++ pr_debug("data file load failed\n", name);
+ return UCODE_NFOUND;
+ }
+
diff --git a/helpers/make-linux b/helpers/make-linux
index 8812209f..23e604fb 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net>
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=4
+VERSION=5
. ./config
--
GitLab