diff mbox series

[v12,1/2] Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA2066

Message ID 20230726052245.609987-2-quic_tjiang@quicinc.com (mailing list archive)
State Superseded
Headers show
Series Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA2066 | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/SubjectPrefix success Gitlint PASS
tedd_an/BuildKernel success BuildKernel PASS
tedd_an/CheckAllWarning success CheckAllWarning PASS
tedd_an/CheckSparse success CheckSparse PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/BuildKernel32 success BuildKernel32 PASS
tedd_an/TestRunnerSetup success TestRunnerSetup PASS
tedd_an/TestRunner_l2cap-tester success TestRunner PASS
tedd_an/TestRunner_iso-tester success TestRunner PASS
tedd_an/TestRunner_bnep-tester success TestRunner PASS
tedd_an/TestRunner_mgmt-tester success TestRunner PASS
tedd_an/TestRunner_rfcomm-tester success TestRunner PASS
tedd_an/TestRunner_sco-tester success TestRunner PASS
tedd_an/TestRunner_ioctl-tester success TestRunner PASS
tedd_an/TestRunner_mesh-tester success TestRunner PASS
tedd_an/TestRunner_smp-tester success TestRunner PASS
tedd_an/TestRunner_userchan-tester success TestRunner PASS
tedd_an/IncrementalBuild success Incremental Build PASS

Commit Message

Tim Jiang July 26, 2023, 5:22 a.m. UTC 
This patch make the print btsoc type expression more clearly.

Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
---
 drivers/bluetooth/btqca.h   |  1 +
 drivers/bluetooth/hci_qca.c | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

Comments

bluez.test.bot@gmail.com July 26, 2023, 6 a.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=769552

---Test result---

Test Summary:
CheckPatch                    PASS      1.95 seconds
GitLint                       PASS      0.67 seconds
SubjectPrefix                 PASS      0.24 seconds
BuildKernel                   PASS      32.64 seconds
CheckAllWarning               PASS      35.17 seconds
CheckSparse                   PASS      39.99 seconds
CheckSmatch                   PASS      112.03 seconds
BuildKernel32                 PASS      31.03 seconds
TestRunnerSetup               PASS      472.71 seconds
TestRunner_l2cap-tester       PASS      22.10 seconds
TestRunner_iso-tester         PASS      41.97 seconds
TestRunner_bnep-tester        PASS      10.03 seconds
TestRunner_mgmt-tester        PASS      212.34 seconds
TestRunner_rfcomm-tester      PASS      15.17 seconds
TestRunner_sco-tester         PASS      16.02 seconds
TestRunner_ioctl-tester       PASS      16.94 seconds
TestRunner_mesh-tester        PASS      12.66 seconds
TestRunner_smp-tester         PASS      13.54 seconds
TestRunner_userchan-tester    PASS      10.46 seconds
IncrementalBuild              PASS      34.50 seconds



---
Regards,
Linux Bluetooth
Johan Hovold July 26, 2023, 6:59 a.m. UTC | #2 
Please fix up the subject of this patch, which should be different from
patch 2/2 and instead summarise what *this* patch does.

Note that keeping the same 2/2 subject on the cover letter is fine as
2/2 is the primary patch and sort of summarises the series.

