{"id":801897,"url":"http://patchwork.ozlabs.org/api/1.2/patches/801897/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1502862122-14771-9-git-send-email-bmeng.cn@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1502862122-14771-9-git-send-email-bmeng.cn@gmail.com>","list_archive_url":null,"date":"2017-08-16T05:41:57","name":"[U-Boot,08/13] x86: fsp: Update fsp command to show spec 1.1 header","commit_ref":"b3fd2126dc8114d648b1e769b9fa621e3537bf48","pull_url":null,"state":"accepted","archived":false,"hash":"f1ffbf4b0cc44dd624c685a8b4323f5b170196a2","submitter":{"id":64981,"url":"http://patchwork.ozlabs.org/api/1.2/people/64981/?format=json","name":"Bin Meng","email":"bmeng.cn@gmail.com"},"delegate":{"id":56520,"url":"http://patchwork.ozlabs.org/api/1.2/users/56520/?format=json","username":"bmeng","first_name":"Bin","last_name":"Meng","email":"bmeng.cn@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1502862122-14771-9-git-send-email-bmeng.cn@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/801897/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/801897/checks/","tags":{},"related":[],"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"T2UjAhfo\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xXJCz5j6hz9sPr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 16 Aug 2017 15:43:11 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 79D90C21E3A; Wed, 16 Aug 2017 05:40:46 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 48C04C21DD9;\n\tWed, 16 Aug 2017 05:38:59 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 18E1DC21E0C; Wed, 16 Aug 2017 05:37:55 +0000 (UTC)","from mail-io0-f194.google.com (mail-io0-f194.google.com\n\t[209.85.223.194])\n\tby lists.denx.de (Postfix) with ESMTPS id AD059C21DED\n\tfor <u-boot@lists.denx.de>; Wed, 16 Aug 2017 05:37:51 +0000 (UTC)","by mail-io0-f194.google.com with SMTP id q64so1790293ioi.0\n\tfor <u-boot@lists.denx.de>; Tue, 15 Aug 2017 22:37:51 -0700 (PDT)","from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com.\n\t[147.11.156.139])\n\tby smtp.gmail.com with ESMTPSA id g13sm30442ioi.0.2017.08.15.22.37.49\n\t(version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 15 Aug 2017 22:37:49 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:subject:date:message-id:in-reply-to:references;\n\tbh=VAE9R6Is1Cx77fSpbrljiid6g5PIlsdOGc08G98nvr0=;\n\tb=T2UjAhfoqsvQuFA9n/huHNZZ0hGmc6KXrUZCr5RfxClEZmxstl32YIM613tlXEXX+b\n\tZLRfKQxWut5fnp4TFY4OaNLjDcHjOOWGw0Dsqw28eJELpJz7EDM3nxYqnvMx68HjNGwF\n\tWNSFkCOKrh/NP/uo/3507Ep5Ma/dc8Dgn+ZDL+tI3nYcVXzjjUcfm0rCOditlx44MDjo\n\tipKXLyKBqqP0fKGrCkKPhFhCtUwAhzAolmFlGdFg2k9hSa+mPsdHn/8BmfSl6d51tewF\n\tPrBcDehsYHzuMjYEhPgryGG2hVJY1+/MUFFxaapWZqMP+p/n4q7xdZDkudzEIXOYpuEV\n\t0oBQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=VAE9R6Is1Cx77fSpbrljiid6g5PIlsdOGc08G98nvr0=;\n\tb=J8hYGUtXNtdYfuBTuhCm93ml3rjDCrTj4z7SvVjAoZbJs4bq6WovrugqdQvO0zV889\n\tFyxokgEBXaUFe/YwIQoLpXWa46Bw0dIBx3UyZkcAkrbycXaFA9H7T3X6420F/j2corno\n\tw/nUfYhp6ZLD23nfo1RTX7ntyAhgpj05R6iT7qCmmt8rnTSbDqxW+MzcrMGydjb8xv/Y\n\tz7poRXjOT5lSR12d+ANJpOflcW/EtO8E1UZ2maCXQ76tvZvov6W4OASgDOsCMq/PgcZC\n\tH0CS/BGXlVXNr/ubvN87euJ48lavekUB2lGmA+LzRLbDfy46N0QLwiq1ItzyiVvWifv+\n\t/m7A==","X-Gm-Message-State":"AHYfb5irYeQmdRMHOOCqlmLfWAdD5AwVKQdkHspVDtQX8fPrCYx739uX\n\tLMqaGnTdWdIgmHTo","X-Received":"by 10.107.163.82 with SMTP id m79mr514430ioe.230.1502861870647; \n\tTue, 15 Aug 2017 22:37:50 -0700 (PDT)","From":"Bin Meng <bmeng.cn@gmail.com>","To":"Simon Glass <sjg@chromium.org>,\n\tU-Boot Mailing List <u-boot@lists.denx.de>","Date":"Tue, 15 Aug 2017 22:41:57 -0700","Message-Id":"<1502862122-14771-9-git-send-email-bmeng.cn@gmail.com>","X-Mailer":"git-send-email 1.7.9.5","In-Reply-To":"<1502862122-14771-1-git-send-email-bmeng.cn@gmail.com>","References":"<1502862122-14771-1-git-send-email-bmeng.cn@gmail.com>","Subject":"[U-Boot] [PATCH 08/13] x86: fsp: Update fsp command to show spec\n\t1.1 header","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"},"content":"FSP spec 1.1 adds 3 new APIs and their offsets are in the header.\nUpdate the 'fsp hdr' command to show these new entries.\n\nSigned-off-by: Bin Meng <bmeng.cn@gmail.com>\n---\n\n arch/x86/include/asm/fsp/fsp_infoheader.h |  9 ++++++++-\n arch/x86/lib/fsp/cmd_fsp.c                | 24 ++++++++++++++++++++++--\n 2 files changed, 30 insertions(+), 3 deletions(-)","diff":"diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h\nindex 4a4d627..60ce61d 100644\n--- a/arch/x86/include/asm/fsp/fsp_infoheader.h\n+++ b/arch/x86/include/asm/fsp/fsp_infoheader.h\n@@ -26,7 +26,14 @@ struct __packed fsp_header {\n \tu32\tfsp_tempram_init;\t/* tempram_init offset */\n \tu32\tfsp_init;\t\t/* fsp_init offset */\n \tu32\tfsp_notify;\t\t/* fsp_notify offset */\n-\tu32\treserved2;\n+\tu32\tfsp_mem_init;\t\t/* fsp_mem_init offset */\n+\tu32\tfsp_tempram_exit;\t/* fsp_tempram_exit offset */\n+\tu32\tfsp_silicon_init;\t/* fsp_silicon_init offset */\n };\n \n+#define FSP_HEADER_REVISION_1\t\t1\n+#define FSP_HEADER_REVISION_2\t\t2\n+\n+#define FSP_ATTR_GRAPHICS_SUPPORT\t(1 << 0)\n+\n #endif\ndiff --git a/arch/x86/lib/fsp/cmd_fsp.c b/arch/x86/lib/fsp/cmd_fsp.c\nindex 2554663..2a99cfe 100644\n--- a/arch/x86/lib/fsp/cmd_fsp.c\n+++ b/arch/x86/lib/fsp/cmd_fsp.c\n@@ -38,17 +38,37 @@ static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n \tfor (i = 0; i < sizeof(hdr->sign); i++)\n \t\tprintf(\"%c\", *sign++);\n \tprintf(\", size %d, rev %d\\n\", hdr->hdr_len, hdr->hdr_rev);\n-\tprintf(\"Image  : rev %d.%d, id \",\n-\t       (hdr->img_rev >> 8) & 0xff, hdr->img_rev & 0xff);\n+\tprintf(\"Image  : rev \");\n+\tif (hdr->hdr_rev == FSP_HEADER_REVISION_1) {\n+\t\tprintf(\"%d.%d\",\n+\t\t       (hdr->img_rev >> 8) & 0xff, hdr->img_rev & 0xff);\n+\t} else {\n+\t\tprintf(\"%d.%d.%d.%d\",\n+\t\t       (hdr->img_rev >> 24) & 0xff, (hdr->img_rev >> 16) & 0xff,\n+\t\t       (hdr->img_rev >> 8) & 0xff, hdr->img_rev & 0xff);\n+\t}\n+\tprintf(\", id \");\n \tfor (i = 0; i < ARRAY_SIZE(hdr->img_id); i++)\n \t\tprintf(\"%c\", hdr->img_id[i]);\n \tprintf(\", addr 0x%08x, size %d\\n\", img_addr, hdr->img_size);\n+\tif (hdr->hdr_rev == FSP_HEADER_REVISION_2) {\n+\t\tprintf(\"GFX    :%ssupported\\n\",\n+\t\t       hdr->img_attr & FSP_ATTR_GRAPHICS_SUPPORT ? \" \" : \" un\");\n+\t}\n \tprintf(\"VPD    : addr 0x%08x, size %d\\n\",\n \t       hdr->cfg_region_off + img_addr, hdr->cfg_region_size);\n \tprintf(\"\\nNumber of APIs Supported : %d\\n\", hdr->api_num);\n \tprintf(\"\\tTempRamInit : 0x%08x\\n\", hdr->fsp_tempram_init + img_addr);\n \tprintf(\"\\tFspInit     : 0x%08x\\n\", hdr->fsp_init + img_addr);\n \tprintf(\"\\tFspNotify   : 0x%08x\\n\", hdr->fsp_notify + img_addr);\n+\tif (hdr->hdr_rev == FSP_HEADER_REVISION_2) {\n+\t\tprintf(\"\\tMemoryInit  : 0x%08x\\n\",\n+\t\t       hdr->fsp_mem_init + img_addr);\n+\t\tprintf(\"\\tTempRamExit : 0x%08x\\n\",\n+\t\t       hdr->fsp_tempram_exit + img_addr);\n+\t\tprintf(\"\\tSiliconInit : 0x%08x\\n\",\n+\t\t       hdr->fsp_silicon_init + img_addr);\n+\t}\n \n \treturn 0;\n }\n","prefixes":["U-Boot","08/13"]}