- flashrom-gerrit - mail.coreboot.org

[M] Change in flashrom[master]: util: add bash completion script
by Alexander Goncharov (Code Review) 15 Nov '22

15 Nov '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Anastasia Klimchuk. Alexander Goncharov has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68247 ) Change subject: util: add bash completion script ...................................................................... Patch Set 9: (1 comment) File util/flashrom.bash-completion: https://review.coreboot.org/c/flashrom/+/68247/comment/fec1e8cb_d2d01758 PS4, Line 36: atahpt > Okay makes sense, not that important. I am marking as resolved. The list of enabled programmers is substituted now as we discussed this with Thomas and you. It works for meson and Makefile :) -- To view, visit https://review.coreboot.org/c/flashrom/+/68247 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Gerrit-Change-Number: 68247 Gerrit-PatchSet: 9 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 15 Nov 2022 10:10:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: util: add bash completion script
by Alexander Goncharov (Code Review) 15 Nov '22

15 Nov '22

Attention is currently required from: Thomas Heijligen, Alexander Goncharov. Hello Felix Singer, build bot (Jenkins), Thomas Heijligen, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/68247 to look at the new patch set (#9). Change subject: util: add bash completion script ...................................................................... util: add bash completion script Add a bash script for the flashrom CLI that auto-completes the command sequence. The script is generated from a template by substituting a list of enabled programmers. It requires an extra `bash-completion` package to work, but, fortunately, it's installed on most systems. Also, provide the meson option `bash_completion` to determine if the script should be installed. Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> --- M .gitignore M Makefile M meson.build M meson_options.txt A util/flashrom.bash-completion.tmpl 5 files changed, 179 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/47/68247/9 -- To view, visit https://review.coreboot.org/c/flashrom/+/68247 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Gerrit-Change-Number: 68247 Gerrit-PatchSet: 9 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: newpatchset

1 0

[L] Change in flashrom[master]: poc json chip entry parser
by Edward O'Callaghan (Code Review) 15 Nov '22

15 Nov '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69610 ) Change subject: poc json chip entry parser ...................................................................... poc json chip entry parser Change-Id: If3e591468a60cb8846860e8b4ac1978b33f11aec Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- A subprojects/chip.txt A subprojects/json_chip.c 2 files changed, 297 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/10/69610/1 diff --git a/subprojects/chip.txt b/subprojects/chip.txt new file mode 100644 index 0000000..7b06889 --- /dev/null +++ b/subprojects/chip.txt @@ -0,0 +1,45 @@ + { + "vendor" : "Winbond", + "name" : "W25Q128.V", + "bustype" : BUS_SPI, + "manufacture_id": WINBOND_NEX_ID, + "model_id" : WINBOND_NEX_W25Q128_V, + "total_size" : 16384, + "page_size" : 256, + "feature_bits" : [FEATURE_WRSR_WREN, FEATURE_OTP, FEATURE_WRSR_EXT2, FEATURE_WRSR2, FEATURE_WRSR3], + "tested" : TEST_OK_PREW, + "probe" : PROBE_SPI_RDID, + "probe_timing" : TIMING_ZERO, + "block_erasers" : + [ + { + "eraseblocks" : [4 * 1024, 4096], + "block_erase" : SPI_BLOCK_ERASE_20, + }, { + "eraseblocks" : [32 * 1024, 512], + "block_erase" : SPI_BLOCK_ERASE_52, + }, { + "eraseblocks" : [64 * 1024, 256], + "block_erase" : SPI_BLOCK_ERASE_D8, + }, { + "eraseblocks" : [16 * 1024 * 1024, 1], + "block_erase" : SPI_BLOCK_ERASE_60, + }, { + "eraseblocks" : [16 * 1024 * 1024, 1], + "block_erase" : SPI_BLOCK_ERASE_C7, + } + ], + "write" : SPI_CHIP_WRITE256, + "read" : SPI_CHIP_READ, + "voltage" : [2700, 3600], + "reg_bits" : + { + "srp" : [STATUS1, 7, RW], + "srl" : [STATUS2, 0, RW], + "tb" : [STATUS1, 5, RW], + "sec" : [STATUS1, 6, RW], + "cmp" : [STATUS2, 6, RW], + "wps" : [STATUS3, 2, RW], + }, + "decode_range" : DECODE_RANGE_SPI25, + }, diff --git a/subprojects/json_chip.c b/subprojects/json_chip.c new file mode 100644 index 0000000..ad16fc1 --- /dev/null +++ b/subprojects/json_chip.c @@ -0,0 +1,242 @@ +#include "jsmn/jsmn.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* JSONify flashchips db worked example. */ + +static int jsoneq (const char *json, jsmntok_t *tok, const char *s) { + if (tok->type == JSMN_STRING && (int)strlen (s) == tok->end - tok->start && + strncmp (json + tok->start, s, tok->end - tok->start) == 0) { + return 0; + } + return -1; +} + +int main () { + int i; + int r; + jsmn_parser p; + jsmntok_t t[128] = {0}; /* no. of expected tokens */ + char *data = NULL; + + FILE *fp = fopen ("chip.txt", "r"); + if (fp) { + if (fseek (fp, 0L, SEEK_END) == 0) { + long bufsize = ftell (fp); + if (bufsize == -1) { + exit (1); + } + + data = malloc (sizeof (char) * (bufsize + 1)); + + if (fseek (fp, 0L, SEEK_SET) != 0) { + free (data); + exit (1); + } + + size_t newLen = fread (data, sizeof (char), bufsize, fp); + if (ferror (fp) != 0) { + fputs ("Error reading file", stderr); + } else { + data[newLen++] = '\0'; + } + } + fclose (fp); + } + + jsmn_init (&p); + r = jsmn_parse (&p, data, strlen (data), t, sizeof (t) / sizeof (t[0])); + if (r < 0) { + printf ("Failed to parse JSON: %d\n", r); + return 1; + } + + /* Assume the top-level element is an object */ + if (r < 1 || t[0].type != JSMN_OBJECT) { + printf ("Object expected\n"); + return 1; + } + + /* Loop over all keys of the root object */ + for (i = 1; i < r; i++) { + if (jsoneq (data, &t[i], "vendor") == 0) { + /* We may use strndup() to fetch string value */ + printf ("- vendor: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "name") == 0) { + /* We may additionally check if the value is either "true" or "false" */ + printf ("- name: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "bustype") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- bustype: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "manufacture_id") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- manufacture_id: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "model_id") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- model_id: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "total_size") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- total_size: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "page_size") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- page_size: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "feature_bits") == 0) { + int j; + printf ("- feature_bits:\n"); + if (t[i + 1].type != JSMN_ARRAY) { + continue; /* We expect groups to be an array of strings */ + } + for (j = 0; j < t[i + 1].size; j++) { + jsmntok_t *g = &t[i + j + 2]; + printf (" * %.*s\n", g->end - g->start, data + g->start); + } + i += t[i + 1].size + 1; + } else if (jsoneq (data, &t[i], "tested") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- tested: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "probe") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- probe: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "probe_timing") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- probe_timing: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + // .block_erasers = + // { + // { + // .eraseblocks = { {4 * 1024, 4096} }, + // .block_erase = SPI_BLOCK_ERASE_20, + // }, { + // .eraseblocks = { {32 * 1024, 512} }, + // .block_erase = SPI_BLOCK_ERASE_52, + // }, { + // .eraseblocks = { {64 * 1024, 256} }, + // .block_erase = SPI_BLOCK_ERASE_D8, + // }, { + // .eraseblocks = { {16 * 1024 * 1024, 1} + //}, .block_erase = SPI_BLOCK_ERASE_60, + // }, { + // .eraseblocks = { {16 * 1024 * 1024, 1} + //}, .block_erase = SPI_BLOCK_ERASE_C7, + // } + // }, + // } else if (jsoneq(data, &t[i], "block_erasers") == 0) { + // int j, k; + // printf("- block_erasers:\n"); + // if (t[i + 1].type != JSMN_OBJECT) { + // continue; /* We expect groups to be an array of strings */ + // } + // for (j = 0; j < t[i + 1].size; j++) { + // jsmntok_t *g = &t[i + j + 2]; + // if (g[j + 1].type != JSMN_OBJECT) { + // continue; + // } + // for (k = 0; k < g[j + 1].size; k++) { + // jsmntok_t *h = &g[i + j + k + 2]; + // printf(" * %.*s\n", h->end - h->start, data + + // h->start); + // } + // } + // i += t[i + 1].size + 1; + } else if (jsoneq (data, &t[i], "write") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- write: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "read") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- read: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else if (jsoneq (data, &t[i], "voltage") == 0) { + int j; + printf ("- voltage:\n"); + if (t[i + 1].type != JSMN_ARRAY) { + continue; /* We expect groups to be an array of strings */ + } + for (j = 0; j < t[i + 1].size; j++) { + jsmntok_t *g = &t[i + j + 2]; + printf (" * %.*s\n", g->end - g->start, data + g->start); + } + i += t[i + 1].size + 1; + } else if (jsoneq (data, &t[i], "reg_bits") == 0) { + int j, k; + printf ("- reg_bits:\n"); + if (t[i + 1].type != JSMN_OBJECT) { + continue; /* We expect reg_bits to be an object */ + } + // printf("- ZZZ: %.*s\n", t[i + 1].end - t[i + 1].start, + // data + t[i + 1].start); + // for (j = 0; j < t[i + 1].size; j++) { + j = 0; // XXX + jsmntok_t *g = &t[i + j + 2]; + // if (g[j + 1].type != JSMN_ARRAY) { // if the val at key g[j + 1] + //is not an array continue; continue; + // } + for (k = 0; k < g[j + 1].size; k++) { + printf ("X\n"); + jsmntok_t *h = &g[k + 1]; // value of g[k] key. + if (h->type != + JSMN_ARRAY) { // if the val at key g[k] is not an array continue; + printf ("Y\n"); + continue; + } + if (jsoneq (data, &g[k], "srp") == 0) { + printf (" srp: %.*s\n", h->end - h->start, data + h->start); + } else if (jsoneq (data, &g[k], "srl") == 0) { + printf (" srl: %.*s\n", h->end - h->start, data + h->start); + } else if (jsoneq (data, &g[k], "tb") == 0) { + printf (" tb: %.*s\n", h->end - h->start, data + h->start); + } else if (jsoneq (data, &g[k], "sec") == 0) { + printf (" sec: %.*s\n", h->end - h->start, data + h->start); + } else if (jsoneq (data, &g[k], "cmp") == 0) { + printf (" cmp: %.*s\n", h->end - h->start, data + h->start); + } else if (jsoneq (data, &g[k], "wps") == 0) { + printf (" wps: %.*s\n", h->end - h->start, data + h->start); + } else { + printf (" <UNKNOWN>: %.*s\n", g[k].end - g[k].start, + data + g[k].start); + } + // TODO(handle bp) object. + // "bp" : + // { + // [STATUS1, 2, RW], + // [STATUS1, 3, RW], + // [STATUS1, 4, RW] + // }, + } + //} + i += t[i + 1].size + 1; + } else if (jsoneq (data, &t[i], "decode_range") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf ("- decode_range: %.*s\n", t[i + 1].end - t[i + 1].start, + data + t[i + 1].start); + i++; + } else { + printf ("Unexpected key: %.*s\n", t[i].end - t[i].start, + data + t[i].start); + } + } + + return EXIT_SUCCESS; +} -- To view, visit https://review.coreboot.org/c/flashrom/+/69610 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If3e591468a60cb8846860e8b4ac1978b33f11aec Gerrit-Change-Number: 69610 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[L] Change in flashrom[master]: subprojects/: Import jsmn/jsmn.h micro json parser library
by Edward O'Callaghan (Code Review) 15 Nov '22

15 Nov '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69609 ) Change subject: subprojects/: Import jsmn/jsmn.h micro json parser library ...................................................................... subprojects/: Import jsmn/jsmn.h micro json parser library Change-Id: I5e6e60162576bac4a677fa7ae34825b9ac5d6855 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- A subprojects/jsmn/jsmn.h 1 file changed, 481 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/09/69609/1 diff --git a/subprojects/jsmn/jsmn.h b/subprojects/jsmn/jsmn.h new file mode 100644 index 0000000..dca2bb5 --- /dev/null +++ b/subprojects/jsmn/jsmn.h @@ -0,0 +1,471 @@ +/* + * MIT License + * + * Copyright (c) 2010 Serge Zaitsev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef JSMN_H +#define JSMN_H + +#include <stddef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef JSMN_STATIC +#define JSMN_API static +#else +#define JSMN_API extern +#endif + +/** + * JSON type identifier. Basic types are: + * o Object + * o Array + * o String + * o Other primitive: number, boolean (true/false) or null + */ +typedef enum { + JSMN_UNDEFINED = 0, + JSMN_OBJECT = 1 << 0, + JSMN_ARRAY = 1 << 1, + JSMN_STRING = 1 << 2, + JSMN_PRIMITIVE = 1 << 3 +} jsmntype_t; + +enum jsmnerr { + /* Not enough tokens were provided */ + JSMN_ERROR_NOMEM = -1, + /* Invalid character inside JSON string */ + JSMN_ERROR_INVAL = -2, + /* The string is not a full JSON packet, more bytes expected */ + JSMN_ERROR_PART = -3 +}; + +/** + * JSON token description. + * type type (object, array, string etc.) + * start start position in JSON data string + * end end position in JSON data string + */ +typedef struct jsmntok { + jsmntype_t type; + int start; + int end; + int size; +#ifdef JSMN_PARENT_LINKS + int parent; +#endif +} jsmntok_t; + +/** + * JSON parser. Contains an array of token blocks available. Also stores + * the string being parsed now and current position in that string. + */ +typedef struct jsmn_parser { + unsigned int pos; /* offset in the JSON string */ + unsigned int toknext; /* next token to allocate */ + int toksuper; /* superior token node, e.g. parent object or array */ +} jsmn_parser; + +/** + * Create JSON parser over an array of tokens + */ +JSMN_API void jsmn_init(jsmn_parser *parser); + +/** + * Run JSON parser. It parses a JSON data string into and array of tokens, each + * describing + * a single JSON object. + */ +JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len, + jsmntok_t *tokens, const unsigned int num_tokens); + +#ifndef JSMN_HEADER +/** + * Allocates a fresh unused token from the token pool. + */ +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, jsmntok_t *tokens, + const size_t num_tokens) { + jsmntok_t *tok; + if (parser->toknext >= num_tokens) { + return NULL; + } + tok = &tokens[parser->toknext++]; + tok->start = tok->end = -1; + tok->size = 0; +#ifdef JSMN_PARENT_LINKS + tok->parent = -1; +#endif + return tok; +} + +/** + * Fills token type and boundaries. + */ +static void jsmn_fill_token(jsmntok_t *token, const jsmntype_t type, + const int start, const int end) { + token->type = type; + token->start = start; + token->end = end; + token->size = 0; +} + +/** + * Fills next available token with JSON primitive. + */ +static int jsmn_parse_primitive(jsmn_parser *parser, const char *js, + const size_t len, jsmntok_t *tokens, + const size_t num_tokens) { + jsmntok_t *token; + int start; + + start = parser->pos; + + for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) { + switch (js[parser->pos]) { +#ifndef JSMN_STRICT + /* In strict mode primitive must be followed by "," or "}" or "]" */ + case ':': +#endif + case '\t': + case '\r': + case '\n': + case ' ': + case ',': + case ']': + case '}': + goto found; + default: + /* to quiet a warning from gcc*/ + break; + } + if (js[parser->pos] < 32 || js[parser->pos] >= 127) { + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } +#ifdef JSMN_STRICT + /* In strict mode primitive must be followed by a comma/object/array */ + parser->pos = start; + return JSMN_ERROR_PART; +#endif + +found: + if (tokens == NULL) { + parser->pos--; + return 0; + } + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos); +#ifdef JSMN_PARENT_LINKS + token->parent = parser->toksuper; +#endif + parser->pos--; + return 0; +} + +/** + * Fills next token with JSON string. + */ +static int jsmn_parse_string(jsmn_parser *parser, const char *js, + const size_t len, jsmntok_t *tokens, + const size_t num_tokens) { + jsmntok_t *token; + + int start = parser->pos; + + /* Skip starting quote */ + parser->pos++; + + for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) { + char c = js[parser->pos]; + + /* Quote: end of string */ + if (c == '\"') { + if (tokens == NULL) { + return 0; + } + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_STRING, start + 1, parser->pos); +#ifdef JSMN_PARENT_LINKS + token->parent = parser->toksuper; +#endif + return 0; + } + + /* Backslash: Quoted symbol expected */ + if (c == '\\' && parser->pos + 1 < len) { + int i; + parser->pos++; + switch (js[parser->pos]) { + /* Allowed escaped symbols */ + case '\"': + case '/': + case '\\': + case 'b': + case 'f': + case 'r': + case 'n': + case 't': + break; + /* Allows escaped symbol \uXXXX */ + case 'u': + parser->pos++; + for (i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; + i++) { + /* If it isn't a hex character we have an error */ + if (!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */ + (js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */ + (js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */ + parser->pos = start; + return JSMN_ERROR_INVAL; + } + parser->pos++; + } + parser->pos--; + break; + /* Unexpected symbol */ + default: + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } + } + parser->pos = start; + return JSMN_ERROR_PART; +} + +/** + * Parse JSON string and fill tokens. + */ +JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len, + jsmntok_t *tokens, const unsigned int num_tokens) { + int r; + int i; + jsmntok_t *token; + int count = parser->toknext; + + for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) { + char c; + jsmntype_t type; + + c = js[parser->pos]; + switch (c) { + case '{': + case '[': + count++; + if (tokens == NULL) { + break; + } + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + return JSMN_ERROR_NOMEM; + } + if (parser->toksuper != -1) { + jsmntok_t *t = &tokens[parser->toksuper]; +#ifdef JSMN_STRICT + /* In strict mode an object or array can't become a key */ + if (t->type == JSMN_OBJECT) { + return JSMN_ERROR_INVAL; + } +#endif + t->size++; +#ifdef JSMN_PARENT_LINKS + token->parent = parser->toksuper; +#endif + } + token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY); + token->start = parser->pos; + parser->toksuper = parser->toknext - 1; + break; + case '}': + case ']': + if (tokens == NULL) { + break; + } + type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); +#ifdef JSMN_PARENT_LINKS + if (parser->toknext < 1) { + return JSMN_ERROR_INVAL; + } + token = &tokens[parser->toknext - 1]; + for (;;) { + if (token->start != -1 && token->end == -1) { + if (token->type != type) { + return JSMN_ERROR_INVAL; + } + token->end = parser->pos + 1; + parser->toksuper = token->parent; + break; + } + if (token->parent == -1) { + if (token->type != type || parser->toksuper == -1) { + return JSMN_ERROR_INVAL; + } + break; + } + token = &tokens[token->parent]; + } +#else + for (i = parser->toknext - 1; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + if (token->type != type) { + return JSMN_ERROR_INVAL; + } + parser->toksuper = -1; + token->end = parser->pos + 1; + break; + } + } + /* Error if unmatched closing bracket */ + if (i == -1) { + return JSMN_ERROR_INVAL; + } + for (; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + parser->toksuper = i; + break; + } + } +#endif + break; + case '\"': + r = jsmn_parse_string(parser, js, len, tokens, num_tokens); + if (r < 0) { + return r; + } + count++; + if (parser->toksuper != -1 && tokens != NULL) { + tokens[parser->toksuper].size++; + } + break; + case '\t': + case '\r': + case '\n': + case ' ': + break; + case ':': + parser->toksuper = parser->toknext - 1; + break; + case ',': + if (tokens != NULL && parser->toksuper != -1 && + tokens[parser->toksuper].type != JSMN_ARRAY && + tokens[parser->toksuper].type != JSMN_OBJECT) { +#ifdef JSMN_PARENT_LINKS + parser->toksuper = tokens[parser->toksuper].parent; +#else + for (i = parser->toknext - 1; i >= 0; i--) { + if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) { + if (tokens[i].start != -1 && tokens[i].end == -1) { + parser->toksuper = i; + break; + } + } + } +#endif + } + break; +#ifdef JSMN_STRICT + /* In strict mode primitives are: numbers and booleans */ + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 't': + case 'f': + case 'n': + /* And they must not be keys of the object */ + if (tokens != NULL && parser->toksuper != -1) { + const jsmntok_t *t = &tokens[parser->toksuper]; + if (t->type == JSMN_OBJECT || + (t->type == JSMN_STRING && t->size != 0)) { + return JSMN_ERROR_INVAL; + } + } +#else + /* In non-strict mode every unquoted value is a primitive */ + default: +#endif + r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens); + if (r < 0) { + return r; + } + count++; + if (parser->toksuper != -1 && tokens != NULL) { + tokens[parser->toksuper].size++; + } + break; + +#ifdef JSMN_STRICT + /* Unexpected char in strict mode */ + default: + return JSMN_ERROR_INVAL; +#endif + } + } + + if (tokens != NULL) { + for (i = parser->toknext - 1; i >= 0; i--) { + /* Unmatched opened object or array */ + if (tokens[i].start != -1 && tokens[i].end == -1) { + return JSMN_ERROR_PART; + } + } + } + + return count; +} + +/** + * Creates a new parser based over a given buffer with an array of tokens + * available. + */ +JSMN_API void jsmn_init(jsmn_parser *parser) { + parser->pos = 0; + parser->toknext = 0; + parser->toksuper = -1; +} + +#endif /* JSMN_HEADER */ + +#ifdef __cplusplus +} +#endif + +#endif /* JSMN_H */ -- To view, visit https://review.coreboot.org/c/flashrom/+/69609 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5e6e60162576bac4a677fa7ae34825b9ac5d6855 Gerrit-Change-Number: 69609 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tests: Convert selfcheck to unit tests
by Thomas Heijligen (Code Review) 15 Nov '22

