Browse Source

qcacmn: Removal of pre lithium wlan driver support in 12.x Software

Code related to IPQ4019 is removed

Change-Id: I64ef452cafe64840576f40a8f35bc617b9978c96
Naveen S 3 years ago
parent
commit
8b6625530d

+ 0 - 1
hif/inc/hif.h

@@ -65,7 +65,6 @@ typedef void *hif_handle_t;
 #define HIF_TYPE_ADRASTEA 10
 #define HIF_TYPE_AR900B 11
 #define HIF_TYPE_QCA9984 12
-#define HIF_TYPE_IPQ4019 13
 #define HIF_TYPE_QCA9888 14
 #define HIF_TYPE_QCA8074 15
 #define HIF_TYPE_QCA6290 16

+ 1 - 4
hif/inc/hostdef.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2016,2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. 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
@@ -40,9 +40,6 @@ extern struct hostdef_s *QCA6490_HOSTdef;
 extern struct hostdef_s *QCA6750_HOSTdef;
 extern struct hostdef_s *KIWI_HOSTdef;
 
-#ifdef ATH_AHB
-extern struct hostdef_s *IPQ4019_HOSTdef;
-#endif
 extern struct hostdef_s *QCA8074_HOSTdef;
 extern struct hostdef_s *QCA8074V2_HOSTDEF;
 extern struct hostdef_s *QCA6018_HOSTDEF;

+ 1 - 7
hif/inc/targetdef.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2016,2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. 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
@@ -39,9 +39,6 @@ extern struct targetdef_s *QCA6390_TARGETdef;
 extern struct targetdef_s *QCA6490_TARGETdef;
 extern struct targetdef_s *QCA6750_TARGETdef;
 
-#ifdef ATH_AHB
-extern struct targetdef_s *IPQ4019_TARGETdef;
-#endif
 extern struct targetdef_s *QCA8074_TARGETdef;
 extern struct targetdef_s *QCA8074V2_TARGETDEF;
 extern struct targetdef_s *QCA6018_TARGETDEF;
@@ -65,9 +62,6 @@ extern struct ce_reg_def *QCA6290_CE_TARGETdef;
 extern struct ce_reg_def *QCA6390_CE_TARGETdef;
 extern struct ce_reg_def *QCA6490_CE_TARGETdef;
 extern struct ce_reg_def *QCA6750_CE_TARGETdef;
-#ifdef ATH_AHB
-extern struct ce_reg_def *IPQ4019_CE_TARGETdef;
-#endif
 extern struct ce_reg_def *QCA8074_CE_TARGETdef;
 extern struct ce_reg_def *QCA8074V2_CE_TARGETDEF;
 extern struct ce_reg_def *QCA6018_CE_TARGETDEF;

+ 3 - 23
hif/src/ce/ce_diag.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -72,18 +73,12 @@ hif_ce_dump_target_memory(struct hif_softc *scn, void *ramdump_base,
 	 | 0x100000 | ((addr) & 0xfffff))
 #endif
 
-#define TARG_CPU_SPACE_TO_CE_SPACE_IPQ4019(scn, pci_addr, addr) \
-	(hif_read32_mb(scn, (pci_addr) + (WIFICMN_PCIE_BAR_REG_ADDRESS)) \
-	| ((addr) & 0xfffff))
-
 #define TARG_CPU_SPACE_TO_CE_SPACE_AR900B(scn, pci_addr, addr) \
 	(hif_read32_mb(scn, (pci_addr) + (WIFICMN_PCIE_BAR_REG_ADDRESS)) \
 	| 0x100000 | ((addr) & 0xfffff))
 
 #define SRAM_BASE_ADDRESS 0xc0000
 #define SRAM_END_ADDRESS 0x100000
-#define WIFI0_IPQ4019_BAR 0xa000000
-#define WIFI1_IPQ4019_BAR 0xa800000
 
 /* Wait up to this many Ms for a Diagnostic Access CE operation to complete */
 #define DIAG_ACCESS_CE_TIMEOUT_MS 10
