From nobody Thu Oct 2 07:46:38 2025 Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 DC3C4260563; Fri, 19 Sep 2025 02:57:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250639; cv=none; b=DC25ZXUdVCJmnnmaDJR5hp1gbHRtymbRrzHqEsSaOgemustzvtcn9GXYEQY2846cvl4q23CqoxOnYdk7QsMqtboJWqYk8+Lvw8enDTVV6dCvDXo4RvGRIGwZEGYggDGcyN44gWH+/TcSdaudRMtwRS8nF8Qh9A5C58vQG6QeJUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250639; c=relaxed/simple; bh=qCMpKNEwmFFQntyUxe04ONnLaz0OBcgXO5q4kCOIInU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pFWSgG5TR3B7t9doZ61myIUpaS32UEYxzHNPQAfG5g/MVHrL4d6R6zT7Mf9y7n8Oy3TO98QgVOeFeRx/jBRywOZxN1cwyDeg/S1ZUpR4rOpiVnOLa7VLtB5Sd2FQ1SU4X2RCKf0XujnGMI5WeAnIgso3oWZk18T6D3L4MpoD9lI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Fri, 19 Sep 2025 10:57:12 +0800 Received: from twmbx02.aspeed.com (192.168.10.13) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Fri, 19 Sep 2025 10:57:12 +0800 From: Ryan Chen To: ryan_chen , Greg Kroah-Hartman , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , "Alan Stern" , Philipp Zabel , , , CC: Conor Dooley Subject: [PATCH v3 1/4] dt-bindings: usb: uhci: Add reset property Date: Fri, 19 Sep 2025 10:57:09 +0800 Message-ID: <20250919025712.719246-2-ryan_chen@aspeedtech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250919025712.719246-1-ryan_chen@aspeedtech.com> References: <20250919025712.719246-1-ryan_chen@aspeedtech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The UHCI controller on Aspeed SoCs (including AST2700) requires its reset line to be deasserted before the controller can be used. Add an optional "resets" property to the UHCI device tree bindings to describe the phandle to the reset controller. This property is optional for platforms which do not require explicit reset handling. Signed-off-by: Ryan Chen Acked-by: Conor Dooley --- Documentation/devicetree/bindings/usb/usb-uhci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/usb-uhci.yaml b/Document= ation/devicetree/bindings/usb/usb-uhci.yaml index d8336f72dc1f..b1f2b9bd7921 100644 --- a/Documentation/devicetree/bindings/usb/usb-uhci.yaml +++ b/Documentation/devicetree/bindings/usb/usb-uhci.yaml @@ -28,6 +28,9 @@ properties: interrupts: maxItems: 1 =20 + resets: + maxItems: 1 + '#ports': $ref: /schemas/types.yaml#/definitions/uint32 =20 --=20 2.34.1 From nobody Thu Oct 2 07:46:38 2025 Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 E4A1A269CE5; Fri, 19 Sep 2025 02:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250641; cv=none; b=nWwl2mStYtZRy+P3HPYy00sjo5BUKLHmPM+ZZjQfgZ5sFXAkq/zeUxUramSP1AtBq4LKIHU2A2NRN6EwhRfPZwlcbfclGEUrmQ7jv3lXd1GDdMXOWVjOhYh7v5lRZ5p5k0N3piZPEH3vkhL/KuYnGcvf/ONT+AFdX+8QPSQvvHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250641; c=relaxed/simple; bh=geJcDqLWAU5xS0NZ+uBv9dd9zO08aWrmQ2L38iDv2J0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nmCIZKWYL1xCiaRSzdCG+8ss6rStt21j5RbUtjS5X50niJyCTq53whVwJydHwHnz1Be7SpjoaxqmIufdX0azOQrzuW8W92a+UXw0fX6vtLbrRaa1LaIGNKMXIzrtnSVR8zZyw4la/R7hrcBldVXfBFPmTVaiwgecU/pc5pB1DPA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Fri, 19 Sep 2025 10:57:12 +0800 Received: from twmbx02.aspeed.com (192.168.10.13) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Fri, 19 Sep 2025 10:57:12 +0800 From: Ryan Chen To: ryan_chen , Greg Kroah-Hartman , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , "Alan Stern" , Philipp Zabel , , , Subject: [PATCH v3 2/4] usb: uhci: Add reset control support Date: Fri, 19 Sep 2025 10:57:10 +0800 Message-ID: <20250919025712.719246-3-ryan_chen@aspeedtech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250919025712.719246-1-ryan_chen@aspeedtech.com> References: <20250919025712.719246-1-ryan_chen@aspeedtech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some SoCs, such as the Aspeed AST2700, require the UHCI controller to be taken out of reset before it can operate. Add optional reset control support to the UHCI platform driver. The driver now acquires an optional reset line from device tree, deasserts it during probe, and asserts it again in the error path and shutdown. Signed-off-by: Ryan Chen --- drivers/usb/host/uhci-hcd.h | 1 + drivers/usb/host/uhci-platform.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h index 13ee2a6144b2..4326d1f3ca76 100644 --- a/drivers/usb/host/uhci-hcd.h +++ b/drivers/usb/host/uhci-hcd.h @@ -445,6 +445,7 @@ struct uhci_hcd { short load[MAX_PHASE]; /* Periodic allocations */ =20 struct clk *clk; /* (optional) clock source */ + struct reset_control *rsts; /* (optional) clock reset */ =20 /* Reset host controller */ void (*reset_hc) (struct uhci_hcd *uhci); diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platf= orm.c index 62318291f566..f255358d6242 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 static int uhci_platform_init(struct usb_hcd *hcd) { @@ -132,17 +133,29 @@ static int uhci_hcd_platform_probe(struct platform_de= vice *pdev) goto err_rmr; } =20 + uhci->rsts =3D devm_reset_control_array_get_optional_shared(&pdev->dev); + if (IS_ERR(uhci->rsts)) { + ret =3D PTR_ERR(uhci->rsts); + goto err_clk; + } + ret =3D reset_control_deassert(uhci->rsts); + if (ret) + goto err_clk; + ret =3D platform_get_irq(pdev, 0); if (ret < 0) - goto err_clk; + goto err_reset; =20 ret =3D usb_add_hcd(hcd, ret, IRQF_SHARED); if (ret) - goto err_clk; + goto err_reset; =20 device_wakeup_enable(hcd->self.controller); return 0; =20 +err_reset: + if (!IS_ERR_OR_NULL(uhci->rsts)) + reset_control_assert(uhci->rsts); err_clk: clk_disable_unprepare(uhci->clk); err_rmr: @@ -156,6 +169,7 @@ static void uhci_hcd_platform_remove(struct platform_de= vice *pdev) struct usb_hcd *hcd =3D platform_get_drvdata(pdev); struct uhci_hcd *uhci =3D hcd_to_uhci(hcd); =20 + reset_control_assert(uhci->rsts); clk_disable_unprepare(uhci->clk); usb_remove_hcd(hcd); usb_put_hcd(hcd); --=20 2.34.1 From nobody Thu Oct 2 07:46:38 2025 Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 BE6CD26D4ED; Fri, 19 Sep 2025 02:57:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250643; cv=none; b=CShJV+2dnhGYm9RHLEYJKloHXE8yVC7bALjeg4ihkAj2oqraI4DnHxESiq+ztig7u2IcCyqhAshapVT5BjfDbDXPLTuAGvAEtGyVGMGtjvWh9D6AJpNTIpxfbSRVe6ujhUmTPF+eBucCS22u7HgiegbJSQeuyiD60sUa5/FP+9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250643; c=relaxed/simple; bh=6tFUe5ClwPO1n/Mm8qoJjiUjNyDI4gX260/dZCLD9fs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qu0Wl7Gx8YnWimLKnTJUO4K+Dfs+AT1LpE2ZVpI3JIdsOlx9uADujMmuC95g6w/OSnWeUvKCHiy251hO2i4Y0uk/qPXtRY9V6sstjOLZgbWlQ2bID11SRSPEJGvXGHLoDtiozf8SbRwNurtjH2OYXQflfv2jK/g6AGp0UFPuaAw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Fri, 19 Sep 2025 10:57:12 +0800 Received: from twmbx02.aspeed.com (192.168.10.13) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Fri, 19 Sep 2025 10:57:12 +0800 From: Ryan Chen To: ryan_chen , Greg Kroah-Hartman , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , "Alan Stern" , Philipp Zabel , , , CC: Conor Dooley Subject: [PATCH v3 3/4] dt-bindings: usb: uhci: Add Aspeed AST2700 compatible Date: Fri, 19 Sep 2025 10:57:11 +0800 Message-ID: <20250919025712.719246-4-ryan_chen@aspeedtech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250919025712.719246-1-ryan_chen@aspeedtech.com> References: <20250919025712.719246-1-ryan_chen@aspeedtech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the compatible string for Aspeed AST2700 SoC. Signed-off-by: Ryan Chen Acked-by: Conor Dooley --- Documentation/devicetree/bindings/usb/usb-uhci.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/usb-uhci.yaml b/Document= ation/devicetree/bindings/usb/usb-uhci.yaml index b1f2b9bd7921..7b774d0b2742 100644 --- a/Documentation/devicetree/bindings/usb/usb-uhci.yaml +++ b/Documentation/devicetree/bindings/usb/usb-uhci.yaml @@ -20,6 +20,7 @@ properties: - aspeed,ast2400-uhci - aspeed,ast2500-uhci - aspeed,ast2600-uhci + - aspeed,ast2700-uhci - const: generic-uhci =20 reg: @@ -53,6 +54,15 @@ allOf: required: - clocks =20 + - if: + properties: + compatible: + contains: + const: aspeed,ast2700-uhci + then: + required: + - resets + unevaluatedProperties: false =20 examples: --=20 2.34.1 From nobody Thu Oct 2 07:46:38 2025 Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 C66D8271464; Fri, 19 Sep 2025 02:57:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250645; cv=none; b=DMJynEs1U8oSVaXwZBCXhxD0vvJKMN1WBTcqflybBgmaz38PsXgzerq4KSQceVx5DSLj9DcpoSj2Hm+pIxIzpwgU0kCo0UFr1BrNa73CWaIOZVo9gMEfRnf2jBHlKW4C5nQaDhWwKU3MBJdvwRDh9CEGfoPCBb7IK3vh3vSm+5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758250645; c=relaxed/simple; bh=dIXm72jYVUSRnA1JaqY2TM09z0JcIh39eokbKve6ZVM=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AGV+OIzq9KWjsEQ+TfzseqIUrjlykZPpYwE2wY7VWXyi7mcKLqwFPTWahT1TFiY3gH1dH7UE/7YdIXnwVWf41VZgnCr/VQjBVL1nCC9PeyiVAc0GUtJ61cOtHqqJbKxC3kXSO1p2om3T5JeusVWbjAI41LP556o65wfpV9HVaN0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Fri, 19 Sep 2025 10:57:13 +0800 Received: from twmbx02.aspeed.com (192.168.10.13) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Fri, 19 Sep 2025 10:57:13 +0800 From: Ryan Chen To: ryan_chen , Greg Kroah-Hartman , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , "Alan Stern" , Philipp Zabel , , , Subject: [PATCH v3 4/4] usb: uhci: Add Aspeed AST2700 support Date: Fri, 19 Sep 2025 10:57:12 +0800 Message-ID: <20250919025712.719246-5-ryan_chen@aspeedtech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250919025712.719246-1-ryan_chen@aspeedtech.com> References: <20250919025712.719246-1-ryan_chen@aspeedtech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Unlike earlier Aspeed SoCs (AST2400/2500/2600) which are limited to 32-bit DMA addressing, the UHCI controller in AST2700 supports 64-bit DMA. Update the platform UHCI driver to select the appropriate DMA mask based on the device tree compatible string. Signed-off-by: Ryan Chen --- drivers/usb/host/uhci-platform.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platf= orm.c index f255358d6242..5b4be9a5764a 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -71,6 +71,7 @@ static int uhci_hcd_platform_probe(struct platform_device= *pdev) struct usb_hcd *hcd; struct uhci_hcd *uhci; struct resource *res; + u64 *dma_mask_ptr; int ret; =20 if (usb_disabled()) @@ -81,7 +82,8 @@ static int uhci_hcd_platform_probe(struct platform_device= *pdev) * Since shared usb code relies on it, set it here for now. * Once we have dma capability bindings this can go away. */ - ret =3D dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + dma_mask_ptr =3D (u64 *)of_device_get_match_data(&pdev->dev); + ret =3D dma_coerce_mask_and_coherent(&pdev->dev, *dma_mask_ptr); if (ret) return ret; =20 @@ -114,7 +116,8 @@ static int uhci_hcd_platform_probe(struct platform_devi= ce *pdev) } if (of_device_is_compatible(np, "aspeed,ast2400-uhci") || of_device_is_compatible(np, "aspeed,ast2500-uhci") || - of_device_is_compatible(np, "aspeed,ast2600-uhci")) { + of_device_is_compatible(np, "aspeed,ast2600-uhci") || + of_device_is_compatible(np, "aspeed,ast2700-uhci")) { uhci->is_aspeed =3D 1; dev_info(&pdev->dev, "Enabled Aspeed implementation workarounds\n"); @@ -189,9 +192,13 @@ static void uhci_hcd_platform_shutdown(struct platform= _device *op) uhci_hc_died(hcd_to_uhci(hcd)); } =20 +static const u64 dma_mask_32 =3D DMA_BIT_MASK(32); +static const u64 dma_mask_64 =3D DMA_BIT_MASK(64); + static const struct of_device_id platform_uhci_ids[] =3D { - { .compatible =3D "generic-uhci", }, - { .compatible =3D "platform-uhci", }, + { .compatible =3D "generic-uhci", .data =3D &dma_mask_32}, + { .compatible =3D "platform-uhci", .data =3D &dma_mask_32}, + { .compatible =3D "aspeed,ast2700-uhci", .data =3D &dma_mask_64}, {} }; MODULE_DEVICE_TABLE(of, platform_uhci_ids); --=20 2.34.1