From patchwork Mon Oct 22 05:42:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10651727 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 12670109C for ; Mon, 22 Oct 2018 05:43:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00A4628703 for ; Mon, 22 Oct 2018 05:43:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6AFA287E7; Mon, 22 Oct 2018 05:43:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A96228703 for ; Mon, 22 Oct 2018 05:43:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727527AbeJVOAC (ORCPT ); Mon, 22 Oct 2018 10:00:02 -0400 Received: from mail-eopbgr10066.outbound.protection.outlook.com ([40.107.1.66]:36974 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726784AbeJVOAC (ORCPT ); Mon, 22 Oct 2018 10:00:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hWeIemQJ+uHzUcsTuhR+PWzXooglmgxBI1xJRlex8E8=; b=nOFk137+TgID7f2/9vIomT6jztbXUDNZM5H3g5JUugdRLCLVq6fYzHKX0Os2F1mYMx28v7MAeYlEyhCCZ3CnqlKYMfvX34aUNkdBTFQRJpb/h51Xg1W40dNpaYzPRcYW0pP/d4YRc76wKcO4I4bPmOsCB2f+DWU3RAFSnr2X6pg= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB4045.eurprd04.prod.outlook.com (10.171.182.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.20; Mon, 22 Oct 2018 05:42:57 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97%3]) with mapi id 15.20.1250.028; Mon, 22 Oct 2018 05:42:57 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "frieder.schrempf@exceet.de" , "festevam@gmail.com" , Peter Chen Subject: [PATCH v2 1/4] usb: chipidea: add flag for imx hsic implementation Thread-Topic: [PATCH v2 1/4] usb: chipidea: add flag for imx hsic implementation Thread-Index: AQHUacoVjKUbgl66mkyZsu6I4B79fA== Date: Mon, 22 Oct 2018 05:42:56 +0000 Message-ID: <20181022054031.14027-2-peter.chen@nxp.com> References: <20181022054031.14027-1-peter.chen@nxp.com> In-Reply-To: <20181022054031.14027-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0P153CA0036.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::24) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB4045;6:q7VGa6Hk6aiOD++yXOZNOzuARgRpZ6Bt7JP5F+YP0dMz+HLfGj/0nD+Pe9JjEuPXQxyMZiuayI8Zr6i5QLz0AI5Qz6V+NAF586iNG6PzzZILgc2M4q6u421wov5oxHWm9bDTU7SWg3HgVFzdctOvh6uk+OSVv6UWebIVWhKsC5sBzznzj5PeLkDP+zClkTYODh6+bAxICyQ36evseR7hA/c3N2ffWp4a5g8IKTolkuSBwKTnyyZxxNx9uLek8YovEZfhh3m2otTQFz6orskQlPPHZoWTxnxQaIeEQPTmNI0lzqwn8oZhb72XHzR5aM55RfnxjNNnCg5EpkKAcwsaNUmX8xxqEGdlLl/lyuz6qSB9h0k4FSHqR5cofGCOsOGj5q+MOVVkuJdQ7sY10sxEhaPdvWI8K6fZWrOAtPv8fqKiIR4xjNYWbADAjfdLhM684tBr0mSBvHaL2ty/D15jhQ==;5:hKmBdklBHQ/FUQk2epvptDZMoqGken2Xqn86liqmXla6t/FSJeFTg5S7/7ISTiwLjH45qwMRkwAHql0/39zft9Cc6cuAFZf72fgpszwiTLJyA+G4EGXZWXeeO3dS31vG4Or9YednXnZg399Gb9bA4aIsmlXn2nNZuJ4I/d/q6m8=;7:Up2wVvE9sNYHEjPz9RKrbRyj+AhoSi8NYWVNq0jRldEYh9c5otMtHWhHS3BoFOFAXIoZfoU2w0i27Eof0971MzwceybVbV2fkDzbOj8LaxMggDmNYihAUlDpKKV/J+Sb8Okl0TChDxYlKU215Ol7ofMfXGrntdeQ6Box7g2RylTnqWM3TiS+OXUf4oFc26+M204itiL8wa6ksYHlBGkF6+PlbgI0MtNxTZyaNBXwWcrdRbpzLZesVprOVyv1Fkfb x-ms-office365-filtering-correlation-id: 21dfe8ea-718e-4cf2-b7c0-08d637e13804 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB4045; x-ms-traffictypediagnostic: VI1PR04MB4045: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:VI1PR04MB4045;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB4045; x-forefront-prvs: 08331F819E x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(346002)(136003)(376002)(396003)(366004)(199004)(189003)(54906003)(6512007)(186003)(6486002)(305945005)(5640700003)(3846002)(66066001)(478600001)(2351001)(7736002)(6116002)(6916009)(6436002)(106356001)(2900100001)(5660300001)(105586002)(11346002)(44832011)(52116002)(76176011)(2616005)(8676002)(4326008)(81156014)(81166006)(71200400001)(2906002)(25786009)(316002)(6506007)(476003)(2501003)(486006)(68736007)(8936002)(5250100002)(71190400001)(386003)(1076002)(97736004)(446003)(50226002)(26005)(36756003)(53936002)(86362001)(256004)(14444005)(102836004)(99286004)(14454004)(39060400002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB4045;H:VI1PR04MB5327.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 7T5Ca8X6LJi3x8ETxJZNnoFlAA41xVsKrBDFh2DM+K8HN890umcpGa+giQYah7b5V/tRHVQGCtsqiyJLnZKAnExVXn+M5HqvgCCdD7Jd1vuKMA6BfUCjyqMRZQ+MfCjG1TfXiqL2G9SqGwEzh8YSakzc+vlo2sfZnqV2yLbHIwGVUlFEFxpxa1AyHq9QZNX/9Y8/XwYtdAz5Wp/g67N43npO7hH/CszJHQoETiVUMKt3taLu9Xck1bY+YQ+hkB+YQ2rJ5do+57GKEYW7XWXKPwUY70MwNBFYVLj9FG+q87HWF22K2O/FMbI09W6Z2VrUI3th5enTYh9e8OEdAp/lNr/E7MdkIEfnakNVkUG382s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21dfe8ea-718e-4cf2-b7c0-08d637e13804 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2018 05:42:57.0100 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4045 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP NXP (Freecale) imx HSIC design has some special requirements, add some flags at host code to handle them. Signed-off-by: Peter Chen --- drivers/usb/chipidea/host.c | 24 ++++++++++++++++++++++++ include/linux/usb/chipidea.h | 3 +++ 2 files changed, 27 insertions(+) diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index d858a82c4f44..d74a13d7c21c 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -28,6 +28,20 @@ struct ehci_ci_priv { struct regulator *reg_vbus; }; +/* This function is used to override WKCN, WKDN, and WKOC */ +static void ci_ehci_override_wakeup_flag(struct ehci_hcd *ehci, + u32 __iomem *reg, u32 flags, bool set) +{ + u32 val = ehci_readl(ehci, reg); + + if (set) + val |= flags; + else + val &= ~flags; + + ehci_writel(ehci, val, reg); +} + static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); @@ -170,6 +184,11 @@ static int host_start(struct ci_hdrc *ci) otg->host = &hcd->self; hcd->self.otg_port = 1; } + + if (ci->platdata->notify_event && + (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC)) + ci->platdata->notify_event + (ci, CI_HDRC_IMX_HSIC_ACTIVE_EVENT); } return ret; @@ -218,6 +237,8 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci) static int ci_ehci_bus_suspend(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); + struct device *dev = hcd->self.controller; + struct ci_hdrc *ci = dev_get_drvdata(dev); int port; u32 tmp; @@ -249,6 +270,9 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd) * It needs a short delay between set RS bit and PHCD. */ usleep_range(150, 200); + if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) + ci_ehci_override_wakeup_flag(ehci, reg, + PORT_WKDISC_E | PORT_WKCONN_E, false); break; } } diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index 63758c399e4e..911e05af671e 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -60,9 +60,12 @@ struct ci_hdrc_platform_data { #define CI_HDRC_OVERRIDE_RX_BURST BIT(11) #define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */ #define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13) +#define CI_HDRC_IMX_IS_HSIC BIT(14) enum usb_dr_mode dr_mode; #define CI_HDRC_CONTROLLER_RESET_EVENT 0 #define CI_HDRC_CONTROLLER_STOPPED_EVENT 1 +#define CI_HDRC_IMX_HSIC_ACTIVE_EVENT 2 +#define CI_HDRC_IMX_HSIC_SUSPEND_EVENT 3 int (*notify_event) (struct ci_hdrc *ci, unsigned event); struct regulator *reg_vbus; struct usb_otg_caps ci_otg_caps; From patchwork Mon Oct 22 05:43:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10651729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C981112B for ; Mon, 22 Oct 2018 05:43:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B15528703 for ; Mon, 22 Oct 2018 05:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F133287E7; Mon, 22 Oct 2018 05:43:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4468E28703 for ; Mon, 22 Oct 2018 05:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727502AbeJVOAH (ORCPT ); Mon, 22 Oct 2018 10:00:07 -0400 Received: from mail-eopbgr10049.outbound.protection.outlook.com ([40.107.1.49]:64432 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726784AbeJVOAH (ORCPT ); Mon, 22 Oct 2018 10:00:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8p5wBS/3GOq78FHlWEJ7vjZsfboVwzRowZKUs+XLFo8=; b=CI99tJAjvY4R4CzXk+MDTLHz+Xp7K14Q7FLrBHetH0AobHph3c8RRIKh+PeVY5l4DjOKY7So8z4MNEM+d1dHLpJg9Te5yv5TeilFhZvNB6xFNXx/1kT49Wi2xzysQeLTD2mPxV1T5dEi1m6Sf4gr2BPuXnhXMBVV8gtFp81xQBs= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB4045.eurprd04.prod.outlook.com (10.171.182.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.20; Mon, 22 Oct 2018 05:43:01 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97%3]) with mapi id 15.20.1250.028; Mon, 22 Oct 2018 05:43:01 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "frieder.schrempf@exceet.de" , "festevam@gmail.com" , Peter Chen Subject: [PATCH v2 2/4] usb: chipidea: imx: add HSIC support Thread-Topic: [PATCH v2 2/4] usb: chipidea: imx: add HSIC support Thread-Index: AQHUacoYf+EAWMlw3kiHVgElr/TR5Q== Date: Mon, 22 Oct 2018 05:43:01 +0000 Message-ID: <20181022054031.14027-3-peter.chen@nxp.com> References: <20181022054031.14027-1-peter.chen@nxp.com> In-Reply-To: <20181022054031.14027-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0P153CA0036.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::24) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB4045;6:NNYkSUIC0r9lqKEe3I1wehLRnRgLEtYjyo3pa9wDou71B/u8opzGZjvyQWDmS7zXFYeodqCtRfJ4XkncGf7wxDEPxoS0/QtSqczQEYyQwla88PTYvjRBySzBxMUPBWWqM834sTRU0V1vL9VqLWP+jQYMoIXzaD94JAYsb0XSizWaJtHwBwbg5zr18PSPxHC4C35orAK7t1SuWtovXSD9gFq9CwaaswHLOld6TWfPO0hteJOW2VmS+1rygwLRbhEuyYPvZXOyhlPpt/dCinQiFU+db1cWFq93PS6R9OIwoiL/a8Wzj58iwIucw1leaWkbXujaQlwQa5Na1APE6reicMTkG2UJLXP0Zc04ka7OMtFsuv+KoM1197ybFq2/WJECv2GBtuNU6tN6D7Xnbo4oRGAJeP0h0BT0z3mN/aj5CeNkh3XHeUhU5PfhoUSP121fbM9iedRVbdFN8Q1rlW9Yxg==;5:JNXi4yBzypngRY2khX8O1iQZbb4gVGNE+NmAM4SQsmq3HjDNWA8asUT4fkZn3FTc/l2Zfg3AmKc5A31JH3BSvOyi2EhFex87DdbnouK5wZBgYfowhKlfyERLRYHbM2EYZeD+hI+1RJMP4mNNHQA1Fd6gA4W+bZn0nkrkchnqZCY=;7:2mpdJYpDemhG6SpAn4947/VoZc4pPB1eSwcYcFc3nJEnDEdrC5ie0I0aaIgQ8t5uX9nJ8oHHkQUvpXeir6yl4iQzBanw7HBOmRAohTGgnc6Fzt0wkB6WCBqmRTaVdS+GV22jcMBta+CSPxiccORHzVQbtWI7tHakCLk7jsjYNO2s4oL+ExyTj3Yk+HwVb2FIT/TNHBFKXTHozXA4n0SRyn7uRVDTbBRQZPGbXvLYF5yR+wzkSUd8XJMLYc96c3UL x-ms-office365-filtering-correlation-id: ea54464e-b936-49d1-5717-08d637e13a94 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB4045; x-ms-traffictypediagnostic: VI1PR04MB4045: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:VI1PR04MB4045;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB4045; x-forefront-prvs: 08331F819E x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(979002)(39860400002)(346002)(136003)(376002)(396003)(366004)(199004)(189003)(54906003)(6512007)(186003)(6486002)(305945005)(5640700003)(3846002)(66066001)(478600001)(2351001)(7736002)(6116002)(6916009)(6436002)(106356001)(2900100001)(5660300001)(105586002)(11346002)(44832011)(52116002)(76176011)(2616005)(8676002)(4326008)(81156014)(81166006)(71200400001)(2906002)(25786009)(4744004)(316002)(6506007)(476003)(2501003)(486006)(68736007)(8936002)(5250100002)(71190400001)(386003)(1076002)(97736004)(446003)(50226002)(26005)(36756003)(53936002)(575784001)(86362001)(256004)(14444005)(102836004)(99286004)(14454004)(53946003)(39060400002)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB4045;H:VI1PR04MB5327.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: EIBRg8R7tkQD58M///KVZ/mg5LRVm+Idl5YCNGFp+YJ8eNr0oxGusx3eRXfud52nTmxWZ/jpvFrMSZgDUm1c2DMUC4fmQR7vEGEx48egYb9CENb7QP3DBhixymS+xEKiqr6ewAtr8XGi4BzsVzEXCX9LluxeN7sXxw8QWoH0Ifn4Ng54C5dZKBISyc03YxFhIjOl+6l6D5vt4dOYrW6pPZhaCGhdlZdEqaQRS/PwiKmke0xi734cAccD816zyozS9buRsUeDqglYwVOKfQQJJlIPYuvPSsH6VyjL+uErusHtHBcUie4k7+XIMKVuoBuPybM2wm0c7GsSRiwbO+ZMFET0DGy6BwYxFh2Y72aw+Zo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea54464e-b936-49d1-5717-08d637e13a94 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2018 05:43:01.3848 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4045 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To support imx HSIC, there are some special requirement: - The HSIC pad is 1.2v, it may need to supply from external - The data/strobe pin needs to be pulled down first, and after host mode is initialized, the strobe pin needs to be pulled up - During the USB suspend/resume, special setting is needed Signed-off-by: Peter Chen --- drivers/usb/chipidea/ci_hdrc_imx.c | 140 ++++++++++++++++++++++++++++++++----- drivers/usb/chipidea/ci_hdrc_imx.h | 9 ++- drivers/usb/chipidea/usbmisc_imx.c | 130 ++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+), 19 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index 09b37c0d075d..389c3261c4ee 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "ci.h" #include "ci_hdrc_imx.h" @@ -85,6 +86,9 @@ struct ci_hdrc_imx_data { bool supports_runtime_pm; bool override_phy_control; bool in_lpm; + struct pinctrl *pinctrl; + struct pinctrl_state *pinctrl_hsic_active; + struct regulator *hsic_pad_regulator; /* SoC before i.mx6 (except imx23/imx28) needs three clks */ bool need_three_clks; struct clk *clk_ipg; @@ -245,19 +249,49 @@ static void imx_disable_unprepare_clks(struct device *dev) } } +static int ci_hdrc_imx_notify_event(struct ci_hdrc *ci, unsigned int event) +{ + struct device *dev = ci->dev->parent; + struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); + int ret = 0; + + switch (event) { + case CI_HDRC_IMX_HSIC_ACTIVE_EVENT: + ret = pinctrl_select_state(data->pinctrl, + data->pinctrl_hsic_active); + if (ret) + dev_err(dev, "hsic_active select failed, err=%d\n", + ret); + break; + case CI_HDRC_IMX_HSIC_SUSPEND_EVENT: + ret = imx_usbmisc_hsic_set_connect(data->usbmisc_data); + if (ret) + dev_err(dev, + "hsic_set_connect failed, err=%d\n", ret); + break; + default: + break; + } + + return ret; +} + static int ci_hdrc_imx_probe(struct platform_device *pdev) { struct ci_hdrc_imx_data *data; struct ci_hdrc_platform_data pdata = { .name = dev_name(&pdev->dev), .capoffset = DEF_CAPOFFSET, + .notify_event = ci_hdrc_imx_notify_event, }; int ret; const struct of_device_id *of_id; const struct ci_hdrc_imx_platform_flag *imx_platform_flag; struct device_node *np = pdev->dev.of_node; + struct device *dev = &pdev->dev; + struct pinctrl_state *pinctrl_hsic_idle; - of_id = of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev); + of_id = of_match_device(ci_hdrc_imx_dt_ids, dev); if (!of_id) return -ENODEV; @@ -268,19 +302,73 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, data); - data->usbmisc_data = usbmisc_get_init_data(&pdev->dev); + data->usbmisc_data = usbmisc_get_init_data(dev); if (IS_ERR(data->usbmisc_data)) return PTR_ERR(data->usbmisc_data); - ret = imx_get_clks(&pdev->dev); + if (of_usb_get_phy_mode(dev->of_node) == USBPHY_INTERFACE_MODE_HSIC) { + pdata.flags |= CI_HDRC_IMX_IS_HSIC; + data->usbmisc_data->hsic = 1; + data->pinctrl = devm_pinctrl_get(dev); + if (IS_ERR(data->pinctrl)) { + dev_err(dev, "pinctrl get failed, err=%ld\n", + PTR_ERR(data->pinctrl)); + return PTR_ERR(data->pinctrl); + } + + pinctrl_hsic_idle = pinctrl_lookup_state(data->pinctrl, "idle"); + if (IS_ERR(pinctrl_hsic_idle)) { + dev_err(dev, + "pinctrl_hsic_idle lookup failed, err=%ld\n", + PTR_ERR(pinctrl_hsic_idle)); + return PTR_ERR(pinctrl_hsic_idle); + } + + ret = pinctrl_select_state(data->pinctrl, pinctrl_hsic_idle); + if (ret) { + dev_err(dev, "hsic_idle select failed, err=%d\n", ret); + return ret; + } + + data->pinctrl_hsic_active = pinctrl_lookup_state(data->pinctrl, + "active"); + if (IS_ERR(data->pinctrl_hsic_active)) { + dev_err(dev, + "pinctrl_hsic_active lookup failed, err=%ld\n", + PTR_ERR(data->pinctrl_hsic_active)); + return PTR_ERR(data->pinctrl_hsic_active); + } + + data->hsic_pad_regulator = devm_regulator_get(dev, "hsic"); + if (PTR_ERR(data->hsic_pad_regulator) == -EPROBE_DEFER) { + return -EPROBE_DEFER; + } else if (PTR_ERR(data->hsic_pad_regulator) == -ENODEV) { + /* no pad regualator is needed */ + data->hsic_pad_regulator = NULL; + } else if (IS_ERR(data->hsic_pad_regulator)) { + dev_err(dev, "Get HSIC pad regulator error: %ld\n", + PTR_ERR(data->hsic_pad_regulator)); + return PTR_ERR(data->hsic_pad_regulator); + } + + if (data->hsic_pad_regulator) { + ret = regulator_enable(data->hsic_pad_regulator); + if (ret) { + dev_err(dev, + "Fail to enable HSIC pad regulator\n"); + return ret; + } + } + } + ret = imx_get_clks(dev); if (ret) - return ret; + goto disable_hsic_regulator; - ret = imx_prepare_enable_clks(&pdev->dev); + ret = imx_prepare_enable_clks(dev); if (ret) - return ret; + goto disable_hsic_regulator; - data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0); + data->phy = devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0); if (IS_ERR(data->phy)) { ret = PTR_ERR(data->phy); /* Return -EINVAL if no usbphy is available */ @@ -305,40 +393,43 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ret = imx_usbmisc_init(data->usbmisc_data); if (ret) { - dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", ret); + dev_err(dev, "usbmisc init failed, ret=%d\n", ret); goto err_clk; } - data->ci_pdev = ci_hdrc_add_device(&pdev->dev, + data->ci_pdev = ci_hdrc_add_device(dev, pdev->resource, pdev->num_resources, &pdata); if (IS_ERR(data->ci_pdev)) { ret = PTR_ERR(data->ci_pdev); if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "ci_hdrc_add_device failed, err=%d\n", ret); + dev_err(dev, "ci_hdrc_add_device failed, err=%d\n", + ret); goto err_clk; } ret = imx_usbmisc_init_post(data->usbmisc_data); if (ret) { - dev_err(&pdev->dev, "usbmisc post failed, ret=%d\n", ret); + dev_err(dev, "usbmisc post failed, ret=%d\n", ret); goto disable_device; } if (data->supports_runtime_pm) { - pm_runtime_set_active(&pdev->dev); - pm_runtime_enable(&pdev->dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); } - device_set_wakeup_capable(&pdev->dev, true); + device_set_wakeup_capable(dev, true); return 0; disable_device: ci_hdrc_remove_device(data->ci_pdev); err_clk: - imx_disable_unprepare_clks(&pdev->dev); + imx_disable_unprepare_clks(dev); +disable_hsic_regulator: + if (data->hsic_pad_regulator) + ret = regulator_disable(data->hsic_pad_regulator); return ret; } @@ -355,6 +446,8 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev) if (data->override_phy_control) usb_phy_shutdown(data->phy); imx_disable_unprepare_clks(&pdev->dev); + if (data->hsic_pad_regulator) + regulator_disable(data->hsic_pad_regulator); return 0; } @@ -367,9 +460,16 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev) static int __maybe_unused imx_controller_suspend(struct device *dev) { struct ci_hdrc_imx_data *data = dev_get_drvdata(dev); + int ret = 0; dev_dbg(dev, "at %s\n", __func__); + ret = imx_usbmisc_hsic_set_clk(data->usbmisc_data, false); + if (ret) { + dev_err(dev, "usbmisc hsic_set_clk failed, ret=%d\n", ret); + return ret; + } + imx_disable_unprepare_clks(dev); data->in_lpm = true; @@ -400,8 +500,16 @@ static int __maybe_unused imx_controller_resume(struct device *dev) goto clk_disable; } + ret = imx_usbmisc_hsic_set_clk(data->usbmisc_data, true); + if (ret) { + dev_err(dev, "usbmisc hsic_set_clk failed, ret=%d\n", ret); + goto hsic_set_clk_fail; + } + return 0; +hsic_set_clk_fail: + imx_usbmisc_set_wakeup(data->usbmisc_data, true); clk_disable: imx_disable_unprepare_clks(dev); return ret; diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h index 204275f47573..fcecab478934 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.h +++ b/drivers/usb/chipidea/ci_hdrc_imx.h @@ -14,10 +14,13 @@ struct imx_usbmisc_data { unsigned int oc_polarity:1; /* over current polarity if oc enabled */ unsigned int evdo:1; /* set external vbus divider option */ unsigned int ulpi:1; /* connected to an ULPI phy */ + unsigned int hsic:1; /* HSIC controlller */ }; -int imx_usbmisc_init(struct imx_usbmisc_data *); -int imx_usbmisc_init_post(struct imx_usbmisc_data *); -int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *, bool); +int imx_usbmisc_init(struct imx_usbmisc_data *data); +int imx_usbmisc_init_post(struct imx_usbmisc_data *data); +int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *data, bool enabled); +int imx_usbmisc_hsic_set_connect(struct imx_usbmisc_data *data); +int imx_usbmisc_hsic_set_clk(struct imx_usbmisc_data *data, bool on); #endif /* __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H */ diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index def80ff547e4..df244be80b90 100644 --- a/drivers/usb/chipidea/usbmisc_imx.c +++ b/drivers/usb/chipidea/usbmisc_imx.c @@ -64,10 +64,22 @@ #define MX6_BM_OVER_CUR_DIS BIT(7) #define MX6_BM_OVER_CUR_POLARITY BIT(8) #define MX6_BM_WAKEUP_ENABLE BIT(10) +#define MX6_BM_UTMI_ON_CLOCK BIT(13) #define MX6_BM_ID_WAKEUP BIT(16) #define MX6_BM_VBUS_WAKEUP BIT(17) #define MX6SX_BM_DPDM_WAKEUP_EN BIT(29) #define MX6_BM_WAKEUP_INTR BIT(31) + +#define MX6_USB_HSIC_CTRL_OFFSET 0x10 +/* Send resume signal without 480Mhz PHY clock */ +#define MX6SX_BM_HSIC_AUTO_RESUME BIT(23) +/* set before portsc.suspendM = 1 */ +#define MX6_BM_HSIC_DEV_CONN BIT(21) +/* HSIC enable */ +#define MX6_BM_HSIC_EN BIT(12) +/* Force HSIC module 480M clock on, even when in Host is in suspend mode */ +#define MX6_BM_HSIC_CLK_ON BIT(11) + #define MX6_USB_OTG1_PHY_CTRL 0x18 /* For imx6dql, it is host-only controller, for later imx6, it is otg's */ #define MX6_USB_OTG2_PHY_CTRL 0x1c @@ -94,6 +106,10 @@ struct usbmisc_ops { int (*post)(struct imx_usbmisc_data *data); /* It's called when we need to enable/disable usb wakeup */ int (*set_wakeup)(struct imx_usbmisc_data *data, bool enabled); + /* It's called before setting portsc.suspendM */ + int (*hsic_set_connect)(struct imx_usbmisc_data *data); + /* It's called during suspend/resume */ + int (*hsic_set_clk)(struct imx_usbmisc_data *data, bool enabled); }; struct imx_usbmisc { @@ -353,6 +369,18 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data) writel(reg | MX6_BM_NON_BURST_SETTING, usbmisc->base + data->index * 4); + /* For HSIC controller */ + if (data->hsic) { + reg = readl(usbmisc->base + data->index * 4); + writel(reg | MX6_BM_UTMI_ON_CLOCK, + usbmisc->base + data->index * 4); + reg = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + + (data->index - 2) * 4); + reg |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON; + writel(reg, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + + (data->index - 2) * 4); + } + spin_unlock_irqrestore(&usbmisc->lock, flags); usbmisc_imx6q_set_wakeup(data, false); @@ -360,6 +388,69 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data) return 0; } +static int usbmisc_imx6_hsic_set_connect(struct imx_usbmisc_data *data) +{ + unsigned long flags; + u32 val, offset; + struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev); + int ret = 0; + + spin_lock_irqsave(&usbmisc->lock, flags); + if (data->index == 2 || data->index == 3) { + offset = (data->index - 2) * 4; + } else if (data->index == 0) { + /* + * For SoCs like i.MX7D and later, each USB controller has + * its own non-core register region. For SoCs before i.MX7D, + * the first USB controller is non-HSIC controller. + */ + offset = 0; + } else { + dev_err(data->dev, "index is error for usbmisc\n"); + offset = 0; + ret = -EINVAL; + } + + val = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset); + if (!(val & MX6_BM_HSIC_DEV_CONN)) + writel(val | MX6_BM_HSIC_DEV_CONN, + usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset); + spin_unlock_irqrestore(&usbmisc->lock, flags); + + return ret; +} + +static int usbmisc_imx6_hsic_set_clk(struct imx_usbmisc_data *data, bool on) +{ + unsigned long flags; + u32 val, offset; + struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev); + int ret = 0; + + spin_lock_irqsave(&usbmisc->lock, flags); + if (data->index == 2 || data->index == 3) { + offset = (data->index - 2) * 4; + } else if (data->index == 0) { + offset = 0; + } else { + dev_err(data->dev, "index is error for usbmisc\n"); + offset = 0; + ret = -EINVAL; + } + + val = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset); + val |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON; + if (on) + val |= MX6_BM_HSIC_CLK_ON; + else + val &= ~MX6_BM_HSIC_CLK_ON; + writel(val, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset); + spin_unlock_irqrestore(&usbmisc->lock, flags); + + return 0; +} + + static int usbmisc_imx6sx_init(struct imx_usbmisc_data *data) { void __iomem *reg = NULL; @@ -385,6 +476,13 @@ static int usbmisc_imx6sx_init(struct imx_usbmisc_data *data) spin_unlock_irqrestore(&usbmisc->lock, flags); } + /* For HSIC controller */ + if (data->hsic) { + val = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET); + val |= MX6SX_BM_HSIC_AUTO_RESUME; + writel(val, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET); + } + return 0; } @@ -454,6 +552,7 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data) reg &= ~MX7D_USB_VBUS_WAKEUP_SOURCE_MASK; writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID, usbmisc->base + MX7D_USBNC_USB_CTRL2); + spin_unlock_irqrestore(&usbmisc->lock, flags); usbmisc_imx7d_set_wakeup(data, false); @@ -481,6 +580,8 @@ static const struct usbmisc_ops imx53_usbmisc_ops = { static const struct usbmisc_ops imx6q_usbmisc_ops = { .set_wakeup = usbmisc_imx6q_set_wakeup, .init = usbmisc_imx6q_init, + .hsic_set_connect = usbmisc_imx6_hsic_set_connect, + .hsic_set_clk = usbmisc_imx6_hsic_set_clk, }; static const struct usbmisc_ops vf610_usbmisc_ops = { @@ -490,6 +591,8 @@ static const struct usbmisc_ops vf610_usbmisc_ops = { static const struct usbmisc_ops imx6sx_usbmisc_ops = { .set_wakeup = usbmisc_imx6q_set_wakeup, .init = usbmisc_imx6sx_init, + .hsic_set_connect = usbmisc_imx6_hsic_set_connect, + .hsic_set_clk = usbmisc_imx6_hsic_set_clk, }; static const struct usbmisc_ops imx7d_usbmisc_ops = { @@ -546,6 +649,33 @@ int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *data, bool enabled) } EXPORT_SYMBOL_GPL(imx_usbmisc_set_wakeup); +int imx_usbmisc_hsic_set_connect(struct imx_usbmisc_data *data) +{ + struct imx_usbmisc *usbmisc; + + if (!data) + return 0; + + usbmisc = dev_get_drvdata(data->dev); + if (!usbmisc->ops->hsic_set_connect || !data->hsic) + return 0; + return usbmisc->ops->hsic_set_connect(data); +} +EXPORT_SYMBOL_GPL(imx_usbmisc_hsic_set_connect); + +int imx_usbmisc_hsic_set_clk(struct imx_usbmisc_data *data, bool on) +{ + struct imx_usbmisc *usbmisc; + + if (!data) + return 0; + + usbmisc = dev_get_drvdata(data->dev); + if (!usbmisc->ops->hsic_set_clk || !data->hsic) + return 0; + return usbmisc->ops->hsic_set_clk(data, on); +} +EXPORT_SYMBOL_GPL(imx_usbmisc_hsic_set_clk); static const struct of_device_id usbmisc_imx_dt_ids[] = { { .compatible = "fsl,imx25-usbmisc", From patchwork Mon Oct 22 05:43:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10651733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DF08109C for ; Mon, 22 Oct 2018 05:43:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DA502875E for ; Mon, 22 Oct 2018 05:43:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FCED287E7; Mon, 22 Oct 2018 05:43:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A28FC2875E for ; Mon, 22 Oct 2018 05:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727498AbeJVOAs (ORCPT ); Mon, 22 Oct 2018 10:00:48 -0400 Received: from mail-eopbgr40044.outbound.protection.outlook.com ([40.107.4.44]:47008 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727269AbeJVOAs (ORCPT ); Mon, 22 Oct 2018 10:00:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C1cEsZjb06IK+4NhNz+vvITU4YhMk5NjmpnRzrLp7qQ=; b=Ey0DhF+J1eqPOOfN5sR49VGnty9757pwhvHK7L0OBYxz/1hRHgrsMq3m33na66bpbqU1SJ7nkiUnrHBBPM7xLdqBkJIDD3Ogn75r5fIB72U73dX0jHk7HKvrGHW6/FR6eRMuDA0K3WIbUuFrkCV1+WC84eQbeCVj95dT2VwMsiM= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB5056.eurprd04.prod.outlook.com (20.177.50.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.29; Mon, 22 Oct 2018 05:43:04 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97%3]) with mapi id 15.20.1250.028; Mon, 22 Oct 2018 05:43:04 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "frieder.schrempf@exceet.de" , "festevam@gmail.com" , Peter Chen Subject: [PATCH v2 3/4] usb: chipidea: host: override ehci->hub_control Thread-Topic: [PATCH v2 3/4] usb: chipidea: host: override ehci->hub_control Thread-Index: AQHUacoa5rUVJKwNv02LfUsQ233YWw== Date: Mon, 22 Oct 2018 05:43:04 +0000 Message-ID: <20181022054031.14027-4-peter.chen@nxp.com> References: <20181022054031.14027-1-peter.chen@nxp.com> In-Reply-To: <20181022054031.14027-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0P153CA0036.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::24) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB5056;6:OVRUHjInKnwNsrgqkgWfgoyUImKck3cDxpUKiEUajmFz78Ew0Rxtpn8oIm+HG/i9UT8eDECc6DPb8HyXntaxgKHUdINCY9R444YThNOMSptDjObSKLZ4fJo0A5gJRHvRan6KCIb1OtPyv9fVhk+JHaJUWtNR+nfEwfJyOEwMhqjkhG/yYO39rnGQxZAi1eb+lZfeTe5nd66fvJrvaw/GF5lwHpWAl/pClXuo/3ctO53UGpyiT4J+UuGP4QbBU4tn6M34K5Arvy5tTOyDGmZ7VfzX6llTAIU1iWfC8k3XF5Nv3O+NCuqlbEBm5PcCFgst9VDQw5lgUTZ4hxRQ76tiNNMWsb0fLzgaWdKFMKfm8/HK0293tXu9Ea0+xpm4N8kdGTYX+gJ80icpSRB7erZEUqoxFQZUfo/eniz64eAkCiwJcB5JnHI8wxYAYZ+WxtHmmnsBDOImSj4G7LXNkoMi/w==;5:OKkn2V7HZAdbano83n+DCtFdQePBzHejvPza1pszoy8rqctExucyZD1TAn9o3GUtnEcGX7T2GMqrEQzYwOZusic2aeY4/Sf6YqyE0Y8JnIYTt8q9HvlwIoD0B0mV3AP7NMiWQjsoTpphFo7U5pHmmC/B0wFSgeJtx5rOayLlpdM=;7:m2tKtSt9U/2TAEdGjO4is1+B50kmcXtiMmpyHTAY4/3EABYUjuEqChnmZKBQMv78M4oZLCUNj3+ZcDZLOlca+rE9ffACwp1lQJel2rs4uUel6tg7lgeEBpyOQxzpNDzqDHt4JU6mkHgvDcI8V57ofcCSWUTsnIyvp1bThIU6n88U9JxW0jynWo0X5+1vLE+9tAvPAQm9yvuiBSL9KEHNcPUtxWpLVJfWZdJUPywM2weELLwp2UTou8DHSCO6/nde x-ms-office365-filtering-correlation-id: 2fd0091f-7f98-4112-38de-08d637e13ca3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB5056; x-ms-traffictypediagnostic: VI1PR04MB5056: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095);SRVR:VI1PR04MB5056;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB5056; x-forefront-prvs: 08331F819E x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(39860400002)(396003)(346002)(366004)(376002)(189003)(199004)(39060400002)(478600001)(2906002)(5660300001)(6436002)(2501003)(8676002)(86362001)(7736002)(36756003)(486006)(305945005)(386003)(2351001)(2900100001)(8936002)(68736007)(102836004)(81166006)(81156014)(26005)(186003)(76176011)(52116002)(6512007)(25786009)(99286004)(6916009)(2616005)(5640700003)(14454004)(53936002)(14444005)(476003)(97736004)(6506007)(105586002)(106356001)(71200400001)(44832011)(446003)(3846002)(50226002)(316002)(6116002)(256004)(54906003)(6486002)(4326008)(551934003)(66066001)(11346002)(1076002)(5250100002)(71190400001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB5056;H:VI1PR04MB5327.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 2CivDs0QrVhvI+2jZJFNton2beZBDST+BDYi32Q120b+qPsrtUJ9dZtK1hcuk4LMtrJZP+i/6zV4iCtJ9e4B5hfPehBH2hZ/bQfDLhtjm8di/tfkcggLH5gjNumWxIhZBjXRI3Z5Q3l2kyplCvV1Kq8MHuNf5mV13ztno6man5pbrsuJAbW/ypc7YX88af7UPj8amPO+IeWHrevaglzQe84ttcJvnLDUPW7i7b1GqdWrlkzIq9HDtzFN7/TA1nN+0lMLgwQiT6l2uv89VITv2VJT4PcrHMgS5Wb3daLLc3RgJ1ht1kFep/I67Kr3kIK05/VOvlsdnKa0ZyBYMR7+twbQYGEtIggQcrc6gP3yQBc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fd0091f-7f98-4112-38de-08d637e13ca3 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2018 05:43:04.7440 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5056 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The chipidea controller has some special requirements during suspend/resume, override common ehci->hub_control to implement it. Signed-off-by: Peter Chen --- drivers/usb/chipidea/host.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index d74a13d7c21c..b8e7d7fe3d53 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -234,6 +234,79 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci) host_stop(ci); } +/* The below code is based on tegra ehci driver */ +static int ci_ehci_hub_control( + struct usb_hcd *hcd, + u16 typeReq, + u16 wValue, + u16 wIndex, + char *buf, + u16 wLength +) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + u32 __iomem *status_reg; + u32 temp; + unsigned long flags; + int retval = 0; + struct device *dev = hcd->self.controller; + struct ci_hdrc *ci = dev_get_drvdata(dev); + + status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1]; + + spin_lock_irqsave(&ehci->lock, flags); + + if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) { + temp = ehci_readl(ehci, status_reg); + if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) { + retval = -EPIPE; + goto done; + } + + temp &= ~(PORT_RWC_BITS | PORT_WKCONN_E); + temp |= PORT_WKDISC_E | PORT_WKOC_E; + ehci_writel(ehci, temp | PORT_SUSPEND, status_reg); + + /* + * If a transaction is in progress, there may be a delay in + * suspending the port. Poll until the port is suspended. + */ + if (ehci_handshake(ehci, status_reg, PORT_SUSPEND, + PORT_SUSPEND, 5000)) + ehci_err(ehci, "timeout waiting for SUSPEND\n"); + + if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) { + if (ci->platdata->notify_event) + ci->platdata->notify_event + (ci, CI_HDRC_IMX_HSIC_SUSPEND_EVENT); + ci_ehci_override_wakeup_flag(ehci, status_reg, + PORT_WKDISC_E | PORT_WKCONN_E, false); + } + + set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports); + goto done; + } + + /* + * After resume has finished, it needs do some post resume + * operation for some SoCs. + */ + else if (typeReq == ClearPortFeature && + wValue == USB_PORT_FEAT_C_SUSPEND) { + + /* Make sure the resume has finished, it should be finished */ + if (ehci_handshake(ehci, status_reg, PORT_RESUME, 0, 25000)) + ehci_err(ehci, "timeout waiting for resume\n"); + } + + spin_unlock_irqrestore(&ehci->lock, flags); + + /* Handle the hub control events here */ + return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength); +done: + spin_unlock_irqrestore(&ehci->lock, flags); + return retval; +} static int ci_ehci_bus_suspend(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); @@ -305,4 +378,5 @@ void ci_hdrc_host_driver_init(void) ehci_init_driver(&ci_ehci_hc_driver, &ehci_ci_overrides); orig_bus_suspend = ci_ehci_hc_driver.bus_suspend; ci_ehci_hc_driver.bus_suspend = ci_ehci_bus_suspend; + ci_ehci_hc_driver.hub_control = ci_ehci_hub_control; } From patchwork Mon Oct 22 05:43:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10651731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6BD89109C for ; Mon, 22 Oct 2018 05:43:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58656212D8 for ; Mon, 22 Oct 2018 05:43:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4982D28703; Mon, 22 Oct 2018 05:43:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D40F3212D8 for ; Mon, 22 Oct 2018 05:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727411AbeJVOAn (ORCPT ); Mon, 22 Oct 2018 10:00:43 -0400 Received: from mail-he1eur01on0074.outbound.protection.outlook.com ([104.47.0.74]:11577 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726784AbeJVOAm (ORCPT ); Mon, 22 Oct 2018 10:00:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qqx4dNvvPGfEauXir6exJRKdi+394NZM1vwTOLqfQh8=; b=r2yAEnIkAWuEKqfg98VdtZNR8vnM+g7kJ8XD8yTgVoz0upLOYYPZUJ1XR+PNjsWFoNDq4hcQMyuRDiq03eiyg5MIfxpmCcgHHTSzcQOVIhdJPyRp7sVXDF0XYbgiekURR85iycK8Jqw9MLGbfkLiDTCAnS84P+I2uaXfBtzXehE= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB5056.eurprd04.prod.outlook.com (20.177.50.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.29; Mon, 22 Oct 2018 05:43:08 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::e046:4971:4e49:7e97%3]) with mapi id 15.20.1250.028; Mon, 22 Oct 2018 05:43:08 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "frieder.schrempf@exceet.de" , "festevam@gmail.com" , Peter Chen Subject: [PATCH v2 4/4] doc: usb: ci-hdrc-usb2: Add pinctrl properties for HSIC pin groups Thread-Topic: [PATCH v2 4/4] doc: usb: ci-hdrc-usb2: Add pinctrl properties for HSIC pin groups Thread-Index: AQHUacoc88t9ameE/USXCZgX4C2HaA== Date: Mon, 22 Oct 2018 05:43:07 +0000 Message-ID: <20181022054031.14027-5-peter.chen@nxp.com> References: <20181022054031.14027-1-peter.chen@nxp.com> In-Reply-To: <20181022054031.14027-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0P153CA0036.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::24) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR04MB5056;6:7dRpr0lYYxrcT6/FHob6PLS8Q0AnKSawLMFmgTSXX/8bONB9yoeqh6qMhfvFnh56nJDcdr4jj85NW5TFlI7qWJ41+Mb7rhiqUzL1Gv5NntMB9WsPCqHs/2hy63Zde2Xg8+sXJveZaXNoxDV7jKOhy3eqOcLZY7Elz2FoYnheDRXdxZXMmnRxewQcO1kYq5V1hOd/CfogByKISWqTwZu86VoyxpsGUsywHGBpiuurY6pX+Wcg8cuSyL4NeYPeLCERtUUhrHKCO0BjVoJU/3XPMe1l4m5LVkcv5s8zVY+mCx9um+PgfrcceOQsSignn0mZz0cWEGF8j2jRkpaPC6KU2dhy6wY28VS/3ryUvtPRbGFXMJtqrZ9YIZbUeHf+wpGzcXeUGcgSFzid0chFnn1LWDqIsXL9J4umlBPqFcS9kXG8I7MdTtgY2qgQqqyfQCEj4Z2brR+arfRLz6pH7HyIcw==;5:9yUkfc91VpeI76I1lK3ndlRgfLJaQ12f2kYrv3MrBdwidTAllW6pu6oKKRjaZ83tkaCmo9ElyDv3dDs2WBD7uwXsncqUGj1Pz4ngqK69ydxlSKaWYoiRpAWQne1mcUVKF0K/I3SjiR/dXycAwprz/cRxuQ0l3qxWVq+YFdN9P9E=;7:0DbORh/r7ZBcL0NYlr/jsRQwUhv1Eh40cA94nhNer/Ma2gR3C8MxSKsOufEBpBtjGfxkgGkLiaKQpc43rM9NJOUC6pf095mi5lk8GgP4sj5twyBDFxPLy8LbH25f0i3++dFxZ897k5ewZv5PU93/3CaQOtY+ryJW8vFiPwiPVf3W4H3J1Hu9nTVVRRIjbFryjrfuIaRKwo2CUATegFZawT3Nx1TcJl0uRJiJR5N/CEJRvEFa8DZBqCgQzl2BkH8D x-ms-office365-filtering-correlation-id: ec4fad46-7efd-43be-1e38-08d637e13e74 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB5056; x-ms-traffictypediagnostic: VI1PR04MB5056: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095);SRVR:VI1PR04MB5056;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB5056; x-forefront-prvs: 08331F819E x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(39860400002)(396003)(346002)(366004)(376002)(189003)(199004)(39060400002)(478600001)(2906002)(5660300001)(6436002)(2501003)(8676002)(86362001)(7736002)(36756003)(486006)(305945005)(386003)(2351001)(2900100001)(8936002)(68736007)(102836004)(81166006)(81156014)(26005)(186003)(76176011)(52116002)(6512007)(25786009)(99286004)(6916009)(2616005)(5640700003)(14454004)(53936002)(476003)(97736004)(6506007)(105586002)(106356001)(71200400001)(44832011)(446003)(3846002)(50226002)(316002)(6116002)(256004)(54906003)(6486002)(4326008)(66066001)(11346002)(1076002)(5250100002)(71190400001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB5056;H:VI1PR04MB5327.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: iBZ8JIz3kI1xvgTNt0LnzTcXr0blwM1JQvWBnwTsxBcECuJKo9EL+Lwah/9xvRtANdC3Gb5sVsbC+ZOdmfsfg4XHhdYqdXrUViVSzCywmhM4ki6XxkTsYDmIbnstTObppkDlFSA7k6pnMEu5Oh5OGbUB7lPD4LWCU4cUjpMnaiTtr1KfZm6k2MGAWMGBYDbPJEC8/ZatBAI8D2CavViMXozoZdVzFkx9DfIa7aF1ADwXsyqiOhe5ntqCUR3cxtrigLpEEX0NsaoJT7ee8PlU+0ZkCybQAQeyObOBrIg3oboNQgW/UuVxjOn6SU7tl9R6uiMMET1TGTPWiUMZDH2KWtw/I9/neK3Z5vGvJ+77gR8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec4fad46-7efd-43be-1e38-08d637e13e74 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2018 05:43:07.9470 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5056 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For USB HSIC, the data and strobe pin needs to be pulled down at default, we consider it as "idle" state. When the USB host is ready to be used, the strobe pin needs to be pulled up, we consider it as "active" state. Signed-off-by: Peter Chen --- Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index 529e51879fb2..10c8d793ea49 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -81,6 +81,7 @@ Optional properties: mux state of 1 indicates host mode. - mux-control-names: Shall be "usb_switch" if mux-controls is specified. - pinctrl-names: Names for optional pin modes in "default", "host", "device" + Or names for HSIC "idle" and "active" pin modes. - pinctrl-n: alternate pin modes i.mx specific properties