From patchwork Mon Nov 13 14:26:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 743552 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8760210F3; Mon, 13 Nov 2023 14:27:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="dkrLrBm0" Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7BA4D6E; Mon, 13 Nov 2023 06:27:03 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPSA id F36D91C0006; Mon, 13 Nov 2023 14:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1699885622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cnUtq32WECjfa76r/drw3nv80tgUh5X0WPjXLzFlw28=; b=dkrLrBm0G6WnQIfo4v7EkNmhc1fxeqZv1l6opb3gjHwULojiv5p/NaJkGUcgKv6etaoTPi 0ADc6WeA4CdTabdx64+7Gy6f75FiUnUNQLtLQseNQx/zupfA/EeObKE/1sR3HGVLTDLlHM Z7kk8kfQ1SjxnzJwKIPBztWSCscdZ887WmLlRhjPQw8cKbTzt9uJ1yImGdhxThhyNu2gcI mNkXD5ji2f8B+Vz9TPGfvS9qEzz+GHVuLlueiKEMLpXbzezYnSKIVFa21m+qkzSOiKy7Ic 4YXN4WaS+eim3Llkje2kUE2pwefMyWZL7qdftfkh4ktna5b+quJLChPti4S6Ew== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Mon, 13 Nov 2023 15:26:59 +0100 Subject: [PATCH 4/6] usb: cdns3: support power-off of controller when in host role Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231113-j7200-usb-suspend-v1-4-ad1ee714835c@bootlin.com> References: <20231113-j7200-usb-suspend-v1-0-ad1ee714835c@bootlin.com> In-Reply-To: <20231113-j7200-usb-suspend-v1-0-ad1ee714835c@bootlin.com> To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Roger Quadros , Peter Chen , Pawel Laszczak , Nishanth Menon , Vignesh Raghavendra , Tero Kristo Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.12.3 X-GND-Sasl: theo.lebrun@bootlin.com The controller is not being reconfigured at resume. Change resume to redo hardware config if quirk CDNS3_RESET_ON_RESUME is active. Platform data comes from the parent driver (eg cdns3-ti). The quirk should be passed if the platform driver knows that the controller might be in reset state at resume. We do NOT reconfigure the hardware without this quirk to avoid losing state if we did a suspend without reset. If the quirk is on, we notify the xHCI subsystem that: 1. We reset on resume. It will therefore redo the xHC init & trigger such message as "root hub lost power or was reset" in dmesg. 2. It should disable/enable clocks on suspend/resume. This does not matter on our platform as xhci-plat does not get access to any clock but it would be the right thing to do if we indeed had such clocks. Signed-off-by: Théo Lebrun --- drivers/usb/cdns3/core.h | 1 + drivers/usb/cdns3/host.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h index 81a9c9d6be08..7487067ba23f 100644 --- a/drivers/usb/cdns3/core.h +++ b/drivers/usb/cdns3/core.h @@ -44,6 +44,7 @@ struct cdns3_platform_data { bool suspend, bool wakeup); unsigned long quirks; #define CDNS3_DEFAULT_PM_RUNTIME_ALLOW BIT(0) +#define CDNS3_RESET_ON_RESUME BIT(1) }; /** diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c index 6164fc4c96a4..a81019a7c8cc 100644 --- a/drivers/usb/cdns3/host.c +++ b/drivers/usb/cdns3/host.c @@ -88,6 +88,9 @@ static int __cdns_host_init(struct cdns *cdns) goto err1; } + if (cdns->pdata && cdns->pdata->quirks & CDNS3_RESET_ON_RESUME) + cdns->xhci_plat_data->quirks |= XHCI_RESET_ON_RESUME | XHCI_SUSPEND_RESUME_CLKS; + if (cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW)) cdns->xhci_plat_data->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; @@ -124,6 +127,18 @@ static void cdns_host_exit(struct cdns *cdns) cdns_drd_host_off(cdns); } +static int cdns_host_suspend(struct cdns *cdns, bool do_wakeup) +{ + if (!do_wakeup) + cdns_drd_host_off(cdns); + return 0; +} + +static int cdns_host_resume(struct cdns *cdns, bool hibernated) +{ + return cdns_drd_host_on(cdns); +} + int cdns_host_init(struct cdns *cdns) { struct cdns_role_driver *rdrv; @@ -137,6 +152,11 @@ int cdns_host_init(struct cdns *cdns) rdrv->state = CDNS_ROLE_STATE_INACTIVE; rdrv->name = "host"; + if (cdns->pdata && cdns->pdata->quirks & CDNS3_RESET_ON_RESUME) { + rdrv->suspend = cdns_host_suspend; + rdrv->resume = cdns_host_resume; + } + cdns->roles[USB_ROLE_HOST] = rdrv; return 0; From patchwork Mon Nov 13 14:27:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 743551 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5116321111; Mon, 13 Nov 2023 14:27:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="iGLuVOPw" Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 727B2D72; Mon, 13 Nov 2023 06:27:04 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9F7B31C0012; Mon, 13 Nov 2023 14:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1699885623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k+i4FLnvd6XaZ4FK4Rv/lHlLAWGwtUlxb23vylnIS6g=; b=iGLuVOPw+l/CxkdcZ/4FKg7+dIPMY8gL2CbmKr/0Umw9RnIJxa4RBep3RmGFRt7kBhrULY VwDCidB9ZXtJYNGEpMm+OebAMZUXYfTlOC6WPRXCsQDlE1rFkoETqtaBtODxEpHk8vM0Bx LvlOx6U2BL5fGVNNpN7HaBySe3mYNLBKTD5yVXxf6L9o/9DkK2O9Yc7v4HMH5ikcI5xrYs hhMFaP0Q7LaWWeg4Tl1vJKHTS/U2TKBee34xMElK4UoDmNjz25wzhPMHV0ugN4Xb5s/+Ze rxZOWCT2xetF5zM9gJBUSr2jeXjWlU+EC2QJA2RM+Z+BtYedyq0w4twkS9L2XA== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Mon, 13 Nov 2023 15:27:00 +0100 Subject: [PATCH 5/6] usb: cdns3-ti: notify cdns core that hardware resets across suspend on J7200 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231113-j7200-usb-suspend-v1-5-ad1ee714835c@bootlin.com> References: <20231113-j7200-usb-suspend-v1-0-ad1ee714835c@bootlin.com> In-Reply-To: <20231113-j7200-usb-suspend-v1-0-ad1ee714835c@bootlin.com> To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Roger Quadros , Peter Chen , Pawel Laszczak , Nishanth Menon , Vignesh Raghavendra , Tero Kristo Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.12.3 X-GND-Sasl: theo.lebrun@bootlin.com Use the CDNS3_RESET_ON_RESUME quirk flag to inform the cdns3 core that our J7200 USB controller will lose power during suspend. It therefore must be reconfigured when we resume. Signed-off-by: Théo Lebrun --- drivers/usb/cdns3/cdns3-ti.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index 50b38c4b9c87..c65714c783fb 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -16,6 +16,7 @@ #include #include #include +#include "core.h" /* USB Wrapper register offsets */ #define USBSS_PID 0x0 @@ -127,6 +128,7 @@ static int cdns_ti_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *node = pdev->dev.of_node; + const struct of_dev_auxdata *auxdata; struct cdns_ti *data; unsigned long rate; int error, i; @@ -182,7 +184,8 @@ static int cdns_ti_probe(struct platform_device *pdev) cdns_ti_init_hw(data); - error = of_platform_populate(node, NULL, NULL, dev); + auxdata = of_device_get_match_data(dev); + error = of_platform_populate(node, NULL, auxdata, dev); if (error) { dev_err(dev, "failed to create children: %d\n", error); goto err; @@ -261,8 +264,20 @@ static void cdns_ti_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); } +static struct cdns3_platform_data cdns_ti_j7200_pdata = { + .quirks = CDNS3_RESET_ON_RESUME, +}; + +static const struct of_dev_auxdata cdns_ti_j7200_auxdata[] = { + { + .compatible = "cdns,usb3", + .platform_data = &cdns_ti_j7200_pdata, + }, + {}, +}; + static const struct of_device_id cdns_ti_of_match[] = { - { .compatible = "ti,j7200-usb", }, + { .compatible = "ti,j7200-usb", .data = cdns_ti_j7200_auxdata, }, { .compatible = "ti,j721e-usb", }, { .compatible = "ti,am64-usb", }, {},