15 Nov '22

Attention is currently required from: Anastasia Klimchuk, Evan Benn. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69620 ) Change subject: tests: Convert selfcheck to unit tests ...................................................................... Patch Set 5: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/69620/comment/4dc613c4_973f0ad8 PS5, Line 7: tests: Convert selfcheck to unit tests Please be aware that the selfcheck can't be droped as long as we offer to build with `make`. Adding additional unit tests, doing the same thing is fine. -- To view, visit https://review.coreboot.org/c/flashrom/+/69620 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Gerrit-Change-Number: 69620 Gerrit-PatchSet: 5 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Tue, 15 Nov 2022 06:27:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tests: Convert selfcheck to unit tests
by Evan Benn (Code Review) 15 Nov '22

15 Nov '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk, Evan Benn. Hello build bot (Jenkins), Thomas Heijligen, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69620 to look at the new patch set (#5). Change subject: tests: Convert selfcheck to unit tests ...................................................................... tests: Convert selfcheck to unit tests Add unit tests for programmer_table, flashchips, and board_matches structs. The tests are derived from the selfcheck function, checking that the required fields have been filled in. BUG=b:140595239 BRANCH=None TEST=meson test Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M board_enable.c M include/programmer.h M tests/meson.build M tests/tests.c M tests/tests.h A tests/well_formed_tables.c 6 files changed, 118 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/69620/5 -- To view, visit https://review.coreboot.org/c/flashrom/+/69620 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Gerrit-Change-Number: 69620 Gerrit-PatchSet: 5 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: tests: Move SKIP_TEST macro to common header
by Evan Benn (Code Review) 15 Nov '22

