From f76166d3c3b51692035f0cd911c90874b3fa2128 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Mon, 15 Feb 2016 17:50:41 +0530 Subject: [PATCH] qcacmn: Move BMI info structure to global BMI context BMI info is needed during BMI Phase. The structure holds the physical address and virtual address of Command and response of BMI buffer. Remove the structure from HIF and move to BMI. Change-Id: I37a43cca0bdef66f6b0201d27e9dcbecffeef5dd CRs-Fixed: 967765 --- hif/inc/hif.h | 13 ------------- hif/src/hif_main.h | 1 - hif/src/pcie/if_pci.c | 13 ------------- 3 files changed, 27 deletions(-) diff --git a/hif/inc/hif.h b/hif/inc/hif.h index db6d846121cf..b927a4dc9973 100644 --- a/hif/inc/hif.h +++ b/hif/inc/hif.h @@ -179,18 +179,6 @@ struct hif_target_info { uint32_t soc_version; }; -struct bmi_info { - uint8_t *bmi_cmd_buff; - uint8_t *bmi_rsp_buff; - dma_addr_t bmi_cmd_da; - dma_addr_t bmi_rsp_da; - uint8_t *cal_in_flash; - bool bmi_done; -#ifdef CONFIG_CNSS - struct cnss_fw_files fw_files; -#endif -}; - struct ol_softc { }; @@ -565,7 +553,6 @@ void hif_lro_flush_cb_deregister(struct ol_softc *scn); struct hif_target_info *hif_get_target_info_handle(struct ol_softc *scn); struct hif_config_info *hif_get_ini_handle(struct ol_softc *scn); struct ramdump_info *hif_get_ramdump_ctx(struct ol_softc *hif_ctx); -struct bmi_info *hif_get_bmi_ctx(struct ol_softc *hif_ctx); ol_target_status hif_get_target_status(struct ol_softc *hif_ctx); void hif_set_target_status(struct ol_softc *hif_ctx, ol_target_status); #ifdef __cplusplus diff --git a/hif/src/hif_main.h b/hif/src/hif_main.h index 4cc565db871e..78cee292d270 100644 --- a/hif/src/hif_main.h +++ b/hif/src/hif_main.h @@ -112,7 +112,6 @@ struct hif_softc { struct ol_softc osc; struct hif_config_info hif_config; struct hif_target_info target_info; - struct bmi_info bmi_ctx; void __iomem *mem; enum ath_hal_bus_type bus_type; void *ce_id_to_state[CE_COUNT_MAX]; diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 1e9072122d0b..7b99e2e831bb 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -3292,16 +3292,3 @@ void hif_runtime_lock_deinit(struct ol_softc *hif_ctx, } #endif /* FEATURE_RUNTIME_PM */ - -/** - * hif_get_bmi_ctx() - API to get BMI context - * @hif_ctx: HIF Context - * - * Return: Pointer to BMI Context - */ -struct bmi_info *hif_get_bmi_ctx(struct ol_softc *hif_ctx) -{ - struct hif_softc *sc = HIF_GET_SOFTC(hif_ctx); - - return &sc->bmi_ctx; -}