From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36329C4360F for ; Thu, 4 Apr 2019 10:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB4D0205C9 for ; Thu, 4 Apr 2019 10:00:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="jOmVn4fV"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="OX1I4ZS8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728764AbfDDKAD (ORCPT ); Thu, 4 Apr 2019 06:00:03 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:54046 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726694AbfDDKAD (ORCPT ); Thu, 4 Apr 2019 06:00:03 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 72A6861926; Thu, 4 Apr 2019 10:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1554372001; bh=uS3tQVq+7k16FrxHJQ1eUQoMO40M6FO3w4lLZ5kIqKg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jOmVn4fVTJ4sNLQS3zd5zKGP4H5fjv0jIF2p9ZgPwo4kYx2fC0oK17o52FW+h1jj8 tkD/ug+8TSIeLWyI5VVS6umanmQhuWgzwyWexI0EG6CmTgFj/DuyP9PBjKhDboWSDi DPPPl67PjlUxSDmeM/z2FbWKqzi3X9wpTgzqCf9k= Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id D65A66134E; Thu, 4 Apr 2019 09:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1554371999; bh=uS3tQVq+7k16FrxHJQ1eUQoMO40M6FO3w4lLZ5kIqKg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=OX1I4ZS8ZFFuJbV2Y2BFJpqrjt1yoOfTge6rSSNxYq5JqJSYnWq0wP1Yny9+maBlE 1tXdAZ2RCwhCH08I/RY6lfSUPE00Peuj+1Nr2NOQbK/0VazcLepP7aMQbamQ7W1Jad 7u9HDPUrLbydPGjXQCarlQRku7p8R5Gz8KFdtdY0= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 04 Apr 2019 15:29:58 +0530 From: Balakrishna Godavarthi To: Rocky Liao Cc: marcel@holtmann.org, johan.hedberg@gmail.com, mka@chromium.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, hemantg@codeaurora.org Subject: Re: [PATCH v2 1/2] Bluetooth: hci_qca: Load customized NVM based on the device property In-Reply-To: <1554368908-22017-1-git-send-email-rjliao@codeaurora.org> References: <1554359858-21049-1-git-send-email-rjliao@codeaurora.org> <1554368908-22017-1-git-send-email-rjliao@codeaurora.org> Message-ID: <874b0a9f23d3857ed2dbcfb7ff84e558@codeaurora.org> X-Sender: bgodavar@codeaurora.org User-Agent: Roundcube Webmail/1.2.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rocky, On 2019-04-04 14:38, Rocky Liao wrote: > QCA BTSOC nvm is a customized file and different vendor/platoform may > want > to have different BTSOC configuration via this file (e.g. Configure SCO > over PCM or I2S, Setting Tx power, etc.) This patch will allow vendors > to > download different nvm file by reading a device property "nvm-postfix" > as > the nvm file name postfix. > > Signed-off-by: Rocky Liao > --- > Changes in v2: > * added the property to the document file > Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt > * fixed coding style warnings > * moved the nvm-postfix to the last entry of the qca_serdev > --- > drivers/bluetooth/btqca.c | 14 ++++++++++---- > drivers/bluetooth/btqca.h | 6 ++++-- > drivers/bluetooth/hci_qca.c | 19 ++++++++++++++++++- > 3 files changed, 32 insertions(+), 7 deletions(-) > > diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c > index 6122685..4e89286 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 *nvm_postfix) > { > struct rome_config config; > int err; > @@ -368,9 +369,14 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t > baudrate, > if (soc_type == QCA_WCN3990) > snprintf(config.fwname, sizeof(config.fwname), > "qca/crnv%02x.bin", rom_ver); > - else > - snprintf(config.fwname, sizeof(config.fwname), > - "qca/nvm_%08x.bin", soc_ver); > + else { > + if (nvm_postfix) > + snprintf(config.fwname, sizeof(config.fwname), > + "qca/nvm_%08x_%s.bin", soc_ver, nvm_postfix); > + else > + snprintf(config.fwname, sizeof(config.fwname), > + "qca/nvm_%08x.bin", soc_ver); > + } > > err = qca_download_firmware(hdev, &config); > if (err < 0) { > diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h > index 6fdc25d..0dd6cd0 100644 > --- a/drivers/bluetooth/btqca.h > +++ b/drivers/bluetooth/btqca.h > @@ -139,7 +139,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 *nvm_postfix); > int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version); > int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr); > #else > @@ -150,7 +151,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 *nvm_postfix) > { > return -EOPNOTSUPP; > } > diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c > index 4ea995d..560e880 100644 > --- a/drivers/bluetooth/hci_qca.c > +++ b/drivers/bluetooth/hci_qca.c > @@ -168,6 +168,7 @@ struct qca_serdev { > struct qca_power *bt_power; > u32 init_speed; > u32 oper_speed; > + const char *nvm_postfix; [Bala]: I guess your trying to the read the type of communication for SCO. so i would recommend to change this to variable name to sco_com_type or might be to the use understandable name. just an suggestion. Don't respin right away wait for other comments too :) > }; > > static int qca_power_setup(struct hci_uart *hu, bool on); > @@ -189,6 +190,17 @@ static enum qca_btsoc_type qca_soc_type(struct > hci_uart *hu) > return soc_type; > } > > +static const char *qca_get_nvm_postfix(struct hci_uart *hu) > +{ > + if (hu->serdev) { > + struct qca_serdev *qsd = serdev_device_get_drvdata(hu->serdev); > + > + return qsd->nvm_postfix; > + } else { > + return NULL; > + } > +} > + > static void __serial_clock_on(struct tty_struct *tty) > { > /* TODO: Some chipset requires to enable UART clock on client > @@ -1191,6 +1203,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 *nvm_postfix = qca_get_nvm_postfix(hu); > int ret; > int soc_ver = 0; > > @@ -1241,7 +1254,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, > + nvm_postfix); > if (!ret) { > set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags); > qca_debugfs_init(hdev); > @@ -1462,6 +1476,9 @@ static int qca_serdev_probe(struct serdev_device > *serdev) > return PTR_ERR(qcadev->bt_en); > } > > + device_property_read_string(&serdev->dev, "nvm-postfix", > + &qcadev->nvm_postfix); > + > qcadev->susclk = devm_clk_get(&serdev->dev, NULL); > if (IS_ERR(qcadev->susclk)) { > dev_err(&serdev->dev, "failed to acquire clk\n"); -- Regards Balakrishna.