From patchwork Thu Apr 21 09:49:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 8898531 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3158BF29F for ; Thu, 21 Apr 2016 09:49:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD3FE2025B for ; Thu, 21 Apr 2016 09:49:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFBFB2024F for ; Thu, 21 Apr 2016 09:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751647AbcDUJt1 (ORCPT ); Thu, 21 Apr 2016 05:49:27 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:26196 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751282AbcDUJtZ (ORCPT ); Thu, 21 Apr 2016 05:49:25 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 21 Apr 2016 18:49:23 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 708955B5AE; Thu, 21 Apr 2016 18:49:23 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 57AED2806E; Thu, 21 Apr 2016 18:49:23 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 51EF82806D; Thu, 21 Apr 2016 18:49:23 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAC29553; Thu, 21 Apr 2016 18:49:23 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="209840233" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 21 Apr 2016 18:49:22 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=arJYm+fr0qbMqJGsD6QTq9e0u8DrZWQv3JY8Lba+GQo=; b=GavrlTMxqgcKiI0UQXp1Qauc/uCEFxMZdt4+9UZ/T31fEDKpBFMl4LvcDd+aVoRNE0zXOw43F0pBJJC50y1UVGJHoitSJlLkc8oj5yl+1870uP3UxuvbDtFveJvkxx2PPJJOnAu1YtmdxVnUj+GnNL77YKIKCvRO/vHl/dLM9xM= Authentication-Results: intel.com; dkim=none (message not signed) header.d=none; intel.com; dmarc=none action=none header.from=renesas.com; Received: from localhost (211.11.155.144) by TY1PR06MB0927.apcprd06.prod.outlook.com (10.164.99.153) with Microsoft SMTP Server (TLS) id 15.1.466.19; Thu, 21 Apr 2016 09:49:20 +0000 From: Yoshihiro Shimoda To: , CC: , , , Yoshihiro Shimoda Subject: [PATCH] usb: host: xhci-rcar: Avoid long wait in xhci_reset() Date: Thu, 21 Apr 2016 18:49:14 +0900 Message-ID: <1461232154-7420-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0030.apcprd06.prod.outlook.com (10.164.91.40) To TY1PR06MB0927.apcprd06.prod.outlook.com (10.164.99.153) X-MS-Office365-Filtering-Correlation-Id: b78d6670-bba0-4b46-3fdf-08d369ca368e X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0927; 2:nhvRg3zUTnDYoPPhRIDiaiPhuAqkbY0m41yMzW+UHHU0iql63QsSJheKXxS9mAj90Y4jPDL0xe5XvRVZGrnlVHGRe8hj4l7Xi22uk1YiSocmFeafBB2SPZqTEyaBvinGAOEJRwBenep69eUMcUtp/uQLF+rNOq3HKGT2afD9mHH8XQbTnz2fOiW2ks6s3bEo; 3:zG7yPQEYlA+2MiaT+p3Ra7YzSj57TUn+YbrdAh7fhd86LCHKBWcMMP8hSKsxG4algnHtdPpo182K2rt7uaZnX5KHUhdMWMAFRXqefyIoGSrxDnMc9Vvdm1eP3Y1BbQYy X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:TY1PR06MB0927; X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0927; 25:lt6+7AXVr3g9Q0GbIj+SXgEvb99ZzB0LjO++VJHZi14+74QZSlmb240bYlwaSSxcJ0CXQ9PCb6zAHMWn5wwxcH7iNFC2E1xmh2Q/IwXXgF05GkFblVUXZiF2RfQRMw3x97v2QKFZ/xhOCQ+ZFldD+YqGgiAA86pHVVZjxDqjFIJhTxI3qaYjaL0iadpWuqxnruFSykIpap7GgbR9vW6wg71JP3jEdWW+ZRVJ9rlZumCIM9hxeaHj14Y2UVD9hA4ckRa02+9pqEfGPuJbHXzE7eIO9oR+/kL57by6MQf+78qA32IFKqA9FAgqRh0OxhI2+ECOcqbQ4h0bpw3JB08BbPLEK3Of3quRPs4WdIRKIJ+zZe7dtQq0Wmw1A2n0wIaHKY98zMQyFpXygZjaNNyHUkH+du1AET00107YtVNsbLf/29GXOfTUEWgVLnjGviIHM9IDLpzh1zHOkdvMgSsaj14IaT7Gzpu+ATzNakYrJ9ft4mefFTD3J7r6eBYe5D0pL/lmD9jgYdvfITVnfIhT/cEVXkDXOL33I3JHFyPnOI0SvPF+KRqvKF0hjh3BPlha5z9f1oEwAnU7nVSMXXA9Ab97JJCVBtueJpW5uyBzD8rQJ1iJi0QAxGNy01uLsxZ8t6MjfwDaSohPXJBbw4q2JqOB883+Z6PWP1QYO46iZx4= X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0927; 20:sqY9Om0V2YvyZ/N1/oqUiQfFxjj48lMU0uqT89GCaGtpYRVo3LPkRo4WZ5OHr6fl2Nb+L3JTrCN0BYafxW3lj+ugC08vmAhu+jnH2rBTK+84idX28A6w58VRwKvq2MkHoizIvZrGfKnrmYq7v8rVOh5SSi+MG+DD7LXc9efZihIYw+qM5ntmNh+jSm+GZxG4a4EdzhnrbBSUqRQ9A/SBOBThhnvpiivSYBn/3f5IclXgzshyRH9wb7KnJqakUtjxlfhPeMHRDqjcqqKw67FqsF840Dc5RYKQTTScAo7WrrNycwLaklUZgqRPJ4YSoWilq8D49OmRC1RLwJvkLDTxDKHsUiZ69ua/RlorH4sPzvMqEq70AbDGzkpLtioEwVjE6PrdAipCM8y1eP/0qHNj312e5lm2dpoJJFAOu0vEK66ABkIs8ReAx+X5vFdeTb1j19KmeILPhljYLZ6+XMZC653BQtcEew6qNNbSGEJpyAGj73Yq6AlTArLUzPbWX6Gn; 4:Mq55ZGx0McjyBBcyZuPa6ARayejPZsnT92wx+3WKN+XELGyRIIqPuOHfWOKVaSIdeynNetCW4gmyOrCjheBrq8bAYsk9MWvyFCG/FkinavHLixKDtZgMoNUELMUCn9f9et4nuTCUSER81cXXIpVQQN9I8yOt15Qd5LpkVChD5CrPdQ5bVnIQaZ7mqF080rwlaAksr+Uhsy7ommXQJcUyUDY8rDLxAGbJG8UUyFh5zvFrpz0sBMBpEjCnR1ifiiFX2HVzK/MklUlvktJycGe8jByisum5DsGLjcJk8kk4J9ZCqz6oVFpkc4KIAWjBqBpMK3sLHzlcRdPO+h7I6mTf+CTsv84oQxFZuY2yiQmopvcznoUerGW26kynSsK9nq+e6N13uh9rKLqhszHK9F2W1w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:TY1PR06MB0927; BCL:0; PCL:0; RULEID:; SRVR:TY1PR06MB0927; X-Forefront-PRVS: 091949432C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(5001770100001)(81166005)(48376002)(229853001)(4326007)(36756003)(66066001)(50466002)(76506005)(42186005)(33646002)(47776003)(107886002)(42382002)(4001430100002)(189998001)(1096002)(78352003)(3846002)(50986999)(6116002)(50226001)(586003)(19580405001)(2906002)(5003940100001)(5004730100002)(77096005)(5008740100001)(92566002)(19580395003); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR06MB0927; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0927; 23:Fr8LNJg/lgoRuhuGTXWJ9qp2+TPuujZnbjrK/Lde6WJ0b1xksuC8jXzK203+S3DR8DbYxDR98rQzUJAA6w13dGmH2nVyvVegMdAWxf6Nm5tNclNrKduF4Muu6WJ8tfE/nDwvzIRkEhrlDOEx97MimgcA+LXyiyF+8kKmgMRX6dpeK5Agb8028ahM8HcBBlGPckrTSX+js31/3X3kqNZw96qlmQxP+ITn1y5gL/1+kspJRkEM1a8CfsKPMXULA2MaRMdsCfI5yEWP8ePtvhmZB/QY9JiJe6xbPVZRoRWqZ859JRGquKEpI4b7YBsQ1pnMvH/NV4pVkgAHfeV+zczR08AZBMkBs4JYdxJXEj8blLBc3t4SgrDenjBAzLdX7VSFFBfevlGzV9aDCZ64uoAhP7s3Vz0crfEw7yF2tgMNfVBB4SLyb9w9YIivOPRj6grLZEkiAJIcuEstb8Wvi3GwXSYF3qeBA9Z9aG8cKZx61wG0fTSoXH0Vkh5KaN5y0zbxy8OKiCrwqPg2MJT6r1PTrFu2gsHLuUkxMWxBuPcTHMgYRVqJQJYFyK+cFGyhHrDnP70DGwfDffu1bWrrfHVrceHkHpCHTm5vzR01km3knM0UOq9gKNWU+cYWIdp+VBdHGe8wIl2sDuwFKBBAeoUn6i5knFaX6uqkMGagC0S8zWCvZAh8ERCa4wZnQ1NuTmB8E75QZkpxqmxqz5EQBZgKMGJHwNsJmaKKKphVH+CKG/oN6mU9pYUyuLiNsDlcQ9NnKxgnw7n0zcdrB+llZPurI3dV5QrSxwqJ0KSGbESin/V4uw3+WfcUsWfbrupNaaUCxTTI4oCdijgIG+FjiCZko29s4a7YGh9eRm6UKzWAcF4MUMG2CxUbAOMQPuC589q5dPSXZffzyKKmStNz8G8u1crRqc0HRDe6aubse4SSJ pDL23kT3j17pH6VxND0J9MZ X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0927; 5:gJJE8exOXKj7OgOgI5LAoT0ipNVjht/JfWQCh0riWo/H+Bs/HmbcxVhda9/m+E//4uG5ebB039eJyCYjOP01Arsdbigoz4RzdGWcIDeVsBTs8OXsrbPPZ1AjlwyvnVH9XKw3a24V5SKmueqZDl5DrNEXf2ubeL64YhtNDmMAxB9CEN+BCDH1m38MtbU5MS8z; 24:TyeNOcMg4h49YgnKpVRRPwET1ERBFHhIo/36IYO1Lyx9vAe/1Yx5xJbPU7BWe1HNAP0sraFOZmTpBKzynsUbrHD/RjAPX0bN+K4Z4mK5fdA=; 7:rTvqHy2kfOKQahUrrCbzN68W/IpzNYXmUx6kaIUeDLw18IfGA6p8sjWGByTYHkCytOaDjbAs6/EEIqx5csdbV68R4BR2etvphPJx/k5Vx/ObWKHxn5kUI7E0yqjBG0HnjFmYLPnmXQal6lP6xslhl7ZoLVbAcWJjbsLoQ719q4vKDZno99KYNjYLbCXM+eNXKUvPrszHwGPtHVW5nHsyYbk5vsrAhyOfKepZQSzf7XI=; 20:PBNVwaUHphunjCIsunl5fu6kzLctlATdo3WydlwZHyS3ekOiAM9UKV2NgPd57g9KDTLpMCNlP6E3ypf9svEQml5O4WzWxN1EFwaPFScnTl2AVXOl04pa6dFynKUUSQeLx1l7HP1+j7jt/JTn4X7sC63MFCqKfb9kRbDcDolNsYE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2016 09:49:20.6786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR06MB0927 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If kernel configuration is CONFIG_USB_XHCI_PLATFORM=y and CONFIG_USB_XHCI_RCAR is not set, R-Car Gen2/3 will cause long wait in xhci_reset() because such SoCs need specific initialization. So, this patch modifies the xhci_rcar_init_quirk() in xhci-rcar.h to exit the probe function immediately. Fixes: 4ac8918f3a7 (usb: host: xhci-plat: add support for the R-Car H2 and M2 xHCI controllers) Cc: # v3.17+ Signed-off-by: Yoshihiro Shimoda --- drivers/usb/host/xhci-rcar.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-rcar.h b/drivers/usb/host/xhci-rcar.h index 2941a25..2afed68 100644 --- a/drivers/usb/host/xhci-rcar.h +++ b/drivers/usb/host/xhci-rcar.h @@ -24,7 +24,11 @@ static inline void xhci_rcar_start(struct usb_hcd *hcd) static inline int xhci_rcar_init_quirk(struct usb_hcd *hcd) { - return 0; + /* + * To avoid wait and timeout in xhci_reset() if CONFIG_XHCI_RCAR is + * disabled, this function fails. + */ + return -ENODEV; } #endif #endif /* _XHCI_RCAR_H */