From patchwork Fri May 6 06:20:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 9029141 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 43D1D9F30C for ; Fri, 6 May 2016 06:20:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F1D620376 for ; Fri, 6 May 2016 06:20:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59A0C20303 for ; Fri, 6 May 2016 06:20:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932068AbcEFGUo (ORCPT ); Fri, 6 May 2016 02:20:44 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:26241 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751171AbcEFGU3 (ORCPT ); Fri, 6 May 2016 02:20:29 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 06 May 2016 15:20:27 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 353A1462C2; Fri, 6 May 2016 15:20:26 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id D8F5D8002E; Fri, 6 May 2016 15:20:25 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id B6CB98002D; Fri, 6 May 2016 15:20:25 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id RAN11997; Fri, 6 May 2016 15:20:25 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="210718282" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 06 May 2016 15:20:25 +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=nWNAEgIiXuFjFbo4an+iJy+W/HQubsyPvo/ZapQeOa0=; b=AuOrSEBAKUCTxXnFsBuURrjr5BPGbdU0/+Xl0YetVKnhS8UQO0vLDn3glzXWi26/l6f3VobH/wvCyVrmu6Ix+0v1ygfC/AvbHbRbtRlpXf16tpoUjLMjGlNlYKgcYM8iTD5pvHsodxEX1N7qOjxvVt/sJXAam+sG4rIxnnHoO8U= 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 SIXPR06MB0924.apcprd06.prod.outlook.com (10.162.180.29) with Microsoft SMTP Server (TLS) id 15.1.492.11; Fri, 6 May 2016 06:20:22 +0000 From: Yoshihiro Shimoda To: , CC: , , , Yoshihiro Shimoda Subject: [PATCH v3] usb: host: xhci-rcar: Avoid long wait in xhci_reset() Date: Fri, 6 May 2016 15:20:11 +0900 Message-ID: <1462515611-6972-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: TY1PR06CA0019.apcprd06.prod.outlook.com (10.164.91.29) To SIXPR06MB0924.apcprd06.prod.outlook.com (10.162.180.29) X-MS-Office365-Filtering-Correlation-Id: 47cd6236-b9d4-4078-07d8-08d375768165 X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0924; 2:psm671tyZHxtMH1UEnB7hkswQDKGiBaLWwUdjCvXf+L9jpukQNGZDi56qNdApIM0jl+PHlD2F1jYlEFHssrn4nkymf2l81Yn5l9psGYFtLFEag+S5Z9Nqu+BCrSjMKfbo8dus6rzQrLtR+eM2ZMh5ISod0lRV3U4icbUwAV/irnvKQM6dcjUpRp98+coO1CB; 3:HHXNEpoEFW6jQWVjxPA+oM+nTQCXOxjDWVMasEr7msi0pYLLrWGFHqcq3KAKK7j3F9NiBOWti+3IuTkKJlk8vnbf55AyoR8RLqL6a6CCeozeNJT2lzlRymKeQA25CaZ8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0924; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0924; 25:8ry+8zDQMIGPSuoV4LET2iy83/YbkfaVJ0I0oK4B1ptfHm9GdoFUPCv2rjwDAVf27oXeoiwfGYij5pRvO57Lk00mT7f9EP0B17g69lHGI6zOCin6nR3z3E6Z/K9BuZB5prSAE1YKeN9MjOLGzF8lQ7UlTq1/unTOMC3kX2Cgke37v/0BNSYuQdNVlcMONKnb5wVlYT+fsLSQYo4+Lxq4U6kM1E2jO+t2ugG9yYz2YOHmuakqfkz3ZuMf5edL/EmInwB6d1mwhaNLKMSjBY0ON96EAvw2etT8ujGOYsPnE8Ou1Bmc4o1N+7Fkk8hAwxmZVJ2x2mCYMRbrYDBGpZNb3x3oZF5lgRHL2sqGTjx07UMfb5WY161PFK/AwF0x7esVUEpj3In5/vF7DOgA0SnbpdVLt0QLEXdmxq72r+3zovjT4JYn/90FdORuq/XYiAaqRu7BoRk/T3E3vwMzGSQs2ujUM4sou2smQQTtHAbTTfb9jizbaK9K3KPCTPmQ/+TvwttX5GDCa9TSbn17xr5/VlKUhBVludhTZiQyOkb6AtFdY20/n8g3PFECYqJ7EczvZ6Le9kkCmG0nRDCevwcTwG4/u09BztHrolLKnfR2Z6t/2v3h2snvHAqOtB0k4+R0PPgYxhtxidYD2Javer+IaXql2m/9NrvZbwI/4e83HXTDIlMhOzkzdvKsGX5kK4Rzkwj+K4jeOZGlkq4I68cHZUog/rsyN/MwUGtqBKFGauSxfbUKf3K3xseptcvtqDUKFJl24Yv3H2Qk4uSWkAVWD01AgS6ctavVHabOPBmUnwGl7v87/HhISJx5FN0qF5+2ZQbyzPmRs/LcXES9t/Xvc1FCKs7QjFau7AwWKt99+pk= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0924; 20:4pYndDxzHRnxrY05/QCHDlfE1C7xUy31TUsapst+tMMh8BYbslyoRCiRxRGlYrb1YC4LVO21PPxe2uTDc6D3DTvDwGvM9qwed/uLT8QQuRMPPHVL8ELPAdLm3PXUkp8bLkobImftHKi1YWd8pnJq7Mtj2zLTvLfKpS7CooYS90aF2af+TrodAvCTlPjRmRBUw0I/NyulFSjBzTiOHVApGVosrjiNo2pwEKGfzbt22y2Zmhx+6qYSzQ/OMRnCiBa0DLWomZNRM9owQJZyJUSud2Tw9hAneRmDibOXgzydpx4kzPjBaod2j74xmF5aXZ8lbbDAmp6g9EXWbxtsPOnSPM7wOuyKSLdRRdsfAdwmSjY4lVoZTfzDKNnuZo7h7g5njoxrsLjD0geifBWsDyFZUtqGxQ17rm0HbcssXMNcgjUrTDvsncVGhboKVzrMj/KbLmcLxwD6PKNKftoTs+PJhruZWOcx4vZNyNx/rM4DdR6AwjWiycxj7opMmz1AOBNO; 4:Q/qSB0FVcInGJoEYH6QKrZI7dy+MrztZ+c+tU0FMSNI+4Mz5DNSyjPykV5C2mNWTehFsnCMRk6V5lfqI2/hierd9XU/YoZNR9x1HBUzQkrn8TpOy0o8172JekOc2x7aqk06L6afzGgO6iQCvYaGD1Pem4y2VA9K2p7d3tStHTJN++US9JJemRcWxQyjSdv56ku4HgllFSWj5MR8h5U2OfWA31CxJW10oi0l48ngbIxYmFL/OK9GjxFD0IMtU5T1dnfJ2Z4CFvo0s6270zRJanXluIhK/fZnSJA4tYK3xBD7e0cW2q283UShk8YFEiQMkJqiuEs+pVv3dzs5PKMaCLngGB8mv41OuHRSLkw4LftGLttSskrgDm+L/5ED/Qbd0flXn2zsvv3caZw9mXRQ4AA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:SIXPR06MB0924; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0924; X-Forefront-PRVS: 09347618C4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6069001)(33646002)(229853001)(586003)(19300405004)(66066001)(47776003)(81166005)(5003940100001)(3846002)(5008740100001)(50986999)(4001430100002)(92566002)(19580405001)(19580395003)(6116002)(50226002)(48376002)(15975445007)(5004730100002)(77096005)(50466002)(5001770100001)(36756003)(4326007)(189998001)(107886002)(78352003)(2906002)(42186005)(42382002)(76506005)(562404015); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0924; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0924; 23:vMapYoB59q//EnmgslGUbUKGNIqZla05QXZKrUf9e?= =?us-ascii?Q?0t4XnpdxpLSFnpB6IVWxw9M3x9y+haTn9G9iBDJBg0+AxR9ksMlTjf8Epb91?= =?us-ascii?Q?Cach43fOQjKkLprhkxSTyWj5Z6R1sIk+3IETabfocAsvonEEY6EimNmn6lSB?= =?us-ascii?Q?Wb8QY/KAZZuOTSVvxiel0J7A/QEsGjjL7z0Xy1evLq3Gh71q2qHPq8n5l2Ek?= =?us-ascii?Q?sYpXzqdTOGdUG7Wy+avkSsTOZTF/s2DjBFsxvK3LWyrTtlEfHSpkSB1jXTAO?= =?us-ascii?Q?qiFdhUkZWPZa+koJSY7pkXbkYBbJbZArDP1qFHbuxBBZk4GNPEBngmrWyOGe?= =?us-ascii?Q?aPDsD0VF2mmtuH2yn3oDNB4Gvmftpli9h6OF1cKYmphuHtSNoaJKzUO9o14d?= =?us-ascii?Q?LBxUyjO8xqs+/qX7KFwg3G2e/E/abMab7DE7Vdghp2D8o1t3QVZCSn0vQ1zY?= =?us-ascii?Q?76YpA5thYnRxDSCMKJrV97i3JytCmA+p2u4toATkg9+UTSqJNIIlBv4oApNv?= =?us-ascii?Q?m4n0tl0NOBdJAXmrU/OlciZ9Pbph6L5X0kFMShh8s1omUoRMDsWpNPCGkRZW?= =?us-ascii?Q?+TuWaX6eeujUZVBdKIy4HNDkKFhZLS5Jh6ZNqVmN+IhQ3HIhfvaUpyRYhYU9?= =?us-ascii?Q?/OSKLprByFDYk0lU0HuyB+67UUpFXQ4w/PqBWP6AeuNRduPnvbvOdscPArr8?= =?us-ascii?Q?Ozk8KkFR3oAnteHXN/mDrg9PQcCssVjjccSh3+5dSHuK0DO63NXHWc/mpEkV?= =?us-ascii?Q?2Biyb9lzvgf+LHPayj0Jx9TJxcYjv7Oxa2ieqWOOUWKngFXYxtjeWW+/ZA1L?= =?us-ascii?Q?TZQwy7BWKYe9zhcCX5VKTqdS6ImrOC/T4Je3r9rnZF1yMEh9AT2g54ppfCyw?= =?us-ascii?Q?spkNX8bFsT+xASLBtIbEtJkoriy+qR6mpbTnqD8BalPveDAo0up0EqzgpsGV?= =?us-ascii?Q?01JbFLPcAcRut4C80MskqnlPf00q+c7+CnfMmxCulnNmLQKcctRHY9v/waZ4?= =?us-ascii?Q?e6rBgLRSeOTHxzlvUUC8wpa?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0924; 5:NlksxbNcgqjWKUJ9jquqbiLOZsrlYnqkb3eVGgW0+ZfBeJjQGMKEL/LZ1HZ/xeg/l9RwYzxWY6kycBgJbqFvuJ1l8ezAnj5cfkrcEZ8x3BGrRq4O4cHQFc21o9ZBY8rBGX+PkiQ5edO+EKWzKstTng==; 24:M2FTCZrB3pdKc6gM7AErDbrY7NJnvqhdiLxlACbbCcblMq2U4sjmaV4KeVHZdIbq0om1dcFrrwkl63t9NpMvEP6artBRkG7PupiNGD1T4TY=; 7:frYg5kEvivIl3WpnTHHP404kTfKfuidkWb5nntr7puUemCyQPwvgqIUbnMdLdhFr49p7UWsBodKD4THPUjJCLlsCW4iZr3HHgPL0DZm3jzMzFg9ZYCBIJ1mkRI9VGIfBoHbfuF1lHs2J4mKCdWwqPMy7wdJ9yEclP0ptBJESheZeJYRSX+0Rl1pkWULO1Mf4; 20:eW2I++chYGr/pLQaO6DUz9gmM33kG5M7XN2Ttnbwj4WocjkoKWOY09vnfmS4dzPY0EG9uTm9AOOqkevFyRmAzrOrafvyNkCM7WM+kGcGxf3d05bXoMnX6GRq33cxlTbiGoA4997DPTTVtLvol0oQlhoTe+rS3AlXfrhC8aec54o= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2016 06:20:22.3875 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0924 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=-9.0 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 The firmware of R-Car USB 3.0 host controller will control the reset. So, if the xhci driver doesn't do firmware downloading (e.g. kernel configuration is CONFIG_USB_XHCI_PLATFORM=y and CONFIG_USB_XHCI_RCAR is not set), the reset of USB 3.0 host controller doesn't work correctly. Then, the host controller will cause long wait in xhci_reset() because the CMD_RESET bit of op_regs->command is not cleared for 10 seconds. So, this patch modifies the Kconfig to enable both CONFIG_USB_XHCI_PLATFORM and CONFIG_USB_XHCI_RCAR. 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 Reviewed-by: Felipe Balbi --- Changes from v2: - Modify the Kconfig instead of xhci-rcar.h http://www.spinics.net/lists/linux-usb/msg139681.html http://www.spinics.net/lists/linux-usb/msg139722.html Changes from v1: - Revise the commit log. http://www.spinics.net/lists/stable/msg130007.html drivers/usb/host/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 3050b18..e9d4dde 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -35,6 +35,7 @@ config USB_XHCI_PCI config USB_XHCI_PLATFORM tristate "Generic xHCI driver for a platform device" + select USB_XHCI_RCAR if ARCH_RENESAS ---help--- Adds an xHCI host driver for a generic platform device, which provides a memory space and an irq. @@ -63,7 +64,7 @@ config USB_XHCI_MVEBU config USB_XHCI_RCAR tristate "xHCI support for Renesas R-Car SoCs" - select USB_XHCI_PLATFORM + depends on USB_XHCI_PLATFORM depends on ARCH_RENESAS || COMPILE_TEST ---help--- Say 'Y' to enable the support for the xHCI host controller