Re: [PATCH v10 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
Hi Matthias, On 2018-07-23 23:10, Matthias Kaehlcke wrote: On Fri, Jul 20, 2018 at 07:02:39PM +0530, Balakrishna Godavarthi wrote: Redefinition of qca_uart_setup will help future Qualcomm Bluetooth SoC, to use the same function instead of duplicating the function. Added new arguments soc_type and soc_ver to the functions. These arguments will help to decide type of firmware files to be loaded into Bluetooth chip. soc_type holds the Bluetooth chip connected to APPS processor. soc_ver holds the Bluetooth chip version. Signed-off-by: Balakrishna Godavarthi Reviewed-by: Matthias Kaehlcke --- drivers/bluetooth/btqca.c | 20 +++- drivers/bluetooth/btqca.h | 13 +++-- drivers/bluetooth/hci_qca.c | 10 +- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index c5cf9cab438a..b556710ee1bd 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) out: kfree_skb(skb); + if (err < 0 || *soc_version == 0) + bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You also have to set 'err' if soc_version is 0, so the caller can skip the check for soc_version == 0 I'd suggest: // directly after setting soc_version if (*soc_version == 0) err = -EILSEQ; // or should it be a different error code? ... if (err) bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You could also limit the error log to the 'if (*soc_version == 0)' branch, for all other errors there will already be a more specific log entry. [Bala]: will update. if(!err && *soc_version == 0) err = -EINVAL; // as soc_version zero is invalid. if (err) bt_dev_err(hdev, "QCA Failed to get version (%d)", err); + return err; } Cheers Matthias -- Regards Balakrishna.
Re: [PATCH v10 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
Hi Matthias, On 2018-07-23 23:10, Matthias Kaehlcke wrote: On Fri, Jul 20, 2018 at 07:02:39PM +0530, Balakrishna Godavarthi wrote: Redefinition of qca_uart_setup will help future Qualcomm Bluetooth SoC, to use the same function instead of duplicating the function. Added new arguments soc_type and soc_ver to the functions. These arguments will help to decide type of firmware files to be loaded into Bluetooth chip. soc_type holds the Bluetooth chip connected to APPS processor. soc_ver holds the Bluetooth chip version. Signed-off-by: Balakrishna Godavarthi Reviewed-by: Matthias Kaehlcke --- drivers/bluetooth/btqca.c | 20 +++- drivers/bluetooth/btqca.h | 13 +++-- drivers/bluetooth/hci_qca.c | 10 +- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index c5cf9cab438a..b556710ee1bd 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) out: kfree_skb(skb); + if (err < 0 || *soc_version == 0) + bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You also have to set 'err' if soc_version is 0, so the caller can skip the check for soc_version == 0 I'd suggest: // directly after setting soc_version if (*soc_version == 0) err = -EILSEQ; // or should it be a different error code? ... if (err) bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You could also limit the error log to the 'if (*soc_version == 0)' branch, for all other errors there will already be a more specific log entry. [Bala]: will update. if(!err && *soc_version == 0) err = -EINVAL; // as soc_version zero is invalid. if (err) bt_dev_err(hdev, "QCA Failed to get version (%d)", err); + return err; } Cheers Matthias -- Regards Balakrishna.
Re: [PATCH v10 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
On Fri, Jul 20, 2018 at 07:02:39PM +0530, Balakrishna Godavarthi wrote: > Redefinition of qca_uart_setup will help future Qualcomm Bluetooth > SoC, to use the same function instead of duplicating the function. > Added new arguments soc_type and soc_ver to the functions. > > These arguments will help to decide type of firmware files > to be loaded into Bluetooth chip. > soc_type holds the Bluetooth chip connected to APPS processor. > soc_ver holds the Bluetooth chip version. > > Signed-off-by: Balakrishna Godavarthi > Reviewed-by: Matthias Kaehlcke > --- > drivers/bluetooth/btqca.c | 20 +++- > drivers/bluetooth/btqca.h | 13 +++-- > drivers/bluetooth/hci_qca.c | 10 +- > 3 files changed, 27 insertions(+), 16 deletions(-) > > diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c > index c5cf9cab438a..b556710ee1bd 100644 > --- a/drivers/bluetooth/btqca.c > +++ b/drivers/bluetooth/btqca.c > @@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 > *soc_version) > out: > kfree_skb(skb); > > + if (err < 0 || *soc_version == 0) > + bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You also have to set 'err' if soc_version is 0, so the caller can skip the check for soc_version == 0 I'd suggest: // directly after setting soc_version if (*soc_version == 0) err = -EILSEQ; // or should it be a different error code? ... if (err) bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You could also limit the error log to the 'if (*soc_version == 0)' branch, for all other errors there will already be a more specific log entry. > + > return err; > } Cheers Matthias
Re: [PATCH v10 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
On Fri, Jul 20, 2018 at 07:02:39PM +0530, Balakrishna Godavarthi wrote: > Redefinition of qca_uart_setup will help future Qualcomm Bluetooth > SoC, to use the same function instead of duplicating the function. > Added new arguments soc_type and soc_ver to the functions. > > These arguments will help to decide type of firmware files > to be loaded into Bluetooth chip. > soc_type holds the Bluetooth chip connected to APPS processor. > soc_ver holds the Bluetooth chip version. > > Signed-off-by: Balakrishna Godavarthi > Reviewed-by: Matthias Kaehlcke > --- > drivers/bluetooth/btqca.c | 20 +++- > drivers/bluetooth/btqca.h | 13 +++-- > drivers/bluetooth/hci_qca.c | 10 +- > 3 files changed, 27 insertions(+), 16 deletions(-) > > diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c > index c5cf9cab438a..b556710ee1bd 100644 > --- a/drivers/bluetooth/btqca.c > +++ b/drivers/bluetooth/btqca.c > @@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 > *soc_version) > out: > kfree_skb(skb); > > + if (err < 0 || *soc_version == 0) > + bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You also have to set 'err' if soc_version is 0, so the caller can skip the check for soc_version == 0 I'd suggest: // directly after setting soc_version if (*soc_version == 0) err = -EILSEQ; // or should it be a different error code? ... if (err) bt_dev_err(hdev, "QCA Failed to get version (%d)", err); You could also limit the error log to the 'if (*soc_version == 0)' branch, for all other errors there will already be a more specific log entry. > + > return err; > } Cheers Matthias
[PATCH v10 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
Redefinition of qca_uart_setup will help future Qualcomm Bluetooth
SoC, to use the same function instead of duplicating the function.
Added new arguments soc_type and soc_ver to the functions.
These arguments will help to decide type of firmware files
to be loaded into Bluetooth chip.
soc_type holds the Bluetooth chip connected to APPS processor.
soc_ver holds the Bluetooth chip version.
Signed-off-by: Balakrishna Godavarthi
Reviewed-by: Matthias Kaehlcke
---
drivers/bluetooth/btqca.c | 20 +++-
drivers/bluetooth/btqca.h | 13 +++--
drivers/bluetooth/hci_qca.c | 10 +-
3 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index c5cf9cab438a..b556710ee1bd 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32
*soc_version)
out:
kfree_skb(skb);
+ if (err < 0 || *soc_version == 0)
+ bt_dev_err(hdev, "QCA Failed to get version (%d)", err);
+
return err;
}
EXPORT_SYMBOL_GPL(qca_read_soc_version);
@@ -327,9 +330,9 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const
bdaddr_t *bdaddr)
}
EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);
-int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
+int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
+ enum qca_btsoc_type soc_type, u32 soc_ver)
{
- u32 rome_ver = 0;
struct rome_config config;
int err;
@@ -337,19 +340,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
config.user_baud_rate = baudrate;
- /* Get QCA version information */
- err = qca_read_soc_version(hdev, _ver);
- if (err < 0 || rome_ver == 0) {
- bt_dev_err(hdev, "QCA Failed to get version %d", err);
- return err;
- }
-
- bt_dev_info(hdev, "QCA controller version 0x%08x", rome_ver);
-
/* Download rampatch file */
config.type = TLV_TYPE_PATCH;
snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin",
-rome_ver);
+soc_ver);
err = qca_download_firmware(hdev, );
if (err < 0) {
bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
@@ -359,7 +353,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
/* Download NVM configuration */
config.type = TLV_TYPE_NVM;
snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin",
-rome_ver);
+soc_ver);
err = qca_download_firmware(hdev, );
if (err < 0) {
bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err);
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 5c9851b11838..a9c2779f3e07 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -124,10 +124,18 @@ struct tlv_type_hdr {
__u8 data[0];
} __packed;
+enum qca_btsoc_type {
+ QCA_INVALID = -1,
+ QCA_AR3002,
+ QCA_ROME,
+ QCA_WCN3990
+};
+
#if IS_ENABLED(CONFIG_BT_QCA)
int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);
-int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate);
+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);
#else
@@ -137,7 +145,8 @@ static inline int qca_set_bdaddr_rome(struct hci_dev *hdev,
const bdaddr_t *bdad
return -EOPNOTSUPP;
}
-static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
+static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
+enum qca_btsoc_type soc_type, u32 soc_ver)
{
return -EOPNOTSUPP;
}
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index d7b60669b656..5f1c0a8fd5cd 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -929,6 +929,7 @@ static int qca_setup(struct hci_uart *hu)
struct qca_data *qca = hu->priv;
unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;
int ret;
+ int soc_ver = 0;
bt_dev_info(hdev, "ROME setup");
@@ -965,8 +966,15 @@ static int qca_setup(struct hci_uart *hu)
host_set_baudrate(hu, speed);
}
+ /* Get QCA version information */
+ ret = qca_read_soc_version(hdev, _ver);
+ if (ret)
+ return ret;
+
+ bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);
+
/* Setup patch / NVM configurations */
- ret = qca_uart_setup(hdev, qca_baudrate);
+ ret = qca_uart_setup(hdev, qca_baudrate, QCA_ROME, soc_ver);
if (!ret) {
set_bit(STATE_IN_BAND_SLEEP_ENABLED, >flags);
qca_debugfs_init(hdev);
--
The Qualcomm Innovation Center, Inc. is a member of the
[PATCH v10 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
Redefinition of qca_uart_setup will help future Qualcomm Bluetooth
SoC, to use the same function instead of duplicating the function.
Added new arguments soc_type and soc_ver to the functions.
These arguments will help to decide type of firmware files
to be loaded into Bluetooth chip.
soc_type holds the Bluetooth chip connected to APPS processor.
soc_ver holds the Bluetooth chip version.
Signed-off-by: Balakrishna Godavarthi
Reviewed-by: Matthias Kaehlcke
---
drivers/bluetooth/btqca.c | 20 +++-
drivers/bluetooth/btqca.h | 13 +++--
drivers/bluetooth/hci_qca.c | 10 +-
3 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index c5cf9cab438a..b556710ee1bd 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32
*soc_version)
out:
kfree_skb(skb);
+ if (err < 0 || *soc_version == 0)
+ bt_dev_err(hdev, "QCA Failed to get version (%d)", err);
+
return err;
}
EXPORT_SYMBOL_GPL(qca_read_soc_version);
@@ -327,9 +330,9 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const
bdaddr_t *bdaddr)
}
EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);
-int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
+int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
+ enum qca_btsoc_type soc_type, u32 soc_ver)
{
- u32 rome_ver = 0;
struct rome_config config;
int err;
@@ -337,19 +340,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
config.user_baud_rate = baudrate;
- /* Get QCA version information */
- err = qca_read_soc_version(hdev, _ver);
- if (err < 0 || rome_ver == 0) {
- bt_dev_err(hdev, "QCA Failed to get version %d", err);
- return err;
- }
-
- bt_dev_info(hdev, "QCA controller version 0x%08x", rome_ver);
-
/* Download rampatch file */
config.type = TLV_TYPE_PATCH;
snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin",
-rome_ver);
+soc_ver);
err = qca_download_firmware(hdev, );
if (err < 0) {
bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
@@ -359,7 +353,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
/* Download NVM configuration */
config.type = TLV_TYPE_NVM;
snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin",
-rome_ver);
+soc_ver);
err = qca_download_firmware(hdev, );
if (err < 0) {
bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err);
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 5c9851b11838..a9c2779f3e07 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -124,10 +124,18 @@ struct tlv_type_hdr {
__u8 data[0];
} __packed;
+enum qca_btsoc_type {
+ QCA_INVALID = -1,
+ QCA_AR3002,
+ QCA_ROME,
+ QCA_WCN3990
+};
+
#if IS_ENABLED(CONFIG_BT_QCA)
int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);
-int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate);
+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);
#else
@@ -137,7 +145,8 @@ static inline int qca_set_bdaddr_rome(struct hci_dev *hdev,
const bdaddr_t *bdad
return -EOPNOTSUPP;
}
-static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)
+static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
+enum qca_btsoc_type soc_type, u32 soc_ver)
{
return -EOPNOTSUPP;
}
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index d7b60669b656..5f1c0a8fd5cd 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -929,6 +929,7 @@ static int qca_setup(struct hci_uart *hu)
struct qca_data *qca = hu->priv;
unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;
int ret;
+ int soc_ver = 0;
bt_dev_info(hdev, "ROME setup");
@@ -965,8 +966,15 @@ static int qca_setup(struct hci_uart *hu)
host_set_baudrate(hu, speed);
}
+ /* Get QCA version information */
+ ret = qca_read_soc_version(hdev, _ver);
+ if (ret)
+ return ret;
+
+ bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);
+
/* Setup patch / NVM configurations */
- ret = qca_uart_setup(hdev, qca_baudrate);
+ ret = qca_uart_setup(hdev, qca_baudrate, QCA_ROME, soc_ver);
if (!ret) {
set_bit(STATE_IN_BAND_SLEEP_ENABLED, >flags);
qca_debugfs_init(hdev);
--
The Qualcomm Innovation Center, Inc. is a member of the
