diff mbox series

[v1] Bluetooth: hci_qca: Add helper to set device address.

Message ID 20181026140450.13172-1-bgodavar@codeaurora.org (mailing list archive)
State Not Applicable, archived
Headers show
Series [v1] Bluetooth: hci_qca: Add helper to set device address. | expand

Commit Message

Balakrishna Godavarthi Oct. 26, 2018, 2:04 p.m. UTC 
This patch add qca_set_device_bdaddr() to set the device
address for latest Qualcomm Bluetooth chipset wcn3990 and above.

Signed-off-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
---
 drivers/bluetooth/btqca.c   | 21 +++++++++++++++++++++
 drivers/bluetooth/btqca.h   |  9 ++++++++-
 drivers/bluetooth/hci_qca.c |  5 ++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

Comments

Matthias Kaehlcke Oct. 26, 2018, 6:53 p.m. UTC | #1 
On Fri, Oct 26, 2018 at 07:34:50PM +0530, Balakrishna Godavarthi wrote:
> This patch add qca_set_device_bdaddr() to set the device
> address for latest Qualcomm Bluetooth chipset wcn3990 and above.
> 
> Signed-off-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
> ---
>  drivers/bluetooth/btqca.c   | 21 +++++++++++++++++++++
>  drivers/bluetooth/btqca.h   |  9 ++++++++-
>  drivers/bluetooth/hci_qca.c |  5 ++++-
>  3 files changed, 33 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index ec9e03a6b778..132dc6ceb174 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -391,6 +391,27 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>  }
>  EXPORT_SYMBOL_GPL(qca_uart_setup);
>  
> +int qca_set_device_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)

nit: just qca_set_bdaddr() ? That would be consistent with
qca_set_bdaddr_rome() and ->set_bdaddr().

> +{
> +	struct sk_buff *skb;
> +	u8 cmd[6];

nit: this doesn't really contain the command (which is
EDL_WRITE_BD_ADDR_OPCODE). Name it 'buf', 'ba' or similar?

re-nit: in the memcpy below 'sizeof(bdaddr_t)' is used, do the same in
the declaration?

> +	int err;
> +
> +	memcpy(cmd, bdaddr, sizeof(bdaddr_t));
> +	skb = __hci_cmd_sync_ev(hdev, EDL_WRITE_BD_ADDR_OPCODE, sizeof(cmd),
> +				cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);
> +	if (IS_ERR(skb)) {
> +		err = PTR_ERR(skb);
> +		bt_dev_err(hdev, "QCA Change address cmd failed (%d)", err);
> +		return err;
> +	}
> +
> +	kfree_skb(skb);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(qca_set_device_bdaddr);
> +
>  MODULE_AUTHOR("Ben Young Tae Kim <ytkim@qca.qualcomm.com>");
>  MODULE_DESCRIPTION("Bluetooth support for Qualcomm Atheros family ver " VERSION);
>  MODULE_VERSION(VERSION);
> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
> index 0c01f375fe83..8771fc2b193d 100644
> --- a/drivers/bluetooth/btqca.h
> +++ b/drivers/bluetooth/btqca.h
> @@ -20,6 +20,7 @@
>  
>  #define EDL_PATCH_CMD_OPCODE		(0xFC00)
>  #define EDL_NVM_ACCESS_OPCODE		(0xFC0B)
> +#define EDL_WRITE_BD_ADDR_OPCODE	(0xFC14)
>  #define EDL_PATCH_CMD_LEN		(1)
>  #define EDL_PATCH_VER_REQ_CMD		(0x19)
>  #define EDL_PATCH_TLV_REQ_CMD		(0x1E)
> @@ -140,7 +141,7 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);
>  int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>  		   enum qca_btsoc_type soc_type, u32 soc_ver);
>  int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);
> -
> +int qca_set_device_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
>  #else
>  
>  static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)
> @@ -159,4 +160,10 @@ static inline int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version)
>  	return -EOPNOTSUPP;
>  }
>  
> +static inline int qca_set_device_bdaddr(struct hci_dev *hdev,
> +					const bdaddr_t *bdaddr)
> +{
> +	return -EOPNOTSUPP;
> +}
> +
>  #endif
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index f036c8f98ea3..f18d9f5a7782 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1241,7 +1241,10 @@ static int qca_setup(struct hci_uart *hu)
>  	}
>  
>  	/* Setup bdaddr */
> -	hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
> +	if (qcadev->btsoc_type == QCA_WCN3990)
> +		hu->hdev->set_bdaddr = qca_set_device_bdaddr;
> +	else
> +		hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
>  
>  	return ret;
>  }

Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Tested-by: Matthias Kaehlcke <mka@chromium.org>
Balakrishna Godavarthi Oct. 31, 2018, 1:36 p.m. UTC | #2 
Hi Matthias,

On 2018-10-27 00:23, Matthias Kaehlcke wrote:
> On Fri, Oct 26, 2018 at 07:34:50PM +0530, Balakrishna Godavarthi wrote:
>> This patch add qca_set_device_bdaddr() to set the device
>> address for latest Qualcomm Bluetooth chipset wcn3990 and above.
>> 
>> Signed-off-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
>> ---
>>  drivers/bluetooth/btqca.c   | 21 +++++++++++++++++++++
>>  drivers/bluetooth/btqca.h   |  9 ++++++++-
>>  drivers/bluetooth/hci_qca.c |  5 ++++-
>>  3 files changed, 33 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
>> index ec9e03a6b778..132dc6ceb174 100644
>> --- a/drivers/bluetooth/btqca.c
>> +++ b/drivers/bluetooth/btqca.c
>> @@ -391,6 +391,27 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t 
>> baudrate,
>>  }
>>  EXPORT_SYMBOL_GPL(qca_uart_setup);
>> 
>> +int qca_set_device_bdaddr(struct hci_dev *hdev, const bdaddr_t 
>> *bdaddr)
> 
> nit: just qca_set_bdaddr() ? That would be consistent with
> qca_set_bdaddr_rome() and ->set_bdaddr().
> 

[Bala]: will update.

>> +{
>> +	struct sk_buff *skb;
>> +	u8 cmd[6];
> 
> nit: this doesn't really contain the command (which is
> EDL_WRITE_BD_ADDR_OPCODE). Name it 'buf', 'ba' or similar?
> 
[Bala]: will update with ba.
> re-nit: in the memcpy below 'sizeof(bdaddr_t)' is used, do the same in
> the declaration?
> 
>> +	int err;
>> +
>> +	memcpy(cmd, bdaddr, sizeof(bdaddr_t));
>> +	skb = __hci_cmd_sync_ev(hdev, EDL_WRITE_BD_ADDR_OPCODE, sizeof(cmd),
>> +				cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);
>> +	if (IS_ERR(skb)) {
>> +		err = PTR_ERR(skb);
>> +		bt_dev_err(hdev, "QCA Change address cmd failed (%d)", err);
>> +		return err;
>> +	}
>> +
>> +	kfree_skb(skb);
>> +
>> +	return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(qca_set_device_bdaddr);
>> +
>>  MODULE_AUTHOR("Ben Young Tae Kim <ytkim@qca.qualcomm.com>");
>>  MODULE_DESCRIPTION("Bluetooth support for Qualcomm Atheros family ver 
>> " VERSION);
>>  MODULE_VERSION(VERSION);
>> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
>> index 0c01f375fe83..8771fc2b193d 100644
>> --- a/drivers/bluetooth/btqca.h
>> +++ b/drivers/bluetooth/btqca.h
>> @@ -20,6 +20,7 @@
>> 
>>  #define EDL_PATCH_CMD_OPCODE		(0xFC00)
>>  #define EDL_NVM_ACCESS_OPCODE		(0xFC0B)
>> +#define EDL_WRITE_BD_ADDR_OPCODE	(0xFC14)
>>  #define EDL_PATCH_CMD_LEN		(1)
>>  #define EDL_PATCH_VER_REQ_CMD		(0x19)
>>  #define EDL_PATCH_TLV_REQ_CMD		(0x1E)
>> @@ -140,7 +141,7 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, 
>> const bdaddr_t *bdaddr);
>>  int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>>  		   enum qca_btsoc_type soc_type, u32 soc_ver);
>>  int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);
>> -
>> +int qca_set_device_bdaddr(struct hci_dev *hdev, const bdaddr_t 
>> *bdaddr);
>>  #else
>> 
>>  static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const 
>> bdaddr_t *bdaddr)
>> @@ -159,4 +160,10 @@ static inline int qca_read_soc_version(struct 
>> hci_dev *hdev, u32 *soc_version)
>>  	return -EOPNOTSUPP;
>>  }
>> 
>> +static inline int qca_set_device_bdaddr(struct hci_dev *hdev,
>> +					const bdaddr_t *bdaddr)
>> +{
>> +	return -EOPNOTSUPP;
>> +}
>> +
>>  #endif
>> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
>> index f036c8f98ea3..f18d9f5a7782 100644
>> --- a/drivers/bluetooth/hci_qca.c
>> +++ b/drivers/bluetooth/hci_qca.c
>> @@ -1241,7 +1241,10 @@ static int qca_setup(struct hci_uart *hu)
>>  	}
>> 
>>  	/* Setup bdaddr */
>> -	hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
>> +	if (qcadev->btsoc_type == QCA_WCN3990)
>> +		hu->hdev->set_bdaddr = qca_set_device_bdaddr;
>> +	else
>> +		hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
>> 
>>  	return ret;
>>  }
> 
> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
> Tested-by: Matthias Kaehlcke <mka@chromium.org>
diff mbox series

