From patchwork Wed Mar 20 07:19:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quic_zijuhu X-Patchwork-Id: 781391 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E616438DC0 for ; Wed, 20 Mar 2024 07:19:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710919196; cv=none; b=EDqOdlah9qAa+gp419gXqSETXH57bCJDZExnh4nGpdFSplqvKj5lkWNGOYFaFNX0iMbT8h2cO2LKl247YSL7Twt2WNt029KwVywvnjK8WsVJ3LxEEJXxrmL19WimxPFVd3wutKJX8naO3RP5qQ7+ZUSzw0JGn0x9QYpYOioCjd0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710919196; c=relaxed/simple; bh=lO1Fdj6/jBVe7a3IMjVthPTi30f+LSKJNJfcWBh2IEI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=euvEFV8E6/x8ToZhT8BtO6EDqH8nXgJHdN2sXmcgBuveG9glhpgbgv7Dvk3Q23jwcPIF3lej92+bSyxVjb6h2kh+TFrHbLUrefnvqlVNkHfqDSxSo6j4WfXqvXZqj83OwH66ZJfqOM5fW7wLTJR8NU5ZiWixyrqBhlwcsulWOWg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=LUZWflz/; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="LUZWflz/" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42K4SSZG019359; Wed, 20 Mar 2024 07:19:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=c/saCsWreSwTn89Dne65 Z1TR8eSJ04xIWaP2+xMAVVk=; b=LUZWflz/kHlcPPn6lyotZlNLk/nwQuQN5sqV 3pjgml6NKGjXmwxJJyDXbSDk7MlFRh07hqLmwmrjmo+/s9MtzA7G6su0CfLssI1P JpQxMmVDnTIZAnGTz7IXg7YehrWXOLQ2oGG2KSkAWYuohe6izw7I8vYGFWRbh2lV O6YWM6l5PGKSFHvCyGRu5km7fEWbroARgtaAh1wY0akIopZRAarFMD4CV/mdsDzv YGRMR3z6LwJWUFp9rrDIO7W8+KLckC+2ap9NfbBcv7ZlMD2GzpBhgoBcyYV6rrm/ lcXUinjCZfMqddogNnTgs6IAUbx5aFLfDsParWraBFf6NuQIYg== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3wye5n9p2x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Mar 2024 07:19:51 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 42K7JoMU020683 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Mar 2024 07:19:50 GMT Received: from zijuhu-gv.qualcomm.com (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 20 Mar 2024 00:19:49 -0700 From: Zijun Hu To: , CC: Subject: [PATCH v1] tools/btattach: Add support for all QCA soc_types Date: Wed, 20 Mar 2024 15:19:21 +0800 Message-ID: <1710919161-19190-1-git-send-email-quic_zijuhu@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1710914907-30012-1-git-send-email-quic_zijuhu@quicinc.com> References: <1710914907-30012-1-git-send-email-quic_zijuhu@quicinc.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: yKd8x3MZs-cxvPU-5C4vBnd1vux2CJ3m X-Proofpoint-ORIG-GUID: yKd8x3MZs-cxvPU-5C4vBnd1vux2CJ3m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-20_04,2024-03-18_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 spamscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 mlxlogscore=687 mlxscore=0 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2403140001 definitions=main-2403200057 Tool btattach currently only supports QCA default soc_type QCA_ROME, this change adds support for all other QCA soc_types by adding a option to specify soc_type. --- tools/btattach.c | 29 ++++++++++++++++++++++++----- tools/btattach.rst | 2 ++ tools/hciattach.h | 2 ++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/tools/btattach.c b/tools/btattach.c index 4ce1be78d69c..024b0c7a289c 100644 --- a/tools/btattach.c +++ b/tools/btattach.c @@ -97,7 +97,8 @@ static void local_version_callback(const void *data, uint8_t size, } static int attach_proto(const char *path, unsigned int proto, - unsigned int speed, bool flowctl, unsigned int flags) + unsigned int speed, bool flowctl, unsigned int flags, + unsigned long soc_type) { int fd, dev_id; @@ -111,6 +112,16 @@ static int attach_proto(const char *path, unsigned int proto, return -1; } + if ((proto == HCI_UART_QCA) && (soc_type > 0)) { + if (ioctl(fd, HCIUARTSETPROTODATA, soc_type) < 0) { + fprintf(stderr, + "Failed to set soc_type(%lu) for protocol qca\n", + soc_type); + close(fd); + return -1; + } + } + if (ioctl(fd, HCIUARTSETPROTO, proto) < 0) { perror("Failed to set protocol"); close(fd); @@ -181,6 +192,7 @@ static void usage(void) "\t-A, --amp Attach AMP controller\n" "\t-P, --protocol Specify protocol type\n" "\t-S, --speed Specify which baudrate to use\n" + "\t-T, --type Specify soc_type for protocol qca\n" "\t-N, --noflowctl Disable flow control\n" "\t-h, --help Show help options\n"); } @@ -190,6 +202,7 @@ static const struct option main_options[] = { { "amp", required_argument, NULL, 'A' }, { "protocol", required_argument, NULL, 'P' }, { "speed", required_argument, NULL, 'S' }, + { "type", required_argument, NULL, 'T' }, { "noflowctl",no_argument, NULL, 'N' }, { "version", no_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, @@ -221,12 +234,13 @@ int main(int argc, char *argv[]) bool flowctl = true, raw_device = false; int exit_status, count = 0, proto_id = HCI_UART_H4; unsigned int speed = B115200; + unsigned long soc_type = 0; for (;;) { int opt; - opt = getopt_long(argc, argv, "B:A:P:S:NRvh", - main_options, NULL); + opt = getopt_long(argc, argv, "B:A:P:S:T:NRvh", + main_options, NULL); if (opt < 0) break; @@ -237,6 +251,9 @@ int main(int argc, char *argv[]) case 'A': amp_path = optarg; break; + case 'T': + soc_type = strtoul(optarg, NULL, 0); + break; case 'P': proto = optarg; break; @@ -298,7 +315,8 @@ int main(int argc, char *argv[]) if (raw_device) flags = (1 << HCI_UART_RAW_DEVICE); - fd = attach_proto(bredr_path, proto_id, speed, flowctl, flags); + fd = attach_proto(bredr_path, proto_id, speed, flowctl, flags, + soc_type); if (fd >= 0) { mainloop_add_fd(fd, 0, uart_callback, NULL, NULL); count++; @@ -317,7 +335,8 @@ int main(int argc, char *argv[]) if (raw_device) flags = (1 << HCI_UART_RAW_DEVICE); - fd = attach_proto(amp_path, proto_id, speed, flowctl, flags); + fd = attach_proto(amp_path, proto_id, speed, flowctl, flags, + soc_type); if (fd >= 0) { mainloop_add_fd(fd, 0, uart_callback, NULL, NULL); count++; diff --git a/tools/btattach.rst b/tools/btattach.rst index 787d5c49e3bb..4aad3b915641 100644 --- a/tools/btattach.rst +++ b/tools/btattach.rst @@ -62,6 +62,8 @@ OPTIONS -S baudrate, --speed baudrate Specify wich baudrate to use +-T soc_type, --type soc_type Specify soc_type for protocol qca + -N, --noflowctl Disable flow control -v, --version Show version diff --git a/tools/hciattach.h b/tools/hciattach.h index dfa4c1e7abe7..998a2a9a8460 100644 --- a/tools/hciattach.h +++ b/tools/hciattach.h @@ -19,6 +19,8 @@ #define HCIUARTGETDEVICE _IOR('U', 202, int) #define HCIUARTSETFLAGS _IOW('U', 203, int) #define HCIUARTGETFLAGS _IOR('U', 204, int) +#define HCIUARTSETPROTODATA _IOW('U', 205, unsigned long) + #define HCI_UART_H4 0 #define HCI_UART_BCSP 1 From patchwork Wed Mar 20 06:08:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quic_zijuhu X-Patchwork-Id: 781392 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5296F17548 for ; Wed, 20 Mar 2024 06:08:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710914944; cv=none; b=Xo5r9GAAejt8eBy+QOIlplTFmsyg54YP3meTe76pqIYZL7BXLVnq/cXz0lk+hWXQn/74iLoou5CSkHIenDZr7/YlfdhWeHZiCeFVaoMkczuIB1vB7KeX7g0/WrUM7IKHEZeBj4X8siOrwUlfNSIpwKg+1w3Uhhadn+nm5ve4bb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710914944; c=relaxed/simple; bh=6Fpp7Et4/rFCDQak1UvP6i4IyL8s7+YWc+m7tcPqTlU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AvIXoUukh+mTinXK5axcz2d+zxWG4kmcrSmlJ+c0QVY8K61uFj2M5VzU/mnSEOn5PDKNnyHG7rw4yUe8dwjeCVAezHxjDmntfBbKafM6ZC9OgyOdnhjMOygRBN/rEldPgyw6STZo/e/YHakMGhoHWPVpp+TXAsRyJrtBZgOgmsU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=nvdYeTKG; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="nvdYeTKG" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42K4edli029777; Wed, 20 Mar 2024 06:08:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=r+v3XUw7YkiiUtTM+gKj nFHhbtREOnJzAdtL9EVC75I=; b=nvdYeTKG3a4b+13hxvqz8xMVz6aLNmvExWRS 2tsZ0M4EpOKtohpUMfvZiLIlyPGvkbcuVmWH2yxqrv4kqs1mmVmUkYRXLoxJh8ZS 5Nh/6xRZ9rCh9lqz2sKeV8wh6E+RfDvmFEQP3UC0p2Dcsjm7J4aUonVuEp3DoVzM c7np7Jnu4qQ+iOvzkWIY32wzlACDjGBcuUN0JOSvj4t5BiYDXMrITovHEiHqtoT1 fMVSAqiEReNnHZBwHxtx33ZVNOsI7HQrf6+q/wq32kl9boO0PsQGzYupTmWtOoIu kZGKyGzMg4H0oahBzrx6eRkciDlTAFULLa02/luctH6sIoTm4A== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3wygbbh3jp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Mar 2024 06:08:56 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 42K68tnV009902 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Mar 2024 06:08:55 GMT Received: from zijuhu-gv.qualcomm.com (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Tue, 19 Mar 2024 23:08:54 -0700 From: Zijun Hu To: , CC: , Zijun Hu Subject: [PATCH v1 2/2] Bluetooth: qca: Fix wrong soc_type returned for tool btattach Date: Wed, 20 Mar 2024 14:08:27 +0800 Message-ID: <1710914907-30012-3-git-send-email-quic_zijuhu@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1710914907-30012-1-git-send-email-quic_zijuhu@quicinc.com> References: <1710914907-30012-1-git-send-email-quic_zijuhu@quicinc.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: dqvUUy5KOQVdu0qo-e0ji-CfZxH_RUnw X-Proofpoint-GUID: dqvUUy5KOQVdu0qo-e0ji-CfZxH_RUnw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-20_03,2024-03-18_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 adultscore=0 mlxscore=0 impostorscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 spamscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2403140001 definitions=main-2403200046 qca_soc_type() returns wrong soc_type QCA_ROME when use tool btattach for any other soc_type such as QCA_QCA2066, and wrong soc_type will cause later initialization failure, fixed by using user specified soc_type for hci_uart derived from tool btattach. Signed-off-by: Zijun Hu --- drivers/bluetooth/btqca.h | 1 + drivers/bluetooth/hci_qca.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index dc31984f71dc..a148d4c4e1bd 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -153,6 +153,7 @@ enum qca_btsoc_type { QCA_WCN6750, QCA_WCN6855, QCA_WCN7850, + QCA_MAX, }; #if IS_ENABLED(CONFIG_BT_QCA) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 8a60ad7acd70..06bbcc678f88 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -238,12 +238,17 @@ static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb); static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu) { + /* For Non-serdev device, hu->proto_data records soc_type + * set by ioctl HCIUARTSETPROTODATA. + */ + int proto_data = (int)hu->proto_data; enum qca_btsoc_type soc_type; if (hu->serdev) { struct qca_serdev *qsd = serdev_device_get_drvdata(hu->serdev); - soc_type = qsd->btsoc_type; + } else if ((proto_data > 0) && (proto_data < QCA_MAX)) { + soc_type = (enum qca_btsoc_type)proto_data; } else { soc_type = QCA_ROME; } @@ -2286,6 +2291,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) return -ENOMEM; qcadev->serdev_hu.serdev = serdev; + qcadev->serdev_hu.proto_data = 0; data = device_get_match_data(&serdev->dev); serdev_device_set_drvdata(serdev, qcadev); device_property_read_string(&serdev->dev, "firmware-name", From patchwork Wed Apr 17 12:52:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quic_zijuhu X-Patchwork-Id: 789447 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1977213C685 for ; Wed, 17 Apr 2024 12:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713358395; cv=none; b=mbdYOHLqIEVs7OkJf+pt3rXeH9ngo4nx1N/faErhfUbRgtQpBs2GS065o07xEfBafEEkdOjNxxkIjFXPvZ6CeYAqGPkKg0RH0HuspF0OCHWQNmpvWTsjG9X5UN+2Iq+U4qDGoDpTElObbkAXGh5hj9nYw6CiCYX9G1HIFlBwcBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713358395; c=relaxed/simple; bh=5A0rZQo2upNCYelDQTTRkv8bDBl9IzhYlWyJmSMZRpU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ILLtwk8LLxpfkHqqtijwEZtrpw6HWY5UM/hXA5HeJ5zy0rmfUoQvwDJTnG4MBfgstWfUUymLHGA+nQQhE3gze1IfQ31XL+Qd4llNoyVIwmrj8rwaJ8sCxdj8epjacEsqG835iap3trlQJRlrS+IdJ6M0Yqac4BlyKuFXw3s+LT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=EnMe5/Bn; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="EnMe5/Bn" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 43HACrWi024119; Wed, 17 Apr 2024 12:53:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=ALF3LUL2yYb2zHY8ugcv ky+QYOVJVuvtlOnkWjNplbE=; b=EnMe5/BnNKFnZaea5ayEZFqvHQsd61Idc5Xz lN6HYYG24v/nMaJHh6uYWEjVfU+L3h6qe3usqwVtq9hAoLJsAMqgDttIvmg6uI15 TFlYvAbapuL8KQ/fdIH0SRh9cBeS4j2O63gVqzpDl+j9vX9wU58IxHjunE32vnxE 6iq+Ww/Gf/KcCGpAuhFw9MmmN88sbkdj2ul0zSrVd4CC3I9hUeYKwgf4Yek5yQUC mjWYOat0foxj4Fr7Z8jmYOK0Xwf7GEkTqfSzXQz2lWAuB2KHhC1GLJ5OsSaqs4NF iujg9bG38wnTGY9XYu24aDimzUM/lDuX344ytnc+SYKm3SI/NQ== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3xjceh0bpr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Apr 2024 12:53:10 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 43HCr9bF024491 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Apr 2024 12:53:09 GMT Received: from zijuhu-gv.qualcomm.com (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 17 Apr 2024 05:53:07 -0700 From: Zijun Hu To: , , CC: , Zijun Hu Subject: [PATCH v2 4/4] Bluetooth: qca: Fix wrong soc type returned for tool btattach Date: Wed, 17 Apr 2024 20:52:16 +0800 Message-ID: <1713358336-29619-5-git-send-email-quic_zijuhu@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1713358336-29619-1-git-send-email-quic_zijuhu@quicinc.com> References: <1710914907-30012-1-git-send-email-quic_zijuhu@quicinc.com> <1713358336-29619-1-git-send-email-quic_zijuhu@quicinc.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: GegivuuISc8_73_OTgKnQtxM9hKx4mou X-Proofpoint-ORIG-GUID: GegivuuISc8_73_OTgKnQtxM9hKx4mou X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-17_10,2024-04-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 bulkscore=0 adultscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2404010003 definitions=main-2404170087 qca_soc_type() returns wrong soc type QCA_ROME when use tool btattach for any other soc type such as QCA_QCA2066, and wrong soc type will cause later initialization failure, fixed by using user specified soc type for hci_uart derived from tool btattach. Signed-off-by: Zijun Hu --- drivers/bluetooth/btqca.h | 1 + drivers/bluetooth/hci_qca.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index dc31984f71dc..a148d4c4e1bd 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -153,6 +153,7 @@ enum qca_btsoc_type { QCA_WCN6750, QCA_WCN6855, QCA_WCN7850, + QCA_MAX, }; #if IS_ENABLED(CONFIG_BT_QCA) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index c04b97332bca..7c3577a4887c 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -238,12 +238,17 @@ static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb); static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu) { + /* For Non-serdev device, hu->proto_data records soc type + * set by ioctl HCIUARTSETPROTODATA. + */ + int proto_data = (int)hu->proto_data; enum qca_btsoc_type soc_type; if (hu->serdev) { struct qca_serdev *qsd = serdev_device_get_drvdata(hu->serdev); - soc_type = qsd->btsoc_type; + } else if ((proto_data > 0) && (proto_data < QCA_MAX)) { + soc_type = (enum qca_btsoc_type)proto_data; } else { soc_type = QCA_ROME; } @@ -2281,6 +2286,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) return -ENOMEM; qcadev->serdev_hu.serdev = serdev; + qcadev->serdev_hu.proto_data = 0; data = device_get_match_data(&serdev->dev); serdev_device_set_drvdata(serdev, qcadev); device_property_read_string(&serdev->dev, "firmware-name",