From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
In preparation for unduplicating the hci_uart registration code,
schedule a devres action for disabling the SUSCLK rather than doing it
manually.
We cannot really use devm_clk_get_enabled() as we also set the rate
before enabling the clock. While this should in theory work, I don't
want to risk breaking existing users. One solution for the future is to
add devm_clk_get_enabled_with_rate() to the clock framework.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/bluetooth/hci_qca.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index bc6a49ba26f9..895ce8e11da8 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -2295,6 +2295,13 @@ static int qca_init_regulators(struct qca_power *qca,
return 0;
}
+static void qca_clk_disable_unprepare(void *data)
+{
+ struct clk *clk = data;
+
+ clk_disable_unprepare(clk);
+}
+
static int qca_serdev_probe(struct serdev_device *serdev)
{
struct qca_serdev *qcadev;
@@ -2434,10 +2441,15 @@ static int qca_serdev_probe(struct serdev_device *serdev)
if (err)
return err;
+ err = devm_add_action_or_reset(&serdev->dev,
+ qca_clk_disable_unprepare,
+ qcadev->susclk);
+ if (err)
+ return err;
+
err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
if (err) {
BT_ERR("Rome serdev registration failed");
- clk_disable_unprepare(qcadev->susclk);
return err;
}
}
@@ -2484,8 +2496,6 @@ static void qca_serdev_remove(struct serdev_device *serdev)
fallthrough;
default:
- if (qcadev->susclk)
- clk_disable_unprepare(qcadev->susclk);
}
hci_uart_unregister_device(&qcadev->serdev_hu);
--
2.43.0Hi Bartosz,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 0b58e108042b0ed28a71cd7edf5175999955b233]
url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/dt-bindings-bluetooth-qualcomm-describe-the-inputs-from-PMU-for-wcn7850/20240706-055822
base: 0b58e108042b0ed28a71cd7edf5175999955b233
patch link: https://lore.kernel.org/r/20240705-hci_qca_refactor-v1-2-e2442121c13e%40linaro.org
patch subject: [PATCH 2/6] Bluetooth: hci_qca: schedule a devm action for disabling the clock
config: hexagon-allyesconfig (https://download.01.org/0day-ci/archive/20240707/202407070754.L1XER9qH-lkp@intel.com/config)
compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project a0c6b8aef853eedaa0980f07c0a502a5a8a9740e)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240707/202407070754.L1XER9qH-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202407070754.L1XER9qH-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/bluetooth/hci_qca.c:23:
In file included from include/linux/devcoredump.h:12:
In file included from include/linux/scatterlist.h:8:
In file included from include/linux/mm.h:2229:
include/linux/vmstat.h:514:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
514 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/bluetooth/hci_qca.c:23:
In file included from include/linux/devcoredump.h:12:
In file included from include/linux/scatterlist.h:9:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
548 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
| ^
In file included from drivers/bluetooth/hci_qca.c:23:
In file included from include/linux/devcoredump.h:12:
In file included from include/linux/scatterlist.h:9:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
| ^
In file included from drivers/bluetooth/hci_qca.c:23:
In file included from include/linux/devcoredump.h:12:
In file included from include/linux/scatterlist.h:9:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
>> drivers/bluetooth/hci_qca.c:2499:2: warning: label at end of compound statement is a C23 extension [-Wc23-extensions]
2499 | }
| ^
8 warnings generated.
vim +2499 drivers/bluetooth/hci_qca.c
05ba533c5c1155 Thierry Escande 2018-03-29 2478
05ba533c5c1155 Thierry Escande 2018-03-29 2479 static void qca_serdev_remove(struct serdev_device *serdev)
05ba533c5c1155 Thierry Escande 2018-03-29 2480 {
05ba533c5c1155 Thierry Escande 2018-03-29 2481 struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
054ec5e94a46b0 Venkata Lakshmi Narayana Gubba 2020-09-10 2482 struct qca_power *power = qcadev->bt_power;
05ba533c5c1155 Thierry Escande 2018-03-29 2483
691d54d0f7cb14 Neil Armstrong 2023-08-16 2484 switch (qcadev->btsoc_type) {
691d54d0f7cb14 Neil Armstrong 2023-08-16 2485 case QCA_WCN3988:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2486 case QCA_WCN3990:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2487 case QCA_WCN3991:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2488 case QCA_WCN3998:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2489 case QCA_WCN6750:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2490 case QCA_WCN6855:
e0c1278ac89b03 Neil Armstrong 2023-08-16 2491 case QCA_WCN7850:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2492 if (power->vregs_on) {
c2d7827338618a Balakrishna Godavarthi 2018-08-22 2493 qca_power_shutdown(&qcadev->serdev_hu);
691d54d0f7cb14 Neil Armstrong 2023-08-16 2494 break;
691d54d0f7cb14 Neil Armstrong 2023-08-16 2495 }
691d54d0f7cb14 Neil Armstrong 2023-08-16 2496 fallthrough;
691d54d0f7cb14 Neil Armstrong 2023-08-16 2497
691d54d0f7cb14 Neil Armstrong 2023-08-16 2498 default:
691d54d0f7cb14 Neil Armstrong 2023-08-16 @2499 }
fa9ad876b8e0eb Balakrishna Godavarthi 2018-08-03 2500
fa9ad876b8e0eb Balakrishna Godavarthi 2018-08-03 2501 hci_uart_unregister_device(&qcadev->serdev_hu);
05ba533c5c1155 Thierry Escande 2018-03-29 2502 }
05ba533c5c1155 Thierry Escande 2018-03-29 2503
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Bartosz,
kernel test robot noticed the following build errors:
[auto build test ERROR on 0b58e108042b0ed28a71cd7edf5175999955b233]
url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/dt-bindings-bluetooth-qualcomm-describe-the-inputs-from-PMU-for-wcn7850/20240706-055822
base: 0b58e108042b0ed28a71cd7edf5175999955b233
patch link: https://lore.kernel.org/r/20240705-hci_qca_refactor-v1-2-e2442121c13e%40linaro.org
patch subject: [PATCH 2/6] Bluetooth: hci_qca: schedule a devm action for disabling the clock
config: i386-buildonly-randconfig-006-20240707 (https://download.01.org/0day-ci/archive/20240707/202407070656.wRERdKMy-lkp@intel.com/config)
compiler: gcc-9 (Ubuntu 9.5.0-4ubuntu2) 9.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240707/202407070656.wRERdKMy-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202407070656.wRERdKMy-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/bluetooth/hci_qca.c: In function 'qca_serdev_remove':
>> drivers/bluetooth/hci_qca.c:2498:2: error: label at end of compound statement
2498 | default:
| ^~~~~~~
vim +2498 drivers/bluetooth/hci_qca.c
05ba533c5c1155 Thierry Escande 2018-03-29 2478
05ba533c5c1155 Thierry Escande 2018-03-29 2479 static void qca_serdev_remove(struct serdev_device *serdev)
05ba533c5c1155 Thierry Escande 2018-03-29 2480 {
05ba533c5c1155 Thierry Escande 2018-03-29 2481 struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
054ec5e94a46b0 Venkata Lakshmi Narayana Gubba 2020-09-10 2482 struct qca_power *power = qcadev->bt_power;
05ba533c5c1155 Thierry Escande 2018-03-29 2483
691d54d0f7cb14 Neil Armstrong 2023-08-16 2484 switch (qcadev->btsoc_type) {
691d54d0f7cb14 Neil Armstrong 2023-08-16 2485 case QCA_WCN3988:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2486 case QCA_WCN3990:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2487 case QCA_WCN3991:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2488 case QCA_WCN3998:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2489 case QCA_WCN6750:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2490 case QCA_WCN6855:
e0c1278ac89b03 Neil Armstrong 2023-08-16 2491 case QCA_WCN7850:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2492 if (power->vregs_on) {
c2d7827338618a Balakrishna Godavarthi 2018-08-22 2493 qca_power_shutdown(&qcadev->serdev_hu);
691d54d0f7cb14 Neil Armstrong 2023-08-16 2494 break;
691d54d0f7cb14 Neil Armstrong 2023-08-16 2495 }
691d54d0f7cb14 Neil Armstrong 2023-08-16 2496 fallthrough;
691d54d0f7cb14 Neil Armstrong 2023-08-16 2497
691d54d0f7cb14 Neil Armstrong 2023-08-16 @2498 default:
691d54d0f7cb14 Neil Armstrong 2023-08-16 2499 }
fa9ad876b8e0eb Balakrishna Godavarthi 2018-08-03 2500
fa9ad876b8e0eb Balakrishna Godavarthi 2018-08-03 2501 hci_uart_unregister_device(&qcadev->serdev_hu);
05ba533c5c1155 Thierry Escande 2018-03-29 2502 }
05ba533c5c1155 Thierry Escande 2018-03-29 2503
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.