This fixes the wifi problem on a WRT54G3GV2. If an entry
"pci/1/1/il0macaddr" exists in the nvram, the prefix "pci/1/1/" is used
for nvram reads, and a fallback sprom is filled with the data.
I don't know the exact details, as the original patch was created by
"rtz" without many explanations some time in may and never published.
Since then quite some changes were made to setup.c, so I had to work it
over. It's probably not perfect, but it works.
Tested with my own G3G.
Signed-off-by: Niclas Koeser <[email protected]>
--- linux-2.6.34.5/arch/mips/bcm47xx/setup.c.orig 2010-09-16 12:38:58.000000000 +0200
+++ linux-2.6.34.5/arch/mips/bcm47xx/setup.c 2010-09-16 12:40:56.000000000 +0200
@@ -40,6 +40,8 @@
struct ssb_bus ssb_bcm47xx;
EXPORT_SYMBOL(ssb_bcm47xx);
+static struct ssb_sprom fallback_sprom;
+
static void bcm47xx_machine_restart(char *command)
{
printk(KERN_ALERT "Please stand by while rebooting the system...\n");
@@ -76,89 +78,142 @@
}
}
-#define READ_FROM_NVRAM(_outvar, name, buf) \
- if (nvram_getenv(name, buf, sizeof(buf)) >= 0 || \
- cfe_getenv(name, buf, sizeof(buf)) >= 0) \
- sprom->_outvar = simple_strtoul(buf, NULL, 0);
+#define READ_FROM_NVRAM(_outvar, name, buf, buf2, prefix) \
+ if (prefix) { \
+ snprintf(buf2, sizeof(buf2), "%s%s", prefix, name); \
+ if (nvram_getenv(buf2, buf, sizeof(buf)) >= 0 || \
+ cfe_getenv(buf2, buf, sizeof(buf)) >= 0) \
+ sprom->_outvar = simple_strtoul(buf, NULL, 0); \
+ } \
+ else { \
+ if (nvram_getenv(name, buf, sizeof(buf)) >= 0 || \
+ cfe_getenv(name, buf, sizeof(buf)) >= 0) \
+ sprom->_outvar = simple_strtoul(buf, NULL, 0); \
+ }
+
+#define READ_EADDR_FROM_NVRAM(_outvar, name, buf, buf2, prefix) \
+ if (prefix) { \
+ snprintf(buf2, sizeof(buf2), "%s%s", prefix, name); \
+ if (nvram_getenv(buf2, buf, sizeof(buf)) >= 0 || \
+ cfe_getenv(buf2, buf, sizeof(buf)) >= 0) \
+ str2eaddr(buf, sprom->_outvar); \
+ } \
+ else { \
+ if (nvram_getenv(name, buf, sizeof(buf)) >= 0 || \
+ cfe_getenv(name, buf, sizeof(buf)) >= 0) \
+ str2eaddr(buf, sprom->_outvar); \
+ }
-static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix)
{
char buf[100];
- u32 boardflags;
+ char buf2[51];
+ u32 boardflags=0;
+
+ memset(sprom, 0x0, sizeof(struct ssb_sprom));
- 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 ||
- cfe_getenv("il0macaddr", buf, sizeof(buf)) >= 0)
- str2eaddr(buf, sprom->il0mac);
- if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
- str2eaddr(buf, sprom->et0mac);
- if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0 ||
- cfe_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 ||
- cfe_getenv("boardflags", buf, sizeof(buf)) >= 0)
- boardflags = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(revision, "sromrev", buf, buf2, prefix); // ???
+ if (prefix) {
+ snprintf(buf2, sizeof(buf2), "%s%s", prefix, "sromrev");
+ if (nvram_getenv(buf2, buf, sizeof(buf)) >= 0 ||
+ cfe_getenv(buf2, buf, sizeof(buf)) >= 0)
+ sprom->revision = simple_strtoul(buf, NULL, 0);
+ else
+ sprom->revision = 1;
+ }
+ else {
+ if (nvram_getenv("sromrev", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("sromrev", buf, sizeof(buf)) >= 0)
+ sprom->revision = simple_strtoul(buf, NULL, 0);
+ else
+ sprom->revision = 1;
+ }
+
+
+ READ_EADDR_FROM_NVRAM(il0mac, "il0macaddr", buf, buf2, prefix);
+ READ_EADDR_FROM_NVRAM(et0mac, "et0macaddr", buf, buf2, prefix);
+ READ_EADDR_FROM_NVRAM(et1mac, "et1macaddr", buf, buf2, prefix);
+
+
+ READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf, buf2, prefix);
+ READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf, buf2, prefix);
+ READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf, buf2, prefix);
+ READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf, buf2, prefix);
+ READ_FROM_NVRAM(board_rev, "boardrev", buf, buf2, prefix);
+ READ_FROM_NVRAM(country_code, "ccode", buf, buf2, prefix);
+ READ_FROM_NVRAM(ant_available_a, "aa5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(ant_available_bg, "aa2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa0b0, "pa0b0", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa0b1, "pa0b1", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa0b2, "pa0b2", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1b0, "pa1b0", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1b1, "pa1b1", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1b2, "pa1b2", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf, buf2, prefix);
+ READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf, buf2, prefix);
+ READ_FROM_NVRAM(gpio0, "wl0gpio0", buf, buf2, prefix);
+ READ_FROM_NVRAM(gpio1, "wl0gpio1", buf, buf2, prefix);
+ READ_FROM_NVRAM(gpio2, "wl0gpio2", buf, buf2, prefix);
+ READ_FROM_NVRAM(gpio3, "wl0gpio3", buf, buf2, prefix);
+ READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf, buf2, prefix);
+ READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf, buf2, prefix);
+ READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf, buf2, prefix);
+ READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf, buf2, prefix);
+ READ_FROM_NVRAM(itssi_a, "pa1itssit", buf, buf2, prefix);
+ READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf, buf2, prefix);
+ READ_FROM_NVRAM(tri2g, "tri2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(tri5gl, "tri5gl", buf, buf2, prefix);
+ READ_FROM_NVRAM(tri5g, "tri5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(tri5gh, "tri5gh", buf, buf2, prefix);
+ READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(bxa2g, "bxa2g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(bxa5g, "bxa5g", buf, buf2, prefix);
+ READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf, buf2, prefix);
+ READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf, buf2, prefix);
+ READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf, buf2, prefix);
+ READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf, buf2, prefix);
+ READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf, buf2, prefix);
+
+
+ if (prefix) {
+ snprintf(buf2, sizeof(buf2), "%s%s", prefix, "boardflags");
+ if (nvram_getenv(buf2, buf, sizeof(buf)) >= 0 ||
+ cfe_getenv(buf2, buf, sizeof(buf)) >= 0)
+ boardflags = simple_strtoul(buf, NULL, 0);
+ }
+ else {
+ if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 ||
+ cfe_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 ||
- cfe_getenv("boardflags2", buf, sizeof(buf)) >= 0)
- boardflags = simple_strtoul(buf, NULL, 0);
+
+ if (prefix) {
+ snprintf(buf2, sizeof(buf2), "%s%s", prefix, "boardflags2");
+ if (nvram_getenv(buf2, buf, sizeof(buf)) >= 0 ||
+ cfe_getenv(buf2, buf, sizeof(buf)) >= 0)
+ boardflags = simple_strtoul(buf, NULL, 0);
+ }
+ else {
+ if (nvram_getenv("boardflags2", buf, sizeof(buf)) >= 0 ||
+ cfe_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;
@@ -181,7 +236,7 @@
cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
- bcm47xx_fill_sprom(&iv->sprom);
+ bcm47xx_fill_sprom(&iv->sprom, NULL);
if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0 ||
cfe_getenv("cardbus", buf, sizeof(buf)) >= 0)
@@ -196,12 +251,30 @@
char buf[100];
struct ssb_mipscore *mcore;
+ #ifdef CONFIG_SSB_PCIHOST
+ const char *prefix;
+ #endif
+
err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
bcm47xx_get_invariants);
if (err)
panic("Failed to initialize SSB bus (err %d)\n", err);
mcore = &ssb_bcm47xx.mipscore;
+ #ifdef CONFIG_SSB_PCIHOST
+ printk(KERN_INFO "Using fallback SPROM.\n");
+
+ prefix = "pci/1/1/";
+ if (nvram_getenv("pci/1/1/il0macaddr", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("pci/1/1/il0macaddr", buf, sizeof(buf)) >= 0) {
+ bcm47xx_fill_sprom(&fallback_sprom, prefix);
+
+ if (ssb_arch_set_fallback_sprom(&fallback_sprom) < 0)
+ printk(KERN_ERR "failed to register fallback SPROM\n");
+ }
+ #endif
+
+
if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0 ||
cfe_getenv("kernel_args", buf, sizeof(buf)) >= 0) {
if (strstr(buf, "console=ttyS1")) {
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
