Fill-in more details of boot stub

common/cmd_cros_bootstub.c

 /*
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Alternatively, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") version 2 as published by the Free
  * Software Foundation.
  */
 
@@ skipping 17 matching lines @@
                                 #action, return_code); \
 } while (0)
 #else
 #define WARN_ON_FAILURE(action) action
 #endif
 
 #define FIRMWARE_RECOVERY       0
 #define FIRMWARE_A              1
 #define FIRMWARE_B              2
 
+int load_firmware(int primary_firmware, int boot_flags,
+                void *kernel_sign_key_blob, uint64_t kernel_sign_key_size,
+                int *firmware_index_ptr)
+{
+        return LOAD_FIRMWARE_RECOVERY;
+}
+
+void jump_to_firmware(void (*rwfw_entry_point)(void))
+{
+        debug(PREFIX "jump to firmware %p\n", rwfw_entry_point);
+}
+
 int do_cros_bootstub(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-        int firmware_index, primary_firmware;
-
-        /* Boot Stub ******************************************************** */
+        int status = !LOAD_FIRMWARE_SUCCESS;

[sjg, 2011/03/01 05:13:41]

Ick - this is odd. Perhaps just 0 for ok, -1 for error?

[Che-Liang Chiou, 2011/03/01 08:45:22]

Change it to LOAD_FIRMWARE_RECOVERY (since we should jump to recovery firmware
when no valid firmware.)

+        int firmware_index, primary_firmware, boot_flags = 0;
+        uint8_t *kernel_sign_key_blob = (uint8_t *) CONFIG_KERNEL_SIGN_KEY_BLOB;
+        uint64_t kernel_sign_key_size = CONFIG_KERNEL_SIGN_KEY_SIZE;
 
         /* TODO Start initializing chipset */
 
         if (is_firmware_write_protect_gpio_asserted())
                 WARN_ON_FAILURE(lock_down_eeprom());
 
         WARN_ON_FAILURE(initialize_tpm());
 
         if (is_s3_resume() && !is_debug_reset_mode_field_containing_cookie()) {
                 WARN_ON_FAILURE(lock_tpm());
                 /* TODO Jump to S3 resume pointer and should never return */
                 return 0;
         }
 
         if (is_recovery_mode_gpio_asserted() ||
             is_recovery_mode_field_containing_cookie()) {
                 firmware_index = FIRMWARE_RECOVERY;
         } else {
                 if (is_try_firmware_b_field_containing_cookie())
                         primary_firmware = FIRMWARE_B;
                 else
                         primary_firmware = FIRMWARE_A;
 
-                /* TODO call LoadFirmware */
+                if (is_developer_mode_gpio_asserted())
+                        boot_flags |= BOOT_FLAG_DEVELOPER;
+
+                status = load_firmware(primary_firmware, boot_flags,
+                                kernel_sign_key_blob, kernel_sign_key_size,
+                                &firmware_index);
         }
 
-        debug(PREFIX "load firmware of index %d\n", firmware_index);
-
         WARN_ON_FAILURE(lock_tpm_rewritable_firmware_index());
 
-        if (firmware_index == FIRMWARE_A) {
-                /* TODO Jump to firmware A and should never return */
+        if (status == LOAD_FIRMWARE_SUCCESS) {
+                debug(PREFIX "jump to rewritable firmware %d "
+                                "and never return\n", firmware_index);
+                jump_to_firmware((void (*)(void)) (firmware_index == 0 ?
+                                        CONFIG_FIRMWARE_BODY_BUFFER_0 :

[Che-Liang Chiou, 2011/03/01 08:45:22]

Remove statically allocated buffers. Changes due to earlier code review
comments.

+                                        CONFIG_FIRMWARE_BODY_BUFFER_1));
+        } else {
+                /* TODO Jump to recovery firmware and never return */
         }
 
-        if (firmware_index == FIRMWARE_B) {
-                /* TODO Jump to firmware B and should never return */
-        }
-
-        /* assert(firmware_index == FIRMWARE_RECOVERY); */
-
-        /* Recovery Firmware ************************************************ */
-
-        return 0;
+        debug(PREFIX "error: should never reach here!\n");
+        return 1;

[sjg, 2011/03/01 05:13:41]

Should this hang, jump to recovery mode, something else?

[Che-Liang Chiou, 2011/03/01 08:45:22]

We should jump to recovery firmware when rewritable firmware accidentally
returns.

But if recovery firmware accidentally returns, there is nothing we can do. Do
you think it should hang or reset cpu?

 }
 
 U_BOOT_CMD(cros_bootstub, 1, 1, do_cros_bootstub, NULL, NULL);