1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From 7b4161933d0a409023f5ef70cdc9296ab1cf5430 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Wed, 14 Sep 2016 14:10:42 -0400
Subject: [PATCH] rtl8xxxu: Fix reloading of driver for 8188eu devices
For 8188eu, once the MAC is asked to power down by setting
APS_FSMCO_MAC_OFF, there seems to be no way to bring it back to life.
In addition, only disable RF_ENABLE in RF_CTRL rather than all bits.
This was spotted by Andrea Merello who noticed that if we dropped the
call to rtl8188eu_active_to_emu() reloading started working.
Reported-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 29 +++++-----------------
1 file changed, 6 insertions(+), 23 deletions(-)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
@@ -1160,37 +1160,18 @@ exit:
static int rtl8188eu_active_to_emu(struct rtl8xxxu_priv *priv)
{
u8 val8;
- int count, ret = 0;
/* Turn off RF */
- rtl8xxxu_write8(priv, REG_RF_CTRL, 0);
+ val8 = rtl8xxxu_read8(priv, REG_RF_CTRL);
+ val8 &= ~RF_ENABLE;
+ rtl8xxxu_write8(priv, REG_RF_CTRL, val8);
/* LDO Sleep mode */
val8 = rtl8xxxu_read8(priv, REG_LPLDO_CTRL);
val8 |= BIT(4);
rtl8xxxu_write8(priv, REG_LPLDO_CTRL, val8);
- /* 0x0005[1] = 1 turn off MAC by HW state machine*/
- val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
- val8 |= BIT(1);
- rtl8xxxu_write8(priv, REG_APS_FSMCO + 1, val8);
-
- for (count = RTL8XXXU_MAX_REG_POLL; count; count--) {
- val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
- if ((val8 & BIT(1)) == 0)
- break;
- udelay(10);
- }
-
- if (!count) {
- dev_warn(&priv->udev->dev, "%s: Disabling MAC timed out\n",
- __func__);
- ret = -EBUSY;
- goto exit;
- }
-
-exit:
- return ret;
+ return 0;
}
static int rtl8188eu_emu_to_disabled(struct rtl8xxxu_priv *priv)
@@ -1372,6 +1353,8 @@ void rtl8188eu_power_off(struct rtl8xxxu
static void rtl8188e_enable_rf(struct rtl8xxxu_priv *priv)
{
+ rtl8xxxu_write8(priv, REG_RF_CTRL, RF_ENABLE | RF_RSTB | RF_SDMRSTB);
+
rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
}
|
