Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2217771/?format=api
{ "id": 2217771, "url": "http://patchwork.ozlabs.org/api/patches/2217771/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-tegra/patch/20260330144456.13551-7-akhilrajeev@nvidia.com/", "project": { "id": 21, "url": "http://patchwork.ozlabs.org/api/projects/21/?format=api", "name": "Linux Tegra Development", "link_name": "linux-tegra", "list_id": "linux-tegra.vger.kernel.org", "list_email": "linux-tegra@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260330144456.13551-7-akhilrajeev@nvidia.com>", "list_archive_url": null, "date": "2026-03-30T14:44:52", "name": "[v5,06/10] dmaengine: tegra: Support address width > 39 bits", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "0fd70e309aa40752f48cb44566bbfc2a7922d8db", "submitter": { "id": 81965, "url": "http://patchwork.ozlabs.org/api/people/81965/?format=api", "name": "Akhil R", "email": "akhilrajeev@nvidia.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-tegra/patch/20260330144456.13551-7-akhilrajeev@nvidia.com/mbox/", "series": [ { "id": 498044, "url": "http://patchwork.ozlabs.org/api/series/498044/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-tegra/list/?series=498044", "date": "2026-03-30T14:44:52", "name": "Add GPCDMA support in Tegra264", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/498044/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2217771/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2217771/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linux-tegra+bounces-13427-incoming=patchwork.ozlabs.org@vger.kernel.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linux-tegra@vger.kernel.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256\n header.s=selector2 header.b=E2Yi9e5q;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.232.135.74; helo=sto.lore.kernel.org;\n envelope-from=linux-tegra+bounces-13427-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com\n header.b=\"E2Yi9e5q\"", "smtp.subspace.kernel.org;\n arc=fail smtp.client-ip=52.101.46.31", "smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=nvidia.com", "smtp.subspace.kernel.org;\n spf=fail smtp.mailfrom=nvidia.com" ], "Received": [ "from sto.lore.kernel.org (sto.lore.kernel.org [172.232.135.74])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fkvQX3Vxtz1xtJ\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 31 Mar 2026 01:53:56 +1100 (AEDT)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 6706830539E6\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 30 Mar 2026 14:46:40 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 0D64A3264EF;\n\tMon, 30 Mar 2026 14:46:40 +0000 (UTC)", "from CO1PR03CU002.outbound.protection.outlook.com\n (mail-westus2azon11010031.outbound.protection.outlook.com [52.101.46.31])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 52D573242BD;\n\tMon, 30 Mar 2026 14:46:38 +0000 (UTC)", "from SJ2PR07CA0005.namprd07.prod.outlook.com (2603:10b6:a03:505::29)\n by LV8PR12MB9666.namprd12.prod.outlook.com (2603:10b6:408:296::19) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.15; Mon, 30 Mar\n 2026 14:46:31 +0000", "from SJ1PEPF00002319.namprd03.prod.outlook.com\n (2603:10b6:a03:505:cafe::52) by SJ2PR07CA0005.outlook.office365.com\n (2603:10b6:a03:505::29) with Microsoft SMTP Server (version=TLS1_3,\n cipher=TLS_AES_256_GCM_SHA384) id 15.20.9745.28 via Frontend Transport; Mon,\n 30 Mar 2026 14:46:30 +0000", "from mail.nvidia.com (216.228.117.160) by\n SJ1PEPF00002319.mail.protection.outlook.com (10.167.242.229) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.9745.21 via Frontend Transport; Mon, 30 Mar 2026 14:46:30 +0000", "from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com\n (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 30 Mar\n 2026 07:46:07 -0700", "from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail205.nvidia.com\n (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 30 Mar\n 2026 07:46:06 -0700", "from BUILDSERVER-IO-L4T.nvidia.com (10.127.8.9) by mail.nvidia.com\n (10.129.68.9) with Microsoft SMTP Server id 15.2.2562.20 via Frontend\n Transport; Mon, 30 Mar 2026 07:46:02 -0700" ], "ARC-Seal": [ "i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1774881999; cv=fail;\n b=p6McmrBIajzfo+TT/dCF5/Ks18QoopDlkN49yx+dXi7aMoRO6IPUDqcJtB57voogU0Gho4w+Y76RxFPQ9fNu9Cao4w/WhsNGj2pJckUZceu9Pguzw0xEzAlQWC7iy92EUWb7eL/MRWJ9neATf9TKoWEE73CThHWZZJ0Yio4Kx5U=", "i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=P2mr+xc4RtLU6gYu+c8bq3kaxRR56AxVqfvgCq+5qMQNq1kKWfm58XCVFB7kK1TRjQKhSUN/e6yikGHJcPrxEfgkpUQe2E6jvn97t9N6+5O9dsEysJHk93NXSVQk9GAEG3ZRtC3p9plaUu5icHo7sYW+3qfKaJKxFtyaO/G8d2GidliWD2z8doMeUlS3XnF+R381Melpuw3g5vcfXNcDrApkhSHM9kUf8+ZArSrE0bxIlL4th2pOYhBEafztvUW4reScq2jgS9fweUkagR7fLab3xOGUg2jNls8Jxqu5J+OKiRCUwUWwEyMjy9BvB+xqBEvGm/P868GrnjjdTDbk/A==" ], "ARC-Message-Signature": [ "i=2; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1774881999; c=relaxed/simple;\n\tbh=SQJ7VMOdztBN8VEoQ/woCNTKLz4Zb3vzMDtFm/Pnv/Y=;\n\th=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=fu1Jr/6v3K03c2UFMtrCVNjV/AqFXDLq6YK2bChi8Su6e9dDkpnAxqvSIollERjj4qzzTZsCHpyj+/ogYcHML8rQf0DmnXwRWqvp9FTRmuNwojRI+x9vh/t/kw7D4JOmWBhlCoDVpfngkrRrQ/Vi0NQ+Vqrs8hxAxSatxmxnHGw=", "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=vVnz7TKYYKTyGo33p2hmPXlgiheHRvP1btHDWx1JjFc=;\n b=G394CHLPVhj89XiLPp+spbrInMFzCkjcjM1d+jPBJfE5mf3ZmweV942zm11pHO+IqF2WcINR0TMd9qSTvstuPqVkMST4Bdad2YYjJFNb7pRGs4ybz/Mbp6zbs5XhQPN56zRe0Ff8OPmghAQv2U/lZbTxi7yZB7SHD8Oybui0PCbiiCwDyimWzL037JUkrF2lgzd9EvP4OMlJpWvyU54OOl19XdH28nw7glGPBP/gDA9LtIQdTPL1x+9BfiKP5DY2n+8tSj2bLdSRnYU1IQ1/ifjm+JvegZc1ZOwyIi3V7/4ord8QHKWls8WwD1XnyFXQacTle0wEupRK3HrHV4bTgw==" ], "ARC-Authentication-Results": [ "i=2; smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=nvidia.com;\n spf=fail smtp.mailfrom=nvidia.com;\n dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com\n header.b=E2Yi9e5q; arc=fail smtp.client-ip=52.101.46.31", "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.117.160) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none (0)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=vVnz7TKYYKTyGo33p2hmPXlgiheHRvP1btHDWx1JjFc=;\n b=E2Yi9e5qC4oDBv/RuktMbiAfGnyE3yjK0Bv5zMHPg2dqHnvflzYrrKM1sbmTtLU+VIKQROIi0Rifs0rl3N3whhkkSYefE+V7xyvE4ssdCBFekUrYt1KKdulC/4R/uAuHYHnLHqpov0XBxVbo/dYGUN4FeoXS3vcpriWDGvMtlzoBDdEz+YiL8fnwfxdJVkchRUG3uwyNwrvGjAZGmklGPMgCFIgtdd05ZsDofkX9HbPKPbG1ePPMfm4IpMvra5YRzHxA1YZ619MPtYbmi8xXtsQaF4Kmv+UlzVhnK8xq7wWbGSSwBri+QkukrBhyLrE4XWhKaASYhGPLODtV7FrTDA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.117.160)\n smtp.mailfrom=nvidia.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.117.160 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C", "From": "Akhil R <akhilrajeev@nvidia.com>", "To": "Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>, Rob Herring\n\t<robh@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, Conor Dooley\n\t<conor+dt@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, \"Jonathan\n Hunter\" <jonathanh@nvidia.com>, Laxman Dewangan <ldewangan@nvidia.com>,\n\tPhilipp Zabel <p.zabel@pengutronix.de>, <dmaengine@vger.kernel.org>,\n\t<devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>,\n\t<linux-kernel@vger.kernel.org>", "CC": "Akhil R <akhilrajeev@nvidia.com>, Frank Li <Frank.Li@nxp.com>", "Subject": "[PATCH v5 06/10] dmaengine: tegra: Support address width > 39 bits", "Date": "Mon, 30 Mar 2026 20:14:52 +0530", "Message-ID": "<20260330144456.13551-7-akhilrajeev@nvidia.com>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20260330144456.13551-1-akhilrajeev@nvidia.com>", "References": "<20260330144456.13551-1-akhilrajeev@nvidia.com>", "Precedence": "bulk", "X-Mailing-List": "linux-tegra@vger.kernel.org", "List-Id": "<linux-tegra.vger.kernel.org>", "List-Subscribe": "<mailto:linux-tegra+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:linux-tegra+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "X-NVConfidentiality": "public", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-NV-OnPremToCloud": "ExternallySecured", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ1PEPF00002319:EE_|LV8PR12MB9666:EE_", "X-MS-Office365-Filtering-Correlation-Id": "17be865f-0f3c-4937-310e-08de8e6b2150", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "\n\tBCL:0;ARA:13230040|36860700016|7416014|376014|1800799024|82310400026|921020|22082099003|18002099003|56012099003;", "X-Microsoft-Antispam-Message-Info": "\n\tamZnNZ8p+eTZGIAOMq/O0YsRcgJ/K6k6WYxsNTPIntRhLmDtnl5zrh2zZJQUDxmrK7ngBJ1SlHhy0N9gvJQbVXq803fqEcr5CH+85wQ1zdaokS0U09tDHSF52QpBvK+sYPIkNeJulwFmD961vsvptbC7adO88UE/IFx8JeSURur7OQsfPvgJBuEMIxpko8kr1RRCfMVNDClBs14OpnOa+8hz6euZR5ILtuPZoYBAGlP0fO0l3oBIHB5rdIP32HOYayT9UtFgZ+Gar5I5s+CgACl0W4/qqQs9x/7K2dFUrF1LarNwsKvNKJ8+m4OdZeCnX6dXVIkVHWWlotNV8BT0RUN1QnnczVZogiNZSGOHy2EdeR+8xwGuhBbzwHd8m4Tjz1NIODNuu4ly3pUBHJ4diJcgt8hesqcm+0AH47kAG/89yaU2E0M5Sm11PK3JJuKRIl1jwSud83FozCw6ZI6T3ssrtHI5HwUnb4sA4mZD9r/hX4zypfg0OVdbruzUL93jD/t0Lxqkv8lqya38kgXh0UgTi9q0gTDN4t1OkLFALyAEor7BNV8grTyi8TBs9a9r9dcvTO5Kw/L0RsHNfcAwqyyR0iSFrbaWJyf/BwK9UIa7jlC7tux99SmU5BlphXulAPwnxsxLvbCJeUyOVG0872XTJe4y2C7m1VDY4XhQzt4HaaBp2IKKtmjXXkvukywyaZZPqUmWLOi3YMawPlWMxv3oHSSE8zG2v5I6QqIwM/1CJ0KkwzNuV1aNbBmlgdENTCF1SsP6GLRnc9VEd1X6C9jOWzPSNUC/8dY/UPr2teovCmFYNof+3iZ4mpiU+KDl", "X-Forefront-Antispam-Report": "\n\tCIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(36860700016)(7416014)(376014)(1800799024)(82310400026)(921020)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n\t+oh4N2ZAr1GkfU118HTUY7f6yiX/LnfI1HEHRjau7NO+rI8NvPnR0tgBx3g41jJsqk793ZpyTSsrue60L3rCgs8NMKoJY3iS+yFAevRSKOa93Skb+Fl7W8tdTz3sNRXhlzVhuzhn1BsLao1MyK7xgWhwGAoxfNs79LEPVwV6hxlGseuaeXpxEHoto1EbLVN1Ik6sJP9K27aKZdnxyC3QnHzMUsMbd44YHyyWnHEl0iuKGYhqLdT1MStn7Lfh/UCU7lnDp8fM3A77vqUCRPp0QGOsRxgTOB5d1LIQzI8QNqUZCsDcGwsd4fobUDbxxqHCOjzUz7rBPP7wxuWtF8KJ5jipF4y+/XdUinlwBR13KCpTQS16E1Cmb4pE77BoewrheAySg+RfgLKangHiPz9xMa7HhnN016CYyqxT8DI1SZ5sOZQn6FW5wfrf8gYt3WWD", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "30 Mar 2026 14:46:30.3310\n (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 17be865f-0f3c-4937-310e-08de8e6b2150", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n\tSJ1PEPF00002319.namprd03.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "LV8PR12MB9666" }, "content": "Tegra264 supports address width of 41 bits. Unlike older SoCs which use\na common high_addr register for upper address bits, Tegra264 has separate\nsrc_high and dst_high registers to accommodate this wider address space.\n\nAdd an addr_bits property to the device data structure to specify the\nnumber of address bits supported on each device and use that to program\nthe appropriate registers.\n\nUpdate the sg_req struct to remove the high_addr field and use\ndma_addr_t for src and dst to store the complete addresses. Extract\nthe high address bits only when programming the registers.\n\nSigned-off-by: Akhil R <akhilrajeev@nvidia.com>\nReviewed-by: Frank Li <Frank.Li@nxp.com>\n---\n drivers/dma/tegra186-gpc-dma.c | 83 +++++++++++++++++++++-------------\n 1 file changed, 52 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c\nindex b213c4ae07d2..3ac43ad19ed6 100644\n--- a/drivers/dma/tegra186-gpc-dma.c\n+++ b/drivers/dma/tegra186-gpc-dma.c\n@@ -146,6 +146,7 @@ struct tegra_dma_channel;\n */\n struct tegra_dma_chip_data {\n \tbool hw_support_pause;\n+\tunsigned int addr_bits;\n \tunsigned int nr_channels;\n \tunsigned int channel_reg_size;\n \tunsigned int max_dma_count;\n@@ -161,6 +162,8 @@ struct tegra_dma_channel_regs {\n \tu32 src;\n \tu32 dst;\n \tu32 high_addr;\n+\tu32 src_high;\n+\tu32 dst_high;\n \tu32 mc_seq;\n \tu32 mmio_seq;\n \tu32 wcount;\n@@ -179,10 +182,9 @@ struct tegra_dma_channel_regs {\n */\n struct tegra_dma_sg_req {\n \tunsigned int len;\n+\tdma_addr_t src;\n+\tdma_addr_t dst;\n \tu32 csr;\n-\tu32 src;\n-\tu32 dst;\n-\tu32 high_addr;\n \tu32 mc_seq;\n \tu32 mmio_seq;\n \tu32 wcount;\n@@ -266,6 +268,25 @@ static inline struct device *tdc2dev(struct tegra_dma_channel *tdc)\n \treturn tdc->vc.chan.device->dev;\n }\n \n+static void tegra_dma_program_addr(struct tegra_dma_channel *tdc,\n+\t\t\t\t struct tegra_dma_sg_req *sg_req)\n+{\n+\ttdc_write(tdc, tdc->regs->src, lower_32_bits(sg_req->src));\n+\ttdc_write(tdc, tdc->regs->dst, lower_32_bits(sg_req->dst));\n+\n+\tif (tdc->tdma->chip_data->addr_bits > 39) {\n+\t\ttdc_write(tdc, tdc->regs->src_high, upper_32_bits(sg_req->src));\n+\t\ttdc_write(tdc, tdc->regs->dst_high, upper_32_bits(sg_req->dst));\n+\t} else {\n+\t\tu32 src_high = FIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR,\n+\t\t\t\t\t upper_32_bits(sg_req->src));\n+\t\tu32 dst_high = FIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR,\n+\t\t\t\t\t upper_32_bits(sg_req->dst));\n+\n+\t\ttdc_write(tdc, tdc->regs->high_addr, src_high | dst_high);\n+\t}\n+}\n+\n static void tegra_dma_dump_chan_regs(struct tegra_dma_channel *tdc)\n {\n \tdev_dbg(tdc2dev(tdc), \"DMA Channel %d name %s register dump:\\n\",\n@@ -274,10 +295,20 @@ static void tegra_dma_dump_chan_regs(struct tegra_dma_channel *tdc)\n \t\ttdc_read(tdc, tdc->regs->csr),\n \t\ttdc_read(tdc, tdc->regs->status),\n \t\ttdc_read(tdc, tdc->regs->csre));\n-\tdev_dbg(tdc2dev(tdc), \"SRC %x DST %x HI ADDR %x\\n\",\n-\t\ttdc_read(tdc, tdc->regs->src),\n-\t\ttdc_read(tdc, tdc->regs->dst),\n-\t\ttdc_read(tdc, tdc->regs->high_addr));\n+\n+\tif (tdc->tdma->chip_data->addr_bits > 39) {\n+\t\tdev_dbg(tdc2dev(tdc), \"SRC %x SRC HI %x DST %x DST HI %x\\n\",\n+\t\t\ttdc_read(tdc, tdc->regs->src),\n+\t\t\ttdc_read(tdc, tdc->regs->src_high),\n+\t\t\ttdc_read(tdc, tdc->regs->dst),\n+\t\t\ttdc_read(tdc, tdc->regs->dst_high));\n+\t} else {\n+\t\tdev_dbg(tdc2dev(tdc), \"SRC %x DST %x HI ADDR %x\\n\",\n+\t\t\ttdc_read(tdc, tdc->regs->src),\n+\t\t\ttdc_read(tdc, tdc->regs->dst),\n+\t\t\ttdc_read(tdc, tdc->regs->high_addr));\n+\t}\n+\n \tdev_dbg(tdc2dev(tdc), \"MCSEQ %x IOSEQ %x WCNT %x XFER %x WSTA %x\\n\",\n \t\ttdc_read(tdc, tdc->regs->mc_seq),\n \t\ttdc_read(tdc, tdc->regs->mmio_seq),\n@@ -480,9 +511,7 @@ static void tegra_dma_configure_next_sg(struct tegra_dma_channel *tdc)\n \tsg_req = &dma_desc->sg_req[dma_desc->sg_idx];\n \n \ttdc_write(tdc, tdc->regs->wcount, sg_req->wcount);\n-\ttdc_write(tdc, tdc->regs->src, sg_req->src);\n-\ttdc_write(tdc, tdc->regs->dst, sg_req->dst);\n-\ttdc_write(tdc, tdc->regs->high_addr, sg_req->high_addr);\n+\ttegra_dma_program_addr(tdc, sg_req);\n \n \t/* Start DMA */\n \ttdc_write(tdc, tdc->regs->csr,\n@@ -510,11 +539,9 @@ static void tegra_dma_start(struct tegra_dma_channel *tdc)\n \n \tsg_req = &dma_desc->sg_req[dma_desc->sg_idx];\n \n+\ttegra_dma_program_addr(tdc, sg_req);\n \ttdc_write(tdc, tdc->regs->wcount, sg_req->wcount);\n \ttdc_write(tdc, tdc->regs->csr, 0);\n-\ttdc_write(tdc, tdc->regs->src, sg_req->src);\n-\ttdc_write(tdc, tdc->regs->dst, sg_req->dst);\n-\ttdc_write(tdc, tdc->regs->high_addr, sg_req->high_addr);\n \ttdc_write(tdc, tdc->regs->fixed_pattern, sg_req->fixed_pattern);\n \ttdc_write(tdc, tdc->regs->mmio_seq, sg_req->mmio_seq);\n \ttdc_write(tdc, tdc->regs->mc_seq, sg_req->mc_seq);\n@@ -819,7 +846,7 @@ static unsigned int get_burst_size(struct tegra_dma_channel *tdc,\n \n static int get_transfer_param(struct tegra_dma_channel *tdc,\n \t\t\t enum dma_transfer_direction direction,\n-\t\t\t u32 *apb_addr,\n+\t\t\t dma_addr_t *apb_addr,\n \t\t\t u32 *mmio_seq,\n \t\t\t u32 *csr,\n \t\t\t unsigned int *burst_size,\n@@ -897,11 +924,9 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,\n \tdma_desc->bytes_req = len;\n \tdma_desc->sg_count = 1;\n \tsg_req = dma_desc->sg_req;\n-\n \tsg_req[0].src = 0;\n \tsg_req[0].dst = dest;\n-\tsg_req[0].high_addr =\n-\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (dest >> 32));\n+\n \tsg_req[0].fixed_pattern = value;\n \t/* Word count reg takes value as (N +1) words */\n \tsg_req[0].wcount = ((len - 4) >> 2);\n@@ -969,10 +994,7 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,\n \n \tsg_req[0].src = src;\n \tsg_req[0].dst = dest;\n-\tsg_req[0].high_addr =\n-\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR, (src >> 32));\n-\tsg_req[0].high_addr |=\n-\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (dest >> 32));\n+\n \t/* Word count reg takes value as (N +1) words */\n \tsg_req[0].wcount = ((len - 4) >> 2);\n \tsg_req[0].csr = csr;\n@@ -992,7 +1014,8 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,\n \tstruct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);\n \tunsigned int max_dma_count = tdc->tdma->chip_data->max_dma_count;\n \tenum dma_slave_buswidth slave_bw = DMA_SLAVE_BUSWIDTH_UNDEFINED;\n-\tu32 csr, mc_seq, apb_ptr = 0, mmio_seq = 0;\n+\tu32 csr, mc_seq, mmio_seq = 0;\n+\tdma_addr_t apb_ptr = 0;\n \tstruct tegra_dma_sg_req *sg_req;\n \tstruct tegra_dma_desc *dma_desc;\n \tstruct scatterlist *sg;\n@@ -1080,13 +1103,9 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,\n \t\tif (direction == DMA_MEM_TO_DEV) {\n \t\t\tsg_req[i].src = mem;\n \t\t\tsg_req[i].dst = apb_ptr;\n-\t\t\tsg_req[i].high_addr =\n-\t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR, (mem >> 32));\n \t\t} else if (direction == DMA_DEV_TO_MEM) {\n \t\t\tsg_req[i].src = apb_ptr;\n \t\t\tsg_req[i].dst = mem;\n-\t\t\tsg_req[i].high_addr =\n-\t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (mem >> 32));\n \t\t}\n \n \t\t/*\n@@ -1110,7 +1129,8 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l\n \t\t\t unsigned long flags)\n {\n \tenum dma_slave_buswidth slave_bw = DMA_SLAVE_BUSWIDTH_UNDEFINED;\n-\tu32 csr, mc_seq, apb_ptr = 0, mmio_seq = 0, burst_size;\n+\tu32 csr, mc_seq, mmio_seq = 0, burst_size;\n+\tdma_addr_t apb_ptr = 0;\n \tunsigned int max_dma_count, len, period_count, i;\n \tstruct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);\n \tstruct tegra_dma_desc *dma_desc;\n@@ -1201,13 +1221,9 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l\n \t\tif (direction == DMA_MEM_TO_DEV) {\n \t\t\tsg_req[i].src = mem;\n \t\t\tsg_req[i].dst = apb_ptr;\n-\t\t\tsg_req[i].high_addr =\n-\t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR, (mem >> 32));\n \t\t} else if (direction == DMA_DEV_TO_MEM) {\n \t\t\tsg_req[i].src = apb_ptr;\n \t\t\tsg_req[i].dst = mem;\n-\t\t\tsg_req[i].high_addr =\n-\t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (mem >> 32));\n \t\t}\n \t\t/*\n \t\t * Word count register takes input in words. Writing a value\n@@ -1304,6 +1320,7 @@ static const struct tegra_dma_channel_regs tegra186_reg_offsets = {\n \n static const struct tegra_dma_chip_data tegra186_dma_chip_data = {\n \t.nr_channels = 32,\n+\t.addr_bits = 39,\n \t.channel_reg_size = SZ_64K,\n \t.max_dma_count = SZ_1G,\n \t.hw_support_pause = false,\n@@ -1313,6 +1330,7 @@ static const struct tegra_dma_chip_data tegra186_dma_chip_data = {\n \n static const struct tegra_dma_chip_data tegra194_dma_chip_data = {\n \t.nr_channels = 32,\n+\t.addr_bits = 39,\n \t.channel_reg_size = SZ_64K,\n \t.max_dma_count = SZ_1G,\n \t.hw_support_pause = true,\n@@ -1322,6 +1340,7 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {\n \n static const struct tegra_dma_chip_data tegra234_dma_chip_data = {\n \t.nr_channels = 32,\n+\t.addr_bits = 39,\n \t.channel_reg_size = SZ_64K,\n \t.max_dma_count = SZ_1G,\n \t.hw_support_pause = true,\n@@ -1433,6 +1452,8 @@ static int tegra_dma_probe(struct platform_device *pdev)\n \t\ttdc->stream_id = stream_id;\n \t}\n \n+\tdma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(cdata->addr_bits));\n+\n \tdma_cap_set(DMA_SLAVE, tdma->dma_dev.cap_mask);\n \tdma_cap_set(DMA_PRIVATE, tdma->dma_dev.cap_mask);\n \tdma_cap_set(DMA_MEMCPY, tdma->dma_dev.cap_mask);\n", "prefixes": [ "v5", "06/10" ] }