]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi: hii: add HII config routing/access protocols
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Mon, 21 Jan 2019 03:13:00 +0000 (12:13 +0900)
committerAlexander Graf <agraf@suse.de>
Wed, 13 Feb 2019 08:40:06 +0000 (09:40 +0100)
This patch is a place holder for HII configuration routing protocol and
HII configuration access protocol.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
include/efi_api.h
include/efi_loader.h
lib/efi_loader/Makefile
lib/efi_loader/efi_boottime.c
lib/efi_loader/efi_hii_config.c [new file with mode: 0644]

index 03e95ec28ed4f60cf03ead0707ec5b78c36bbc9e..45ca05e8ac69e360de3c07909b03d5e2de69c67d 100644 (file)
@@ -39,6 +39,9 @@ typedef void *efi_hii_handle_t;
 typedef u16 *efi_string_t;
 typedef u16 efi_string_id_t;
 typedef u32 efi_hii_font_style_t;
+typedef u16 efi_question_id_t;
+typedef u16 efi_image_id_t;
+typedef u16 efi_form_id_t;
 
 #define EVT_TIMER                              0x80000000
 #define EVT_RUNTIME                            0x40000000
@@ -799,6 +802,101 @@ efi_hii_sibt_string_ucs2_block_next(struct efi_hii_sibt_string_ucs2_block *blk)
                (u16_strlen(blk->string_text) + 1) * 2;
 }
 
+/*
+ * HII forms package
+ * TODO: full scope of definitions
+ */
+struct efi_hii_time {
+       u8 hour;
+       u8 minute;
+       u8 second;
+};
+
+struct efi_hii_date {
+       u16 year;
+       u8 month;
+       u8 day;
+};
+
+struct efi_hii_ref {
+       efi_question_id_t question_id;
+       efi_form_id_t form_id;
+       efi_guid_t form_set_guid;
+       efi_string_id_t device_path;
+};
+
+union efi_ifr_type_value {
+       u8 u8;                          // EFI_IFR_TYPE_NUM_SIZE_8
+       u16 u16;                        // EFI_IFR_TYPE_NUM_SIZE_16
+       u32 u32;                        // EFI_IFR_TYPE_NUM_SIZE_32
+       u64 u64;                        // EFI_IFR_TYPE_NUM_SIZE_64
+       bool b;                         // EFI_IFR_TYPE_BOOLEAN
+       struct efi_hii_time time;       // EFI_IFR_TYPE_TIME
+       struct efi_hii_date date;       // EFI_IFR_TYPE_DATE
+       efi_string_id_t string; // EFI_IFR_TYPE_STRING, EFI_IFR_TYPE_ACTION
+       struct efi_hii_ref ref;         // EFI_IFR_TYPE_REF
+       // u8 buffer[];                 // EFI_IFR_TYPE_BUFFER
+};
+
+#define EFI_IFR_TYPE_NUM_SIZE_8                0x00
+#define EFI_IFR_TYPE_NUM_SIZE_16       0x01
+#define EFI_IFR_TYPE_NUM_SIZE_32       0x02
+#define EFI_IFR_TYPE_NUM_SIZE_64       0x03
+#define EFI_IFR_TYPE_BOOLEAN           0x04
+#define EFI_IFR_TYPE_TIME              0x05
+#define EFI_IFR_TYPE_DATE              0x06
+#define EFI_IFR_TYPE_STRING            0x07
+#define EFI_IFR_TYPE_OTHER             0x08
+#define EFI_IFR_TYPE_UNDEFINED         0x09
+#define EFI_IFR_TYPE_ACTION            0x0A
+#define EFI_IFR_TYPE_BUFFER            0x0B
+#define EFI_IFR_TYPE_REF               0x0C
+#define EFI_IFR_OPTION_DEFAULT         0x10
+#define EFI_IFR_OPTION_DEFAULT_MFG     0x20
+
+#define EFI_IFR_ONE_OF_OPTION_OP       0x09
+
+struct efi_ifr_op_header {
+       u8 opCode;
+       u8 length:7;
+       u8 scope:1;
+};
+
+struct efi_ifr_one_of_option {
+       struct efi_ifr_op_header header;
+       efi_string_id_t option;
+       u8 flags;
+       u8 type;
+       union efi_ifr_type_value value;
+};
+
+typedef efi_uintn_t efi_browser_action_t;
+
+#define EFI_BROWSER_ACTION_REQUEST_NONE                        0
+#define EFI_BROWSER_ACTION_REQUEST_RESET               1
+#define EFI_BROWSER_ACTION_REQUEST_SUBMIT              2
+#define EFI_BROWSER_ACTION_REQUEST_EXIT                        3
+#define EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT    4
+#define EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT   5
+#define EFI_BROWSER_ACTION_REQUEST_FORM_APPLY          6
+#define EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD                7
+#define EFI_BROWSER_ACTION_REQUEST_RECONNECT           8
+
+typedef efi_uintn_t efi_browser_action_request_t;
+
+#define EFI_BROWSER_ACTION_CHANGING                    0
+#define EFI_BROWSER_ACTION_CHANGED                     1
+#define EFI_BROWSER_ACTION_RETRIEVE                    2
+#define EFI_BROWSER_ACTION_FORM_OPEN                   3
+#define EFI_BROWSER_ACTION_FORM_CLOSE                  4
+#define EFI_BROWSER_ACTION_SUBMITTED                   5
+#define EFI_BROWSER_ACTION_DEFAULT_STANDARD            0x1000
+#define EFI_BROWSER_ACTION_DEFAULT_MANUFACTURING       0x1001
+#define EFI_BROWSER_ACTION_DEFAULT_SAFE                        0x1002
+#define EFI_BROWSER_ACTION_DEFAULT_PLATFORM            0x2000
+#define EFI_BROWSER_ACTION_DEFAULT_HARDWARE            0x3000
+#define EFI_BROWSER_ACTION_DEFAULT_FIRMWARE            0x4000
+
 /*
  * HII keyboard package
  */
