From nobody Wed Oct 8 02:04:17 2025 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011027.outbound.protection.outlook.com [52.101.65.27]) (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 4D5A7244675; Thu, 3 Jul 2025 10:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.27 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751538947; cv=fail; b=V4saVuyGwVHDHTRZi8qLzOyEyBMjPQ7ekga5KYHp/tLXSCx24sf6qd++8fzg9EUEtPr2+vUVVe8xXaFMOQh0OifYv8tStpWX5lgpJZeKE3Tft91SwWZ2GRaHeSh/OavLiMvaSvywD35tSbQQrFfAgcd9tUpqRzO6VXRhlATRT2k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751538947; c=relaxed/simple; bh=3nE/zCAKmOalcbbXjRHX6DK6N8JwDPxCmvndHR4X648=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=tWQi9AhawNGZs9HqRrPA8GbZyN5+8LFc7nEJEkISEnqtnGjzNJx5PnWAJOd507bjS9Y9Jft0L1f8/+iAwaJsxzIwQghbkgMCYTHzYiz6ZbFEo1XmutWekQv0JUOaHOZSrHQVtjNk2SEg/DjbV0nArVLbXcgGLHvBEJNuy9y5eeM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=NkmcMyl/; arc=fail smtp.client-ip=52.101.65.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="NkmcMyl/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a8psQ0C1N1zI4a7qSEskMqZu16Vny74SxxH3sDokA1HcAV99CnoqbOhZg+KhfA1SmSto9dS2Yz5T61VGJOk5QR/jejgHGj8YFh7rAjI6ug+mo9K/MkRLDu/mDYlfpQ6AMvAhq9NiflwcGgCcL7UOLNSvJWy+fMtGjgZ5Jfxet0obIFRu1DYTZwR/I5jnB6/sAmHLEKVl4n/b6qI/nboCIgTSMgu1Uia05CnANgiFnQkTkNL5tIDvqUFhijM/OnSGTurVynMczQ+5Rrzpir7BaxYnqwPgtELnEeVZuAwUSQtS9EzC6aB7lXfKYS9hDlSZxMpXj2lukBBrAa1vB80X0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=g2HAYuVl7aFZMyJ1eE+eaT8o7A5QEBCSTZOr1EoZ6f4=; b=JFw0zn6NnzfloyzzTqKMuC38dvcDB4MWg7CcAIem/VFI0T2hGN2hPwDRlKnQd3yHQF7QcrjnoDSusHTaqA39LYZCAaDf1JMZeMKUaWZ5HzbAEmQLrG13Lr9WqnvEQh7K2vjgwDnMzJXUM1+/6s04j1Ub0YyJGkaZicqnFVdmZ6VvBwA6tdPCDP/UvephFfP4Zb2Rgbullko+Zqjflh1N7Ga+LIrU+J5O6NBV7FMmQs5ly2K8IRIuWGZIMiiaSlf4ZZ53BnVJ20RBTX9ZIUpK1lzDNIHzz8PVeUmHnSVTU8imNMcyQYL9uVCIgFMwUrSyu8d2+lK7JR8ojh/2sarBsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g2HAYuVl7aFZMyJ1eE+eaT8o7A5QEBCSTZOr1EoZ6f4=; b=NkmcMyl/rQx4hkFWP4hfz3fuMzGPI9TJqazhhUTnoogt9mZfdorMuixFqIxdJBnd+pyqTAAL3lCZaXVheQjJZbc4NtG4QCTu7AIiD0RrbJWBuXYpMVpBhTBO2IB+DiLSBXJdj4F+1Puy97rEH13PjnT1xdk24zjByJlh7inoJ7FO+Uwpi5H6l6xEjQ/ofNbcNkf83qJ6NXyHkWfOYWPQW7VcOzvQRbzWQ9WxKNEV+U96doeGnMQGWla28bDr1SQGTHz3nugLI89PBcT9f2r3Zw/MVOw/18pEIGkSC5ldPgabMHkFHFskgUWkmPk3oumbug6z2lMmXLYWaOilKUBSwA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by VI0PR04MB10928.eurprd04.prod.outlook.com (2603:10a6:800:261::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Thu, 3 Jul 2025 10:35:43 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7%6]) with mapi id 15.20.8901.021; Thu, 3 Jul 2025 10:35:43 +0000 From: Xu Yang To: ezequiel@vanguardiasur.com.ar, mchehab@kernel.org, laurent.pinchart@ideasonboard.com, hdegoede@redhat.com, gregkh@linuxfoundation.org, xu.yang_2@nxp.com, mingo@kernel.org, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, viro@zeniv.linux.org.uk, thomas.weissschuh@linutronix.de Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH v4 1/3] usb: core: add dma-noncoherent buffer alloc and free API Date: Thu, 3 Jul 2025 18:38:09 +0800 Message-Id: <20250703103811.4048542-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250703103811.4048542-1-xu.yang_2@nxp.com> References: <20250703103811.4048542-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0050.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ac::7) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|VI0PR04MB10928:EE_ X-MS-Office365-Filtering-Correlation-Id: ad9b8112-a3e3-44aa-d68f-08ddba1d5cc3 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|19092799006|376014|52116014|7416014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JqV1leL3ObDTuH9Ky01Jy0eucgdzGzfCegTOdHUgKfibSZkPACD1DlovC3dH?= =?us-ascii?Q?avAZpiWTaR8paY56Wqm2hBKekqSJeDjNNC4fUX1T4i88Q0XAvLNM0iDAk+uC?= =?us-ascii?Q?weaoJIl1OZBpzSxk3QGVh+roxTy9QDFiTIVsdJMHIQTGYs7+Q3mz/KlMd9FW?= =?us-ascii?Q?a8NxUOKF1scNn4Sm8MPej5XqaL3RSdrP0ffBS/9loOfDeRjnyPTOc7yBw6T1?= =?us-ascii?Q?MNOeNCXrJjwHJ6LGv036QXNZ3X1GiQyRZO5jrnvYe7WmD5ZMjoW+AlQBuKpL?= =?us-ascii?Q?DXyuc8fv/wJwoGSpuiElv+5w5G+l3AcS1jfVlElRPHPzYqxtElN2LD3KJVNW?= =?us-ascii?Q?ckGcRSfFxq8l0kxXHOWUty80PDazvoPfMtBlepGYLxMwDZUg+A+dPeeMhWHk?= =?us-ascii?Q?UCJormI5bI7Mk774nqwAGi6BGPE67EHreEZdKZQOxVo8B3Lqlx3ZcxJTTP51?= =?us-ascii?Q?xy9PnNFnuEtUowCTMLlJhVYOsE4gZjC1SHBLoaAqKhCFMJ8Pqqm/rRWFn4Y1?= =?us-ascii?Q?hBvobCsnwy+ZiFqrigYR+cKl633/ZkV8Mombqt946AYq1AWtlpmzz5XTYwic?= =?us-ascii?Q?JhjpRXlRjD9Gkf0MYwugJ6ads+U2vHU9QD+Odn/tpPFEGY4KHXQmj3SV19kv?= =?us-ascii?Q?Ri/y2E+IkiSkH+GKG9gSE9PX/E0NDIFdNL1tvGspkVsmstYdOqrs5fmByp4C?= =?us-ascii?Q?57izniZYB8sOdyTPoxcRNhn8Ge84kPb/MMMFd/DkxkceGhiX2/JC3OHF+QMQ?= =?us-ascii?Q?Oe6WoJTALpfVeX5tcc8V6QQR/P8A5ZS1UNjClorFTeDrb3PAHxhThGWx5BBr?= =?us-ascii?Q?o79BIt2BqWN5izEK9ko7U4TstM0sV3KAyNnUD+cVLG0K0CYfALUOpSQRseLn?= =?us-ascii?Q?8nR1hpBGghT4ll465eg5O5ZbEKOYj4wNvk0Znqo2h2de1hEohZRFjr1ZHihf?= =?us-ascii?Q?evcMJzU10qdwVUKI7odXTKibJLbws2J9gKBAy9tRVU1UStVS59xPC2IxPbch?= =?us-ascii?Q?CVULFklbekrYLtR5IlRRubtbeQ2SR6F25AOe0et3xDweMHgtLmCvnVT8gI1R?= =?us-ascii?Q?RoKDjmbDLZrwc9QcsQkiNzXxoouZnJLF6QDHec0/FQUj2DH9KjJ5o69Rh9kb?= =?us-ascii?Q?B+EFXSutbFvioYXJcbN1cNks40il5L4zo1R2E+Fpta5Ywi39tmNJGjw1DtlY?= =?us-ascii?Q?HI2sqkFr32y4/ibL2q2zO5ygIj30vb8EITqC3+5sZY3eydG12BH7jVKVSdC/?= =?us-ascii?Q?LGuOyj+c7tpF+ztoZcGZQx1K85Un1b2QQjMRvITc8Dxm3eJj9rjZ1QwZuM1D?= =?us-ascii?Q?e40MLcES25POI/O4Z7Sd74PfpJm9gI8wURspPTPcA9TmgNmzgm+I0SveQDTv?= =?us-ascii?Q?SYCU1XzpVgfouA6SOcEiMExxv+XARf/W8oWldakIbhDdoC8z/jMgl0l6zc6G?= =?us-ascii?Q?eHjc5EqmKLRNolJGgrhLY+BUrzNCu9v5cCb3z1NNvBaTZmkG+vjZecVEdUy1?= =?us-ascii?Q?5fQeJOUSKMzMV9U=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(19092799006)(376014)(52116014)(7416014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CxAi9MmodOcGRIvJa3OD3tyV5zAvd+aXNEI2pZcLUJTrTqA7o77vEmW7r5AF?= =?us-ascii?Q?XJ0DciM0mQaohHzD3VmpjPGr1JRAdEV1nmnoLbyAG+AJsTK916uvSwyDW1DQ?= =?us-ascii?Q?hnd21+6hBKWSjmuXGVhUPaOB0T/FlPIcYcnuR3kP1OHJvIeySM0lXiWRXFzy?= =?us-ascii?Q?P3avRimhXPZ8DGrY1oLTWVJc/lLqHNyOB3z7yniQai3V1O+Fp9tClKLlv6lB?= =?us-ascii?Q?FhOz/Stgr6ZNbHZdxaIq9/gQbljyo7hL7D9rh562vTqFhYfFQx9ZnheqSyEP?= =?us-ascii?Q?fNHORgLQVHrWW7aJqvM81R1vVMkX2cbY3nuXGe05S5sQ9ZkJ8pJ//rBMjmbM?= =?us-ascii?Q?Cjw0ZuHdIf/qDGijALcbFtwDlkP7ntS2EAnKc26ljs7Xz4tXTchQ3naHkxBS?= =?us-ascii?Q?ipvbpWPtEtQVfRPtjxe7hhuqp1EBa0v6XfbsKNQkfmmq91bw0V++WdBg9wLx?= =?us-ascii?Q?z4jGAdW4jyx2Do5ZssQfFBB6JEokCGT01euX/eKr2pl4K6usTxdE++jxo9fn?= =?us-ascii?Q?m31HRZa6I8IQo9ZnE+VmHX5vKsbnpoM3kUPiy17OXt0H4uvdTz6URHdAsAil?= =?us-ascii?Q?Edj3sGyb59dXmGKruSHNFXKorA0hIhQ4dAcy3+a5AhpdPRb8QEg7y60QmFLZ?= =?us-ascii?Q?Ub7tXEv47zWmroGnhR5Y7kjBgSsPKwkBVCKewFtIBikg9eGgpiGeIBpB6uug?= =?us-ascii?Q?mYvPZSjO2QMB6T1NYGOaotmy79XqJ9hcDjWAucFBsu3JRjZIzIHiUujpfMMV?= =?us-ascii?Q?7DRzP6qu2aAt2Hf7F1bI8Er4HlhbcB+yIEeueKdQh23zFDc8/kRCnuUIuCWS?= =?us-ascii?Q?YWAiYaEvJ7IUBtlAvjvRZygiHgxkqzszNc62+n8BqwhkYUz4NAj1POcGOCTp?= =?us-ascii?Q?peI4rgdnHoU/9GSr9BNum7kJSdztRK1QYm2D+00cfTMLBgC/C6fNKVKlHKfY?= =?us-ascii?Q?64et1IHeALLIvaMWOv6CZXWt6FfHAlDARgo4jsnqRfA4zUC2Q+nE3gPocyqh?= =?us-ascii?Q?KHw0caLVIQt5wk7n9+nmVEfEp0swZg1bUOKzdG5Zna/QJv5MiRSfMGG686Qx?= =?us-ascii?Q?G0eAq0eAVqss2RVEf+tgHottwYic+moDfrsfkW1Zlj+KRazrq3gTrBo0Lhej?= =?us-ascii?Q?XrgN/+/OoKy5F981nwzznMRjz93ORdxyt/JkTOEc4sj6hEXxYSb9eIz6HLYT?= =?us-ascii?Q?DSZ8OmR5pbLByquiT/CK5CqHOAAVAjE95QS1zYa20F4osHwOAs+MsRJ09oo8?= =?us-ascii?Q?cPVoOuWMpH00DRPenwX7o7xWk2SEhNxDzi1FxwY7C4JrHivFFggxeFMZVAi1?= =?us-ascii?Q?ZzecILQHMsPw+BQfhYfqc9vxMsvh03lhd0tEYAfyIpFI19fxCUChDjuFXBoT?= =?us-ascii?Q?8qTRqCCnrYRDO1oA9M1I7td8XNH9oQWknBlHdsK987V20Hfzx+RJft1zW4ZM?= =?us-ascii?Q?boo3aEdFH2/bgdSihoWwq2Xrt2tquQlMk41f29qcTSAJHjaqwMg055ubbMIy?= =?us-ascii?Q?oCkAaz5VHJFJtFokW9RNMvQUAYEzTcjN+Y1vzOMe+h5QCf9EgrDZAvU0vR4l?= =?us-ascii?Q?OI+9GZhMDA35fh0YlTOlICmzyzhlC+kBWiAwdi5T?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad9b8112-a3e3-44aa-d68f-08ddba1d5cc3 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2025 10:35:43.2345 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wefPhQnY3E0gfYvVet5Ss697UPoWt2SjHlnT0cysx5wTAKZ+8E34sLqfeQ18xvNiPbIzPVq4CKGRr2nc425Kxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB10928 Content-Type: text/plain; charset="utf-8" This will add usb_alloc_noncoherent() and usb_free_noncoherent() functions to support alloc and free buffer in a dma-noncoherent way. To explicit manage the memory ownership for the kernel and device, this will also add usb_dma_noncoherent_sync_for_cpu/device() functions and call it at proper time. The management requires the user save sg_table returned by usb_alloc_noncoherent() to urb->sgt. Signed-off-by: Xu Yang --- Changes in v4: - improve if-else logic Changes in v3: - put Return section at the end of description - correct some abbreviations - remove usb_dma_noncoherent_sync_for_cpu() and usb_dma_noncoherent_sync_for_device() - do DMA sync in usb_hcd_map_urb_for_dma() and usb_hcd_unmap_urb_for_dma() - call flush_kernel_vmap_range() for OUT transfers and invalidate_kernel_vmap_range() for IN transfers --- drivers/usb/core/hcd.c | 33 ++++++++++++----- drivers/usb/core/usb.c | 80 ++++++++++++++++++++++++++++++++++++++++++ include/linux/usb.h | 11 ++++++ 3 files changed, 116 insertions(+), 8 deletions(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index c22de97432a0..42d9d8db0968 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1342,29 +1342,35 @@ void usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd,= struct urb *urb) =20 dir =3D usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; if (IS_ENABLED(CONFIG_HAS_DMA) && - (urb->transfer_flags & URB_DMA_MAP_SG)) + (urb->transfer_flags & URB_DMA_MAP_SG)) { dma_unmap_sg(hcd->self.sysdev, urb->sg, urb->num_sgs, dir); - else if (IS_ENABLED(CONFIG_HAS_DMA) && - (urb->transfer_flags & URB_DMA_MAP_PAGE)) + } else if (IS_ENABLED(CONFIG_HAS_DMA) && + (urb->transfer_flags & URB_DMA_MAP_PAGE)) { dma_unmap_page(hcd->self.sysdev, urb->transfer_dma, urb->transfer_buffer_length, dir); - else if (IS_ENABLED(CONFIG_HAS_DMA) && - (urb->transfer_flags & URB_DMA_MAP_SINGLE)) + } else if (IS_ENABLED(CONFIG_HAS_DMA) && + (urb->transfer_flags & URB_DMA_MAP_SINGLE)) { dma_unmap_single(hcd->self.sysdev, urb->transfer_dma, urb->transfer_buffer_length, dir); - else if (urb->transfer_flags & URB_MAP_LOCAL) + } else if (urb->transfer_flags & URB_MAP_LOCAL) { hcd_free_coherent(urb->dev->bus, &urb->transfer_dma, &urb->transfer_buffer, urb->transfer_buffer_length, dir); + } else if ((urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP) && urb->sgt) { + dma_sync_sgtable_for_cpu(hcd->self.sysdev, urb->sgt, dir); + if (dir =3D=3D DMA_FROM_DEVICE) + invalidate_kernel_vmap_range(urb->transfer_buffer, + urb->transfer_buffer_length); + } =20 /* Make it safe to call this routine more than once */ urb->transfer_flags &=3D ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE | @@ -1425,8 +1431,10 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, str= uct urb *urb, } =20 dir =3D usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; - if (urb->transfer_buffer_length !=3D 0 - && !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) { + if (!(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) { + if (!urb->transfer_buffer_length) + return ret; + if (hcd->localmem_pool) { ret =3D hcd_alloc_coherent( urb->dev->bus, mem_flags, @@ -1491,7 +1499,16 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, str= uct urb *urb, if (ret && (urb->transfer_flags & (URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL))) usb_hcd_unmap_urb_for_dma(hcd, urb); + } else { + if (!urb->sgt) + return ret; + + if (dir =3D=3D DMA_TO_DEVICE) + flush_kernel_vmap_range(urb->transfer_buffer, + urb->transfer_buffer_length); + dma_sync_sgtable_for_device(hcd->self.sysdev, urb->sgt, dir); } + return ret; } EXPORT_SYMBOL_GPL(usb_hcd_map_urb_for_dma); diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 118fa4c93a79..fca7735fc660 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1030,6 +1030,86 @@ void usb_free_coherent(struct usb_device *dev, size_= t size, void *addr, } EXPORT_SYMBOL_GPL(usb_free_coherent); =20 +/** + * usb_alloc_noncoherent - allocate dma-noncoherent buffer for URB_NO_xxx_= DMA_MAP + * @dev: device the buffer will be used with + * @size: requested buffer size + * @mem_flags: affect whether allocation may block + * @dma: used to return DMA address of buffer + * @dir: DMA transfer direction + * @table: used to return sg_table of allocated memory + * + * To explicit manage the memory ownership for the kernel vs the device by + * USB core, the user needs save sg_table to urb->sgt. Then USB core will + * do DMA sync for CPU and device properly. + * + * When the buffer is no longer used, free it with usb_free_noncoherent(). + * + * Return: Either null (indicating no buffer could be allocated), or the + * cpu-space pointer to a buffer that may be used to perform DMA to the + * specified device. Such cpu-space buffers are returned along with the D= MA + * address (through the pointer provided). + */ +void *usb_alloc_noncoherent(struct usb_device *dev, size_t size, + gfp_t mem_flags, dma_addr_t *dma, + enum dma_data_direction dir, + struct sg_table **table) +{ + struct device *dmadev; + struct sg_table *sgt; + void *buffer; + + if (!dev || !dev->bus) + return NULL; + + dmadev =3D bus_to_hcd(dev->bus)->self.sysdev; + + sgt =3D dma_alloc_noncontiguous(dmadev, size, dir, mem_flags, 0); + if (!sgt) + return NULL; + + buffer =3D dma_vmap_noncontiguous(dmadev, size, sgt); + if (!buffer) { + dma_free_noncontiguous(dmadev, size, sgt, dir); + return NULL; + } + + *table =3D sgt; + *dma =3D sg_dma_address(sgt->sgl); + + return buffer; +} +EXPORT_SYMBOL_GPL(usb_alloc_noncoherent); + +/** + * usb_free_noncoherent - free memory allocated with usb_alloc_noncoherent= () + * @dev: device the buffer was used with + * @size: requested buffer size + * @addr: CPU address of buffer + * @dir: DMA transfer direction + * @table: describe the allocated and DMA mapped memory, + * + * This reclaims an I/O buffer, letting it be reused. The memory must have + * been allocated using usb_alloc_noncoherent(), and the parameters must m= atch + * those provided in that allocation request. + */ +void usb_free_noncoherent(struct usb_device *dev, size_t size, + void *addr, enum dma_data_direction dir, + struct sg_table *table) +{ + struct device *dmadev; + + if (!dev || !dev->bus) + return; + if (!addr) + return; + + dmadev =3D bus_to_hcd(dev->bus)->self.sysdev; + dma_vunmap_noncontiguous(dmadev, addr); + dma_free_noncontiguous(dmadev, size, table, dir); +} +EXPORT_SYMBOL_GPL(usb_free_noncoherent); + /* * Notifications of device and interface registration */ diff --git a/include/linux/usb.h b/include/linux/usb.h index e8662843e68c..9ade441ab4c8 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1619,6 +1619,7 @@ struct urb { void *transfer_buffer; /* (in) associated data buffer */ dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */ struct scatterlist *sg; /* (in) scatter gather buffer list */ + struct sg_table *sgt; /* (in) scatter gather table for noncoherent buffe= r */ int num_mapped_sgs; /* (internal) mapped sg entries */ int num_sgs; /* (in) number of entries in the sg list */ u32 transfer_buffer_length; /* (in) data buffer length */ @@ -1824,6 +1825,16 @@ void *usb_alloc_coherent(struct usb_device *dev, siz= e_t size, void usb_free_coherent(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma); =20 +enum dma_data_direction; + +void *usb_alloc_noncoherent(struct usb_device *dev, size_t size, + gfp_t mem_flags, dma_addr_t *dma, + enum dma_data_direction dir, + struct sg_table **table); +void usb_free_noncoherent(struct usb_device *dev, size_t size, + void *addr, enum dma_data_direction dir, + struct sg_table *table); + /*-------------------------------------------------------------------* * SYNCHRONOUS CALL SUPPORT * *-------------------------------------------------------------------*/ --=20 2.34.1 From nobody Wed Oct 8 02:04:17 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013039.outbound.protection.outlook.com [40.107.162.39]) (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 1B9A42E3390; Thu, 3 Jul 2025 10:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.39 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751538954; cv=fail; b=BK9Ue0+q8q/hlviYHO1xMwEpnb+Snn14ol4J/+oqB7g/pXPqGbkiZus7ViKzQYcyJSbnGvHNcEX0oP/zitVWeHLs+4ZNR9zYEJisj6JSfJq4V8aq/z/3ql2pFKhvT1fDCpLENujmqs+qG2AJWn2Lrs4vk41KOEDF/J+wxfycrTE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751538954; c=relaxed/simple; bh=LALhuZvhWsh68GrPWAr+N/INxrWA4QS3c46mkXobpWg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Bw7cVE1ZBHKI1XTznjC/3nh+VZKGZV2JxniyA25nOpXpZz6mo8EHkkzzao8l5U6HMgX9kqb9+RiehYWxx4E8SY2xyzPxc/77ucBM/YUKmj65aKd/XCMmDjroyjbduARHacE3ZCrvQziDTjfSxcqjZom+98ZnjtlM8/SB2VOklTg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=YFM1ciD7; arc=fail smtp.client-ip=40.107.162.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="YFM1ciD7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TjUSOtMozW+TGTuPiXXWs5VJmPGPKpkkyLzPIHtydtVFraloF+t+j5D7LzQb8IxzMAZoHrpMj57hcNPCp0fQizavNpYe/aIE1DAuzN+sB1NoAMDtkSmsqyyoHB9zkndKJau8bhzSSWe4XM9PDHbTbtVjoJZBTfHEahc+zC3tJjZsNnAzvuQPnuE/peTR+RCE1RXrm4TTMFbAhVIcseTwi0yS+Wc/HmjDSoUugbf6f+dz90xxVv10Fr7JahXnSu3p4QfFd2CEIJYfUJ1oS2eku81wIMmFT1hPxDqMTIvWoVJdWZ0+xoHyuoPvxZvxIoX9z+DIPN7QD2qmcUQdetrv4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=LNyWHexmtHJkE0z6rxmA/nCGJi0Y+hSdRCe07jFZATA=; b=Wu2K1PoYOrxlVRqsMX0y+TdZ3do9JYERFC7542BGdZsK0cQ9z9FhklXRo+UIUU91U+6aIn0e+0XkGSPi5RP0GY5SX+dyO8JscBy0QeLNd5BYkAsci23fKF/PfvO/eX8EVDMD9zAziteaXYeC2FGiO5mq0mmLsibUgASTquLzam13s/JkMvEej5M1noraBiYUJDoKxHf+BucvxFTk7azKJG9xsyL/Fe5P2Hg9CCvTYrEloJzSw8/STsuI4s3cg3AhyDK5k3plpGJ6UJMT6MhIICVjBlQs7MehYdZKbpsKHjIL2NAEyWuV4IOlrvzQwwmxrLW8WhHE1rUQObJ80mAkSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LNyWHexmtHJkE0z6rxmA/nCGJi0Y+hSdRCe07jFZATA=; b=YFM1ciD7XDhWHyYn32cjvq1/+b8Pm1VTJh4JDK2Ha8QOmFsCPCezdjtTJlkRZS0oMyr1YyhvD1blxTNqPTgwB2J0J74rQUdPBvPimfuMiMt4mOSn3FAH0JaUJhnne5ajCNtMZJz5pYfS8h6ES+9VzY60fH1RlyEujuIpK57JTw80I9boHgFOuKFShaj9BaVt2aTVjw2q2bDm4RXkyCZXnymkvgZH+Zc93wOGZj3QLLZCblWjPsZmbtZ3CQJSOVha90oOYOOTt4CVjbUOG7TOJkLcEd2L5nKmSiG+xm9rnHJcZvRpIn7PRFQod3C5l1bSbjplvUwEIhFZnaAg2wQ6aQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by VI0PR04MB10928.eurprd04.prod.outlook.com (2603:10a6:800:261::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Thu, 3 Jul 2025 10:35:48 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7%6]) with mapi id 15.20.8901.021; Thu, 3 Jul 2025 10:35:48 +0000 From: Xu Yang To: ezequiel@vanguardiasur.com.ar, mchehab@kernel.org, laurent.pinchart@ideasonboard.com, hdegoede@redhat.com, gregkh@linuxfoundation.org, xu.yang_2@nxp.com, mingo@kernel.org, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, viro@zeniv.linux.org.uk, thomas.weissschuh@linutronix.de Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH v4 2/3] media: uvcvideo: use usb_alloc_noncoherent/usb_free_noncoherent() Date: Thu, 3 Jul 2025 18:38:10 +0800 Message-Id: <20250703103811.4048542-3-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250703103811.4048542-1-xu.yang_2@nxp.com> References: <20250703103811.4048542-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0050.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ac::7) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|VI0PR04MB10928:EE_ X-MS-Office365-Filtering-Correlation-Id: c36469aa-1538-4d21-bf03-08ddba1d5ffe X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|19092799006|376014|52116014|7416014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SFGyUabvPDtaPXuLiyBIgLAMa6f7iil7fei0NPEuJgRevtPbqTQ5mpRwj3qh?= =?us-ascii?Q?4oNwR73cP95KCNcUZCKB+3VXznL0vPaZK98JpM2gm5cqd6NXrbO22l8WdZ1a?= =?us-ascii?Q?r1EiOYvKOszjhogpE3HQREC726EB6DIwgj2q/UbasQEvERuKv2q9vssJssMw?= =?us-ascii?Q?KreSGfGXeCuF5ct2MXa/2PiLW+1NTv7E9RWOiJyh5+yE585bSZYFFhdlzklM?= =?us-ascii?Q?e5z6BP3fHDMtrB4A+kLm+F7+0JklbzlAd5Oz3Mwa2kGulEhBwFnqXap+u8MS?= =?us-ascii?Q?jmJziqkBebi7HNCiKCNJjaHwhFvMqpsCjkL/6ZhHkksnsA29TeGtX0LblWOD?= =?us-ascii?Q?xDeC/nZVFWBAxt0bC2vX9sMRNLMsRLkQ4jSCA8YB+Njwf/ZV7PUk0jHlODmd?= =?us-ascii?Q?hYWAMfiDIpnb5SUkBs8HXOQpJ7OPa8SZF5Y+ghkjMTiTVzr4BAkRLK7ra1Ay?= =?us-ascii?Q?ux4cfsmzugdofqrVpzqzljKxhgs7Ww+LRDG0pfSb1gQ6KlzLj0xM1lbANuVZ?= =?us-ascii?Q?9Uj3XihOEN1vxkqoq408erxkHEsZAnJk9TuoCO81DC3BXvgRpy6AIbN8UvP+?= =?us-ascii?Q?eEAreELwP4UchEUacuUO77loXCmp/kN4eZ0zXJxEfMcsCoucagcXthu+qeJr?= =?us-ascii?Q?eu7vkzBdW8HfLAmWEMar1YHMaG93t64xo9orihbUtGKiAwQ3q3+liRsx9xGc?= =?us-ascii?Q?/NsMZmBuWosOpTXrS5wW87IpTcauppIt+eCIfwRw5v3tLKdZgrsvE4/gzRe0?= =?us-ascii?Q?XPR4kgS92RsZlPeZkH8rncmV6IYlBJvLZxzwASztWkA8mAhAGTAQeZabJ8h5?= =?us-ascii?Q?16GijJqf5DKlvIoIh6+emxpYXVelYBMIZq5enw4VX8FPliX+QOrKBrKymW7Z?= =?us-ascii?Q?ck7VjG9h7kxfpvEUh1XI3zkrVvTLcAoOXpKF9T27ID5rGoiAjW82VkAZ3Tnc?= =?us-ascii?Q?0dwdX1KEaEAWiOzNXyaBb5C67DxF1RC1lZZUttnfBZgXGIMiGvn7AiJfkZWo?= =?us-ascii?Q?yyH1y5+yfkoy7U0h++RLIEPKRpI8zbzRXKyH5Q0T2RDSNV9D6ISpzaX83+op?= =?us-ascii?Q?E5fNxTrWI0g8GkCQmSbmHaVEeDfOUShsV1wR1Fox3A2z3WmcoSkdIjKONka4?= =?us-ascii?Q?qdWrgwfYUA4p/yimckLvOnBgEXuqShsHSv+1CQWq4kfFZmw2445xDjf1ZB5+?= =?us-ascii?Q?cF6YGIl4CJfbBN5/NQAgb4o74hz+sOlBosR7oPAAM9pUF3Vh3nnkxwapTl26?= =?us-ascii?Q?2R43pDUjKoDZw29nOvtfSYbSunP4iy0Z4Us4XLBCRlC+/dAo5UnrlBMzeCQ6?= =?us-ascii?Q?UpCWZY77PXcHIIGORC3Ao+CJlEswf7v+mGu7qxj96kCR1nT5UCqpJTKe1zRd?= =?us-ascii?Q?h//R4wM+kmoDeYWH7tqqYdgJ7wcyjvp46ilVaJa5uNaEHKq3SV1pBWrsK+Fw?= =?us-ascii?Q?O/XU+F77/Q+KWy3n/hIcfrUMpv8gvNT24lEzPzfZKr9M6MdhvqGGkrC5YXDr?= =?us-ascii?Q?stRu+fH24JsG8PU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(19092799006)(376014)(52116014)(7416014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2afdWAX1dUjSZorHMKWButcLkqZ5TYUcNAwaQiIl2+rnYYShAF9Wb0YNVP/W?= =?us-ascii?Q?DyHHAPPk8O5Sjjc+Ey88RCkbg2r2s2dJBYgiPKkNna4AH6WUN9Pf5rb/VBGq?= =?us-ascii?Q?3cJmPeOcZI64rD9ONq+WPETihrQZ7eVeMEX3WtRtDX/T4QGba9946O7tlT/w?= =?us-ascii?Q?no5RLEwNG/jV19dq1nzssX9JMvvYKvMA/UTHfRvDM7uVaBfAOWVvRhnYW3Zk?= =?us-ascii?Q?MT/dkl3OuCMiTPA1Fu67JvekJVu45P0qEKMjAQU1GWoWotFtPK5gwmdPbQCw?= =?us-ascii?Q?ot68fxPS9Aw0JohIDeDWM9NS1RsvxVHFDCMUdML7L3NrY9SfOJM20qe3bVrK?= =?us-ascii?Q?YprvtHpNS65He4fWu8YGfNO67ap+ai6f0buKrdsqoiliX9kVrAfGB3cSLqg9?= =?us-ascii?Q?LzNoa+Fe9BXKonRIeRkdt96WoONurxygQ30z+MxR13zR3m50ZchjuKDWyplX?= =?us-ascii?Q?s3k7goJMPmIpjTUGQuPm+8kebRKtrbPSYB5uMZJNziPX0xKH2g3LS/pLpzql?= =?us-ascii?Q?hB+BWAdPhQWTyifBedKxC0V5z1Ch9+JdjA+J8cUNoJHfnM1vzl4nC9cTTcJS?= =?us-ascii?Q?MgDdVm5fUftpGAmBVqSvTgoWXlvLmB9DlgUqV65JpNCsPT6Bbe1DqE+VDzbj?= =?us-ascii?Q?URw4JMHyaNhKt6jMp2+6/gwZECDv7+DJgFX4cnxaEc+/jZPbWRroYTdyIb9/?= =?us-ascii?Q?cxASq9KNPeOofTMqyMI7DFMqhBBaaH4oDbAcQr6edmQ/dA+iVYuw/hPuw6iN?= =?us-ascii?Q?wA8Vqw4XHm7bVH5X8jvfPyN5g4f03sjlZIbuqVAg2WwhPwvcINHcsoahVuWW?= =?us-ascii?Q?foXk3KBNIPiNgX2inNaZRyBxnkWwx88hvFDDPNTfDhKe3gLDA3BpCiScbipA?= =?us-ascii?Q?annSuvfBGvoHBFTAFlniacpWMwf+YhC60Py0RzETPSbhAeB+cNK9b2zEDreQ?= =?us-ascii?Q?yreWcLIGFHLQ1BPu2TvGwS3kcxFW92IL5UbTLvH6xXfByDzibx9EGC04M0Q5?= =?us-ascii?Q?V79nYcHzMECPKRvofERNbyfqBP5d5yPCY7ZgN4yjTuUkML2mDHuJxd4MrGYk?= =?us-ascii?Q?Rwa0DF/aNGNt59v77THrkq8k4399Rv8bzzgbUyxUXwuxdSD4mF8lVBQcUKoz?= =?us-ascii?Q?koeCSstmCpN2fCcNy7Md24pFOx7dM9M8EJET+tkffHN6CbtSr+/UxyEQe8nn?= =?us-ascii?Q?OniSp6MXWH4xaBS8uS+20bvI/c/Ss9linp+1sNFNj5rlsOalmXmXPmt2cYyF?= =?us-ascii?Q?u9y93b7jv6IYVDAmXiTzDB/bVAOaUUVTevESCtbsDP59NPFv9m6wqLw4Kl28?= =?us-ascii?Q?xpVVCqsJWzGX1PLlbJfJ2pB/3x3NBNr42+IJAZfoix7Kod0OuoSrStNx1ZFT?= =?us-ascii?Q?UWqfB+XrIq0UmoOYcxcvjSpR02cUwGx/1p9I4jb42/XYPpUSBC1ZHdWWvwky?= =?us-ascii?Q?9CrQAOW/rcMVYSk9x4eh4+jFD1aO1YaJ0rVvSrzhhUfNoGmcvWMwXFxcTUjW?= =?us-ascii?Q?hzh44Ps01hjqHfzuDn/aD6TWBORpIj1gDFFIwLt/WLZNPoqTNH7DjfNCzTM9?= =?us-ascii?Q?08c4LzsAfzClj8a30n8mYJPw2WAgFSLZ5YnefylM?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c36469aa-1538-4d21-bf03-08ddba1d5ffe X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2025 10:35:48.6171 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PoQrUqi171a8p8GykdywmdcDvV/PKwQvChxfQqt3ozCJzbiYjyjuktmbTkoEvcF16Kpf4WRBsDVS0sPfPq9Y2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB10928 Content-Type: text/plain; charset="utf-8" This will use USB noncoherent API to alloc/free urb buffers, then uvc driver needn't to do dma sync operations by itself. Signed-off-by: Xu Yang Reviewed-by: Ricardo Ribalda --- Changes in v4: - remove uvc_stream_to_dmadev() Changes in v3: - no changes --- drivers/media/usb/uvc/uvc_video.c | 61 +++++++------------------------ 1 file changed, 14 insertions(+), 47 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index e3567aeb0007..a75af314e46b 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1275,20 +1275,6 @@ static inline enum dma_data_direction uvc_stream_dir( return DMA_TO_DEVICE; } =20 -static inline struct device *uvc_stream_to_dmadev(struct uvc_streaming *st= ream) -{ - return bus_to_hcd(stream->dev->udev->bus)->self.sysdev; -} - -static int uvc_submit_urb(struct uvc_urb *uvc_urb, gfp_t mem_flags) -{ - /* Sync DMA. */ - dma_sync_sgtable_for_device(uvc_stream_to_dmadev(uvc_urb->stream), - uvc_urb->sgt, - uvc_stream_dir(uvc_urb->stream)); - return usb_submit_urb(uvc_urb->urb, mem_flags); -} - /* * uvc_video_decode_data_work: Asynchronous memcpy processing * @@ -1310,7 +1296,7 @@ static void uvc_video_copy_data_work(struct work_stru= ct *work) uvc_queue_buffer_release(op->buf); } =20 - ret =3D uvc_submit_urb(uvc_urb, GFP_KERNEL); + ret =3D usb_submit_urb(uvc_urb->urb, GFP_KERNEL); if (ret < 0) dev_err(&uvc_urb->stream->intf->dev, "Failed to resubmit video URB (%d).\n", ret); @@ -1736,12 +1722,6 @@ static void uvc_video_complete(struct urb *urb) /* Re-initialise the URB async work. */ uvc_urb->async_operations =3D 0; =20 - /* Sync DMA and invalidate vmap range. */ - dma_sync_sgtable_for_cpu(uvc_stream_to_dmadev(uvc_urb->stream), - uvc_urb->sgt, uvc_stream_dir(stream)); - invalidate_kernel_vmap_range(uvc_urb->buffer, - uvc_urb->stream->urb_size); - /* * Process the URB headers, and optionally queue expensive memcpy tasks * to be deferred to a work queue. @@ -1750,7 +1730,7 @@ static void uvc_video_complete(struct urb *urb) =20 /* If no async work is needed, resubmit the URB immediately. */ if (!uvc_urb->async_operations) { - ret =3D uvc_submit_urb(uvc_urb, GFP_ATOMIC); + ret =3D usb_submit_urb(uvc_urb->urb, GFP_ATOMIC); if (ret < 0) dev_err(&stream->intf->dev, "Failed to resubmit video URB (%d).\n", ret); @@ -1765,17 +1745,15 @@ static void uvc_video_complete(struct urb *urb) */ static void uvc_free_urb_buffers(struct uvc_streaming *stream) { - struct device *dma_dev =3D uvc_stream_to_dmadev(stream); + struct usb_device *udev =3D stream->dev->udev; struct uvc_urb *uvc_urb; =20 for_each_uvc_urb(uvc_urb, stream) { if (!uvc_urb->buffer) continue; =20 - dma_vunmap_noncontiguous(dma_dev, uvc_urb->buffer); - dma_free_noncontiguous(dma_dev, stream->urb_size, uvc_urb->sgt, - uvc_stream_dir(stream)); - + usb_free_noncoherent(udev, stream->urb_size, uvc_urb->buffer, + uvc_stream_dir(stream), uvc_urb->sgt); uvc_urb->buffer =3D NULL; uvc_urb->sgt =3D NULL; } @@ -1786,26 +1764,13 @@ static void uvc_free_urb_buffers(struct uvc_streami= ng *stream) static bool uvc_alloc_urb_buffer(struct uvc_streaming *stream, struct uvc_urb *uvc_urb, gfp_t gfp_flags) { - struct device *dma_dev =3D uvc_stream_to_dmadev(stream); - - uvc_urb->sgt =3D dma_alloc_noncontiguous(dma_dev, stream->urb_size, - uvc_stream_dir(stream), - gfp_flags, 0); - if (!uvc_urb->sgt) - return false; - uvc_urb->dma =3D uvc_urb->sgt->sgl->dma_address; - - uvc_urb->buffer =3D dma_vmap_noncontiguous(dma_dev, stream->urb_size, - uvc_urb->sgt); - if (!uvc_urb->buffer) { - dma_free_noncontiguous(dma_dev, stream->urb_size, - uvc_urb->sgt, - uvc_stream_dir(stream)); - uvc_urb->sgt =3D NULL; - return false; - } + struct usb_device *udev =3D stream->dev->udev; =20 - return true; + uvc_urb->buffer =3D usb_alloc_noncoherent(udev, stream->urb_size, + gfp_flags, &uvc_urb->dma, + uvc_stream_dir(stream), + &uvc_urb->sgt); + return !!uvc_urb->buffer; } =20 /* @@ -1953,6 +1918,7 @@ static int uvc_init_video_isoc(struct uvc_streaming *= stream, urb->complete =3D uvc_video_complete; urb->number_of_packets =3D npackets; urb->transfer_buffer_length =3D size; + urb->sgt =3D uvc_urb->sgt; =20 for (i =3D 0; i < npackets; ++i) { urb->iso_frame_desc[i].offset =3D i * psize; @@ -2009,6 +1975,7 @@ static int uvc_init_video_bulk(struct uvc_streaming *= stream, size, uvc_video_complete, uvc_urb); urb->transfer_flags =3D URB_NO_TRANSFER_DMA_MAP; urb->transfer_dma =3D uvc_urb->dma; + urb->sgt =3D uvc_urb->sgt; =20 uvc_urb->urb =3D urb; } @@ -2120,7 +2087,7 @@ static int uvc_video_start_transfer(struct uvc_stream= ing *stream, =20 /* Submit the URBs. */ for_each_uvc_urb(uvc_urb, stream) { - ret =3D uvc_submit_urb(uvc_urb, gfp_flags); + ret =3D usb_submit_urb(uvc_urb->urb, gfp_flags); if (ret < 0) { dev_err(&stream->intf->dev, "Failed to submit URB %u (%d).\n", --=20 2.34.1 From nobody Wed Oct 8 02:04:17 2025 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011050.outbound.protection.outlook.com [40.107.130.50]) (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 3B1852E3B0A; Thu, 3 Jul 2025 10:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751538960; cv=fail; b=ZrbYqpYcEPBZgcVf1nWCKdxEZQSikqKSpVinb+rGEmarfuqtHBatZ7M+q6kJ4i4ef+THd+GuguwciiHbJK/unvo91GI1Yjm7O5fw78jw5rKAejQRAHer/Hy9A5IqO70R2zta7gkm4C+MblWJ+HSmvRImuECNgBbCha2nU8mLbeY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751538960; c=relaxed/simple; bh=X1r+fS34EO+oP6hvm2GwMZ6ZYVuh3L0ke5KSqG4aZbQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=EGwF0fqM576kmXvP6PFFp1abKtz07zGIfzFgm4Q1Nkt8SeaXMM5b/IY0bDccvZOr+FSgn0r85GyJKmUX99LQeXfSB69J1/T0rjHzmFRUHGPCH7hpeJcK7vvu6nQ704P13pO2Re7JqqVC7qVu0QWh7wY1KK0ABmZbHxZrVRONilY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=ZovBS5k5; arc=fail smtp.client-ip=40.107.130.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="ZovBS5k5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lkbp4rh+NZHaMKf1TQu46Fdz3DeNvV7rj2GzVhHFdedrVDmO8By6UEUINSywradSXEMMxonqEFwZGgu+/AoCYXAcW8svmaBOudZomWOjbxb3AUzomlJ+mZZ85hc7HZO5CZswjYPX6gxf3v2Xv/SHfYXge4rUnXgapf+HiAR55lUJ4EMWm3q1s9LDlPthJOW8NPdN/iMF+OfIP+8HXeURP8g/4WEObeTblgm4UU7CEWKFAG3Ms4JvjnlbZ5A165b3xRl2QqdkzyTFJMkZrLucyE0+Lfhml5arGXPTfKNyqDwe4eaeaYUTH6zesPwKeEi+XmXoBZmTAOt67eg6ofADow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=aSKy1xmXRvzEA2tWhXJskNFy7c382nQM50HD36q4zLI=; b=MXSpTaU3vZbitORJ+jM5lZglFHUPBZnuFZvPOxoTr5i1vzL+7OwU46XKB4Y+bprXSIihDxOauAyUPxWiEaIktfSeBmfShG+q8GDU/6LjMjcC94b5212oFvZP2AEgxr3H9Td5thqm9xdCjit6wF8RoV2BH6Y6n9FrlxyOxgK5cOCjdyFPw5zTwy32mONxhSHkeUdd0tKT+TZXQ1jA2PgEZovHk570kZcBOG0LcmPMhLR+O0+44df6ClaJZyDntF6TufMCIja43Ej10OXB3C/3ckCfYW30Bl0nqZTXCM6RqLdWvsxuP4Qyq6vbVnwpcohHIOWBXojJUGSvOD36z2dG4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aSKy1xmXRvzEA2tWhXJskNFy7c382nQM50HD36q4zLI=; b=ZovBS5k56KmUue0sQ+yZCzRJBrXAPMu1r0X10/mArEQbB/qMQ2dwitNzPkC1x2k56a+cIigN/Lf0hODgl5driW02Nofof3pb7/0B64mCtbkprFhg/O7c7vxfvH2bqxxqzXIeCfDkpx9N3P6CmhGPl8hmKH+5cbYKI5jpucH6rGY3XvNBFITstfTtw+vvhB8ckZXqKrgYelJDZDUS5jnt+SoinvSggvWKo/MMDJpiYNRVd29ZbiqvhAsTDhvkHdWAZREfvKVBcejhfg09gtNIKZ3DtNpAAcFduSOBdGJ4mZEik9U00MbzBBVe3FT1ZdwObmTYxywtodeQ9j36PZfy+Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by AM8PR04MB7826.eurprd04.prod.outlook.com (2603:10a6:20b:234::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Thu, 3 Jul 2025 10:35:55 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7%6]) with mapi id 15.20.8901.021; Thu, 3 Jul 2025 10:35:53 +0000 From: Xu Yang To: ezequiel@vanguardiasur.com.ar, mchehab@kernel.org, laurent.pinchart@ideasonboard.com, hdegoede@redhat.com, gregkh@linuxfoundation.org, xu.yang_2@nxp.com, mingo@kernel.org, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, viro@zeniv.linux.org.uk, thomas.weissschuh@linutronix.de Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH v4 3/3] media: stk1160: use usb_alloc_noncoherent/usb_free_noncoherent() Date: Thu, 3 Jul 2025 18:38:11 +0800 Message-Id: <20250703103811.4048542-4-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250703103811.4048542-1-xu.yang_2@nxp.com> References: <20250703103811.4048542-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0050.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ac::7) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|AM8PR04MB7826:EE_ X-MS-Office365-Filtering-Correlation-Id: 78481ca1-c75e-42e1-6550-08ddba1d6322 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|19092799006|376014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4CWgaBNi5NgkR+liz/zcLbMwk9nqBoHo4Dr3JvYO9J8nKMqSwEfjyT7hLgac?= =?us-ascii?Q?UYElwWBmpO36jS7n0d416NMvNYCqA36QFlGw+pkJTGr9dEcLoyJHjUApSvVt?= =?us-ascii?Q?A54v8fdAWX1koyBCnG0gtoN4LZLRm8O6og2jG8D3uk3xBDX2E5exFH6dVdgS?= =?us-ascii?Q?cPCTTou/Rj3avOG9WNga4MU6009Ok8Z24IVvCbSORiZJraUml0tsgU7yJfWY?= =?us-ascii?Q?ToDR6JYvvb9S/cHgJtnGo0pVaBzIev8NasoQiKgNbEr8nhM4A5Mtcr2sRFEj?= =?us-ascii?Q?g+43/WXs3swhSSgsjkn/T+MxEMH+5s0fmySAjVQ1BmSvqG/yF6bR4YUicjZm?= =?us-ascii?Q?DmDKrCBAzI9wIFPUkIzFeo29UCNaEPLpMJt7ywI0iZxCpbd2J8+CiOQuTZPU?= =?us-ascii?Q?/O0nkUfh6SUSmR6ILc0CyoTYXkgWiya49+Ziq2Jo+7vevhTm1ogk0rQtuXG6?= =?us-ascii?Q?fQG2owpeqaERcu/H9mahFwECFRyCBfh8IZlX1iH41epmnbO05By3ivWUKuRa?= =?us-ascii?Q?2qOpcy4JaW22yqVH9m7KkUq745Vc4MObKEnyC6BPORZDof+m5lH6heokC4T+?= =?us-ascii?Q?1gMiPLWi8nF/TwMhg6USwc82zB1hzZVIBvEmABhStSGCTAIE3fCxtNO8X1Qp?= =?us-ascii?Q?KTwYS6kn5OsO/lCU1Yqo9aEzfXQiBrfMfF9trHE/qo7VRtapJbTh0jOqKAq/?= =?us-ascii?Q?DivH73w2Qbc+tr7BK6Fu+fhP8WPxc0OJ2nX20YIEvGQh2J/BtLC2Q7vE7y08?= =?us-ascii?Q?1XQJ5xQxCD0fEMHsW6cPszEmCq5VCk/rSFG36gCqIkBNU7+xd2vIxNjV3iSQ?= =?us-ascii?Q?EQy0ZFhJFVKcnU8MCsAH3Wm0QBctuuHLIWYTlgZMTkTO7c63NfntkEv7lcgb?= =?us-ascii?Q?CjmQbJDptKmFfFnClzWuboVQPpO9EyuowGmv2kNz7J5z/RxvkK+H93FGl9xz?= =?us-ascii?Q?ZMlM9XVpZ5xzoC8N4SZf295HquoZm786HIfMflK/zBSHMWp3BMDQG2RSgvl4?= =?us-ascii?Q?GJ4TN6rtK2cRYcb6R/jtWoVOFY5N/TxHCxsYiieaXoZcFA9XD/PVcBE39MTl?= =?us-ascii?Q?GbV/hymuODqtR7hTnkn+2uLvp2gA3ivaQNmld70ERxkm48U4/JDttjAS5qF9?= =?us-ascii?Q?Xj8EbObz5lTKhWL4ujfkhofleTX/TnuBHU2SVgGOWah+3arbdxpwWV6Xn6ML?= =?us-ascii?Q?QOWawfccgL2DOdzCMUDGKcWGpkBA+BJ3LNmkNMJykPHTG/+UjP2wku1BTrgM?= =?us-ascii?Q?b8xRxXwR4z7sfrQBUllF9UzZRsyc0j8oSFg8R3o1Qo5r02KU8/C5fwJAtj1x?= =?us-ascii?Q?KaqsoWPZaoRre7DbiRZtLn9fp1MGFM+V5iD/Z5BcRh+APixHHD1jFzybmjtV?= =?us-ascii?Q?eCafn+B752auUURyGGzk1ZJiO1iC1p3QTAYgJApCesRjQSH689ZDztbS63O5?= =?us-ascii?Q?9h3KT3DY61gAxMbCPdoI07QJvXI3IPg0Ix9c2tmJ7ILEOvVq1rHtNrM56fNw?= =?us-ascii?Q?LgCpWjWSwX/Ka1Y=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(19092799006)(376014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?91/7lKicjMKvcdrbgqZhkbFMmRPex3przcSg1+15YZi/F/NtC97A9oN21Dfz?= =?us-ascii?Q?XFtU4oONl73nIqLMlSo8tH2nGVQh1KUejh/9i77KnCRQsFe8wIKyiabub8bQ?= =?us-ascii?Q?jRmPw0SFz1fS6Ykb6AbXyk3A4wmnBWC6ioLjKXNDplClEUcKxZN2vMKwFC3M?= =?us-ascii?Q?KjrQavVdBPMWTcdiPZRLqb7LvDpcn2CR0AuJhD6h7Jl+LGumNDQs+q0b4iA+?= =?us-ascii?Q?NBR1ZCIXG7S+g7TAMp2G/jaThvd4J/bFAjgHc/5R9qlTJIQRQKADzxJcUvW7?= =?us-ascii?Q?2CEZ3fWFKaxhVijixOMCaqTS9IcVmNKzQm6Oxe02oVhn/bcHXbsrAfHzO+Il?= =?us-ascii?Q?n6xp4cZEpcPo6kwKODIx+5uUj8sTmlGdy5gjUHsIKmgi6gV4lpicsEdOBdNa?= =?us-ascii?Q?lrdkwDZDtipv2RJ9B2BS+JchKu4M3Ucite3e485DlqvwIfBUGLgXAZa/40h0?= =?us-ascii?Q?BScHDB9G5NN1s16mJD1eMvh2oZQ+fsyRpWkAcfI9qMdSD34tbHoApfAGozoO?= =?us-ascii?Q?HysHDEFv8AWNIje6rfZ0U7xPlz+Y/r0SrblXtz5t3B2vrsou7NZg+fF30Zxx?= =?us-ascii?Q?sPwa9yr+WiKPrzFW1ndkHaz44471jZf9ZiBx1meIgN1qoAyhwl4a6VF4p80g?= =?us-ascii?Q?VtDTO927LHWPzCUYpVS65uedJEbvUeQITOIGbqlOeW+NFbIEe3h1cKpsUc+c?= =?us-ascii?Q?mR9wv8tEKYwKIb+qEP5GPkAVSSeB25yadAR+fml3tD/LrvlCsSeVVsveq4x1?= =?us-ascii?Q?rAC3UzbkNoO/BG8OfSq61z4pXDlj8znry5BtNaSIB9K1iZ+dR7e46wmA7oCK?= =?us-ascii?Q?9wwFwZH5WQKe9O3XyPODtrTmU0+2CNv2bVWowSJiVakbphJ/qYR5dQ9N78/e?= =?us-ascii?Q?ncRq2o0gNRNKqFLvBWbiKfI0NTd/CeHgnNcBqvngLfJkYNgDDuDDdKPPqKJF?= =?us-ascii?Q?o+y8T/gLp8352DPNK/4vBHRIfyy5HArnKStFTMSgpkCHhbYKtkvJB8FORGBQ?= =?us-ascii?Q?wBmqN+Pzetevwvd0oS0HJTvsGKAQWZgaEEwnqXToiivUspWIVscbRN8wshj+?= =?us-ascii?Q?9x2Wd8Uy9a/pVPJmhAmreiyn21aVIvgJup9J0z+P0kHBMnCTFR1qqER0YvTz?= =?us-ascii?Q?D7KExAm+vpepD9SdaPiZop8q7oZv8VQ5VcOzHAM+8x5gCZGWYzPl7shluQ0u?= =?us-ascii?Q?fqAqxix0GjdvjVJFSixC6b7f/2h0P3a4EhbJKetNz10fV+2VZImfXQsyJt8D?= =?us-ascii?Q?miGbqbjVD1a49FlrnBOka+TITcDpYWLoJ7dgTPXHFO7gvSYzZvirCjU8Ao8q?= =?us-ascii?Q?Z0QUy/qqLOsf4X+MZKAFemNbyh8Xl1WC9IKhYwb6UVk8dXjhhXLpXT/EtEKt?= =?us-ascii?Q?GdqFVUC1eA3uTjVFVy22osP88uGT4dThVasTQXt+5E3VU3AGqKAMNwUMb+DV?= =?us-ascii?Q?kOYqYLQo5XwN6EN7hokCvzfD3j8NfEa863iFvxnXYYaRzGgov2bXLtKp2cXc?= =?us-ascii?Q?o+F2/l3JiojW79fupDE/HNfXSqmrxHd4L4rOlS3/riAHl8kmsn56RLeB/qOC?= =?us-ascii?Q?dWZ99YcPMf9gCaRXvX7rSPAmQBaENTlJdQBQrntm?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78481ca1-c75e-42e1-6550-08ddba1d6322 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2025 10:35:53.8485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cgPJruMX09ikIIhpM/llUFuklRVxoBDQy7QzroWbTr/IrfFRpZVMiGPZ1RdjqvqEY5ONwjKORHZ7ZnA05+QoQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7826 Content-Type: text/plain; charset="utf-8" This will use USB noncoherent API to alloc/free urb buffers, then stk1160 driver needn't to do dma sync operations by itself. Signed-off-by: Xu Yang --- Changes in v4: - no changes Changes in v3: - no changes --- drivers/media/usb/stk1160/stk1160-v4l.c | 4 --- drivers/media/usb/stk1160/stk1160-video.c | 43 ++++++----------------- drivers/media/usb/stk1160/stk1160.h | 7 ---- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/st= k1160/stk1160-v4l.c index 5ba3d9c4b3fb..715ce1dcb304 100644 --- a/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c @@ -232,10 +232,6 @@ static int stk1160_start_streaming(struct stk1160 *dev) =20 /* submit urbs and enables IRQ */ for (i =3D 0; i < dev->isoc_ctl.num_bufs; i++) { - struct stk1160_urb *stk_urb =3D &dev->isoc_ctl.urb_ctl[i]; - - dma_sync_sgtable_for_device(stk1160_get_dmadev(dev), stk_urb->sgt, - DMA_FROM_DEVICE); rc =3D usb_submit_urb(dev->isoc_ctl.urb_ctl[i].urb, GFP_KERNEL); if (rc) { stk1160_err("cannot submit urb[%d] (%d)\n", i, rc); diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/= stk1160/stk1160-video.c index 9cbd957ecc90..416cb74377eb 100644 --- a/drivers/media/usb/stk1160/stk1160-video.c +++ b/drivers/media/usb/stk1160/stk1160-video.c @@ -298,9 +298,7 @@ static void stk1160_process_isoc(struct stk1160 *dev, s= truct urb *urb) static void stk1160_isoc_irq(struct urb *urb) { int i, rc; - struct stk1160_urb *stk_urb =3D urb->context; - struct stk1160 *dev =3D stk_urb->dev; - struct device *dma_dev =3D stk1160_get_dmadev(dev); + struct stk1160 *dev =3D urb->context; =20 switch (urb->status) { case 0: @@ -315,10 +313,6 @@ static void stk1160_isoc_irq(struct urb *urb) return; } =20 - invalidate_kernel_vmap_range(stk_urb->transfer_buffer, - urb->transfer_buffer_length); - dma_sync_sgtable_for_cpu(dma_dev, stk_urb->sgt, DMA_FROM_DEVICE); - stk1160_process_isoc(dev, urb); =20 /* Reset urb buffers */ @@ -327,7 +321,6 @@ static void stk1160_isoc_irq(struct urb *urb) urb->iso_frame_desc[i].actual_length =3D 0; } =20 - dma_sync_sgtable_for_device(dma_dev, stk_urb->sgt, DMA_FROM_DEVICE); rc =3D usb_submit_urb(urb, GFP_ATOMIC); if (rc) stk1160_err("urb re-submit failed (%d)\n", rc); @@ -365,11 +358,9 @@ void stk1160_cancel_isoc(struct stk1160 *dev) =20 static void stk_free_urb(struct stk1160 *dev, struct stk1160_urb *stk_urb) { - struct device *dma_dev =3D stk1160_get_dmadev(dev); - - dma_vunmap_noncontiguous(dma_dev, stk_urb->transfer_buffer); - dma_free_noncontiguous(dma_dev, stk_urb->urb->transfer_buffer_length, - stk_urb->sgt, DMA_FROM_DEVICE); + usb_free_noncoherent(dev->udev, stk_urb->urb->transfer_buffer_length, + stk_urb->transfer_buffer, DMA_FROM_DEVICE, + stk_urb->sgt); usb_free_urb(stk_urb->urb); =20 stk_urb->transfer_buffer =3D NULL; @@ -410,32 +401,19 @@ void stk1160_uninit_isoc(struct stk1160 *dev) static int stk1160_fill_urb(struct stk1160 *dev, struct stk1160_urb *stk_u= rb, int sb_size, int max_packets) { - struct device *dma_dev =3D stk1160_get_dmadev(dev); - stk_urb->urb =3D usb_alloc_urb(max_packets, GFP_KERNEL); if (!stk_urb->urb) return -ENOMEM; - stk_urb->sgt =3D dma_alloc_noncontiguous(dma_dev, sb_size, - DMA_FROM_DEVICE, GFP_KERNEL, 0); - - /* - * If the buffer allocation failed, we exit but return 0 since - * we allow the driver working with less buffers - */ - if (!stk_urb->sgt) - goto free_urb; =20 - stk_urb->transfer_buffer =3D dma_vmap_noncontiguous(dma_dev, sb_size, - stk_urb->sgt); + stk_urb->transfer_buffer =3D usb_alloc_noncoherent(dev->udev, sb_size, + GFP_KERNEL, &stk_urb->dma, + DMA_FROM_DEVICE, &stk_urb->sgt); if (!stk_urb->transfer_buffer) - goto free_sgt; + goto free_urb; =20 - stk_urb->dma =3D stk_urb->sgt->sgl->dma_address; stk_urb->dev =3D dev; return 0; -free_sgt: - dma_free_noncontiguous(dma_dev, sb_size, stk_urb->sgt, DMA_FROM_DEVICE); - stk_urb->sgt =3D NULL; + free_urb: usb_free_urb(stk_urb->urb); stk_urb->urb =3D NULL; @@ -494,12 +472,13 @@ int stk1160_alloc_isoc(struct stk1160 *dev) urb->transfer_buffer =3D dev->isoc_ctl.urb_ctl[i].transfer_buffer; urb->transfer_buffer_length =3D sb_size; urb->complete =3D stk1160_isoc_irq; - urb->context =3D &dev->isoc_ctl.urb_ctl[i]; + urb->context =3D dev; urb->interval =3D 1; urb->start_frame =3D 0; urb->number_of_packets =3D max_packets; urb->transfer_flags =3D URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; urb->transfer_dma =3D dev->isoc_ctl.urb_ctl[i].dma; + urb->sgt =3D dev->isoc_ctl.urb_ctl[i].sgt; =20 k =3D 0; for (j =3D 0; j < max_packets; j++) { diff --git a/drivers/media/usb/stk1160/stk1160.h b/drivers/media/usb/stk116= 0/stk1160.h index 7b498d14ed7a..4cbcb0a03bab 100644 --- a/drivers/media/usb/stk1160/stk1160.h +++ b/drivers/media/usb/stk1160/stk1160.h @@ -16,8 +16,6 @@ #include #include #include -#include -#include =20 #define STK1160_VERSION "0.9.5" #define STK1160_VERSION_NUM 0x000905 @@ -195,8 +193,3 @@ void stk1160_select_input(struct stk1160 *dev); =20 /* Provided by stk1160-ac97.c */ void stk1160_ac97_setup(struct stk1160 *dev); - -static inline struct device *stk1160_get_dmadev(struct stk1160 *dev) -{ - return bus_to_hcd(dev->udev->bus)->self.sysdev; -} --=20 2.34.1