diff mbox series

[v2,03/30] x86: Add a layout for Chrome OS verified boot

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

Commit Message

Simon Glass Oct. 22, 2020, 3:02 a.m. UTC 
Add definitions for part of the vboot context used with verified boot.

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

Changes in v2:
- Convert tabs to spaces for consistency

 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

Bin Meng Nov. 3, 2020, 7:47 a.m. UTC | #1 
Hi Simon,

On Thu, Oct 22, 2020 at 11:03 AM 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>
> ---
>
> Changes in v2:
> - Convert tabs to spaces for consistency

I think in U-Boot tabs are preferred over spaces.

>
>  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
>

Otherwise,
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Regards,
Bin
Simon Glass Nov. 4, 2020, 4:20 p.m. UTC | #2 
Hi Bin,

On Tue, 3 Nov 2020 at 00:47, Bin Meng <bmeng.cn@gmail.com> wrote:
>
> Hi Simon,
>
> On Thu, Oct 22, 2020 at 11:03 AM 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>
> > ---
> >
> > Changes in v2:
> > - Convert tabs to spaces for consistency
>
> I think in U-Boot tabs are preferred over spaces.

I think that message is wrong so I updated it.


>
> >
> >  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
> >
>
> Otherwise,
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Regards,
Simon
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..89065524d37
--- /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__ */