This reverts commit 235b630eda072d7e7b102ab346d6b8a2c028a772.

This commit was found responsible for issues with SD card recognition,
as users had to re-insert their cards in the readers and wait for a
while. As for some people the SD card was involved in the boot process
it also caused boot failures.

Cc: stable@vger.kernel.org
Link: https://bbs.archlinux.org/viewtopic.php?id=303321
Fixes: 235b630eda07 ("drivers/card_reader/rtsx_usb: Restore interrupt based detection")
Reported-by: qf <quintafeira@tutanota.com>
Closes: https://lore.kernel.org/all/1de87dfa-1e81-45b7-8dcb-ad86c21d5352@heusel.eu
Signed-off-by: Christian Heusel <christian@heusel.eu>
---
 drivers/misc/cardreader/rtsx_usb.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/misc/cardreader/rtsx_usb.c b/drivers/misc/cardreader/rtsx_usb.c
index e0174da5e9fc39ae96b70ce70d57a87dfaa2ebdb..77b0490a1b38d79134d48020bd49a9fa6f0df967 100644
--- a/drivers/misc/cardreader/rtsx_usb.c
+++ b/drivers/misc/cardreader/rtsx_usb.c
@@ -286,7 +286,6 @@ static int rtsx_usb_get_status_with_bulk(struct rtsx_ucr *ucr, u16 *status)
 int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status)
 {
 	int ret;
-	u8 interrupt_val = 0;
 	u16 *buf;

 	if (!status)
@@ -309,20 +308,6 @@ int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status)
 		ret = rtsx_usb_get_status_with_bulk(ucr, status);
 	}

-	rtsx_usb_read_register(ucr, CARD_INT_PEND, &interrupt_val);
-	/* Cross check presence with interrupts */
-	if (*status & XD_CD)
-		if (!(interrupt_val & XD_INT))
-			*status &= ~XD_CD;
-
-	if (*status & SD_CD)
-		if (!(interrupt_val & SD_INT))
-			*status &= ~SD_CD;
-
-	if (*status & MS_CD)
-		if (!(interrupt_val & MS_INT))
-			*status &= ~MS_CD;
-
 	/* usb_control_msg may return positive when success */
 	if (ret < 0)
 		return ret;

---
base-commit: d082ecbc71e9e0bf49883ee4afd435a77a5101b6
change-id: 20250224-revert-sdcard-patch-f7a7453d4d8a

Best regards,
--
Christian Heusel <christian@heusel.eu>

On 25/02/24 09:32AM, Christian Heusel wrote:
> This reverts commit 235b630eda072d7e7b102ab346d6b8a2c028a772.
> 
> This commit was found responsible for issues with SD card recognition,
> as users had to re-insert their cards in the readers and wait for a
> while. As for some people the SD card was involved in the boot process
> it also caused boot failures.
> 
> Cc: stable@vger.kernel.org
> Link: https://bbs.archlinux.org/viewtopic.php?id=303321
> Fixes: 235b630eda07 ("drivers/card_reader/rtsx_usb: Restore interrupt based detection")
> Reported-by: qf <quintafeira@tutanota.com>
> Closes: https://lore.kernel.org/all/1de87dfa-1e81-45b7-8dcb-ad86c21d5352@heusel.eu
> Signed-off-by: Christian Heusel <christian@heusel.eu>

Hey Arnd, hey greg,

could one of you pick this up? Sean said in the other thread that going
with the revert for now seems like the best option and that he'll
revisit this once he has time...

Cheers,
chris

On Thu, Feb 27, 2025 at 02:40:04PM +0100, Christian Heusel wrote:
> On 25/02/24 09:32AM, Christian Heusel wrote:
> > This reverts commit 235b630eda072d7e7b102ab346d6b8a2c028a772.
> > 
> > This commit was found responsible for issues with SD card recognition,
> > as users had to re-insert their cards in the readers and wait for a
> > while. As for some people the SD card was involved in the boot process
> > it also caused boot failures.
> > 
> > Cc: stable@vger.kernel.org
> > Link: https://bbs.archlinux.org/viewtopic.php?id=303321
> > Fixes: 235b630eda07 ("drivers/card_reader/rtsx_usb: Restore interrupt based detection")
> > Reported-by: qf <quintafeira@tutanota.com>
> > Closes: https://lore.kernel.org/all/1de87dfa-1e81-45b7-8dcb-ad86c21d5352@heusel.eu
> > Signed-off-by: Christian Heusel <christian@heusel.eu>
> 
> Hey Arnd, hey greg,
> 
> could one of you pick this up? Sean said in the other thread that going
> with the revert for now seems like the best option and that he'll
> revisit this once he has time...

Yes, will go queue this up right now, thanks.

greg k-h