Revert "test_firmware: Test platform fw loading on non-EFI systems"

This reverts commit 18efb2f9e897ac65e7a1b2892f4a53e404534eba as it is
reported to break the build:
	https://lore.kernel.org/r/20200909154709.619fe9bb@canb.auug.org.au

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 18efb2f9e897 ("test_firmware: Test platform fw loading on non-EFI systems")
Cc: stable@vger.kernel.org
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Scott Branden <scott.branden@broadcom.com>
Cc: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20200909154709.619fe9bb@canb.auug.org.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 18 insertions, 42 deletions

diff --git a/drivers/firmware/efi/embedded-firmware.c b/drivers/firmware/efi/embedded-firmware.c
index f1330f55f7f4..e97a9c9d010c 100644
--- a/drivers/firmware/efi/embedded-firmware.c
+++ b/drivers/firmware/efi/embedded-firmware.c
@@ -14,22 +14,11 @@
 #include <linux/vmalloc.h>
 #include <crypto/sha.h>
 
-#include "embedded-firmware.h"
-
-#ifdef CONFIG_TEST_FIRMWARE
-# define EFI_EMBEDDED_FW_VISIBILITY
-#else
-# define EFI_EMBEDDED_FW_VISIBILITY static
-#endif
-
-EFI_EMBEDDED_FW_VISIBILITY LIST_HEAD(efi_embedded_fw_list);
-EFI_EMBEDDED_FW_VISIBILITY bool efi_embedded_fw_checked;
-
 /* Exported for use by lib/test_firmware.c only */
-#ifdef CONFIG_TEST_FIRMWARE
+LIST_HEAD(efi_embedded_fw_list);
 EXPORT_SYMBOL_GPL(efi_embedded_fw_list);
-EXPORT_SYMBOL_GPL(efi_embedded_fw_checked);
-#endif
+
+static bool checked_for_fw;
 
 static const struct dmi_system_id * const embedded_fw_table[] = {
 #ifdef CONFIG_TOUCHSCREEN_DMI
@@ -127,14 +116,14 @@ void __init efi_check_for_embedded_firmwares(void)
 		}
 	}
 
-	efi_embedded_fw_checked = true;
+	checked_for_fw = true;
 }
 
 int efi_get_embedded_fw(const char *name, const u8 **data, size_t *size)
 {
 	struct efi_embedded_fw *iter, *fw = NULL;
 
-	if (!efi_embedded_fw_checked) {
+	if (!checked_for_fw) {
 		pr_warn("Warning %s called while we did not check for embedded fw\n",
 			__func__);
 		return -ENOENT;
diff --git a/drivers/firmware/efi/embedded-firmware.h b/drivers/firmware/efi/embedded-firmware.h
deleted file mode 100644
index bb894eae0906..000000000000
--- a/drivers/firmware/efi/embedded-firmware.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _EFI_EMBEDDED_FW_INTERNAL_H_
-#define _EFI_EMBEDDED_FW_INTERNAL_H_
-
-/*
- * This struct and efi_embedded_fw_list are private to the efi-embedded fw
- * implementation they only in separate header for use by lib/test_firmware.c.
- */
-struct efi_embedded_fw {
-	struct list_head list;
-	const char *name;
-	const u8 *data;
-	size_t length;
-};
-
-#ifdef CONFIG_TEST_FIRMWARE
-extern struct list_head efi_embedded_fw_list;
-extern bool efi_embedded_fw_checked;
-#endif
-
-#endif /* _EFI_EMBEDDED_FW_INTERNAL_H_ */
diff --git a/include/linux/efi_embedded_fw.h b/include/linux/efi_embedded_fw.h
index 4ad5db9f5312..57eac5241303 100644
--- a/include/linux/efi_embedded_fw.h
+++ b/include/linux/efi_embedded_fw.h
@@ -7,6 +7,19 @@
 
 #define EFI_EMBEDDED_FW_PREFIX_LEN		8
 
+/*
+ * This struct and efi_embedded_fw_list are private to the efi-embedded fw
+ * implementation they are in this header for use by lib/test_firmware.c only!
+ */
+struct efi_embedded_fw {
+	struct list_head list;
+	const char *name;
+	const u8 *data;
+	size_t length;
+};
+
+extern struct list_head efi_embedded_fw_list;
+
 /**
  * struct efi_embedded_fw_desc - This struct is used by the EFI embedded-fw
  *                               code to search for embedded firmwares.
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 62af792e151c..9fee2b93a8d1 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -489,7 +489,6 @@ out:
 static DEVICE_ATTR_WO(trigger_request);
 
 #ifdef CONFIG_EFI_EMBEDDED_FIRMWARE
-#include "../drivers/firmware/efi/embedded-firmware.h"
 static ssize_t trigger_request_platform_store(struct device *dev,
 					      struct device_attribute *attr,
 					      const char *buf, size_t count)
@@ -502,7 +501,6 @@ static ssize_t trigger_request_platform_store(struct device *dev,
 	};
 	struct efi_embedded_fw efi_embedded_fw;
 	const struct firmware *firmware = NULL;
-	bool saved_efi_embedded_fw_checked;
 	char *name;
 	int rc;
 
@@ -515,8 +513,6 @@ static ssize_t trigger_request_platform_store(struct device *dev,
 	efi_embedded_fw.data = (void *)test_data;
 	efi_embedded_fw.length = sizeof(test_data);
 	list_add(&efi_embedded_fw.list, &efi_embedded_fw_list);
-	saved_efi_embedded_fw_checked = efi_embedded_fw_checked;
-	efi_embedded_fw_checked = true;
 
 	pr_info("loading '%s'\n", name);
 	rc = firmware_request_platform(&firmware, name, dev);
@@ -534,7 +530,6 @@ static ssize_t trigger_request_platform_store(struct device *dev,
 	rc = count;
 
 out:
-	efi_embedded_fw_checked = saved_efi_embedded_fw_checked;
 	release_firmware(firmware);
 	list_del(&efi_embedded_fw.list);
 	kfree(name);