Skip to contentSkip to conversation

rt2800: fix TX_PIN_CFG setting for non MT7620 chips

PATCH In review Stanislaw Gruszka 3 participants 3 messages Aug 25, 2017 – Aug 30, 2017 Ralink RT2X00 wireless LAN driver

lore
Share & tools
lore

Stanislaw Gruszka

author
#0 lore raw

PATCH v2 1/1 rt2800: fix TX_PIN_CFG setting for non MT7620 chips

Since commit 41977e86c984 ("rt2x00: add support for MT7620") we do not initialize TX_PIN_CFG setting. This cause breakage at least on some RT3573 devices. To fix the problem patch restores previous behaviour for non MT7620 chips.

Fixes 41977e86c984 ("rt2x00: add support for MT7620")

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1480829

Reported-and-tested-by Jussi Eloranta <[email protected]>
Cc Daniel Golle <[email protected]>
Signed-off-by Stanislaw Gruszka <[email protected]>

---
v1 -> v2: patch for updated linux version

 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +4 -1
index 0b75def39c6c..d2c289446c00 100644
@@ -3702,7 +3702,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	if (rt2x00_rt(rt2x00dev, RT3572))
 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-	tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
+	if (rt2x00_rt(rt2x00dev, RT6352))
+		tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
+	else
+		tx_pin = 0;
 
 	switch (rt2x00dev->default_ant.tx_chain_num) {
 	case 3:
Signature · 1 line
2.7.5
Acked-by on v2 1/1
#1 lore raw
Quoted 10 lines · Stanislaw Gruszka

Since commit 41977e86c984 ("rt2x00: add support for MT7620") we do not initialize TX_PIN_CFG setting. This cause breakage at least on some RT3573 devices. To fix the problem patch restores previous behaviour for non MT7620 chips.

Fixes 41977e86c984 ("rt2x00: add support for MT7620")

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1480829

Reported-and-tested-by Jussi Eloranta <[email protected]>
Cc Daniel Golle <[email protected]>
Signed-off-by Stanislaw Gruszka <[email protected]>
Acked-by Daniel Golle <[email protected]>
Quoted 24 lines

---
v1 -> v2: patch for updated linux version

 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +4 -1
index 0b75def39c6c..d2c289446c00 100644
@@ -3702,7 +3702,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	if (rt2x00_rt(rt2x00dev, RT3572))
 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-	tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
+	if (rt2x00_rt(rt2x00dev, RT6352))
+		tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
+	else
+		tx_pin = 0;
 
 	switch (rt2x00dev->default_ant.tx_chain_num) {
 	case 3:
Signature · 1 line
2.7.5
#2 lore raw
In reply to Stanislaw Gruszka
Quoted 11 lines · Stanislaw Gruszka

Since commit 41977e86c984 ("rt2x00: add support for MT7620") we do not initialize TX_PIN_CFG setting. This cause breakage at least on some RT3573 devices. To fix the problem patch restores previous behaviour for non MT7620 chips.

Fixes 41977e86c984 ("rt2x00: add support for MT7620")

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1480829

Reported-and-tested-by Jussi Eloranta <[email protected]>
Cc Daniel Golle <[email protected]>
Signed-off-by Stanislaw Gruszka <[email protected]>
Acked-by Daniel Golle <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

83ec48919389 rt2800: fix TX_PIN_CFG setting for non MT7620 chips

Signature · 3 lines
https://patchwork.kernel.org/patch/9922285/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches