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

Commit 5fe2e071 authored by Nathan Hintz's avatar Nathan Hintz Committed by John W. Linville
Browse files

bcma: Move initialization of SPROM to prevent overwrite 



The first thing bcm47xx_fill_sprom does is initialize (zero fill) the SPROM.  For
BCMA SOC, this wipes out any values previously read by bcm47xx_fill_sprom_ethernet
(see arch/mips/bcm47xx/setup.c - bcm47xx_get_sprom_bcma).  Move the initialization
of SPROM so it is called prior to filling in any values.

Signed-off-by: default avatarNathan Hintz <nlhintz@hotmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 82a7c2bb

arch/mips/bcm47xx/setup.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out) 
	char prefix[10];

	char prefix[10];





	if (bus->bustype == SSB_BUSTYPE_PCI) {

	if (bus->bustype == SSB_BUSTYPE_PCI) {

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

		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",

		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",

			 bus->host_pci->bus->number + 1,

			 bus->host_pci->bus->number + 1,

			 PCI_SLOT(bus->host_pci->devfn));

			 PCI_SLOT(bus->host_pci->devfn));
@@ -111,6 +112,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, 




	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);

	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);





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

	bcm47xx_fill_sprom(&iv->sprom, NULL);

	bcm47xx_fill_sprom(&iv->sprom, NULL);





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

	if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
@@ -159,12 +161,14 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out) 




	switch (bus->hosttype) {

	switch (bus->hosttype) {

	case BCMA_HOSTTYPE_PCI:

	case BCMA_HOSTTYPE_PCI:

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

		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",

		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",

			 bus->host_pci->bus->number + 1,

			 bus->host_pci->bus->number + 1,

			 PCI_SLOT(bus->host_pci->devfn));

			 PCI_SLOT(bus->host_pci->devfn));

		bcm47xx_fill_sprom(out, prefix);

		bcm47xx_fill_sprom(out, prefix);

		return 0;

		return 0;

	case BCMA_HOSTTYPE_SOC:

	case BCMA_HOSTTYPE_SOC:

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

		bcm47xx_fill_sprom_ethernet(out, NULL);

		bcm47xx_fill_sprom_ethernet(out, NULL);

		core = bcma_find_core(bus, BCMA_CORE_80211);

		core = bcma_find_core(bus, BCMA_CORE_80211);

		if (core) {

		if (core) {

arch/mips/bcm47xx/sprom.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -557,8 +557,6 @@ void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, const char *prefix) 




void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix)

void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix)

{

{

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



	bcm47xx_fill_sprom_ethernet(sprom, prefix);

	bcm47xx_fill_sprom_ethernet(sprom, prefix);





	nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0);

	nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0);