From patchwork Tue Feb 2 03:40:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tedd Ho-Jeong An X-Patchwork-Id: 12060519 X-Patchwork-Delegate: luiz.dentz@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6ADBC433DB for ; Tue, 2 Feb 2021 03:40:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FDF664ED4 for ; Tue, 2 Feb 2021 03:40:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230055AbhBBDkt (ORCPT ); Mon, 1 Feb 2021 22:40:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbhBBDks (ORCPT ); Mon, 1 Feb 2021 22:40:48 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A653C061573 for ; Mon, 1 Feb 2021 19:40:08 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id y205so13426456pfc.5 for ; Mon, 01 Feb 2021 19:40:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HQM9RrRWsegAJXIpcJlxvRsaMrV7eMAfLscLjtTdlcU=; b=b5C6w3t4gTA0TxonlwM91rNQCiIbfupPx5ofUKZewYXaWbDKWpeKStJeoU3ulrLzlL a8FEqOAQ5zRUNJ1Ee3GzSw43TLUxDN2wOE+hiFEcrwyTy2Hi80SzpO4rp7KRZdkenKtx Eh6kU/b79xXXzKTNFmYSEyXZ+raQ4HOK8x5v8jFB+Xnk05zjxTH5gOQssWK4d0eLdpUE a2Arl2ZLKOpvwskUD3o2dc87v5fcVVb96iTE0LH/Tn/zZh6GD2/5OGhIX4D5LHbu0Bq0 kpw3ritaFWDUVz75Ff9AGykrGsOFHbc/39oQKCyAATaG/ziJkKYTb2aWaMTUUcFi38A5 3T/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HQM9RrRWsegAJXIpcJlxvRsaMrV7eMAfLscLjtTdlcU=; b=aAMG09i9unxTQVnZy5315mLflVAfO3h3XrGL9uC4rz0NY4rnEDthJFiRlLulUo6okz JL4Gn5fRgj97a9t8cBBFZgg1bVhL4KQK42lyqCk7PHPlFJ6COI5I8KS7FBQr/hHDbY1s pZf34L0oUIfYnpH/QZ9VUfLkf0ci9vHsT4opwEOnoGJXMnZLrBC4eSxEzW6tmTvZmnRA ra8fZv1PYYzKctJ+w/zgaGZoRbN3WwCa0zV6D1c1cjVmoX9njZrahaSCDSaVj8c8BN+m z0MNAK9XSjVPjFca73pLx69AGkEuVXT5LUan1l1Gp6uFrfdnR2c5PEeI4B461STq+mHh S4cA== X-Gm-Message-State: AOAM531FwPHRc3uLI3OazSYHwl4nCcsjUH+xtvJOX+/SI+TylBniaD64 xpbudKhA+pTBEKTVhWuf0n42aVYNe/9fBg== X-Google-Smtp-Source: ABdhPJxnEHbgxUxPBLQx+FDWugKd6avEbMz3m/n5utNNiu8XYq/eDZq/Ta0eSXeSbfbR69GhN+ah6w== X-Received: by 2002:a63:6c85:: with SMTP id h127mr19984316pgc.158.1612237207756; Mon, 01 Feb 2021 19:40:07 -0800 (PST) Received: from han1-XPS-13-9350.hsd1.or.comcast.net ([2601:1c0:6a01:30d0:2ff9:d5db:6a4d:60be]) by smtp.gmail.com with ESMTPSA id l190sm19689568pfl.205.2021.02.01.19.40.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 19:40:06 -0800 (PST) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v4 1/2] tools/bluemoon: Display FW version of firmware file Date: Mon, 1 Feb 2021 19:40:04 -0800 Message-Id: <20210202034005.27697-1-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An This patch displays a FW version after parsing the WRITE_BOOT_PARAMS command in the firmeare file. It also change the display type for Module vendor and Date in the CSS header to hex for easy read. --- tools/bluemoon.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/bluemoon.c b/tools/bluemoon.c index 8b62b1e7b..382c76c69 100644 --- a/tools/bluemoon.c +++ b/tools/bluemoon.c @@ -805,8 +805,10 @@ static void analyze_firmware(const char *path) le32_to_cpu(css->header_version) >> 16, le32_to_cpu(css->header_version) & 0xffff); printf("Module ID:\t%u\n", le32_to_cpu(css->module_id)); - printf("Module vendor:\t%u\n", le32_to_cpu(css->module_vendor)); - printf("Date:\t\t%u\n", le32_to_cpu(css->date)); + printf("Module vendor:\t0x%x\n", le32_to_cpu(css->module_vendor)); + printf("Date:\t\t%04x-%02x-%02x\n", le32_to_cpu(css->date) >> 16, + le32_to_cpu(css->date) >> 8 & 0xff, + le32_to_cpu(css->date) & 0xff); printf("Size:\t\t%u DWORDs / %u bytes\n", le32_to_cpu(css->size), le32_to_cpu(css->size) * 4); printf("Key size:\t%u DWORDs / %u bytes\n", @@ -840,13 +842,23 @@ static void analyze_firmware(const char *path) while (firmware_offset < firmware_size) { uint16_t opcode; uint8_t dlen; + struct cmd_write_boot_params *params; opcode = get_le16(firmware_data + firmware_offset); dlen = firmware_data[firmware_offset + 2]; switch (opcode) { - case CMD_NO_OPERATION: case CMD_WRITE_BOOT_PARAMS: + params = (void *)&firmware_data[firmware_offset + 3]; + printf("Boot Parameters\n"); + printf("Boot Address:\t0x%08x\n", + le32_to_cpu(params->boot_addr)); + printf("Firmware build:\t%u-%u.%u\n", + params->fw_build_nn, + params->fw_build_cw, + 2000 + params->fw_build_yy); + printf("\n"); + case CMD_NO_OPERATION: case CMD_MEMORY_WRITE: break; default: From patchwork Tue Feb 2 03:40:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tedd Ho-Jeong An X-Patchwork-Id: 12060521 X-Patchwork-Delegate: luiz.dentz@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34056C433E0 for ; Tue, 2 Feb 2021 03:40:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A9D664ED4 for ; Tue, 2 Feb 2021 03:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231156AbhBBDku (ORCPT ); Mon, 1 Feb 2021 22:40:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbhBBDkt (ORCPT ); Mon, 1 Feb 2021 22:40:49 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D27BC06174A for ; Mon, 1 Feb 2021 19:40:09 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id o7so14019178pgl.1 for ; Mon, 01 Feb 2021 19:40:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DTA6bOUp791fsNwbB4tP+OsspavtADy1IjWdoID7w7g=; b=MYxjB5zxbmQaUOt+UnB0PlGzC4ydgmJPKTAYuox1jMyw+hyvopKl3HN1Ojo7FhfCdm N/eamkpFzA1tfdUdWVVOn5erOFDbOs2DXtCFO2E0DhpsBXy+CiwtQVDCO0Bl1YV8sn+a 9Wt87o40m3IflvlqPUeJYLkqIufFBH/r45BUs9APPfmBNnOoEr1d5b8oRQETAIoDIY0+ /TpJ6+BI24/6aZLAWRv/imGceO2Hhco+UY54OvNJhrqAO5BGw6V/AOHeUvpBGQCCXmf5 pMdxI+uZ4sGxT4nCiaRqrPCI8zqQxnJ/I8oCEktwv71dk+tBoZ5nPF3WTe784n6c6J8p ygnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DTA6bOUp791fsNwbB4tP+OsspavtADy1IjWdoID7w7g=; b=DZkS5th6voMGZ7RNYvH6dt0RU8hCv8bT91IWalpY2g1drjxEJpImkdgQGYowb3tDuU syW3PnJDlZcRFmtJSWXSnbsFfoJd09R2jFEPIS4g+dCUBLbqS4E5szUPobniTHAAoywe AHzB+b9v521OsoukFXBc34g5HU43G8vxTCqJgUgnmtjV+0rg3Q7wUTpdzU5FVuDHMZiQ fehq2o0QyYtkf7gr1vWAJRqa2w5Cotjrue9254qU0f9vvPFhSL9hoDkiwyae+jWte6lm OlhAvj3fF+Qwy3DITzkvSTOg/2L6iVpkDj9u6+NiXvAGaC9VM3XsaPPVx5z34OZZCBHb WQsg== X-Gm-Message-State: AOAM531Z1rcLFm1QgUcGXdzUwE8P7eCBzFC4IWPOexkGMth5FPFtEHMR +1CnTvl5jFeCIJuP4juw/shH8Cyi7wC+pg== X-Google-Smtp-Source: ABdhPJyiTTLhIneQo9WtK1RDTqqx50GIFZRl8ecJXiDYEm0zX/7bWqym/U5CU25Lvz4FgD2ds15Z8g== X-Received: by 2002:a62:ae0c:0:b029:1bc:a0b9:f0aa with SMTP id q12-20020a62ae0c0000b02901bca0b9f0aamr19031770pff.78.1612237208670; Mon, 01 Feb 2021 19:40:08 -0800 (PST) Received: from han1-XPS-13-9350.hsd1.or.comcast.net ([2601:1c0:6a01:30d0:2ff9:d5db:6a4d:60be]) by smtp.gmail.com with ESMTPSA id l190sm19689568pfl.205.2021.02.01.19.40.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 19:40:08 -0800 (PST) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v4 2/2] tools/bluemoon: Add support for checking other firmware file types Date: Mon, 1 Feb 2021 19:40:05 -0800 Message-Id: <20210202034005.27697-2-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210202034005.27697-1-hj.tedd.an@gmail.com> References: <20210202034005.27697-1-hj.tedd.an@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An There are more firmware files for Intel devices like .ddc, and .bseq. This patch checks the file extension and analyze the firmware file. --- tools/bluemoon.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tools/bluemoon.c b/tools/bluemoon.c index 382c76c69..f50107a2a 100644 --- a/tools/bluemoon.c +++ b/tools/bluemoon.c @@ -127,6 +127,8 @@ struct cmd_trigger_exception { uint8_t type; } __attribute__ ((packed)); +#define CMD_DDC_CONFIG_WRITE 0xfc8b + #define CMD_MEMORY_WRITE 0xfc8e static struct bt_hci *hci_dev; @@ -608,7 +610,10 @@ static const struct { { 0x0a, "iBT 2.1 (AG620)" }, { 0x0b, "iBT 3.0 (LnP)" }, { 0x0c, "iBT 3.0 (WsP)" }, + { 0x11, "iBT 3.5 (JfP)" }, { 0x12, "iBT 3.5 (ThP)" }, + { 0x13, "iBT 3.5 (HrP)" }, + { 0x14, "iBT 3.5 (CcP)" }, { } }; @@ -657,6 +662,16 @@ static void read_version_complete(const void *data, uint8_t size, } if (load_firmware) { + /* This option is only supported for the legacy ROM produce, + * which can be identified by the fw_variant == 0x01 + */ + if (rsp->fw_variant != 0x01) { + printf("FW Variant: 0x%02x\n", rsp->fw_variant); + fprintf(stderr, "This device is not supported\n"); + mainloop_quit(); + return; + } + if (load_firmware_value) { printf("Firmware: %s\n", load_firmware_value); request_firmware(load_firmware_value); @@ -735,6 +750,95 @@ static void read_version_complete(const void *data, uint8_t size, mainloop_quit(); } +struct ddc { + uint8_t size; + uint16_t id; + uint8_t value[0]; +} __attribute__ ((packed)); + +static unsigned int analyze_ddc(uint8_t *data, ssize_t len) +{ + unsigned int ddc_num; + ssize_t offset; + struct ddc *ddc; + + ddc_num = 0; + offset = 0; + + while (offset < len) { + ddc = (void *)&data[offset]; + offset += ddc->size + 1; + ddc_num++; + } + + return ddc_num; +} + +static void analyze_firmware_bseq(uint8_t *data, ssize_t len) +{ + struct cmd_write_bd_data *bddata = NULL; + unsigned int cmd_num; + unsigned int evt_num; + unsigned int ddc_num; + ssize_t offset; + + offset = 0; + cmd_num = 0; + evt_num = 0; + ddc_num = 0; + + while (offset < len) { + uint8_t type; + struct bt_hci_cmd_hdr *cmd_hdr; + struct bt_hci_evt_hdr *evt_hdr; + + type = data[offset]; + offset += 1; + + /* Command */ + if (type == 0x01) { + cmd_hdr = (void *)&data[offset]; + + if (cmd_hdr->opcode == CMD_WRITE_BD_DATA) + bddata = (void *)&data[offset + 3]; + + if (cmd_hdr->opcode == CMD_DDC_CONFIG_WRITE) + ddc_num = analyze_ddc((void *)&data[offset + 3], + cmd_hdr->plen); + + offset += cmd_hdr->plen + sizeof(*cmd_hdr); + cmd_num++; + + } else if (type == 0x02) { + evt_hdr = (void *)&data[offset]; + offset += evt_hdr->plen + sizeof(*evt_hdr); + evt_num++; + } else { + fprintf(stderr, "Unknown type: 0x%02x\n", type); + return; + } + + } + + printf("Command count:\t%d\n", cmd_num); + printf("Event count:\t%d\n", evt_num); + + if (bddata) { + printf("\n"); + printf("BD Data Configuration\n"); + printf("Features:\t%02X%02X %02X%02X %02X%02X %02X%02X\n", + bddata->features[7], bddata->features[6], + bddata->features[5], bddata->features[4], + bddata->features[3], bddata->features[2], + bddata->features[1], bddata->features[0]); + printf("LE Features:\t%02x\n", bddata->le_features); + printf("LMP Version:\t0x%02x\n", bddata->lmp_version); + } + + if (ddc_num) + printf("Total DDC:\t%d\n", ddc_num); +} + struct css_hdr { uint32_t module_type; uint32_t header_len; @@ -753,6 +857,7 @@ static void analyze_firmware(const char *path) { unsigned int cmd_num = 0; struct css_hdr *css; + const char *ext; struct stat st; ssize_t len; int fd; @@ -790,6 +895,32 @@ static void analyze_firmware(const char *path) goto done; } + /* Check the file extension for file type */ + ext = strrchr(path, '.'); + if (!ext) { + fprintf(stderr, "Unable to get the file extension from path\n"); + goto done; + } + + if (!strncmp(ext, ".ddc", 4)) { + printf("Firmware file type: DDC file\n\n"); + cmd_num = analyze_ddc(firmware_data, len); + printf("Total DDC:\t%d\n", cmd_num); + goto done; + + } else if (!strncmp(ext, ".bseq", 5)) { + printf("Firmware file type: BSEQ file\n\n"); + analyze_firmware_bseq(firmware_data, len); + goto done; + + } else if (!strncmp(ext, ".sfi", 4)) + printf("Firmware file type: SFI file\n\n"); + + else { + fprintf(stderr, "Unknown file extension: %s\n", ext); + goto done; + } + if ((size_t) len < sizeof(*css)) { fprintf(stderr, "Firmware file is too short\n"); goto done;