From nobody Thu Oct 2 17:02:08 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 67E562DC34B; Mon, 15 Sep 2025 07:39:47 +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=1757921989; cv=none; b=lA1IgNs67AYfdzihM9gjMzwNZl9QViWUzIdCkRMtn0BC6ntqNDJh5Q4f70WTyXN1+oYNIJcx1GTNkNjXGTcax0wej6OzGv/PN+1X91+LcbNNCtmVW1DjvKqLsh1OkGqf6aC95s5ZnuoVzwB3Z2L9hRUMq/GjHVqixM5tE6T3bN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757921989; c=relaxed/simple; bh=AsQ0kXWPHX6N8RSiom5wtRA4QFYaJO1fYEXrO99sRBs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kc3x4EZjTs0f4VC5y54fDi/d4b5YySS7tU6aqW//WaBwUKo68gKz/Z8387Hf3ZGvcjUCXn8+39KgTwgubA7lwuLUTYz/Kb+ACCU51F2SupwNIcdbz6Bv28Vtdqiae1cvnU/M6QOwrO6NJFR+JRCLjGk1MBt+9/iCsNbOLk/G44w= 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; Mon, 15 Sep 2025 15:39:26 +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; Mon, 15 Sep 2025 15:39:26 +0800 From: Ryan Chen To: ryan_chen , Greg Kroah-Hartman , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , "Alan Stern" , Philipp Zabel , , , Subject: [PATCH 4/4] usb: uhci: Add Aspeed AST2700 support Date: Mon, 15 Sep 2025 15:39:26 +0800 Message-ID: <20250915073926.3057368-5-ryan_chen@aspeedtech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250915073926.3057368-1-ryan_chen@aspeedtech.com> References: <20250915073926.3057368-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 010c458e7d8f..24628b0ce99b 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"); @@ -190,9 +193,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