This is a note to let you know that I've just added the patch titled
misc: rtsx: Fix rts5264 driver status incorrect when card removed
to the 6.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
misc-rtsx-fix-rts5264-driver-status-incorrect-when-card-removed.patch
and it can be found in the queue-6.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 26ac2df47d4c58f17210b7a59037e40f7eca693e Mon Sep 17 00:00:00 2001
From: Ricky Wu <ricky_wu@xxxxxxxxxxx>
Date: Thu, 14 Mar 2024 14:51:13 +0800
Subject: misc: rtsx: Fix rts5264 driver status incorrect when card removed
From: Ricky Wu <ricky_wu@xxxxxxxxxxx>
commit 26ac2df47d4c58f17210b7a59037e40f7eca693e upstream.
rts5264 driver not clean express link error and set EXTRA_CAPS_SD_EXPRESS
capability back when card removed
Fixes: 6a511c9b3a0d ("misc: rtsx: add to support new card reader rts5264")
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Ricky Wu <ricky_wu@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240314065113.5962-1-ricky_wu@xxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/misc/cardreader/rtsx_pcr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index 1a64364700eb..0ad2ff9065aa 100644
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1002,7 +1002,7 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
} else {
pcr->card_removed |= SD_EXIST;
pcr->card_inserted &= ~SD_EXIST;
- if (PCI_PID(pcr) == PID_5261) {
+ if ((PCI_PID(pcr) == PID_5261) || (PCI_PID(pcr) == PID_5264)) {
rtsx_pci_write_register(pcr, RTS5261_FW_STATUS,
RTS5261_EXPRESS_LINK_FAIL_MASK, 0);
pcr->extra_caps |= EXTRA_CAPS_SD_EXPRESS;
--
2.44.0
Patches currently in stable-queue which might be from ricky_wu@xxxxxxxxxxx are
queue-6.8/misc-rtsx-fix-rts5264-driver-status-incorrect-when-card-removed.patch
