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

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

Merge "cnss: Add support for multiple revisions of CNSS FW"

parents ff6c6609 99a3806b

drivers/net/wireless/cnss/cnss.c

+58 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 


#define QCA6174_VENDOR_ID	(0x168C)

#define QCA6174_DEVICE_ID	(0x003E)

#define QCA6174_REV_ID_OFFSET	(0x08)

#define QCA6174_FW_1_1	(0x11)

#define QCA6174_FW_1_3	(0x13)



#define WLAN_VREG_NAME		"vdd-wlan"

#define WLAN_EN_GPIO_NAME	"wlan-en-gpio"
@@ -75,6 +78,8 @@ static struct cnss_data { 
	struct cnss_wlan_gpio_info gpio_info;

	bool pcie_link_state;

	struct pci_saved_state *saved_state;

	u16 revision_id;

	struct cnss_fw_files fw_files;

} *penv;



static int cnss_wlan_vreg_set(struct cnss_wlan_vreg_info *vreg_info, bool state)
@@ -223,6 +228,56 @@ static u8 cnss_get_pci_dev_bus_number(struct pci_dev *pdev) 
	return pdev->bus->number;

}



void cnss_setup_fw_files(u16 revision)

{

	switch (revision) {



	case QCA6174_FW_1_1:

		strlcpy(penv->fw_files.image_file, "athwlan11.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.board_data, "bdatawlan11.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.otp_data, "otp11.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf11.bin",

			CNSS_MAX_FILE_NAME);

		break;



	case QCA6174_FW_1_3:

		strlcpy(penv->fw_files.image_file, "athwlan13.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.board_data, "bdatawlan13.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.otp_data, "otp13.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf13.bin",

			CNSS_MAX_FILE_NAME);

		break;



	default:

		strlcpy(penv->fw_files.image_file, "athwlan.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.board_data, "bdatawlan.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.otp_data, "otp.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf.bin",

			CNSS_MAX_FILE_NAME);

		break;

	}

}



int cnss_get_fw_files(struct cnss_fw_files *pfw_files)

{

	if (!penv || !pfw_files)

		return -ENODEV;



	*pfw_files = penv->fw_files;



	return 0;

}

EXPORT_SYMBOL(cnss_get_fw_files);



static int cnss_wlan_pci_probe(struct pci_dev *pdev,

			       const struct pci_device_id *id)

{
@@ -233,6 +288,9 @@ static int cnss_wlan_pci_probe(struct pci_dev *pdev, 
	penv->pdev = pdev;

	penv->id = id;



	pci_read_config_word(pdev, QCA6174_REV_ID_OFFSET, &penv->revision_id);

	cnss_setup_fw_files(penv->revision_id);



	if (penv->pcie_link_state) {

		pci_save_state(pdev);

		penv->saved_state = pci_store_saved_state(pdev);

include/net/cnss.h

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
/* max 20mhz channel count */

#define CNSS_MAX_CH_NUM       45



#define CNSS_MAX_FILE_NAME	  20



struct dev_info {

	struct device	*dev;

	char	*dump_buffer;
@@ -27,6 +29,14 @@ struct dev_info { 
	void (*dev_crashshutdown)(void);

};



/* FW image files */

struct cnss_fw_files {

	char image_file[CNSS_MAX_FILE_NAME];

	char board_data[CNSS_MAX_FILE_NAME];

	char otp_data[CNSS_MAX_FILE_NAME];

	char utf_file[CNSS_MAX_FILE_NAME];

};



struct cnss_wlan_driver {

	char *name;

	int  (*probe)(struct pci_dev *, const struct pci_device_id *);
@@ -47,5 +57,6 @@ extern int cnss_get_wlan_unsafe_channel(u16 *unsafe_ch_list, 
						u16 *ch_count, u16 buf_len);

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);



#endif /* _NET_CNSS_H_ */