From 07d0f5534935e2daf63a4e1012af13d68e089fed Mon Sep 17 00:00:00 2001
From: Kevin Lo <kevlo@kevlo.org>
Date: Fri, 15 May 2020 14:11:53 +0800
Subject: [PATCH] rtw88: no need to set registers for SDIO
Git-commit: 07d0f5534935e2daf63a4e1012af13d68e089fed
Patch-mainline: v5.8-rc1
References: jsc#SLE-13430, bsc#1176741
There's no need to set SDIO related registers when powering up/down the chip.
Signed-off-by: Kevin Lo <kevlo@kevlo.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200515061153.GA15714@ns.kevlo.org
Acked-by: Takashi Iwai <tiwai@suse.de>
---
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 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 7422baf2d41b..8641ea645c4b 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -2093,16 +2093,6 @@ 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,
@@ -2113,11 +2103,6 @@ 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,
@@ -2325,11 +2310,6 @@ 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,
@@ -2409,11 +2389,6 @@ 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,
@@ -2434,21 +2409,6 @@ 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,
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index e49bdd76ab9a..6abcdf4070a2 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -1551,16 +1551,6 @@ static void rtw8822b_bf_config_bfee(struct rtw_dev *rtwdev, struct rtw_vif *vif,
}
static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822b[] = {
- {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,
@@ -1689,11 +1679,6 @@ static const struct rtw_pwr_seq_cmd trans_cardemu_to_act_8822b[] = {
RTW_PWR_INTF_ALL_MSK,
RTW_PWR_ADDR_MAC,
RTW_PWR_CMD_WRITE, 0xFF, 0x0c},
- {0x0068,
- RTW_PWR_CUT_C_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(4), BIT(4)},
{0x0029,
RTW_PWR_CUT_ALL_MSK,
RTW_PWR_INTF_ALL_MSK,
@@ -1722,11 +1707,6 @@ static const struct rtw_pwr_seq_cmd trans_cardemu_to_act_8822b[] = {
};
static const struct rtw_pwr_seq_cmd trans_act_to_cardemu_8822b[] = {
- {0x0003,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(2), 0},
{0x0093,
RTW_PWR_CUT_ALL_MSK,
RTW_PWR_INTF_ALL_MSK,
@@ -1795,11 +1775,6 @@ static const struct rtw_pwr_seq_cmd trans_act_to_cardemu_8822b[] = {
};
static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822b[] = {
- {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,
@@ -1820,46 +1795,6 @@ static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822b[] = {
RTW_PWR_INTF_USB_MSK,
RTW_PWR_ADDR_MAC,
RTW_PWR_CMD_WRITE, BIT(0), 0},
- {0x0067,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(5), 0},
- {0x0067,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(4), 0},
- {0x004F,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(0), 0},
- {0x0067,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(1), 0},
- {0x0046,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(6), BIT(6)},
- {0x0067,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(2), 0},
- {0x0046,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(7), BIT(7)},
- {0x0062,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_MAC,
- RTW_PWR_CMD_WRITE, BIT(4), BIT(4)},
{0x0081,
RTW_PWR_CUT_ALL_MSK,
RTW_PWR_INTF_ALL_MSK,
@@ -1870,41 +1805,11 @@ static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822b[] = {
RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,
RTW_PWR_ADDR_MAC,
RTW_PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3)},
- {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},
{0x0090,
RTW_PWR_CUT_ALL_MSK,
RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_PCI_MSK,
RTW_PWR_ADDR_MAC,
RTW_PWR_CMD_WRITE, BIT(1), 0},
- {0x0044,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_SDIO,
- RTW_PWR_CMD_WRITE, 0xFF, 0},
- {0x0040,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_SDIO,
- RTW_PWR_CMD_WRITE, 0xFF, 0x90},
- {0x0041,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_SDIO,
- RTW_PWR_CMD_WRITE, 0xFF, 0x00},
- {0x0042,
- RTW_PWR_CUT_ALL_MSK,
- RTW_PWR_INTF_SDIO_MSK,
- RTW_PWR_ADDR_SDIO,
- RTW_PWR_CMD_WRITE, 0xFF, 0x04},
{0xFFFF,
RTW_PWR_CUT_ALL_MSK,
RTW_PWR_INTF_ALL_MSK,
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 5e4cc57dbd7c..fe995bb4e43e 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -3563,16 +3563,6 @@ 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,
@@ -3783,11 +3773,6 @@ 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,
@@ -3833,11 +3818,6 @@ 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,
--
2.16.4