From nobody Mon Jun 15 19:01:45 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99EA03BBA17 for ; Mon, 13 Apr 2026 11:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776080559; cv=none; b=KdM2BG/gzohaycvm+Uc7ENhzSAoovip26JJQqyr6/yox8rQK31WXtRm+dI4vU04W2v46BXLinvv6YSGOUyCWXpU7ujAXDwz1cvTlf7US4eBi5akLbIahC6oJHIfTP09OHg5ggyG0sfVXYJIhP4J7odLOlqoj5+a3Q24NxwHe3Qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776080559; c=relaxed/simple; bh=PnNMMbjwcKzVWP+m7FD53JqeYKvEanJzlNiXzEuxsp4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nxRIomDbbtBV7JcT9nM8byQn2hpPvDrOiB/SI+ntKMzl//d43o7SEG9L8vuuiZYyP3ufq0BuZF4CCVP77CgFZ5mtqxtLyxt1zqrEnkcWb96ULXvMF18aNyztAwPkOcWBFrcwfrNS3U0D942lrWvZ2u0y4LL9GiE0na9v8qOpu+0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems; spf=pass smtp.mailfrom=starlabs.systems; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b=cAr3l21V; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b="cAr3l21V" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-483487335c2so46841955e9.2 for ; Mon, 13 Apr 2026 04:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1776080556; x=1776685356; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BbrAMVuoymvOc0pbOyeM4Q5RieftEOwF5FE/RDRgc9A=; b=cAr3l21VklToYwJNBQlMpmkHi/IkaKzFZNR3zfRMRHDHD8AeOwM03n9e/+Tk0TMyOp krpOgQ/otkHzuDNYhKQOonYyTEwGfqyl5FlP8tgxDQyr6GwpUPZf3yp2QkU/cSHDE0Jb euLnduKsneFyppNarzFmJhW9kFnY8qPUaRoE+FPaztQuPa3db8LLQIlQTIZHqMVZHGlR l2Z6XzeAO1e+7edNDXNPFca3q/atkjigMGFSMLmbwrF+zcrFpecNmnZzjEoMlmXvjPWW /cWa2D6ZuE48wdFKeZN7757uW5gc6V1nmJ+4DbZKKT1WFe47J/SsWkHC5qaCP/1lPtn9 6auQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776080556; x=1776685356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BbrAMVuoymvOc0pbOyeM4Q5RieftEOwF5FE/RDRgc9A=; b=bGs7XDeiIQ8UV6ZH/eOnHglnW5noVJ6qrmFaMEBN+BEdlhT6vwzmDgqmcyytU10qpU 47Cm6VG4I//En5Hp6YGnaIirPKjbqACuMyAyDy1407DrfNm37Cqioh2CmAZOxulhL88w Ex3trHzBFU7cHjZNS87Hiu4u737AorteXo3SAWcdY9mWqVwFtaIvW8VnlmAzqNNOJ4G5 HF1iP+JT7+7NZVUl8aMP915nnejLxZ2W6aZye5HbjaPYHce/nRiW1lEjmHHuHg4iufpk fcFsg+G8IBqB5OllqgKCfFuPpuKBxbYUj4qPDBYf89iM4sFa9QLONiifpOdEyv8QzNMt NDhA== X-Gm-Message-State: AOJu0Yzc8Ol92L73Qxd4jx66LV/WDCu8AmWipOaLUuTotaeHWfBB3MTK aYoCm+R+gZWBEJy6B9PI9QaQo5sZufK1pfcl6PK5KQHIStf1uv6+AM0bRD7Hu5UAKMDxsnitJ0Y 7pMfF2A== X-Gm-Gg: AeBDieuK4pNj+Skpqnwi+A+QLTa6JivzTLkOt1zkWiScvzGBnFmoIhJqQ8C7qYSi0Go XCVEpgylWhRvas0qIIr1+QVm2xdowIEMEqLYykQD5LB+vS7jaubfGUuSvyoPbVY/z+3XEovo2LB onJEYCkOAe0bhaUXeNcDBnYxP4PeKF+GjInQFWfvaADypP2bwbuUA00A0eWrleNPBGW72llDcnb IKVSa5jlZqsz/2GKrWsOLlfua3UQRPC0tm0PtoGLFAe37PjfsdTYPXQ1l3fPPehBkMxM8cyYUrO gBedRloX4wAzzJMUowxce1/WozxaAZQbcyxqpohxQXXIxC868DYG7AO2yg/qFZ4o6EN/zf3DyhV 5ERcdVxK1HnkTF7zMrlTw3B0su5BkdIaa4nn3miZ9zWq8VaNezx4boTqct1l5dA2dh5oYZLut28 pCzCu4paNiyhaflWxXmCMmc2dr31y6i1e6QHsmdUR1ftuQTDazA8CvIfA0nnAUionJfmZI X-Received: by 2002:a05:600c:3f0e:b0:485:3f72:323f with SMTP id 5b1f17b1804b1-488d67e6973mr177577725e9.11.1776080555721; Mon, 13 Apr 2026 04:42:35 -0700 (PDT) Received: from horizon.localdomain ([212.105.128.254]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488d67b46ffsm126301165e9.6.2026.04.13.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 04:42:34 -0700 (PDT) From: Sean Rhodes To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Greg Kroah-Hartman , Sean Rhodes , Ulf Hansson , Ricky Wu , Ingo Molnar , Thomas Gleixner , linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [RFC PATCH 1/2] rtsx_usb: hold runtime PM during transfers Date: Mon, 13 Apr 2026 12:42:30 +0100 Message-ID: <95a293902585bd43c6857b79bdcdb8be692ff687.1776080528.git.sean@starlabs.systems> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Hold a runtime-PM reference across bulk transfers, and mark the device busy afterwards. When runtime PM is already in progress (e.g. from rtsx_usb_suspend()), avoid forcing a runtime resume from within the PM path by using usb_autopm_get_interface_no_resume() unless the interface is already runtime-suspended. Signed-off-by: Sean Rhodes --- drivers/misc/cardreader/rtsx_usb.c | 38 ++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/misc/cardreader/rtsx_usb.c b/drivers/misc/cardreader/r= tsx_usb.c index f65acf4d1164..c8badd0db87b 100644 --- a/drivers/misc/cardreader/rtsx_usb.c +++ b/drivers/misc/cardreader/rtsx_usb.c @@ -12,6 +12,7 @@ #include #include #include +#include #include =20 static int polling_pipe =3D 1; @@ -65,19 +66,42 @@ static int rtsx_usb_bulk_transfer_sglist(struct rtsx_uc= r *ucr, } =20 int rtsx_usb_transfer_data(struct rtsx_ucr *ucr, unsigned int pipe, - void *buf, unsigned int len, int num_sg, - unsigned int *act_len, int timeout) + void *buf, unsigned int len, int num_sg, + unsigned int *act_len, int timeout) { + int ret; + struct device *dev =3D &ucr->pusb_intf->dev; + if (timeout < 600) timeout =3D 600; =20 + /* + * During runtime suspend/resume callbacks, avoid forcing a runtime resume + * from within the PM path. The device is still active when + * rtsx_usb_suspend() runs, but usb_autopm_get_interface() can block when + * runtime PM is already in progress. + */ + if (pm_runtime_status_suspended(dev)) { + ret =3D usb_autopm_get_interface(ucr->pusb_intf); + } else { + usb_autopm_get_interface_no_resume(ucr->pusb_intf); + ret =3D 0; + } + if (ret) + return ret; + if (num_sg) - return rtsx_usb_bulk_transfer_sglist(ucr, pipe, - (struct scatterlist *)buf, num_sg, len, act_len, - timeout); + ret =3D rtsx_usb_bulk_transfer_sglist(ucr, pipe, + (struct scatterlist *)buf, + num_sg, len, act_len, + timeout); else - return usb_bulk_msg(ucr->pusb_dev, pipe, buf, len, act_len, - timeout); + ret =3D usb_bulk_msg(ucr->pusb_dev, pipe, buf, len, act_len, + timeout); + + usb_mark_last_busy(ucr->pusb_dev); + usb_autopm_put_interface(ucr->pusb_intf); + return ret; } EXPORT_SYMBOL_GPL(rtsx_usb_transfer_data); From nobody Mon Jun 15 19:01:45 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4F873C2761 for ; Mon, 13 Apr 2026 11:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776080560; cv=none; b=BhlW9umSpNMCB2N4UN2b1BS4j87/GI9Nk11CTd/uwcg6M5aqkFH1HiPARDNb2WWcJ+CdPxXqKBFNANS9gfRfNvhtDMbYfoPJMCsm6xaf7Cqc2feuIHU297QPKpHr/tc+wratQMME32a+LOFvIA5tkDdNWAvEGlXOlS4d3pr9R3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776080560; c=relaxed/simple; bh=0qrQDtg/iO+GuWnNTcreS6tqsL6qXGvlukyNO4uPxvY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VQwFpVioELPICDKrwUXHOCd796+AJBWfI7itCdm/T3X+mXCOCFhEkS0HeE8XtB94Vqp2i4QF9FX4Xen7mT9W0GGYoGzoAGhoeWAvpdJB8c9UktsklN/Hrgvr/p7EMgXnFvxnr17rVSpLr6oTDXeOSl0ALNtx698irVeCv2BsRGw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems; spf=pass smtp.mailfrom=starlabs.systems; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b=uOv7hYX5; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b="uOv7hYX5" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-488d2079582so37831575e9.2 for ; Mon, 13 Apr 2026 04:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1776080557; x=1776685357; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+IjMTVS/gOBqHrtAqQ1Hrz/YK4AU6mgf/uKtZN6EAfE=; b=uOv7hYX5WVZZ4gLwONF1vdUv6S0Es36G1mL7mQzcs5Hu3i4smBGJ31+mwgyxfgIa+x xOD9sPbojAS/U3DgMG05UwdhBr9XpN2W66UvM/a9NpQ9ZdUG/AVTAcFSFH9C/anTpleY QIB0pU3dJlHCBgvR9t9wfcvNvkh5CWXQz5s1WagvafV/WrNrsEcaLE4ZVkV7TRiE/HLZ uBmJ6ngzFmkvOBEXjhHIz09NIraOppJ5Tinki44S2zZqLhiNEcD6TnLM6Yzi5g9vDXZ8 fzI8+qqOC7K8WZR0qvimEteIKd/u3A0CNqfOtrTvGg5OFHy2zRnVKsibXDxjCEOMg4Wo txFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776080557; x=1776685357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+IjMTVS/gOBqHrtAqQ1Hrz/YK4AU6mgf/uKtZN6EAfE=; b=rOjVSuh7Uhom/TX2fLrHcsu1Im91J860sMI6hX6GbyW+XQOXbt8IeFEjWKSWr3xbIX Yo8VvbD3jDwVzYJbRMKf+ZAFL46UY9AF9/QbUPmV0J8pFN9T6wRZ7Ynp/I0/WsW7I65M RPLiY5O9t1BdN+OkwoyLkETdmvos/UeZb+rppp41mWnJBj71TFlVTxEFF9LT3pHlff+l P/6lz9ho4lF2qnzO+oMwzcLhi5US8xoUK+LebX4oc0J5l9HxrNpoUS4hxbERNoEvM7Z3 YJnKX9I6GZp+aE2MbjOIuzarOjy0rB3JeMKZ933JeoL/7g2RqPMUkuXHo6AprIvm0MAP sx4g== X-Gm-Message-State: AOJu0Ywzm+swaYXLeCZbrs/G4sgSxuMKtnSLlI7XjqMDORnohIw6Epw8 FPDf+25igeDG3O7I1tmDWFRkug0RrseTB2jTACtlLLtRtFlNNwpLT9oiBfkMME8uQ17bMvArpy9 FtRZvdQ== X-Gm-Gg: AeBDieurZz8iY4N5NIuoPfLBJoLKq2NHOjQVJmWrKuk/1mbXj4V0LUa27PS1sfJ0uJf QQDcgXFMKoRyIDzaUrrNzG3ycUi3vpMlzgVd5qvy06a5goTsmpQ0TsEXhpIvnH8+5gY7iHg5eKB E2R0K5gCpHqOvOSFVM/klT5XcAOzkZe1+U4lZAw3oXgilsbe/ATlFdrZ+I0G56N2GyoWwVyVOzC 2dGUy+HIUgP4BogZuYctewGBXXjZnYckGIMRa1Fc7+D8ap5YsieBYE2wP4aVc/X6daU/HYhZjCd nLe3YsTHEkyM0gazEQ7TPWz/3kU9IyRRrV3kTfuLUjsLnE3FujjwfatQOAU64aEDiTT4HT1rJ6S /0oY/ViZue/nGAAW/Y2PWgUWn8GfyLmdlW/0ql/mvYjuOpx42jsgxlENxWpNOBC6cfoNKoyw/oe YO+BpGN06viJ+Vkl6XIQtm1rsE5MBcNUW4Ji0gjh81rRfQ/L2+M0jVHzg+cu6tBSIwIeFJ X-Received: by 2002:a05:600c:a306:b0:480:20f1:7aa6 with SMTP id 5b1f17b1804b1-488d68607e8mr124377275e9.21.1776080556957; Mon, 13 Apr 2026 04:42:36 -0700 (PDT) Received: from horizon.localdomain ([212.105.128.254]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488d67b46ffsm126301165e9.6.2026.04.13.04.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 04:42:36 -0700 (PDT) From: Sean Rhodes To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Greg Kroah-Hartman , Sean Rhodes , Ulf Hansson , Ricky Wu , Ingo Molnar , Thomas Gleixner , linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [RFC PATCH 2/2] rtsx_usb: avoid USB I/O in runtime autosuspend Date: Mon, 13 Apr 2026 12:42:31 +0100 Message-ID: <00a2cae4c8243a39d254edb329b5a76c24d38373.1776080528.git.sean@starlabs.systems> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The runtime autosuspend callback currently queries card status and clears OCP via USB register accesses. On some systems this can deadlock runtime PM and leave the USB device stuck in the "suspending" state. Avoid issuing USB commands from the runtime autosuspend callback. Instead, use the last cached card status (updated on successful status reads) and conservatively assume a card may be present until status is known. Signed-off-by: Sean Rhodes --- drivers/misc/cardreader/rtsx_usb.c | 11 +++++++---- include/linux/rtsx_usb.h | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/misc/cardreader/rtsx_usb.c b/drivers/misc/cardreader/r= tsx_usb.c index c8badd0db87b..727205e84640 100644 --- a/drivers/misc/cardreader/rtsx_usb.c +++ b/drivers/misc/cardreader/rtsx_usb.c @@ -336,6 +336,9 @@ int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 = *status) if (ret < 0) return ret; =20 + ucr->card_status_cache =3D *status; + ucr->card_status_valid =3D true; + return 0; } EXPORT_SYMBOL_GPL(rtsx_usb_get_card_status); @@ -753,16 +756,16 @@ static int rtsx_usb_suspend(struct usb_interface *int= f, pm_message_t message) =20 if (PMSG_IS_AUTO(message)) { if (mutex_trylock(&ucr->dev_mutex)) { - rtsx_usb_get_card_status(ucr, &val); + if (ucr->card_status_valid) + val =3D ucr->card_status_cache; + else + val =3D SD_CD | MS_CD; mutex_unlock(&ucr->dev_mutex); =20 /* Defer the autosuspend if card exists */ if (val & (SD_CD | MS_CD)) { device_for_each_child(&intf->dev, NULL, rtsx_usb_resume_child); return -EAGAIN; - } else { - /* if the card does not exists, clear OCP status */ - rtsx_usb_write_register(ucr, OCPCTL, MS_OCP_CLEAR, MS_OCP_CLEAR); } } else { /* There is an ongoing operation*/ diff --git a/include/linux/rtsx_usb.h b/include/linux/rtsx_usb.h index 54c6ea82bf43..fed695760691 100644 --- a/include/linux/rtsx_usb.h +++ b/include/linux/rtsx_usb.h @@ -62,6 +62,9 @@ struct rtsx_ucr { struct usb_interface *pusb_intf; struct usb_sg_request current_sg; =20 + u16 card_status_cache; + bool card_status_valid; + struct timer_list sg_timer; struct mutex dev_mutex; };