Add a command line option to set an Intel-specific PV bit

Add a '-p' command line flag to set Intel reserved bit in IMR area.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/adsp_config.c

@@ -929,7 +929,6 @@ static int parse_css_v2_5(const toml_table_t *toml, struct parse_ctx *pctx,
 		return ret;
 
 	/* hardcoded to align with meu */
-	out->reserved0 = 0;
 	out->reserved1[0] = 0xf;
 	out->reserved1[1] = 0x048e0000; // TODO: what is this ?
 

src/rimage.c

@@ -31,6 +31,7 @@ static void usage(char *name)
 	fprintf(stdout, "\t -e build extended manifest\n");
 	fprintf(stdout, "\t -y verify signed file\n");
 	fprintf(stdout, "\t -q resign binary\n");
+	fprintf(stdout, "\t -p set PV bit\n");
 }
 
 int main(int argc, char *argv[])
@@ -41,10 +42,11 @@ int main(int argc, char *argv[])
 	int opt, ret, i, first_non_opt;
 	int imr_type = MAN_DEFAULT_IMR_TYPE;
 	int use_ext_man = 0;
+	unsigned int pv_bit = 0;
 
 	memset(&image, 0, sizeof(image));
 
-	while ((opt = getopt(argc, argv, "ho:va:s:k:ri:f:b:ec:y:q:")) != -1) {
+	while ((opt = getopt(argc, argv, "ho:va:s:k:ri:f:b:ec:y:q:p")) != -1) {
 		switch (opt) {
 		case 'o':
 			image.out_file = optarg;
@@ -88,6 +90,9 @@ int main(int argc, char *argv[])
 		case 'q':
 			image.in_file = optarg;
 			break;
+		case 'p':
+			pv_bit = 1;
+			break;
 		default:
 		 /* getopt's default error message is good enough */
 			return 1;
@@ -163,15 +168,21 @@ int main(int argc, char *argv[])
 		return resign_image(&image);
 	}
 
-	/* set IMR Type in found machine definition */
-	if (image.adsp->man_v1_8)
+	/* set IMR Type and the PV bit in found machine definition */
+	if (image.adsp->man_v1_8) {
 		image.adsp->man_v1_8->adsp_file_ext.imr_type = imr_type;
+		image.adsp->man_v1_8->css.reserved0 = pv_bit;
+	}
 
-	if (image.adsp->man_v2_5)
+	if (image.adsp->man_v2_5) {
 		image.adsp->man_v2_5->adsp_file_ext.imr_type = imr_type;
+		image.adsp->man_v2_5->css.reserved0 = pv_bit;
+	}
 
-	if (image.adsp->man_ace_v1_5)
+	if (image.adsp->man_ace_v1_5) {
 		image.adsp->man_ace_v1_5->adsp_file_ext.imr_type = imr_type;
+		image.adsp->man_ace_v1_5->css.reserved0 = pv_bit;
+	}
 
 	/* parse input ELF files */
 	image.num_modules = argc - first_non_opt;