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

Commit 898d3c3b authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: use sprom from bcma 



bcma now provides all sprom attributes needed by brcmsmac and also
parses them from the pci sprom ant otp.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Tested-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2b2715b8

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c

+3 −1
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ static struct si_info *ai_doattach(struct si_info *sii, 
	u32 w, savewin;

	struct bcma_device *cc;

	uint socitype;

	struct ssb_sprom *sprom = &pbus->sprom;



	savewin = 0;
@@ -617,7 +618,8 @@ static struct si_info *ai_doattach(struct si_info *sii, 
	}



	/* setup the GPIO based LED powersave register */

	w = getintvar(sih, BRCMS_SROM_LEDDC);

	w = (sprom->leddc_on_time << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) |

		 (sprom->leddc_off_time << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT);

	if (w == 0)

		w = DEFAULT_GPIOTIMERVAL;

	ai_cc_reg(sih, offsetof(struct chipcregs, gpiotimerval),

drivers/net/wireless/brcm80211/brcmsmac/antsel.c

+8 −8
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ brcms_c_antsel_init_cfg(struct antsel_info *asi, struct brcms_antselcfg *antsel, 
struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc)

{

	struct antsel_info *asi;

	struct si_pub *sih = wlc->hw->sih;

	struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;



	asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);

	if (!asi)
@@ -118,7 +118,7 @@ struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc) 
	asi->pub = wlc->pub;

	asi->antsel_type = ANTSEL_NA;

	asi->antsel_avail = false;

	asi->antsel_antswitch = (u8) getintvar(sih, BRCMS_SROM_ANTSWITCH);

	asi->antsel_antswitch = sprom->antswitch;



	if ((asi->pub->sromrev >= 4) && (asi->antsel_antswitch != 0)) {

		switch (asi->antsel_antswitch) {
@@ -128,12 +128,12 @@ struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc) 
			/* 4321/2 board with 2x3 switch logic */

			asi->antsel_type = ANTSEL_2x3;

			/* Antenna selection availability */

			if (((u16) getintvar(sih, BRCMS_SROM_AA2G) == 7) ||

			    ((u16) getintvar(sih, BRCMS_SROM_AA5G) == 7)) {

			if ((sprom->ant_available_bg == 7) ||

			    (sprom->ant_available_a == 7)) {

				asi->antsel_avail = true;

			} else if (

				(u16) getintvar(sih, BRCMS_SROM_AA2G) == 3 ||

				(u16) getintvar(sih, BRCMS_SROM_AA5G) == 3) {

				sprom->ant_available_bg == 3 ||

				sprom->ant_available_a == 3) {

				asi->antsel_avail = false;

			} else {

				asi->antsel_avail = false;
@@ -146,8 +146,8 @@ struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc) 
			break;

		}

	} else if ((asi->pub->sromrev == 4) &&

		   ((u16) getintvar(sih, BRCMS_SROM_AA2G) == 7) &&

		   ((u16) getintvar(sih, BRCMS_SROM_AA5G) == 0)) {

		   (sprom->ant_available_bg == 7) &&

		   (sprom->ant_available_a == 0)) {

		/* hack to match old 4321CB2 cards with 2of3 antenna switch */

		asi->antsel_type = ANTSEL_2x3;

		asi->antsel_avail = true;

drivers/net/wireless/brcm80211/brcmsmac/channel.c

+3 −4
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc) 
	char country_abbrev[BRCM_CNTRY_BUF_SZ];

	const struct country_info *country;

	struct brcms_pub *pub = wlc->pub;

	char *ccode;

	struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;



	BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
@@ -1122,9 +1122,8 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc) 
	wlc->cmi = wlc_cm;



	/* store the country code for passing up as a regulatory hint */

	ccode = getvar(wlc->hw->sih, BRCMS_SROM_CCODE);

	if (ccode && brcms_c_country_valid(ccode))

		strncpy(wlc->pub->srom_ccode, ccode, BRCM_CNTRY_BUF_SZ - 1);

	if (sprom->alpha2 && brcms_c_country_valid(sprom->alpha2))

		strncpy(wlc->pub->srom_ccode, sprom->alpha2, sizeof(sprom->alpha2));



	/*

	 * internal country information which must match

drivers/net/wireless/brcm80211/brcmsmac/main.c

+25 −41
Original line number Diff line number Diff line
@@ -1882,27 +1882,20 @@ static bool brcms_c_validboardtype(struct brcms_hardware *wlc_hw) 
	return true;

}



static char *brcms_c_get_macaddr(struct brcms_hardware *wlc_hw)

static void brcms_c_get_macaddr(struct brcms_hardware *wlc_hw, u8 etheraddr[ETH_ALEN])

{

	enum brcms_srom_id var_id = BRCMS_SROM_MACADDR;

	char *macaddr;

	struct ssb_sprom *sprom = &wlc_hw->d11core->bus->sprom;



	/* If macaddr exists, use it (Sromrev4, CIS, ...). */

	macaddr = getvar(wlc_hw->sih, var_id);

	if (macaddr != NULL)

		return macaddr;

	if (!is_zero_ether_addr(sprom->il0mac)) {

		memcpy(etheraddr, sprom->il0mac, 6);

		return;

	}



	if (wlc_hw->_nbands > 1)

		var_id = BRCMS_SROM_ET1MACADDR;

		memcpy(etheraddr, sprom->et1mac, 6);

	else

		var_id = BRCMS_SROM_IL0MACADDR;



	macaddr = getvar(wlc_hw->sih, var_id);

	if (macaddr == NULL)

		wiphy_err(wlc_hw->wlc->wiphy, "wl%d: wlc_get_macaddr: macaddr "

			  "getvar(%d) not found\n", wlc_hw->unit, var_id);



	return macaddr;

		memcpy(etheraddr, sprom->il0mac, 6);

}



/* power both the pll and external oscillator on/off */
@@ -4436,13 +4429,13 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, 
			  uint unit, bool piomode)

{

	struct brcms_hardware *wlc_hw;

	char *macaddr = NULL;

	uint err = 0;

	uint j;

	bool wme = false;

	struct shared_phy_params sha_params;

	struct wiphy *wiphy = wlc->wiphy;

	struct pci_dev *pcidev = core->bus->host_pci;

	struct ssb_sprom *sprom = &core->bus->sprom;



	BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,

	       pcidev->vendor,
@@ -4512,7 +4505,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, 
	}



	/* get the board rev, used just below */

	j = getintvar(wlc_hw->sih, BRCMS_SROM_BOARDREV);

	j = sprom->board_rev;

	/* promote srom boardrev of 0xFF to 1 */

	if (j == BOARDREV_PROMOTABLE)

		j = BOARDREV_PROMOTED;
@@ -4525,11 +4518,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, 
		err = 15;

		goto fail;

	}

	wlc_hw->sromrev = (u8) getintvar(wlc_hw->sih, BRCMS_SROM_REV);

	wlc_hw->boardflags = (u32) getintvar(wlc_hw->sih,

					     BRCMS_SROM_BOARDFLAGS);

	wlc_hw->boardflags2 = (u32) getintvar(wlc_hw->sih,

					      BRCMS_SROM_BOARDFLAGS2);

	wlc_hw->sromrev = sprom->revision;

	wlc_hw->boardflags = sprom->boardflags_lo + (sprom->boardflags_hi << 16);

	wlc_hw->boardflags2 = sprom->boardflags2_lo + (sprom->boardflags2_hi << 16);



	if (wlc_hw->boardflags & BFL_NOPLLDOWN)

		brcms_b_pllreq(wlc_hw, true, BRCMS_PLLREQ_SHARED);
@@ -4702,25 +4693,18 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, 
	 */



	/* init etheraddr state variables */

	macaddr = brcms_c_get_macaddr(wlc_hw);

	if (macaddr == NULL) {

		wiphy_err(wiphy, "wl%d: brcms_b_attach: macaddr not found\n",

			  unit);

		err = 21;

		goto fail;

	}

	if (!mac_pton(macaddr, wlc_hw->etheraddr) ||

	    is_broadcast_ether_addr(wlc_hw->etheraddr) ||

	brcms_c_get_macaddr(wlc_hw, wlc_hw->etheraddr);



	if (is_broadcast_ether_addr(wlc_hw->etheraddr) ||

	    is_zero_ether_addr(wlc_hw->etheraddr)) {

		wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr %s\n",

			  unit, macaddr);

		wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr\n",

			  unit);

		err = 22;

		goto fail;

	}



	BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",

	       wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih),

	       macaddr);

	BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x\n",

	       wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih));



	return err;
@@ -4770,16 +4754,16 @@ static bool brcms_c_attach_stf_ant_init(struct brcms_c_info *wlc) 
	int aa;

	uint unit;

	int bandtype;

	struct si_pub *sih = wlc->hw->sih;

	struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;



	unit = wlc->pub->unit;

	bandtype = wlc->band->bandtype;



	/* get antennas available */

	if (bandtype == BRCM_BAND_5G)

		aa = (s8) getintvar(sih, BRCMS_SROM_AA5G);

		aa = sprom->ant_available_a;

	else

		aa = (s8) getintvar(sih, BRCMS_SROM_AA2G);

		aa = sprom->ant_available_bg;



	if ((aa < 1) || (aa > 15)) {

		wiphy_err(wlc->wiphy, "wl%d: %s: Invalid antennas available in"
@@ -4799,9 +4783,9 @@ static bool brcms_c_attach_stf_ant_init(struct brcms_c_info *wlc) 


	/* Compute Antenna Gain */

	if (bandtype == BRCM_BAND_5G)

		wlc->band->antgain = (s8) getintvar(sih, BRCMS_SROM_AG1);

		wlc->band->antgain = sprom->antenna_gain.a1;

	else

		wlc->band->antgain = (s8) getintvar(sih, BRCMS_SROM_AG0);

		wlc->band->antgain = sprom->antenna_gain.a0;



	brcms_c_attach_antgain_init(wlc);

drivers/net/wireless/brcm80211/brcmsmac/nicpci.c

+4 −1
Original line number Diff line number Diff line
@@ -714,7 +714,10 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) 
void pcicore_attach(struct pcicore_info *pi, int state)

{

	struct si_pub *sih = pi->sih;

	u32 bfl2 = (u32)getintvar(sih, BRCMS_SROM_BOARDFLAGS2);

	struct ssb_sprom *sprom = &pi->core->bus->sprom;

	u32 bfl2;



	bfl2 = sprom->boardflags2_lo + (sprom->boardflags2_hi << 16);



	/* Determine if this board needs override */

	if (PCIE_ASPM(sih)) {