Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
From:   Meng Li <Meng.Li@windriver.com>
To:     stern@rowland.harvard.edu, gregkh@linuxfoundation.org,
        linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net,
        linux-kernel@vger.kernel.org
Cc:     meng.li@windriver.com
Subject: [PATCH] usb: storage: add shutdown function for usb storage driver
Date:   Mon, 23 Oct 2023 13:41:11 +0800
Message-Id: <20231023054111.2744872-1-Meng.Li@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IrF+OFR1TewgCvRejpCuk451V1YuEE2koCAaXjqCJFM6ZMAGM7lDMejI0mBd?=
 =?us-ascii?Q?hyjYCnpsh96C9WdVp+DoWViAmxBOAH0bwAJAT3oIAXAS2Main5tUPDdjAsxc?=
 =?us-ascii?Q?v7kN5iq1YbpEdR4yDzinNkejjf/fOFb3Z50fCMooLXKwFqsd/gmpMkH+qIWD?=
 =?us-ascii?Q?bBEfC7UNTHDrBpAxvvCf5vKa2CUbQUBm1vGescNN0fGd06PirH8cWJKIUbvF?=
 =?us-ascii?Q?UgG0czBcIfGWK+uihg7s2ef9aqlb8340gvCIpvnj+ySRrneiXOh+8PMIesVY?=
 =?us-ascii?Q?3jJOrSx0UWnsY/QAPVSYOyDQ2wFkDATZaGEhPtwl6PpIQKahLTB7+h30Nvtk?=
 =?us-ascii?Q?YMy4JcI/mKVSTucDTjarr/dXKe40VyUSYIo94VhIw7+pq/bfriyzJij9Vdvd?=
 =?us-ascii?Q?uzTAcPkqtHUR949plrac+loMnxa05QBmnT1tx77okwnHolonqnV22i8OD2ad?=
 =?us-ascii?Q?ZI3UMPBcuFPYmf8Iu0WFs1sgahSnaoE/zuEW+Aklf1vFyWadrJROMvQVG1Tv?=
 =?us-ascii?Q?4yNTLAQcwYL/meXBs/LAQkzFFZvCCcVdjUdzfG3i7IYucOebqG9zlBvQxXs3?=
 =?us-ascii?Q?+js6l2KZbxte71LepcM5d9BqPSFdicB1Ny4IzInoA0UYZrb2WQfCu5pxLqId?=
 =?us-ascii?Q?Mq3gOViXrG9Ydw9RoOblUlQP2KEp8DJta5sCCz+YMxteSdjeZhaesdlPpFFg?=
 =?us-ascii?Q?SOQTtp9jTAb5QODSybVp0eDda7/JsSB70aRE0sKOc09U9pGvJc3v4UI2f0G6?=
 =?us-ascii?Q?L0ineS8x5ucZelKuMavOOf7Z8UAQoMrWfGXEZjnhTJL/CRb5B6UVIPqFo4mv?=
 =?us-ascii?Q?CCtaSBL8bfGacC4mHfuKQ+cnBn7qUoWnzWKd0rRQA0/uW0tJgjl0j0gl5ljF?=
 =?us-ascii?Q?o5WsX/KWh3z3txS8gGJu58hve0S7qGQ0P+0qYc7VjB86da+9+JI2+hOfZSUI?=
 =?us-ascii?Q?nKFS4S0Tt5k+NHzkt1o5HcurdjWmMpeyE9iU6wWqZqJSW+NaUOInWSLr6IBn?=
 =?us-ascii?Q?n4o+0oCmuUpBkcD7462/jx0Y8IxiCmcJEwhjigE3EcACnJwWwoD5VeILW8rQ?=
 =?us-ascii?Q?tMIxZ9fSuFvPpwXNWzIVknpDGT7kYzpXoSxpr+WnrRxZXM2DscwjQWK8n/OU?=
 =?us-ascii?Q?+sKvj9KAf2zlzCiWPUnIHzCsCJCaJ4PCZxWyRVYMgs8gnldVYC7mhUvC8BKa?=
 =?us-ascii?Q?nfIEzMp+WUmbw6N3CzzBFZa59yRvlIviBBUyUAGsGSG6gFCKnQb85uP+LlJm?=
 =?us-ascii?Q?J6wPWjuTNyH3RA31GUh+/vjjOV5ZprV/x26+RXsiOZ/LzQ5UgN+TsOB6YcvU?=
 =?us-ascii?Q?ry0q69k2plg9ixamOf7S29SFMjuy5hPxj4gHawjTLE/R1NGvHjeeavdMNHjM?=
 =?us-ascii?Q?fTCkmITVz8dq5qg5uD2pUpM4QA0xMNbTICO/9tW9QfoJUDWxWezMeceYYDZQ?=
 =?us-ascii?Q?y828lMUJEPahFgr49xAqNDY+HrNtxFkicRuj89JvQV6PsW4NkEghWoeJfM62?=
 =?us-ascii?Q?LjN4Obac0fNujTzp60TipV/cF+rT0kuxZyI+PDt1jjHY8ouL2suHrBBzqCqu?=
 =?us-ascii?Q?6uzvIRBaxj+N3WQFHJzD7N133+iZ33pZzOW4N5Bt?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b0ea17ec-56e6-49db-0d8b-08dbd38ab4c0
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2023 05:41:29.6580
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ddSshizY6wMnbP3UOl4KFDhzWgkSwhsDy2Jpv0J9+dNdVSZEBkRWQph2D9iH80aMiAM2hTlXOGO8pOfjtJatRA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4518
X-Proofpoint-ORIG-GUID: MDsKuBvQzReriWr6mGqL9fTVUqYOcWM0
X-Proofpoint-GUID: MDsKuBvQzReriWr6mGqL9fTVUqYOcWM0
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-10-23_03,2023-10-19_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0
 mlxlogscore=988 clxscore=1011 impostorscore=0 priorityscore=1501
 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 adultscore=0
 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.19.0-2310170000 definitions=main-2310230049
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 22 Oct 2023 22:41:51 -0700 (PDT)