15 Nov '22

Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69621 ) Change subject: tests: Move SKIP_TEST macro to common header ...................................................................... tests: Move SKIP_TEST macro to common header BUG=None BRANCH=None TEST=None Change-Id: I6cca635212867dad5a8e391a46b1d943530c539a --- M tests/include/test.h M tests/lifecycle.h 2 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/69621/1 diff --git a/tests/include/test.h b/tests/include/test.h index 88ac16d..ef0b9a6 100644 --- a/tests/include/test.h +++ b/tests/include/test.h @@ -31,6 +31,9 @@ #define MOCK_FD (0x10ec) +#define SKIP_TEST(name) \ + void name (void **state) { skip(); } + /* * Having this as function allows to set a breakpoint on the address, * as it has a named symbol associated with the address number. diff --git a/tests/lifecycle.h b/tests/lifecycle.h index 69f1119..b4c2fbe 100644 --- a/tests/lifecycle.h +++ b/tests/lifecycle.h @@ -28,9 +28,6 @@ #include "programmer.h" #include "spi.h" -#define SKIP_TEST(name) \ - void name (void **state) { skip(); } - void run_basic_lifecycle(void **state, const struct io_mock *io, const struct programmer_entry *prog, const char *param); -- To view, visit https://review.coreboot.org/c/flashrom/+/69621 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6cca635212867dad5a8e391a46b1d943530c539a Gerrit-Change-Number: 69621 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tests: Convert selfcheck to unit tests
by Evan Benn (Code Review) 15 Nov '22

