Message ID | 51B0FAC0.4080709@broadcom.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On 06/06/2013 03:10 PM, Arend van Spriel wrote: > On 06/04/13 14:58, Arend van Spriel wrote: >> On 06/04/2013 12:56 AM, Stephen Warren wrote: >>> (John, note that this commit is part of the pull request you sent to >>> Dave today) >>> >>> Arend, >>> >>> Commit 9390ace "brcmfmac: free net device when registration fails" >>> causes a regression. >>> >>> I had the BCM4330 firmware present in my root fs, whereas my HW is a >>> BCM4329. With this patch applied, I get a kernel panic on boot. With it >>> reverted, I see that no issues of that nature. This is true in >>> next-20130531 (and also 5/30 and 6/1 but not earlier). A bisect of >>> Linus's tree followed by a merge of John's wireless pull request from >>> today pointed at this same commit. >> >> Thanks, Stephen >> >> I will look into this. > > Hi Stephen, > > Can you try the attached patch? If it does not solve the issue, could > you provide a log. Yes, that works great, thanks. Tested-by: Stephen Warren <swarren@nvidia.com> >>> Related: Since the two hardware require different firmware, I wonder why >>> the driver doesn't use a firmware filename that encodes the HW device ID >>> instead of using the same name for all HW. This means that when I move >>> my SD card between development systems, I have to copy different >>> firmware over the top. That's a little painful... >> >> I agree that for development switching cards it is kinda awkward and I >> have been fooled by it as well. We may want to change or if your itch is >> annoying enough feel free to send a patch for it ;-) > > We have a patch for this that we can submit to wireless-next. Oh, great! If you could Cc me, that'd be helpful, since I'm not on that list. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/06/2013 03:36 PM, Stephen Warren wrote: > On 06/06/2013 03:10 PM, Arend van Spriel wrote: >> On 06/04/13 14:58, Arend van Spriel wrote: >>> On 06/04/2013 12:56 AM, Stephen Warren wrote: >>>> (John, note that this commit is part of the pull request you sent to >>>> Dave today) >>>> >>>> Arend, >>>> >>>> Commit 9390ace "brcmfmac: free net device when registration fails" >>>> causes a regression. >>>> >>>> I had the BCM4330 firmware present in my root fs, whereas my HW is a >>>> BCM4329. With this patch applied, I get a kernel panic on boot. With it >>>> reverted, I see that no issues of that nature. This is true in >>>> next-20130531 (and also 5/30 and 6/1 but not earlier). A bisect of >>>> Linus's tree followed by a merge of John's wireless pull request from >>>> today pointed at this same commit. >>> >>> Thanks, Stephen >>> >>> I will look into this. >> >> Hi Stephen, >> >> Can you try the attached patch? If it does not solve the issue, could >> you provide a log. > > Yes, that works great, thanks. > > Tested-by: Stephen Warren <swarren@nvidia.com> Did this patch get applied anywhere? I was hoping it'd go into 3.10-rc* given it's a user-triggerable backtrace introduced in 3.10-rc*. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/12/2013 11:19 PM, Stephen Warren wrote: > On 06/06/2013 03:36 PM, Stephen Warren wrote: >> On 06/06/2013 03:10 PM, Arend van Spriel wrote: >>> On 06/04/13 14:58, Arend van Spriel wrote: >>>> On 06/04/2013 12:56 AM, Stephen Warren wrote: >>>>> (John, note that this commit is part of the pull request you sent to >>>>> Dave today) >>>>> >>>>> Arend, >>>>> >>>>> Commit 9390ace "brcmfmac: free net device when registration fails" >>>>> causes a regression. >>>>> >>>>> I had the BCM4330 firmware present in my root fs, whereas my HW is a >>>>> BCM4329. With this patch applied, I get a kernel panic on boot. With it >>>>> reverted, I see that no issues of that nature. This is true in >>>>> next-20130531 (and also 5/30 and 6/1 but not earlier). A bisect of >>>>> Linus's tree followed by a merge of John's wireless pull request from >>>>> today pointed at this same commit. >>>> >>>> Thanks, Stephen >>>> >>>> I will look into this. >>> >>> Hi Stephen, >>> >>> Can you try the attached patch? If it does not solve the issue, could >>> you provide a log. >> >> Yes, that works great, thanks. >> >> Tested-by: Stephen Warren <swarren@nvidia.com> > > Did this patch get applied anywhere? I was hoping it'd go into 3.10-rc* > given it's a user-triggerable backtrace introduced in 3.10-rc*. Hi Stephen, The patch went into the wireless-next tree. Given recent events with our patch series I am a bit more carsful to tag patches for 3.10. Your issue is user-triggerable but the scenario to get there can be avoided. But you are right it was introduced in the 3.10-rc cycle. I leave it to John to decide. Regards, Arend -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 13, 2013 at 10:09:58AM +0200, Arend van Spriel wrote: > On 06/12/2013 11:19 PM, Stephen Warren wrote: > >On 06/06/2013 03:36 PM, Stephen Warren wrote: > >>On 06/06/2013 03:10 PM, Arend van Spriel wrote: > >>>On 06/04/13 14:58, Arend van Spriel wrote: > >>>>On 06/04/2013 12:56 AM, Stephen Warren wrote: > >>>>>(John, note that this commit is part of the pull request you sent to > >>>>>Dave today) > >>>>> > >>>>>Arend, > >>>>> > >>>>>Commit 9390ace "brcmfmac: free net device when registration fails" > >>>>>causes a regression. > >>>>> > >>>>>I had the BCM4330 firmware present in my root fs, whereas my HW is a > >>>>>BCM4329. With this patch applied, I get a kernel panic on boot. With it > >>>>>reverted, I see that no issues of that nature. This is true in > >>>>>next-20130531 (and also 5/30 and 6/1 but not earlier). A bisect of > >>>>>Linus's tree followed by a merge of John's wireless pull request from > >>>>>today pointed at this same commit. > >>>> > >>>>Thanks, Stephen > >>>> > >>>>I will look into this. > >>> > >>>Hi Stephen, > >>> > >>>Can you try the attached patch? If it does not solve the issue, could > >>>you provide a log. > >> > >>Yes, that works great, thanks. > >> > >>Tested-by: Stephen Warren <swarren@nvidia.com> > > > >Did this patch get applied anywhere? I was hoping it'd go into 3.10-rc* > >given it's a user-triggerable backtrace introduced in 3.10-rc*. > > Hi Stephen, > > The patch went into the wireless-next tree. Given recent events with > our patch series I am a bit more carsful to tag patches for 3.10. > Your issue is user-triggerable but the scenario to get there can be > avoided. But you are right it was introduced in the 3.10-rc cycle. I > leave it to John to decide. > > Regards, > Arend I've just applied it to the wireless tree. I doubt if it will make -rc6, but it might make the final 3.10. John
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 63cadf6..d7cf98e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -941,6 +941,10 @@ fail: brcmf_fws_del_interface(ifp); brcmf_fws_deinit(drvr); } + if (drvr->iflist[0]) { + free_netdev(ipf->ndev); + drvr->iflist[0] = NULL; + } if (p2p_ifp) { free_netdev(p2p_ifp->ndev); drvr->iflist[1] = NULL;