@@ -101,23 +96,9 @@ static qdf_dma_addr_t get_ce_phy_addr(struct hif_softc *sc, uint32_t  address,
 {
 	qdf_dma_addr_t ce_phy_addr;
 	struct hif_softc *scn = sc;
-	unsigned int region = address & 0xfffff;
-	unsigned int bar = address & 0xfff00000;
-	unsigned int sramregion = 0;
-
-	if ((target_type == TARGET_TYPE_IPQ4019) &&
-		(region >= SRAM_BASE_ADDRESS && region <= SRAM_END_ADDRESS)
-		&& (bar == WIFI0_IPQ4019_BAR ||
-		    bar == WIFI1_IPQ4019_BAR || bar == 0)) {
-		sramregion = 1;
-	}
 
-	if ((target_type == TARGET_TYPE_IPQ4019) && sramregion == 1) {
-		ce_phy_addr = TARG_CPU_SPACE_TO_CE_SPACE_IPQ4019(sc, sc->mem,
-								 address);
-	} else if ((target_type == TARGET_TYPE_AR900B) ||
+	if ((target_type == TARGET_TYPE_AR900B) ||
 	    (target_type == TARGET_TYPE_QCA9984) ||
-	    (target_type == TARGET_TYPE_IPQ4019) ||
 	    (target_type == TARGET_TYPE_QCA9888)) {
 		ce_phy_addr =
 		    TARG_CPU_SPACE_TO_CE_SPACE_AR900B(sc, sc->mem, address);
@@ -180,8 +161,7 @@ QDF_STATUS hif_diag_read_mem(struct hif_opaque_softc *hif_ctx,
 	 * register read fn but preserve the multi word read capability of
 	 * this fn
 	 */
-	if ((target_type == TARGET_TYPE_IPQ4019) ||
-	    (target_type == TARGET_TYPE_AR900B)  ||
+	if ((target_type == TARGET_TYPE_AR900B)  ||
 	    (target_type == TARGET_TYPE_QCA9984) ||
 	    (target_type == TARGET_TYPE_AR9888) ||
 	    (target_type == TARGET_TYPE_QCA9888))

+ 0 - 2
hif/src/ce/ce_main.c

@@ -1329,7 +1329,6 @@ static void hif_select_service_to_pipe_map(struct hif_softc *scn,
 			break;
 		case TARGET_TYPE_AR900B:
 		case TARGET_TYPE_QCA9984:
-		case TARGET_TYPE_IPQ4019:
 		case TARGET_TYPE_QCA9888:
 		case TARGET_TYPE_AR9888:
 		case TARGET_TYPE_AR9888V2:
@@ -3922,7 +3921,6 @@ void hif_ce_prepare_config(struct hif_softc *scn)
 		break;
 	case TARGET_TYPE_AR900B:
 	case TARGET_TYPE_QCA9984:
-	case TARGET_TYPE_IPQ4019:
 	case TARGET_TYPE_QCA9888:
 		if (hif_is_attribute_set(scn, HIF_LOWDESC_CE_NO_PKTLOG_CFG)) {
 			hif_state->host_ce_config =

+ 1 - 9
hif/src/hif_main.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. 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
@@ -213,8 +213,6 @@ uint32_t hif_hia_item_address(uint32_t target_type, uint32_t item_offset)
 		return QCA9984_HOST_INTEREST_ADDRESS + item_offset;
 	case TARGET_TYPE_QCA9888:
 		return QCA9888_HOST_INTEREST_ADDRESS + item_offset;
-	case TARGET_TYPE_IPQ4019:
-		return IPQ4019_HOST_INTEREST_ADDRESS + item_offset;
 
 	default:
 		ASSERT(0);
@@ -1516,12 +1514,6 @@ int hif_get_device_type(uint32_t device_id,
 		hif_info(" *********** AR900B *************");
 		break;
 
-	case IPQ4019_DEVICE_ID:
-		*hif_type = HIF_TYPE_IPQ4019;
-		*target_type = TARGET_TYPE_IPQ4019;
-		hif_info(" *********** IPQ4019  *************");
-		break;
-
 	case QCA8074_DEVICE_ID:
 		*hif_type = HIF_TYPE_QCA8074;
 		*target_type = TARGET_TYPE_QCA8074;

+ 0 - 3
hif/src/hif_main.h

@@ -110,9 +110,6 @@
 #define AR900B_DEVICE_ID    (0x0040)
 #define QCA9984_DEVICE_ID   (0x0046)
 #define QCA9888_DEVICE_ID   (0x0056)
-#ifndef IPQ4019_DEVICE_ID
-#define IPQ4019_DEVICE_ID   (0x12ef)
-#endif
 #define QCA8074_DEVICE_ID   (0xffff) /* Todo: replace this with
 					actual number once available.
 					currently defining this to 0xffff for

+ 1 - 2
hif/src/pcie/if_pci.c

@@ -1936,8 +1936,7 @@ static int hif_pci_configure_legacy_irq(struct hif_pci_softc *sc)
 	hif_write32_mb(sc, sc->mem + PCIE_LOCAL_BASE_ADDRESS +
 		      PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_RESET);
 
-	if ((target_type == TARGET_TYPE_IPQ4019) ||
-			(target_type == TARGET_TYPE_AR900B)  ||
+	if ((target_type == TARGET_TYPE_AR900B)  ||
 			(target_type == TARGET_TYPE_QCA9984) ||
 			(target_type == TARGET_TYPE_AR9888) ||
 			(target_type == TARGET_TYPE_QCA9888) ||

+ 1 - 16
hif/src/regtable.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. 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
@@ -93,14 +93,6 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
 		scn->target_ce_def = QCA9888_CE_TARGETdef;
 		break;
 #endif
-#ifdef ATH_AHB
-#if defined(IPQ4019_HEADERS_DEF)
-	case TARGET_TYPE_IPQ4019:
-		scn->targetdef = IPQ4019_TARGETdef;
-		scn->target_ce_def = IPQ4019_CE_TARGETdef;
-		break;
-#endif
-#endif
 #if defined(QCA8074_HEADERS_DEF)
 	case TARGET_TYPE_QCA8074:
 		scn->targetdef = QCA8074_TARGETdef;
@@ -257,13 +249,6 @@ void hif_register_tbl_attach(struct hif_softc *scn, u32 hif_type)
 		break;
 #endif
 
-#ifdef ATH_AHB
-#if defined(IPQ4019_HEADERS_DEF)
-	case HIF_TYPE_IPQ4019:
-		scn->hostdef = IPQ4019_HOSTdef;
-		break;
-#endif
-#endif
 #if defined(QCA8074_HEADERS_DEF)
 	case HIF_TYPE_QCA8074:
 		scn->hostdef = QCA8074_HOSTdef;

+ 0 - 8
target_if/core/inc/target_if.h

@@ -509,14 +509,6 @@ QDF_STATUS target_if_free_psoc_tgt_info(struct wlan_objmgr_psoc *psoc);
  */
 bool target_is_tgt_type_ar900b(uint32_t target_type);
 
-/**
- * target_is_tgt_type_ipq4019() - Check if the target type is IPQ4019
- * @target_type: target type to be checked.
- *
- * Return: true if the target_type is IPQ4019, else false.
- */
-bool target_is_tgt_type_ipq4019(uint32_t target_type);
-
 /**
  * target_is_tgt_type_qca9984() - Check if the target type is QCA9984
  * @target_type: target type to be checked.

+ 0 - 8
target_if/core/src/target_if_main.c

@@ -410,9 +410,6 @@ static void target_if_target_tx_ops_register(
 	target_tx_ops->tgt_is_tgt_type_ar900b =
 		target_is_tgt_type_ar900b;
 
-	target_tx_ops->tgt_is_tgt_type_ipq4019 =
-		target_is_tgt_type_ipq4019;
-
 	target_tx_ops->tgt_is_tgt_type_qca9984 =
 		target_is_tgt_type_qca9984;
 
@@ -753,11 +750,6 @@ bool target_is_tgt_type_ar900b(uint32_t target_type)
 	return target_type == TARGET_TYPE_AR900B;
 }
 
-bool target_is_tgt_type_ipq4019(uint32_t target_type)
-{
-	return target_type == TARGET_TYPE_IPQ4019;
-}
-
 bool target_is_tgt_type_qca9984(uint32_t target_type)
 {
 	return target_type == TARGET_TYPE_QCA9984;

+ 1 - 4
target_if/dfs/src/target_if_dfs_partial_offload.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -70,10 +71,6 @@ QDF_STATUS target_if_dfs_get_caps(struct wlan_objmgr_pdev *pdev,
 	case TARGET_TYPE_AR900B:
 		break;
 
-	case TARGET_TYPE_IPQ4019:
-		dfs_caps->wlan_chip_is_false_detect = 0;
-		break;
-
 	case TARGET_TYPE_AR9888:
 		dfs_caps->wlan_chip_is_over_sampled = 1;
 		break;

+ 1 - 1
target_if/init_deinit/src/init_deinit_lmac.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -169,7 +170,6 @@ bool lmac_is_target_ar900b(struct wlan_objmgr_psoc *psoc)
 	switch (target_type) {
 	case TARGET_TYPE_AR900B:
 	case TARGET_TYPE_QCA9984:
-	case TARGET_TYPE_IPQ4019:
 	case TARGET_TYPE_QCA9888:
 		return true;
 	default:

+ 3 - 5
umac/dfs/core/src/filtering/dfs_partial_offload_radar.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
  * Copyright (c) 2011, Atheros Communications Inc.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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 above
@@ -405,8 +406,7 @@ static inline void dfs_assign_fcc_pulse_table(
 		rinfo->numradars = QDF_ARRAY_SIZE(dfs_fcc_radars);
 	}
 
-	if (tx_ops->tgt_is_tgt_type_ar900b(target_type) ||
-			tx_ops->tgt_is_tgt_type_ipq4019(target_type)) {
+	if (tx_ops->tgt_is_tgt_type_ar900b(target_type)) {
 		rinfo->b5pulses = dfs_fcc_bin5pulses_ar900b;
 		rinfo->numb5radars = QDF_ARRAY_SIZE(dfs_fcc_bin5pulses_ar900b);
 	} else if (tx_ops->tgt_is_tgt_type_qca9984(target_type) ||
@@ -520,8 +520,7 @@ dfs_assign_mkk_bin5_radars(struct wlan_dfs_radar_tab_info *rinfo,
 			   uint32_t target_type,
 			   struct wlan_lmac_if_target_tx_ops *tgt_tx_ops)
 {
-	if (tgt_tx_ops->tgt_is_tgt_type_ar900b(target_type) ||
-	    tgt_tx_ops->tgt_is_tgt_type_ipq4019(target_type)) {
+	if (tgt_tx_ops->tgt_is_tgt_type_ar900b(target_type)) {
 		rinfo->b5pulses = dfs_jpn_bin5pulses_ar900b;
 		rinfo->numb5radars = QDF_ARRAY_SIZE(
 				dfs_jpn_bin5pulses_ar900b);
@@ -699,7 +698,6 @@ void dfs_get_po_radars(struct wlan_dfs *dfs)
 	}
 
 	if (tgt_tx_ops->tgt_is_tgt_type_ar900b(target_type) ||
-			tgt_tx_ops->tgt_is_tgt_type_ipq4019(target_type) ||
 			tgt_tx_ops->tgt_is_tgt_type_qca9984(target_type) ||
 			tgt_tx_ops->tgt_is_tgt_type_qca9888(target_type)) {
 		/* Beeliner WAR: lower RSSI threshold to improve detection of

+ 0 - 2
umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -1141,7 +1141,6 @@ struct wlan_lmac_if_dfs_tx_ops {
  * struct wlan_lmac_if_target_tx_ops - Function pointers to call target
  *                                     functions from other modules.
  * @tgt_is_tgt_type_ar900b:  To check AR900B target type.
- * @tgt_is_tgt_type_ipq4019: To check IPQ4019 target type.
  * @tgt_is_tgt_type_qca9984: To check QCA9984 target type.
  * @tgt_is_tgt_type_qca9888: To check QCA9888 target type.
  * @tgt_is_tgt_type_adrastea: To check QCS40X target type.
@@ -1154,7 +1153,6 @@ struct wlan_lmac_if_dfs_tx_ops {
  */
 struct wlan_lmac_if_target_tx_ops {
 	bool (*tgt_is_tgt_type_ar900b)(uint32_t);
-	bool (*tgt_is_tgt_type_ipq4019)(uint32_t);
 	bool (*tgt_is_tgt_type_qca9984)(uint32_t);
 	bool (*tgt_is_tgt_type_qca9888)(uint32_t);
 	bool (*tgt_is_tgt_type_adrastea)(uint32_t);