samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Rozštěpit 0
Zdrojový kód Úkoly Pull requesty Akce Balíčky Projekty Vydání Wiki Aktivita

qcacmn: remove dependency of public files from wlan_objmgr_psoc_obj.h

Procházet zdrojové kódy 
Remove dependency of wlan_lmac_if_def headerfiles from
wlan_objmgr_psoc_obj.h

Change-Id: Ibe2f22c4b4f22b15eef201d1a42844ccf2931fef
Tento commit je obsažen v:
Neha Bisht
2020-04-06 15:12:52 +05:30
odevzdal nshrivas
rodič 466c04dee9
revize 4bda764146
25 změnil soubory, kde provedl 483 přidání a 96 odebrání
Stáhněte soubor záplaty Stáhněte rozdílový soubor Rozbalit všechny soubory Sbalit všechny soubory

24
umac/cmn_services/crypto/src/wlan_crypto_def_i.h
Zobrazit soubor

@@ -161,18 +161,18 @@ static inline void wlan_crypto_put_be64(u8 *a, u64 val)
a[7] = val & 0xff;
}
#define WLAN_CRYPTO_TX_OPS_ALLOCKEY(psoc) \
(psoc->soc_cb.tx_ops.crypto_tx_ops.allockey)
#define WLAN_CRYPTO_TX_OPS_SETKEY(psoc) \
(psoc->soc_cb.tx_ops.crypto_tx_ops.setkey)
#define WLAN_CRYPTO_TX_OPS_DELKEY(psoc) \
(psoc->soc_cb.tx_ops.crypto_tx_ops.delkey)
#define WLAN_CRYPTO_TX_OPS_DEFAULTKEY(psoc) \
(psoc->soc_cb.tx_ops.crypto_tx_ops.defaultkey)
#define WLAN_CRYPTO_TX_OPS_SET_KEY(psoc) \
((psoc)->soc_cb.tx_ops.crypto_tx_ops.set_key)
#define WLAN_CRYPTO_TX_OPS_GETPN(psoc) \
((psoc)->soc_cb.tx_ops.crypto_tx_ops.getpn)
#define WLAN_CRYPTO_TX_OPS_ALLOCKEY(tx_ops) \
((tx_ops)->crypto_tx_ops.allockey)
#define WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops) \
((tx_ops)->crypto_tx_ops.setkey)
#define WLAN_CRYPTO_TX_OPS_DELKEY(tx_ops) \
((tx_ops)->crypto_tx_ops.delkey)
#define WLAN_CRYPTO_TX_OPS_DEFAULTKEY(tx_ops) \
((tx_ops)->crypto_tx_ops.defaultkey)
#define WLAN_CRYPTO_TX_OPS_SET_KEY(tx_ops) \
((tx_ops)->crypto_tx_ops.set_key)
#define WLAN_CRYPTO_TX_OPS_GETPN(tx_ops) \
((tx_ops)->crypto_tx_ops.getpn)
/* unalligned little endian access */
#ifndef LE_READ_2

122
umac/cmn_services/crypto/src/wlan_crypto_global_api.c
Zobrazit soubor