@@ -958,6 +1056,69 @@ struct efi_hii_database_protocol {
                efi_handle_t *driver_handle);
 };
 
+#define EFI_HII_CONFIG_ROUTING_PROTOCOL_GUID \
+       EFI_GUID(0x587e72d7, 0xcc50, 0x4f79, \
+                0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f)
+
+struct efi_hii_config_routing_protocol {
+       efi_status_t(EFIAPI *extract_config)(
+               const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t request,
+               efi_string_t *progress,
+               efi_string_t *results);
+       efi_status_t(EFIAPI *export_config)(
+               const struct efi_hii_config_routing_protocol *this,
+               efi_string_t *results);
+       efi_status_t(EFIAPI *route_config)(
+               const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t configuration,
+               efi_string_t *progress);
+       efi_status_t(EFIAPI *block_to_config)(
+               const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t config_request,
+               const uint8_t *block,
+               const efi_uintn_t block_size,
+               efi_string_t *config,
+               efi_string_t *progress);
+       efi_status_t(EFIAPI *config_to_block)(
+               const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t config_resp,
+               const uint8_t *block,
+               const efi_uintn_t *block_size,
+               efi_string_t *progress);
+       efi_status_t(EFIAPI *get_alt_config)(
+               const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t config_resp,
+               const efi_guid_t *guid,
+               const efi_string_t name,
+               const struct efi_device_path *device_path,
+               const efi_string_t alt_cfg_id,
+               efi_string_t *alt_cfg_resp);
+};
+
+#define EFI_HII_CONFIG_ACCESS_PROTOCOL_GUID \
+       EFI_GUID(0x330d4706, 0xf2a0, 0x4e4f, \
+                0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85)
+
+struct efi_hii_config_access_protocol {
+       efi_status_t(EFIAPI *extract_config_access)(
+               const struct efi_hii_config_access_protocol *this,
+               const efi_string_t request,
+               efi_string_t *progress,
+               efi_string_t *results);
+       efi_status_t(EFIAPI *route_config_access)(
+               const struct efi_hii_config_access_protocol *this,
+               const efi_string_t configuration,
+               efi_string_t *progress);
+       efi_status_t(EFIAPI *form_callback)(
+               const struct efi_hii_config_access_protocol *this,
+               efi_browser_action_t action,
+               efi_question_id_t question_id,
+               u8 type,
+               union efi_ifr_type_value *value,
+               efi_browser_action_request_t *action_request);
+};
+
 #define EFI_GOP_GUID \
        EFI_GUID(0x9042a9de, 0x23dc, 0x4a38, \
                 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a)
