diff mbox series

[1/3] wifi: rtl8xxxu: Name some bits used in burst init

Message ID 91f59414-86f7-f0ed-a138-19f0ab63bb0b@gmail.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series [1/3] wifi: rtl8xxxu: Name some bits used in burst init | expand

Commit Message

Bitterblue Smith Nov. 8, 2022, 6:54 p.m. UTC 
Names provided by Ping-Ke Shih.

Suggested-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
---
This patch should be applied after my older patch:
"[PATCH v2 1/3] wifi: rtl8xxxu: Move burst init to a function​"
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++-----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

Comments

Ping-Ke Shih Nov. 9, 2022, 12:41 a.m. UTC | #1 
> -----Original Message-----
> From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> Sent: Wednesday, November 9, 2022 2:54 AM
> To: linux-wireless@vger.kernel.org
> Cc: Jes Sorensen <Jes.Sorensen@gmail.com>; Ping-Ke Shih <pkshih@realtek.com>
> Subject: [PATCH 1/3] wifi: rtl8xxxu: Name some bits used in burst init
> 
> Names provided by Ping-Ke Shih.

Ha. That looks weird to see my name in commit message. Could you say
"use descriptive names instead of magic number" or something like that?

> 
> Suggested-by: Ping-Ke Shih <pkshih@realtek.com>
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> ---
> This patch should be applied after my older patch:
> "[PATCH v2 1/3] wifi: rtl8xxxu: Move burst init to a function​"

For me, I have reviewed the former patchset, so it is fine to me.
But, I'm not sure if other people want you to change something
in the former patchset but you fix them in this patchset.

> ---
>  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++-----
>  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h |  6 ++++++
>  2 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index 839e0546f5ec..e4eb17d03cd7 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -3786,16 +3786,16 @@ void rtl8xxxu_init_burst(struct rtl8xxxu_priv *priv)
>  	 * For USB high speed set 512B packets
>  	 */
>  	val8 = rtl8xxxu_read8(priv, REG_RXDMA_PRO_8723B);
> -	val8 &= ~(BIT(4) | BIT(5));
> -	val8 |= BIT(4);
> -	val8 |= BIT(1) | BIT(2) | BIT(3);
> +	u8p_replace_bits(&val8, 1, RXDMA_PRO_DMA_BURST_SIZE);
> +	u8p_replace_bits(&val8, 3, RXDMA_PRO_DMA_BURST_CNT);
> +	val8 |= RXDMA_PRO_DMA_MODE;
>  	rtl8xxxu_write8(priv, REG_RXDMA_PRO_8723B, val8);
> 
>  	/*
>  	 * Enable single packet AMPDU
>  	 */
>  	val8 = rtl8xxxu_read8(priv, REG_HT_SINGLE_AMPDU_8723B);
> -	val8 |= BIT(7);
> +	val8 |= HT_SINGLE_AMPDU_ENABLE;
>  	rtl8xxxu_write8(priv, REG_HT_SINGLE_AMPDU_8723B, val8);
> 
>  	rtl8xxxu_write16(priv, REG_MAX_AGGR_NUM, 0x0c14);
> @@ -3820,7 +3820,7 @@ void rtl8xxxu_init_burst(struct rtl8xxxu_priv *priv)
> 
>  	/* to prevent mac is reseted by bus. */
>  	val8 = rtl8xxxu_read8(priv, REG_RSV_CTRL);
> -	val8 |= BIT(5) | BIT(6);
> +	val8 |= RSV_CTRL_WLOCK_1C | RSV_CTRL_DIS_PRST;
>  	rtl8xxxu_write8(priv, REG_RSV_CTRL, val8);
>  }
> 
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
> index 04bf77959fba..5d4cac4f4c06 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
> @@ -68,6 +68,8 @@
>  #define REG_SPS_OCP_CFG			0x0018
>  #define REG_8192E_LDOV12_CTRL		0x0014
>  #define REG_RSV_CTRL			0x001c
> +#define  RSV_CTRL_WLOCK_1C		BIT(5)
> +#define  RSV_CTRL_DIS_PRST		BIT(6)
> 
>  #define REG_RF_CTRL			0x001f
>  #define  RF_ENABLE			BIT(0)
> @@ -472,6 +474,9 @@
>  /* Presumably only found on newer chips such as 8723bu */
>  #define REG_RX_DMA_CTRL_8723B		0x0286
>  #define REG_RXDMA_PRO_8723B		0x0290
> +#define  RXDMA_PRO_DMA_MODE		BIT(1)		/* Set to 0x1. */
> +#define  RXDMA_PRO_DMA_BURST_CNT	GENMASK(3, 2)	/* Set to 0x3. */
> +#define  RXDMA_PRO_DMA_BURST_SIZE	GENMASK(5, 4)	/* Set to 0x1. */
> 
>  #define REG_RF_BB_CMD_ADDR		0x02c0
>  #define REG_RF_BB_CMD_DATA		0x02c4
> @@ -577,6 +582,7 @@
>  #define REG_STBC_SETTING		0x04c4
>  #define REG_QUEUE_CTRL			0x04c6
>  #define REG_HT_SINGLE_AMPDU_8723B	0x04c7
> +#define  HT_SINGLE_AMPDU_ENABLE		BIT(7)
>  #define REG_PROT_MODE_CTRL		0x04c8
>  #define REG_MAX_AGGR_NUM		0x04ca
>  #define REG_RTS_MAX_AGGR_NUM		0x04cb
> --
> 2.38.0
> 
> ------Please consider the environment before printing this e-mail.
Bitterblue Smith Nov. 9, 2022, 4:40 p.m. UTC | #2 
On 09/11/2022 02:41, Ping-Ke Shih wrote:
> 
>> -----Original Message-----
>> From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
>> Sent: Wednesday, November 9, 2022 2:54 AM
>> To: linux-wireless@vger.kernel.org
>> Cc: Jes Sorensen <Jes.Sorensen@gmail.com>; Ping-Ke Shih <pkshih@realtek.com>
>> Subject: [PATCH 1/3] wifi: rtl8xxxu: Name some bits used in burst init
>>
>> Names provided by Ping-Ke Shih.
> 
> Ha. That looks weird to see my name in commit message. Could you say
> "use descriptive names instead of magic number" or something like that?
> 
Of course, I'll change that.
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 839e0546f5ec..e4eb17d03cd7 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -3786,16 +3786,16 @@  void rtl8xxxu_init_burst(struct rtl8xxxu_priv *priv)
 	 * For USB high speed set 512B packets
 	 */
 	val8 = rtl8xxxu_read8(priv, REG_RXDMA_PRO_8723B);
