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

Commit 399cfaad authored by Komal Seelam's avatar Komal Seelam Committed by Gerrit - the friendly Code Review server
Browse files

cnss: Implement API to store WLAN MAC address in platform driver 



WLAN Functional Drivers Queries cnss platform driver to get the
MAC Address. If the OEM doesn't provide the valid MAC address, the
WLAN Driver fallbacks to use other approaches to get MAC address.

This works under CONFIG_CNSS_MAC feature flag, which will be enabled
only on the OEM platforms. For internal platforms, CNSS driver doesn't
hold any valid mac addresses.

CRs-Fixed: 985585
Change-Id: I1e8a030a32a640cec84cadd6b36b37938d5fe6be
Signed-off-by: default avatarKomal Kumar <kseelam@codeaurora.org>
parent e3ea6c56

drivers/net/wireless/cnss/cnss_pci.c

+103 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/crypto.h>

#include <linux/scatterlist.h>

#include <linux/log2.h>

#include <linux/etherdevice.h>

#ifdef CONFIG_PCI_MSM

#include <linux/msm_pcie.h>

#else
@@ -223,6 +224,16 @@ struct index_file { 
	u8 file_name[13];

};



/**

 * struct wlan_mac_addr - Structure to hold WLAN MAC Address

 * @mac_addr: MAC address

 */

#define MAX_NO_OF_MAC_ADDR 4

struct cnss_wlan_mac_addr {

	u8 mac_addr[MAX_NO_OF_MAC_ADDR][ETH_ALEN];

	uint32_t no_of_mac_addr_set;

};



/* device_info is expected to be fully populated after cnss_config is invoked.

 * The function pointer callbacks are expected to be non null as well.

 */
@@ -230,6 +241,8 @@ static struct cnss_data { 
	struct platform_device *pldev;

	struct subsys_device *subsys;

	struct subsys_desc    subsysdesc;

	struct cnss_wlan_mac_addr wlan_mac_addr;

	bool is_wlan_mac_set;

	bool ramdump_dynamic;

	struct ramdump_device *ramdump_dev;

	unsigned long ramdump_size;
@@ -1927,6 +1940,96 @@ end: 
	return;

}



/**

 * cnss_get_wlan_mac_address() - API to return MAC addresses buffer

 * @dev: struct device pointer

 * @num: buffer for number of mac addresses supported

 *

 * API returns the pointer to the buffer filled with mac addresses and

 * updates num with the number of mac addresses the buffer contains.

 *

 * Return: pointer to mac address buffer.

 */

u8 *cnss_get_wlan_mac_address(struct device *dev, uint32_t *num)

{

	struct cnss_wlan_mac_addr *addr = NULL;



	if (!penv) {

		pr_err("%s: Invalid Platform Driver Context\n", __func__);

		goto end;

	}



	if (!penv->is_wlan_mac_set) {

		pr_info("%s: Platform Driver doesn't have any mac address\n",

			__func__);

		goto end;

	}



	addr = &penv->wlan_mac_addr;

	*num = addr->no_of_mac_addr_set;

	return &addr->mac_addr[0][0];

end:

	*num = 0;

	return NULL;

}

EXPORT_SYMBOL(cnss_get_wlan_mac_address);



/**

* cnss_pcie_set_wlan_mac_address() - API to get two wlan mac address

* @in: Input buffer with wlan mac addresses

* @len: Size of the buffer passed

*

* API to store wlan mac address passed by the caller. The stored mac

* addresses are used by the wlan functional driver to program wlan HW.

*

* Return: kernel error code.

*/

int cnss_pcie_set_wlan_mac_address(const u8 *in, uint32_t len)

{

	uint32_t no_of_mac_addr;

	struct cnss_wlan_mac_addr *addr = NULL;

	int iter = 0;

	u8 *temp = NULL;



	if (len == 0 || (len % ETH_ALEN) != 0) {

		pr_err("%s: Invalid Length:%d\n", __func__, len);

		return -EINVAL;

	}



	no_of_mac_addr = len / ETH_ALEN;



	if (no_of_mac_addr > MAX_NO_OF_MAC_ADDR) {

		pr_err("%s: Num of supported MAC  addresses are:%d given:%d\n",

		       __func__, MAX_NO_OF_MAC_ADDR, no_of_mac_addr);

		return -EINVAL;

	}



	if (!penv) {

		pr_err("%s: Invalid CNSS Platform Context\n", __func__);

		return -ENOENT;

	}



	if (penv->is_wlan_mac_set) {

		pr_info("%s: Already MAC address are configured\n", __func__);

		return 0;

	}



	penv->is_wlan_mac_set = true;

	addr = &penv->wlan_mac_addr;

	addr->no_of_mac_addr_set = no_of_mac_addr;

	temp = &addr->mac_addr[0][0];



	for (; iter < no_of_mac_addr; ++iter, temp += ETH_ALEN, in +=

	     ETH_ALEN) {

		ether_addr_copy(temp, in);

		pr_debug("%s MAC_ADDR:%02x:%02x:%02x:%02x:%02x:%02x\n",

			 __func__, temp[0], temp[1], temp[2], temp[3], temp[4],

			 temp[5]);

	}

	return 0;

}

EXPORT_SYMBOL(cnss_pcie_set_wlan_mac_address);



int cnss_wlan_register_driver(struct cnss_wlan_driver *driver)

{

	int ret = 0;

drivers/net/wireless/cnss/cnss_sdio.c

+13 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,19 @@ static int cnss_sdio_remove(struct platform_device *pdev) 
	return 0;

}



int cnss_sdio_set_wlan_mac_address(const u8 *in, uint32_t len)

{

	return 0;

}

EXPORT_SYMBOL(cnss_sdio_set_wlan_mac_address);



u8 *cnss_get_wlan_mac_address(struct device *dev, uint32_t *num)

{

	*num = 0;

	return NULL;

}

EXPORT_SYMBOL(cnss_get_wlan_mac_address);



static const struct of_device_id cnss_sdio_dt_match[] = {

	{.compatible = "qcom,cnss_sdio"},

	{}

include/net/cnss.h

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ extern void *cnss_sdio_get_virt_ramdump_mem(unsigned long *size); 
extern void cnss_schedule_recovery_work(void);

extern void cnss_sdio_schedule_recovery_work(void);

extern void cnss_pci_schedule_recovery_work(void);

extern int cnss_pcie_set_wlan_mac_address(const u8 *in, uint32_t len);

extern u8 *cnss_get_wlan_mac_address(struct device *dev, uint32_t *num);

extern int cnss_sdio_set_wlan_mac_address(const u8 *in, uint32_t len);



enum {

	CNSS_RESET_SOC = 0,