A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Add support to set antenna mode for SAP

Browse source 
Add support to set antenna mode for SAP using iwpriv commands
set_txchainmask and set_txchainmask.

Change-Id: Id74d8caf6b2d48b0afbcc3791bd347d6addd2e7d
CRs-Fixed: 2239648
This commit is contained in:
Abhishek Singh 2018-04-17 15:14:21 +05:30 • committed by nshrivas
commit 1571ca7cc0
4 changed files with 48 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -3789,6 +3789,7 @@ static __iw_softap_setparam(struct net_device *dev,
ret = wma_cli_set_command(adapter->session_id,
WMI_PDEV_PARAM_TX_CHAIN_MASK,
set_value, PDEV_CMD);
ret = hdd_set_antenna_mode(adapter, hdd_ctx, set_value);
break;
}
@ -3798,6 +3799,7 @@ static __iw_softap_setparam(struct net_device *dev,
ret = wma_cli_set_command(adapter->session_id,
WMI_PDEV_PARAM_RX_CHAIN_MASK,
set_value, PDEV_CMD);
ret = hdd_set_antenna_mode(adapter, hdd_ctx, set_value);
break;
}

72
core/hdd/src/wlan_hdd_ioctl.c
View file

@ -6402,47 +6402,16 @@ QDF_STATUS hdd_update_smps_antenna_mode(struct hdd_context *hdd_ctx, int mode)
return QDF_STATUS_SUCCESS;
}
/**
* drv_cmd_set_antenna_mode() - SET ANTENNA MODE driver command
* handler
* @adapter: Pointer to network adapter
* @hdd_ctx: Pointer to hdd context
* @command: Pointer to input command
* @command_len: Command length
* @priv_data: Pointer to private data in command
*/
static int drv_cmd_set_antenna_mode(struct hdd_adapter *adapter,
struct hdd_context *hdd_ctx,
uint8_t *command,
uint8_t command_len,
struct hdd_priv_data *priv_data)
int hdd_set_antenna_mode(struct hdd_adapter *adapter,
struct hdd_context *hdd_ctx, int mode)
{
struct sir_antenna_mode_param params;
QDF_STATUS status;
int ret = 0;
int mode;
uint8_t *value = command;
if (((1 << QDF_STA_MODE) !=
policy_mgr_get_concurrency_mode(hdd_ctx->hdd_psoc)) ||
(policy_mgr_is_multiple_active_sta_sessions(hdd_ctx->hdd_psoc))) {
hdd_err("Operation invalid in non sta or concurrent mode");
ret = -EPERM;
goto exit;
}
mode = hdd_parse_setantennamode_command(value);
if (mode < 0) {
hdd_err("Invalid SETANTENNA command");
ret = mode;
goto exit;
}
hdd_debug("Processing antenna mode switch to: %d", mode);
if (hdd_ctx->current_antenna_mode == mode) {
hdd_err("System already in the requested mode");
ret = 0;
goto exit;
}
@ -6456,7 +6425,6 @@ static int drv_cmd_set_antenna_mode(struct hdd_adapter *adapter,
if ((HDD_ANTENNA_MODE_1X1 == mode) &&
hdd_is_supported_chain_mask_1x1(hdd_ctx)) {
hdd_err("System only supports 1x1 mode");
ret = 0;
goto exit;
}
@ -6494,7 +6462,7 @@ static int drv_cmd_set_antenna_mode(struct hdd_adapter *adapter,
INIT_COMPLETION(hdd_ctx->set_antenna_mode_cmpl);
status = sme_soc_set_antenna_mode(hdd_ctx->hHal, &params);
if (QDF_STATUS_SUCCESS != status) {
if (QDF_IS_STATUS_ERROR(status)) {
hdd_err("set antenna mode failed status : %d", status);
ret = -EFAULT;
goto exit;
@ -6504,8 +6472,8 @@ static int drv_cmd_set_antenna_mode(struct hdd_adapter *adapter,
&hdd_ctx->set_antenna_mode_cmpl,
msecs_to_jiffies(WLAN_WAIT_TIME_ANTENNA_MODE_REQ));
if (!ret) {
ret = -EFAULT;
hdd_err("send set antenna mode timed out");
ret = -EFAULT;
goto exit;
}
@ -6518,8 +6486,36 @@ static int drv_cmd_set_antenna_mode(struct hdd_adapter *adapter,
exit:
hdd_debug("Set antenna status: %d current mode: %d",
ret, hdd_ctx->current_antenna_mode);
return ret;
return ret;
}
/**
* drv_cmd_set_antenna_mode() - SET ANTENNA MODE driver command
* handler
* @adapter: Pointer to network adapter
* @hdd_ctx: Pointer to hdd context
* @command: Pointer to input command
* @command_len: Command length
* @priv_data: Pointer to private data in command
*/
static int drv_cmd_set_antenna_mode(struct hdd_adapter *adapter,
struct hdd_context *hdd_ctx,
uint8_t *command,
uint8_t command_len,
struct hdd_priv_data *priv_data)
{
int mode;
uint8_t *value = command;
mode = hdd_parse_setantennamode_command(value);
if (mode < 0) {
hdd_err("Invalid SETANTENNA command");
return mode;
}
hdd_debug("Processing antenna mode switch to: %d", mode);
return hdd_set_antenna_mode(adapter, hdd_ctx, mode);
}
/**

12
core/hdd/src/wlan_hdd_ioctl.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2014, 2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2014, 2017-2018 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
@ -38,5 +38,15 @@ int wlan_hdd_set_mc_rate(struct hdd_adapter *adapter, int targetRate);
* Return: QDF_STATUS
*/
QDF_STATUS hdd_update_smps_antenna_mode(struct hdd_context *hdd_ctx, int mode);
/**
* hdd_set_antenna_mode() - SET ANTENNA MODE command handler
* @adapter: Pointer to network adapter
* @hdd_ctx: Pointer to hdd context
* @mode: new anteena mode
*/
int hdd_set_antenna_mode(struct hdd_adapter *adapter,
struct hdd_context *hdd_ctx, int mode);
#endif /* end #if !defined(WLAN_HDD_IOCTL_H) */

2
core/hdd/src/wlan_hdd_wext.c
View file

@ -4826,6 +4826,7 @@ static int __iw_setint_getnone(struct net_device *dev,
ret = wma_cli_set_command(adapter->session_id,
WMI_PDEV_PARAM_TX_CHAIN_MASK,
set_value, PDEV_CMD);
ret = hdd_set_antenna_mode(adapter, hdd_ctx, set_value);
break;
}
@ -4836,6 +4837,7 @@ static int __iw_setint_getnone(struct net_device *dev,
ret = wma_cli_set_command(adapter->session_id,
WMI_PDEV_PARAM_RX_CHAIN_MASK,
set_value, PDEV_CMD);
ret = hdd_set_antenna_mode(adapter, hdd_ctx, set_value);
break;
}