Skip to contentSkip to conversation

efi: add bootsource detection

PATCH Applied Enrico Jorns 2 participants 2 messages Feb 20, 2018 – Feb 22, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi: add bootsource detection

We check the supported protocol of the parent EFI device of 'efi_loaded_image' to see if we are booted from USB or not (HD)

---
 drivers/efi/efi-device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
drivers/efi/efi-device.c +48 -0
index 9975aea6f7..3a27323a00 100644
@@ -17,6 +17,7 @@
  *
  */
 
+#include <bootsource.h>
 #include <command.h>
 #include <common.h>
 #include <driver.h>
@@ -385,6 +386,51 @@ static int efi_is_setup_mode(void)
 	return ret != 1;
 }
 
+static int is_bio_usbdev(struct efi_device *efidev)
+{
+	int i;
+
+	for (i = 0; i < efidev->num_guids; i++) {
+		if (!efi_guidcmp(efidev->guids[i], EFI_USB_IO_PROTOCOL_GUID))
+			return 1;
+	}
+
+	return 0;
+}
+
+static void efi_set_bootsource(void)
+{
+	enum bootsource src = BOOTSOURCE_UNKNOWN;
+	int instance = BOOTSOURCE_INSTANCE_UNKNOWN;
+
+	efi_handle_t *efi_parent;
+	struct efi_device *bootdev;
+
+	if (!efi_loaded_image->parent_handle)
+		goto out;
+
+	efi_parent = efi_find_parent(efi_loaded_image->device_handle);
+
+	if (!efi_parent)
+		goto out;
+
+	bootdev = efi_find_device(efi_parent);
+
+	if (!bootdev)
+		goto out;
+
+	if (is_bio_usbdev(bootdev)) {
+		src = BOOTSOURCE_USB;
+	} else {
+		src = BOOTSOURCE_HD;
+	}
+
+out:
+
+	bootsource_set(src);
+	bootsource_set_instance(instance);
+}
+
 static int efi_init_devices(void)
 {
 	char *fw_vendor = NULL;
@@ -415,6 +461,8 @@ static int efi_init_devices(void)
 
 	efi_register_devices();
 
+	efi_set_bootsource();
+
 	return 0;
 }
 core_initcall(efi_init_devices);
Signature · 7 lines
2.16.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw
Quoted 7 lines · Enrico Jorns

We check the supported protocol of the parent EFI device of 'efi_loaded_image' to see if we are booted from USB or not (HD)

---
 drivers/efi/efi-device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

Applied, thanks

Sascha

Quoted 83 lines
drivers/efi/efi-device.c +48 -0
index 9975aea6f7..3a27323a00 100644
@@ -17,6 +17,7 @@
  *
  */
 
+#include <bootsource.h>
 #include <command.h>
 #include <common.h>
 #include <driver.h>
@@ -385,6 +386,51 @@ static int efi_is_setup_mode(void)
 	return ret != 1;
 }
 
+static int is_bio_usbdev(struct efi_device *efidev)
+{
+	int i;
+
+	for (i = 0; i < efidev->num_guids; i++) {
+		if (!efi_guidcmp(efidev->guids[i], EFI_USB_IO_PROTOCOL_GUID))
+			return 1;
+	}
+
+	return 0;
+}
+
+static void efi_set_bootsource(void)
+{
+	enum bootsource src = BOOTSOURCE_UNKNOWN;
+	int instance = BOOTSOURCE_INSTANCE_UNKNOWN;
+
+	efi_handle_t *efi_parent;
+	struct efi_device *bootdev;
+
+	if (!efi_loaded_image->parent_handle)
+		goto out;
+
+	efi_parent = efi_find_parent(efi_loaded_image->device_handle);
+
+	if (!efi_parent)
+		goto out;
+
+	bootdev = efi_find_device(efi_parent);
+
+	if (!bootdev)
+		goto out;
+
+	if (is_bio_usbdev(bootdev)) {
+		src = BOOTSOURCE_USB;
+	} else {
+		src = BOOTSOURCE_HD;
+	}
+
+out:
+
+	bootsource_set(src);
+	bootsource_set_instance(instance);
+}
+
 static int efi_init_devices(void)
 {
 	char *fw_vendor = NULL;
@@ -415,6 +461,8 @@ static int efi_init_devices(void)
 
 	efi_register_devices();
 
+	efi_set_bootsource();
+
 	return 0;
 }
 core_initcall(efi_init_devices);
Signature · 7 lines
2.16.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox