[PATCH] Bluetooth: btintel_pcie: avoid unguarded 64-bit division

Arnd Bergmann posted 1 patch 2 months, 1 week ago
drivers/bluetooth/btintel_pcie.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] Bluetooth: btintel_pcie: avoid unguarded 64-bit division
Posted by Arnd Bergmann 2 months, 1 week ago
From: Arnd Bergmann <arnd@arndb.de>

Directly dividing a 64-bit value is not allowed on 32-bit
architectures in the kernel.

arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: drivers/bluetooth/btintel_pcie.o: in function `btintel_pcie_suspend_late':
btintel_pcie.c:(.text+0x224): undefined reference to `__aeabi_ldivmod'

Since this is a ktime_t value and dividing by 1000 gives a microsecond
number, just convert it into microseconds using the appropriate helper.

Fixes: 33bb9b1ce6f6 ("Bluetooth: btintel_pcie: Add support for _suspend() / _resume()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/bluetooth/btintel_pcie.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 9792a49886ff..4dfd5365bb4e 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -2607,7 +2607,7 @@ static int btintel_pcie_suspend_late(struct device *dev, pm_message_t mesg)
 	btintel_pcie_wr_sleep_cntrl(data, dxstate);
 	err = wait_event_timeout(data->gp0_wait_q, data->gp0_received,
 				 msecs_to_jiffies(BTINTEL_DEFAULT_INTR_TIMEOUT_MS));
-	delta = ktime_to_ns(ktime_get() - start) / 1000;
+	delta = ktime_to_us(ktime_get() - start);
 
 	if (err == 0) {
 		bt_dev_err(data->hdev, "Timeout (%u ms) on alive interrupt for D3 entry",
@@ -2651,7 +2651,7 @@ static int btintel_pcie_resume(struct device *dev)
 	btintel_pcie_wr_sleep_cntrl(data, BTINTEL_PCIE_STATE_D0);
 	err = wait_event_timeout(data->gp0_wait_q, data->gp0_received,
 				 msecs_to_jiffies(BTINTEL_DEFAULT_INTR_TIMEOUT_MS));
-	delta = ktime_to_ns(ktime_get() - start) / 1000;
+	delta = ktime_to_us(ktime_get() - start);
 
 	if (err == 0) {
 		bt_dev_err(data->hdev, "Timeout (%u ms) on alive interrupt for D0 entry",
-- 
2.39.5
RE: [PATCH] Bluetooth: btintel_pcie: avoid unguarded 64-bit division
Posted by K, Kiran 2 months, 1 week ago
Hi Arnd,

Thanks for the patch. I would like to amend this patch with - https://patchwork.kernel.org/project/bluetooth/patch/20250725090133.1358775-1-kiran.k@intel.com/

I will include your name as part of Signed-off-by tag. 

>-----Original Message-----
>From: Arnd Bergmann <arnd@kernel.org>
>Sent: Friday, July 25, 2025 2:37 PM
>To: Marcel Holtmann <marcel@holtmann.org>; Luiz Augusto von Dentz
><luiz.dentz@gmail.com>; Devegowda, Chandrashekar
><chandrashekar.devegowda@intel.com>; K, Kiran <kiran.k@intel.com>
>Cc: Arnd Bergmann <arnd@arndb.de>; Vijay Satija <vijay.satija@intel.com>;
>Aluvala Sai Teja <aluvala.sai.teja@intel.com>; linux-
>bluetooth@vger.kernel.org; linux-kernel@vger.kernel.org
>Subject: [PATCH] Bluetooth: btintel_pcie: avoid unguarded 64-bit division
>
>From: Arnd Bergmann <arnd@arndb.de>
>
>Directly dividing a 64-bit value is not allowed on 32-bit architectures in the
>kernel.
>
>arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: drivers/bluetooth/btintel_pcie.o:
>in function `btintel_pcie_suspend_late':
>btintel_pcie.c:(.text+0x224): undefined reference to `__aeabi_ldivmod'
>
>Since this is a ktime_t value and dividing by 1000 gives a microsecond number,
>just convert it into microseconds using the appropriate helper.
>
>Fixes: 33bb9b1ce6f6 ("Bluetooth: btintel_pcie: Add support for _suspend() /
>_resume()")
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>---
> drivers/bluetooth/btintel_pcie.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
>index 9792a49886ff..4dfd5365bb4e 100644
>--- a/drivers/bluetooth/btintel_pcie.c
>+++ b/drivers/bluetooth/btintel_pcie.c
>@@ -2607,7 +2607,7 @@ static int btintel_pcie_suspend_late(struct device
>*dev, pm_message_t mesg)
> 	btintel_pcie_wr_sleep_cntrl(data, dxstate);
> 	err = wait_event_timeout(data->gp0_wait_q, data->gp0_received,
>
>msecs_to_jiffies(BTINTEL_DEFAULT_INTR_TIMEOUT_MS));
>-	delta = ktime_to_ns(ktime_get() - start) / 1000;
>+	delta = ktime_to_us(ktime_get() - start);
>
> 	if (err == 0) {
> 		bt_dev_err(data->hdev, "Timeout (%u ms) on alive interrupt
>for D3 entry", @@ -2651,7 +2651,7 @@ static int btintel_pcie_resume(struct
>device *dev)
> 	btintel_pcie_wr_sleep_cntrl(data, BTINTEL_PCIE_STATE_D0);
> 	err = wait_event_timeout(data->gp0_wait_q, data->gp0_received,
>
>msecs_to_jiffies(BTINTEL_DEFAULT_INTR_TIMEOUT_MS));
>-	delta = ktime_to_ns(ktime_get() - start) / 1000;
>+	delta = ktime_to_us(ktime_get() - start);
>
> 	if (err == 0) {
> 		bt_dev_err(data->hdev, "Timeout (%u ms) on alive interrupt
>for D0 entry",
>--
>2.39.5

Thanks,
Kiran