From nobody Tue Dec 30 19:27:44 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB6CC4167B for ; Mon, 13 Nov 2023 14:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231328AbjKMO1S (ORCPT ); Mon, 13 Nov 2023 09:27:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbjKMO1H (ORCPT ); Mon, 13 Nov 2023 09:27:07 -0500 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9301FD5E; Mon, 13 Nov 2023 06:27:02 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8C3A21C0015; Mon, 13 Nov 2023 14:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1699885621; 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=GSimQIqa/8SepKg3uis9mexXr+RooQka7AQUj0ZMCxM=; b=SwUcstoMkO51WegbzPUOXINPZ7NYGCDMsSX0TGQ1JTX8616YqGNMPNTIaMYNIdWQ35Dku+ QmWV2FEHBVVZBsexgmEjdOmjFtlIq+ydInNn6XP2nZPQj55mglPNuuAyYqHwiITK75nWAC VzBCcYJvpz7H087K6HdZz5+obEe/2eOZnvxwUb5P0L65KMHQfR4r/KZrxmelOxS5Fvq9CQ NkXbPlSCOKL2S6v+1o1YlB9fCcBiQeDl5T+U4BF3PbBXFYe4Ud4wpofFGQK6Z+G2JjFI8E i07xwHxck7QCcudy3pCixOhdQW/ekohVwHujrytfq81jMmf0ctoZNe/43FdDLQ== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Mon, 13 Nov 2023 15:26:57 +0100 Subject: [PATCH 2/6] usb: cdns3-ti: move reg writes from probe into an init_hw helper MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231113-j7200-usb-suspend-v1-2-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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The hardware initialisation register write sequence is only used at probe. To support suspend/resume with a controller losing power, we must redo this sequence of writes. Extract the register write sequence to a new cdns_ti_init_hw function to reuse it later down the road, at resume. We keep the devicetree-parsing aspect of the sequence in probe & add a new field in the private struct to remember the USB2 refclk rate code computation result. Signed-off-by: Th=C3=A9o Lebrun --- drivers/usb/cdns3/cdns3-ti.c | 76 ++++++++++++++++++++++++----------------= ---- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index 5945c4b1e11f..c331bcd2faeb 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -57,6 +57,7 @@ struct cdns_ti { unsigned vbus_divider:1; struct clk *usb2_refclk; struct clk *lpm_clk; + int usb2_refclk_rate_code; }; =20 static const int cdns_ti_rate_table[] =3D { /* in KHZ */ @@ -85,15 +86,50 @@ static inline void cdns_ti_writel(struct cdns_ti *data,= u32 offset, u32 value) writel(value, data->usbss + offset); } =20 +static void cdns_ti_init_hw(struct cdns_ti *data) +{ + u32 reg; + + /* assert RESET */ + reg =3D cdns_ti_readl(data, USBSS_W1); + reg &=3D ~USBSS_W1_PWRUP_RST; + cdns_ti_writel(data, USBSS_W1, reg); + + /* set static config */ + reg =3D cdns_ti_readl(data, USBSS_STATIC_CONFIG); + reg &=3D ~USBSS1_STATIC_PLL_REF_SEL_MASK; + reg |=3D data->usb2_refclk_rate_code << USBSS1_STATIC_PLL_REF_SEL_SHIFT; + + reg &=3D ~USBSS1_STATIC_VBUS_SEL_MASK; + if (data->vbus_divider) + reg |=3D 1 << USBSS1_STATIC_VBUS_SEL_SHIFT; + + cdns_ti_writel(data, USBSS_STATIC_CONFIG, reg); + reg =3D cdns_ti_readl(data, USBSS_STATIC_CONFIG); + + /* set USB2_ONLY mode if requested */ + reg =3D cdns_ti_readl(data, USBSS_W1); + if (data->usb2_only) + reg |=3D USBSS_W1_USB2_ONLY; + + /* set default modestrap */ + reg |=3D USBSS_W1_MODESTRAP_SEL; + reg &=3D ~USBSS_W1_MODESTRAP_MASK; + reg |=3D USBSS_MODESTRAP_MODE_NONE << USBSS_W1_MODESTRAP_SHIFT; + cdns_ti_writel(data, USBSS_W1, reg); + + /* de-assert RESET */ + reg |=3D USBSS_W1_PWRUP_RST; + cdns_ti_writel(data, USBSS_W1, reg); +} + static int cdns_ti_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct device_node *node =3D pdev->dev.of_node; struct cdns_ti *data; - int error; - u32 reg; - int rate_code, i; unsigned long rate; + int error, i; =20 data =3D devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -133,8 +169,6 @@ static int cdns_ti_probe(struct platform_device *pdev) return -EINVAL; } =20 - rate_code =3D i; - pm_runtime_enable(dev); error =3D pm_runtime_get_sync(dev); if (error < 0) { @@ -142,39 +176,11 @@ static int cdns_ti_probe(struct platform_device *pdev) goto err; } =20 - /* assert RESET */ - reg =3D cdns_ti_readl(data, USBSS_W1); - reg &=3D ~USBSS_W1_PWRUP_RST; - cdns_ti_writel(data, USBSS_W1, reg); - - /* set static config */ - reg =3D cdns_ti_readl(data, USBSS_STATIC_CONFIG); - reg &=3D ~USBSS1_STATIC_PLL_REF_SEL_MASK; - reg |=3D rate_code << USBSS1_STATIC_PLL_REF_SEL_SHIFT; - - reg &=3D ~USBSS1_STATIC_VBUS_SEL_MASK; data->vbus_divider =3D device_property_read_bool(dev, "ti,vbus-divider"); - if (data->vbus_divider) - reg |=3D 1 << USBSS1_STATIC_VBUS_SEL_SHIFT; - - cdns_ti_writel(data, USBSS_STATIC_CONFIG, reg); - reg =3D cdns_ti_readl(data, USBSS_STATIC_CONFIG); - - /* set USB2_ONLY mode if requested */ - reg =3D cdns_ti_readl(data, USBSS_W1); data->usb2_only =3D device_property_read_bool(dev, "ti,usb2-only"); - if (data->usb2_only) - reg |=3D USBSS_W1_USB2_ONLY; - - /* set default modestrap */ - reg |=3D USBSS_W1_MODESTRAP_SEL; - reg &=3D ~USBSS_W1_MODESTRAP_MASK; - reg |=3D USBSS_MODESTRAP_MODE_NONE << USBSS_W1_MODESTRAP_SHIFT; - cdns_ti_writel(data, USBSS_W1, reg); + data->usb2_refclk_rate_code =3D i; =20 - /* de-assert RESET */ - reg |=3D USBSS_W1_PWRUP_RST; - cdns_ti_writel(data, USBSS_W1, reg); + cdns_ti_init_hw(data); =20 error =3D of_platform_populate(node, NULL, NULL, dev); if (error) { --=20 2.41.0