| Message ID | 1475278518-18527-2-git-send-email-Jes.Sorensen@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ab05e5ec81c76f3a852919c22984c885edd2414a |
| Delegated to: | Kalle Valo |
| Headers | show |
On Fri, Sep 30, 2016 at 07:35:17PM -0400, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen <Jes.Sorensen@redhat.com> > > The generic disable_rf() function clears bits 22 and 23 in > REG_RX_WAIT_CCA, however we did not re-enable them again in > rtl8723b_enable_rf() > > This resolves the problem for me with 8723bu devices not working again > after reloading the driver. > > Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> > --- > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 ++++ > 1 file changed, 4 insertions(+) <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read Documentation/stable_kernel_rules.txt for how to do this properly. </formletter>
Greg KH <greg@kroah.com> writes: > On Fri, Sep 30, 2016 at 07:35:17PM -0400, Jes.Sorensen@redhat.com wrote: >> From: Jes Sorensen <Jes.Sorensen@redhat.com> >> >> The generic disable_rf() function clears bits 22 and 23 in >> REG_RX_WAIT_CCA, however we did not re-enable them again in >> rtl8723b_enable_rf() >> >> This resolves the problem for me with 8723bu devices not working again >> after reloading the driver. >> >> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> >> --- >> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 ++++ >> 1 file changed, 4 insertions(+) > > <formletter> > > This is not the correct way to submit patches for inclusion in the > stable kernel tree. Please read Documentation/stable_kernel_rules.txt > for how to do this properly. > > </formletter> DOH Kalle told me to CC stable I took it for granted that you meant CC in the email sense. Guess I get to blame my self for looking like a fool in public. I'll send you an email directly with the SHA once it hits Linus' tree instead. Jes
Jes Sorensen <Jes.Sorensen@redhat.com> writes: > Greg KH <greg@kroah.com> writes: >> On Fri, Sep 30, 2016 at 07:35:17PM -0400, Jes.Sorensen@redhat.com wrote: >>> From: Jes Sorensen <Jes.Sorensen@redhat.com> >>> >>> The generic disable_rf() function clears bits 22 and 23 in >>> REG_RX_WAIT_CCA, however we did not re-enable them again in >>> rtl8723b_enable_rf() >>> >>> This resolves the problem for me with 8723bu devices not working again >>> after reloading the driver. >>> >>> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> >>> --- >>> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 ++++ >>> 1 file changed, 4 insertions(+) >> >> <formletter> >> >> This is not the correct way to submit patches for inclusion in the >> stable kernel tree. Please read Documentation/stable_kernel_rules.txt >> for how to do this properly. >> >> </formletter> > > DOH Kalle told me to CC stable I took it for granted that you meant CC > in the email sense. Guess I get to blame my self for looking like a > fool in public. Yes, I meant adding it to the commit log. This part of the stable process is a bit confusing, I should have been more clear how this works. > I'll send you an email directly with the SHA once it hits Linus' tree > instead. No need, I'll add this to the commit log and the stable team will get the commit automatically once the commit is in Linus' tree: Cc: stable@vger.kernel.org # 4.7+
Jes Sorensen <Jes.Sorensen@redhat.com> wrote: > From: Jes Sorensen <Jes.Sorensen@redhat.com> > > The generic disable_rf() function clears bits 22 and 23 in > REG_RX_WAIT_CCA, however we did not re-enable them again in > rtl8723b_enable_rf() > > This resolves the problem for me with 8723bu devices not working again > after reloading the driver. > > Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> > Cc: stable@vger.kernel.org # 4.7+ 2 patches applied to wireless-drivers.git, thanks. ab05e5ec81c7 rtl8xxxu: Fix rtl8723bu driver reload issue 29d5e6fbd65b rtl8xxxu: Fix rtl8192eu driver reload issue
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c index 6c086b5..02b8ddd 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c @@ -1498,6 +1498,10 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) u32 val32; u8 val8; + val32 = rtl8xxxu_read32(priv, REG_RX_WAIT_CCA); + val32 |= (BIT(22) | BIT(23)); + rtl8xxxu_write32(priv, REG_RX_WAIT_CCA, val32); + /* * No indication anywhere as to what 0x0790 does. The 2 antenna * vendor code preserves bits 6-7 here.