[PATCH wireless?] bcma: keep info about parallel flash presentence

[PATCH wireless?] bcma: keep info about parallel flash presentence

[Rafał Miłecki]

This allows drivers to access flash conditionally and stop crashing some
devices.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
---
John: I suggest taking it for wirelesss, AKA fix
---
 drivers/bcma/driver_mips.c                  |    2 +-
 include/linux/bcma/bcma_driver_chipcommon.h |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index cc65b45..55acba9 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -192,12 +192,12 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
 		bcma_debug(bus, "Found parallel flash\n");
 		bus->drv_cc.pflash.window = 0x1c000000;
 		bus->drv_cc.pflash.window_size = 0x02000000;
-
 		if ((bcma_read32(bus->drv_cc.core, BCMA_CC_FLASH_CFG) &
 		     BCMA_CC_FLASH_CFG_DS) == 0)
 			bus->drv_cc.pflash.buswidth = 1;
 		else
 			bus->drv_cc.pflash.buswidth = 2;
+		bus->drv_cc.pflash.present = true;
 		break;
 	default:
 		bcma_err(bus, "Flash type not supported\n");
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 3fb8bba..16c266c 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -510,6 +510,7 @@ struct bcma_chipcommon_pmu {
 
 #ifdef CONFIG_BCMA_DRIVER_MIPS
 struct bcma_pflash {
+	bool present;
 	u8 buswidth;
 	u32 window;
 	u32 window_size;
-- 
1.7.7

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[Arend van Spriel]

On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
> This allows drivers to access flash conditionally and stop crashing some
> devices.
> 
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> John: I suggest taking it for wirelesss, AKA fix

Maybe you could mentioned devices and/or drivers crashes without this patch?

Gr. AvS

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[Rafał Miłecki]

2012/8/10 Arend van Spriel <arend@broadcom.com>:
> On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
>> This allows drivers to access flash conditionally and stop crashing some
>> devices.
>>
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>> John: I suggest taking it for wirelesss, AKA fix
>
> Maybe you could mentioned devices and/or drivers crashes without this patch?

Yes, sure! The problematic one for me is arch/mips/bcm47xx/nvram.c.
Right now it assumes every BCMA board has pflash. I'll submit fix for
mips tree when this patch hits it.

-- 
Rafał

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[Rafał Miłecki]

2012/8/10 Rafał Miłecki <zajec5@gmail.com>:
> 2012/8/10 Arend van Spriel <arend@broadcom.com>:
>> On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
>>> This allows drivers to access flash conditionally and stop crashing some
>>> devices.
>>>
>>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>>> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>>> ---
>>> John: I suggest taking it for wirelesss, AKA fix
>>
>> Maybe you could mentioned devices and/or drivers crashes without this patch?
>
> Yes, sure! The problematic one for me is arch/mips/bcm47xx/nvram.c.
> Right now it assumes every BCMA board has pflash. I'll submit fix for
> mips tree when this patch hits it.

Ah, and device. My Netgear WNDR4500 has serial flash and NAND flash.
It doesn't have parallel one, so this code crashes my device.

-- 
Rafał

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[Hauke Mehrtens]

On 08/10/2012 11:32 AM, Rafał Miłecki wrote:
> 2012/8/10 Arend van Spriel <arend@broadcom.com>:
>> On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
>>> This allows drivers to access flash conditionally and stop crashing some
>>> devices.
>>>
>>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>>> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>>> ---
>>> John: I suggest taking it for wirelesss, AKA fix
>>
>> Maybe you could mentioned devices and/or drivers crashes without this patch?
> 
> Yes, sure! The problematic one for me is arch/mips/bcm47xx/nvram.c.
> Right now it assumes every BCMA board has pflash. I'll submit fix for
> mips tree when this patch hits it.

Letting this patches get merged into the wireless tree and an other
patches which depends on this one into the mips tree will cause
problems, because the wireless tree only gets merged into the mips tree
indirectly round about the rc1 release in form of the rc1 release done
by Linus.

The patch to arch/mips/bcm47xx/nvram.c will depend on this one and you
should submit them to the same tree.

Hauke

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[Rafał Miłecki]

2012/8/10 Hauke Mehrtens <hauke@hauke-m.de>:
> On 08/10/2012 11:32 AM, Rafał Miłecki wrote:
>> 2012/8/10 Arend van Spriel <arend@broadcom.com>:
>>> On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
>>>> This allows drivers to access flash conditionally and stop crashing some
>>>> devices.
>>>>
>>>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>>>> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>>>> ---
>>>> John: I suggest taking it for wirelesss, AKA fix
>>>
>>> Maybe you could mentioned devices and/or drivers crashes without this patch?
>>
>> Yes, sure! The problematic one for me is arch/mips/bcm47xx/nvram.c.
>> Right now it assumes every BCMA board has pflash. I'll submit fix for
>> mips tree when this patch hits it.
>
> Letting this patches get merged into the wireless tree and an other
> patches which depends on this one into the mips tree will cause
> problems, because the wireless tree only gets merged into the mips tree
> indirectly round about the rc1 release in form of the rc1 release done
> by Linus.
>
> The patch to arch/mips/bcm47xx/nvram.c will depend on this one and you
> should submit them to the same tree.

I'm planning to wait until rc2 (or rc3 if needed). I know the dependency :)

-- 
Rafał

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[John W. Linville]

On Fri, Aug 10, 2012 at 02:25:48PM +0200, Rafał Miłecki wrote:
> 2012/8/10 Hauke Mehrtens <hauke@hauke-m.de>:
> > On 08/10/2012 11:32 AM, Rafał Miłecki wrote:
> >> 2012/8/10 Arend van Spriel <arend@broadcom.com>:
> >>> On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
> >>>> This allows drivers to access flash conditionally and stop crashing some
> >>>> devices.
> >>>>
> >>>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> >>>> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> >>>> ---
> >>>> John: I suggest taking it for wirelesss, AKA fix
> >>>
> >>> Maybe you could mentioned devices and/or drivers crashes without this patch?
> >>
> >> Yes, sure! The problematic one for me is arch/mips/bcm47xx/nvram.c.
> >> Right now it assumes every BCMA board has pflash. I'll submit fix for
> >> mips tree when this patch hits it.
> >
> > Letting this patches get merged into the wireless tree and an other
> > patches which depends on this one into the mips tree will cause
> > problems, because the wireless tree only gets merged into the mips tree
> > indirectly round about the rc1 release in form of the rc1 release done
> > by Linus.
> >
> > The patch to arch/mips/bcm47xx/nvram.c will depend on this one and you
> > should submit them to the same tree.
> 
> I'm planning to wait until rc2 (or rc3 if needed). I know the dependency :)

Which rc2?  Because Ralf probably won't have it in his tree until
the 3.7-rc1 timeframe...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH wireless?] bcma: keep info about parallel flash presentence

[Rafał Miłecki]

2012/8/10 John W. Linville <linville@tuxdriver.com>:
> On Fri, Aug 10, 2012 at 02:25:48PM +0200, Rafał Miłecki wrote:
>> 2012/8/10 Hauke Mehrtens <hauke@hauke-m.de>:
>> > On 08/10/2012 11:32 AM, Rafał Miłecki wrote:
>> >> 2012/8/10 Arend van Spriel <arend@broadcom.com>:
>> >>> On 08/09/2012 10:38 PM, Rafał Miłecki wrote:
>> >>>> This allows drivers to access flash conditionally and stop crashing some
>> >>>> devices.
>> >>>>
>> >>>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> >>>> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>> >>>> ---
>> >>>> John: I suggest taking it for wirelesss, AKA fix
>> >>>
>> >>> Maybe you could mentioned devices and/or drivers crashes without this patch?
>> >>
>> >> Yes, sure! The problematic one for me is arch/mips/bcm47xx/nvram.c.
>> >> Right now it assumes every BCMA board has pflash. I'll submit fix for
>> >> mips tree when this patch hits it.
>> >
>> > Letting this patches get merged into the wireless tree and an other
>> > patches which depends on this one into the mips tree will cause
>> > problems, because the wireless tree only gets merged into the mips tree
>> > indirectly round about the rc1 release in form of the rc1 release done
>> > by Linus.
>> >
>> > The patch to arch/mips/bcm47xx/nvram.c will depend on this one and you
>> > should submit them to the same tree.
>>
>> I'm planning to wait until rc2 (or rc3 if needed). I know the dependency :)
>
> Which rc2?  Because Ralf probably won't have it in his tree until
> the 3.7-rc1 timeframe...

Ouch, I hoped bcma fix will go into 3.6-rc2 or 3.6-rc3 and Ralf will
rebase his tree against Linus at some point...

OK, I'll try to send additional bcm47xx fix through yours tree (after
Ralf accepts it).

-- 
Rafał