From: Sean Rhodes <sean@starlabs.systems>
commit 235b630eda072d7e7b102ab346d6b8a2c028a772 upstream.
This commit reintroduces interrupt-based card detection previously
used in the rts5139 driver. This functionality was removed in commit
00d8521dcd23 ("staging: remove rts5139 driver code").
Reintroducing this mechanism fixes presence detection for certain card
readers, which with the current driver, will taken approximately 20
seconds to enter S3 as `mmc_rescan` has to be frozen.
Fixes: 00d8521dcd23 ("staging: remove rts5139 driver code")
Cc: stable@xxxxxxxxxxxxxxx
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Link: https://lore.kernel.org/r/20241119085815.11769-1-sean@starlabs.systems
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/misc/cardreader/rtsx_usb.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
--- a/drivers/misc/cardreader/rtsx_usb.c
+++ b/drivers/misc/cardreader/rtsx_usb.c
@@ -286,6 +286,7 @@ static int rtsx_usb_get_status_with_bulk
int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status)
{
int ret;
+ u8 interrupt_val = 0;
u16 *buf;
if (!status)
@@ -308,6 +309,20 @@ int rtsx_usb_get_card_status(struct rtsx
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;
Patches currently in stable-queue which might be from stable@xxxxxxxxxxxxxxx are
queue-6.12/xfs-check-for-dead-buffers-in-xfs_buf_find_insert.patch
queue-6.12/usb-gadget-f_tcm-fix-get-setinterface-return-value.patch
queue-6.12/selftests-ftrace-fix-to-use-remount-when-testing-mount-gid-option.patch
queue-6.12/alsa-usb-audio-add-delay-quirk-for-ibasso-dc07-pro.patch
queue-6.12/drm-amd-display-reduce-accessing-remote-dpcd-overhead.patch
queue-6.12/usb-xhci-fix-null-pointer-dereference-on-certain-command-aborts.patch
queue-6.12/xfs-don-t-shut-down-the-filesystem-for-media-failures-beyond-end-of-log.patch
queue-6.12/netfilter-nf_tables-reject-mismatching-sum-of-field_len-with-set-key-length.patch
queue-6.12/drivers-card_reader-rtsx_usb-restore-interrupt-based-detection.patch
queue-6.12/clk-qcom-gcc-x1e80100-do-not-turn-off-usb_2-controller-gdsc.patch
queue-6.12/net-usb-rtl8150-enable-basic-endpoint-checking.patch
queue-6.12/usb-typec-tcpm-set-src_send_capabilities-timeout-to-pd_t_sender_response.patch
queue-6.12/ktest.pl-check-kernelrelease-return-in-get_version.patch
queue-6.12/selftests-rseq-fix-handling-of-glibc-without-rseq-support.patch
