> On Fri, Dec 20, 2019 at 5:22 PM <yhchuang@xxxxxxxxxxx> wrote:
> >
> > From: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
> >
> > The hardware value of secondary channel offset isn't very intuitive. This
> > commit adds enumeration, so we can easier to check the logic with the
> > suffix of enumeration name, likes _UPPER or _LOWER.
> >
> > Signed-off-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
> > Signed-off-by: Yan-Hsuan Chuang <yhchuang@xxxxxxxxxxx>
> > ---
> > drivers/net/wireless/realtek/rtw88/mac.c | 6 +++---
> > drivers/net/wireless/realtek/rtw88/main.c | 14 +++++++-------
> > drivers/net/wireless/realtek/rtw88/main.h | 10 ++++++++++
> > drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +-
> > drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
> > 5 files changed, 22 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/net/wireless/realtek/rtw88/mac.c
> b/drivers/net/wireless/realtek/rtw88/mac.c
> > index ed9bb427ba60..94d1b179e2e1 100644
> > --- a/drivers/net/wireless/realtek/rtw88/mac.c
> > +++ b/drivers/net/wireless/realtek/rtw88/mac.c
> > @@ -17,10 +17,10 @@ void rtw_set_channel_mac(struct rtw_dev *rtwdev,
> u8 channel, u8 bw,
> >
> > txsc20 = primary_ch_idx;
> > if (bw == RTW_CHANNEL_WIDTH_80) {
> > - if (txsc20 == 1 || txsc20 == 3)
> > - txsc40 = 9;
> > + if (txsc20 == RTW_SC_20_UPPER || txsc20 ==
> RTW_SC_20_UPPERST)
> > + txsc40 = RTW_SC_40_UPPER;
> > else
> > - txsc40 = 10;
> > + txsc40 = RTW_SC_40_LOWER;
> > }
> > rtw_write8(rtwdev, REG_DATA_SC,
> > BIT_TXSC_20M(txsc20) | BIT_TXSC_40M(txsc40));
> > diff --git a/drivers/net/wireless/realtek/rtw88/main.c
> b/drivers/net/wireless/realtek/rtw88/main.c
> > index f369ddca953a..cc61c390226c 100644
> > --- a/drivers/net/wireless/realtek/rtw88/main.c
> > +++ b/drivers/net/wireless/realtek/rtw88/main.c
> > @@ -333,10 +333,10 @@ void rtw_get_channel_params(struct
> cfg80211_chan_def *chandef,
> > bandwidth = RTW_CHANNEL_WIDTH_80;
> > if (primary_freq > center_freq) {
> > if (primary_freq - center_freq == 10) {
> > - primary_chan_idx = 1;
> > + primary_chan_idx =
> RTW_SC_20_UPPER;
> > center_chan -= 2;
> > } else {
> > - primary_chan_idx = 3;
> > + primary_chan_idx =
> RTW_SC_20_UPPERST;
> > center_chan -= 6;
> > }
> > /* assign the center channel used
> > @@ -345,10 +345,10 @@ void rtw_get_channel_params(struct
> cfg80211_chan_def *chandef,
> > cch_by_bw[RTW_CHANNEL_WIDTH_40] =
> center_chan + 4;
> > } else {
> > if (center_freq - primary_freq == 10) {
> > - primary_chan_idx = 2;
> > + primary_chan_idx =
> RTW_SC_20_LOWER;
> > center_chan += 2;
> > } else {
> > - primary_chan_idx = 4;
> > + primary_chan_idx =
> RTW_SC_20_LOWEST;
> > center_chan += 6;
> > }
> > /* assign the center channel used
> > diff --git a/drivers/net/wireless/realtek/rtw88/main.h
> b/drivers/net/wireless/realtek/rtw88/main.h
> > index d012eefcd0da..144fbab38fd5 100644
> > --- a/drivers/net/wireless/realtek/rtw88/main.h
> > +++ b/drivers/net/wireless/realtek/rtw88/main.h
> > @@ -95,6 +95,16 @@ enum rtw_bandwidth {
> > RTW_CHANNEL_WIDTH_10 = 6,
> > };
> >
> > +enum rtw_sc_offset {
> > + RTW_SC_DONT_CARE = 0,
> > + RTW_SC_20_UPPER = 1,
> > + RTW_SC_20_LOWER = 2,
> > + RTW_SC_20_UPPERST = 3,
>
> I'll suppgest RTW_SC_20_UPMOST instead or simply RTW_SC_20_UPPEREST.
>
OK, that makes sense :)
Yan-Hsuan