@@ -641,6 +641,7 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
enum QDF_OPMODE vdev_mode;
uint8_t igtk_idx = 0;
uint8_t bigtk_idx = 0;
struct wlan_lmac_if_tx_ops *tx_ops;
if (!vdev || !req_key || req_key->keylen > (sizeof(req_key->keydata))) {
crypto_err("Invalid params vdev%pK, req_key%pK", vdev, req_key);
@@ -935,14 +936,20 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
}
}
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return QDF_STATUS_E_INVAL;
}
qdf_mem_copy(key->keyval, req_key->keydata, sizeof(key->keyval));
key->valid = 1;
if ((IS_MGMT_CIPHER(req_key->type))) {
if (HAS_CIPHER_CAP(crypto_params,
WLAN_CRYPTO_CAP_PMF_OFFLOAD) ||
is_bigtk(req_key->keyix)) {
if (WLAN_CRYPTO_TX_OPS_SETKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_SETKEY(psoc)(vdev,
if (WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)(vdev,
key, macaddr, req_key->type);
}
}
@@ -953,9 +960,9 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
/* Take request key object to FILS setkey */
key->private = req_key;
} else {
if (WLAN_CRYPTO_TX_OPS_SETKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_SETKEY(psoc)(vdev, key,
macaddr, req_key->type);
if (WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)(vdev, key, macaddr,
req_key->type);
}
}
status = cipher->setkey(key);
@@ -1094,6 +1101,7 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev,
struct wlan_crypto_cipher *cipher_table;
struct wlan_crypto_key *key;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_tx_ops *tx_ops;
uint8_t macaddr[QDF_MAC_ADDR_SIZE] =
{0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -1129,10 +1137,17 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_E_NOENT;
}
key = wlan_crypto_peer_getkey(peer, req_key->keyix);
if (WLAN_CRYPTO_TX_OPS_GETPN(psoc) &&
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return QDF_STATUS_E_INVAL;
}
if (WLAN_CRYPTO_TX_OPS_GETPN(tx_ops) &&
(req_key->flags & WLAN_CRYPTO_KEY_GET_PN))
WLAN_CRYPTO_TX_OPS_GETPN(psoc)(vdev, mac_addr,
req_key->type);
WLAN_CRYPTO_TX_OPS_GETPN(tx_ops)(vdev, mac_addr,
req_key->type);
wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);
if (!key)
return QDF_STATUS_E_INVAL;
@@ -1187,6 +1202,7 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
struct wlan_crypto_key *key;
struct wlan_crypto_cipher *cipher_table;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_tx_ops *tx_ops;
uint8_t bssid_mac[QDF_MAC_ADDR_SIZE];
if (!vdev || !macaddr ||
@@ -1266,10 +1282,16 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
cipher_table = (struct wlan_crypto_cipher *)key->cipher_table;
qdf_mem_zero(key->keyval, sizeof(key->keyval));
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return QDF_STATUS_E_INVAL;
}
if (!IS_FILS_CIPHER(cipher_table->cipher) &&
WLAN_CRYPTO_TX_OPS_DELKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_DELKEY(psoc)(vdev, key,
macaddr, cipher_table->cipher);
WLAN_CRYPTO_TX_OPS_DELKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_DELKEY(tx_ops)(vdev, key, macaddr,
cipher_table->cipher);
} else if (IS_FILS_CIPHER(cipher_table->cipher)) {
if (key->private)
qdf_mem_free(key->private);
@@ -1294,17 +1316,23 @@ static QDF_STATUS wlan_crypto_set_default_key(struct wlan_objmgr_vdev *vdev,
uint8_t key_idx, uint8_t *macaddr)
{
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_tx_ops *tx_ops;
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
crypto_err("psoc is NULL");
return QDF_STATUS_E_INVAL;
}
if (WLAN_CRYPTO_TX_OPS_DEFAULTKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_DEFAULTKEY(psoc)(vdev, key_idx,
macaddr);
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return QDF_STATUS_E_INVAL;
}
if (WLAN_CRYPTO_TX_OPS_DEFAULTKEY(tx_ops))
WLAN_CRYPTO_TX_OPS_DEFAULTKEY(tx_ops)(vdev, key_idx, macaddr);
return QDF_STATUS_SUCCESS;
}
#endif
@@ -3318,6 +3346,7 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
struct wlan_crypto_key *sta_key;
struct wlan_crypto_cipher *cipher_table;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_tx_ops *tx_ops;
uint8_t *mac_addr;
int i;
enum QDF_OPMODE opmode;
@@ -3379,6 +3408,12 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
key->cipher_table;
if (cipher_table->cipher == WLAN_CRYPTO_CIPHER_WEP) {
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return QDF_STATUS_E_INVAL;
}
sta_key = qdf_mem_malloc(
sizeof(struct wlan_crypto_key));
if (!sta_key) {
@@ -3401,19 +3436,21 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
/* setting the broadcast/multicast key for sta*/
if (opmode == QDF_STA_MODE ||
opmode == QDF_IBSS_MODE){
if (WLAN_CRYPTO_TX_OPS_SETKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_SETKEY(psoc)(
vdev, sta_key, mac_addr,
if (WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_SETKEY(
tx_ops)(vdev, sta_key,
mac_addr,
cipher_table->cipher);
}
}
/* setting unicast key */
sta_key->flags &= ~WLAN_CRYPTO_KEY_GROUP;
if (WLAN_CRYPTO_TX_OPS_SETKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_SETKEY(psoc)(vdev,
sta_key, mac_addr,
cipher_table->cipher);
if (WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)(
vdev, sta_key,
mac_addr,
cipher_table->cipher);
}
}
}
@@ -3456,8 +3493,16 @@ QDF_STATUS wlan_crypto_register_crypto_rx_ops(
struct wlan_lmac_if_crypto_rx_ops *wlan_crypto_get_crypto_rx_ops(
struct wlan_objmgr_psoc *psoc)
{
struct wlan_lmac_if_rx_ops *rx_ops;
return &(psoc->soc_cb.rx_ops.crypto_rx_ops);
rx_ops = wlan_psoc_get_lmac_if_rxops(psoc);
if (!rx_ops) {
crypto_err("rx_ops is NULL");
return NULL;
}
return &rx_ops->crypto_rx_ops;
}
qdf_export_symbol(wlan_crypto_get_crypto_rx_ops);
@@ -3755,6 +3800,7 @@ static void crypto_plumb_peer_keys(struct wlan_objmgr_vdev *vdev,
struct wlan_crypto_comp_priv *crypto_priv;
struct wlan_crypto_params *crypto_params;
struct wlan_crypto_key *key = NULL;
struct wlan_lmac_if_tx_ops *tx_ops;
int i;
if ((!peer) || (!vdev) || (!psoc)) {
@@ -3773,8 +3819,14 @@ static void crypto_plumb_peer_keys(struct wlan_objmgr_vdev *vdev,
for (i = 0; i < WLAN_CRYPTO_MAXKEYIDX; i++) {
key = crypto_priv->key[i];
if (key && key->valid) {
if (WLAN_CRYPTO_TX_OPS_SETKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_SETKEY(psoc)
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return;
}
if (WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)
(
vdev,
key,
@@ -3805,6 +3857,7 @@ void wlan_crypto_restore_keys(struct wlan_objmgr_vdev *vdev)
{0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct wlan_objmgr_pdev *pdev = NULL;
struct wlan_objmgr_psoc *psoc = NULL;
struct wlan_lmac_if_tx_ops *tx_ops;
pdev = wlan_vdev_get_pdev(vdev);
psoc = wlan_vdev_get_psoc(vdev);
@@ -3833,8 +3886,13 @@ void wlan_crypto_restore_keys(struct wlan_objmgr_vdev *vdev)
}
key = crypto_priv->key[i];
if (key && key->valid) {
if (WLAN_CRYPTO_TX_OPS_SETKEY(psoc)) {
WLAN_CRYPTO_TX_OPS_SETKEY(psoc)
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return;
}
if (WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)) {
WLAN_CRYPTO_TX_OPS_SETKEY(tx_ops)
(
vdev,
key,
@@ -4317,10 +4375,18 @@ QDF_STATUS wlan_crypto_set_key_req(struct wlan_objmgr_vdev *vdev,
enum wlan_crypto_key_type key_type)
{
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_tx_ops *tx_ops;
psoc = wlan_vdev_get_psoc(vdev);
if (psoc && WLAN_CRYPTO_TX_OPS_SET_KEY(psoc))
WLAN_CRYPTO_TX_OPS_SET_KEY(psoc)(vdev, req, key_type);
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
crypto_err("tx_ops is NULL");
return QDF_STATUS_E_FAILURE;
}
if (psoc && WLAN_CRYPTO_TX_OPS_SET_KEY(tx_ops))
WLAN_CRYPTO_TX_OPS_SET_KEY(tx_ops)(vdev, req, key_type);
else
return QDF_STATUS_E_FAILURE;

59
umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_utils_api.c
Zobrazit soubor

@@ -370,6 +370,8 @@ QDF_STATUS wlan_mgmt_txrx_mgmt_frame_tx(struct wlan_objmgr_peer *peer,
struct mgmt_txrx_priv_pdev_context *txrx_ctx;
struct wlan_objmgr_vdev *vdev;
QDF_STATUS status;
struct wlan_lmac_if_tx_ops *tx_ops;
struct wlan_lmac_if_rx_ops *rx_ops;
if (!peer) {
mgmt_txrx_err("peer passed is NULL");
@@ -428,18 +430,28 @@ QDF_STATUS wlan_mgmt_txrx_mgmt_frame_tx(struct wlan_objmgr_peer *peer,
desc->vdev_id = wlan_vdev_get_id(vdev);
desc->context = context;
if (psoc->soc_cb.rx_ops.iot_sim_rx_ops.iot_sim_cmd_handler) {
status = psoc->soc_cb.rx_ops.iot_sim_rx_ops.iot_sim_cmd_handler(
vdev, buf);
rx_ops = wlan_psoc_get_lmac_if_rxops(psoc);
if (!rx_ops) {
mgmt_txrx_err("rx_ops is NULL");
return QDF_STATUS_E_NULL_VALUE;
}
if (rx_ops->iot_sim_rx_ops.iot_sim_cmd_handler) {
status = rx_ops->iot_sim_rx_ops.iot_sim_cmd_handler(vdev, buf);
if (status) {
mgmt_txrx_err("iot_sim_cmd_handler returned failure, dropping the frame");
return QDF_STATUS_E_FAILURE;
}
}
if (!psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.mgmt_tx_send) {
mgmt_txrx_err(
"mgmt txrx txop to send mgmt frame is NULL for psoc: %pK",
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
mgmt_txrx_err("tx_ops is NULL");
return QDF_STATUS_E_NULL_VALUE;
}
if (!tx_ops->mgmt_txrx_tx_ops.mgmt_tx_send) {
mgmt_txrx_err("mgmt txrx txop to send mgmt frame is NULL for psoc: %pK",
psoc);
wlan_objmgr_peer_release_ref(peer, WLAN_MGMT_NB_ID);
desc->nbuf = NULL;
@@ -447,7 +459,7 @@ QDF_STATUS wlan_mgmt_txrx_mgmt_frame_tx(struct wlan_objmgr_peer *peer,
return QDF_STATUS_E_FAILURE;
}
if (psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.mgmt_tx_send(
if (tx_ops->mgmt_txrx_tx_ops.mgmt_tx_send(
vdev, buf, desc->desc_id, mgmt_tx_params)) {
mgmt_txrx_err("Mgmt send fail for peer %pK psoc %pK pdev: %pK",
peer, psoc, pdev);
@@ -465,6 +477,7 @@ QDF_STATUS wlan_mgmt_txrx_beacon_frame_tx(struct wlan_objmgr_peer *peer,
{
struct wlan_objmgr_vdev *vdev;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_tx_ops *tx_ops;
vdev = wlan_peer_get_vdev(peer);
if (!vdev) {
@@ -478,13 +491,19 @@ QDF_STATUS wlan_mgmt_txrx_beacon_frame_tx(struct wlan_objmgr_peer *peer,
return QDF_STATUS_E_NULL_VALUE;
}
if (!psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.beacon_send) {
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
mgmt_txrx_err("tx_ops is NULL");
return QDF_STATUS_E_NULL_VALUE;
}
if (!tx_ops->mgmt_txrx_tx_ops.beacon_send) {
mgmt_txrx_err("mgmt txrx tx op to send beacon frame is NULL for psoc: %pK",
psoc);
return QDF_STATUS_E_FAILURE;
}
if (psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.beacon_send(vdev, buf)) {
if (tx_ops->mgmt_txrx_tx_ops.beacon_send(vdev, buf)) {
mgmt_txrx_err("Beacon send fail for peer %pK psoc %pK",
peer, psoc);
return QDF_STATUS_E_FAILURE;
@@ -500,6 +519,7 @@ wlan_mgmt_txrx_fd_action_frame_tx(struct wlan_objmgr_vdev *vdev,
{
struct wlan_objmgr_psoc *psoc;
uint32_t vdev_id;
struct wlan_lmac_if_tx_ops *tx_ops;
if (!vdev) {
mgmt_txrx_err("Invalid vdev");
@@ -512,12 +532,18 @@ wlan_mgmt_txrx_fd_action_frame_tx(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_E_NULL_VALUE;
}
if (!psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.fd_action_frame_send) {
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
mgmt_txrx_err("tx_ops is NULL");
return QDF_STATUS_E_NULL_VALUE;
}
if (!tx_ops->mgmt_txrx_tx_ops.fd_action_frame_send) {
mgmt_txrx_err("mgmt txrx txop to send fd action frame is NULL");
return QDF_STATUS_E_FAILURE;
}
if (psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.fd_action_frame_send(
if (tx_ops->mgmt_txrx_tx_ops.fd_action_frame_send(
vdev, buf)) {
mgmt_txrx_err("FD send fail for vdev %d", vdev_id);
return QDF_STATUS_E_FAILURE;
@@ -744,6 +770,7 @@ QDF_STATUS wlan_mgmt_txrx_pdev_close(struct wlan_objmgr_pdev *pdev)
struct mgmt_txrx_desc_elem_t *mgmt_desc;
uint32_t pool_size;
uint32_t index;
struct wlan_lmac_if_tx_ops *tx_ops;
if (!pdev) {
mgmt_txrx_err("pdev context is NULL");
@@ -756,6 +783,12 @@ QDF_STATUS wlan_mgmt_txrx_pdev_close(struct wlan_objmgr_pdev *pdev)
return QDF_STATUS_E_NULL_VALUE;
}
tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
if (!tx_ops) {
mgmt_txrx_err("tx_ops is NULL");
return QDF_STATUS_E_NULL_VALUE;
}
mgmt_txrx_pdev_ctx = (struct mgmt_txrx_priv_pdev_context *)
wlan_objmgr_pdev_get_comp_private_obj(pdev,
WLAN_UMAC_COMP_MGMT_TXRX);
@@ -777,9 +810,9 @@ QDF_STATUS wlan_mgmt_txrx_pdev_close(struct wlan_objmgr_pdev *pdev)
"mgmt descriptor with desc id: %d not in freelist",
index);
mgmt_desc = &mgmt_txrx_pdev_ctx->mgmt_desc_pool.pool[index];
if (psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.
if (tx_ops->mgmt_txrx_tx_ops.
tx_drain_nbuf_op)
psoc->soc_cb.tx_ops.mgmt_txrx_tx_ops.
tx_ops->mgmt_txrx_tx_ops.
tx_drain_nbuf_op(pdev, mgmt_desc->nbuf);
qdf_nbuf_free(mgmt_desc->nbuf);
wlan_objmgr_peer_release_ref(mgmt_desc->peer,