redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-12360-3 bcmdhd: fix bcmdhd blocks system suspend issue 

When enable WIFi and connected with AP, the system is unable to suspend.
root@imx6qdlsolo:~# echo standby > /sys/power/state
PM: Syncing filesystems ... done.
Freezing user space processes ... (elapsed 0.001 seconds) done.
Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
dhdsdio_isr: Enter
dhdsdio_isr: Enter
dhdsdio_isr: disable SDIO interrupts
Calling dhdsdio_dpc() from dhdsdio_isr
dhdsdio_dpc: Enter
dhdsdio_bussleep: request WAKE (currently SLEEP)

(Keypress still response here.... )

It's caused by Broadcom WiFi driver will keep handling SDIO irq even after
the driver is already suspended.
This weird behavior will block the MMC host suspend during its irq
synchronize operation in free_irq(), then the system suspend is blocked
too and hanged.

Add SDHCI_QUIRK2_SDIO_IRQ_THREAD for BCM WiFi to use kernel thread
to process sdio interrupts which won't block system suspend and process
freeze operation.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
pull/10/head
Dong Aisheng 2016-01-29 21:34:45 +08:00 committed by Jason Liu
parent 11fbafedac
commit e4035157c3
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
View File

@ -36,7 +36,7 @@ Optional properties:
cells which is useful for some special boards or cards when the default
tuning step can't find the proper delay window within limited tuning retries.
- wifi-host : assigned as a wifi host.
This is required for some WiFi cards to do card detect
This is required for Broadcom BCM WiFi cards to do card detect
Examples:

1
drivers/mmc/host/sdhci-esdhc-imx.c
View File

@ -1172,6 +1172,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
if (of_get_property(np, "wifi-host", NULL)) {
wifi_mmc_host = host->mmc;
host->quirks2 |= SDHCI_QUIRK2_SDIO_IRQ_THREAD;
dev_info(mmc_dev(host->mmc), "assigned as wifi host\n");
}

3
drivers/mmc/host/sdhci.c
View File

@ -3606,7 +3606,8 @@ int sdhci_setup_host(struct sdhci_host *host)
}
mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
if (!(host->quirks2 & SDHCI_QUIRK2_SDIO_IRQ_THREAD))
mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
host->flags |= SDHCI_AUTO_CMD12;

2
drivers/mmc/host/sdhci.h
View File

@ -437,6 +437,8 @@ struct sdhci_host {
#define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN (1<<15)
/* Controller has CRC in 136 bit Command Response */
#define SDHCI_QUIRK2_RSP_136_HAS_CRC (1<<16)
/* Host or Card can't support no thread sdio irq */
#define SDHCI_QUIRK2_SDIO_IRQ_THREAD (1<<17)
int irq; /* Device IRQ */
void __iomem *ioaddr; /* Mapped address */