From nobody Tue Oct 7 23:01:01 2025 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010015.outbound.protection.outlook.com [52.101.69.15]) (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 33CF82EE61F; Fri, 4 Jul 2025 09:55:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751622925; cv=fail; b=dZpHp2SDgVKxj316zOkTGpcIZBV2jos/zWC8MUM7Otyse6ofmeIIyg5S7l2N4D90t+dg4asfK1/MnsbD1S1maqOwQ0i0+K2AWYIXbMOeb8B6mZRwhAGelnVebD2iItwpcuX3Q5XsrlH+3Uq2u1sA4hpStJZ/WiwbUAMdb7tNo7c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751622925; c=relaxed/simple; bh=mr2aTDMCFKcMG+iRWL95UySDpx33eFW+nID+zrQ8zAo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=eAmMrPHvndlbraVlAFj1wVeRnyYLu1S0xWq7gevlN97lmA4dnLHuh8hNw0b8FeTe2+UvfMm5i/uRL3qP4sgWkFHgkowvi+smIPRw8NqxV0rd3zxHirxHH0hOKkj3oj0AhbvZ8sQrUAAW24fada9xITcE6bqVBwJCcYeJj9Fkw8I= 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=lFwrgw4x; arc=fail smtp.client-ip=52.101.69.15 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="lFwrgw4x" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QYrPXk6aLCfXBMpE8e80ns15TWWrw/dqoBJwS+M3+Uu13C23WySSkjUk8QMlV6yg6KXtEItGp19BgXCL5Xspb38GJrdZESQ271/1xUkIv3asl9oWqxeg0d/Xon5ET6HeqfGWWm/efL/E4QR9rYssZJPrS9soLNiKGecFyMs/edPOGH9rPLnMYuJBW8dYiwUU5eSSBy0dF7ct6cV/5xCh3ffXXg+0YxOyBKaLMVQpJ+9hKUXkrvOOlgqjiNJt+2P9KNKT+jM+v5B2Lk08nFPqOolV0Df+aO1QDB+/Rtm0j9iJxbZKSf/BNv3vdyDH3e5jdDqc/dmRlh3Sz6/5+deTAw== 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=KfOGAiq5ABsb74WbSLYr5fvjtfvJu0RZD8u+eWBtPnE=; b=Btdt+b4Qipjazp8Hcrg/rfEmNmAmNCTlY1HBxLka02MKzD1RraB2I45yuZz+qhXTaKd8tRJ69ujUgb14fZ7ljUUe866ehVDuU87BMAFENfxki+tHJAgP8FZqvK0xckUTwjlsaOa3z+xVwZT5mXdV1YKLXD5AU32mirF8kSCEGEA9k1rgxkgSUpCuuJqxy0Py+Hs8WLW8oRbZoTOse6PCLp3vJzZbdbAc1nPpRPOMb0IepSpgzbFQdfnA5VC2Sg59VNk9FumDImxmCzXyda2gzuN1udCFUCvLFrI3YbuNhHUFtYXgEG5rZIzb326ka+wEKhcb3DniM1HwpNfsgTCy8A== 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=KfOGAiq5ABsb74WbSLYr5fvjtfvJu0RZD8u+eWBtPnE=; b=lFwrgw4xMZSvA29VIuVdUFIX5brhvgxgPPvC7OrT3QXBWYHsk2iPNGNL43MVs3Mv/J5y5HJxY0BBoCHSG+TN4FCFxjzATWzEGU1EJHdmKZ2yShCc7XnOVXz/0Svos7He2lhWWgeg8bdrUfn2CQvQPTsJXgyO2H9MaEiW1OnM/F4KvuDDRJpXwxznDH7HNiywc8EMZkbGYXn1MY1uRP3vR3YjjF6ioKyg/l3Z7V4EVD9deAJb0dRc/Hobxf+BURK1O6bkgvdytEKu9RGblZjorSMOOXodAJQL2O373pE4g9aSrIafaePmYLDT9y8JZ4BB1afXoyoeqolrOHnobAMrQQ== 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 DBBPR04MB7834.eurprd04.prod.outlook.com (2603:10a6:10:1ee::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 09:55:21 +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; Fri, 4 Jul 2025 09:55:21 +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 v5 1/3] usb: core: add dma-noncoherent buffer alloc and free API Date: Fri, 4 Jul 2025 17:57:49 +0800 Message-Id: <20250704095751.73765-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250704095751.73765-1-xu.yang_2@nxp.com> References: <20250704095751.73765-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0064.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ad::6) 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_|DBBPR04MB7834:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ed8de2d-57ba-4eb4-1280-08ddbae0e3d0 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|366016|376014|19092799006|1800799024|7416014|52116014|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?7XKk0V4QqWELuuf/4otf1uuysI3skBIyCBjon81v3+wslg+QZJLxP0oYpnCe?= =?us-ascii?Q?KkTvT0vm0LdH7YIA9fncyo9/E9FmTYB1h2D6qp4JUh+e4rAOxv5Ioe5zEuV0?= =?us-ascii?Q?Z6lr00HunwZGVlh+iHhxbHFm/Fa1RltYwuZKxbqhRRWtQy/N3isibdzllFJj?= =?us-ascii?Q?qlqtTja8G0Tpk3MlKSEBJtxVu3cBViLpL3VPraGFi6RfTnvri17wfPDakEq9?= =?us-ascii?Q?ciye4y62lQsM75rVzFQ7yX6lTpp66eBuMIJMdd5YTbMy3lh3Xda5Uphur2xZ?= =?us-ascii?Q?Cwe0XynOTFkhUe1ug32IlT0HBhEFazzfAYsFD0SM8kx/synSPTRY6WFlRKYt?= =?us-ascii?Q?5DKN+3jNsUUH7PlyxcM1qKjTGpKLHHuWzf/qkfPs64eYG58m0ki989wGOdUo?= =?us-ascii?Q?zS2kr5gi1RaUoIQVbCSF1YzoVhgHxvMZtfERAKr18rG9xZxL+4OG2vjHeGlf?= =?us-ascii?Q?yTtBomZJCJPEV4bST+9rV0y+xuyQDp7AAkB2gwvvd+e80GQWF8FSAxQRWu+i?= =?us-ascii?Q?NQUPJRy3HVxiWldS0Xu8v94yXBEYqNWfeae586VFrJn6lgTdOvsc6Hrg5u/B?= =?us-ascii?Q?kWHxC4Rj/fSQQq7cclrtxXUS0QN/myt/ZDxPgaHxIeHLOIKwt6XTxHHJSSRK?= =?us-ascii?Q?NE2iOi2nGYkIybRCMS4KlyHp4YUId4f4y+Fd0CNfjcv85XmBo1Dwx9GMoPyd?= =?us-ascii?Q?kvcNxy3utCFR+cUj9vSPjBIdvMhWN8H76p1+aJldJBtqjMEzr+sN2rvAEWNL?= =?us-ascii?Q?DCXJJ/8c80fS6G36HJYsH/WeU+VcgsiIJJ9sL+pkDm9S/9MVQ3510almqSrZ?= =?us-ascii?Q?eH44WqsebJvL8VCEL7G8JG8xnaJQ9qjdCBwJLHU8XsD7MTFkzoqFtAFRHhLB?= =?us-ascii?Q?zSlDXMLxmHKEg8hpwYOj/X27f4ohA8z2yZ+ROUdfR8402/hKaK+d9JVJpbvV?= =?us-ascii?Q?POIb12nZ/3VNssQdFz6QKlLnvXYT0bH/HOrX41t2v3g7kSWnniIGpKBV+GDu?= =?us-ascii?Q?358A7Q6yE0KGhI7MJ9DCoTS17YPQvq++fidxPzQs3j7owGeioXJ1DbFgrDuE?= =?us-ascii?Q?OBGzpxbQ2U4sEtU8TvmyVeWwSR0o5fXydNQ1rpHc654YuBYm/io7YGfIMQEy?= =?us-ascii?Q?Ds15oF7TZ8Vg/q84cmQePQe3bhGroclqTBCVhJhOTt2+rK6miUL3mvhasK5c?= =?us-ascii?Q?QGOeSo8//3xj4GoCDDI5alLXobUKe/cQHrvn1kgzo0ev/wPOAnuhbsBfGq3M?= =?us-ascii?Q?yCtRULdpfILNSG0C03YN30t123ZyBZ7Dj3zA2wGG3JUOy0YNxTglCtlA09OR?= =?us-ascii?Q?e1FwR1cqjSOFMCst+VI2AJU1FVA7k2JDWrHR6OLpCWBPuWLb5ba+bNZzemnI?= =?us-ascii?Q?WA/6MuRBH8gM0Lp6OFLLHNV5Nid9dTJGuA1asy/MIBSTNilH0Df9EhwT2VDw?= =?us-ascii?Q?JfIiaqaBAOelIeGj0qysrtUyi1d/3zg9D5P6BuRUTv+5M6bEDam14WjVoCUe?= =?us-ascii?Q?Ac1rsa+msj81qaE=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)(366016)(376014)(19092799006)(1800799024)(7416014)(52116014)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VAY/LswPTANhr4KLm6wlOxcwmClK0CHtCcbERhvZl36VbSi6bDgkO5K0/lhv?= =?us-ascii?Q?Ga5eSkqxt5BxH9BUKWNI6sVKXrjlDY2hCq102nolhI8wwm9D52Ne5AY8LHkd?= =?us-ascii?Q?4u0wmoaHlVVwQwX6xkFAIz3+fuZpcycXsp6LpEAypq9L6CzB8MqZVJzkxN3P?= =?us-ascii?Q?uzQhwgdbli2g3ohSLAp2Ahr/Rog1QbZvISu6VhddqadWtLZALEe44zjAMqQ+?= =?us-ascii?Q?41rFPJZZOvJMJ/i2NsN1BnsVYxfc1vR04IZTxiR7cEVjS1PQQxcW9/tM5ZNV?= =?us-ascii?Q?o/ybpxvQaHbewzuQc3YmVu/KT25JIwJQb4Cig87Le66GIJJcBrY7SkPCExou?= =?us-ascii?Q?4adMD6lDYPMpuht/dYybnIKqKfw5lz5PrzR11QVhwgu1qgVJ7bB0c4MBYudN?= =?us-ascii?Q?QLSNoTff1WJ5oX7WRqTdX1Pn0RYo3YsqV1ggRfUOi/mLpr/HvNVABykSYxDX?= =?us-ascii?Q?nPdv9guWm5VIBB/7LyY3+C4LzZpI9SugC3D4NjQpWw1rWx88/eVVacylKKoa?= =?us-ascii?Q?QwhBbGpehvYpfnY2bpgn/9J8QY2wxcgiP64E/T19VH89YgM8raP3me4zgOal?= =?us-ascii?Q?GoBOPFFK1dwp5si1kf1Tc2FIcTaZa+NwZyF6Mw3GLov8Q87IQuceuRaxqEPy?= =?us-ascii?Q?yBoSOi/TyqzHtswFwPbQ/sIYwvQ2tfshQvuJ8JHy9xbDJY1rI+kmOQuGC3Mg?= =?us-ascii?Q?7Hh5rRgv5FdiEDtOkdzetVk2iDG0YG/cKa6csxZgPejM4uuVoKipZ8H1TosC?= =?us-ascii?Q?6dKIm51rWdLufXjZcI8UDHkHG7C9/IEsUGYk4ThF/fzj4JBBY0Qb7AFM7CjA?= =?us-ascii?Q?yi0qvSO5ubsHHzB1yrYYlD/UIxu2eOR9BsIb+WCzM6Kl1pT+R5RyzLGU8GrE?= =?us-ascii?Q?B5q9WyXI/FuwEjWpVagcfKhI0MXZBoM58UCkZ58AXsZsa77j1ljylzJcfT/k?= =?us-ascii?Q?oueXGOQiPr0ogc88oVnWxU3WZAY+PPrAf8H+rpVO2IpLx3psl7o7wCWKYnFy?= =?us-ascii?Q?K8ThfA0EI71o6Wa4gB7BX5+IXLDupJGTOMWDY6Q6BegBcFOS/Xl4AQdIlkvt?= =?us-ascii?Q?SA3MdO/SyAVP03f/Uz1E5M7iA9UooetJSi+4Y3fvm/LLYQWRZ3Mf6bU0zWpK?= =?us-ascii?Q?L6ESFAszUb/uYQXvW9P/071+nUWc6JsHn5F+LK+8h0dxg7nvARyw2Eno3aEX?= =?us-ascii?Q?LXD7jmJtoi2y2DBnUpWTgUHdJvddAoOfSuS3vZIcXWmuyeboT0Jg1e/citKe?= =?us-ascii?Q?i0HQkATD2TrnPL2Ow1vTJ0XE6wCbLDJERFL2oh3VnqfsmJ6t4kQToQaN9Bl4?= =?us-ascii?Q?IwBTssGmI6N7w3eGwv5d4keCRT7CUaRPjY0VmH1CuBz6yGEP3LFS9NIYBNy8?= =?us-ascii?Q?iYwm4Xy+9nmkDgP96ANTeWbWFsJxZXB64CZjc4FiuEvaBp422coq7eU+Hwtw?= =?us-ascii?Q?MRJ98dkwOvUWjjY4r8jgHFm7vOjbVkAczec2XK0ncq4h/l4/tgK++0yWg6cl?= =?us-ascii?Q?RnhqajRUnAKmCKHzGBu45w50u0WJ+RjQUTNl5NWSx+wDsPwYZRnx0JYtecpB?= =?us-ascii?Q?Ovb9cnlgvD2q4Lp4oljnEFEDLmNeQTpB5nVPm/0a?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ed8de2d-57ba-4eb4-1280-08ddbae0e3d0 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 09:55:21.5946 (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: jTTor6Ti3DRVPTotV94YUF6zZqhkh8gtFJhiE19IGakwCG0sm42e1DObliyJNefH9vIaOdVuMTpDJ0uLbVIeTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7834 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 Reviewed-by: Alan Stern --- Changes in v5: - improve if-else logic again 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 | 29 ++++++++++----- drivers/usb/core/usb.c | 80 ++++++++++++++++++++++++++++++++++++++++++ include/linux/usb.h | 11 ++++++ 3 files changed, 112 insertions(+), 8 deletions(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index c22de97432a0..03771bbc6c01 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,15 @@ 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->sgt) + return 0; + + 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); + } else if (urb->transfer_buffer_length !=3D 0) { if (hcd->localmem_pool) { ret =3D hcd_alloc_coherent( urb->dev->bus, mem_flags, 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 Tue Oct 7 23:01:01 2025 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011058.outbound.protection.outlook.com [40.107.130.58]) (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 56D1E2F19B1; Fri, 4 Jul 2025 09:55:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751622931; cv=fail; b=mk9esUhDkvTQQHYJv1ogCRo8KJiIXOBBSIFgdC/qnrXF6/I8BYgtSnNTMFgx8ItkBd+fB55LxxmK/o3z7iPtPHC1qy6mp8/Xs2ffTMkHkSXBK+xNuImpJAC9qkcQ+m+T9KwDXrEFku8niyCqJvE3g7G1RJjXI9Cej3JPIQju7pk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751622931; c=relaxed/simple; bh=M2fqwYIzZZpBYLU8MQchWZ1mwnvl2EvZFGMF9dqGkSU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=OSsY8QVSfXIFb/JSPS/ZooiaR/3bzp2zYwV+Nzl2g4MaoSdSDR7JuluS/XyfjtDclPtx6EyDxYBK1Lf5YoLsRpqyth3HrD9AmIEUfuLESBAzA1D7ZtAQdGBgWHirr6FfkUsqLwXcNfTqAmw51Nv7k5SUdaE/MfePRTuP70YXFlA= 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=g+F0wMOo; arc=fail smtp.client-ip=40.107.130.58 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="g+F0wMOo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rr/OtAokCDODx9RJdCIECCak4AwkxwOKqF2lKEla7YN+LIXw74RFzfmKIn57VdgqMK/2L3SFm9K3WsmY2ByHfTtJZ5YxQBOvBDnDhgxnyC/wuapfRm/Yigasz4CI9QoMcfmGwumvRRLBAAEgtZn33KB1Bnz37R4h+nj+HZtwBdcKQYqTCSHhE4EhKIa8MyEMjrH1IfIz3mPPi2zEOnOIFLIiH0jZLeIncBHmAODzHQXjmdWnydAeQ95KKFeTcZm+5G49hbEaurhgpYBk2BnZ+qicIFBw2gGQUgL5MgThDr/vsWrbvcL1b5aj0/7biV5unVDdTfQvBFxDz873/YIgww== 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=XDwh75zy2d9+2GdFJzuGjlsy5usankGsF4uj1NKxZRI=; b=OQYL6LXanu6ZodK4+nGfRLgkKGAQffb2AkafHnfA8H5MltFtFrwx62jnrSyJ7wXfz1yUHsDtEwCeext/B9op8Aod3geWiM8tFdcYGx0pybNB4siohko7QAUgbfcohz2+ewlrCL3j5r9fRwtDf3dYtH1NQoliAH0CXv2yCn6vF4UWWZjZJu/5fpg+UfD3aMeuaqSMSjCT4JwTn+YtuM+DHjQaBYDCA8T5Q2U1BAv79i9cNo/dTyyWzoM3o5iPvXG9Ccc/NnVe8VXLFuzevi1pmBXVge0CqX2A5UrzHguiYCGb1i5CwEeR5vvKCqKqGY5U/XhTA7d3HHJJQSIctrl1Zw== 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=XDwh75zy2d9+2GdFJzuGjlsy5usankGsF4uj1NKxZRI=; b=g+F0wMOoG/Yc6yxDAPqtU7XehmWj+q9iINBT7UXAVWapPamlFRrmmGZ9+mZs0oossHafzAa4eb70aut9z6fabBy6VLp2sDRclFsDJdRmDwxO4DMJTCw8FEX5whpFnM5jcQ8R3z6r/Rf3nUU1kE5sF7/g4BW8q+HnqOq5pIFsztkpdN8YlH1j4BFt3XvbKtmNRRnuXy8GsBVgtRdOwVJ5dxDs7HUXolwiHAQBZVxg4ZeViEkCRYiMBDvpgWwBtdijzBfkXCkJhkEkydaNCHTdhe2B8q22zrk41eBgcStDsOVRpLf3YHqFV9AsFIzTd21JqDf1taAKwGHQQ8f/RdsNbg== 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 DBBPR04MB7834.eurprd04.prod.outlook.com (2603:10a6:10:1ee::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 09:55:26 +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; Fri, 4 Jul 2025 09:55:26 +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 v5 2/3] media: uvcvideo: use usb_alloc_noncoherent/usb_free_noncoherent() Date: Fri, 4 Jul 2025 17:57:50 +0800 Message-Id: <20250704095751.73765-3-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250704095751.73765-1-xu.yang_2@nxp.com> References: <20250704095751.73765-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0064.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ad::6) 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_|DBBPR04MB7834:EE_ X-MS-Office365-Filtering-Correlation-Id: db823697-72f6-482a-9d57-08ddbae0e6d2 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|366016|376014|19092799006|1800799024|7416014|52116014|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xSVWylrohH0T4hD6mx2h08YP8Y3L1f/JDv7NhvXOi75zvzV7lWIwBe/g2br3?= =?us-ascii?Q?Adf4FMffQYkiFcd0U4qtcx79LKoNkr7uQkXc7BPhFmr2RiQmZ/Fy9jsIf6Ik?= =?us-ascii?Q?6xpWXp6WMyLSDzw7BLeQMwEwUJXYF7bSjk32y8d8PQOnHHShsROdzX7x2JAV?= =?us-ascii?Q?CPuPrZ194udKD0hb0QrAUu6R98MRTUyY50hk5q1/vbgfHM/S8GqSqcX4J9On?= =?us-ascii?Q?hG4tdeMaMCcfui3aAnlUX3EnRF0/ivpL1evZjc1A5DUIT7ulJYOGg8fFZYOv?= =?us-ascii?Q?aqgEGHsMD60kp7O0MybdTW7V4S1FrQJUyfL/Uw7AyeYe3HnbbtkucgooxGmx?= =?us-ascii?Q?QP6Gvv5ASQrdsWugHeW58bxg65PdJTcIZSBE+4A5JxsVcvgiENWT3V6bw/qu?= =?us-ascii?Q?PRYcLyGakPwBIDwRZox2x3RaU+mdt/DyZp04JF5vdmMmN7YIeBWk18py8vUk?= =?us-ascii?Q?Ta25JyGov6SNFVdvPXom35+XQ+64CEbL9RycePfpYIKwHPVUP7e8Uetbw8jo?= =?us-ascii?Q?eKWQ8/Js+5vYoxGmyxjvs1XYQb4pSoKYtVp6emGFsT3V5gcVmDa3EthfyRoW?= =?us-ascii?Q?XdW9EpMZfBZOuQKrO65Ke+YR45qBP/b9ISyb086yobtF5/uTgjUZE325O5vQ?= =?us-ascii?Q?3QiCatjPHhYO86P4M1mbkP9ZcInzmtt/ZQKTLn/QPOiMHk5KCSKP6iEDBCjx?= =?us-ascii?Q?zQ4B39hqas9sCXC48mGmv07TVwUhwm4EhJjAyjCygUIDmK5mlCm/RAayaASb?= =?us-ascii?Q?CVhNShT8P2gllvtmndd/wn6KwqqVIuh/sb3FfPlii73mU/G0FRPCyh0h+As2?= =?us-ascii?Q?C5tzMQYIcoS0zCL/9IOwD4BYjjNp6iL0mnpQD1DBNINdGNj9v6juTvOxeXfR?= =?us-ascii?Q?olsHujA0o1MO6ayY7va9k4t56yBFpVnHHZ78oeh2mV7VH5g4nNwELn94KpPf?= =?us-ascii?Q?bEJMJrRkRUxp8PO9a1Z8AW/HelQu1964dF3KkH+Ih3COK5o9LRKqMIw7394e?= =?us-ascii?Q?sHmpCflMaQ2DGPmqzKjKvXmVuML8pgm4H/EBiIYWnRlx5m0RZ+9rqwa0l6Dy?= =?us-ascii?Q?BE33aVYSlIM2BUwQE4TBnfScLfLtoLDTC7PDmX7nNvwji3/epW2ldxmq7Sap?= =?us-ascii?Q?p9XBbVb5jyk5ZSaPo1hRCGKtil9AzvU+5Y+GbIuQhRzMrUm38MPHQWJ/1Y4+?= =?us-ascii?Q?HERVxOpCEkuopIFlVPyI5QZ4JWXQMc0EBQmrwopSyquaTCMx2vWSy7P1Hzac?= =?us-ascii?Q?lKPAecqEYDH6Mm1qDlt+/j7aCaXE3xEC342b8pJVXm5Op7wUuMf2O0nJSQwr?= =?us-ascii?Q?p9HB2NI+kTAjegMjQiOkPhHAs8H3imRxl639/mYZmB7eB/gfbrKF/7Mp94ky?= =?us-ascii?Q?5l9Luh8fnMLJPYnZUSfrn0+YEzaZPgp1Qxn8u1QrYZTcdXOn+kH9YD7LMBSp?= =?us-ascii?Q?i6tzPewMtpNM4Hi0xMiA1hrkRpfNDMSJIZ4vW/98rZkJJkIbcGUjfoppWOAK?= =?us-ascii?Q?YVxMa0YXRGdt9KI=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)(366016)(376014)(19092799006)(1800799024)(7416014)(52116014)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bys7ZhzJnRhescdYJaUIx0xp3zCl/6i68biDgEFcpivxmTrcGnECdF2uy8k+?= =?us-ascii?Q?X6V16DHq9JaMddwoFBPOVxrb2C00Rl2JytlsStk3Xf7v5SNoU/ufVfnAsuGE?= =?us-ascii?Q?M8CLAglZ4ldzx6OWeTyd68PGcPApZU3uVccsLFMrpGp5OHmJbiTwllbkzku7?= =?us-ascii?Q?NS53lCKX2dLOqSPVx8/4nIpPdCfPMXNCtbuI8xXobacaNjh47sfdAljCUQ5i?= =?us-ascii?Q?Je3tn4pdLKMbcpmrRM0dLSToz6DhaIDP7DShVlJ3jqvBiOCoGTo/RwyL20aZ?= =?us-ascii?Q?ziSiL4HQPBWcMM74NgmLyMKZ+vz3wxne26CgPhEBkwB7167Wx2l5+Sp/5U9Q?= =?us-ascii?Q?sKadVJgBiHgO8m8gV/4JHUxYbXmWXrYJH+zNE3s2OVgrANwbRa8naPflSWZO?= =?us-ascii?Q?GMiHSpWxB21hnOydfFDKguH7ouYRS2H+WF0ddN76qvmngJQO9E1/RjQURFnD?= =?us-ascii?Q?rYD2zQwxHj3/4IFWo21hqE/knAC+6txl7xI8DxwrV1tqhCdrkQ4CBMjUU8pP?= =?us-ascii?Q?r93Q5NvVWErQaU4eRRsqkHGDcgFecdUJZb8wKL5FWNNwjCrGKKDIyQXberDu?= =?us-ascii?Q?0dzZ54DnPiIATRAzlSVSqdJNATU40nYP4p0puDIYJeQSJy6nZ40nZQwx85xc?= =?us-ascii?Q?y/HuDjjRqSoa+3+xWfdrBifLlL1qe/kQqOP1NAPY+JmW81nQG3HfqIzHT6AM?= =?us-ascii?Q?RYENgHPdukAKC4EAsK1HQ5BpvkRsCkoLe7OLhkAFcydkgh5uaf7ye/CsuW++?= =?us-ascii?Q?/1gFb2BZcX3GwuNquksnE46P4cJihca7Op7Pk4cgyAd/lHzu4fS0tGtpCy8j?= =?us-ascii?Q?LtbEK8jmzLzhZpjv5oDFP49xuZ1++E8fRImL6yOubHgb6yPmsoUBuBPZEfpR?= =?us-ascii?Q?yMSfIyl30OE5+SN0ICBYDmV/WsOcGfRARRnPrETch82KuS6zfmy6OI5jLb3x?= =?us-ascii?Q?Me7TZFExLOV3TnfSDRbFP8rm6shHTjfRc3sEL22KAnEGXXUWM92eWdZAm3C1?= =?us-ascii?Q?+Q1EBTxeS4VBt1Z0qbhJWvZDAMO0Z8uvBiWDu4DEPCzppaufV4g5rV4TPSl9?= =?us-ascii?Q?sJqOI+NpsSrmZ13b67M2syXkn5VwAMxZOdnLZ25YIyPOnpaUT5ESHWE/yAil?= =?us-ascii?Q?wyMRMnID/OhkZAqKm3LP+WiKbZiaC/gE8bn4W1e67Jlrz6ixMVV08U1GFVQC?= =?us-ascii?Q?QRKQtSiBuH+M8kugRzCYTCy+BP5mEB98O0vMBB0ElbXnvcPUw3gMPV4gvQxf?= =?us-ascii?Q?gyZstp/xDfaCD6Yy970jQzeWXbLnWnn/EgAEA9FNUkbj7CsnepIwGnLZuzcz?= =?us-ascii?Q?sqLiKuX3THOTR2WuL2ZHSUK0+4/hc9jVdbQUZbjst2Woq4bYcxKRzSsEyukW?= =?us-ascii?Q?K0YRBA7Y5sqOpKSvCe9ZwC9FoXNWn/C0cNz7ER7nJB/A/czS/G7wZWjEzb/1?= =?us-ascii?Q?onX8BR8D/LoC6NBb8qNR7qVZxIuLXRY41pa1NPcqRAkL6PgMIojlNcRMRxVs?= =?us-ascii?Q?MWTISntKChNfgX1tJRLZamA/1Jwory4Hkv7DA0lD1PyhWk0LQygERpe+r6Rx?= =?us-ascii?Q?0uF4srbRdmvnbrgv6/SstduGYz7Jnpm6/6gi1+Ve?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: db823697-72f6-482a-9d57-08ddbae0e6d2 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 09:55:26.6574 (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: on8J1Xa1/qO+/6WM4owThllUjDhldBjYUzGB62x/6OVLRgZ0MrRrBwJki4wITLqOeU893O/ztCGaFSdjPoQSzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7834 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. Reviewed-by: Ricardo Ribalda Signed-off-by: Xu Yang Reviewed-by: Hans de Goede --- Changes in v5: - add Rb tag 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 Tue Oct 7 23:01:01 2025 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010071.outbound.protection.outlook.com [52.101.84.71]) (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 55A102F2724; Fri, 4 Jul 2025 09:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751622937; cv=fail; b=gtuumvjDULLFTB9qcpxfjBUA9nEGwL9ZcEx4mx3FUqWctkhRvNX4CMT/mKv4TgloBpvLwiqIUyk8VfS/TdchrA7tAXDtk3YxlF9M6IBff6qXi6AbDX7nks22FHpcDTjQbe1qRD3zv70hsgXU3NoCFTiHCqJSTUnLcqighqBCKN0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751622937; c=relaxed/simple; bh=WeiWiZBtNLzh4PO9jwnq/9MP66R+GIHYAYmGbMI++RY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WXGiCuko+HxTPRkxMdFOav6bSKpLilG4jA8+S8qXrcWC/4+BL44C6iTp45ApfWrIZFNluQycMUOi31RFJl5FtPzbeGhUddA1JyCK73Am8zsOlKNRZ2xpB7WZaXPzUuzgkWXfF2nvt9ufR+N+uL6S9LkbZAWMUWCjmTUw7ms8xjI= 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=CZUqtTD/; arc=fail smtp.client-ip=52.101.84.71 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="CZUqtTD/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QBU3Ud8Z3kA1VcO7JyCFcg3gizBgYH5ORfqzeyifvhxECelhP5n2H/DQ9sA/KVD1BHJZFhFmoxpIZgaSSim18A16+zX3Ze4cSAHAV9sc1nOTRFqU30W7WsrNUx4gaM8wx2YZWQtD2/Oq/IG9GeTJam9odpQuBg1wLWESO+Axs3e3obHyic8K1vBfGBcCTldwmsuCzuEtMJW6OIOABSvDUUtr0F1y2wDnWutLnZSgjUYGX0IBX/KePaG1+3+0wu17YbhF7tskEODI4cpwaLYdOO2R396IIbawr/2zgsGWWhElBBTfRfwBaxOkApYKzZLx9ooZudBG44IYeSAXhrixew== 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=6AQNoBBTF73pqmMZ7WyxQ7wKSap/ElP4kPcafpuo/a8=; b=RiqMQToC5jPKsmCson4jgID6y7QWAJ+fEDUN8R77nJUVF43XTYJpjIEDHh7QsJCR4ZdxCxQ00ULqK9SZcXgtX29udpnB59YnagG1LSLn3ttKp76Uc6eWmmQqZL7XbqZ5LgMsd1yo2Xe7df51AsZLTKvxiJBBjZ74Ut35SpKBOkjm5ukxyf77encCGbISboLmMtdttkiTX5ncMexZ5rmjwhP4Jlfs+pL7++swPDaXWj9vkeecMd9yw4i1seP5pFgCkP4XrjLS30VjqpwjNGaJHAzYXMB7qsb83HzMKFDSw8rxsvvTwEjMynx2fuV8A2WzLY5wpJ+dyt5UjAr3RDznCw== 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=6AQNoBBTF73pqmMZ7WyxQ7wKSap/ElP4kPcafpuo/a8=; b=CZUqtTD/gHp74eFDAP3mpqFuZ0OuXcppdHZ6eG6OSgJIpiRhcM0j3Y4Ht0vy9ylR48uhfioRKKZaMznZjrA4owb7G6JPmo/hmYUOmrVfUtORZ6LG1EmOV426zaqtGJEXwfYkuCXKmU2r1RDHPjwnNMsPub2S/VOCgzi/HRokenF7k9L5J8gyInio8tF/V+yr5V9G72J1auqLrOOAHFm2fv9KXkemsfFccNtz2j+LzoboLwAlSdTx2LBeiYGpgag+rKZEtd2z9XIGrfxsDv2IN57negDuBkIPg3NOTxNgh800uFjYxbiWaJe6W4W1JMDX24dmoX4mvN55s/LSDoH9xA== 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 DBBPR04MB7834.eurprd04.prod.outlook.com (2603:10a6:10:1ee::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 09:55:31 +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; Fri, 4 Jul 2025 09:55:31 +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 v5 3/3] media: stk1160: use usb_alloc_noncoherent/usb_free_noncoherent() Date: Fri, 4 Jul 2025 17:57:51 +0800 Message-Id: <20250704095751.73765-4-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250704095751.73765-1-xu.yang_2@nxp.com> References: <20250704095751.73765-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0064.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ad::6) 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_|DBBPR04MB7834:EE_ X-MS-Office365-Filtering-Correlation-Id: 764fa4c3-3a11-4aae-a9f6-08ddbae0e9d5 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|366016|376014|19092799006|1800799024|7416014|52116014|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CxD+A45dR4UlJB04UryKtFZ2AQY4Qx8ov6yfv0SnWnpkD6iheY+4SLyWXCos?= =?us-ascii?Q?jGL60pTJG2W2cEqx81CBgz345rN7p5OFkvEqggzAUWesZ59ia7Oo7Yw771RE?= =?us-ascii?Q?0A5lF7WK405AvAyw9pZ6XOM45JoB5uO9bxufO1x68AtUG47DsqO3t7jY9EcW?= =?us-ascii?Q?9wdai7WkBF5+TMIs7tUgu9aBYVXA2yKU8n7QL3f7Z0/oGq3bECgG9clmbyQx?= =?us-ascii?Q?pnpBVe6D9J86wGoQ5EMMdIeO53ycIIQc+93v/vwyLARip6A9f2zU+bweICaJ?= =?us-ascii?Q?o5r+ZVw5bUhTjAB4tb56ybNTTZmcF+NDULXYUTf4SCwLY4HyCH94XT+8mE+h?= =?us-ascii?Q?jxBFow9fRXy2k4Y+7w4Z5X3FMA+75lNMiTFxk9W5z8vEPoiIL5zpWnsQ3Air?= =?us-ascii?Q?sKyhKHrRu2nG/Abyrxg4v/OgXnL1put7LhA0fqi6hQvfs0PEgrbOusGp2aPn?= =?us-ascii?Q?V938LrWCqq84I269u5YRGcJxTnFZQn2XN9vgOOvhYW4Y0ewZstq+fHnenM+i?= =?us-ascii?Q?GtHXo96JUE+1SRKA1psK3wWD7xhtVDUQwovHje+uGcb61iR8xqCXZQpbpr40?= =?us-ascii?Q?6Vmb6wF3I+a+mUWnAq4HYt0dvRhbBKk75NTo4MD876VHbN8lv6yrGzqsCTiB?= =?us-ascii?Q?gk+eEEDO/hd1nkVeQmI4yVw7u37wDolDLOPW5n/lwq0kL5yrYBuGidCYx27n?= =?us-ascii?Q?DGOnAJ7l5i9Ly3z2XzuooxqAXYXjuv+jzIn40DB6ZbS8etMPApf25XpMs5O5?= =?us-ascii?Q?W2n52kYa+Wp3I2xjCb1aTASPo/BDZFFC6A4CcNZ/Bd0D7UF48p+4b6uUJ1MM?= =?us-ascii?Q?WaF8kqGBonj7dFLRm5veLBuyorNHXIvkGJFleqWITYVfjOtKbR99unBLpHZZ?= =?us-ascii?Q?tu9A3Tc8E/XDMlZJO6Ba7WPE2AfbgvKY4UVihrWKDOTiDQefkE8bRZEPDnck?= =?us-ascii?Q?ohVioAqOawtM/A+o+fX+LjSqiC/4c0ipPTlYZu8tb8vGWp7hlkIJUKLdu5sH?= =?us-ascii?Q?jS9TOBxHSfRuznQBNNQSXeXjVKMiqG+auMql1HfTdoRTq0cm9ZAujYPhknNY?= =?us-ascii?Q?swVTJk/tFVQQ0ClVFgdD/K8eZHVXAvs8xK9dS+3rT4zInNhWV5kde6V2Ce4y?= =?us-ascii?Q?jhmJpK0Z/w/GXUT7PnEBXYhTX8mOQsfho/x7z/FPMsodgj06KWEru5xddPM0?= =?us-ascii?Q?/1+YmJTekLDzY4KAyOjrqzznIpEy90l4GQoilu/hWMqfId3P3awgY68acIc4?= =?us-ascii?Q?xrUkjbj1IbjiMBRJZ0kwfqPHfaqAQKhFEfBq/t18QTyt2mDoRN34H4gcYXXR?= =?us-ascii?Q?PLBiNNNYZUeAIZtPJ3oP9EKeJ6ARFP/Q0ZcCMkfvujeq4Ne/rthmr7dHJf0N?= =?us-ascii?Q?3794Ukjkj86Sbt7NGYigKvA+8VwEpimcfJ8QMOFbBBW2O49/tEw4lrPd0eXb?= =?us-ascii?Q?MRNVL9HjZTlVRM+0IjM/43MK1jpyUwYwv+/XDZ1+k4B36/ycPBHmFHzPQqtG?= =?us-ascii?Q?mTEgHPXUc39OCaY=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)(366016)(376014)(19092799006)(1800799024)(7416014)(52116014)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BG7QacpHuFqrTWX1qu3CUSb0TaFxOGpMISXzYghCO1eIBdqBO9XN4zX5WvjE?= =?us-ascii?Q?fnX3Gfg3wON0m0mOCBsiD0s23+yYoj13IFgxuCSYoKJ7jeduCGC48MDHYvhV?= =?us-ascii?Q?vLtrwfdKXmn0qCCW3PnpwWZWFdPFIO1WFOk0JscW/vh60ZvnnWsSk0767QPQ?= =?us-ascii?Q?hRx/xlHIrPdPIo3s2nwEv6SpF3rkpQOUL4VHrzFB5qCQEqaJarSaFmnXHLoR?= =?us-ascii?Q?dGji2j8uPvJ0PC0lV/poLyBZDiEh3Jnzds2O6Dt4mFGt84wZvbgRbaoH77dM?= =?us-ascii?Q?yFn3/9jsmAkfNRXWg/2qg4fhiSWTenryFNNZhafRFpco/wjBrrVmT0XTmo2S?= =?us-ascii?Q?RFA4Gk2cdok+UjG16rXS802Idtl3ZWnxOOWqTjR7ezn0FlO3ozMdYiMBLutX?= =?us-ascii?Q?y2jgagCio60wI7rSf7fanwHzKqIeu/gkZG1m3iaYq1xN84nb//DiC8Bbbk7u?= =?us-ascii?Q?iMLPRVDW+tQIUa3jeDJSIowN0HTimaLNZ4lm6rwWkUp4Q5qtxfGStrEQUEV4?= =?us-ascii?Q?A9WZ/ySAlTWFfmig8c8tboLQ/fT04DR6F7IiqkPMoxgzcgHfNXmcHQBLDCRR?= =?us-ascii?Q?61mBSdm3XHn5VSkSpYo55mG8xcud/JYjtaS3/w71bMHtP/bT3LP2uD/iW0sM?= =?us-ascii?Q?KQB4OvtQAYO88+2U35/AbKrwbtuMQbsYO0Hwbz+6mNKlatSV6QxCCYntJuEK?= =?us-ascii?Q?Pke3OZQEy1MmaWSaFr+Mb/ConXfx+vd7G/3CzkeXOBolthyYav9kbwb9ScJb?= =?us-ascii?Q?mNJQe70MPOQOV/rpRGgqHo592AHqy++8CvcnwScc5qmpyxCcTd2gihqquCB7?= =?us-ascii?Q?h4ll6yq/FY5qVgsIDg/xjAo3SiRfvzJc+PZC79cq+Sz0GxrmSwewTtM6qOhK?= =?us-ascii?Q?1s99eDgfwxHKKUrQwY3Dz75ZAuAshTYG3Ks6MHPcwVEP+w0YMad/KsutA0/n?= =?us-ascii?Q?Sg+E5hHyEkXK5Ok98L/zgBAot4f3HxXGC/NykhYfN/y4nckEL0PeBbomze8x?= =?us-ascii?Q?B8qBYbGmqeJ6hDnB+NFL4e7Tfa/rLABQnIIHAtLq9IzeXjKNWjerihd0QnKr?= =?us-ascii?Q?h5wmYLd1i4YfnPKq1yLZpmQGdSXDE0WUf6KQxzRHVQUv98V0AS4rYIuq9s5z?= =?us-ascii?Q?aQU4qbox8h6+bwcZsbr7CRB1GU4NsKDw7oWKPsIDwpQd9jnFPU/lsCeqbqsG?= =?us-ascii?Q?WQv2vDB9bNTWz2IJ6sVX4Qm4fXswFeU6bPAROEcPmcMVyK2l+g0qqUWnnSSA?= =?us-ascii?Q?eOaK7tvoFmMuBiIr/GrcSURx1aX4aipNkZMw4aGCQdTPNN4T+V5R8HrNiL9J?= =?us-ascii?Q?IAK1jBFDKvy4nC4ys/uOFwqdNY/O0qcjUdxyCE7ENhL+qAUzJV9099KFbZq0?= =?us-ascii?Q?X5wIZKWhoUF0klzVuHzItbYqVC2S+ni1ZbkXJGd+PJY2yGTVVtGJwcg5anlO?= =?us-ascii?Q?EwUgWdHZRS5/T1fm1TbojCL1+C6gPTuC2HWlezNYiA3dSzVPsY5VZ+kN3YaX?= =?us-ascii?Q?uvuOYZmvD6LBcAzBpSC4hsBPgQ+gtO6Vnq31RpHTN/hL7ONv+i7kG2xWS44F?= =?us-ascii?Q?hQ/lMBugncxpLpwpHteXWDbw2XsyLZHJr/p6lKeU?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 764fa4c3-3a11-4aae-a9f6-08ddbae0e9d5 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 09:55:31.7102 (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: LOhZwxAmesKFYqRbcwpK3UZXFZfU0CaVzV0S/GdeZRiIgLAcr7WgVI25y/fXVixYdTqUuHe1Urd5wRi+OHldYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7834 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 Reviewed-by: Hans de Goede --- Changes in v5: - no changes 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