Split coreboot_table.h: move struct coreboot_table_header into coreboot_table.h and the rest of the header to include/linux/coreboot.h.
Prepares coreboot for allowing drivers in other subsystems. Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/firmware/google/cbmem.c | 3 +-- drivers/firmware/google/coreboot_table.c | 11 +++++++- .../firmware/google/framebuffer-coreboot.c | 3 +-- drivers/firmware/google/memconsole-coreboot.c | 2 +- drivers/firmware/google/vpd.c | 2 +- .../linux/coreboot.h | 27 +++++++------------ 6 files changed, 23 insertions(+), 25 deletions(-) rename drivers/firmware/google/coreboot_table.h => include/linux/coreboot.h (88%) diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbmem.c index 3397bacdfdbe..b3e477d9ad4e 100644 --- a/drivers/firmware/google/cbmem.c +++ b/drivers/firmware/google/cbmem.c @@ -7,6 +7,7 @@ * Copyright 2022 Google LLC */ +#include <linux/coreboot.h> #include <linux/device.h> #include <linux/init.h> #include <linux/io.h> @@ -18,8 +19,6 @@ #include <linux/slab.h> #include <linux/sysfs.h> -#include "coreboot_table.h" - struct cbmem_entry { char *mem_file_buf; u32 size; diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/google/coreboot_table.c index ae20c0527032..3b07e1d60255 100644 --- a/drivers/firmware/google/coreboot_table.c +++ b/drivers/firmware/google/coreboot_table.c @@ -9,6 +9,7 @@ */ #include <linux/acpi.h> +#include <linux/coreboot.h> #include <linux/device.h> #include <linux/err.h> #include <linux/init.h> @@ -21,7 +22,15 @@ #include <linux/slab.h> #include <linux/sysfb.h> -#include "coreboot_table.h" +/* Coreboot table header structure */ +struct coreboot_table_header { + char signature[4]; + u32 header_bytes; + u32 header_checksum; + u32 table_bytes; + u32 table_checksum; + u32 table_entries; +}; #define CB_DEV(d) container_of(d, struct coreboot_device, dev) #define CB_DRV(d) container_of_const(d, struct coreboot_driver, drv) diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/google/framebuffer-coreboot.c index 7ac9dc4f5392..88815e0abb3f 100644 --- a/drivers/firmware/google/framebuffer-coreboot.c +++ b/drivers/firmware/google/framebuffer-coreboot.c @@ -9,6 +9,7 @@ * Copyright 2017 Samuel Holland <[email protected]> */ +#include <linux/coreboot.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/mm.h> @@ -17,8 +18,6 @@ #include <linux/platform_data/simplefb.h> #include <linux/platform_device.h> -#include "coreboot_table.h" - static const struct simplefb_format formats[] = SIMPLEFB_FORMATS; static int framebuffer_probe(struct coreboot_device *dev) diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/google/memconsole-coreboot.c index 4aa9b1cad3c3..bc7e4bfb2d08 100644 --- a/drivers/firmware/google/memconsole-coreboot.c +++ b/drivers/firmware/google/memconsole-coreboot.c @@ -7,6 +7,7 @@ * Copyright 2017 Google Inc. */ +#include <linux/coreboot.h> #include <linux/device.h> #include <linux/io.h> #include <linux/kernel.h> @@ -14,7 +15,6 @@ #include <linux/module.h> #include "memconsole.h" -#include "coreboot_table.h" #define CB_TAG_CBMEM_CONSOLE 0x17 diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c index 8d7f123f96f4..f75008b956d5 100644 --- a/drivers/firmware/google/vpd.c +++ b/drivers/firmware/google/vpd.c @@ -7,6 +7,7 @@ * Copyright 2017 Google Inc. */ +#include <linux/coreboot.h> #include <linux/ctype.h> #include <linux/init.h> #include <linux/io.h> @@ -20,7 +21,6 @@ #include <linux/slab.h> #include <linux/sysfs.h> -#include "coreboot_table.h" #include "vpd_decode.h" #define CB_TAG_VPD 0x2c diff --git a/drivers/firmware/google/coreboot_table.h b/include/linux/coreboot.h similarity index 88% rename from drivers/firmware/google/coreboot_table.h rename to include/linux/coreboot.h index 4c71830c98ca..26ea5eecac52 100644 --- a/drivers/firmware/google/coreboot_table.h +++ b/include/linux/coreboot.h @@ -1,32 +1,26 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * coreboot_table.h + * coreboot.h * - * Internal header for coreboot table access. + * Coreboot device and driver interfaces. * * Copyright 2014 Gerd Hoffmann <[email protected]> * Copyright 2017 Google Inc. * Copyright 2017 Samuel Holland <[email protected]> */ -#ifndef __COREBOOT_TABLE_H -#define __COREBOOT_TABLE_H +#ifndef _LINUX_COREBOOT_H +#define _LINUX_COREBOOT_H #include <linux/device.h> struct coreboot_device_id; -/* Coreboot table header structure */ -struct coreboot_table_header { - char signature[4]; - u32 header_bytes; - u32 header_checksum; - u32 table_bytes; - u32 table_checksum; - u32 table_entries; -}; - /* List of coreboot entry structures that is used */ + +#define CB_TAG_FRAMEBUFFER 0x12 +#define LB_TAG_CBMEM_ENTRY 0x31 + /* Generic */ struct coreboot_table_entry { u32 tag; @@ -41,9 +35,6 @@ struct lb_cbmem_ref { u64 cbmem_addr; }; -#define CB_TAG_FRAMEBUFFER 0x12 -#define LB_TAG_CBMEM_ENTRY 0x31 - /* Corresponds to LB_TAG_CBMEM_ENTRY */ struct lb_cbmem_entry { u32 tag; @@ -118,4 +109,4 @@ void coreboot_driver_unregister(struct coreboot_driver *driver); module_driver(__coreboot_driver, coreboot_driver_register, \ coreboot_driver_unregister) -#endif /* __COREBOOT_TABLE_H */ +#endif /* _LINUX_COREBOOT_H */ -- 2.52.0
