Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 616c6695 authored by Chevron Li's avatar Chevron Li Committed by Greg Kroah-Hartman
Browse files

mmc: sdhci-pci-o2micro: fix card detect fail issue caused by CD# debounce timeout 



commit 096cc0cddf58232bded309336961784f1d1c85f8 upstream.

The SD card is recognized failed sometimes when resume from suspend.
Because CD# debounce time too long then card present report wrong.
Finally, card is recognized failed.

Signed-off-by: default avatarChevron Li <chevron.li@bayhubtech.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221104095512.4068-1-chevron.li@bayhubtech.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 076712ff

drivers/mmc/host/sdhci-pci-o2micro.c

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define O2_SD_CAPS		0xE0

#define O2_SD_ADMA1		0xE2

#define O2_SD_ADMA2		0xE7

#define O2_SD_MISC_CTRL2	0xF0

#define O2_SD_INF_MOD		0xF1

#define O2_SD_MISC_CTRL4	0xFC

#define O2_SD_TUNING_CTRL	0x300
@@ -777,6 +778,12 @@ int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) 
		/* Set Tuning Windows to 5 */

		pci_write_config_byte(chip->pdev,

				O2_SD_TUNING_CTRL, 0x55);

		//Adjust 1st and 2nd CD debounce time

		pci_read_config_dword(chip->pdev, O2_SD_MISC_CTRL2, &scratch_32);

		scratch_32 &= 0xFFE7FFFF;

		scratch_32 |= 0x00180000;

		pci_write_config_dword(chip->pdev, O2_SD_MISC_CTRL2, scratch_32);

		pci_write_config_dword(chip->pdev, O2_SD_DETECT_SETTING, 1);

		/* Lock WP */

		ret = pci_read_config_byte(chip->pdev,

					   O2_SD_LOCK_WP, &scratch);