Patch

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index ec9e03a6b778..132dc6ceb174 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -391,6 +391,27 @@  int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 }
 EXPORT_SYMBOL_GPL(qca_uart_setup);
 
+int qca_set_device_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
+{
+	struct sk_buff *skb;
+	u8 cmd[6];
+	int err;
+
+	memcpy(cmd, bdaddr, sizeof(bdaddr_t));
+	skb = __hci_cmd_sync_ev(hdev, EDL_WRITE_BD_ADDR_OPCODE, sizeof(cmd),
+				cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);
+	if (IS_ERR(skb)) {
+		err = PTR_ERR(skb);
+		bt_dev_err(hdev, "QCA Change address cmd failed (%d)", err);
+		return err;
+	}
+
+	kfree_skb(skb);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(qca_set_device_bdaddr);
+
 MODULE_AUTHOR("Ben Young Tae Kim <ytkim@qca.qualcomm.com>");
 MODULE_DESCRIPTION("Bluetooth support for Qualcomm Atheros family ver " VERSION);
 MODULE_VERSION(VERSION);
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 0c01f375fe83..8771fc2b193d 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -20,6 +20,7 @@ 
 
 #define EDL_PATCH_CMD_OPCODE		(0xFC00)
 #define EDL_NVM_ACCESS_OPCODE		(0xFC0B)
+#define EDL_WRITE_BD_ADDR_OPCODE	(0xFC14)
 #define EDL_PATCH_CMD_LEN		(1)
 #define EDL_PATCH_VER_REQ_CMD		(0x19)
 #define EDL_PATCH_TLV_REQ_CMD		(0x1E)
@@ -140,7 +141,7 @@  int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 		   enum qca_btsoc_type soc_type, u32 soc_ver);
 int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);
-
+int qca_set_device_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 #else
 
 static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)
@@ -159,4 +160,10 @@  static inline int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version)
 	return -EOPNOTSUPP;
 }
 
+static inline int qca_set_device_bdaddr(struct hci_dev *hdev,
+					const bdaddr_t *bdaddr)
+{
+	return -EOPNOTSUPP;
+}
+
 #endif
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index f036c8f98ea3..f18d9f5a7782 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1241,7 +1241,10 @@  static int qca_setup(struct hci_uart *hu)
 	}
 
 	/* Setup bdaddr */
-	hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
+	if (qcadev->btsoc_type == QCA_WCN3990)
+		hu->hdev->set_bdaddr = qca_set_device_bdaddr;
+	else
+		hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
 
 	return ret;
 }