* [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM
@ 2015-05-14 7:42 Rafał Miłecki
2015-05-14 8:52 ` Markos Chandras
0 siblings, 1 reply; 5+ messages in thread
From: Rafał Miłecki @ 2015-05-14 7:42 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Hauke Mehrtens, Rafał Miłecki
In the recent SPROM commit:
MIPS: BCM47xx: Read board info for all bcma buses
a proper handling of "fallback" argument has been dropped. Restore it.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
arch/mips/bcm47xx/sprom.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 8485143..b0d62e7 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -698,6 +698,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
struct bcma_device *core;
char buf[10];
char *prefix;
+ bool fallback = false;
switch (bus->hosttype) {
case BCMA_HOSTTYPE_PCI:
@@ -715,6 +716,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
snprintf(buf, sizeof(buf), "sb/%u/",
core->core_index);
prefix = buf;
+ fallback = true;
} else {
prefix = NULL;
}
@@ -729,7 +731,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
binfo->vendor = SSB_BOARDVENDOR_BCM;
nvram_read_u16(prefix, NULL, "boardtype", &binfo->type, 0, true);
- bcm47xx_fill_sprom(out, prefix, false);
+ bcm47xx_fill_sprom(out, prefix, fallback);
return 0;
}
--
1.8.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM
2015-05-14 7:42 [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM Rafał Miłecki
@ 2015-05-14 8:52 ` Markos Chandras
2015-05-14 9:18 ` Rafał Miłecki
0 siblings, 1 reply; 5+ messages in thread
From: Markos Chandras @ 2015-05-14 8:52 UTC (permalink / raw)
To: Rafał Miłecki, linux-mips, Ralf Baechle; +Cc: Hauke Mehrtens
On 05/14/2015 08:42 AM, Rafał Miłecki wrote:
> In the recent SPROM commit:
> MIPS: BCM47xx: Read board info for all bcma buses
> a proper handling of "fallback" argument has been dropped. Restore it.
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
Hi,
if the "MIPS: BCM47xx: Read board info for all bcma buses" is not
upstream yet (I can't see it) it might make sense to fold this fix into
it and repost it as v2.
--
markos
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM
2015-05-14 8:52 ` Markos Chandras
@ 2015-05-14 9:18 ` Rafał Miłecki
2015-05-15 14:12 ` Ralf Baechle
0 siblings, 1 reply; 5+ messages in thread
From: Rafał Miłecki @ 2015-05-14 9:18 UTC (permalink / raw)
To: Markos Chandras; +Cc: linux-mips@linux-mips.org, Ralf Baechle, Hauke Mehrtens
On 14 May 2015 at 10:52, Markos Chandras <Markos.Chandras@imgtec.com> wrote:
> On 05/14/2015 08:42 AM, Rafał Miłecki wrote:
>> In the recent SPROM commit:
>> MIPS: BCM47xx: Read board info for all bcma buses
>> a proper handling of "fallback" argument has been dropped. Restore it.
>>
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> ---
> if the "MIPS: BCM47xx: Read board info for all bcma buses" is not
> upstream yet (I can't see it) it might make sense to fold this fix into
> it and repost it as v2.
It's not upstream in Linus's tree, but it was already pushed by Ralf
to his tree:
http://git.linux-mips.org/cgit/ralf/upstream-sfr.git/commit/?id=c6d94e9354139e8a0ef3bd3286b2a5ac30f8f6aa
I'll just let Ralf decide if he wants to rebase.
--
Rafał
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM
2015-05-14 9:18 ` Rafał Miłecki
@ 2015-05-15 14:12 ` Ralf Baechle
2015-05-15 14:18 ` Rafał Miłecki
0 siblings, 1 reply; 5+ messages in thread
From: Ralf Baechle @ 2015-05-15 14:12 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Markos Chandras, linux-mips@linux-mips.org, Hauke Mehrtens
On Thu, May 14, 2015 at 11:18:57AM +0200, Rafał Miłecki wrote:
> On 14 May 2015 at 10:52, Markos Chandras <Markos.Chandras@imgtec.com> wrote:
> > On 05/14/2015 08:42 AM, Rafał Miłecki wrote:
> >> In the recent SPROM commit:
> >> MIPS: BCM47xx: Read board info for all bcma buses
> >> a proper handling of "fallback" argument has been dropped. Restore it.
> >>
> >> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> >> ---
> > if the "MIPS: BCM47xx: Read board info for all bcma buses" is not
> > upstream yet (I can't see it) it might make sense to fold this fix into
> > it and repost it as v2.
>
> It's not upstream in Linus's tree, but it was already pushed by Ralf
> to his tree:
> http://git.linux-mips.org/cgit/ralf/upstream-sfr.git/commit/?id=c6d94e9354139e8a0ef3bd3286b2a5ac30f8f6aa
>
> I'll just let Ralf decide if he wants to rebase.
I've folded this patch into the original commit. I put the original
and now the combined patch into my 4.2 queue so it won't go to Linus
for another few weeks anyway. If this should go upstream for 4.1,
please lemme know.
Ralf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM
2015-05-15 14:12 ` Ralf Baechle
@ 2015-05-15 14:18 ` Rafał Miłecki
0 siblings, 0 replies; 5+ messages in thread
From: Rafał Miłecki @ 2015-05-15 14:18 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Markos Chandras, linux-mips@linux-mips.org, Hauke Mehrtens
On 15 May 2015 at 16:12, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Thu, May 14, 2015 at 11:18:57AM +0200, Rafał Miłecki wrote:
>
>> On 14 May 2015 at 10:52, Markos Chandras <Markos.Chandras@imgtec.com> wrote:
>> > On 05/14/2015 08:42 AM, Rafał Miłecki wrote:
>> >> In the recent SPROM commit:
>> >> MIPS: BCM47xx: Read board info for all bcma buses
>> >> a proper handling of "fallback" argument has been dropped. Restore it.
>> >>
>> >> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> >> ---
>> > if the "MIPS: BCM47xx: Read board info for all bcma buses" is not
>> > upstream yet (I can't see it) it might make sense to fold this fix into
>> > it and repost it as v2.
>>
>> It's not upstream in Linus's tree, but it was already pushed by Ralf
>> to his tree:
>> http://git.linux-mips.org/cgit/ralf/upstream-sfr.git/commit/?id=c6d94e9354139e8a0ef3bd3286b2a5ac30f8f6aa
>>
>> I'll just let Ralf decide if he wants to rebase.
>
> I've folded this patch into the original commit. I put the original
> and now the combined patch into my 4.2 queue so it won't go to Linus
> for another few weeks anyway. If this should go upstream for 4.1,
> please lemme know.
Thanks a lot. Everything I posted is for next (4.2).
--
Rafał
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-15 14:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-14 7:42 [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM Rafał Miłecki
2015-05-14 8:52 ` Markos Chandras
2015-05-14 9:18 ` Rafał Miłecki
2015-05-15 14:12 ` Ralf Baechle
2015-05-15 14:18 ` Rafał Miłecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox