x230: util: update ifdtool and commonlib

x230/util/commonlib/include/commonlib/cbfs.h

@@ -70,6 +70,12 @@ size_t cbfs_for_each_attr(void *metadata, size_t metadata_size,
  */
 int cbfsf_decompression_info(struct cbfsf *fh, uint32_t *algo, size_t *size);
 
+/*
+ * Return the CBFS file type as out-parameter.
+ * Returns 0 on success and < 0 on error.
+ */
+int cbfsf_file_type(struct cbfsf *fh, uint32_t *ftype);
+
 /*
  * Perform the vb2 hash over the CBFS region skipping empty file contents.
  * Caller is responsible for providing the hash algorithm as well as storage

x230/util/commonlib/include/commonlib/cbfs_serialized.h

@@ -67,7 +67,8 @@
 #define CBFS_TYPE_DELETED    0x00000000
 #define CBFS_TYPE_DELETED2   0xffffffff
 #define CBFS_TYPE_STAGE      0x10
-#define CBFS_TYPE_PAYLOAD    0x20
+#define CBFS_TYPE_SELF       0x20
+#define CBFS_TYPE_FIT        0x21
 #define CBFS_TYPE_OPTIONROM  0x30
 #define CBFS_TYPE_BOOTSPLASH 0x40
 #define CBFS_TYPE_RAW        0x50

x230/util/commonlib/include/commonlib/timestamp_serialized.h

@@ -76,6 +76,10 @@ enum timestamp_id {
 	TS_DONE_LOADING = 508,
 	TS_DONE_HASHING = 509,
 	TS_END_HASH_BODY = 510,
+	TS_START_TPMPCR = 511,
+	TS_END_TPMPCR = 512,
+	TS_START_TPMLOCK = 513,
+	TS_END_TPMLOCK = 514,
 	TS_START_COPYVPD = 550,
 	TS_END_COPYVPD_RO = 551,
 	TS_END_COPYVPD_RW = 552,
@@ -190,6 +194,10 @@ static const struct timestamp_id_to_name {
 	{ TS_DONE_LOADING,	"finished loading body (ignore for x86)" },
 	{ TS_DONE_HASHING,	"finished calculating body hash (SHA2)" },
 	{ TS_END_HASH_BODY,	"finished verifying body signature (RSA)" },
+	{ TS_START_TPMPCR,	"starting TPM PCR extend" },
+	{ TS_END_TPMPCR,	"finished TPM PCR extend" },
+	{ TS_START_TPMLOCK,	"starting locking TPM" },
+	{ TS_END_TPMLOCK,	"finished locking TPM" },
 
 	{ TS_START_COPYVPD,	"starting to load Chrome OS VPD" },
 	{ TS_END_COPYVPD_RO,	"finished loading Chrome OS VPD (RO)" },
@@ -224,6 +232,12 @@ static const struct timestamp_id_to_name {
 	{ TS_AGESA_INIT_LATE_DONE,	"back from AmdInitLate" },
 	{ TS_AGESA_INIT_RTB_START,	"calling AmdInitRtb/AmdS3Save" },
 	{ TS_AGESA_INIT_RTB_DONE,	"back from AmdInitRtb/AmdS3Save" },
+	{ TS_AGESA_INIT_RESUME_START,	"calling AmdInitResume" },
+	{ TS_AGESA_INIT_RESUME_DONE,	"back from AmdInitResume" },
+	{ TS_AGESA_S3_LATE_START,	"calling AmdS3LateRestore" },
+	{ TS_AGESA_S3_LATE_DONE,	"back from AmdS3LateRestore" },
+	{ TS_AGESA_S3_FINAL_START,	"calling AmdS3FinalRestore" },
+	{ TS_AGESA_S3_FINAL_DONE,	"back from AmdS3FinalRestore" },
 
 	/* Intel ME related timestamps */
 	{ TS_ME_INFORM_DRAM_WAIT,	"waiting for ME acknowledgement of raminit"},

x230/util/ifdtool/Makefile

@@ -29,9 +29,8 @@ $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
 
 clean:
-	rm -f $(PROGRAM) *.o *~
+	rm -f $(PROGRAM) *.o *~ .dependencies
 distclean: clean
-	rm -rf .dependencies
 
 dep:
 	@$(CC) $(CFLAGS) -MM *.c > .dependencies

x230/util/ifdtool/ifdtool.c

@@ -125,15 +125,36 @@ static fmsba_t *find_fmsba(char *image, int size)
 	return PTR_IN_RANGE(fmsba, image, size) ? fmsba : NULL;
 }
 
+/*
+ * Some newer platforms have re-defined the FCBA field that was used to
+ * distinguish IFD v1 v/s v2. Define a list of platforms that we know do not
+ * have the required FCBA field, but are IFD v2 and return true if current
+ * platform is one of them.
+ */
+static int is_platform_ifd_2(void)
+{
+	static const int ifd_2_platforms[] = {
+		PLATFORM_GLK,
+		PLATFORM_CNL,
+	};
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(ifd_2_platforms); i++) {
+		if (platform == ifd_2_platforms[i])
+			return 1;
+	}
+
+	return 0;
+}
+
 /*
  * There is no version field in the descriptor so to determine
  * if this is a new descriptor format we check the hardcoded SPI
  * read frequency to see if it is fixed at 20MHz or 17MHz.
  */
-static void check_ifd_version(char *image, int size)
+static int get_ifd_version_from_fcba(char *image, int size)
 {
 	int read_freq;
-
 	const fcba_t *fcba = find_fcba(image, size);
 	if (!fcba)
 		exit(EXIT_FAILURE);
@@ -142,14 +163,10 @@ static void check_ifd_version(char *image, int size)
 
 	switch (read_freq) {
 	case SPI_FREQUENCY_20MHZ:
-		ifd_version = IFD_VERSION_1;
-		max_regions = MAX_REGIONS_OLD;
-		break;
+		return IFD_VERSION_1;
 	case SPI_FREQUENCY_17MHZ:
 	case SPI_FREQUENCY_50MHZ_30MHZ:
-		ifd_version = IFD_VERSION_2;
-		max_regions = MAX_REGIONS;
-		break;
+		return IFD_VERSION_2;
 	default:
 		fprintf(stderr, "Unknown descriptor version: %d\n",
 			read_freq);
@@ -157,6 +174,19 @@ static void check_ifd_version(char *image, int size)
 	}
 }
 
+static void check_ifd_version(char *image, int size)
+{
+	if (is_platform_ifd_2())
+		ifd_version = IFD_VERSION_2;
+	else
+		ifd_version = get_ifd_version_from_fcba(image, size);
+
+	if (ifd_version == IFD_VERSION_1)
+		max_regions = MAX_REGIONS_OLD;
+	else
+		max_regions = MAX_REGIONS;
+}
+
 static region_t get_region(const frba_t *frba, unsigned int region_type)
 {
 	int base_mask;
@@ -816,7 +846,8 @@ static void lock_descriptor(const char *filename, char *image, int size)
 	}
 
 	switch (platform) {
-	case PLATFORM_APOLLOLAKE:
+	case PLATFORM_APL:
+	case PLATFORM_GLK:
 		/* CPU/BIOS can read descriptor and BIOS */
 		fmba->flmstr1 |= 0x3 << rd_shift;
 		/* CPU/BIOS can write BIOS */
@@ -826,6 +857,24 @@ static void lock_descriptor(const char *filename, char *image, int size)
 		/* TXE can only write Device Expansion */
 		fmba->flmstr2 |= 0x20 << wr_shift;
 		break;
+	case PLATFORM_SKLKBL:
+		/* CPU/BIOS can read descriptor, BIOS and GbE. */
+		fmba->flmstr1 |= 0xb << rd_shift;
+		/* CPU/BIOS can write BIOS and Gbe. */
+		fmba->flmstr1 |= 0xa << wr_shift;
+		/* ME can read descriptor, ME and GbE. */
+		fmba->flmstr2 |= 0xd << rd_shift;
+		/* ME can write ME. */
+		fmba->flmstr2 |= 0x4 << wr_shift;
+		/* GbE can read GbE and descriptor. */
+		fmba->flmstr3 |= 0x9 << rd_shift;
+		/* GbE can write GbE. */
+		fmba->flmstr3 |= 0x8 << wr_shift;
+		/* EC can read EC and descriptor. */
+		fmba->flmstr5 |= 0x101 << rd_shift;
+		/* EC can write EC region. */
+		fmba->flmstr5 |= 0x100 << wr_shift;
+		break;
 	default:
 		/* CPU/BIOS can read descriptor, BIOS, and GbE. */
 		fmba->flmstr1 |= 0xb << rd_shift;
@@ -1135,6 +1184,9 @@ static void print_usage(const char *name)
 	       "   -u | --unlock                      Unlock firmware descriptor and ME region\n"
 	       "   -p | --platform                    Add platform-specific quirks\n"
 	       "                                      aplk - Apollo Lake\n"
+	       "                                      cnl - Cannon Lake\n"
+	       "                                      glk - Gemini Lake\n"
+	       "                                      sklkbl - Skylake/Kaby Lake\n"
 	       "   -v | --version:                    print the version\n"
 	       "   -h | --help:                       print this help\n\n"
 	       "<region> is one of Descriptor, BIOS, ME, GbE, Platform\n"
@@ -1324,11 +1376,18 @@ int main(int argc, char *argv[])
 			break;
 		case 'p':
 			if (!strcmp(optarg, "aplk")) {
-				platform = PLATFORM_APOLLOLAKE;
+				platform = PLATFORM_APL;
+			} else if (!strcmp(optarg, "cnl")) {
+				platform = PLATFORM_CNL;
+			} else if (!strcmp(optarg, "glk")) {
+				platform = PLATFORM_GLK;
+			} else if (!strcmp(optarg, "sklkbl")) {
+				platform = PLATFORM_SKLKBL;
 			} else {
 				fprintf(stderr, "Unknown platform: %s\n", optarg);
 				exit(EXIT_FAILURE);
 			}
+			fprintf(stderr, "Platform is: %s\n", optarg);
 			break;
 		case 'v':
 			print_version();

x230/util/ifdtool/ifdtool.h

@@ -22,7 +22,10 @@ enum ifd_version {
 };
 
 enum platform {
-	PLATFORM_APOLLOLAKE
+	PLATFORM_APL,
+	PLATFORM_CNL,
+	PLATFORM_GLK,
+	PLATFORM_SKLKBL,
 };
 
 #define LAYOUT_LINELEN 80