diff mbox series

[03/32] x86: Add a layout for Chrome OS verified boot

Message ID 20200927222538.3.I7705f4557d04102288614f5c447395fdadebc36f@changeid
State New
Delegated to: Bin Meng
Headers show
Series x86: Allow Coral to boot into Chrome OS | expand

Commit Message

Simon Glass Sept. 28, 2020, 4:25 a.m. UTC
Add definitions for part of the vboot context used with verified boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h

Comments

Simon Glass Oct. 14, 2020, 1:07 p.m. UTC | #1
Hi Bin,

On Sun, 27 Sep 2020 at 22:26, Simon Glass <sjg@chromium.org> wrote:
>
> Add definitions for part of the vboot context used with verified boot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
>  create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h

Any thoughts on this series?

Regards,
SImon
Bin Meng Oct. 15, 2020, 9:13 a.m. UTC | #2
Hi Simon,

On Wed, Oct 14, 2020 at 9:07 PM Simon Glass <sjg@chromium.org> wrote:
>
> Hi Bin,
>
> On Sun, 27 Sep 2020 at 22:26, Simon Glass <sjg@chromium.org> wrote:
> >
> > Add definitions for part of the vboot context used with verified boot.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >  arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++
> >  1 file changed, 38 insertions(+)
> >  create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
>
> Any thoughts on this series?

I will take a look at this soon.

Regards,
Bin
Bin Meng Oct. 16, 2020, 9:55 a.m. UTC | #3
Hi Simon,

On Mon, Sep 28, 2020 at 12:26 PM Simon Glass <sjg@chromium.org> wrote:
>
> Add definitions for part of the vboot context used with verified boot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  arch/x86/include/asm/acpi/vbnv_layout.h | 38 +++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
>  create mode 100644 arch/x86/include/asm/acpi/vbnv_layout.h
>
> diff --git a/arch/x86/include/asm/acpi/vbnv_layout.h b/arch/x86/include/asm/acpi/vbnv_layout.h
> new file mode 100644
> index 00000000000..8bc4e9534ef
> --- /dev/null
> +++ b/arch/x86/include/asm/acpi/vbnv_layout.h
> @@ -0,0 +1,38 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright 2020 Google LLC
> + */
> +
> +#ifndef __ASM_ACPI_VBNV_LAYOUT_H__
> +#define __ASM_ACPI_VBNV_LAYOUT_H__
> +
> +#define VBOOT_VBNV_BLOCK_SIZE 16       /* Size of NV storage block in bytes */
> +
> +/* Constants for NV storage, for use with ACPI */
> +#define HEADER_OFFSET                  0
> +#define HEADER_MASK                    0xc0
> +#define HEADER_SIGNATURE               0x40
> +#define HEADER_FIRMWARE_SETTINGS_RESET  0x20
> +#define HEADER_KERNEL_SETTINGS_RESET    0x10

It seems above two lines are using spaces not tabs before 0x

> +
> +#define BOOT_OFFSET                    1
> +#define BOOT_DEBUG_RESET_MODE          0x80
> +#define BOOT_DISABLE_DEV_REQUEST       0x40
> +#define BOOT_DISPLAY_REQUEST           0x20
> +#define BOOT_TRY_B_COUNT_MASK          0x0f
> +
> +#define RECOVERY_OFFSET                        2
> +#define LOCALIZATION_OFFSET            3
> +
> +#define DEV_FLAGS_OFFSET               4
> +#define DEV_BOOT_USB_MASK              0x01
> +#define DEV_BOOT_SIGNED_ONLY_MASK      0x02
> +#define DEV_ENABLE_UDC                 0x40
> +
> +#define MISC_FLAGS_OFFSET              8
> +#define MISC_FLAGS_BATTERY_CUTOFF_MASK 0x08
> +
> +#define KERNEL_FIELD_OFFSET            11
> +#define CRC_OFFSET                     15
> +
> +#endif /* __ASM_ACPI_VBNV_LAYOUT_H__ */
> --

Regards,
Bin
diff mbox series

Patch

diff --git a/arch/x86/include/asm/acpi/vbnv_layout.h b/arch/x86/include/asm/acpi/vbnv_layout.h
new file mode 100644
index 00000000000..8bc4e9534ef
--- /dev/null
+++ b/arch/x86/include/asm/acpi/vbnv_layout.h
@@ -0,0 +1,38 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2020 Google LLC
+ */
+
+#ifndef __ASM_ACPI_VBNV_LAYOUT_H__
+#define __ASM_ACPI_VBNV_LAYOUT_H__
+
+#define VBOOT_VBNV_BLOCK_SIZE 16	/* Size of NV storage block in bytes */
+
+/* Constants for NV storage, for use with ACPI */
+#define HEADER_OFFSET			0
+#define HEADER_MASK			0xc0
+#define HEADER_SIGNATURE		0x40
+#define HEADER_FIRMWARE_SETTINGS_RESET  0x20
+#define HEADER_KERNEL_SETTINGS_RESET    0x10
+
+#define BOOT_OFFSET			1
+#define BOOT_DEBUG_RESET_MODE		0x80
+#define BOOT_DISABLE_DEV_REQUEST	0x40
+#define BOOT_DISPLAY_REQUEST		0x20
+#define BOOT_TRY_B_COUNT_MASK		0x0f
+
+#define RECOVERY_OFFSET			2
+#define LOCALIZATION_OFFSET		3
+
+#define DEV_FLAGS_OFFSET		4
+#define DEV_BOOT_USB_MASK		0x01
+#define DEV_BOOT_SIGNED_ONLY_MASK	0x02
+#define DEV_ENABLE_UDC			0x40
+
+#define MISC_FLAGS_OFFSET		8
+#define MISC_FLAGS_BATTERY_CUTOFF_MASK	0x08
+
+#define KERNEL_FIELD_OFFSET		11
+#define CRC_OFFSET			15
+
+#endif /* __ASM_ACPI_VBNV_LAYOUT_H__ */