Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806967/?format=api
{ "id": 806967, "url": "http://patchwork.ozlabs.org/api/patches/806967/?format=api", "web_url": "http://patchwork.ozlabs.org/project/skiboot/patch/20170829062506.8317-7-cyril.bur@au1.ibm.com/", "project": { "id": 44, "url": "http://patchwork.ozlabs.org/api/projects/44/?format=api", "name": "skiboot firmware development", "link_name": "skiboot", "list_id": "skiboot.lists.ozlabs.org", "list_email": "skiboot@lists.ozlabs.org", "web_url": "http://github.com/open-power/skiboot", "scm_url": "http://github.com/open-power/skiboot", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170829062506.8317-7-cyril.bur@au1.ibm.com>", "list_archive_url": null, "date": "2017-08-29T06:24:59", "name": "[RFC,06/13] external/ffspart: Remove side, order and backup options", "commit_ref": null, "pull_url": null, "state": "rfc", "archived": false, "hash": "30b636a5892b6722527ef19ef0ae4ab41d2d65c5", "submitter": { "id": 64738, "url": "http://patchwork.ozlabs.org/api/people/64738/?format=api", "name": "Cyril Bur", "email": "cyril.bur@au1.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/skiboot/patch/20170829062506.8317-7-cyril.bur@au1.ibm.com/mbox/", "series": [ { "id": 313, "url": "http://patchwork.ozlabs.org/api/series/313/?format=api", "web_url": "http://patchwork.ozlabs.org/project/skiboot/list/?series=313", "date": "2017-08-29T06:24:53", "name": "Rework flash TOC generation", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/313/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806967/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806967/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "skiboot@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "skiboot@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhJvs5Yztz9ryr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 16:42:01 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xhJvs4cLSzDrVh\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 16:42:01 +1000 (AEST)", "from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n\t[148.163.156.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xhJY32CQpzDqYs\n\tfor <skiboot@lists.ozlabs.org>; Tue, 29 Aug 2017 16:25:43 +1000 (AEST)", "from pps.filterd (m0098410.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T6OHOL100265\n\tfor <skiboot@lists.ozlabs.org>; Tue, 29 Aug 2017 02:25:41 -0400", "from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cmx61t72q-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <skiboot@lists.ozlabs.org>; Tue, 29 Aug 2017 02:25:41 -0400", "from localhost\n\tby e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <skiboot@lists.ozlabs.org> from <cyril.bur@au1.ibm.com>;\n\tTue, 29 Aug 2017 16:25:38 +1000", "from d23relay10.au.ibm.com (202.81.31.229)\n\tby e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tTue, 29 Aug 2017 16:25:36 +1000", "from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139])\n\tby d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n\tv7T6Pa9p23593032\n\tfor <skiboot@lists.ozlabs.org>; Tue, 29 Aug 2017 16:25:36 +1000", "from d23av04.au.ibm.com (localhost [127.0.0.1])\n\tby d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id\n\tv7T6PatS017773\n\tfor <skiboot@lists.ozlabs.org>; Tue, 29 Aug 2017 16:25:37 +1000", "from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14])\n\tby d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id\n\tv7T6PaBe017744; Tue, 29 Aug 2017 16:25:36 +1000", "from camb691.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114])\n\t(using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby ozlabs.au.ibm.com (Postfix) with ESMTPSA id 4F2EBA0275;\n\tTue, 29 Aug 2017 16:25:35 +1000 (AEST)" ], "From": "Cyril Bur <cyril.bur@au1.ibm.com>", "To": "skiboot@lists.ozlabs.org, stewart@linux.vnet.ibm.com", "Date": "Tue, 29 Aug 2017 16:24:59 +1000", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20170829062506.8317-1-cyril.bur@au1.ibm.com>", "References": "<20170829062506.8317-1-cyril.bur@au1.ibm.com>", "X-TM-AS-MML": "disable", "x-cbid": "17082906-0012-0000-0000-0000025A9F59", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17082906-0013-0000-0000-0000077669DC", "Message-Id": "<20170829062506.8317-7-cyril.bur@au1.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-29_01:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=29\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290096", "Subject": "[Skiboot] [RFC PATCH 06/13] external/ffspart: Remove side,\n\torder and backup options", "X-BeenThere": "skiboot@lists.ozlabs.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "Mailing list for skiboot development <skiboot.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/skiboot>,\n\t<mailto:skiboot-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/skiboot/>", "List-Post": "<mailto:skiboot@lists.ozlabs.org>", "List-Help": "<mailto:skiboot-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/skiboot>,\n\t<mailto:skiboot-request@lists.ozlabs.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org", "Sender": "\"Skiboot\"\n\t<skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>" }, "content": "These options are currently flakey in libflash/libffs so there isn't\nmuch point to being able to use them in ffspart.\n\nFuture reworks planned for libflash/libffs will render these options\nredundant anyway.\n\nSigned-off-by: Cyril Bur <cyril.bur@au1.ibm.com>\n---\n external/ffspart/ffspart.c | 87 ++--------------------\n external/ffspart/test/results/00-usage.out | 5 --\n external/ffspart/test/tests/01-param-sanity | 6 +-\n external/ffspart/test/tests/02-param-sides | 6 +-\n external/ffspart/test/tests/03.1-tiny-pnor-backup | 4 +\n .../ffspart/test/tests/05.1-hdr-overlap-backup | 6 +-\n 6 files changed, 24 insertions(+), 90 deletions(-)", "diff": "diff --git a/external/ffspart/ffspart.c b/external/ffspart/ffspart.c\nindex 73c02c40..bd223c78 100644\n--- a/external/ffspart/ffspart.c\n+++ b/external/ffspart/ffspart.c\n@@ -52,11 +52,6 @@\n #define MAX_LINE 100\n #define SEPARATOR ','\n \n-enum order {\n-\tORDER_ADB,\n-\tORDER_ABD\n-};\n-\n /* Full version number (possibly includes gitid). */\n extern const char version[];\n \n@@ -76,23 +71,16 @@ static void print_help(const char *pname)\n \tprintf(\"\\t\\tNumber of blocks on the flash\\n\\n\");\n \tprintf(\"\\t-i, --input=file\\n\");\n \tprintf(\"\\t\\tFile containing the required partition data\\n\\n\");\n-\tprintf(\"\\t-o, --order=( ADB | ABD )\\n\");\n-\tprintf(\"\\t\\tOrdering of the TOC, Data and Backup TOC. Currently only ADB (default)\\n\");\n-\tprintf(\"\\t\\tis supported\\n\");\n \tprintf(\"\\t-p, --pnor=file\\n\");\n \tprintf(\"\\t\\tOutput file to write data\\n\\n\");\n-\tprintf(\"\\t-t, --sides=( 1 | 2 )\\n\");\n-\tprintf(\"\\t\\tNumber of sides to the flash (Default: 1)\\n\");\n }\n \n int main(int argc, char *argv[])\n {\n \tconst char *pname = argv[0];\n \tstruct blocklevel_device *bl = NULL;\n-\tunsigned int sides = 1;\n \tuint32_t block_size = 0, block_count = 0;\n-\tenum order order = ORDER_ADB;\n-\tbool bad_input = false, backup_part = false;\n+\tbool bad_input = false;\n \tchar *pnor = NULL, *input = NULL;\n \tstruct ffs_hdr *new_hdr;\n \tFILE *in_file;\n@@ -101,25 +89,19 @@ int main(int argc, char *argv[])\n \n \twhile(1) {\n \t\tstruct option long_opts[] = {\n-\t\t\t{\"backup\",\tno_argument, NULL, 'b'},\n \t\t\t{\"block_size\",\trequired_argument,\tNULL,\t's'},\n \t\t\t{\"block_count\",\trequired_argument,\tNULL,\t'c'},\n \t\t\t{\"debug\",\tno_argument,\tNULL,\t'g'},\n \t\t\t{\"input\",\trequired_argument,\tNULL,\t'i'},\n-\t\t\t{\"order\",\trequired_argument,\tNULL,\t'o'},\n \t\t\t{\"pnor\",\trequired_argument,\tNULL,\t'p'},\n-\t\t\t{\"tocs\",\trequired_argument,\tNULL,\t't'},\n \t\t\t{NULL,\t0,\t0, 0}\n \t\t};\n \t\tint c, oidx = 0;\n \n-\t\tc = getopt_long(argc, argv, \"bc:gi:o:p:s:t:\", long_opts, &oidx);\n+\t\tc = getopt_long(argc, argv, \"c:gi:p:s:\", long_opts, &oidx);\n \t\tif (c == EOF)\n \t\t\tbreak;\n \t\tswitch(c) {\n-\t\tcase 'b':\n-\t\t\tbackup_part = true;\n-\t\t\tbreak;\n \t\tcase 'c':\n \t\t\tblock_count = strtoul(optarg, NULL, 0);\n \t\t\tbreak;\n@@ -129,52 +111,27 @@ int main(int argc, char *argv[])\n \t\tcase 'i':\n \t\t\tinput = strdup(optarg);\n \t\t\tbreak;\n-\t\tcase 'o':\n-\t\t\tif (strncmp(optarg, \"ABD\", 3) == 0)\n-\t\t\t\torder = ORDER_ABD;\n-\t\t\telse if (strncmp(optarg, \"ADB\", 3) == 0)\n-\t\t\t\torder = ORDER_ADB;\n-\t\t\telse\n-\t\t\t\tbad_input = true;\n-\t\t\tbreak;\n \t\tcase 'p':\n \t\t\tpnor = strdup(optarg);\n \t\t\tbreak;\n \t\tcase 's':\n \t\t\tblock_size = strtoul(optarg, NULL, 0);\n \t\t\tbreak;\n-\t\tcase 't':\n-\t\t\tsides = strtoul(optarg, NULL, 0);\n-\t\t\tbreak;\n \t\tdefault:\n \t\t\texit(1);\n \t\t}\n \t}\n \n-\tif (sides == 0)\n-\t\tsides = 1;\n-\n-\tif (sides > 2) {\n-\t\tfprintf(stderr, \"Greater than two sides is not supported\\n\");\n-\t\tbad_input = true;\n-\t}\n-\n \tif (!block_size || !block_count || !input || !pnor)\n \t\tbad_input = true;\n \n-\t/* TODO Check assumption that sides divide the flash in half. */\n-\tif (block_count % sides) {\n-\t\tfprintf(stderr, \"Invalid block_count %u for sides %u\\n\", block_count, sides);\n-\t\tbad_input = true;\n-\t}\n-\n-\tif (bad_input || order == ORDER_ABD) {\n+\tif (bad_input) {\n \t\tprint_help(pname);\n \t\trc = 1;\n \t\tgoto out;\n \t}\n \n-\trc = ffs_hdr_new(block_size, block_count / sides, &new_hdr);\n+\trc = ffs_hdr_new(block_size, block_count, &new_hdr);\n \tif (rc) {\n \t\tif (rc == FFS_ERR_BAD_SIZE) {\n \t\t\t/* Well this check is a tad redudant now */\n@@ -185,14 +142,6 @@ int main(int argc, char *argv[])\n \t\tgoto out;\n \t}\n \n-\tif (sides == 2) {\n-\t\trc = ffs_hdr_add_side(new_hdr);\n-\t\tif (rc) {\n-\t\t\tfprintf(stderr, \"Couldn't add side to header\\n\");\n-\t\t\tgoto out_free_hdr;\n-\t\t}\n-\t}\n-\n \tin_file = fopen(input, \"r\");\n \tif (!in_file) {\n \t\trc = errno;\n@@ -221,7 +170,6 @@ int main(int argc, char *argv[])\n \t\tstruct ffs_entry_user user = { 0 };\n \t\tchar *pos, *old_pos;\n \t\tchar *name, *endptr;\n-\t\tint side = -1;\n \t\tuint32_t pbase, psize, pactual = 0;\n \n \t\t/* Inline comments in input file */\n@@ -303,20 +251,6 @@ int main(int argc, char *argv[])\n \t\t\tcase 'B':\n \t\t\t\tuser.miscflags |= FFS_MISCFLAGS_BACKUP;\n \t\t\t\tbreak;\n-\t\t\tcase '0':\n-\t\t\tcase '1':\n-\t\t\tcase '2':\n-\t\t\t\t/*\n-\t\t\t\t * There should only be one side specified, fail if\n-\t\t\t\t * we've already seen a side\n-\t\t\t\t */\n-\t\t\t\tif (side != -1) {\n-\t\t\t\t\trc = -1;\n-\t\t\t\t\tgoto out_close_bl;\n-\t\t\t\t} else {\n-\t\t\t\t\tside = *pos - '0';\n-\t\t\t\t}\n-\t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\tfprintf(stderr, \"Unknown flag '%c'\\n\", *pos);\n \t\t\t\trc = -1;\n@@ -325,9 +259,6 @@ int main(int argc, char *argv[])\n \t\t\tpos++;\n \t\t}\n \n-\t\tif (side == -1) /* Default to 0 */\n-\t\t\tside = 0;\n-\n \t\tprintf(\"Adding '%s' 0x%08x, 0x%08x\\n\", name, pbase, psize);\n \t\trc = ffs_entry_new(name, pbase, psize, &new_entry);\n \t\tif (rc) {\n@@ -342,7 +273,7 @@ int main(int argc, char *argv[])\n \t\t\tgoto out_while;\n \t\t}\n \n-\t\trc = ffs_entry_add(new_hdr, new_entry, side);\n+\t\trc = ffs_entry_add(new_hdr, new_entry, 0);\n \t\tif (rc) {\n \t\t\tfprintf(stderr, \"Couldn't add entry '%s' 0x%08x for 0x%08x\\n\",\n \t\t\t\t\tname, pbase, psize);\n@@ -411,14 +342,6 @@ out_while:\n \t\tgoto out_close_bl;\n \t}\n \n-\tif (backup_part) {\n-\t\trc = ffs_hdr_create_backup(new_hdr);\n-\t\tif (rc) {\n-\t\t\tfprintf(stderr, \"Failed to create backup part\\n\");\n-\t\t\tgoto out_close_bl;\n-\t\t}\n-\t}\n-\n \trc = ffs_hdr_finalise(bl, new_hdr);\n \tif (rc)\n \t\tfprintf(stderr, \"Failed to write out TOC values\\n\");\ndiff --git a/external/ffspart/test/results/00-usage.out b/external/ffspart/test/results/00-usage.out\nindex 19eedc74..3ad0441d 100644\n--- a/external/ffspart/test/results/00-usage.out\n+++ b/external/ffspart/test/results/00-usage.out\n@@ -11,11 +11,6 @@ Usage: ./ffspart [options] -s size -c num -i layout_file -p pnor_file ...\n \t-i, --input=file\n \t\tFile containing the required partition data\n \n-\t-o, --order=( ADB | ABD )\n-\t\tOrdering of the TOC, Data and Backup TOC. Currently only ADB (default)\n-\t\tis supported\n \t-p, --pnor=file\n \t\tOutput file to write data\n \n-\t-t, --sides=( 1 | 2 )\n-\t\tNumber of sides to the flash (Default: 1)\ndiff --git a/external/ffspart/test/tests/01-param-sanity b/external/ffspart/test/tests/01-param-sanity\nindex 9e28c45d..28acf511 100644\n--- a/external/ffspart/test/tests/01-param-sanity\n+++ b/external/ffspart/test/tests/01-param-sanity\n@@ -1,6 +1,10 @@\n #! /bin/sh\n \n-run_binary \"./ffspart\" \"-t 3 -s 1 -c 3 -i /dev/null -p /dev/null\"\n+#This test has become a little redundant now.\n+#TODO Do more sanity checking\n+return 0\n+\n+run_binary \"./ffspart\" \"-s 1 -c 3 -i /dev/null -p /dev/null\"\n if [ \"$?\" -ne 1 ] ; then\n \tfail_test\n fi\ndiff --git a/external/ffspart/test/tests/02-param-sides b/external/ffspart/test/tests/02-param-sides\nindex cd7984b8..17a2461e 100644\n--- a/external/ffspart/test/tests/02-param-sides\n+++ b/external/ffspart/test/tests/02-param-sides\n@@ -1,6 +1,10 @@\n #! /bin/sh\n \n-run_binary \"./ffspart\" \"-t 2 -s 1 -c 1 -i /dev/null -p /dev/null\"\n+#The parameter has been removed\n+#TODO Something clever with this test\n+return 0\n+\n+run_binary \"./ffspart\" \"-s 1 -c 1 -i /dev/null -p /dev/null\"\n if [ \"$?\" -ne 1 ] ; then\n \tfail_test\n fi\ndiff --git a/external/ffspart/test/tests/03.1-tiny-pnor-backup b/external/ffspart/test/tests/03.1-tiny-pnor-backup\nindex 3065c864..8fa8d4e4 100644\n--- a/external/ffspart/test/tests/03.1-tiny-pnor-backup\n+++ b/external/ffspart/test/tests/03.1-tiny-pnor-backup\n@@ -1,5 +1,9 @@\n #! /bin/sh\n \n+#The backup partition flag is gone\n+#disable this test temporarily\n+return 0\n+\n touch $DATA_DIR/$CUR_TEST.gen\n \n run_binary \"./ffspart\" \"-b -s 0x100 -c 15 -i $DATA_DIR/$CUR_TEST.in -p $DATA_DIR/$CUR_TEST.gen\"\ndiff --git a/external/ffspart/test/tests/05.1-hdr-overlap-backup b/external/ffspart/test/tests/05.1-hdr-overlap-backup\nindex 5814ffff..0cbd9fa4 100644\n--- a/external/ffspart/test/tests/05.1-hdr-overlap-backup\n+++ b/external/ffspart/test/tests/05.1-hdr-overlap-backup\n@@ -1,8 +1,12 @@\n #! /bin/sh\n \n+#The backup partition flag is gone\n+#disable this test temporarily\n+return 0\n+\n touch $DATA_DIR/$CUR_TEST.gen\n \n-run_binary \"./ffspart\" \"-b -s 0x100 -c 10 -i $DATA_DIR/$CUR_TEST.in -p $DATA_DIR/$CUR_TEST.gen\"\n+run_binary \"./ffspart\" \"-s 0x100 -c 10 -i $DATA_DIR/$CUR_TEST.in -p $DATA_DIR/$CUR_TEST.gen\"\n #expect this error code, which is FFS_ERR_BAD_PART_BASE becase we're\n #going to have too many partitions for header to fit before the first\n #partition\n", "prefixes": [ "RFC", "06/13" ] }