shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

sdio: optimize sdio suspend/resume [1/1]

Browse Source 
PD#SWPL-16036

Problem:
When the system starts up, wifi is turned on.
When we manually turn off wifi and start the
suspend & resume operation, we will find that
the sdio error is reported when we wake up

Solution:
Add the sdio_notify() interface to notify the
sdio controller when wifi is on/off, enabling
the keep_power standard to be configured when suspend.

Verify:
TL1

Change-Id: I48e0c31bf7ea80d3efd4b0d41b4af378e859dc15
Signed-off-by: Nan Li <nan.li@amlogic.com>
This commit is contained in:
Nan Li
2019-11-01 16:39:14 +08:00
committed by Luke Go
parent bd649ddc4c
commit c2eccd3ff2
7 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/amlogic/mmc/aml_sd_emmc_v3.c
View File

@@ -251,6 +251,10 @@ static int meson_mmc_clk_set_rate_v3(struct mmc_host *mmc,
writel(vcfg, host->base + SD_EMMC_CFG);
pdata->stop_clk = 1;
}
if (!clk_ios) {
mmc->actual_clock = clk_ios;
return 0;
}
if (aml_card_type_mmc(pdata)) {
if ((clk_ios >= 200000000) && conf->ddr) {

14
drivers/amlogic/mmc/amlsd.c
View File

@@ -331,6 +331,20 @@ void sdio_reinit(void)
}
EXPORT_SYMBOL(sdio_reinit);
void sdio_notify(int on)
{
if (sdio_host) {
if (sdio_host->card) {
if (on)
sdio_host->wifi_down_f = 0;
else
sdio_host->wifi_down_f = 1;
}
}
pr_info("[%s] finish\n", __func__);
}
EXPORT_SYMBOL(sdio_notify);
void of_amlsd_pwr_prepare(struct amlsd_platform *pdata)
{
}

1
drivers/amlogic/mmc/amlsd_of.c
View File

@@ -57,7 +57,6 @@ static const struct sd_caps host_caps[] = {
SD_CAPS(MMC_CAP_CMD23, "MMC_CAP_CMD23"),
SD_CAPS(MMC_CAP_HW_RESET, "MMC_CAP_HW_RESET"),
SD_CAPS(MMC_CAP_AGGRESSIVE_PM, "MMC_CAP_AGGRESSIVE_PM"),
SD_CAPS(MMC_PM_KEEP_POWER, "MMC_PM_KEEP_POWER"),
};
static int amlsd_get_host_caps(struct device_node *of_node,

2
drivers/amlogic/wifi/wifi_dt.c
View File

@@ -214,6 +214,7 @@ static void usb_power_control(int is_power, int shift)
if (!usb_power) {
set_wifi_power(is_power);
WIFI_INFO("Set %s power on !\n", (shift ? "WiFi":"BT"));
sdio_notify(1);
sdio_reinit();
}
usb_power |= (1 << shift);
@@ -223,6 +224,7 @@ static void usb_power_control(int is_power, int shift)
if (!usb_power) {
set_wifi_power(is_power);
WIFI_INFO("Set %s power down\n", (shift ? "WiFi":"BT"));
sdio_notify(0);
}
}
mutex_unlock(&wifi_bt_mutex);

3
drivers/mmc/core/sdio.c
View File

@@ -919,6 +919,9 @@ static int mmc_sdio_suspend(struct mmc_host *host)
{
mmc_claim_host(host);
if (host->wifi_down_f)
host->pm_flags |= MMC_PM_KEEP_POWER;
if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host))
sdio_disable_wide(host->card);

1
include/linux/amlogic/wifi_dt.h
View File

@@ -19,6 +19,7 @@
#define _wifi_dt_h_
extern void sdio_reinit(void);
void sdio_notify(int on);
extern char *get_wifi_inf(void);
void extern_wifi_set_enable(int is_on);

1
include/linux/mmc/host.h
View File

@@ -229,6 +229,7 @@ struct mmc_host {
unsigned int f_init;
#ifdef CONFIG_AMLOGIC_MMC
u8 first_init_flag;
int wifi_down_f;
#endif
u32 ocr_avail;
u32 ocr_avail_sdio; /* SDIO-specific OCR */