Commit 716c220b authored by Pavel Löbl's avatar Pavel Löbl Committed by Kalle Valo
Browse files

brcmfmac: allow setting wlan MAC address using device tree 



This allows firmware to provide MAC address using device tree. Like in
case there is no MAC burned in wlan NVRAM.

Signed-off-by: default avatarPavel Löbl <pavel@loebl.cz>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220506044246.67146-1-pavel@loebl.cz
parent 62296b3e

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+17 −6
Original line number Diff line number Diff line
@@ -202,13 +202,24 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	char *ptr;

	s32 err;



	/* retreive mac address */

	if (is_valid_ether_addr(ifp->mac_addr)) {

		/* set mac address */

		err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", ifp->mac_addr,

					       ETH_ALEN);

		if (err < 0) {

			bphy_err(ifp->drvr, "Setting cur_etheraddr failed, %d\n", err);

			goto done;

		}

	} else {

		/* retrieve mac address */

		err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,

					       sizeof(ifp->mac_addr));

		if (err < 0) {

			bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);

			goto done;

		}

	}



	memcpy(ifp->drvr->mac, ifp->mac_addr, sizeof(ifp->drvr->mac));

	memcpy(ifp->drvr->wiphy->perm_addr, ifp->drvr->mac, ETH_ALEN);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct brcmf_mp_device { 
	bool		ignore_probe_fail;

	struct brcmfmac_pd_cc *country_codes;

	const char	*board_type;

	unsigned char	mac[ETH_ALEN];

	union {

		struct brcmfmac_sdio_pd sdio;

	} bus;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/etherdevice.h>

#include <linux/module.h>

#include <linux/inetdevice.h>

#include <linux/property.h>

#include <net/cfg80211.h>

#include <net/rtnetlink.h>

#include <net/addrconf.h>
@@ -1197,7 +1198,8 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops) 
	brcmf_dbg(TRACE, "\n");



	/* add primary networking interface */

	ifp = brcmf_add_if(drvr, 0, 0, false, "wlan%d", NULL);

	ifp = brcmf_add_if(drvr, 0, 0, false, "wlan%d",

			   is_valid_ether_addr(drvr->settings->mac) ? drvr->settings->mac : NULL);

	if (IS_ERR(ifp))

		return PTR_ERR(ifp);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_net.h>



#include <defs.h>

#include "debug.h"
@@ -99,6 +100,8 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, 
	if (err)

		brcmf_err("failed to get OF country code map (err=%d)\n", err);



	of_get_mac_address(np, settings->mac);



	if (bus_type != BRCMF_BUSTYPE_SDIO)

		return;