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

qcacmn: Fix for removal of common_wmi_handle

Browse Source 
Add changes to remove usage of common_wmi_handle
Instead use wmi_unified_t as opaque pointer

Change-Id: I85ae8581ce8e4f7fd02fb753e3f482f8a6edebac
This commit is contained in:
Akshay Kosigi
2019-06-12 12:12:16 +05:30
committed by nshrivas
parent 59b6bee259
commit dc8e095f30
8 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
target_if/core/inc/target_if.h
View File

@@ -120,7 +120,6 @@ struct host_fw_ver {
struct common_dbglog_handle;
struct common_hif_handle;
struct common_htc_handle;
struct common_wmi_handle;
struct common_accelerator_handle;
/**
@@ -135,7 +134,7 @@ struct common_accelerator_handle;
struct comp_hdls {
struct common_hif_handle *hif_hdl;
struct common_htc_handle *htc_hdl;
struct common_wmi_handle *wmi_hdl;
struct wmi_unified *wmi_hdl;
struct common_accelerator_handle *accelerator_hdl;
struct common_dbglog_handle *dbglog_hdl;
};
@@ -313,7 +312,7 @@ struct target_psoc_info {
* @feature_ptr: stores legacy pointer or few driver specific structures
*/
struct target_pdev_info {
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
struct common_accelerator_handle *accelerator_hdl;
int32_t pdev_idx;
int32_t phy_idx;
@@ -956,7 +955,7 @@ static inline struct common_htc_handle *target_psoc_get_htc_hdl
*/
static inline void target_psoc_set_wmi_hdl
(struct target_psoc_info *psoc_info,
struct common_wmi_handle *wmi_hdl)
struct wmi_unified *wmi_hdl)
{
if (!psoc_info)
return;
@@ -972,7 +971,7 @@ static inline void target_psoc_set_wmi_hdl
*
* Return: wmi_hdl
*/
static inline struct common_wmi_handle *target_psoc_get_wmi_hdl
static inline struct wmi_unified *target_psoc_get_wmi_hdl
(struct target_psoc_info *psoc_info)
{
if (!psoc_info)
@@ -1386,7 +1385,7 @@ static inline void *target_pdev_get_feature_ptr
*/
static inline void target_pdev_set_wmi_handle
(struct target_pdev_info *pdev_info,
struct common_wmi_handle *wmi_handle)
struct wmi_unified *wmi_handle)
{
if (!pdev_info)
return;
@@ -1402,7 +1401,7 @@ static inline void target_pdev_set_wmi_handle
*
* Return: wmi_handle
*/
static inline struct common_wmi_handle *target_pdev_get_wmi_handle
static inline struct wmi_unified *target_pdev_get_wmi_handle
(struct target_pdev_info *pdev_info)
{
if (!pdev_info)
@@ -1526,7 +1525,7 @@ static inline int32_t target_pdev_get_phy_idx
* Return: wmi_handle on success
* if tgt handle is not initialized, it returns NULL
*/
static inline struct common_wmi_handle *GET_WMI_HDL_FROM_PSOC(
static inline struct wmi_unified *GET_WMI_HDL_FROM_PSOC(
struct wlan_objmgr_psoc *psoc)
{
void *tgt_if_handle;
@@ -1553,7 +1552,7 @@ static inline struct common_wmi_handle *GET_WMI_HDL_FROM_PSOC(
* Return: wmi_handle on success
* if tgt handle is not initialized, it returns NULL
*/
static inline struct common_wmi_handle *GET_WMI_HDL_FROM_PDEV(
static inline struct wmi_unified *GET_WMI_HDL_FROM_PDEV(
struct wlan_objmgr_pdev *pdev)
{
void *tgt_if_handle;

2
target_if/direct_buf_rx/src/target_if_direct_buf_rx_main.c
View File

@@ -920,7 +920,7 @@ static int target_if_direct_buf_rx_rsp_event_handler(ol_scn_t scn,
struct direct_buf_rx_buf_info *dbr_buf_pool;
struct direct_buf_rx_pdev_obj *dbr_pdev_obj;
struct direct_buf_rx_module_param *mod_param;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
wlan_objmgr_ref_dbgid dbr_mod_id = WLAN_DIRECT_BUF_RX_ID;
direct_buf_rx_enter();

10
target_if/dp/src/target_if_dp.c
View File

@@ -31,7 +31,7 @@ target_if_peer_set_default_routing(struct cdp_ctrl_objmgr_pdev *pdev,
{
uint32_t value;
struct peer_set_params param;
struct common_wmi_handle *pdev_wmi_handle;
struct wmi_unified *pdev_wmi_handle;
pdev_wmi_handle =
lmac_get_pdev_wmi_handle((struct wlan_objmgr_pdev *)pdev);
@@ -63,7 +63,7 @@ static QDF_STATUS
target_if_rx_reorder_queue_setup(struct scheduler_msg *msg)
{
struct rx_reorder_queue_setup_params param;
struct common_wmi_handle *pdev_wmi_handle;
struct wmi_unified *pdev_wmi_handle;
struct reorder_q_setup *q_params;
struct cdp_ctrl_objmgr_pdev *pdev;
QDF_STATUS status;
@@ -148,7 +148,7 @@ target_if_peer_rx_reorder_queue_setup(struct cdp_ctrl_objmgr_pdev *pdev,
uint16_t ba_window_size)
{
struct rx_reorder_queue_setup_params param;
struct common_wmi_handle *pdev_wmi_handle;
struct wmi_unified *pdev_wmi_handle;
pdev_wmi_handle =
lmac_get_pdev_wmi_handle((struct wlan_objmgr_pdev *)pdev);
@@ -176,7 +176,7 @@ target_if_peer_rx_reorder_queue_remove(struct cdp_ctrl_objmgr_pdev *pdev,
uint32_t peer_tid_bitmap)
{
struct rx_reorder_queue_remove_params param;
struct common_wmi_handle *pdev_wmi_handle;
struct wmi_unified *pdev_wmi_handle;
pdev_wmi_handle =
lmac_get_pdev_wmi_handle((struct wlan_objmgr_pdev *)pdev);
@@ -196,7 +196,7 @@ target_if_lro_hash_config(struct cdp_ctrl_objmgr_pdev *pdev,
struct cdp_lro_hash_config *lro_hash_cfg)
{
struct wmi_lro_config_cmd_t wmi_lro_cmd = {0};
struct common_wmi_handle *pdev_wmi_handle;
struct wmi_unified *pdev_wmi_handle;
pdev_wmi_handle =
lmac_get_pdev_wmi_handle((struct wlan_objmgr_pdev *)pdev);

6
target_if/init_deinit/inc/init_deinit_lmac.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2019 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
@@ -117,7 +117,7 @@ bool lmac_is_target_ar900b(struct wlan_objmgr_psoc *psoc);
*
* Return: wmi handler
*/
struct common_wmi_handle *lmac_get_wmi_hdl(struct wlan_objmgr_psoc *psoc);
struct wmi_unified *lmac_get_wmi_hdl(struct wlan_objmgr_psoc *psoc);
/**
* lmac_get_wmi_unified_hdl() - get wmi handle
@@ -179,7 +179,7 @@ struct hif_opaque_softc *lmac_get_ol_hif_hdl(struct wlan_objmgr_psoc *psoc);
*
* Return: wmi handle
*/
struct common_wmi_handle *lmac_get_pdev_wmi_handle(
struct wmi_unified *lmac_get_pdev_wmi_handle(
struct wlan_objmgr_pdev *pdev);
/**

4
target_if/init_deinit/src/init_cmd_api.c
View File

@@ -327,7 +327,7 @@ QDF_STATUS init_deinit_handle_host_mem_req(
uint32_t i;
uint32_t idx;
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
struct tgt_info *info;
if (!tgt_hdl) {
@@ -438,7 +438,7 @@ void init_deinit_prepare_send_init_cmd(
{
struct wmi_init_cmd_param init_param = {0};
struct tgt_info *info;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
QDF_STATUS ret_val;
if (!tgt_hdl) {

6
target_if/init_deinit/src/init_deinit_lmac.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2019 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
@@ -187,7 +187,7 @@ bool lmac_is_target_ar900b(struct wlan_objmgr_psoc *psoc)
}
qdf_export_symbol(lmac_is_target_ar900b);
struct common_wmi_handle *lmac_get_wmi_hdl(struct wlan_objmgr_psoc *psoc)
struct wmi_unified *lmac_get_wmi_hdl(struct wlan_objmgr_psoc *psoc)
{
struct target_psoc_info *tgt_hdl;
@@ -274,7 +274,7 @@ struct hif_opaque_softc *lmac_get_ol_hif_hdl(struct wlan_objmgr_psoc *psoc)
}
qdf_export_symbol(lmac_get_ol_hif_hdl);
struct common_wmi_handle *lmac_get_pdev_wmi_handle(
struct wmi_unified *lmac_get_pdev_wmi_handle(
struct wlan_objmgr_pdev *pdev)
{
struct target_pdev_info *tgt_hdl;

8
target_if/init_deinit/src/init_event_handler.c
View File

@@ -41,7 +41,7 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle,
struct wlan_objmgr_psoc *psoc;
struct target_psoc_info *tgt_hdl;
wmi_legacy_service_ready_callback legacy_callback;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
QDF_STATUS ret_val;
if (!scn_handle) {
@@ -193,7 +193,7 @@ static int init_deinit_service_ext_ready_event_handler(ol_scn_t scn_handle,
int err_code;
struct wlan_objmgr_psoc *psoc;
struct target_psoc_info *tgt_hdl;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
struct tgt_info *info;
wmi_legacy_service_ready_callback legacy_callback;
@@ -319,7 +319,7 @@ static int init_deinit_service_available_handler(ol_scn_t scn_handle,
{
struct wlan_objmgr_psoc *psoc;
struct target_psoc_info *tgt_hdl;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
if (!scn_handle) {
target_if_err("scn handle NULL");
@@ -360,7 +360,7 @@ static int init_deinit_ready_event_handler(ol_scn_t scn_handle,
struct wlan_objmgr_psoc *psoc;
struct wlan_objmgr_pdev *pdev;
struct target_psoc_info *tgt_hdl;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
struct wmi_host_fw_abi_ver fw_ver;
uint8_t myaddr[QDF_MAC_ADDR_SIZE];
struct tgt_info *info;

4
target_if/init_deinit/src/service_ready_util.c
View File

@@ -593,7 +593,7 @@ QDF_STATUS init_deinit_validate_160_80p80_fw_caps(
bool vhtcap_160mhz_sgi = false;
bool valid = false;
struct wlan_psoc_host_hal_reg_capabilities_ext *reg_cap;
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
if (!tgt_hdl) {
target_if_err(
@@ -708,7 +708,7 @@ QDF_STATUS init_deinit_is_service_ext_msg(
struct wlan_objmgr_psoc *psoc,
struct target_psoc_info *tgt_hdl)
{
struct common_wmi_handle *wmi_handle;
struct wmi_unified *wmi_handle;
if (!tgt_hdl) {
target_if_err(