From: Matthias Kaehlcke <mka@chromium.org>
To: Balakrishna Godavarthi <bgodavar@codeaurora.org>
Cc: marcel@holtmann.org, johan.hedberg@gmail.com,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-bluetooth@vger.kernel.org, thierry.escande@linaro.org,
rtatiya@codeaurora.org, hemantg@codeaurora.org,
linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH v9 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.
Date: Fri, 6 Jul 2018 15:35:24 -0700 [thread overview]
Message-ID: <20180706223524.GL129942@google.com> (raw)
In-Reply-To: <20180705165515.13340-4-bgodavar@codeaurora.org>
On Thu, Jul 05, 2018 at 10:25:11PM +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 <bgodavar@codeaurora.org>
> ---
> Changes in v9:
> * moved qca_read_soc_ver() to qca_setup().
>
> Changes in v8:
> * updated soc_type with enum.
>
> Changes in v7:
> * initial patch
> * redefined qca_uart_setup function to generic.
> ---
> drivers/bluetooth/btqca.c | 17 ++++-------------
> drivers/bluetooth/btqca.h | 13 +++++++++++--
> drivers/bluetooth/hci_qca.c | 11 ++++++++++-
> 3 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index c5cf9cab438a..03bcbaaf1ae9 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -327,9 +327,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 +337,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, &rome_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, &config);
> if (err < 0) {
> bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
> @@ -359,7 +350,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, &config);
> 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..c02e1d465cca 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,16 @@ static int qca_setup(struct hci_uart *hu)
> host_set_baudrate(hu, speed);
> }
>
> + /* Get QCA version information */
> + ret = qca_read_soc_version(hdev, &soc_ver);
> + if (ret < 0 || soc_ver == 0) {
> + bt_dev_err(hdev, "QCA Failed to get version (%d)", ret);
> + return ret;
> + }
> + bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);
As commented on [1] I'd suggest to move some of the logging and error
handling to qca_read_soc_version(), especially since this sequence is
duplicated later in this series.
Not really the scope of this patch though, so:
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
[1] https://patchwork.kernel.org/patch/10510029/
next prev parent reply other threads:[~2018-07-06 22:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 16:55 [PATCH v9 0/7] Enable Bluetooth functionality for WCN3990 Balakrishna Godavarthi
2018-07-05 16:55 ` [PATCH v9 1/7] dt-bindings: net: bluetooth: Add device tree bindings for QTI chip wcn3990 Balakrishna Godavarthi
2018-07-05 20:42 ` Rob Herring
2018-07-10 12:32 ` Balakrishna Godavarthi
2018-07-05 16:55 ` [PATCH v9 2/7] Bluetooth: btqca: Rename ROME specific functions to generic functions Balakrishna Godavarthi
2018-07-05 16:55 ` [PATCH v9 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function Balakrishna Godavarthi
2018-07-06 22:35 ` Matthias Kaehlcke [this message]
2018-07-05 16:55 ` [PATCH v9 4/7] Bluetooth: hci_qca: Add wrapper functions for setting UART speed Balakrishna Godavarthi
2018-07-06 19:40 ` Matthias Kaehlcke
2018-07-10 12:19 ` Balakrishna Godavarthi
2018-07-10 16:12 ` Matthias Kaehlcke
2018-07-05 16:55 ` [PATCH v9 5/7] Bluetooth: hci_qca: Enable 3.2 Mbps operating speed Balakrishna Godavarthi
2018-07-05 16:55 ` [PATCH v9 6/7] Bluetooth: btqca: Add wcn3990 firmware download support Balakrishna Godavarthi
2018-07-05 16:55 ` [PATCH v9 7/7] Bluetooth: hci_qca: Add support for Qualcomm Bluetooth chip wcn3990 Balakrishna Godavarthi
2018-07-06 22:21 ` Matthias Kaehlcke
2018-07-10 12:52 ` Balakrishna Godavarthi
2018-07-10 16:39 ` Matthias Kaehlcke
2018-07-17 15:18 ` Balakrishna Godavarthi
2018-07-16 13:51 ` Balakrishna Godavarthi
2018-07-16 16:05 ` Matthias Kaehlcke
2018-07-17 13:46 ` Balakrishna Godavarthi
2018-07-18 15:33 ` Balakrishna Godavarthi
2018-07-18 17:13 ` Matthias Kaehlcke
2018-07-20 12:46 ` Balakrishna Godavarthi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180706223524.GL129942@google.com \
--to=mka@chromium.org \
--cc=bgodavar@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=hemantg@codeaurora.org \
--cc=johan.hedberg@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=rtatiya@codeaurora.org \
--cc=thierry.escande@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).