Re: [PATCH v8 3/7] Bluetooth: btqca: Redefine qca_uart_setup() to generic function.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Matthias,

On 2018-06-26 04:50, Matthias Kaehlcke wrote:
On Mon, Jun 25, 2018 at 07:10:09PM +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@xxxxxxxxxxxxxx>
---
Changes in v8:
    * updated soc_type with enum.

Changes in v7:
    * initial patch
    * redefined qca_uart_setup function to generic.
---
 drivers/bluetooth/btqca.c   | 23 ++++++++++++-----------
 drivers/bluetooth/btqca.h   | 13 +++++++++++--
 drivers/bluetooth/hci_qca.c |  3 ++-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index c5cf9cab438a..3b25be1be19c 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,20 @@ 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;
+	if (!soc_ver) {
+		/* Get QCA version information */
+		err = qca_read_soc_version(hdev, &soc_ver);
+		if (err < 0 || soc_ver == 0) {
+			bt_dev_err(hdev, "QCA Failed to get version (%d)", err);
+			return err;
+		}
+		bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);
 	}

I thought we agreed in the discussion on "[v7,4/8] Bluetooth: btqca:
Redefine qca_uart_setup() to generic function" to call
qca_read_soc_version() in common code. Did I misinterpret that?

[Bala]: After integrating wcn3990, calling qca_read_soc_version() in qca_setup() is not preferable. as we will have multiple common blocks of code in qca_setup. calling function to set an operator speed is required in the both the if -else blcoks


code snippet: (this i copied from previous conversation, before this patch series. so you may see a different function call)

   static int qca_setup(struct hci_uart *hu)
      {
        ...

        qcadev = serdev_device_get_drvdata(hu->serdev);

        /* Patch downloading has to be done without IBS mode */
        clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);

        /* Setup initial baudrate */
       qca_set_speed(hu, speed, QCA_INIT_SPEED);

        if (qcadev->btsoc_type == QCA_WCN3990) {
                bt_dev_dbg(hdev, "setting up wcn3990");
                hci_uart_set_flow_control(hu, true);
ret = qca_send_vendor_cmd(hdev, QCA_WCN3990_POWERON_PULSE);
                if (ret) {
bt_dev_err(hdev, "failed to send power on command");
                        return ret;
                }

                serdev_device_close(hu->serdev);
                ret = serdev_device_open(hu->serdev);
                if (ret) {
                        bt_dev_err(hdev, "failed to open port");
                        return ret;
                }

                msleep(100);
                speed = qca_get_speed(hu, QCA_INIT_SPEED);
                if (speed)
                        qca_set_speed(hu, speed, QCA_INIT_SPEED);

                hci_uart_set_flow_control(hu, false);
        } else {
                bt_dev_info(hdev, "ROME setup");
                /* Setup user speed if needed */
                speed = qca_get_speed(hu, QCA_OPER_SPEED);
                if (speed) {
                        ret = qca_set_speed(hu, speed, QCA_OPER_SPEED);
                        if (ret)
                                return ret;

                        qca_baudrate = qca_get_baudrate_value(speed);
                }
        }

        ret = qca_read_soc_version(hdev, &soc_ver);
        if (ret < 0 || soc_ver == 0) {
                bt_dev_err(hdev, "Failed to get version %d", ret);
                return ret;
        }
        bt_dev_info(hdev, "wcn3990 controller version 0x%08x", soc_ver);


        if (qcadev->btsoc_type == QCA_WCN3990) {
                hci_uart_set_flow_control(hu, true);
                /* Setup user speed if needed */
                speed = qca_get_speed(hu, QCA_OPER_SPEED);
                if (speed) {
                        ret = qca_set_speed(hu, speed, QCA_OPER_SPEED);
                        if (ret)
                                return ret;

                qca_baudrate = qca_get_baudrate_value(speed);

        }

        /* Setup patch / NVM configurations */
ret = qca_uart_setup(hdev, qca_baudrate, qcadev->btsoc_type, soc_ver);
        if (!ret) {
                set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
                qca_debugfs_init(hdev);
        } else if (ret == -ENOENT) {
/* No patch/nvm-config found, run with original fw/config */
                ret = 0;
        } else if (ret == -EAGAIN) {
                /*
      ...
      }

diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 5c9851b11838..24d6667eecf1 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
...
-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);

Remove trailing semicolon.

[Bala]: i didn't get you.


--
Regards
Balakrishna.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux