From: Harish Bandi <c-hbandi@codeaurora.org>
To: Balakrishna Godavarthi <bgodavar@codeaurora.org>
Cc: Rocky Liao <rjliao@codeaurora.org>,
robh+dt@kernel.org, mark.rutland@arm.com, marcel@holtmann.org,
johan.hedberg@gmail.com, thierry.escande@linaro.org,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org,
linux-arm-msm@vger.kernel.org, Hemantg <hemantg@codeaurora.org>,
linux-bluetooth-owner@vger.kernel.org
Subject: Re: [PATCH v5 1/2] Bluetooth: hci_qca: Load customized NVM based on the device property
Date: Fri, 17 May 2019 09:56:30 +0530 [thread overview]
Message-ID: <d3e2f431a8e2ef00d7bd8c1cebe5dfc1@codeaurora.org> (raw)
In-Reply-To: <178d2a3454399cfad0e61e72a13ea19a@codeaurora.org>
On 2019-05-17 08:13, Balakrishna Godavarthi wrote:
> Hi Rocky,
>
> On 2019-05-15 16:49, Rocky Liao wrote:
>> QCA BTSOC NVM is a customized firmware file and different vendors may
>> want to have different BTSOC configuration (e.g. Configure SCO over
>> PCM
>> or I2S, Setting Tx power, etc.) via this file. This patch will allow
>> vendors to download different NVM firmware file by reading a device
>> property "firmware-name".
>>
>> Signed-off-by: Rocky Liao <rjliao@codeaurora.org>
>> ---
>> Changes in v5:
>> * Made the change applicable to the wcn399x series chip sets
>> ---
>> drivers/bluetooth/btqca.c | 8 ++++++--
>> drivers/bluetooth/btqca.h | 6 ++++--
>> drivers/bluetooth/hci_qca.c | 19 ++++++++++++++++++-
>> 3 files changed, 28 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
>> index cc12eec..a78b80e 100644
>> --- a/drivers/bluetooth/btqca.c
>> +++ b/drivers/bluetooth/btqca.c
>> @@ -332,7 +332,8 @@ 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,
>> - enum qca_btsoc_type soc_type, u32 soc_ver)
>> + enum qca_btsoc_type soc_type, u32 soc_ver,
>> + const char *firmware_name)
>> {
>> struct rome_config config;
>> int err;
>> @@ -365,7 +366,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t
>> baudrate,
>>
>> /* Download NVM configuration */
>> config.type = TLV_TYPE_NVM;
>> - if (qca_is_wcn399x(soc_type))
>> + if (firmware_name)
>> + snprintf(config.fwname, sizeof(config.fwname),
>> + "qca/%s", firmware_name);
>> + else if (qca_is_wcn399x(soc_type))
>> snprintf(config.fwname, sizeof(config.fwname),
>> "qca/crnv%02x.bin", rom_ver);
>> else
>> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
>> index 4c4fe2b..8c037bb 100644
>> --- a/drivers/bluetooth/btqca.h
>> +++ b/drivers/bluetooth/btqca.h
>> @@ -140,7 +140,8 @@ enum qca_btsoc_type {
>>
>> 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);
>> + enum qca_btsoc_type soc_type, u32 soc_ver,
>> + const char *firmware_name);
>> int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);
>> int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
>> static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)
>> @@ -155,7 +156,8 @@ static inline int qca_set_bdaddr_rome(struct
>> hci_dev *hdev, const bdaddr_t *bdad
>> }
>>
>> static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t
>> baudrate,
>> - enum qca_btsoc_type soc_type, u32 soc_ver)
>> + enum qca_btsoc_type soc_type, u32 soc_ver,
>> + const char *firmware_name)
>> {
>> return -EOPNOTSUPP;
>> }
>> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
>> index 57322c4..9590602 100644
>> --- a/drivers/bluetooth/hci_qca.c
>> +++ b/drivers/bluetooth/hci_qca.c
>> @@ -169,6 +169,7 @@ struct qca_serdev {
>> struct qca_power *bt_power;
>> u32 init_speed;
>> u32 oper_speed;
>> + const char *firmware_name;
>> };
>>
>> static int qca_power_setup(struct hci_uart *hu, bool on);
>> @@ -190,6 +191,17 @@ static enum qca_btsoc_type qca_soc_type(struct
>> hci_uart *hu)
>> return soc_type;
>> }
>>
>> +static const char *qca_get_firmware_name(struct hci_uart *hu)
>> +{
>> + if (hu->serdev) {
>> + struct qca_serdev *qsd = serdev_device_get_drvdata(hu->serdev);
>> +
>> + return qsd->firmware_name;
>> + } else {
>> + return NULL;
>> + }
>> +}
>> +
>> static void __serial_clock_on(struct tty_struct *tty)
>> {
>> /* TODO: Some chipset requires to enable UART clock on client
>> @@ -1195,6 +1207,7 @@ static int qca_setup(struct hci_uart *hu)
>> struct qca_data *qca = hu->priv;
>> unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;
>> enum qca_btsoc_type soc_type = qca_soc_type(hu);
>> + const char *firmware_name = qca_get_firmware_name(hu);
>> int ret;
>> int soc_ver = 0;
>>
>> @@ -1245,7 +1258,8 @@ static int qca_setup(struct hci_uart *hu)
>>
>> bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);
>> /* Setup patch / NVM configurations */
>> - ret = qca_uart_setup(hdev, qca_baudrate, soc_type, soc_ver);
>> + ret = qca_uart_setup(hdev, qca_baudrate, soc_type, soc_ver,
>> + firmware_name);
>> if (!ret) {
>> set_bit(QCA_IBS_ENABLED, &qca->flags);
>> qca_debugfs_init(hdev);
>> @@ -1477,6 +1491,9 @@ static int qca_serdev_probe(struct serdev_device
>> *serdev)
>> return PTR_ERR(qcadev->bt_en);
>> }
>>
>> + device_property_read_string(&serdev->dev, "firmware-name",
>> + &qcadev->firmware_name);
>> +
>> qcadev->susclk = devm_clk_get(&serdev->dev, NULL);
>> if (IS_ERR(qcadev->susclk)) {
>> dev_err(&serdev->dev, "failed to acquire clk\n");
>
> Thanks for doing it for wcn399x series too.
>
> Change look fine to me.
>
> Reviewed-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
Tested for WCN3998.
Tested-by: Harish Bandi <c-hbandi@codeaurora.org>
Thanks,
Harish
next prev parent reply other threads:[~2019-05-17 4:26 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 6:37 [PATCH] Bluetooth: hci_qca: Load customized NVM based on the device property Rocky Liao
2019-04-04 6:56 ` Balakrishna Godavarthi
2019-04-04 9:08 ` [PATCH v2 1/2] " Rocky Liao
2019-04-04 9:08 ` [PATCH v2 2/2] dt-bindings: net: bluetooth: Add device property nvm-postfix for QCA6174 Rocky Liao
2019-04-04 12:32 ` Marc Gonzalez
2019-04-09 10:15 ` Rocky Liao
2019-04-09 14:03 ` Rob Herring
2019-04-09 14:48 ` Rocky Liao
2019-04-09 13:54 ` Rob Herring
2019-04-10 9:27 ` [PATCH v3 2/2] dt-bindings: net: bluetooth: Add device property firmware-name " Rocky Liao
2019-04-23 17:06 ` Marcel Holtmann
2019-04-24 6:19 ` Rocky Liao
2019-04-26 17:45 ` Rob Herring
2019-04-27 5:59 ` Marcel Holtmann
2019-05-03 7:56 ` Rocky Liao
2019-05-05 17:32 ` Marcel Holtmann
2019-04-26 20:50 ` Rob Herring
2019-05-12 3:19 ` [PATCH v4 " Rocky Liao
2019-05-13 15:31 ` Rob Herring
2019-05-15 11:20 ` [PATCH v5 " Rocky Liao
2019-06-06 9:40 ` [PATCH v6 " Rocky Liao
2019-06-11 22:01 ` Rob Herring
2019-07-06 10:56 ` Marcel Holtmann
2019-04-04 9:59 ` [PATCH v2 1/2] Bluetooth: hci_qca: Load customized NVM based on the device property Balakrishna Godavarthi
2019-04-10 9:27 ` [PATCH v3 " Rocky Liao
2019-05-12 3:19 ` [PATCH v4 " Rocky Liao
2019-05-15 5:32 ` Balakrishna Godavarthi
2019-05-15 8:30 ` Rocky Liao
2019-05-15 11:19 ` [PATCH v5 " Rocky Liao
2019-05-17 2:43 ` Balakrishna Godavarthi
2019-05-17 4:26 ` Harish Bandi [this message]
2019-06-06 9:40 ` [PATCH v6 " Rocky Liao
2019-06-06 12:02 ` Harish Bandi
2019-07-06 10:51 ` Marcel Holtmann
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=d3e2f431a8e2ef00d7bd8c1cebe5dfc1@codeaurora.org \
--to=c-hbandi@codeaurora.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-owner@vger.kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=rjliao@codeaurora.org \
--cc=robh+dt@kernel.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).