index 206f724bd9c20f09a17687fe8dc0b9aaa23378f2..9dd933dae7440df4381fc1734d8d640189f8c513 100644 (file)
@@ -106,6 +106,8 @@ extern const struct efi_device_path_utilities_protocol
 /* Implementation of the EFI_UNICODE_COLLATION_PROTOCOL */
 extern const struct efi_unicode_collation_protocol
                                        efi_unicode_collation_protocol;
+extern const struct efi_hii_config_routing_protocol efi_hii_config_routing;
+extern const struct efi_hii_config_access_protocol efi_hii_config_access;
 extern const struct efi_hii_database_protocol efi_hii_database;
 extern const struct efi_hii_string_protocol efi_hii_string;
 
@@ -141,6 +143,8 @@ extern const efi_guid_t efi_file_system_info_guid;
 extern const efi_guid_t efi_guid_device_path_utilities_protocol;
 /* GUID of the Unicode collation protocol */
 extern const efi_guid_t efi_guid_unicode_collation_protocol;
+extern const efi_guid_t efi_guid_hii_config_routing_protocol;
+extern const efi_guid_t efi_guid_hii_config_access_protocol;
 extern const efi_guid_t efi_guid_hii_database_protocol;
 extern const efi_guid_t efi_guid_hii_string_protocol;
 
index 00128d417b9ee8b68fb82272a19c08d193129755..4e90a35896c66d5879b5ba10426c1cd2c25f3698 100644 (file)
@@ -24,7 +24,7 @@ obj-y += efi_device_path.o
 obj-y += efi_device_path_to_text.o
 obj-y += efi_device_path_utilities.o
 obj-y += efi_file.o
-obj-y += efi_hii.o
+obj-y += efi_hii.o efi_hii_config.o
 obj-y += efi_image_loader.o
 obj-y += efi_memory.o
 obj-y += efi_root_node.o
index 73af490377c0c0a57397d40049e8631cba5389a0..fc26d6adc1120ac4072f771cc1cf04307818e6a2 100644 (file)
@@ -1570,6 +1570,12 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,
        if (ret != EFI_SUCCESS)
                goto failure;
 
+       ret = efi_add_protocol(&obj->header,
+                              &efi_guid_hii_config_routing_protocol,
+                              (void *)&efi_hii_config_routing);
+       if (ret != EFI_SUCCESS)
+               goto failure;
+
        return ret;
 failure:
        printf("ERROR: Failure to install protocols for loaded image\n");
diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c
new file mode 100644 (file)
index 0000000..f4b1f02
--- /dev/null
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier:     GPL-2.0+
+/*
+ *  EFI Human Interface Infrastructure ... Configuration
+ *
+ *  Copyright (c) 2017 Leif Lindholm
+ *  Copyright (c) 2018 AKASHI Takahiro, Linaro Limited
+ */
+
+#include <common.h>
+#include <efi_loader.h>
+
+const efi_guid_t efi_guid_hii_config_routing_protocol
+               = EFI_HII_CONFIG_ROUTING_PROTOCOL_GUID;
+const efi_guid_t efi_guid_hii_config_access_protocol
+               = EFI_HII_CONFIG_ACCESS_PROTOCOL_GUID;
+
+/*
+ * EFI_HII_CONFIG_ROUTING_PROTOCOL
+ */
+
+static efi_status_t EFIAPI
+extract_config(const struct efi_hii_config_routing_protocol *this,
+              const efi_string_t request,
+              efi_string_t *progress,
+              efi_string_t *results)
+{
+       EFI_ENTRY("%p, \"%ls\", %p, %p", this, request, progress, results);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+}
+
+static efi_status_t EFIAPI
+export_config(const struct efi_hii_config_routing_protocol *this,
+             efi_string_t *results)
+{
+       EFI_ENTRY("%p, %p", this, results);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+}
+
+static efi_status_t EFIAPI
+route_config(const struct efi_hii_config_routing_protocol *this,
+            const efi_string_t configuration,
+            efi_string_t *progress)
+{
+       EFI_ENTRY("%p, \"%ls\", %p", this, configuration, progress);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+}
+
+static efi_status_t EFIAPI
+block_to_config(const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t config_request,
+               const u8 *block,
+               const efi_uintn_t block_size,
+               efi_string_t *config,
+               efi_string_t *progress)
+{
+       EFI_ENTRY("%p, \"%ls\", %p, %zu, %p, %p", this, config_request,
+                 block, block_size, config, progress);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+}
+
+static efi_status_t EFIAPI
+config_to_block(const struct efi_hii_config_routing_protocol *this,
+               const efi_string_t config_resp,
+               const u8 *block,
+               const efi_uintn_t *block_size,
+               efi_string_t *progress)
+{
+       EFI_ENTRY("%p, \"%ls\", %p, %p, %p", this, config_resp,
+                 block, block_size, progress);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+}
+
+static efi_status_t EFIAPI
+get_alt_config(const struct efi_hii_config_routing_protocol *this,
+              const efi_string_t config_resp,
+              const efi_guid_t *guid,
+              const efi_string_t name,
+              const struct efi_device_path *device_path,
+              const efi_string_t alt_cfg_id,
+              efi_string_t *alt_cfg_resp)
+{
+       EFI_ENTRY("%p, \"%ls\", %pUl, \"%ls\", %p, \"%ls\", %p",
+                 this, config_resp, guid, name, device_path,
+                 alt_cfg_id, alt_cfg_resp);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+}
+
+/*
+ * EFI_HII_ACCESS_PROTOCOL
+ */
+
+efi_status_t EFIAPI
+extract_config_access(const struct efi_hii_config_access_protocol *this,
+                     const efi_string_t request,
+                     efi_string_t *progress,
+                     efi_string_t *results)
+{
+       EFI_ENTRY("%p, \"%ls\", %p, %p", this, request, progress, results);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+};
+
+efi_status_t EFIAPI
+route_config_access(const struct efi_hii_config_access_protocol *this,
+                   const efi_string_t configuration,
+                   efi_string_t *progress)
+{
+       EFI_ENTRY("%p, \"%ls\", %p", this, configuration, progress);
+
+       return EFI_EXIT(EFI_OUT_OF_RESOURCES);
+};
+
+efi_status_t EFIAPI
+form_callback(const struct efi_hii_config_access_protocol *this,
+             efi_browser_action_t action,
+             efi_question_id_t question_id,
+             u8 type,
+             union efi_ifr_type_value *value,
+             efi_browser_action_request_t *action_request)
+{
+       EFI_ENTRY("%p, 0x%lx, 0x%x, 0x%x, %p, %p", this, action,
+                 question_id, type, value, action_request);
+
+       return EFI_EXIT(EFI_DEVICE_ERROR);
+};
+
+const struct efi_hii_config_routing_protocol efi_hii_config_routing = {
+       .extract_config = extract_config,
+       .export_config = export_config,
+       .route_config = route_config,
+       .block_to_config = block_to_config,
+       .config_to_block = config_to_block,
+       .get_alt_config = get_alt_config
+};
+
+const struct efi_hii_config_access_protocol efi_hii_config_access = {
+       .extract_config_access = extract_config_access,
+       .route_config_access = route_config_access,
+       .form_callback = form_callback
+};