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 E18A417CA12; Mon, 10 Mar 2025 17:52:20 +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=1741629141; cv=none; b=SVmqhTqMuz8x6pPObl3mNELS2ixKPKRIUoEEG4QSnc1GLPE5Q/du3mRkNc3cg7Me/YujrjM6lGfqJNnZJgy7J2pET4Kg48nKwMBb4vFKi5ldwCoUYhmIXAOQFITanaq2KE0BVqshdtP1ACv/2uBQfme30VCH0YlnGG+JNRGfu28= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741629141; c=relaxed/simple; bh=vJSJBXa/s61jKeaIzZZjnaQ6qnmHg0zkw8P1Op8XsbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+KYI3EZbUjrBBY0svplnvVRlkbdtmmiyKgHWIDH1BArJFXBJieR2fL96vB1NKpiaXLnssKKOk2+JTbeeyTC9dDEdk/l0O2iTemYaMzgSp/Crt91Pp/RWtN4ca1JyCGzawH68Bh58/NTaQ548zJz5p1V6aa4xbhnl8wxarPxG3w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gQbrvZp4; 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="gQbrvZp4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68A71C4CEE5; Mon, 10 Mar 2025 17:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741629140; bh=vJSJBXa/s61jKeaIzZZjnaQ6qnmHg0zkw8P1Op8XsbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gQbrvZp471/uliIuZ3qK0uo2Sl05NHg0TdizGCczuvsG2Kjfd4YWBMQqyoyYHPDuY 13IMswHYFBKuPjr7d8cDfOfrWqhLn5xZhPo3AEM2W/bl/69K+yK0Y8xgO0BH+9AsIA 6JWEjrP6/sbfvFwqcFJ0bAnA9dldkjg+/Ve37EgQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Sean Rhodes Subject: [PATCH 5.15 192/620] drivers/card_reader/rtsx_usb: Restore interrupt based detection Date: Mon, 10 Mar 2025 18:00:38 +0100 Message-ID: <20250310170553.213384866@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170545.553361750@linuxfoundation.org> References: <20250310170545.553361750@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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Rhodes 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@vger.kernel.org Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Signed-off-by: Sean Rhodes Link: https://lore.kernel.org/r/20241119085815.11769-1-sean@starlabs.systems Signed-off-by: Greg Kroah-Hartman --- 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;