rt2800: fix TX_PIN_CFG setting for non MT7620 chips

PATCH Superseded Stanislaw Gruszka 2 participants 3 messages Aug 25, 2017 Ralink RT2X00 wireless LAN driver

Share & tools

Stanislaw Gruszka

author

2017-08-25 11:38 UTC #0 lore raw

PATCH 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]>

Signed-off-by Stanislaw Gruszka <[email protected]>

---
 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 d11c7b2..5672aec 100644
@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	if (rt2x00_rt(rt2x00dev, RT3572))
 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-	rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
+	if (rt2x00_rt(rt2x00dev, RT6352))
+		rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
+	else
+		tx_pin = 0;
 
 	switch (rt2x00dev->default_ant.tx_chain_num) {
 	case 3:

Signature · 1 line

2.7.5

Daniel Golle

2017-08-25 12:41 UTC #1 lore raw

Hi Stanislaw,

Quoted 18 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]>
Signed-off-by Stanislaw Gruszka <[email protected]>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +0 -0
index d11c7b2..5672aec 100644

drivers/net/wireless/ralink/rt2x00/rt2800lib.c static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, · line 3703

Quoted 6 lines

drivers/net/wireless/ralink/rt2x00/rt2800lib.c +2 -1

@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	if (rt2x00_rt(rt2x00dev, RT3572))
 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-	rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
+	if (rt2x00_rt(rt2x00dev, RT6352))
+		rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);

should be

	tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);

since the calling convention of rt2800_register_read was changed in commit eebd68e782 rt2x00: convert rt2800_register_read return type. Probably you based the patch on an outdated tree...?

Quoted 8 lines

drivers/net/wireless/ralink/rt2x00/rt2800lib.c +2 -0
+	else
+		tx_pin = 0;
 
 	switch (rt2x00dev->default_ant.tx_chain_num) {
 	case 3:
Signature · 1 line
2.7.5

Stanislaw Gruszka

author

2017-08-25 14:50 UTC #2 lore raw

Quoted 30 lines · Daniel Golle

Hi Stanislaw,
Quoted 18 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]>
Signed-off-by Stanislaw Gruszka <[email protected]>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +0 -0
index d11c7b2..5672aec 100644
drivers/net/wireless/ralink/rt2x00/rt2800lib.c static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, · line 3703
Quoted 6 lines
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +2 -1
@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	if (rt2x00_rt(rt2x00dev, RT3572))
 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-	rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
+	if (rt2x00_rt(rt2x00dev, RT6352))
+		rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
should be

Quoted 5 lines

	tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
since the calling convention of rt2800_register_read was changed in commit eebd68e782 rt2x00: convert rt2800_register_read return type. Probably you based the patch on an outdated tree...?

Yes, is was on 4.12. Will post v2.

Thanks
Stanislaw