From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71346249F9; Tue, 11 Mar 2025 15:18:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706301; cv=none; b=OI8AzK0B/ESJ8IbisBi4ePK1Z+wzTiToxf3JnXAPwxTr7lOoafmOM5hOYvpgD9nevh/9TEEgndqxyKdsnsNz9ZbGtTZL9xeBlTw064duM/TiWGXIQhD9owyaIRpLQ2soWhGukS9NZviwU0XJj093wQVUoLlGmUb0fNK7rR+QFus= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706301; c=relaxed/simple; bh=MpQP9kXp6RlUusHGVQXWRNZFuMnwlpqwnjP+JcUWKMM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F5VygbdHb20m7NmP9BTyXOp1zKrOgB/aVbRGFizEj+UkytdSaGwyCm7Mw7mTPNO9A4fb8tZWwbRfaotk05pQWDdi0WdG7e0/I8y3pkiVmJ1ZrEiiFr2dsHdlH5iz1msm0tip8CY93Abu6hpkT7dju/e3gpoJIADnOZyfZ1BwyF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CUcrjB+R; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CUcrjB+R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E37AAC4CEE9; Tue, 11 Mar 2025 15:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741706301; bh=MpQP9kXp6RlUusHGVQXWRNZFuMnwlpqwnjP+JcUWKMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUcrjB+R9oOJCnNHwdJ3Bx55vR1eVfbaStpLw0QsuGMhiHP34fLFg2EzH5SU0v1md 0E3fOwnfVLBwxlZM1IbSiDwXlUnFZxdnoSlG5Db8bj6fssaY9p5oA7VeBkTcpXedlP VzIgEyps3zLZorbLbBGUgHAL6oNsD0yKEqBmDelM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, qf , Christian Heusel Subject: [PATCH 5.4 311/328] Revert "drivers/card_reader/rtsx_usb: Restore interrupt based detection" Date: Tue, 11 Mar 2025 16:01:21 +0100 Message-ID: <20250311145727.268936067@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311145714.865727435@linuxfoundation.org> References: <20250311145714.865727435@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Heusel commit 2397d61ee45cddb8f3bd3a3a9840ef0f0b5aa843 upstream. 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 Closes: https://lore.kernel.org/all/1de87dfa-1e81-45b7-8dcb-ad86c21d5352@heusel.eu Signed-off-by: Christian Heusel Link: https://lore.kernel.org/r/20250224-revert-sdcard-patch-v1-1-d1a457fbb796@heusel.eu Signed-off-by: Greg Kroah-Hartman --- drivers/misc/cardreader/rtsx_usb.c | 15 --------------- 1 file changed, 15 deletions(-) --- 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 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 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;