Message ID | 20230310035943.49020-1-pkshih@realtek.com |
---|---|
State | New |
Headers | show |
Series | wifi: rtw89: add counters of register-based H2C/C2H | expand |
Ping-Ke Shih <pkshih@realtek.com> writes: > The register-based H2C/C2H are used to exchange information between driver > and firmware, but only apply to narrow area because its data size is > smaller than regular packet-based H2C/C2H. > > This kind of H2C/C2H must be paired. To identify if any H2C/C2H is missing, > update counters to help diagnose this kind of problems. > > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> [...] > +static inline void > +rtw89_write8_mask_add(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 add) > +{ > + u32 shift; > + u8 orig, set; > + u8 data; > + > + mask &= 0xff; > + shift = __ffs(mask); > + > + orig = rtw89_read8(rtwdev, addr); > + data = ((orig & mask) >> shift) + add; > + set = (orig & ~mask) | ((data << shift) & mask); > + rtw89_write8(rtwdev, addr, set); > +} This function has a lot of shifting etc which feels like reinventing the wheel, doesn't linux/bitfield.h contain what you need? For example, u32_get_bits() and u32_replace_bits()?
> -----Original Message----- > From: Kalle Valo <kvalo@kernel.org> > Sent: Wednesday, March 15, 2023 5:52 PM > To: Ping-Ke Shih <pkshih@realtek.com> > Cc: linux-wireless@vger.kernel.org > Subject: Re: [PATCH] wifi: rtw89: add counters of register-based H2C/C2H > > Ping-Ke Shih <pkshih@realtek.com> writes: > > > The register-based H2C/C2H are used to exchange information between driver > > and firmware, but only apply to narrow area because its data size is > > smaller than regular packet-based H2C/C2H. > > > > This kind of H2C/C2H must be paired. To identify if any H2C/C2H is missing, > > update counters to help diagnose this kind of problems. > > > > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> > > [...] > > > +static inline void > > +rtw89_write8_mask_add(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 add) > > +{ > > + u32 shift; > > + u8 orig, set; > > + u8 data; > > + > > + mask &= 0xff; > > + shift = __ffs(mask); > > + > > + orig = rtw89_read8(rtwdev, addr); > > + data = ((orig & mask) >> shift) + add; > > + set = (orig & ~mask) | ((data << shift) & mask); > > + rtw89_write8(rtwdev, addr, set); > > +} > > This function has a lot of shifting etc which feels like reinventing the > wheel, doesn't linux/bitfield.h contain what you need? For example, > u32_get_bits() and u32_replace_bits()? > The mask argument of u32_get_bits() and his friends should be const, but our usage could be a variable. For now, we have only one use case that the mask is definitely const, but I remember it could lead some warning if we don't define this as 'static __always_inline'. My original thought to implement this function is rtw89_write8_mask_add(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 add) { u8 tmp; tmp = rtw89_read8_mask(rtwdev, addr, mask); tmp += add; rtw89_write8_mask(rtwdev, addr, mask, tmp); } But, this needs three IO (two reading and one writing IO), so I implement this a little odd patch. I'm thinking I can have another implementation that adds variables to maintain counters by driver, and then I only need existing rtw89_write8_mask() to update counters instead. Therefore, no need rtw89_write8_mask_add(). I will use this method by v2. Ping-Ke
Ping-Ke Shih <pkshih@realtek.com> writes: >> > + orig = rtw89_read8(rtwdev, addr); >> > + data = ((orig & mask) >> shift) + add; >> > + set = (orig & ~mask) | ((data << shift) & mask); >> > + rtw89_write8(rtwdev, addr, set); >> > +} >> >> This function has a lot of shifting etc which feels like reinventing the >> wheel, doesn't linux/bitfield.h contain what you need? For example, >> u32_get_bits() and u32_replace_bits()? >> > > The mask argument of u32_get_bits() and his friends should be const, but our > usage could be a variable. For now, we have only one use case that the mask is > definitely const, but I remember it could lead some warning if we don't define > this as 'static __always_inline'. > > > My original thought to implement this function is > > rtw89_write8_mask_add(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 add) > { > u8 tmp; > > tmp = rtw89_read8_mask(rtwdev, addr, mask); > tmp += add; > rtw89_write8_mask(rtwdev, addr, mask, tmp); > } > > But, this needs three IO (two reading and one writing IO), so I implement this > a little odd patch. > > > I'm thinking I can have another implementation that adds variables to maintain > counters by driver, and then I only need existing rtw89_write8_mask() to update > counters instead. Therefore, no need rtw89_write8_mask_add(). I will use this > method by v2. Sounds good, thanks!
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index b1a886898c5a0..804dd356c30e1 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -2938,8 +2938,10 @@ struct rtw89_chip_info { u32 txwd_body_size; u32 h2c_ctrl_reg; const u32 *h2c_regs; + struct rtw89_reg_def h2c_counter_reg; u32 c2h_ctrl_reg; const u32 *c2h_regs; + struct rtw89_reg_def c2h_counter_reg; const struct rtw89_page_regs *page_regs; bool cfo_src_fd; const struct rtw89_reg_def *dcfo_comp; @@ -4133,6 +4135,22 @@ rtw89_write8_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 data) rtw89_write8(rtwdev, addr, set); } +static inline void +rtw89_write8_mask_add(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 add) +{ + u32 shift; + u8 orig, set; + u8 data; + + mask &= 0xff; + shift = __ffs(mask); + + orig = rtw89_read8(rtwdev, addr); + data = ((orig & mask) >> shift) + add; + set = (orig & ~mask) | ((data << shift) & mask); + rtw89_write8(rtwdev, addr, set); +} + static inline u32 rtw89_read_rf(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, u32 addr, u32 mask) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 1a4ff24078fb9..4892c81b45f06 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -2601,6 +2601,8 @@ static int rtw89_fw_write_h2c_reg(struct rtw89_dev *rtwdev, for (i = 0; i < RTW89_H2CREG_MAX; i++) rtw89_write32(rtwdev, h2c_reg[i], info->h2creg[i]); + rtw89_write8_mask_add(rtwdev, chip->h2c_counter_reg.addr, + chip->h2c_counter_reg.mask, 1); rtw89_write8(rtwdev, chip->h2c_ctrl_reg, B_AX_H2CREG_TRIGGER); return 0; @@ -2633,6 +2635,9 @@ static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, info->content_len = (RTW89_GET_C2H_HDR_LEN(*info->c2hreg) << 2) - RTW89_C2HREG_HDR_LEN; + rtw89_write8_mask_add(rtwdev, chip->c2h_counter_reg.addr, + chip->c2h_counter_reg.mask, 1); + return 0; } diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c index 3d1e4ffef1b16..e060b0f9804c2 100644 --- a/drivers/net/wireless/realtek/rtw89/mac.c +++ b/drivers/net/wireless/realtek/rtw89/mac.c @@ -3398,6 +3398,8 @@ int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw) if (rtw89_read32(rtwdev, R_AX_PLATFORM_ENABLE) & B_AX_WCPU_EN) return -EFAULT; + rtw89_write32(rtwdev, R_AX_UDM1, 0); + rtw89_write32(rtwdev, R_AX_UDM2, 0); rtw89_write32(rtwdev, R_AX_HALT_H2C_CTRL, 0); rtw89_write32(rtwdev, R_AX_HALT_C2H_CTRL, 0); rtw89_write32(rtwdev, R_AX_HALT_H2C, 0); diff --git a/drivers/net/wireless/realtek/rtw89/reg.h b/drivers/net/wireless/realtek/rtw89/reg.h index 600257909df27..69170912cb846 100644 --- a/drivers/net/wireless/realtek/rtw89/reg.h +++ b/drivers/net/wireless/realtek/rtw89/reg.h @@ -207,6 +207,11 @@ #define R_AX_UDM0 0x01F0 #define R_AX_UDM1 0x01F4 +#define B_AX_UDM1_MASK GENMASK(31, 16) +#define B_AX_UDM1_HALMAC_C2H_ENQ_CNT_MASK GENMASK(15, 12) +#define B_AX_UDM1_HALMAC_H2C_DEQ_CNT_MASK GENMASK(11, 8) +#define B_AX_UDM1_WCPU_C2H_ENQ_CNT_MASK GENMASK(7, 4) +#define B_AX_UDM1_WCPU_H2C_DEQ_CNT_MASK GENMASK(3, 0) #define R_AX_UDM2 0x01F8 #define R_AX_UDM3 0x01FC diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c index 9c42b6abd2232..5f7e948507f8a 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c @@ -2131,9 +2131,11 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .h2c_desc_size = sizeof(struct rtw89_txwd_body), .txwd_body_size = sizeof(struct rtw89_txwd_body), .h2c_ctrl_reg = R_AX_H2CREG_CTRL, + .h2c_counter_reg = {R_AX_UDM1 + 1, B_AX_UDM1_HALMAC_H2C_DEQ_CNT_MASK >> 8}, .h2c_regs = rtw8852a_h2c_regs, .c2h_ctrl_reg = R_AX_C2HREG_CTRL, .c2h_regs = rtw8852a_c2h_regs, + .c2h_counter_reg = {R_AX_UDM1 + 1, B_AX_UDM1_HALMAC_C2H_ENQ_CNT_MASK >> 8}, .page_regs = &rtw8852a_page_regs, .cfo_src_fd = false, .dcfo_comp = &rtw8852a_dcfo_comp, diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c index 499ae0389c715..895d216cfa27b 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c @@ -2508,8 +2508,10 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .h2c_desc_size = sizeof(struct rtw89_txwd_body), .txwd_body_size = sizeof(struct rtw89_txwd_body), .h2c_ctrl_reg = R_AX_H2CREG_CTRL, + .h2c_counter_reg = {R_AX_UDM1 + 1, B_AX_UDM1_HALMAC_H2C_DEQ_CNT_MASK >> 8}, .h2c_regs = rtw8852b_h2c_regs, .c2h_ctrl_reg = R_AX_C2HREG_CTRL, + .c2h_counter_reg = {R_AX_UDM1 + 1, B_AX_UDM1_HALMAC_C2H_ENQ_CNT_MASK >> 8}, .c2h_regs = rtw8852b_c2h_regs, .page_regs = &rtw8852b_page_regs, .cfo_src_fd = true, diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c index 8af813132f71d..e8e577a1b9fc4 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c @@ -2867,8 +2867,10 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .h2c_desc_size = sizeof(struct rtw89_rxdesc_short), .txwd_body_size = sizeof(struct rtw89_txwd_body_v1), .h2c_ctrl_reg = R_AX_H2CREG_CTRL_V1, + .h2c_counter_reg = {R_AX_UDM1 + 1, B_AX_UDM1_HALMAC_H2C_DEQ_CNT_MASK >> 8}, .h2c_regs = rtw8852c_h2c_regs, .c2h_ctrl_reg = R_AX_C2HREG_CTRL_V1, + .c2h_counter_reg = {R_AX_UDM1 + 1, B_AX_UDM1_HALMAC_C2H_ENQ_CNT_MASK >> 8}, .c2h_regs = rtw8852c_c2h_regs, .page_regs = &rtw8852c_page_regs, .cfo_src_fd = false,
The register-based H2C/C2H are used to exchange information between driver and firmware, but only apply to narrow area because its data size is smaller than regular packet-based H2C/C2H. This kind of H2C/C2H must be paired. To identify if any H2C/C2H is missing, update counters to help diagnose this kind of problems. Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> --- drivers/net/wireless/realtek/rtw89/core.h | 18 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.c | 5 +++++ drivers/net/wireless/realtek/rtw89/mac.c | 2 ++ drivers/net/wireless/realtek/rtw89/reg.h | 5 +++++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 ++ 7 files changed, 36 insertions(+)