1. Patchew
  2. linux
  3. [PATCH v13 0/2] Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA2066
  4. View patch

[PATCH v13 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression

Tim Jiang posted 2 patches 2 years, 6 months ago
There is a newer version of this series
[PATCH v13 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression
Posted by Tim Jiang 2 years, 6 months ago 
This patch make the print btsoc type expression more clearly.

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

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 9b785c947d96..e11d47210e80 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,32 @@ 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_QCA6390:
+		soc_name = "QCA6390";
+		break;
+	case QCA_WCN3990:
+	case QCA_WCN3991:
+	case QCA_WCN3998:
+		soc_name = "wcn399x";
+		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;
 
-- 
2.41.0
Re: [PATCH v13 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression
Posted by Johan Hovold 2 years, 6 months ago 
On Thu, Jul 27, 2023 at 12:40:10PM +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/hci_qca.c | 31 +++++++++++++++++++++++++++----
>  1 file changed, 27 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 9b785c947d96..e11d47210e80 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,32 @@ 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_QCA6390:
> +		soc_name = "QCA6390";
> +		break;
> +	case QCA_WCN3990:
> +	case QCA_WCN3991:
> +	case QCA_WCN3998:
> +		soc_name = "wcn399x";
> +		break;
> +	case QCA_WCN6750:
> +		soc_name = "wcn6750";
> +		break;
> +	case QCA_WCN6855:
> +		soc_name = "wcn6855";
> +		break;

I still think the above should be sorted (alphabetically) as maintaining
these lists otherwise soon becomes harder than it should be. And similar
throughout the driver.

> +	default:
> +		soc_name = "unknown soc";
> +		break;
> +	}
> +	bt_dev_info(hdev, "setting up %s", soc_name);

Johan
Re: [PATCH v13 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression
Posted by Tim Jiang 2 years, 6 months ago 
On 7/27/23 15:27, Johan Hovold wrote:
> On Thu, Jul 27, 2023 at 12:40:10PM +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/hci_qca.c | 31 +++++++++++++++++++++++++++----
>>   1 file changed, 27 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
>> index 9b785c947d96..e11d47210e80 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,32 @@ 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_QCA6390:
>> +		soc_name = "QCA6390";
>> +		break;
>> +	case QCA_WCN3990:
>> +	case QCA_WCN3991:
>> +	case QCA_WCN3998:
>> +		soc_name = "wcn399x";
>> +		break;
>> +	case QCA_WCN6750:
>> +		soc_name = "wcn6750";
>> +		break;
>> +	case QCA_WCN6855:
>> +		soc_name = "wcn6855";
>> +		break;
> I still think the above should be sorted (alphabetically) as maintaining
> these lists otherwise soon becomes harder than it should be. And similar
> throughout the driver.
[Tim] Hi Johan: I think we no need to sort it, we only add the new btsoc 
name following the older one, for example , ar300x is the oldest , ROME 
is new than ar300x, actually qca2066 is newer version chip than qca6390, 
so I does not think we need to sort it.
>
>> +	default:
>> +		soc_name = "unknown soc";
>> +		break;
>> +	}
>> +	bt_dev_info(hdev, "setting up %s", soc_name);
> Johan
Re: [PATCH v13 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression
Posted by Johan Hovold 2 years, 6 months ago 
On Thu, Jul 27, 2023 at 03:34:53PM +0800, Tim Jiang wrote:
> On 7/27/23 15:27, Johan Hovold wrote:
> > On Thu, Jul 27, 2023 at 12:40:10PM +0800, Tim Jiang wrote:

> >> @@ -1762,10 +1763,32 @@ 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_QCA6390:
> >> +		soc_name = "QCA6390";
> >> +		break;
> >> +	case QCA_WCN3990:
> >> +	case QCA_WCN3991:
> >> +	case QCA_WCN3998:
> >> +		soc_name = "wcn399x";
> >> +		break;
> >> +	case QCA_WCN6750:
> >> +		soc_name = "wcn6750";
> >> +		break;
> >> +	case QCA_WCN6855:
> >> +		soc_name = "wcn6855";
> >> +		break;
> > I still think the above should be sorted (alphabetically) as maintaining
> > these lists otherwise soon becomes harder than it should be. And similar
> > throughout the driver.

> [Tim] Hi Johan: I think we no need to sort it, we only add the new btsoc 
> name following the older one, for example , ar300x is the oldest , ROME 
> is new than ar300x, actually qca2066 is newer version chip than qca6390, 
> so I does not think we need to sort it.

Possibly, but generally this becomes hard to maintain and eventually
someone will need to sort these entries anyway. Therefore it's generally
a good idea to just do so from the start.

But it was good that you replied so that we know that this comment was
not just missed or ignored.

> >> +	default:
> >> +		soc_name = "unknown soc";
> >> +		break;
> >> +	}
> >> +	bt_dev_info(hdev, "setting up %s", soc_name);

Johan

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.