qcacld-3.0: Add a sysfs replacement for set_scan_cfg
As part of WEXT replacement, replace set_scan_cfg with a sysfs file. file path: /sys/kernel/wifi/set_scan_cfg example: echo 1 1 1 > set_scan_cfg Change-Id: I0807a0fc7ab4e3963386f5f5979b039c291896d9 CRs-Fixed: 2678470
This commit is contained in:
parent
28edf2eb89
commit
96d62585ee
4
Kbuild
4
Kbuild
@ -288,6 +288,9 @@ endif
|
||||
ifeq ($(CONFIG_WLAN_WOWL_ADD_PTRN), y)
|
||||
HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_wowl_add_ptrn.o
|
||||
endif
|
||||
ifeq ($(CONFIG_WLAN_SET_SCAN_CFG), y)
|
||||
HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_scan_cfg.o
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_QCACLD_FEATURE_FW_STATE), y)
|
||||
@ -2519,6 +2522,7 @@ cppflags-$(CONFIG_WLAN_REASSOC) += -DCONFIG_WLAN_REASSOC
|
||||
cppflags-$(CONFIG_WLAN_SCAN_DISABLE) += -DCONFIG_WLAN_SCAN_DISABLE
|
||||
cppflags-$(CONFIG_WLAN_WOW_ITO) += -DCONFIG_WLAN_WOW_ITO
|
||||
cppflags-$(CONFIG_WLAN_WOWL_ADD_PTRN) += -DCONFIG_WLAN_WOWL_ADD_PTRN
|
||||
cppflags-$(CONFIG_WLAN_SET_SCAN_CFG) += -DCONFIG_WLAN_SET_SCAN_CFG
|
||||
cppflags-$(CONFIG_FEATURE_UNIT_TEST_SUSPEND) += -DWLAN_SUSPEND_RESUME_TEST
|
||||
cppflags-$(CONFIG_FEATURE_WLM_STATS) += -DFEATURE_WLM_STATS
|
||||
|
||||
|
@ -182,6 +182,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y)
|
||||
CONFIG_WLAN_SCAN_DISABLE := y
|
||||
CONFIG_WLAN_WOW_ITO := y
|
||||
CONFIG_WLAN_WOWL_ADD_PTRN := y
|
||||
CONFIG_WLAN_SET_SCAN_CFG := y
|
||||
endif
|
||||
|
||||
CONFIG_WLAN_POWER_DEBUG := y
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include <wlan_hdd_sysfs_scan_disable.h>
|
||||
#include <wlan_hdd_sysfs_wow_ito.h>
|
||||
#include <wlan_hdd_sysfs_wowl_add_ptrn.h>
|
||||
#include <wlan_hdd_sysfs_set_scan_cfg.h>
|
||||
|
||||
#define MAX_PSOC_ID_SIZE 10
|
||||
|
||||
@ -676,12 +677,14 @@ void hdd_create_sysfs_files(struct hdd_context *hdd_ctx)
|
||||
hdd_sysfs_set_fw_mode_cfg_create(driver_kobject);
|
||||
hdd_sysfs_scan_disable_create(driver_kobject);
|
||||
hdd_sysfs_wow_ito_create(driver_kobject);
|
||||
hdd_sysfs_set_scan_cfg_create(driver_kobject);
|
||||
}
|
||||
}
|
||||
|
||||
void hdd_destroy_sysfs_files(void)
|
||||
{
|
||||
if (QDF_GLOBAL_MISSION_MODE == hdd_get_conparam()) {
|
||||
hdd_sysfs_set_scan_cfg_destroy(driver_kobject);
|
||||
hdd_sysfs_wow_ito_destroy(driver_kobject);
|
||||
hdd_sysfs_scan_disable_destroy(driver_kobject);
|
||||
hdd_sysfs_set_fw_mode_cfg_destroy(driver_kobject);
|
||||
|
151
core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
Normal file
151
core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
Normal file
@ -0,0 +1,151 @@
|
||||
/*
|
||||
* Copyright (c) 2011-2020 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 above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* DOC: wlan_hdd_sysfs_set_scan_cfg.c
|
||||
*
|
||||
* implementation for creating sysfs file set_scan_cfg
|
||||
*/
|
||||
|
||||
#include <wlan_hdd_includes.h>
|
||||
#include "osif_psoc_sync.h"
|
||||
#include <wlan_hdd_sysfs.h>
|
||||
#include <wlan_hdd_sysfs_set_scan_cfg.h>
|
||||
#include "wlan_policy_mgr_ucfg.h"
|
||||
|
||||
static ssize_t
|
||||
__hdd_sysfs_set_scan_cfg_store(struct hdd_context *hdd_ctx,
|
||||
struct kobj_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
uint8_t dual_mac_feature = DISABLE_DBS_CXN_AND_SCAN;
|
||||
char buf_local[MAX_SYSFS_USER_COMMAND_SIZE_LENGTH + 1];
|
||||
char *sptr, *token;
|
||||
uint8_t val1, val2, val3;
|
||||
QDF_STATUS status;
|
||||
int ret;
|
||||
|
||||
if (!wlan_hdd_validate_modules_state(hdd_ctx))
|
||||
return -EINVAL;
|
||||
|
||||
ret = hdd_sysfs_validate_and_copy_buf(buf_local, sizeof(buf_local),
|
||||
buf, count);
|
||||
|
||||
if (ret) {
|
||||
hdd_err_rl("invalid input");
|
||||
return ret;
|
||||
}
|
||||
|
||||
sptr = buf_local;
|
||||
hdd_debug("set_scan_cfg: count %zu buf_local:(%s)",
|
||||
count, buf_local);
|
||||
|
||||
/* Get val1 */
|
||||
token = strsep(&sptr, " ");
|
||||
if (!token)
|
||||
return -EINVAL;
|
||||
if (kstrtou8(token, 0, &val1))
|
||||
return -EINVAL;
|
||||
|
||||
/* Get val2 */
|
||||
token = strsep(&sptr, " ");
|
||||
if (!token)
|
||||
return -EINVAL;
|
||||
if (kstrtou8(token, 0, &val2))
|
||||
return -EINVAL;
|
||||
|
||||
/* Get val3 */
|
||||
token = strsep(&sptr, " ");
|
||||
if (!token)
|
||||
return -EINVAL;
|
||||
if (kstrtou8(token, 0, &val3))
|
||||
return -EINVAL;
|
||||
|
||||
hdd_debug("Sysfs to set dual mac scan config");
|
||||
status = ucfg_policy_mgr_get_dual_mac_feature(hdd_ctx->psoc,
|
||||
&dual_mac_feature);
|
||||
if (status != QDF_STATUS_SUCCESS)
|
||||
hdd_err("can't get dual mac feature val, use def");
|
||||
if (dual_mac_feature == DISABLE_DBS_CXN_AND_SCAN) {
|
||||
hdd_err("Dual mac feature is disabled from INI");
|
||||
return -EPERM;
|
||||
}
|
||||
hdd_debug("%d %d %d", val1, val2, val3);
|
||||
policy_mgr_set_dual_mac_scan_config(hdd_ctx->psoc,
|
||||
val1, val2, val3);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
hdd_sysfs_set_scan_cfg_store(struct kobject *kobj,
|
||||
struct kobj_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct osif_psoc_sync *psoc_sync;
|
||||
struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
|
||||
ssize_t errno_size;
|
||||
int ret;
|
||||
|
||||
ret = wlan_hdd_validate_context(hdd_ctx);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
errno_size = osif_psoc_sync_op_start(wiphy_dev(hdd_ctx->wiphy),
|
||||
&psoc_sync);
|
||||
if (errno_size)
|
||||
return errno_size;
|
||||
|
||||
errno_size = __hdd_sysfs_set_scan_cfg_store(hdd_ctx, attr,
|
||||
buf, count);
|
||||
|
||||
osif_psoc_sync_op_stop(psoc_sync);
|
||||
|
||||
return errno_size;
|
||||
}
|
||||
|
||||
static struct kobj_attribute set_scan_cfg_attribute =
|
||||
__ATTR(set_scan_cfg, 0220, NULL,
|
||||
hdd_sysfs_set_scan_cfg_store);
|
||||
|
||||
int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
|
||||
{
|
||||
int error;
|
||||
|
||||
if (!driver_kobject) {
|
||||
hdd_err("could not get driver kobject!");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
error = sysfs_create_file(driver_kobject,
|
||||
&set_scan_cfg_attribute.attr);
|
||||
if (error)
|
||||
hdd_err("could not create set_scan_cfg sysfs file");
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
void
|
||||
hdd_sysfs_set_scan_cfg_destroy(struct kobject *driver_kobject)
|
||||
{
|
||||
if (!driver_kobject) {
|
||||
hdd_err("could not get driver kobject!");
|
||||
return;
|
||||
}
|
||||
sysfs_remove_file(driver_kobject, &set_scan_cfg_attribute.attr);
|
||||
}
|
60
core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
Normal file
60
core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
Normal file
@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright (c) 2011-2020 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 above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* DOC: wlan_hdd_sysfs_set_scan_cfg.h
|
||||
*
|
||||
* implementation for creating sysfs file set_scan_cfg
|
||||
*/
|
||||
|
||||
#ifndef _WLAN_HDD_SYSFS_SET_SCAN_CFG_H
|
||||
#define _WLAN_HDD_SYSFS_SET_SCAN_CFG_H
|
||||
|
||||
#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_SCAN_CFG)
|
||||
/**
|
||||
* hdd_sysfs_set_scan_cfg_create() - API to create set_scan_cfg
|
||||
* @driver_kobject: sysfs driver kobject
|
||||
*
|
||||
* file path: /sys/kernel/wifi/set_scan_cfg
|
||||
*
|
||||
* usage:
|
||||
* echo [arg_0] [arg_1] [arg_2]> set_scan_cfg
|
||||
*
|
||||
* Return: 0 on success and errno on failure
|
||||
*/
|
||||
int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject);
|
||||
|
||||
/**
|
||||
* hdd_sysfs_set_scan_cfg_destroy() -
|
||||
* API to destroy set_scan_cfg
|
||||
*
|
||||
* Return: none
|
||||
*/
|
||||
void
|
||||
hdd_sysfs_set_scan_cfg_destroy(struct kobject *driver_kobject);
|
||||
#else
|
||||
static inline int
|
||||
hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void
|
||||
hdd_sysfs_set_scan_cfg_destroy(struct kobject *driver_kobject)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
#endif /* #ifndef _WLAN_HDD_SYSFS_SET_SCAN_CFG_H */
|
Loading…
Reference in New Issue
Block a user