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

Commit 61203163 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss: using bmi target info from wlan to determine firmware files"

parents d76cc12f a1c36994

drivers/net/wireless/cnss/cnss.c

+46 −0
Original line number Diff line number Diff line
@@ -50,6 +50,22 @@ 
#define QCA6174_FW_1_3	(0x13)

#define QCA6174_FW_2_0	(0x20)

#define QCA6174_FW_3_0	(0x30)

#define AR6320_REV1_VERSION             0x5000000

#define AR6320_REV1_1_VERSION           0x5000001

#define AR6320_REV1_3_VERSION           0x5000003

#define AR6320_REV2_1_VERSION           0x5010000

#define AR6320_REV3_VERSION             0x5020000

static struct cnss_fw_files FW_FILES_QCA6174_FW_1_1 = {

"qwlan11.bin", "bdwlan11.bin", "otp11.bin", "utf11.bin", "utfbd11.bin"};

static struct cnss_fw_files FW_FILES_QCA6174_FW_2_0 = {

"qwlan20.bin", "bdwlan20.bin", "otp20.bin", "utf20.bin", "utfbd20.bin"};

static struct cnss_fw_files FW_FILES_QCA6174_FW_1_3 = {

"qwlan13.bin", "bdwlan13.bin", "otp13.bin", "utf13.bin", "utfbd13.bin"};

static struct cnss_fw_files FW_FILES_QCA6174_FW_3_0 = {

"qwlan30.bin", "bdwlan30.bin", "otp30.bin", "utf30.bin", "utfbd30.bin"};

static struct cnss_fw_files FW_FILES_DEFAULT = {

	"qwlan.bin", "bdwlan.bin", "otp.bin", "utf.bin", "utfbd.bin"};





#define WLAN_VREG_NAME		"vdd-wlan"

#define WLAN_SWREG_NAME		"wlan-soc-swreg"
@@ -452,6 +468,36 @@ int cnss_get_fw_files(struct cnss_fw_files *pfw_files) 
}

EXPORT_SYMBOL(cnss_get_fw_files);



int cnss_get_fw_files_for_target(struct cnss_fw_files *pfw_files,

					u32 target_type, u32 target_version)

{

	if (!pfw_files)

		return -ENODEV;



	switch (target_version) {

	case AR6320_REV1_VERSION:

	case AR6320_REV1_1_VERSION:

		memcpy(pfw_files, &FW_FILES_QCA6174_FW_1_1, sizeof(*pfw_files));

		break;

	case AR6320_REV1_3_VERSION:

		memcpy(pfw_files, &FW_FILES_QCA6174_FW_1_3, sizeof(*pfw_files));

		break;

	case AR6320_REV2_1_VERSION:

		memcpy(pfw_files, &FW_FILES_QCA6174_FW_2_0, sizeof(*pfw_files));

		break;

	case AR6320_REV3_VERSION:

		memcpy(pfw_files, &FW_FILES_QCA6174_FW_3_0, sizeof(*pfw_files));

		break;

	default:

		memcpy(pfw_files, &FW_FILES_DEFAULT, sizeof(*pfw_files));

		pr_err("%s version mismatch 0x%X 0x%X",

				__func__, target_type, target_version);

		break;

	}

	return 0;

}

EXPORT_SYMBOL(cnss_get_fw_files_for_target);



static int cnss_wlan_pci_probe(struct pci_dev *pdev,

			       const struct pci_device_id *id)

{

include/net/cnss.h

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ extern int cnss_get_wlan_unsafe_channel(u16 *unsafe_ch_list, 
extern int cnss_wlan_register_driver(struct cnss_wlan_driver *driver);

extern void cnss_wlan_unregister_driver(struct cnss_wlan_driver *driver);

extern int cnss_get_fw_files(struct cnss_fw_files *pfw_files);

extern int cnss_get_fw_files_for_target(struct cnss_fw_files *pfw_files,

					u32 target_type, u32 target_version);

extern void cnss_flush_work(void *work);

extern void cnss_flush_delayed_work(void *dwork);

extern void cnss_get_monotonic_boottime(struct timespec *ts);