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

qcacmn: Migrate qdf_ssr_protect/unprotect

Browse Source 
qdf_op_protect/unprotect supersede qdf_ssr_protect/unprotect. Replace
calls to qdf_ssr_protect/unprotect with qdf_op_protect/qdf_op_unprotect.

Change-Id: Iab80e4cbf6b87b37a0d761e7ecea695b840c5e5e
CRs-Fixed: 2418450
This commit is contained in:
Dustin Brown
2019-03-18 13:59:41 -07:00
committed by nshrivas
parent 766ea098f6
commit 50eab9871f
1 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
utils/pktlog/linux_ac.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -537,9 +537,7 @@ static int __pktlog_open(struct inode *i, struct file *f)
int ret = 0; int ret = 0;
PKTLOG_MOD_INC_USE_COUNT; PKTLOG_MOD_INC_USE_COUNT;
pl_info = (struct ath_pktlog_info *) pl_info = PDE_DATA(f->f_path.dentry->d_inode);
PDE_DATA(f->f_path.dentry->d_inode);
if (!pl_info) { if (!pl_info) {
pr_err("%s: pl_info NULL", __func__); pr_err("%s: pl_info NULL", __func__);
return -EINVAL; return -EINVAL;
@@ -551,11 +549,6 @@ static int __pktlog_open(struct inode *i, struct file *f)
return -EBUSY; return -EBUSY;
} }
if (qdf_is_module_state_transitioning()) {
pr_info("%s: module transition in progress", __func__);
return -EAGAIN;
}
pl_info->curr_pkt_state = PKTLOG_OPR_IN_PROGRESS_READ_START; pl_info->curr_pkt_state = PKTLOG_OPR_IN_PROGRESS_READ_START;
scn = cds_get_context(QDF_MODULE_ID_HIF); scn = cds_get_context(QDF_MODULE_ID_HIF);
if (!scn) { if (!scn) {
@@ -593,13 +586,18 @@ static int __pktlog_open(struct inode *i, struct file *f)
static int pktlog_open(struct inode *i, struct file *f) static int pktlog_open(struct inode *i, struct file *f)
{ {
int ret; struct qdf_op_sync *op_sync;
int errno;
qdf_ssr_protect(__func__); errno = qdf_op_protect(&op_sync);
ret = __pktlog_open(i, f); if (errno)
qdf_ssr_unprotect(__func__); return errno;
return ret; errno = __pktlog_open(i, f);
qdf_op_unprotect(op_sync);
return errno;
} }
static int __pktlog_release(struct inode *i, struct file *f) static int __pktlog_release(struct inode *i, struct file *f)
@@ -611,17 +609,10 @@ static int __pktlog_release(struct inode *i, struct file *f)
PKTLOG_MOD_DEC_USE_COUNT; PKTLOG_MOD_DEC_USE_COUNT;
pl_info = (struct ath_pktlog_info *) pl_info = PDE_DATA(f->f_path.dentry->d_inode);
PDE_DATA(f->f_path.dentry->d_inode);
if (!pl_info) if (!pl_info)
return -EINVAL; return -EINVAL;
if (qdf_is_module_state_transitioning()) {
pr_info("%s: module transition in progress", __func__);
return -EAGAIN;
}
scn = cds_get_context(QDF_MODULE_ID_HIF); scn = cds_get_context(QDF_MODULE_ID_HIF);
if (!scn) { if (!scn) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS; pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
@@ -660,13 +651,18 @@ static int __pktlog_release(struct inode *i, struct file *f)
static int pktlog_release(struct inode *i, struct file *f) static int pktlog_release(struct inode *i, struct file *f)
{ {
int ret; struct qdf_op_sync *op_sync;
int errno;
qdf_ssr_protect(__func__); errno = qdf_op_protect(&op_sync);
ret = __pktlog_release(i, f); if (errno)
qdf_ssr_unprotect(__func__); return errno;
return ret; errno = __pktlog_release(i, f);
qdf_op_unprotect(op_sync);
return errno;
} }
#ifndef MIN #ifndef MIN
@@ -839,13 +835,7 @@ __pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
struct ath_pktlog_info *pl_info; struct ath_pktlog_info *pl_info;
struct ath_pktlog_buf *log_buf; struct ath_pktlog_buf *log_buf;
if (qdf_is_module_state_transitioning()) { pl_info = PDE_DATA(file->f_path.dentry->d_inode);
pr_info("%s: module transition in progress", __func__);
return -EAGAIN;
}
pl_info = (struct ath_pktlog_info *)
PDE_DATA(file->f_path.dentry->d_inode);
if (!pl_info) if (!pl_info)
return 0; return 0;
@@ -988,20 +978,24 @@ rd_done:
static ssize_t static ssize_t
pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
{ {
size_t ret; struct ath_pktlog_info *info = PDE_DATA(file->f_path.dentry->d_inode);
struct ath_pktlog_info *pl_info; struct qdf_op_sync *op_sync;
ssize_t err_size;
pl_info = (struct ath_pktlog_info *) if (!info)
PDE_DATA(file->f_path.dentry->d_inode);
if (!pl_info)
return 0; return 0;
qdf_ssr_protect(__func__); err_size = qdf_op_protect(&op_sync);
mutex_lock(&pl_info->pktlog_mutex); if (err_size)
ret = __pktlog_read(file, buf, nbytes, ppos); return err_size;
mutex_unlock(&pl_info->pktlog_mutex);
qdf_ssr_unprotect(__func__); mutex_lock(&info->pktlog_mutex);
return ret; err_size = __pktlog_read(file, buf, nbytes, ppos);
mutex_unlock(&info->pktlog_mutex);
qdf_op_unprotect(op_sync);
return err_size;
} }
int pktlogmod_init(void *context) int pktlogmod_init(void *context)