2023-08-05 10:15:49

by Shiji Yang

Subject: [PATCH] wifi: rt2x00: correct MAC_SYS_CTRL register RX mask in R-Calibration

For MAC_SYS_CTRL register, Bit[2] controls MAC_TX_EN and Bit[3]
controls MAC_RX_EN (Bit index starts from 0). Therefore, 0x08 is
the correct mask for RX.

Signed-off-by: Shiji Yang <[email protected]>
---
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index ff891353c..28d7b4ea4 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -8583,7 +8583,7 @@ static void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev)
rt2x00_warn(rt2x00dev, "Wait MAC Tx Status to MAX !!!\n");

maccfg = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
- maccfg &= (~0x04);
+ maccfg &= (~0x08);
rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, maccfg);

if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev, MAC_STATUS_CFG_BBP_RF_BUSY_RX)))
--
2.39.2

2023-08-05 18:06:31

by Stanislaw Gruszka

Subject: Re: [PATCH] wifi: rt2x00: correct MAC_SYS_CTRL register RX mask in R-Calibration

On Sat, Aug 05, 2023 at 05:17:28PM +0800, Shiji Yang wrote:
> For MAC_SYS_CTRL register, Bit[2] controls MAC_TX_EN and Bit[3]
> controls MAC_RX_EN (Bit index starts from 0). Therefore, 0x08 is
> the correct mask for RX.
>
> Signed-off-by: Shiji Yang <[email protected]>
Acked-by: Stanislaw Gruszka <[email protected]>

> ---
> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> index ff891353c..28d7b4ea4 100644
> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> @@ -8583,7 +8583,7 @@ static void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev)
> rt2x00_warn(rt2x00dev, "Wait MAC Tx Status to MAX !!!\n");
>
> maccfg = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
> - maccfg &= (~0x04);
> + maccfg &= (~0x08);
> rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, maccfg);
>
> if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev, MAC_STATUS_CFG_BBP_RF_BUSY_RX)))
> --
> 2.39.2
>