Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp107897pxt; Thu, 5 Aug 2021 19:43:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6zxTh8j+a25JCXFhJw6jym4fFBXpwckfZ8K5m7Qq6Ifa7Gp/ENbgolXDCGQk0dVT8LOLL X-Received: by 2002:a17:906:d925:: with SMTP id rn5mr7579107ejb.429.1628217823009; Thu, 05 Aug 2021 19:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628217823; cv=none; d=google.com; s=arc-20160816; b=yTlOtmhg54A8zQmuJHLCl/Jl0RAE9O+hae88KvqphZgAiaUcZMF5P7UbiOg54fESZ6 WCEqcKAznl7VO0X+VGzOT38kRvJe2IM8uR4F016/N5dZyj3CaFvBYVtrkUhE4tf5QtQt CWtZ5j7ifFeKofqveYOYxR68ZKYsRqdN7rEricPSxiwq/hMmZ0DV42oiYP9PD/sojNrz 1chEvrJNf6qgj0bgX1RuesI6hqYhLACHjQrvfLAppvJiU7MjsrFvkhC/LfLEhg4hztwN jClwjS3plRMvLtTxd3RZRWiKzBwfEqpaOkeXTQuXlPM8DTXqdm6oNqJxA8iEK7qpbeQ0 +YOQ== 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 :message-id:date:subject:to:from:dkim-signature; bh=pieJupk7tCt0wBOdPy1PnlhT4fSICDJbopsvr0wMo0Y=; b=GOEYtjhQwOEv6Ju7B0DYa9rq1pvS3+5Qfkx/vEaN+ioKOjpHphZdjEGE6ZMaLLgAw/ F2aTNa/7JDXmbjO+J/aHMeLcJt5hd0XvEnyB9ukMoHyLCKJDGzqm2H1gu1IV5laye7Sm oFJCErQM98IFext9exYKZT/DihnAVeXXV7fdu1YkIvXUJXRqnAry629dHlxb+OcwF2jm zEVt7mdyD2bxPesmmveeWSzod2CoBN0C+2lYG/taLXQNVKA1EAjl36MB9D0uBWhBQnou gjDZ1vSe8PvzqnQoINLg1zq121JLgFxeQAZB9e+Mrb2boaw8LgNh3WPEBvRW5S6J3Dcg GYCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="bffx3m/1"; 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 wc16si6468362ejb.95.2021.08.05.19.43.18; Thu, 05 Aug 2021 19:43:43 -0700 (PDT) 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="bffx3m/1"; 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 S241023AbhHFAnY (ORCPT + 99 others); Thu, 5 Aug 2021 20:43:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241348AbhHFAnV (ORCPT ); Thu, 5 Aug 2021 20:43:21 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFAF8C0613D5 for ; Thu, 5 Aug 2021 17:43:06 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id l19so13212684pjz.0 for ; Thu, 05 Aug 2021 17:43:06 -0700 (PDT) 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=pieJupk7tCt0wBOdPy1PnlhT4fSICDJbopsvr0wMo0Y=; b=bffx3m/1WsIXofBSptWTkrzWX69mWT7grro6gXLAJxiUN/3Nsb/z+jT8vAt/VioNeh K4tDEhl4xKmggFngQkiMPQAZlA/p1RmtiaDKHNemqelYSoT8Zjj1kFc1srrdaW4O1Eo6 lZZhONxwB1WfSE4bjaneQl4zLS9ODMm+0liZfsTx21DMcedzNPafymokODt69sfIhbcG ejMigcPQDMT7xdJNppuPnV/xJU802ozG0qYkncnYFPL25x/sMIm3YOcLcZOdk7PZC9JQ URCbuyBXTMwo1t4O1ER4X6/pFd3E6o3232AZk+aWSP9tf0mTykts9HInXEqTQf1+MUW+ y0lQ== 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=pieJupk7tCt0wBOdPy1PnlhT4fSICDJbopsvr0wMo0Y=; b=ofR3//Obi/vKnZQ+6rmOvOqM6cJgEZ1d/lDOdJGgleWr4bFVv2WkE7+b0kH80x8214 7uM+DfbZFZ4GrRoZub9barGwLSr+NTfIAxfFJrswDhUoKqgtu/6hOk+Flk5isw3Qo3P6 f8P/iVdnuVhb/gc3Ac17794VReYYmRHQ/JBPK100zrzjxuLbEN2I6QQBV/sD9olXKzw1 EKbjEh0e/PvmzbL0x39XcArWbKcln0OIx6sPQmLzvXqDc/COMLFyYWQMQY310kc+54FM mZZmmNLpcLqv4MWXkDZEMXFuatrbm0xVunzOCjDqyh+gxYKpov7T0QEMScN31vgHjC85 C+ig== X-Gm-Message-State: AOAM532yUUQxhNSTbwsxDCf2BJGplbHNvRDVuROfZqNXVinwP6MPAVrv 7L0EVnKqqnohjTf6/+0bn53Es6HIq+g= X-Received: by 2002:a17:90a:138f:: with SMTP id i15mr7466158pja.173.1628210586054; Thu, 05 Aug 2021 17:43:06 -0700 (PDT) Received: from localhost.localdomain ([2601:1c0:6a01:d830:93f5:285f:92e6:eeb4]) by smtp.gmail.com with ESMTPSA id u129sm8426942pfc.59.2021.08.05.17.43.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 17:43:05 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [RESEND PATCH v2] monitor: Add support for tlv based version format for Intel vendor Date: Thu, 5 Aug 2021 17:43:04 -0700 Message-Id: <20210806004304.53880-1-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.25.1 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 Some Intel device supports two different formats of the HCI_Intel_Read_Version command depends on the command parameter and this patch parses the command and response parameters depends on the format. --- monitor/intel.c | 219 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 2 deletions(-) diff --git a/monitor/intel.c b/monitor/intel.c index 7591df4ee..e9984bfe3 100644 --- a/monitor/intel.c +++ b/monitor/intel.c @@ -164,6 +164,168 @@ static void reset_cmd(const void *data, uint8_t size) print_field("Boot address: 0x%8.8x", boot_addr); } +struct intel_version_tlv { + uint8_t type; + uint8_t len; + uint8_t val[]; +}; + +static void print_version_tlv_u32(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): 0x%8.8x", type_str, tlv->type, get_le32(tlv->val)); +} + +static void print_version_tlv_u16(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): 0x%4.4x", type_str, tlv->type, get_le16(tlv->val)); +} + +static void print_version_tlv_u8(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): 0x%2.2x", type_str, tlv->type, get_u8(tlv->val)); +} + +static void print_version_tlv_enabled(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): %s(%u)", type_str, tlv->type, + tlv->val[0] ? "Enabled" : "Disabled", + tlv->val[0]); +} + +static void print_version_tlv_img_type(const struct intel_version_tlv *tlv, + char *type_str) +{ + const char *str; + + switch (get_u8(tlv->val)) { + case 0x01: + str = "Bootloader"; + break; + case 0x03: + str = "Firmware"; + break; + default: + str = "Unknown"; + break; + } + print_field("%s(%u): %s(0x%2.2x)", type_str, tlv->type, str, + get_u8(tlv->val)); +} + +static void print_version_tlv_timestamp(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): %u-%u", type_str, tlv->type, + tlv->val[1], tlv->val[0]); +} + +static void print_version_tlv_min_fw(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): %u-%u.%u", type_str, tlv->type, + tlv->val[0], tlv->val[1], 2000 + tlv->val[2]); +} + +static void print_version_tlv_otp_bdaddr(const struct intel_version_tlv *tlv, + char *type_str) +{ + packet_print_addr(type_str, tlv->val, false); +} + +static void print_version_tlv_unknown(const struct intel_version_tlv *tlv, + char *type_str) +{ + print_field("%s(%u): ", type_str, tlv->type); + packet_hexdump(tlv->val, tlv->len); +} + +static void print_version_tlv_mfg(const struct intel_version_tlv *tlv, + char *type_str) +{ + uint16_t mfg_id = get_le16(tlv->val); + + print_field("%s(%u): %s (%u)", type_str, tlv->type, + bt_compidtostr(mfg_id), mfg_id); +} + +static const struct intel_version_tlv_desc { + uint8_t type; + char *type_str; + void (*func)(const struct intel_version_tlv *tlv, char *type_str); +} intel_version_tlv_table[] = { + { 16, "CNVi TOP", print_version_tlv_u32 }, + { 17, "CNVr TOP", print_version_tlv_u32 }, + { 18, "CNVi BT", print_version_tlv_u32 }, + { 19, "CNVr BT", print_version_tlv_u32 }, + { 20, "CNVi OTP", print_version_tlv_u16 }, + { 21, "CNVr OTP", print_version_tlv_u16 }, + { 22, "Device Rev ID", print_version_tlv_u16 }, + { 23, "USB VID", print_version_tlv_u16 }, + { 24, "USB PID", print_version_tlv_u16 }, + { 25, "PCIE VID", print_version_tlv_u16 }, + { 26, "PCIe DID", print_version_tlv_u16 }, + { 27, "PCIe Subsystem ID", print_version_tlv_u16 }, + { 28, "Image Type", print_version_tlv_img_type }, + { 29, "Time Stamp", print_version_tlv_timestamp }, + { 30, "Build Type", print_version_tlv_u8 }, + { 31, "Build Num", print_version_tlv_u32 }, + { 32, "FW Build Product", print_version_tlv_u8 }, + { 33, "FW Build HW", print_version_tlv_u8 }, + { 34, "FW Build Step", print_version_tlv_u8 }, + { 35, "BT Spec", print_version_tlv_u8 }, + { 36, "Manufacturer", print_version_tlv_mfg }, + { 37, "HCI Revision", print_version_tlv_u16 }, + { 38, "LMP SubVersion", print_version_tlv_u16 }, + { 39, "OTP Patch Version", print_version_tlv_u8 }, + { 40, "Secure Boot", print_version_tlv_enabled }, + { 41, "Key From Header", print_version_tlv_enabled }, + { 42, "OTP Lock", print_version_tlv_enabled }, + { 43, "API Lock", print_version_tlv_enabled }, + { 44, "Debug Lock", print_version_tlv_enabled }, + { 45, "Minimum FW", print_version_tlv_min_fw }, + { 46, "Limited CCE", print_version_tlv_enabled }, + { 47, "SBE Type", print_version_tlv_u8 }, + { 48, "OTP BDADDR", print_version_tlv_otp_bdaddr }, + { 49, "Unlocked State", print_version_tlv_enabled }, + { 0, NULL, NULL }, +}; + +static void read_version_tlv_rsp(const void *data, uint8_t size) +{ + uint8_t status = get_u8(data); + + print_status(status); + + /* Consume the status */ + data++; + size--; + + while (size > 0) { + const struct intel_version_tlv *tlv = data; + const struct intel_version_tlv_desc *desc = NULL; + int i; + + for (i = 0; intel_version_tlv_table[i].type > 0; i++) { + if (intel_version_tlv_table[i].type == tlv->type) { + desc = &intel_version_tlv_table[i]; + break; + } + } + + if (desc) + desc->func(tlv, desc->type_str); + else + print_version_tlv_unknown(tlv, "Unknown Type"); + + data += sizeof(*tlv) + tlv->len; + size -= sizeof(*tlv) + tlv->len; + } +} + static void read_version_rsp(const void *data, uint8_t size) { uint8_t status = get_u8(data); @@ -177,6 +339,16 @@ static void read_version_rsp(const void *data, uint8_t size) uint8_t fw_build_yy = get_u8(data + 8); uint8_t fw_patch = get_u8(data + 9); + /* There are two different formats of the response for the + * HCI_Intel_Read_version command depends on the command parameters + * If the size is fixed to 10 and hw_platform is 0x37, then it is the + * legacy format, otherwise use the tlv based format. + */ + if (size != 10 && hw_platform != 0x37) { + read_version_tlv_rsp(data, size); + return; + } + print_status(status); print_field("Hardware platform: 0x%2.2x", hw_platform); print_field("Hardware variant: 0x%2.2x", hw_variant); @@ -191,6 +363,49 @@ static void read_version_rsp(const void *data, uint8_t size) print_field("Firmware patch: %u", fw_patch); } +static void read_version_cmd(const void *data, uint8_t size) +{ + char *str; + uint8_t type; + + /* This is the legacy read version command format and no further action + * is needed + */ + if (size == 0) + return; + + print_field("Requested Type:"); + + while (size > 0) { + const struct intel_version_tlv_desc *desc = NULL; + int i; + + type = get_u8(data); + + /* Get all supported types */ + if (type == 0xff) + str = "All Supported Types"; + else { + for (i = 0; intel_version_tlv_table[i].type > 0; i++) { + if (intel_version_tlv_table[i].type == type) { + desc = &intel_version_tlv_table[i]; + break; + } + } + + if (desc) + str = desc->type_str; + else + str = "Unknown Type"; + } + + print_field(" %s(0x%2.2x)", str, type); + + data += sizeof(type); + size -= sizeof(type); + } +} + static void set_uart_baudrate_cmd(const void *data, uint8_t size) { uint8_t baudrate = get_u8(data); @@ -498,8 +713,8 @@ static const struct vendor_ocf vendor_ocf_table[] = { status_rsp, 1, true }, { 0x002, "No Operation" }, { 0x005, "Read Version", - null_cmd, 0, true, - read_version_rsp, 10, true }, + read_version_cmd, 0, false, + read_version_rsp, 1, false }, { 0x006, "Set UART Baudrate", set_uart_baudrate_cmd, 1, true, status_rsp, 1, true }, -- 2.25.1