> -----Original Message----- > From: Martin Blumenstingl [mailto:martin.blumenstingl@xxxxxxxxxxxxxx] > Sent: Sunday, July 18, 2021 4:41 AM > To: linux-wireless@xxxxxxxxxxxxxxx > Cc: tony0620emma@xxxxxxxxx; kvalo@xxxxxxxxxxxxxx; johannes@xxxxxxxxxxxxxxxx; netdev@xxxxxxxxxxxxxxx; > linux-kernel@xxxxxxxxxxxxxxx; Neo Jou; Jernej Skrabec; Martin Blumenstingl > Subject: [PATCH RFC v1 2/7] rtw88: Use rtw_iterate_vifs where the iterator reads or writes registers > > Upcoming SDIO support may sleep in the read/write handlers. Switch > all users of rtw_iterate_vifs_atomic() which are either reading or > writing a register to rtw_iterate_vifs(). > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> > --- > drivers/net/wireless/realtek/rtw88/main.c | 6 +++--- > drivers/net/wireless/realtek/rtw88/ps.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c > index c6364837e83b..207161a8f5bd 100644 > --- a/drivers/net/wireless/realtek/rtw88/main.c > +++ b/drivers/net/wireless/realtek/rtw88/main.c > @@ -229,8 +229,8 @@ static void rtw_watch_dog_work(struct work_struct *work) > rtw_phy_dynamic_mechanism(rtwdev); > > data.rtwdev = rtwdev; > - /* use atomic version to avoid taking local->iflist_mtx mutex */ > - rtw_iterate_vifs_atomic(rtwdev, rtw_vif_watch_dog_iter, &data); > + > + rtw_iterate_vifs(rtwdev, rtw_vif_watch_dog_iter, &data); You revert the fix of [1]. I think we can move out rtw_chip_cfg_csi_rate() from rtw_dynamic_csi_rate(), and add/set a field cfg_csi_rate to itera data. Then, we do rtw_chip_cfg_csi_rate() outside iterate function. Therefore, we can keep the atomic version of iterate_vifs. [1] https://lore.kernel.org/linux-wireless/1556886547-23632-1-git-send-email-sgruszka@xxxxxxxxxx/ -- Ping-Ke
