Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kernel_samsung_a53x/drivers/mmc/host
History
Adrian Hunter 94e1fafb53 mmc: sdhci: Do not invert write-protect twice 
commit fbd64f902b93fe9658b855b9892ae59ef6ea22b9 upstream.

mmc_of_parse() reads device property "wp-inverted" and sets
MMC_CAP2_RO_ACTIVE_HIGH if it is true. MMC_CAP2_RO_ACTIVE_HIGH is used
to invert a write-protect (AKA read-only) GPIO value.

sdhci_get_property() also reads "wp-inverted" and sets
SDHCI_QUIRK_INVERTED_WRITE_PROTECT which is used to invert the
write-protect value as well but also acts upon a value read out from the
SDHCI_PRESENT_STATE register.

Many drivers call both mmc_of_parse() and sdhci_get_property(),
so that both MMC_CAP2_RO_ACTIVE_HIGH and
SDHCI_QUIRK_INVERTED_WRITE_PROTECT will be set if the controller has
device property "wp-inverted".

Amend the logic in sdhci_check_ro() to allow for that possibility,
so that the write-protect value is not inverted twice.

Also do not invert the value if it is a negative error value. Note that
callers treat an error the same as not-write-protected, so the result is
functionally the same in that case.

Also do not invert the value if sdhci host operation ->get_ro() is used.
None of the users of that callback set SDHCI_QUIRK_INVERTED_WRITE_PROTECT
directly or indirectly, but two do call mmc_gpio_get_ro(), so leave it to
them to deal with that if they ever set SDHCI_QUIRK_INVERTED_WRITE_PROTECT
in the future.

Fixes: 6d5cd068ee59 ("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-2-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-11-19 14:19:33 +01:00
..
alcor.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
android-goldfish.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
atmel-mci.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
au1xmmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
bcm2835.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cavium-octeon.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cavium-thunderx.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cavium.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cavium.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cb710-mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cb710-mmc.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cqhci-core.c mmc: cqhci: Fix task clearing in CQE error recovery 2024-11-18 12:11:16 +01:00
cqhci-crypto.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cqhci-crypto.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
cqhci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
davinci_mmc.c mmc: davinci: Don't strip remove function when driver is builtin 2024-11-19 14:19:01 +01:00
dw_mmc-bluefield.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-exynos.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-exynos.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-hi3798cv200.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-k3.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-pci.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-pltfm.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-pltfm.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-rockchip.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-zx.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc-zx.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
dw_mmc.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
jz4740_mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
Kconfig mmc: sdhci_omap: Fix TI SoC dependencies 2024-11-18 12:12:43 +01:00
Makefile Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
meson-gx-mmc.c mmc: meson-gx: Remove setting of CMD_CFG_ERROR 2024-11-18 11:43:25 +01:00
meson-mx-sdhc-clkc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
meson-mx-sdhc-mmc.c mmc: meson-mx-sdhc: Fix initialization frozen issue 2024-11-18 12:12:08 +01:00
meson-mx-sdhc.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
meson-mx-sdio.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc-sec-feature.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc-sec-feature.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc-sec-sysfs.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc-sec-sysfs.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc_hsq.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc_hsq.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmc_spi.c mmc: mmc_spi: remove custom DMA mapped buffers 2024-11-18 12:12:58 +01:00
mmci.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmci_qcom_dml.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mmci_stm32_sdmmc.c mmc: mmci: stm32: fix DMA API overlapping mappings warning 2024-11-18 23:19:34 +01:00
moxart-mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mtk-sd.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mvsdio.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mvsdio.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mxcmmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
mxs-mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
of_mmc_spi.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
omap.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
omap_hsmmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
owl-mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
pxamci.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
pxamci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
renesas_sdhi.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
renesas_sdhi_core.c mmc: renesas_sdhi: use custom mask for TMIO_MASK_ALL 2024-11-18 10:58:28 +01:00
renesas_sdhi_internal_dmac.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
renesas_sdhi_sys_dmac.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
rtsx_pci_sdmmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
rtsx_usb_sdmmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
s3cmci.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
s3cmci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-acpi.c mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A 2024-11-19 12:27:18 +01:00
sdhci-bcm-kona.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-brcmstb.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-cadence.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-cns3xxx.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-cqhci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-dove.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-esdhc-imx.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-esdhc-mcf.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-esdhc.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-iproc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-milbeaut.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-msm.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-arasan.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-aspeed.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-at91.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-dwcmshc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-esdhc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-hlwd.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-of-sparx5.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-omap.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pci-arasan.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pci-core.c mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos 2024-11-19 14:19:33 +01:00
sdhci-pci-data.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pci-dwc-mshc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pci-gli.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pci-o2micro.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pic32.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pltfm.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pltfm.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pxav2.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-pxav3.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-s3c.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-sirf.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-spear.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-sprd.c mmc: sdhci-sprd: Fix eMMC init failure after hw reset 2024-11-18 12:12:08 +01:00
sdhci-st.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-tegra.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-xenon-phy.c mmc: sdhci-xenon: fix PHY init clock stability 2024-11-18 23:18:29 +01:00
sdhci-xenon.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci-xenon.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci.c mmc: sdhci: Do not invert write-protect twice 2024-11-19 14:19:33 +01:00
sdhci.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci_am654.c mmc: sdhci_am654: Fix ITAPDLY for HS400 timing 2024-11-19 12:27:05 +01:00
sdhci_f_sdh30.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdhci_f_sdh30.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sdricoh_cs.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sh_mmcif.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
sunxi-mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
tifm_sd.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
tmio_mmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
tmio_mmc.h mmc: renesas_sdhi: use custom mask for TMIO_MASK_ALL 2024-11-18 10:58:28 +01:00
tmio_mmc_core.c mmc: tmio: avoid concurrent runs of mmc_request_done() 2024-11-19 09:22:17 +01:00
toshsd.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
toshsd.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
uniphier-sd.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
usdhi6rol0.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
ushc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
via-sdmmc.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
vub300.c mmc: vub300: fix an error code 2024-11-18 11:43:22 +01:00
wbsd.c Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
wbsd.h Import A536BXXU9EXDC 2024-06-15 16:02:09 -03:00
wmt-sdmmc.c mmc: wmt-sdmmc: remove an incorrect release_mem_region() call in the .remove function 2024-11-19 08:44:48 +01:00