15 Nov '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk, Evan Benn. Hello build bot (Jenkins), Thomas Heijligen, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69620 to look at the new patch set (#3). Change subject: tests: Convert selfcheck to unit tests ...................................................................... tests: Convert selfcheck to unit tests Add unit tests for programmer_table, flashchips, and board_matches structs. The tests are derived from the selfcheck function, checking that the required fields have been filled in. BUG=b:140595239 BRANCH=None TEST=meson test Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M board_enable.c M include/programmer.h M tests/meson.build M tests/tests.c M tests/tests.h A tests/well_formed_tables.c 6 files changed, 120 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/69620/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/69620 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Gerrit-Change-Number: 69620 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tests: Convert selfcheck to unit tests
by Evan Benn (Code Review) 15 Nov '22

15 Nov '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Hello Thomas Heijligen, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69620 to look at the new patch set (#2). Change subject: tests: Convert selfcheck to unit tests ...................................................................... tests: Convert selfcheck to unit tests Add unit tests for programmer_table, flashchips, and board_matches structs. The tests are derived from the selfcheck function, checking that the required fields have been filled in. BUG=b:140595239 BRANCH=None TEST=meson test Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M board_enable.c M include/programmer.h M tests/meson.build M tests/tests.c M tests/tests.h A tests/well_formed_tables.c 6 files changed, 114 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/69620/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/69620 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Gerrit-Change-Number: 69620 Gerrit-PatchSet: 2 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tests: Convert selfcheck to unit tests
by Evan Benn (Code Review) 15 Nov '22

