2018-01-08 12:43:37 +00:00
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
mac80211: rt2x00: remove errornous duplicate condition
https://patchwork.kernel.org/patch/11224189/
--
On 2019-10-28 06:07, wbob wrote:
> Hello Roman,
>
> while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> I stumbled on what I think is an edit of yours made in error in march
> 2017:
>
> https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281
>
> RT6352 in line 5281 should not have been introduced as the "else if"
> below line 5291 can then not take effect for a RT6352 device. Another
> possibility is for line 5291 to be not for RT6352, but this seems
> very unlikely. Are you able to clarify still after this substantial time?
>
> 5277: static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
> ...
> 5279: } else if (rt2x00_rt(rt2x00dev, RT5390) ||
> 5280: rt2x00_rt(rt2x00dev, RT5392) ||
> 5281: rt2x00_rt(rt2x00dev, RT6352)) {
> ...
> 5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) {
> ...
Hence remove errornous line 5281 to make the driver actually
execute the correct initialization routine for MT7620 chips.
As it was requested by Stanislaw Gruszka remove setting values of
MIMO_PS_CFG and TX_PIN_CFG. MIMO_PS_CFG is responsible for MIMO
power-safe mode (which is disabled), hence we can drop setting it.
TX_PIN_CFG is set correctly in other functions, and as setting this
value breaks some devices, rather don't set it here during init, but
only modify it later on.
Fixes: 41977e86c984 ("rt2x00: add support for MT7620")
Reported-by: wbob <wbob@jify.de>
Reported-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
--
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-11-03 17:31:02 +00:00
|
|
|
@@ -8628,6 +8628,71 @@ void rt2800_r_calibration(struct rt2x00_
|
2018-01-08 12:43:37 +00:00
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(rt2800_r_calibration);
|
|
|
|
|
|
|
|
|
|
+void rt2800_rxdcoc_calibration(struct rt2x00_dev *rt2x00dev)
|
|
|
|
|
+{
|
|
|
|
|
+ u8 bbpreg = 0;
|
|
|
|
|
+ u32 macvalue = 0, macvalue1 = 0;
|
|
|
|
|
+ u8 saverfb0r2, saverfb5r4, saverfb7r4, rfvalue;
|
|
|
|
|
+ int i;
|
|
|
|
|
+
|
|
|
|
|
+ saverfb0r2 = rt2800_rfcsr_read_bank(rt2x00dev, 0, 2);
|
|
|
|
|
+ rfvalue = saverfb0r2;
|
|
|
|
|
+ rfvalue |= 0x03;
|
|
|
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 2, rfvalue);
|
|
|
|
|
+
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 158, 141);
|
|
|
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
|
|
|
+ bbpreg |= 0x10;
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
|
|
|
+
|
|
|
|
|
+ macvalue = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
|
|
|
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x8);
|
|
|
|
|
+
|
|
|
|
|
+ for (i = 0; i < 10000; i++) {
|
|
|
|
|
+ macvalue1 = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
|
|
|
|
|
+ if (macvalue1 & 0x1)
|
|
|
|
|
+ udelay(50);
|
|
|
|
|
+ else
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ saverfb5r4 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 0);
|
|
|
|
|
+ saverfb7r4 = rt2800_rfcsr_read_bank(rt2x00dev, 7, 4);
|
|
|
|
|
+ saverfb5r4 = saverfb5r4 & (~0x40);
|
|
|
|
|
+ saverfb7r4 = saverfb7r4 & (~0x40);
|
|
|
|
|
+ rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x64);
|
|
|
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 4, saverfb5r4);
|
|
|
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 4, saverfb7r4);
|
|
|
|
|
+
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 158, 141);
|
|
|
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
|
|
|
+ bbpreg = bbpreg & (~0x40);
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
|
|
|
+ bbpreg |= 0x48;
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
|
|
|
+
|
|
|
|
|
+ for (i = 0; i < 10000; i++) {
|
|
|
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
|
|
|
+ if ((bbpreg & 0x40)==0)
|
|
|
|
|
+ break;
|
|
|
|
|
+ udelay(50);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
|
|
|
+ bbpreg = bbpreg & (~0x40);
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
|
|
|
+
|
|
|
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, macvalue);
|
|
|
|
|
+
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 158, 141);
|
|
|
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
|
|
|
+ bbpreg &= (~0x10);
|
|
|
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
|
|
|
+
|
|
|
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 2, saverfb0r2);
|
|
|
|
|
+}
|
|
|
|
|
+EXPORT_SYMBOL_GPL(rt2800_rxdcoc_calibration);
|
|
|
|
|
+
|
|
|
|
|
static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
|
|
|
|
|
bool set_bw, bool is_ht40)
|
|
|
|
|
{
|
mac80211: rt2x00: remove errornous duplicate condition
https://patchwork.kernel.org/patch/11224189/
--
On 2019-10-28 06:07, wbob wrote:
> Hello Roman,
>
> while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> I stumbled on what I think is an edit of yours made in error in march
> 2017:
>
> https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281
>
> RT6352 in line 5281 should not have been introduced as the "else if"
> below line 5291 can then not take effect for a RT6352 device. Another
> possibility is for line 5291 to be not for RT6352, but this seems
> very unlikely. Are you able to clarify still after this substantial time?
>
> 5277: static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
> ...
> 5279: } else if (rt2x00_rt(rt2x00dev, RT5390) ||
> 5280: rt2x00_rt(rt2x00dev, RT5392) ||
> 5281: rt2x00_rt(rt2x00dev, RT6352)) {
> ...
> 5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) {
> ...
Hence remove errornous line 5281 to make the driver actually
execute the correct initialization routine for MT7620 chips.
As it was requested by Stanislaw Gruszka remove setting values of
MIMO_PS_CFG and TX_PIN_CFG. MIMO_PS_CFG is responsible for MIMO
power-safe mode (which is disabled), hence we can drop setting it.
TX_PIN_CFG is set correctly in other functions, and as setting this
value breaks some devices, rather don't set it here during init, but
only modify it later on.
Fixes: 41977e86c984 ("rt2x00: add support for MT7620")
Reported-by: wbob <wbob@jify.de>
Reported-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
--
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-11-03 17:31:02 +00:00
|
|
|
@@ -9237,6 +9302,7 @@ static void rt2800_init_rfcsr_6352(struc
|
2018-01-08 12:43:37 +00:00
|
|
|
|
|
|
|
|
rt2800_r_calibration(rt2x00dev);
|
|
|
|
|
rt2800_rf_self_txdc_cal(rt2x00dev);
|
|
|
|
|
+ rt2800_rxdcoc_calibration(rt2x00dev);
|
|
|
|
|
rt2800_bw_filter_calibration(rt2x00dev, true);
|
|
|
|
|
rt2800_bw_filter_calibration(rt2x00dev, false);
|
|
|
|
|
}
|
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
2019-08-03 10:30:38 +00:00
|
|
|
@@ -245,6 +245,7 @@ void rt2800_vco_calibration(struct rt2x0
|
2018-01-08 12:43:37 +00:00
|
|
|
void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
int rt2800_calcrcalibrationcode(struct rt2x00_dev *rt2x00dev, int d1, int d2);
|
|
|
|
|
void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
+void rt2800_rxdcoc_calibration(struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
|
|
|
|
|
int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
void rt2800_disable_radio(struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
2019-08-03 10:30:38 +00:00
|
|
|
@@ -566,6 +566,7 @@ struct rt2x00lib_ops {
|
2018-01-08 12:43:37 +00:00
|
|
|
void (*rf_self_txdc_cal) (struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
int (*calcrcalibrationcode) (struct rt2x00_dev *rt2x00dev, int d1, int d2);
|
|
|
|
|
void (*r_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
+ void (*rxdcoc_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Data queue handlers.
|
