misc: rtsx: do clear express reg every SD_INT
authorRicky Wu <ricky_wu@realtek.com>
Tue, 30 Apr 2024 06:01:08 +0000 (14:01 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 4 May 2024 17:00:51 +0000 (19:00 +0200)
orginal only do clear EXPRESS_LINK_FAIL reg when card removed,
this patch moved the flow to SD_INT statement, make sure the reg status is
correct when inserted/removed card every time.

Signed-off-by: Ricky Wu <ricky_wu@realtek.com>
Link: https://lore.kernel.org/r/20240430060108.580685-1-ricky_wu@realtek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/cardreader/rtsx_pcr.c

index 0ad2ff9065aad0d31ca2be16e32629b5612ecfea..117b3c24f910c9a8e6d01083fb725100cc804d32 100644 (file)
@@ -1002,12 +1002,14 @@ 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) || (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;
-                       }
                }
+
+               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;
+               }
+
                pcr->dma_error_count = 0;
        }