On Wed, Dec 28, 2022 at 12:30:20AM +0100, Martin Blumenstingl wrote: > Wire up RTL8821CS chipset support using the new rtw88 SDIO HCI code as > well as the existing RTL8821C chipset code. > Unfortunately, this doesn't work for me. I applied it on top of 6.2-rc2 master and I get errors during probe (it appears the firmware never loads). Relevant dmesg logs are as follows: [ 0.989545] mmc2: new high speed SDIO card at address 0001 [ 0.989993] rtw_8821cs mmc2:0001:1: Firmware version 24.8.0, H2C version 12 [ 1.005684] rtw_8821cs mmc2:0001:1: sdio write32 failed (0x14): -110 [ 1.005737] rtw_8821cs mmc2:0001:1: sdio read32 failed (0x1080): -110 [ 1.005789] rtw_8821cs mmc2:0001:1: sdio write32 failed (0x11080): -110 [ 1.005840] rtw_8821cs mmc2:0001:1: sdio read8 failed (0x3): -110 [ 1.005920] rtw_8821cs mmc2:0001:1: sdio read8 failed (0x1103): -110 [ 1.005998] rtw_8821cs mmc2:0001:1: sdio read32 failed (0x80): -110 [ 1.006078] rtw_8821cs mmc2:0001:1: sdio read32 failed (0x1700): -110 The error of "sdio read32 failed (0x1700): -110" then repeats several hundred times, then I get this: [ 1.066294] rtw_8821cs mmc2:0001:1: failed to download firmware [ 1.066367] rtw_8821cs mmc2:0001:1: sdio read16 failed (0x80): -110 [ 1.066417] rtw_8821cs mmc2:0001:1: sdio read8 failed (0x100): -110 [ 1.066697] rtw_8821cs mmc2:0001:1: failed to setup chip efuse info [ 1.066703] rtw_8821cs mmc2:0001:1: failed to setup chip information [ 1.066839] rtw_8821cs: probe of mmc2:0001:1 failed with error -16 The hardware I am using is an rtl8821cs that I can confirm was working with a previous driver. Thank you. > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> > --- > drivers/net/wireless/realtek/rtw88/Kconfig | 11 ++++++ > drivers/net/wireless/realtek/rtw88/Makefile | 3 ++ > .../net/wireless/realtek/rtw88/rtw8821cs.c | 34 +++++++++++++++++++ > 3 files changed, 48 insertions(+) > create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821cs.c > > diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig > index 6b65da81127f..29eb2f8e0eb7 100644 > --- a/drivers/net/wireless/realtek/rtw88/Kconfig > +++ b/drivers/net/wireless/realtek/rtw88/Kconfig > @@ -133,6 +133,17 @@ config RTW88_8821CE > > 802.11ac PCIe wireless network adapter > > +config RTW88_8821CS > + tristate "Realtek 8821CS SDIO wireless network adapter" > + depends on MMC > + select RTW88_CORE > + select RTW88_SDIO > + select RTW88_8821C > + help > + Select this option will enable support for 8821CS chipset > + > + 802.11ac SDIO wireless network adapter > + > config RTW88_8821CU > tristate "Realtek 8821CU USB wireless network adapter" > depends on USB > diff --git a/drivers/net/wireless/realtek/rtw88/Makefile b/drivers/net/wireless/realtek/rtw88/Makefile > index 6105c2745bda..82979b30ae8d 100644 > --- a/drivers/net/wireless/realtek/rtw88/Makefile > +++ b/drivers/net/wireless/realtek/rtw88/Makefile > @@ -59,6 +59,9 @@ rtw88_8821c-objs := rtw8821c.o rtw8821c_table.o > obj-$(CONFIG_RTW88_8821CE) += rtw88_8821ce.o > rtw88_8821ce-objs := rtw8821ce.o > > +obj-$(CONFIG_RTW88_8821CS) += rtw88_8821cs.o > +rtw88_8821cs-objs := rtw8821cs.o > + > obj-$(CONFIG_RTW88_8821CU) += rtw88_8821cu.o > rtw88_8821cu-objs := rtw8821cu.o > > diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c > new file mode 100644 > index 000000000000..61f82b38cda4 > --- /dev/null > +++ b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c > @@ -0,0 +1,34 @@ > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > +// Copyright(c) Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> > + > +#include <linux/mmc/sdio_func.h> > +#include <linux/mmc/sdio_ids.h> > +#include <linux/module.h> > +#include "sdio.h" > +#include "rtw8821c.h" > + > +static const struct sdio_device_id rtw_8821cs_id_table[] = { > + { > + SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, > + SDIO_DEVICE_ID_REALTEK_RTW8821CS), > + .driver_data = (kernel_ulong_t)&rtw8821c_hw_spec, > + }, > + {} > +}; > +MODULE_DEVICE_TABLE(sdio, rtw_8821cs_id_table); > + > +static struct sdio_driver rtw_8821cs_driver = { > + .name = "rtw_8821cs", > + .probe = rtw_sdio_probe, > + .remove = rtw_sdio_remove, > + .id_table = rtw_8821cs_id_table, > + .drv = { > + .pm = &rtw_sdio_pm_ops, > + .shutdown = rtw_sdio_shutdown, > + } > +}; > +module_sdio_driver(rtw_8821cs_driver); > + > +MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>"); > +MODULE_DESCRIPTION("Realtek 802.11ac wireless 8821cs driver"); > +MODULE_LICENSE("Dual BSD/GPL"); > -- > 2.39.0 >