nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 01:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: bluedroid: remove duplicate timer declaration

Browse Source 
There are 2 timer defined. One statically and one in the
bluedroid_pm_data struct. Both timers call the same function on expiration. In the case of the statically defined timer this is a problem because it assumes that the timer is part of the bluedroid_pm_data and so calling timer_container_of() or from_timer() results in an invalid pointer and hence kernel panic. Fix this by
removing the statically defined timer.

Bug 4958861

Change-Id: I08f9dc3a032f84ca3350fbec5fb97062da8d6795
Signed-off-by: Bruce Xu <brucex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3400991
(cherry picked from commit 61490c6a2a65e24068cd33a92d8730260ad83f95)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3405517
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
This commit is contained in:
Bruce Xu
2025-07-08 05:23:28 +00:00
committed by mobile promotions
parent 50c387ecf9
commit 74cc0f56f2
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/misc/bluedroid_pm.c
View File

@@ -79,7 +79,6 @@ EXPORT_SYMBOL(bt_wlan_unlock);
/** bluedroid_m busy timer */ /** bluedroid_m busy timer */
static void bluedroid_pm_timer_expire(struct timer_list *timer); static void bluedroid_pm_timer_expire(struct timer_list *timer);
static DEFINE_TIMER(bluedroid_pm_timer, bluedroid_pm_timer_expire);
static void bluedroid_work(struct work_struct *data) static void bluedroid_work(struct work_struct *data)
{ {
@@ -157,7 +156,7 @@ static void bluedroid_pm_timer_expire(struct timer_list *timer)
} else { } else {
/* BT Rx is busy, Reset Timer */ /* BT Rx is busy, Reset Timer */
BDP_DBG("Rx is busy, restarting the timer"); BDP_DBG("Rx is busy, restarting the timer");
mod_timer(&bluedroid_pm_timer, mod_timer(&bluedroid_pm->bluedroid_pm_timer,
jiffies + (TX_TIMER_INTERVAL * HZ)); jiffies + (TX_TIMER_INTERVAL * HZ));
} }
} }
@@ -259,7 +258,7 @@ static ssize_t lpm_write_proc(struct file *file, const char __user *buffer,
} else { } else {
/* Reset Timer */ /* Reset Timer */
BDP_DBG("Rx is busy, restarting the timer"); BDP_DBG("Rx is busy, restarting the timer");
mod_timer(&bluedroid_pm_timer, mod_timer(&bluedroid_pm->bluedroid_pm_timer,
jiffies + (TX_TIMER_INTERVAL * HZ)); jiffies + (TX_TIMER_INTERVAL * HZ));
} }
clear_bit(BT_WAKE, &bluedroid_pm->flags); clear_bit(BT_WAKE, &bluedroid_pm->flags);
@@ -269,9 +268,9 @@ static ssize_t lpm_write_proc(struct file *file, const char __user *buffer,
bluedroid_pm->ext_wake, 1); bluedroid_pm->ext_wake, 1);
__pm_stay_awake(bluedroid_pm->wake_lock); __pm_stay_awake(bluedroid_pm->wake_lock);
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */ #if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete(&bluedroid_pm_timer); timer_delete(&bluedroid_pm->bluedroid_pm_timer);
#else #else
del_timer(&bluedroid_pm_timer); del_timer(&bluedroid_pm->bluedroid_pm_timer);
#endif #endif
set_bit(BT_WAKE, &bluedroid_pm->flags); set_bit(BT_WAKE, &bluedroid_pm->flags);
} else { } else {
@@ -514,9 +513,9 @@ static int bluedroid_pm_remove(struct platform_device *pdev)
wakeup_source_unregister(bluedroid_pm->wake_lock); wakeup_source_unregister(bluedroid_pm->wake_lock);
remove_bt_proc_interface(); remove_bt_proc_interface();
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */ #if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete(&bluedroid_pm_timer); timer_delete(&bluedroid_pm->bluedroid_pm_timer);
#else #else
del_timer(&bluedroid_pm_timer); del_timer(&bluedroid_pm->bluedroid_pm_timer);
#endif #endif
} }
if (((bluedroid_pm->gpio_reset)) || if (((bluedroid_pm->gpio_reset)) ||