On ls1043/ls1046 rdb platform, if a PCIe-USB host controller is installed, and
an USB disk is also installed on the PCIe card, when executing "reboot -f" to
reset the board, there will be below error reported:
usb 2-2: device not accepting address 2, error -108
This issue is introduced by linux-yocto commit 837547b64a34("driver: net:
dpaa: release resource when executing kexec") that cause to spend more
time on shutdown operation. So, the 2 platforms with DPAA are not reset
immediately after executing force reboot command. Moreover, the usb-storage
thread is still in active status, there is still control data transferred between
USB disk and PCIe host controller. But now the shutdown callback of usb pci driver
had been invoked to stop the PCIe host controller completely. In this situation,
the data transferring failed and report error. Therefore, add shutdown function
used to disconnect the usb mass storage device to avoid data transferring under
the stopped status of PCIe device.

Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 drivers/usb/storage/usb.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index ed7c6ad96a74..e076d7e3784f 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -1142,6 +1142,15 @@ static int storage_probe(struct usb_interface *intf,
 	return result;
 }
 
+static void usb_stor_shutdown(struct device *dev)
+{
+	struct usb_driver *driver = to_usb_driver(dev->driver);
+	struct usb_interface *intf = to_usb_interface(dev);
+
+	if (driver->disconnect)
+		driver->disconnect(intf);
+}
+
 static struct usb_driver usb_storage_driver = {
 	.name =		DRV_NAME,
 	.probe =	storage_probe,
@@ -1151,6 +1160,7 @@ static struct usb_driver usb_storage_driver = {
 	.reset_resume =	usb_stor_reset_resume,
 	.pre_reset =	usb_stor_pre_reset,
 	.post_reset =	usb_stor_post_reset,
+	.drvwrap.driver.shutdown = usb_stor_shutdown,
 	.id_table =	usb_storage_usb_ids,
 	.supports_autosuspend = 1,
 	.soft_unbind =	1,
-- 
2.34.1