On 15/12/2022 15:00, Ping-Ke Shih wrote: > On Tue, 2022-12-13 at 19:31 +0200, Bitterblue Smith wrote: >> From: Jes Sorensen <Jes.Sorensen@xxxxxxxxx> >> >> This chip is found in cheap USB devices from TP-Link, D-Link, etc. >> >> Features: 2.4 GHz, b/g/n mode, 1T1R, 150 Mbps. >> >> Chip versions older than "I cut" need software rate control. That will >> be in the next commit. Until then MCS7 is used for all data frames. >> >> The "I cut" chips are not supported. They require different firmware >> and initialisation tables. Support can be added if someone has the >> hardware to test it. >> >> Co-developed-by: Andrea Merello <andrea.merello@xxxxxxxxx> >> Signed-off-by: Andrea Merello <andrea.merello@xxxxxxxxx> >> Co-developed-by: Taehee Yoo <ap420073@xxxxxxxxx> >> Signed-off-by: Taehee Yoo <ap420073@xxxxxxxxx> >> Signed-off-by: Jes Sorensen <Jes.Sorensen@xxxxxxxxx> >> Co-developed-by: Bitterblue Smith <rtl8821cerfe2@xxxxxxxxx> >> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@xxxxxxxxx> >> --- >> So this patch is 52 of the 57 patches found here, squashed together: >> https://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git/log/drivers/net/wireless/realtek/rtl8xxxu?h=rtl8xxxu-8188eu >> >> Starting from c3f84ded6f76 ("rtl8xxxu: Accept firmware signature 0x88e0") >> up to a9b05c059510 ("rtl8xxxu: Add rpt_sel entry to struct rtl8xxxu_rxdesc16"). >> >> These patches were not needed: >> 3170622ccb61 ("rtl8xxxu: Detect 8188eu parts correctly") >> 8fb5bc92bce0 ("rtl8xxxu: Initialize GPIO settings for 8188eu") >> 6ab646adb585 ("rtl8xxxu: Implement rtl8188e_set_tx_power()") >> 2ccd1f1fc480 ("rtl8xxxu: properly detect RTL8188EU devices") >> 809a2e000cab ("rtl8xxxu: Do not set auto rate fallback on 8188eu") >> >> On top of that, I made various changes required for today's kernel, >> plus changes to match the newer vendor driver more closely, plus some >> bug fixes. >> >> v2: >> - Implement suggestions from Ping-Ke Shih: >> - Add __packed to struct rtl8188eu_efuse. >> - Use u32p_replace_bits() in rtl8188eu_config_channel(). >> - Make fw_name const char*. >> - Use the masks defined in patch 3/5 in rtl8188e_cck_rssi(). >> - Use u32_get_bits() in assignment to bit field priv->pi_enabled. >> - Remove the efuse dumping code. It's not needed after patch 1/5. >> - Update the module description. >> --- >> drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- >> .../net/wireless/realtek/rtl8xxxu/Makefile | 3 +- >> .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 67 +- >> .../realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1286 +++++++++++++++++ >> .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 4 +- >> .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 201 ++- >> .../wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 40 +- >> 7 files changed, 1578 insertions(+), 25 deletions(-) >> create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c >> >> > > [...] > >> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h >> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h >> index 15bb2b5211a8..29f5dbee16b0 100644 >> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h >> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h >> @@ -36,6 +36,7 @@ >> >> #define TX_TOTAL_PAGE_NUM 0xf8 >> #define TX_TOTAL_PAGE_NUM_8188F 0xf7 >> +#define TX_TOTAL_PAGE_NUM_8188E 0xa9 >> #define TX_TOTAL_PAGE_NUM_8192E 0xf3 >> #define TX_TOTAL_PAGE_NUM_8723B 0xf7 >> /* (HPQ + LPQ + NPQ + PUBQ) = TX_TOTAL_PAGE_NUM */ >> @@ -49,6 +50,11 @@ >> #define TX_PAGE_NUM_LO_PQ_8188F 0x02 >> #define TX_PAGE_NUM_NORM_PQ_8188F 0x02 >> >> +#define TX_PAGE_NUM_PUBQ_8188E 0x47 >> +#define TX_PAGE_NUM_HI_PQ_8188E 0x29 >> +#define TX_PAGE_NUM_LO_PQ_8188E 0x1c >> +#define TX_PAGE_NUM_NORM_PQ_8188E 0x1c >> + >> #define TX_PAGE_NUM_PUBQ_8192E 0xe7 >> #define TX_PAGE_NUM_HI_PQ_8192E 0x08 >> #define TX_PAGE_NUM_LO_PQ_8192E 0x0c >> @@ -153,7 +159,8 @@ struct rtl8xxxu_rxdesc16 { >> u32 htc:1; >> u32 eosp:1; >> u32 bssidfit:2; >> - u32 reserved1:16; >> + u32 rpt_sel:2; /* 8188e */ >> + u32 reserved1:14; >> u32 unicastwake:1; >> u32 magicwake:1; >> >> @@ -211,7 +218,8 @@ struct rtl8xxxu_rxdesc16 { >> >> u32 magicwake:1; >> u32 unicastwake:1; >> - u32 reserved1:16; >> + u32 reserved1:14; >> + u32 rpt_sel:2; /* 8188e */ >> u32 bssidfit:2; >> u32 eosp:1; >> u32 htc:1; > > Missing __packed on this struct. > However, it has existed, so maybe you can review struct and > use another patch to add __packed. > Sure, I can add it later. There are several structs which technically should have __packed, but they happen to work anyway. > >> @@ -502,6 +510,8 @@ struct rtl8xxxu_txdesc40 { >> #define TXDESC_AMPDU_DENSITY_SHIFT 20 >> #define TXDESC40_BT_INT BIT(23) >> #define TXDESC40_GID_SHIFT 24 >> +#define TXDESC_ANTENNA_SELECT_A BIT(24) >> +#define TXDESC_ANTENNA_SELECT_B BIT(25) >> > > [...] > >> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c >> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c >> new file mode 100644 >> index 000000000000..587555da9bce >> --- /dev/null >> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c >> > > [...] > >> +static int rtl8188eu_identify_chip(struct rtl8xxxu_priv *priv) >> +{ >> + struct device *dev = &priv->udev->dev; >> + u32 sys_cfg, vendor; >> + int ret = 0; >> + >> + strscpy(priv->chip_name, "8188EU", sizeof(priv->chip_name)); >> + priv->rtl_chip = RTL8188E; >> + priv->rf_paths = 1; >> + priv->rx_paths = 1; >> + priv->tx_paths = 1; >> + priv->has_wifi = 1; >> + >> + sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); >> + priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK); >> + if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { >> + dev_info(dev, "Unsupported test chip\n"); >> + ret = -EOPNOTSUPP; >> + goto out; >> + } >> + >> + /* >> + * TODO: At a glance, I cut requires a different firmware, >> + * different initialisation tables, and no software rate >> + * control. The vendor driver is not configured to handle >> + * I cut chips by default. Are there any in the wild? >> + */ >> + if (priv->chip_cut == 8) { >> + dev_info(dev, "RTL8188EU cut I is not supported. Please complain about it at >> linux-wireless@xxxxxxxxxxxxxxx.\n"); >> + ret = -EOPNOTSUPP; >> + goto out; > > nit: Since you don't need any error handling, just return -EOPNOTSUPP; > Okay. > >> + } >> + >> + vendor = sys_cfg & SYS_CFG_VENDOR_ID; >> + rtl8xxxu_identify_vendor_1bit(priv, vendor); >> + >> + ret = rtl8xxxu_config_endpoints_no_sie(priv); >> + >> +out: >> + return ret; >> +} >> + > > [...] > >
