android/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove QDF_BUG of qdf_spin_is_locked

Browse Source 
spin_is_locked() provided by kernel has statement that we should not
rely heavily on the return value, it only tells that the spinlock is
seen to be locked, not that it is locked on your CPU.
Further, on CONFIG_SMP=n builds with CONFIG_DEBUG_SPINLOCK=n, the
return value is always 0.

So we should not use QDF_BUG to test/assert its return value, only be
used for debugging purpose.

Change-Id: I8854ebc6b96698f5272d77750da7d18582a288e9
CRs-Fixed: 2852179
This commit is contained in:
Will Huang 2021-01-11 16:10:15 +08:00 committed by snandini
parent 233ce05ae0
commit 19be165cba
3 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os_if/sync/src/osif_driver_sync.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2019, 2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -46,13 +46,9 @@ static qdf_spinlock_t __osif_driver_sync_lock;
qdf_spinlock_destroy(&__osif_driver_sync_lock)
#define osif_driver_sync_lock() qdf_spin_lock_bh(&__osif_driver_sync_lock)
#define osif_driver_sync_unlock() qdf_spin_unlock_bh(&__osif_driver_sync_lock)
#define osif_driver_sync_lock_assert() \
QDF_BUG(qdf_spin_is_locked(&__osif_driver_sync_lock))
static struct osif_driver_sync *osif_driver_sync_lookup(void)
{
osif_driver_sync_lock_assert();
if (!__osif_driver_sync.is_registered)
return NULL;
@ -61,8 +57,6 @@ static struct osif_driver_sync *osif_driver_sync_lookup(void)
static struct osif_driver_sync *osif_driver_sync_get(void)
{
osif_driver_sync_lock_assert();
if (__osif_driver_sync.in_use)
return NULL;
@ -73,8 +67,6 @@ static struct osif_driver_sync *osif_driver_sync_get(void)
static void osif_driver_sync_put(struct osif_driver_sync *driver_sync)
{
osif_driver_sync_lock_assert();
qdf_mem_zero(driver_sync, sizeof(*driver_sync));
}
@ -182,8 +174,6 @@ __osif_driver_sync_start_callback(struct osif_driver_sync **out_driver_sync,
QDF_STATUS status;
struct osif_driver_sync *driver_sync;
osif_driver_sync_lock_assert();
*out_driver_sync = NULL;
driver_sync = osif_driver_sync_lookup();
@ -308,8 +298,6 @@ __osif_driver_sync_dsc_psoc_create(struct dsc_psoc **out_dsc_psoc)
{
struct osif_driver_sync *driver_sync;
osif_driver_sync_lock_assert();
driver_sync = osif_driver_sync_lookup();
if (!driver_sync)
return QDF_STATUS_E_INVAL;

14
os_if/sync/src/osif_psoc_sync.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2019, 2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -46,15 +46,11 @@ static qdf_spinlock_t __osif_psoc_sync_lock;
qdf_spinlock_destroy(&__osif_psoc_sync_lock)
#define osif_psoc_sync_lock() qdf_spin_lock_bh(&__osif_psoc_sync_lock)
#define osif_psoc_sync_unlock() qdf_spin_unlock_bh(&__osif_psoc_sync_lock)
#define osif_psoc_sync_lock_assert() \
QDF_BUG(qdf_spin_is_locked(&__osif_psoc_sync_lock))
static struct osif_psoc_sync *osif_psoc_sync_lookup(struct device *dev)
{
int i;
osif_psoc_sync_lock_assert();
for (i = 0; i < QDF_ARRAY_SIZE(__osif_psoc_sync_arr); i++) {
struct osif_psoc_sync *psoc_sync = __osif_psoc_sync_arr + i;
@ -72,8 +68,6 @@ static struct osif_psoc_sync *osif_psoc_sync_get(void)
{
int i;
osif_psoc_sync_lock_assert();
for (i = 0; i < QDF_ARRAY_SIZE(__osif_psoc_sync_arr); i++) {
struct osif_psoc_sync *psoc_sync = __osif_psoc_sync_arr + i;
@ -88,8 +82,6 @@ static struct osif_psoc_sync *osif_psoc_sync_get(void)
static void osif_psoc_sync_put(struct osif_psoc_sync *psoc_sync)
{
osif_psoc_sync_lock_assert();
qdf_mem_zero(psoc_sync, sizeof(*psoc_sync));
}
@ -203,8 +195,6 @@ __osif_psoc_sync_start_callback(struct device *dev,
QDF_STATUS status;
struct osif_psoc_sync *psoc_sync;
osif_psoc_sync_lock_assert();
*out_psoc_sync = NULL;
psoc_sync = osif_psoc_sync_lookup(dev);
@ -353,8 +343,6 @@ __osif_psoc_sync_dsc_vdev_create(struct device *dev,
{
struct osif_psoc_sync *psoc_sync;
osif_psoc_sync_lock_assert();
psoc_sync = osif_psoc_sync_lookup(dev);
if (!psoc_sync)
return QDF_STATUS_E_INVAL;

12
os_if/sync/src/osif_vdev_sync.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2019, 2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -45,15 +45,11 @@ static qdf_spinlock_t __osif_vdev_sync_lock;
qdf_spinlock_destroy(&__osif_vdev_sync_lock)
#define osif_vdev_sync_lock() qdf_spin_lock_bh(&__osif_vdev_sync_lock)
#define osif_vdev_sync_unlock() qdf_spin_unlock_bh(&__osif_vdev_sync_lock)
#define osif_vdev_sync_lock_assert() \
QDF_BUG(qdf_spin_is_locked(&__osif_vdev_sync_lock))
static struct osif_vdev_sync *osif_vdev_sync_lookup(struct net_device *net_dev)
{
int i;
osif_vdev_sync_lock_assert();
for (i = 0; i < QDF_ARRAY_SIZE(__osif_vdev_sync_arr); i++) {
struct osif_vdev_sync *vdev_sync = __osif_vdev_sync_arr + i;
@ -71,8 +67,6 @@ static struct osif_vdev_sync *osif_vdev_sync_get(void)
{
int i;
osif_vdev_sync_lock_assert();
for (i = 0; i < QDF_ARRAY_SIZE(__osif_vdev_sync_arr); i++) {
struct osif_vdev_sync *vdev_sync = __osif_vdev_sync_arr + i;
@ -87,8 +81,6 @@ static struct osif_vdev_sync *osif_vdev_sync_get(void)
static void osif_vdev_sync_put(struct osif_vdev_sync *vdev_sync)
{
osif_vdev_sync_lock_assert();
qdf_mem_zero(vdev_sync, sizeof(*vdev_sync));
}
@ -208,8 +200,6 @@ __osif_vdev_sync_start_callback(struct net_device *net_dev,
QDF_STATUS status;
struct osif_vdev_sync *vdev_sync;
osif_vdev_sync_lock_assert();
*out_vdev_sync = NULL;
vdev_sync = osif_vdev_sync_lookup(net_dev);