15 Nov '22

Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69620 ) Change subject: tests: Convert selfcheck to unit tests ...................................................................... tests: Convert selfcheck to unit tests Add unit tests for programmer_table, flashchips, and board_matches structs. The tests are derived from the selfcheck function, checking that the required fields have been filled in. BUG=b:140595239 BRANCH=None TEST=meson test Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M board_enable.c M include/programmer.h M tests/meson.build M tests/tests.c M tests/tests.h A tests/well_formed_tables.c 6 files changed, 109 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/69620/1 diff --git a/board_enable.c b/board_enable.c index 4903c0f..bf26173 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2524,6 +2524,7 @@ #endif { 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, P3, NULL, NULL, 0, NT, NULL}, /* end marker */ }; +const size_t board_matches_size = ARRAY_SIZE(board_matches); int selfcheck_board_enables(void) { diff --git a/include/programmer.h b/include/programmer.h index 386e6ec..f979c25 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -193,6 +193,7 @@ }; extern const struct board_match board_matches[]; +extern const size_t board_matches_size; struct board_info { const char *vendor; diff --git a/tests/meson.build b/tests/meson.build index 66adb92..86d2f30 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -31,6 +31,7 @@ 'layout.c', 'chip.c', 'chip_wp.c', + 'well_formed_tables.c', ) if not programmer.get('dummy').get('active') diff --git a/tests/tests.c b/tests/tests.c index ea416b8..0b1752e 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -381,6 +381,13 @@ }; ret |= cmocka_run_group_tests_name("helpers.c tests", helpers_tests, NULL, NULL); + const struct CMUnitTest well_formed_tables[] = { + cmocka_unit_test(well_formed_programmer_table), + cmocka_unit_test(well_formed_flashchips_table), + cmocka_unit_test(well_formed_board_matches_table), + }; + ret |= cmocka_run_group_tests_name("well_formed_tables.c tests", well_formed_tables, NULL, NULL); + const struct CMUnitTest flashrom_tests[] = { cmocka_unit_test(flashbuses_to_text_test_success), }; diff --git a/tests/tests.h b/tests/tests.h index 7d84101..230c042 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -87,4 +87,9 @@ void full_chip_erase_with_wp_dummyflasher_test_success(void **state); void partial_chip_erase_with_wp_dummyflasher_test_success(void **state); +/* well_formed_tables.c */ +void well_formed_programmer_table(void **state); +void well_formed_flashchips_table(void **state); +void well_formed_board_matches_table(void **state); + #endif /* TESTS_H */ diff --git a/tests/well_formed_tables.c b/tests/well_formed_tables.c new file mode 100644 index 0000000..67593d8 --- /dev/null +++ b/tests/well_formed_tables.c @@ -0,0 +1,76 @@ +/* + * This file is part of the flashrom project. + * + * Copyright 2022 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "string.h" + +#include "include/test.h" +#include "programmer.h" +#include "tests.h" + + +#define assert_table(assertion, index, name) do { \ + if (!(assertion)) \ + fail_msg(#assertion " is false for index:%zu name:%s", \ + (index), \ + (name) ? (name) : "unknown" \ + ); \ +} while (0) + + +void well_formed_programmer_table(void **state) { + (void) state; /* unused */ + size_t i; + for (i = 0; i < programmer_table_size; i++) { + const struct programmer_entry *const p = programmer_table[i]; + assert_table(p, i, programmer_table[i]->name); + assert_table(p->name, i, programmer_table[i]->name); + assert_table(p->type, i, programmer_table[i]->name); + if (strcmp("internal", p->name) != 0) { /* This one has its device list stored separately. */ + assert_table(p->devs.note, i, programmer_table[i]->name); + } + assert_table(p->init, i, programmer_table[i]->name); + } +} + +void well_formed_flashchips_table(void **state) { + (void) state; /* unused */ + size_t i; + assert_false(flashchips_size <= 1 || flashchips[flashchips_size - 1].name != NULL); + for (i = 0; i < flashchips_size - 1; i++) { + const struct flashchip *chip = &flashchips[i]; + assert_table(chip->vendor, i, flashchips[i].name); + assert_table(chip->name, i, flashchips[i].name); + assert_table(chip->bustype != BUS_NONE, i, flashchips[i].name); + } +} + +void well_formed_board_matches_table(void **state) { + (void) state; /* unused */ + size_t i; + assert_false(board_matches_size <= 1 || board_matches[board_matches_size - 1].vendor_name != NULL); + for (i = 0; i < board_matches_size - 1; i++) { + const struct board_match *b = &board_matches[i]; + assert_table(b->vendor_name, i, b->board_name); + assert_table(b->board_name, i, b->board_name); + assert_table(b->board_name, i, b->board_name); + if ((b->first_vendor == 0 || b->first_device == 0 || + b->second_vendor == 0 || b->second_device == 0) || + ((b->lb_vendor == NULL) ^ (b->lb_part == NULL)) || + (b->max_rom_decode_parallel == 0 && b->enable == NULL)) { + fail_msg("Board enable for %s %s is misdefined.\n", + b->vendor_name, b->board_name); + } + } +} -- To view, visit https://review.coreboot.org/c/flashrom/+/69620 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41cd014d9bf909296b6c28e3e00548e6883ff41a Gerrit-Change-Number: 69620 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit