Commit 2aa088d6 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Fill values for b43 into SSB sprom 



Fill the sprom with all available values from the nvram. Most of these
new values are needed for the b43 or b43legacy driver.

Parts of this patch have been in OpenWRT for a long time and were written
by Michael Buesch.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
To: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: https://patchwork.linux-mips.org/patch/1846/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 82571084

arch/mips/bcm47xx/setup.c

+92 −22
Original line number Diff line number Diff line
@@ -73,42 +73,112 @@ static void str2eaddr(char *str, char *dest) 
	}

}



#define READ_FROM_NVRAM(_outvar, name, buf) \

	if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\

		sprom->_outvar = simple_strtoul(buf, NULL, 0);



static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)

{

	char buf[100];

	u32 boardflags;



	memset(sprom, 0, sizeof(struct ssb_sprom));



	sprom->revision = 1; /* Fallback: Old hardware does not define this. */

	READ_FROM_NVRAM(revision, "sromrev", buf);

	if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, sprom->il0mac);

	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, sprom->et0mac);

	if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, sprom->et1mac);

	READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf);

	READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf);

	READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf);

	READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf);

	READ_FROM_NVRAM(board_rev, "boardrev", buf);

	READ_FROM_NVRAM(country_code, "ccode", buf);

	READ_FROM_NVRAM(ant_available_a, "aa5g", buf);

	READ_FROM_NVRAM(ant_available_bg, "aa2g", buf);

	READ_FROM_NVRAM(pa0b0, "pa0b0", buf);

	READ_FROM_NVRAM(pa0b1, "pa0b1", buf);

	READ_FROM_NVRAM(pa0b2, "pa0b2", buf);

	READ_FROM_NVRAM(pa1b0, "pa1b0", buf);

	READ_FROM_NVRAM(pa1b1, "pa1b1", buf);

	READ_FROM_NVRAM(pa1b2, "pa1b2", buf);

	READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf);

	READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf);

	READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf);

	READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf);

	READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf);

	READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf);

	READ_FROM_NVRAM(gpio0, "wl0gpio0", buf);

	READ_FROM_NVRAM(gpio1, "wl0gpio1", buf);

	READ_FROM_NVRAM(gpio2, "wl0gpio2", buf);

	READ_FROM_NVRAM(gpio3, "wl0gpio3", buf);

	READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf);

	READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf);

	READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf);

	READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf);

	READ_FROM_NVRAM(itssi_a, "pa1itssit", buf);

	READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf);

	READ_FROM_NVRAM(tri2g, "tri2g", buf);

	READ_FROM_NVRAM(tri5gl, "tri5gl", buf);

	READ_FROM_NVRAM(tri5g, "tri5g", buf);

	READ_FROM_NVRAM(tri5gh, "tri5gh", buf);

	READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf);

	READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf);

	READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf);

	READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf);

	READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf);

	READ_FROM_NVRAM(bxa2g, "bxa2g", buf);

	READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf);

	READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf);

	READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf);

	READ_FROM_NVRAM(bxa5g, "bxa5g", buf);

	READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf);

	READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf);

	READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf);

	READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf);

	READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf);



	if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) {

		boardflags = simple_strtoul(buf, NULL, 0);

		if (boardflags) {

			sprom->boardflags_lo = (boardflags & 0x0000FFFFU);

			sprom->boardflags_hi = (boardflags & 0xFFFF0000U) >> 16;

		}

	}

	if (nvram_getenv("boardflags2", buf, sizeof(buf)) >= 0) {

		boardflags = simple_strtoul(buf, NULL, 0);

		if (boardflags) {

			sprom->boardflags2_lo = (boardflags & 0x0000FFFFU);

			sprom->boardflags2_hi = (boardflags & 0xFFFF0000U) >> 16;

		}

	}

}



static int bcm47xx_get_invariants(struct ssb_bus *bus,

				   struct ssb_init_invariants *iv)

{

	char buf[100];

	char buf[20];



	/* Fill boardinfo structure */

	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));



	if (nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0)

		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);

		iv->boardinfo.vendor = (u16)simple_strtoul(buf, NULL, 0);

	else

		iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;

	if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)

		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);

	if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)

		iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);



	/* Fill sprom structure */

	memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));

	iv->sprom.revision = 3;



	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, iv->sprom.et0mac);



	if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, iv->sprom.et1mac);



	if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)

		iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 0);



	if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)

		iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 0);



	if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0)

		iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);

	bcm47xx_fill_sprom(&iv->sprom);



	if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0)

		iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);

	if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)

		iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE