From patchwork Fri Apr 15 10:03:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 8846901 Return-Path: X-Original-To: patchwork-linux-omap@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 38C21C0553 for ; Fri, 15 Apr 2016 10:03:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C68D202F0 for ; Fri, 15 Apr 2016 10:03:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC35F202E9 for ; Fri, 15 Apr 2016 10:03:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751574AbcDOKDY (ORCPT ); Fri, 15 Apr 2016 06:03:24 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:57603 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750900AbcDOKDW convert rfc822-to-8bit (ORCPT ); Fri, 15 Apr 2016 06:03:22 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 15 Apr 2016 19:03:19 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id C56C94CE64; Fri, 15 Apr 2016 19:03:19 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id C2127480A4; Fri, 15 Apr 2016 19:03:19 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id BA283480A3; Fri, 15 Apr 2016 19:03:19 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id VAR28291; Fri, 15 Apr 2016 19:03:19 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="209438958" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Apr 2016 19:03:17 +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=F5+cxW40GAmSJTw6PV8Nzz9b6SVsDZS6NuhvnqwRFi4=; b=bBnIcGGSRtTPhgDbMkIyUkKBN1F4kFMYL7MqFt6YBV9PenxruisUjx5dlFiHVxVlXXDenYD5rHlvj/kcQZBS+6+jItaVlf5vj8sDzJ/EZi1XhjdGqu1lWUtXmJLEi4pJuw+wBEJE8QrbD9ArII22HP1Vfn+82xU9SSyBz5bTLDc= Received: from SG2PR06MB0919.apcprd06.prod.outlook.com (10.162.204.152) by SG2PR06MB0920.apcprd06.prod.outlook.com (10.162.204.153) with Microsoft SMTP Server (TLS) id 15.1.453.26; Fri, 15 Apr 2016 10:03:16 +0000 Received: from SG2PR06MB0919.apcprd06.prod.outlook.com ([10.162.204.152]) by SG2PR06MB0919.apcprd06.prod.outlook.com ([10.162.204.152]) with mapi id 15.01.0453.030; Fri, 15 Apr 2016 10:03:16 +0000 From: Yoshihiro Shimoda To: Roger Quadros , "stern@rowland.harvard.edu" , "balbi@kernel.org" , "gregkh@linuxfoundation.org" , "peter.chen@freescale.com" CC: "dan.j.williams@intel.com" , "jun.li@freescale.com" , "mathias.nyman@linux.intel.com" , "tony@atomide.com" , "Joao.Pinto@synopsys.com" , "abrestic@chromium.org" , "r.baldyga@samsung.com" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" Subject: RE: [PATCH v6 07/12] usb: otg: add OTG/dual-role core Thread-Topic: [PATCH v6 07/12] usb: otg: add OTG/dual-role core Thread-Index: AQHRj0Tb371d8JP1IUix4M6r6OgSS59+LbDwgAA5sgCAAYajwIAEtH8AgASOAyCAACp4gIAAAhUAgAAG6oCAAUYGkIAAMvNA Date: Fri, 15 Apr 2016 10:03:16 +0000 Message-ID: References: <1459865117-7032-1-git-send-email-rogerq@ti.com> <1459865117-7032-8-git-send-email-rogerq@ti.com> <57064850.3060405@ti.com> <570B8268.6090700@ti.com> <570F7827.8050707@ti.com> <570F7FB3.2040807@ti.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: ti.com; dkim=none (message not signed) header.d=none; ti.com; dmarc=none action=none header.from=renesas.com; x-originating-ip: [211.11.155.144] x-ms-office365-filtering-correlation-id: b0506aff-32fa-4f14-ebc9-08d365152a12 x-microsoft-exchange-diagnostics: 1; SG2PR06MB0920; 5:xcXhoyweTxVGzc92PfJ2u1UzL4nJAAO1iIkt/YrPhfD7mV4VAZB/q9ZW4RLlVHEoW0Bdaz+7EWvlE7NoOyg2yhoPWHMJ/pmQ/BGGJG2tMrjjUvRR6ImD5qCOS1xkXtVeB/Y/V5XmoceKHiZpY67aeQ==; 24:Kxr0i7Bmheb5KO+xVF73B9mt5UCN1cADScCJwIowEi5T4au7zAI8neyVYN1XTg3us7vmyza4oqhuMPaqwYcIHDHvGxb3yejtOfcKTpvwXM8=; 20:R8pNz3gTfr9Piw8z33lVc4KTX8/XS3aeyss9wPpx5IXxe98zqeI8AP+i7mr6cXyCW7Fqp+O4C4kGTzbvxMB2oEaEwsJa7W0KTROYjgRqOmmcYD5V7/wxfO+HAHH6WSryPYQg9sQa+Z/sJQ0hdg2UKsee5X3tmIaZNS/5A9uuyhk= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB0920; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(9101521026)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:SG2PR06MB0920; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0920; x-forefront-prvs: 0913EA1D60 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(377454003)(57704003)(24454002)(76176999)(77096005)(2171001)(87936001)(54356999)(50986999)(3280700002)(5002640100001)(9686002)(11100500001)(93886004)(2900100001)(345774005)(122556002)(2906002)(86362001)(5003600100002)(3660700001)(33656002)(2501003)(10400500002)(74316001)(81166005)(92566002)(19580395003)(4326007)(76576001)(5001770100001)(5008740100001)(3846002)(102836003)(106116001)(2201001)(6116002)(189998001)(19580405001)(586003)(1096002)(1220700001)(5004730100002)(66066001)(7059030); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0920; H:SG2PR06MB0919.apcprd06.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Apr 2016 10:03:16.3192 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0920 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Hi, > From: Yoshihiro Shimoda > Sent: Friday, April 15, 2016 6:59 PM > > Hi, > > > From: Roger Quadros > > Sent: Thursday, April 14, 2016 8:32 PM > > > > On 14/04/16 14:15, Yoshihiro Shimoda wrote: > > > Hi, > > > > < snip > > > >>> @@ -865,7 +867,8 @@ int usb_otg_register_hcd(struct usb_hcd *hcd, unsigned int irqnum, > > >>> * we're ready only if we have shared HCD > > >>> * or we don't need shared HCD. > > >>> */ > > >>> - if (otg->shared_hcd.hcd || !otg->primary_hcd.hcd->shared_hcd) { > > >>> + if (otg->shared_hcd.hcd || (!otg->caps->needs_companion && > > >>> + !otg->primary_hcd.hcd->shared_hcd)) { > > >>> otg->host = hcd_to_bus(hcd); > > >>> /* FIXME: set bus->otg_port if this is true OTG port with HNP */ > > >>> > > >> > > >> These changes look good to me. Thanks. > > > > > > Thank you for the comment. > > > If we change the "needs_companion" place to the otg_config, > > > do we need to add a flag into the otg, instead of otg->caps? > > > > Yes we can add a flag in struct usb_otg. > > Thank you for the comment. > > I made a fixed patch. > So, should I send this patch to ML after you sent v7 patches? > Or, would you apply this patch before you send v7 patches? Oops, I sent this email without my patch... Acked-by: Peter Chen --- Subject: [PATCH] usb: otg: add hcd companion support Since some host controller (e.g. EHCI) needs a companion host controller (e.g. OHCI), this patch adds such a configuration to use it in the OTG core. Signed-off-by: Yoshihiro Shimoda --- Documentation/devicetree/bindings/usb/generic.txt | 3 +++ drivers/usb/common/usb-otg.c | 17 +++++++++++++---- include/linux/usb/otg.h | 7 ++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/generic.txt b/Documentation/devicetree/bindings/usb/generic.txt index f6866c1..1db1c33 100644 --- a/Documentation/devicetree/bindings/usb/generic.txt +++ b/Documentation/devicetree/bindings/usb/generic.txt @@ -27,6 +27,9 @@ Optional properties: - otg-controller: phandle to otg controller. Host or gadget controllers can contain this property to link it to a particular OTG controller. + - hcd-needs-companion: must be present if otg controller is dealing with + EHCI host controller that needs a companion OHCI host + controller. This is an attribute to a USB controller such as: diff --git a/drivers/usb/common/usb-otg.c b/drivers/usb/common/usb-otg.c index 41e762a..83c8c96 100644 --- a/drivers/usb/common/usb-otg.c +++ b/drivers/usb/common/usb-otg.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -600,6 +601,10 @@ struct usb_otg *usb_otg_register(struct device *dev, else INIT_WORK(&otg->work, usb_otg_work); + if (of_find_property(dev->of_node, "hcd-needs-companion", NULL) || + config->hcd_needs_companion) /* needs comanion ? */ + otg->flags |= OTG_FLAG_HCD_NEEDS_COMPANION; + otg->wq = create_singlethread_workqueue("usb_otg"); if (!otg->wq) { dev_err(dev, "otg: %s: can't create workqueue\n", @@ -823,13 +828,15 @@ int usb_otg_register_hcd(struct usb_hcd *hcd, unsigned int irqnum, /* HCD will be started by OTG fsm when needed */ mutex_lock(&otg->fsm.lock); if (otg->primary_hcd.hcd) { - /* probably a shared HCD ? */ - if (usb_otg_hcd_is_primary_hcd(hcd)) { + /* probably a shared HCD or a companion OHCI HCD ? */ + if (!(otg->flags & OTG_FLAG_HCD_NEEDS_COMPANION) && + usb_otg_hcd_is_primary_hcd(hcd)) { dev_err(otg_dev, "otg: primary host already registered\n"); goto err; } - if (hcd->shared_hcd == otg->primary_hcd.hcd) { + if (otg->flags & OTG_FLAG_HCD_NEEDS_COMPANION || + (hcd->shared_hcd == otg->primary_hcd.hcd)) { if (otg->shared_hcd.hcd) { dev_err(otg_dev, "otg: shared host already registered\n"); goto err; @@ -865,7 +872,9 @@ int usb_otg_register_hcd(struct usb_hcd *hcd, unsigned int irqnum, * we're ready only if we have shared HCD * or we don't need shared HCD. */ - if (otg->shared_hcd.hcd || !otg->primary_hcd.hcd->shared_hcd) { + if (otg->shared_hcd.hcd || + (!(otg->flags & OTG_FLAG_HCD_NEEDS_COMPANION) && + !otg->primary_hcd.hcd->shared_hcd)) { otg->host = hcd_to_bus(hcd); /* FIXME: set bus->otg_port if this is true OTG port with HNP */ diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index b094352..6f4ca77 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -57,7 +57,8 @@ struct otg_hcd { * @list: list of otg controllers * @work: otg state machine work * @wq: otg state machine work queue - * @flags: to track if host/gadget is running + * @flags: to track if host/gadget is running, or to indicate if hcd needs + * companion */ struct usb_otg { u8 default_a; @@ -84,6 +85,7 @@ struct usb_otg { u32 flags; #define OTG_FLAG_GADGET_RUNNING (1 << 0) #define OTG_FLAG_HOST_RUNNING (1 << 1) +#define OTG_FLAG_HCD_NEEDS_COMPANION (1 << 2) /* use otg->fsm.lock for serializing access */ /*------------- deprecated interface -----------------------------*/ @@ -125,11 +127,14 @@ struct usb_otg_caps { * @caps: otg capabilities of the controller * @ops: otg fsm operations * @otg_work: optional custom otg state machine work function + * @hcd_needs_companion: Indicates if host controller needs a companion + * controller */ struct usb_otg_config { struct usb_otg_caps *otg_caps; struct otg_fsm_ops *fsm_ops; void (*otg_work)(struct work_struct *work); + bool hcd_needs_companion; }; extern const char *usb_otg_state_string(enum usb_otg_state state);