commit ef347acb42e34bddb1a6650bcf059d62b29e0de5
author Andy Duan <fugang.duan@nxp.com> Fri May 04 15:31:21 2018 +0800
committer Tom Hochstein <tom.hochstein@nxp.com> Thu Dec 13 13:13:49 2018 -0600
tree 74d57105c928197efe15f79abd98f9dfa3eb43b5
parent d3085e54490a351dd318d44b79688c13d213625f

CORE: add pcie multi_if_name support

Add pcie multi_if_name support.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

CORE/SERVICES/BMI/ol_fw.c

diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c
index 8e8f7cb..e8d52a5 100644
--- a/CORE/SERVICES/BMI/ol_fw.c
+++ b/CORE/SERVICES/BMI/ol_fw.c
@@ -152,21 +152,28 @@
 #endif
 
 #ifdef CONFIG_NON_QC_PLATFORM_PCI
+
+#ifdef MULTI_IF_NAME
+#define PREFIX MULTI_IF_NAME "/"
+#else
+#define PREFIX ""
+#endif
+
 static struct non_qc_platform_pci_fw_files FW_FILES_QCA6174_FW_1_1 = {
-"qwlan11.bin", "bdwlan11.bin", "otp11.bin", "utf11.bin",
-"utfbd11.bin", "epping11.bin", "evicted11.bin"};
+	PREFIX "qwlan11.bin", PREFIX "bdwlan11.bin", PREFIX "otp11.bin",  PREFIX "utf11.bin",
+	PREFIX "utfbd11.bin", PREFIX "epping11.bin", PREFIX "evicted11.bin"};
 static struct non_qc_platform_pci_fw_files FW_FILES_QCA6174_FW_2_0 = {
-"qwlan20.bin", "bdwlan20.bin", "otp20.bin", "utf20.bin",
-"utfbd20.bin", "epping20.bin", "evicted20.bin"};
+	PREFIX "qwlan20.bin", PREFIX "bdwlan20.bin", PREFIX "otp20.bin", PREFIX "utf20.bin",
+	PREFIX "utfbd20.bin", PREFIX "epping20.bin", PREFIX "evicted20.bin"};
 static struct non_qc_platform_pci_fw_files FW_FILES_QCA6174_FW_1_3 = {
-"qwlan13.bin", "bdwlan13.bin", "otp13.bin", "utf13.bin",
-"utfbd13.bin", "epping13.bin", "evicted13.bin"};
+	PREFIX "qwlan13.bin", PREFIX "bdwlan13.bin", PREFIX "otp13.bin", PREFIX "utf13.bin",
+	PREFIX "utfbd13.bin", PREFIX "epping13.bin", PREFIX "evicted13.bin"};
 static struct non_qc_platform_pci_fw_files FW_FILES_QCA6174_FW_3_0 = {
-"qwlan30.bin", "bdwlan30.bin", "otp30.bin", "utf30.bin",
-"utfbd30.bin", "epping30.bin", "evicted30.bin"};
+	PREFIX "qwlan30.bin", PREFIX "bdwlan30.bin", PREFIX "otp30.bin", PREFIX "utf30.bin",
+	PREFIX "utfbd30.bin", PREFIX "epping30.bin", PREFIX "evicted30.bin"};
 static struct non_qc_platform_pci_fw_files FW_FILES_DEFAULT = {
-"qwlan.bin", "bdwlan.bin", "otp.bin", "utf.bin",
-"utfbd.bin", "epping.bin", "evicted.bin"};
+	PREFIX "qwlan.bin", PREFIX "bdwlan.bin", PREFIX "otp.bin", PREFIX "utf.bin",
+	PREFIX "utfbd.bin", PREFIX "epping.bin", PREFIX "evicted.bin"};
 
 static
 int get_fw_files_for_non_qc_pci_target(struct non_qc_platform_pci_fw_files *pfw_files,
@@ -202,6 +209,12 @@
 				__func__, target_type, target_version);
 			break;
 	}
+
+	pr_debug("%s:%d: pfw_files:%s, %s, %s, %s, %s, %s, %s\n", __func__, __LINE__,
+		pfw_files->image_file, pfw_files->board_data, pfw_files->otp_data,
+		pfw_files->utf_file, pfw_files->utf_board_data, pfw_files->epping_file,
+		pfw_files->evicted_data);
+
 	return 0;
 }
 #endif

CORE/SERVICES/COMMON/ol_if_athvar.h

diff --git a/CORE/SERVICES/COMMON/ol_if_athvar.h b/CORE/SERVICES/COMMON/ol_if_athvar.h
index 03fc4d3..a689b6b 100644
--- a/CORE/SERVICES/COMMON/ol_if_athvar.h
+++ b/CORE/SERVICES/COMMON/ol_if_athvar.h
@@ -149,7 +149,7 @@
 };
 #endif
 #ifdef CONFIG_NON_QC_PLATFORM_PCI
-#define MAX_FILE_NAME        20
+#define MAX_FILE_NAME        40
 struct non_qc_platform_pci_fw_files {
     char image_file[MAX_FILE_NAME];
     char board_data[MAX_FILE_NAME];