On Wed, Jul 26, 2023 at 01:22:44PM +0800, Tim Jiang wrote:
> This patch make the print btsoc type expression more clearly.
> 
> Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
> ---
>  drivers/bluetooth/btqca.h   |  1 +
>  drivers/bluetooth/hci_qca.c | 34 ++++++++++++++++++++++++++++++----
>  2 files changed, 31 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
> index b884095bcd9d..529382f0abb1 100644
> --- a/drivers/bluetooth/btqca.h
> +++ b/drivers/bluetooth/btqca.h
> @@ -148,6 +148,7 @@ enum qca_btsoc_type {
>  	QCA_QCA6390,
>  	QCA_WCN6750,
>  	QCA_WCN6855,
> +	QCA_QCA2066,

This belongs in the next patch.

These are currently not sorted by probably should be to make it easier
to look up and add new entries. This could be done in a third,
preparatory, patch.

>  };
>  
>  #if IS_ENABLED(CONFIG_BT_QCA)
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 9b785c947d96..453000df7aec 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1748,6 +1748,7 @@ static int qca_setup(struct hci_uart *hu)
>  	const char *firmware_name = qca_get_firmware_name(hu);
>  	int ret;
>  	struct qca_btsoc_version ver;
> +	const char *soc_name;
>  
>  	ret = qca_check_speeds(hu);
>  	if (ret)
> @@ -1762,10 +1763,35 @@ static int qca_setup(struct hci_uart *hu)
>  	 */
>  	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
>  
> -	bt_dev_info(hdev, "setting up %s",
> -		qca_is_wcn399x(soc_type) ? "wcn399x" :
> -		(soc_type == QCA_WCN6750) ? "wcn6750" :
> -		(soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");
> +	switch (soc_type) {
> +	case QCA_AR3002:
> +		soc_name = "ar300x";
> +		break;
> +	case QCA_ROME:
> +		soc_name = "ROME";
> +		break;
> +	case QCA_WCN3990:
> +	case QCA_WCN3991:
> +	case QCA_WCN3998:
> +		soc_name = "wcn399x";
> +		break;
> +	case QCA_QCA2066:
> +		soc_name = "QCA2066";
> +		break;

This also belongs in the next patch.

> +	case QCA_QCA6390:
> +		soc_name = "QCA6390";
> +		break;
> +	case QCA_WCN6750:
> +		soc_name = "wcn6750";
> +		break;
> +	case QCA_WCN6855:
> +		soc_name = "wcn6855";
> +		break;
> +	default:
> +		soc_name = "unknown soc";
> +		break;
> +	}

And you should probably sort the above as well.

> +	bt_dev_info(hdev, "setting up %s", soc_name);
>  
>  	qca->memdump_state = QCA_MEMDUMP_IDLE;

Johan
Tim Jiang July 27, 2023, 4:34 a.m. UTC | #3 
Hi Johan:

   I will address your comments in v13 version.


regards

On 7/26/23 14:59, Johan Hovold wrote:
> Please fix up the subject of this patch, which should be different from
> patch 2/2 and instead summarise what *this* patch does.
>
> Note that keeping the same 2/2 subject on the cover letter is fine as
> 2/2 is the primary patch and sort of summarises the series.
>
> On Wed, Jul 26, 2023 at 01:22:44PM +0800, Tim Jiang wrote:
>> This patch make the print btsoc type expression more clearly.
>>
>> Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
>> ---
>>   drivers/bluetooth/btqca.h   |  1 +
>>   drivers/bluetooth/hci_qca.c | 34 ++++++++++++++++++++++++++++++----
>>   2 files changed, 31 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
>> index b884095bcd9d..529382f0abb1 100644
>> --- a/drivers/bluetooth/btqca.h
>> +++ b/drivers/bluetooth/btqca.h
>> @@ -148,6 +148,7 @@ enum qca_btsoc_type {
>>   	QCA_QCA6390,
>>   	QCA_WCN6750,
>>   	QCA_WCN6855,
>> +	QCA_QCA2066,
> This belongs in the next patch.
>
> These are currently not sorted by probably should be to make it easier
> to look up and add new entries. This could be done in a third,
> preparatory, patch.
>
>>   };
>>   
>>   #if IS_ENABLED(CONFIG_BT_QCA)
>> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
>> index 9b785c947d96..453000df7aec 100644
>> --- a/drivers/bluetooth/hci_qca.c
>> +++ b/drivers/bluetooth/hci_qca.c
>> @@ -1748,6 +1748,7 @@ static int qca_setup(struct hci_uart *hu)
>>   	const char *firmware_name = qca_get_firmware_name(hu);
>>   	int ret;
>>   	struct qca_btsoc_version ver;
>> +	const char *soc_name;
>>   
>>   	ret = qca_check_speeds(hu);
>>   	if (ret)
>> @@ -1762,10 +1763,35 @@ static int qca_setup(struct hci_uart *hu)
>>   	 */
>>   	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
>>   
>> -	bt_dev_info(hdev, "setting up %s",
>> -		qca_is_wcn399x(soc_type) ? "wcn399x" :
>> -		(soc_type == QCA_WCN6750) ? "wcn6750" :
>> -		(soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");
>> +	switch (soc_type) {
>> +	case QCA_AR3002:
>> +		soc_name = "ar300x";
>> +		break;
>> +	case QCA_ROME:
>> +		soc_name = "ROME";
>> +		break;
>> +	case QCA_WCN3990:
>> +	case QCA_WCN3991:
>> +	case QCA_WCN3998:
>> +		soc_name = "wcn399x";
>> +		break;
>> +	case QCA_QCA2066:
>> +		soc_name = "QCA2066";
>> +		break;
> This also belongs in the next patch.
>
>> +	case QCA_QCA6390:
>> +		soc_name = "QCA6390";
>> +		break;
>> +	case QCA_WCN6750:
>> +		soc_name = "wcn6750";
>> +		break;
>> +	case QCA_WCN6855:
>> +		soc_name = "wcn6855";
>> +		break;
>> +	default:
>> +		soc_name = "unknown soc";
>> +		break;
>> +	}
> And you should probably sort the above as well.
>
>> +	bt_dev_info(hdev, "setting up %s", soc_name);
>>   
>>   	qca->memdump_state = QCA_MEMDUMP_IDLE;
> Johan
diff mbox series

Patch

diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index b884095bcd9d..529382f0abb1 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -148,6 +148,7 @@  enum qca_btsoc_type {
 	QCA_QCA6390,
 	QCA_WCN6750,
 	QCA_WCN6855,
+	QCA_QCA2066,
 };
 
 #if IS_ENABLED(CONFIG_BT_QCA)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 9b785c947d96..453000df7aec 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1748,6 +1748,7 @@  static int qca_setup(struct hci_uart *hu)
 	const char *firmware_name = qca_get_firmware_name(hu);
 	int ret;
 	struct qca_btsoc_version ver;
+	const char *soc_name;
 
 	ret = qca_check_speeds(hu);
 	if (ret)
@@ -1762,10 +1763,35 @@  static int qca_setup(struct hci_uart *hu)
 	 */
 	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
 
-	bt_dev_info(hdev, "setting up %s",
-		qca_is_wcn399x(soc_type) ? "wcn399x" :
-		(soc_type == QCA_WCN6750) ? "wcn6750" :
-		(soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");
+	switch (soc_type) {
+	case QCA_AR3002:
+		soc_name = "ar300x";
+		break;
+	case QCA_ROME:
+		soc_name = "ROME";
+		break;
+	case QCA_WCN3990:
+	case QCA_WCN3991:
+	case QCA_WCN3998:
+		soc_name = "wcn399x";
+		break;
+	case QCA_QCA2066:
+		soc_name = "QCA2066";
+		break;
+	case QCA_QCA6390:
+		soc_name = "QCA6390";
+		break;
+	case QCA_WCN6750:
+		soc_name = "wcn6750";
+		break;
+	case QCA_WCN6855:
+		soc_name = "wcn6855";
+		break;
+	default:
+		soc_name = "unknown soc";
+		break;
+	}
+	bt_dev_info(hdev, "setting up %s", soc_name);
 
 	qca->memdump_state = QCA_MEMDUMP_IDLE;