Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06bc4f52 authored by Houston Hoffman's avatar Houston Hoffman Committed by Akash Patel
Browse files

qcacld-3.0: Remove IHELIUM_BU flag 

This flag supports depricated emulation hardware.
Remove conditionally compiled code and dummy functions
that become unused as a result.

Change-Id: Ie21df7e39b196109acfb6b41afc6b8c22fecb822
CRs-Fixed: 958120
parent 9c6b4e19

core/bmi/src/bmi.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ CDF_STATUS bmi_done(struct ol_softc *scn) 
	CDF_STATUS status = CDF_STATUS_SUCCESS;

	hif_claim_device(scn, scn);



	if (IHELIUM_NO_BMI)

	if (NO_BMI)

		return status;



	status = bmi_done_local(scn);
@@ -175,7 +175,7 @@ CDF_STATUS bmi_download_firmware(struct ol_softc *scn) 
	uint32_t address;

	int32_t ret;



	if (IHELIUM_NO_BMI)

	if (NO_BMI)

		return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */



	if (!scn) {

core/bmi/src/bmi_2.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ CDF_STATUS bmi_firmware_download(struct ol_softc *scn) 
{

	CDF_STATUS status;



	if (IHELIUM_NO_BMI)

	if (NO_BMI)

		return CDF_STATUS_SUCCESS;



	status = bmi_init(scn);

core/bmi/src/i_bmi.h

+3 −3
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ typedef enum _ATH_BIN_FILE { 
	ATH_SETUP_FILE,

} ATH_BIN_FILE;



#if defined(QCA_WIFI_3_0_IHELIUM) || defined(QCA_WIFI_3_0_ADRASTEA)

#define IHELIUM_NO_BMI 1

#if defined(QCA_WIFI_3_0_ADRASTEA)

#define NO_BMI 1

#else

#define IHELIUM_NO_BMI 0

#define NO_BMI 0

#endif



CDF_STATUS bmi_execute(uint32_t address, uint32_t *param,

core/hif/src/adrastea_reg_def.h

+0 −4
Original line number Diff line number Diff line
@@ -1812,11 +1812,7 @@ 


#define ADRASTEA_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA	0x08

#define ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_2			0x0013005C

#ifdef QCA_WIFI_3_0_IHELIUM

#define ADRASTEA_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK        0xff

#else

#define ADRASTEA_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK        0x0

#endif /* QCA_WIFI_3_0_IHELIUM */

/* end: Q6 iHelium emulation registers */



struct targetdef_s adrastea_targetdef = {

core/hif/src/ce/ce_main.c

+1 −13
Original line number Diff line number Diff line
@@ -1550,7 +1550,7 @@ int hif_set_hia(struct ol_softc *scn) 


	HIF_TRACE("%s: E", __func__);



	if (IHELIUM_BU || ADRASTEA_BU)

	if (ADRASTEA_BU)

		return CDF_STATUS_SUCCESS;



#ifdef QCA_WIFI_3_0
@@ -1816,13 +1816,6 @@ static int hif_wlan_enable(void) 
	return icnss_wlan_enable(&cfg, mode, QWLAN_VERSIONSTR);

}



#if ((!defined(QCA_WIFI_3_0_IHELIUM) && !defined(QCA_WIFI_3_0_ADRASTEA)) || defined(CONFIG_ICNSS))

static inline void cnss_pcie_notify_q6(void)

{

	return;

}

#endif



/*

 * Called from PCI layer whenever a new PCI device is probed.

 * Initializes per-device HIF state and notifies the main
@@ -1861,11 +1854,6 @@ int hif_config_ce(hif_handle_t hif_hdl) 
		HIF_ERROR("%s: hif_wlan_enable error = %d", __func__, ret);

		return CDF_STATUS_NOT_INITIALIZED;

	}

	if (IHELIUM_BU) {

		cnss_pcie_notify_q6();

		HIF_TRACE("%s: cnss_pcie_notify_q6 done, notice_send= %d",

			  __func__, scn->notice_send);

	}



	scn->notice_send = true;