samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: update changes for fully supporting MULTI_IF_NAME

Browse Source 
Currently, driver don't fully support MULTI_IF_NAME when two wlan
cards are supported by using two drivers:
1. if two wlan cards are all PCIe, driver can't distinguish
two PCIe cards firmware path.
2. When create hdd sysfs file upper folder, it will repeatly create the
same folder if not use MULTI_IF_NAME to distinguish them. It's not
necessary to distinguish the sub-folder once upper folder is different.

Change-Id: I511de46eec98e736d4e97d5c94ab22592d33f347
CRs-Fixed: 2311137
This commit is contained in:
Qun Zhang
2018-09-11 16:28:51 +08:00
committed by nshrivas
parent 104ccc7742
commit 4a83a46fab
5 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/pld/src/pld_common.c
View File

@@ -427,19 +427,19 @@ void pld_get_default_fw_files(struct pld_fw_files *pfw_files)
{
memset(pfw_files, 0, sizeof(*pfw_files));
strlcpy(pfw_files->image_file, PLD_IMAGE_FILE,
strlcpy(pfw_files->image_file, PREFIX PLD_IMAGE_FILE,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->board_data, PLD_BOARD_DATA_FILE,
strlcpy(pfw_files->board_data, PREFIX PLD_BOARD_DATA_FILE,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->otp_data, PLD_OTP_FILE,
strlcpy(pfw_files->otp_data, PREFIX PLD_OTP_FILE,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->utf_file, PLD_UTF_FIRMWARE_FILE,
strlcpy(pfw_files->utf_file, PREFIX PLD_UTF_FIRMWARE_FILE,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->utf_board_data, PLD_BOARD_DATA_FILE,
strlcpy(pfw_files->utf_board_data, PREFIX PLD_BOARD_DATA_FILE,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->epping_file, PLD_EPPING_FILE,
strlcpy(pfw_files->epping_file, PREFIX PLD_EPPING_FILE,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->setup_file, PLD_SETUP_FILE,
strlcpy(pfw_files->setup_file, PREFIX PLD_SETUP_FILE,
PLD_MAX_FILE_NAME);
}

28
core/pld/src/pld_pcie.c
View File

@@ -632,20 +632,20 @@ int pld_pcie_get_fw_files_for_target(struct device *dev,
if (ret)
return ret;
strlcpy(pfw_files->image_file, cnss_fw_files.image_file,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->board_data, cnss_fw_files.board_data,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->otp_data, cnss_fw_files.otp_data,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->utf_file, cnss_fw_files.utf_file,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->utf_board_data, cnss_fw_files.utf_board_data,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->epping_file, cnss_fw_files.epping_file,
PLD_MAX_FILE_NAME);
strlcpy(pfw_files->evicted_data, cnss_fw_files.evicted_data,
PLD_MAX_FILE_NAME);
scnprintf(pfw_files->image_file, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.image_file);
scnprintf(pfw_files->board_data, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.board_data);
scnprintf(pfw_files->otp_data, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.otp_data);
scnprintf(pfw_files->utf_file, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.utf_file);
scnprintf(pfw_files->utf_board_data, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.utf_board_data);
scnprintf(pfw_files->epping_file, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.epping_file);
scnprintf(pfw_files->evicted_data, PLD_MAX_FILE_NAME, PREFIX "%s",
cnss_fw_files.evicted_data);
return 0;
}

6
core/pld/src/pld_pcie.h
View File

@@ -24,6 +24,12 @@
#endif
#include "pld_internal.h"
#ifdef MULTI_IF_NAME
#define PREFIX MULTI_IF_NAME "/"
#else
#define PREFIX ""
#endif
#ifndef HIF_PCI
static inline int pld_pcie_register_driver(void)
{