qcacld-3.0: Move os_if vdev lock inside when doing vdev trans wait

Since os_if_vdev_trans_wait may sleep on a wait event if there is any
active ongoing transition on driver, psoc or vdevs. Hence move the
os_if_vdev_sync_lock(a spin lock bh) inside sync calback API for vdev
look up such that spin lock is not held before starting the wait on
event. os_if_vdev_sync lock is for vdev look up and not for wait
and hence this fix makes locking fine granular as well.

Change-Id: I2cca560aeed9b79648168a09f596dbaa374ecbb5
CRs-Fixed: 2433829
This commit is contained in:
Rajeev Kumar 2019-04-11 12:17:32 -07:00 committed by nshrivas
parent 70d2e56aae
commit 0118dc9cc9

View File

@ -225,6 +225,32 @@ __osif_vdev_sync_start_callback(struct net_device *net_dev,
return 0;
}
static int
__osif_vdev_sync_start_wait_callback(struct net_device *net_dev,
struct osif_vdev_sync **out_vdev_sync,
const char *desc,
vdev_start_func vdev_start_cb)
{
QDF_STATUS status;
struct osif_vdev_sync *vdev_sync;
*out_vdev_sync = NULL;
osif_vdev_sync_lock();
vdev_sync = osif_vdev_sync_lookup(net_dev);
osif_vdev_sync_unlock();
if (!vdev_sync)
return -EAGAIN;
status = vdev_start_cb(vdev_sync->dsc_vdev, desc);
if (QDF_IS_STATUS_ERROR(status))
return qdf_status_to_os_return(status);
*out_vdev_sync = vdev_sync;
return 0;
}
int __osif_vdev_sync_trans_start(struct net_device *net_dev,
struct osif_vdev_sync **out_vdev_sync,
const char *desc)
@ -245,10 +271,10 @@ int __osif_vdev_sync_trans_start_wait(struct net_device *net_dev,
{
int errno;
osif_vdev_sync_lock();
errno = __osif_vdev_sync_start_callback(net_dev, out_vdev_sync, desc,
dsc_vdev_trans_start_wait);
osif_vdev_sync_unlock();
/* since dsc_vdev_trans_start_wait may sleep do not take lock here */
errno = __osif_vdev_sync_start_wait_callback(net_dev,
out_vdev_sync, desc,
dsc_vdev_trans_start_wait);
return errno;
}