Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2182425pxb; Fri, 29 Jan 2021 15:56:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzujf3fPt22CQXE91uIQTPTLu5YxPLhD9qnnyYMPqw4Ut1M9lGqYSLnrNl8Dur0+yxfP/zW X-Received: by 2002:a17:906:46d3:: with SMTP id k19mr6734499ejs.546.1611964578673; Fri, 29 Jan 2021 15:56:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611964578; cv=none; d=google.com; s=arc-20160816; b=hwsPvqU0THGZ0ZKLNiLzbXEmGnZTDiywfIZ3xC2MwGqjgzX3Gio8rRLtJICRg+BYQy Pi7/cfnjm/ZgguqQqCgTfIGrTFWdY0mdy0qBZRiFSWJDuowIPTVKLaE/0edaKCU0JzAB Om/okqIh8SvkfC/UMszmR0uUJV2Rv4KCJGdmGatH/bERHpySLu81/lcaoxWcfC/VWQcA hTbsPYXpI0O9YaVEl/dOhWMaQQwwYzD+6rp3kPZfzpsoUq4LTY85nitaxxV8eeijNE3t A8kkRXZ0JhZWNhqd4SspBj8KnxzbM9zcyDpKNNpwDtHzJ0inmKNcuzF6Sd3CorMRwQZj 2uyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=VeAnf3C0fNBxBCOWFyTyptsCrkdSHRzUPX3+BIcsGqg=; b=RPjIuo7wULNzT6dycbq1cFCX7J7qG3URaOmzYIivyK7cEvG7UtOLjGqN+LjpUHmGt+ iq0qTEAxRux6T2GXqkc3g5a6/n2PK2Irbr/+4WVKfkp81G9Lp8+k/8WXuCxyYc0frMIH 4v+vFEsNgSH3dh2Q0BPU3odmue1q5QaEsx3K6fkfZpbyxcf1+WXik9Qrz/tqL6Y3dWID VmOHOCDY/GJryjrdAFEZhsGttlST8xGDYxFDeFFXWz32Z4yi8pzgeN5GUaeWR2YJIOh9 44vcwSr6NhCoHXQlV/JhnUGkf61KxrjspSRx4i1stk4+rlaDa5TE086nV+v+LQfrZqzi Vrow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="Ysj/N7Q5"; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a7si6222791edr.457.2021.01.29.15.55.54; Fri, 29 Jan 2021 15:56:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="Ysj/N7Q5"; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230009AbhA2Xwt (ORCPT + 99 others); Fri, 29 Jan 2021 18:52:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231138AbhA2Xwm (ORCPT ); Fri, 29 Jan 2021 18:52:42 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 851E5C061574 for ; Fri, 29 Jan 2021 15:52:02 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id o20so7236977pfu.0 for ; Fri, 29 Jan 2021 15:52:02 -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=VeAnf3C0fNBxBCOWFyTyptsCrkdSHRzUPX3+BIcsGqg=; b=Ysj/N7Q51arbpPPlle5bxtjeF405w5CFXQsf5BIY1o8zzL/0D0GP1b72oOAMfsW70M Sx1jBnjMVedhUrtjdMacKwlw00aS9nEjmEG9PQ0V+MU1mwtRQE0qR4PD6V1kafKanGx/ 6sRqBwkNL+BQpHe08gJ39olAlHwr4U2IwXK5y/v8XLetejKYG7e5xBpDu/fwctsFWBcY 8ffYYonsjx02w6JaXYuXVcWLLFR2RqTRaXJF06MWOpR53k3k1Hm5QIMrznPfH9Grzsgm YfqqcUII7NAce9p03GxFInyVp7BWyKQM1J4k5DKyglvxfptfMLuaj2UAm3VFweprxBFZ /X1A== 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=VeAnf3C0fNBxBCOWFyTyptsCrkdSHRzUPX3+BIcsGqg=; b=qXliz73w/t0pR7yq25fCc4GQGpBDZf7eIyRSkvmGKkhhQN542jm4+uzirCp4m+N7pO zMAdOCKJx8n1NhKV7vAw/YIrfwwUc+n8lngkLrSCn9F6vA0EW9kdqivDrJAJ/SO3oH5Y 717+mCumB4XfQTdUXIiA5mi4OuHZoKOwb59CJ7nFLrXbiSMVLpfucfn8mAxCyR+okzGK S7mSEa/s53gR8xwfvsFOGeztSwKXAIdLhZcDymwG4VXykAcQyaZaQjpgCz+arrsRrhz+ 0cIFEjoVJ/m7jcA0E6OHh3ifdpFxTj1fA0FAyK+S9hT/6JqXpw2+rQoxXuXYU+oyZLzw ERkw== X-Gm-Message-State: AOAM532O54WAreAnx5/cuGgr2ZWml/vqS01IrCnfONq2Qed+C/OLJsxm Tw5oeCeXVyddeYyemv3lqhbiTA64dKCI2w== X-Received: by 2002:aa7:978e:0:b029:1bd:f965:66dd with SMTP id o14-20020aa7978e0000b02901bdf96566ddmr6516140pfp.46.1611964321865; Fri, 29 Jan 2021 15:52:01 -0800 (PST) Received: from han1-XPS-13-9350.hsd1.or.comcast.net ([2601:1c0:6a01:30d0:c047:f587:7300:6549]) by smtp.gmail.com with ESMTPSA id z11sm8963190pjn.5.2021.01.29.15.52.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 15:52:01 -0800 (PST) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 2/2] tools/bluemoon: Add support for checking other firware file types. Date: Fri, 29 Jan 2021 15:51:59 -0800 Message-Id: <20210129235159.90017-2-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129235159.90017-1-hj.tedd.an@gmail.com> References: <20210129235159.90017-1-hj.tedd.an@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 extenstion 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 912f4f2a9..5940fec9d 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 suppored 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; -- 2.25.1