-	val8 &= ~(BIT(4) | BIT(5));
-	val8 |= BIT(4);
-	val8 |= BIT(1) | BIT(2) | BIT(3);
+	u8p_replace_bits(&val8, 1, RXDMA_PRO_DMA_BURST_SIZE);
+	u8p_replace_bits(&val8, 3, RXDMA_PRO_DMA_BURST_CNT);
+	val8 |= RXDMA_PRO_DMA_MODE;
 	rtl8xxxu_write8(priv, REG_RXDMA_PRO_8723B, val8);
 
 	/*
 	 * Enable single packet AMPDU
 	 */
 	val8 = rtl8xxxu_read8(priv, REG_HT_SINGLE_AMPDU_8723B);
-	val8 |= BIT(7);
+	val8 |= HT_SINGLE_AMPDU_ENABLE;
 	rtl8xxxu_write8(priv, REG_HT_SINGLE_AMPDU_8723B, val8);
 
 	rtl8xxxu_write16(priv, REG_MAX_AGGR_NUM, 0x0c14);
@@ -3820,7 +3820,7 @@  void rtl8xxxu_init_burst(struct rtl8xxxu_priv *priv)
 
 	/* to prevent mac is reseted by bus. */
 	val8 = rtl8xxxu_read8(priv, REG_RSV_CTRL);
-	val8 |= BIT(5) | BIT(6);
+	val8 |= RSV_CTRL_WLOCK_1C | RSV_CTRL_DIS_PRST;
 	rtl8xxxu_write8(priv, REG_RSV_CTRL, val8);
 }
 
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
index 04bf77959fba..5d4cac4f4c06 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
@@ -68,6 +68,8 @@ 
 #define REG_SPS_OCP_CFG			0x0018
 #define REG_8192E_LDOV12_CTRL		0x0014
 #define REG_RSV_CTRL			0x001c
+#define  RSV_CTRL_WLOCK_1C		BIT(5)
+#define  RSV_CTRL_DIS_PRST		BIT(6)
 
 #define REG_RF_CTRL			0x001f
 #define  RF_ENABLE			BIT(0)
@@ -472,6 +474,9 @@ 
 /* Presumably only found on newer chips such as 8723bu */
 #define REG_RX_DMA_CTRL_8723B		0x0286
 #define REG_RXDMA_PRO_8723B		0x0290
+#define  RXDMA_PRO_DMA_MODE		BIT(1)		/* Set to 0x1. */
+#define  RXDMA_PRO_DMA_BURST_CNT	GENMASK(3, 2)	/* Set to 0x3. */
+#define  RXDMA_PRO_DMA_BURST_SIZE	GENMASK(5, 4)	/* Set to 0x1. */
 
 #define REG_RF_BB_CMD_ADDR		0x02c0
 #define REG_RF_BB_CMD_DATA		0x02c4
@@ -577,6 +582,7 @@ 
 #define REG_STBC_SETTING		0x04c4
 #define REG_QUEUE_CTRL			0x04c6
 #define REG_HT_SINGLE_AMPDU_8723B	0x04c7
+#define  HT_SINGLE_AMPDU_ENABLE		BIT(7)
 #define REG_PROT_MODE_CTRL		0x04c8
 #define REG_MAX_AGGR_NUM		0x04ca
 #define REG_RTS_MAX_AGGR_NUM		0x04cb