x86: Update Chromium OS GNVS names

The Global Non-Volatile Storage struct has some fields with particular
meanings. Rename these to make things easier to follow. Also add a few
more boot flags.

GNVS should not be confused with GNVQ (Going Nowhere Very Quickly).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/include/asm/intel_gnvs.h b/arch/x86/include/asm/intel_gnvs.h
index 7f9f101..69a2081 100644 (file)
--- a/arch/x86/include/asm/intel_gnvs.h
+++ b/arch/x86/include/asm/intel_gnvs.h
@@ -9,6 +9,7 @@
 #ifndef _INTEL_GNVS_H_
 #define _INTEL_GNVS_H_
 
+#include <linux/bitops.h>
 /*
  * The chromeos_acpi portion of ACPI GNVS is assumed to live from offset
  * 0x100 - 0x1000.  When defining acpi_global_nvs, use check_member
@@ -19,6 +20,11 @@
 #define GNVS_CHROMEOS_ACPI_OFFSET 0x100
 
 enum {
+       BOOT_REASON_OTHER = 0,
+       BOOT_REASON_S3DIAG = 9
+};
+
+enum {
        CHSW_RECOVERY_X86 =             BIT(1),
        CHSW_RECOVERY_EC =              BIT(2),
        CHSW_DEVELOPER_SWITCH =         BIT(5),
@@ -26,6 +32,22 @@ enum {
 };
 
 enum {
+       RECOVERY_REASON_NONE = 0,
+       RECOVERY_REASON_ME = 1
+};
+
+enum {
+       ACTIVE_ECFW_RO = 0,
+       ACTIVE_ECFW_RW = 1
+};
+
+enum {
+       BINF_RECOVERY = 0,
+       BINF_RW_A = 1,
+       BINF_RW_B = 2
+};
+
+enum {
        FIRMWARE_TYPE_AUTO_DETECT = -1,
        FIRMWARE_TYPE_RECOVERY = 0,
        FIRMWARE_TYPE_NORMAL = 1,
@@ -40,14 +62,14 @@ struct __packed chromeos_acpi_gnvs {
        u32     active_main_fw; /* 04 (0=recovery, 1=A, 2=B) */
        u32     activeec_fw;    /* 08 (0=RO, 1=RW) */
        u16     switches;       /* 0c CHSW */
-       u8      vbt4[256];      /* 0e HWID */
-       u8      vbt5[64];       /* 10e FWID */
-       u8      vbt6[64];       /* 14e FRID - 275 */
+       u8      hwid[256];      /* 0e HWID */
+       u8      fwid[64];       /* 10e FWID */
+       u8      frid[64];       /* 14e FRID - 275 */
        u32     main_fw_type;   /* 18e (2 = developer mode) */
-       u32     vbt8;           /* 192 recovery reason */
-       u32     vbt9;           /* 196 fmap base address */
+       u32     recovery_reason; /* 192 recovery reason */
+       u32     fmap_base;      /* 196 fmap base address */
        u8      vdat[3072];     /* 19a VDAT space filled by verified boot */
-       u32     vbt10;          /* d9a smbios bios version */
+       u32     fwid_ptr;       /* d9a smbios bios version */
        u32     mehh[8];        /* d9e management engine hash */
        u32     ramoops_base;   /* dbe ramoops base address */
        u32     ramoops_len;    /* dc2 ramoops length */