UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() 

commit ab069ce125965a5e282f7b53b86aee76ab32975c upstream.

sdhci_check_ro() can call mmc_gpio_get_ro() while holding the sdhci
host->lock spinlock. That would be a problem if the GPIO access done by
mmc_gpio_get_ro() needed to sleep.

However, host->lock is not needed anyway. The mmc core ensures that host
operations do not race with each other, and asynchronous callbacks like the
interrupt handler, software timeouts, completion work etc, cannot affect
sdhci_check_ro().

So remove the locking.

Fixes: 6d5cd068ee ("mmc: sdhci: use WP GPIO in sdhci_check_ro()")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240614080051.4005-3-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Adrian Hunter 2024-06-14 11:00:50 +03:00 committed by Greg Kroah-Hartman
parent 3336979b6a
commit 7fb456c3c6
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2516,11 +2516,8 @@ EXPORT_SYMBOL_GPL(sdhci_get_cd_nogpio);
static int sdhci_check_ro(struct sdhci_host *host) static int sdhci_check_ro(struct sdhci_host *host)
{ {
bool allow_invert = false; bool allow_invert = false;
unsigned long flags;
int is_readonly; int is_readonly;
spin_lock_irqsave(&host->lock, flags);
if (host->flags & SDHCI_DEVICE_DEAD) { if (host->flags & SDHCI_DEVICE_DEAD) {
is_readonly = 0; is_readonly = 0;
} else if (host->ops->get_ro) { } else if (host->ops->get_ro) {
@ -2535,8 +2532,6 @@ static int sdhci_check_ro(struct sdhci_host *host)
allow_invert = true; allow_invert = true;
} }
spin_unlock_irqrestore(&host->lock, flags);
if (is_readonly >= 0 && if (is_readonly >= 0 &&
allow_invert && allow_invert &&
(host->quirks & SDHCI_QUIRK_INVERTED_WRITE_PROTECT)) (host->quirks & SDHCI_QUIRK_INVERTED_WRITE_PROTECT))