Revert "rtw88: no need to set registers for SDIO"
PATCH 1/1 Revert "rtw88: no need to set registers for SDIO"
From: Yan-Hsuan Chuang <[email protected]>
This reverts commit 07d0f5534935e2daf63a4e1012af13d68e089fed.
For rtw88 driver, the SDIO is going to be supported, so there is no need to remove the SDIO related power sequence settings. And while the power sequence parser will pass in the mask of the HCI, the SDIO part will not be used to set registers accordingly.
Moreover, the power sequence table is released as a whole package, so the next time if we are going to update, the SDIO settings will be overwritten. So, revert this now.
--- drivers/net/wireless/realtek/rtw88/rtw8723d.c | 40 ++++++++ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 95 +++++++++++++++++++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 20 ++++ 3 files changed, 155 insertions(+)
drivers/net/wireless/realtek/rtw88/rtw8723d.c +40 -0
@@ -2093,6 +2093,16 @@ static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8723d[] = {RTW_PWR_INTF_ALL_MSK ,RTW_PWR_ADDR_MAC , RTW_PWR_CMD_WRITE, BIT(3) | BIT(7), 0}, + {0x0086, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , + RTW_PWR_CMD_WRITE, BIT(0), 0}, + {0x0086, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , + RTW_PWR_CMD_POLLING, BIT(1), BIT(1)}, {0x004A,RTW_PWR_CUT_ALL_MSK , RTW_PWR_INTF_USB_MSK,
@@ -2103,6 +2113,11 @@ static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8723d[] = {RTW_PWR_INTF_ALL_MSK ,RTW_PWR_ADDR_MAC , RTW_PWR_CMD_WRITE, BIT(3) | BIT(4), 0}, + {0x0023, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_MAC , + RTW_PWR_CMD_WRITE, BIT(4), 0}, {0x0301,RTW_PWR_CUT_ALL_MSK , RTW_PWR_INTF_PCI_MSK,
@@ -2310,6 +2325,11 @@ static const struct rtw_pwr_seq_cmd trans_act_to_lps_8723d[] = {RTW_PWR_INTF_ALL_MSK ,RTW_PWR_ADDR_MAC , RTW_PWR_CMD_WRITE, BIT(1), 0}, + {0x0093, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_MAC , + RTW_PWR_CMD_WRITE, 0xFF, 0x00}, {0x0553,RTW_PWR_CUT_ALL_MSK , RTW_PWR_INTF_ALL_MSK,
@@ -2389,6 +2409,11 @@ static const struct rtw_pwr_seq_cmd trans_act_to_cardemu_8723d[] = { };static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8723d[] = { + {0x0007 , +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_MAC , +RTW_PWR_CMD_WRITE ,0xFF ,0x20 }, {0x0005 ,RTW_PWR_CUT_ALL_MSK ,RTW_PWR_INTF_USB_MSK |RTW_PWR_INTF_SDIO_MSK ,
@@ -2409,6 +2434,21 @@ static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8723d[] = {RTW_PWR_INTF_USB_MSK ,RTW_PWR_ADDR_MAC , RTW_PWR_CMD_WRITE, BIT(0), 1}, + {0x0023, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_MAC , + RTW_PWR_CMD_WRITE, BIT(4), BIT(4)}, + {0x0086, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , + RTW_PWR_CMD_WRITE, BIT(0), BIT(0)}, + {0x0086, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , + RTW_PWR_CMD_POLLING, BIT(1), 0}, {0xFFFF,RTW_PWR_CUT_ALL_MSK , RTW_PWR_INTF_ALL_MSK,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +95 -0
136 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/rtw8822c.c +20 -0
@@ -3563,6 +3563,16 @@ static void rtw8822c_pwr_track(struct rtw_dev *rtwdev) }static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822c[] = { + {0x0086 , +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , +RTW_PWR_CMD_WRITE ,BIT (0 ),0 }, + {0x0086 , +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , +RTW_PWR_CMD_POLLING ,BIT (1 ),BIT (1 )}, {0x002E ,RTW_PWR_CUT_ALL_MSK ,RTW_PWR_INTF_ALL_MSK ,
@@ -3773,6 +3783,11 @@ static const struct rtw_pwr_seq_cmd trans_act_to_cardemu_8822c[] = { };static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822c[] = { + {0x0005 , +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_MAC , +RTW_PWR_CMD_WRITE ,BIT (7 ),BIT (7 )}, {0x0007 ,RTW_PWR_CUT_ALL_MSK ,RTW_PWR_INTF_USB_MSK |RTW_PWR_INTF_SDIO_MSK ,
@@ -3818,6 +3833,11 @@ static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822c[] = {RTW_PWR_INTF_PCI_MSK ,RTW_PWR_ADDR_MAC , RTW_PWR_CMD_WRITE, BIT(2), BIT(2)}, + {0x0086, +RTW_PWR_CUT_ALL_MSK , +RTW_PWR_INTF_SDIO_MSK , +RTW_PWR_ADDR_SDIO , + RTW_PWR_CMD_WRITE, BIT(0), BIT(0)}, {0xFFFF,RTW_PWR_CUT_ALL_MSK , RTW_PWR_INTF_ALL_MSK,
Signature · 1 line
2.17.1
Quoted 9 lines · <[email protected]> writes:
From: Yan-Hsuan Chuang <[email protected]>
This reverts commit
07d0f5534935e2daf63a4e1012af13d68e089fed.For rtw88 driver, the SDIO is going to be supported, so there is no need to remove the SDIO related power sequence settings. And while the power sequence parser will pass in the mask of the HCI, the SDIO part will not be used to set registers accordingly.
Quoted 5 lines
Moreover, the power sequence table is released as a whole package, so the next time if we are going to update, the SDIO settings will be overwritten. So, revert this now.
Signed-off-by Yan-Hsuan Chuang <[email protected]>
Oops, I was supposed to drop that patch but somehow I did apply it anyway. Sorry about that, I'll apply this revert.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 12 lines
Quoted 9 lines · <[email protected]> writes:
From: Yan-Hsuan Chuang <[email protected]>
This reverts commit
07d0f5534935e2daf63a4e1012af13d68e089fed.For rtw88 driver, the SDIO is going to be supported, so there is no need to remove the SDIO related power sequence settings. And while the power sequence parser will pass in the mask of the HCI, the SDIO part will not be used to set registers accordingly.
Quoted 9 lines
Quoted 5 lines
Moreover, the power sequence table is released as a whole package, so the next time if we are going to update, the SDIO settings will be overwritten. So, revert this now.
Signed-off-by Yan-Hsuan Chuang <[email protected]>Oops, I was supposed to drop that patch but somehow I did apply it anyway. Sorry about that, I'll apply this revert.
It's fine :). Thanks.
Yan-Hsuan
Quoted 9 lines · <[email protected]> wrote:
From: Yan-Hsuan Chuang <[email protected]>
This reverts commit
07d0f5534935e2daf63a4e1012af13d68e089fed.For rtw88 driver, the SDIO is going to be supported, so there is no need to remove the SDIO related power sequence settings. And while the power sequence parser will pass in the mask of the HCI, the SDIO part will not be used to set registers accordingly.
Quoted 5 lines
Moreover, the power sequence table is released as a whole package, so the next time if we are going to update, the SDIO settings will be overwritten. So, revert this now.
Signed-off-by Yan-Hsuan Chuang <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
dba5a189bf61 Revert "rtw88: no need to set registers for SDIO"
Signature · 3 lines
https://patchwork.kernel.org/patch/11559339/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches