qcacmn: Use new HIF_SNOC flag

Use new HIF_SNOC instead of assuming snoc when pci is not defined.
Exposes duplicate function defs with HIF_SNOC and HIF_PCI both defined.
Remove some trivial HIF_PCI conditional compilation.

Change-Id: I958740f49b3298c165e662b89b586bda2b3d2ee8
CRs-Fixed: 986480

hif/src/ath_procfs.c

@@ -33,11 +33,10 @@
 #include <asm/uaccess.h>        /* for copy_from_user */
 #include "ol_if_athvar.h"
 #include "hif.h"
-#if defined(HIF_PCI)
-#include "if_pci.h"
-#elif defined(HIF_USB)
+#if defined(HIF_USB)
 #include "if_usb.h"
-#elif defined(HIF_SDIO)
+#endif
+#if defined(HIF_SDIO)
 #include "if_ath_sdio.h"
 #endif
 #include "hif_debug.h"

hif/src/ce/ce_main.c

@@ -41,9 +41,6 @@
 #define ATH_MODULE_NAME hif
 #include <a_debug.h>
 #include "hif_main.h"
-#ifdef HIF_PCI
-#include "ce_bmi.h"
-#endif
 #include "ce_api.h"
 #include "qdf_trace.h"
 #ifdef CONFIG_CNSS
@@ -55,11 +52,7 @@
 #include "ce_reg.h"
 #include "ce_assignment.h"
 #include "ce_tasklet.h"
-#ifdef HIF_PCI
-#include "icnss_stub.h"
-#else
-#include <soc/qcom/icnss.h>
-#endif
+#include "platform_icnss.h"
 #include "qwlan_version.h"
 
 #define CE_POLL_TIMEOUT 10      /* ms */

hif/src/ce/ce_tasklet.c

@@ -44,11 +44,7 @@
 #include "ce_internal.h"
 #ifdef CONFIG_CNSS
 #include <net/cnss.h>
-#ifdef HIF_PCI
-#include "icnss_stub.h"
-#else
-#include <soc/qcom/icnss.h>
-#endif /* HIF_PCI */
+#include "platform_icnss.h"
 #endif
 #include "hif_debug.h"
 #include "hif_napi.h"

hif/src/hif_io32.h

@@ -33,7 +33,9 @@
 #include "hif.h"
 #ifdef HIF_PCI
 #include "hif_io32_pci.h"
-#else
+#endif
+
+#ifdef HIF_SNOC
 #include "hif_io32_snoc.h"
 #endif /* HIF_PCI */
 #endif /* __HIF_IO32_H__ */

hif/src/hif_main.c

@@ -54,11 +54,7 @@
 #include "epping_main.h"
 #include "hif_debug.h"
 #include "mp_dev.h"
-#ifdef HIF_PCI
-#include "icnss_stub.h"
-#else
-#include <soc/qcom/icnss.h>
-#endif
+#include "platform_icnss.h"
 
 #define AGC_DUMP         1
 #define CHANINFO_DUMP    2
@@ -635,7 +631,7 @@ void hif_disable(struct hif_opaque_softc *hif_ctx, enum hif_disable_type type)
  * Return: n/a
  */
 #if defined(TARGET_RAMDUMP_AFTER_KERNEL_PANIC) \
-&& defined(HIF_PCI) && defined(DEBUG)
+&& defined(DEBUG)
 
 static void hif_crash_shutdown_dump_bus_register(void *hif_ctx)
 {
@@ -660,11 +656,15 @@ static void hif_crash_shutdown_dump_bus_register(void *hif_ctx)
 void hif_crash_shutdown(struct hif_opaque_softc *hif_ctx)
 {
 	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
-	struct HIF_CE_state *hif_state = HIF_GET_CE_STATE(hif_ctx);
 
-	if (!hif_state)
+	if (!hif_ctx)
 		return;
 
+	if (scn->bus_type == QDF_BUS_TYPE_SNOC) {
+		HIF_INFO_MED("%s: RAM dump disabled for bustype %d",
+				__func__, scn->bus_type);
+		return;
+	}
 
 	if (OL_TRGET_STATUS_RESET == scn->target_status) {
 		HIF_INFO_MED("%s: Target is already asserted, ignore!",

hif/src/snoc/hif_io32_snoc.h

@@ -34,10 +34,6 @@
 #ifndef __HIF_IO32_SNOC_H__
 #define __HIF_IO32_SNOC_H__
 
-#ifdef HIF_PCI
-#error snoc and pci cannot be supported in parrallel at this time
-#endif
-
 #include "hif.h"
 #include "regtable.h"
 #include "ce_reg.h"