From nobody Wed Oct 8 04:19:39 2025 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012032.outbound.protection.outlook.com [52.101.66.32]) (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 C57F7245038; Wed, 2 Jul 2025 10:59:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751454002; cv=fail; b=dCtocvmSRvGdYeDdrooCOtCjFfQpwj6ASlE1HjiFOfiopt6OF9+gFPyCaUAn3/bBV8htzC63aK5BRyXYCKxJfOdxbt32vnp5Dq/rHHHkYnhG2MLmJ22ZDk7qPGGwixvGSa7F7zbxRO3ybGjCA2jefNyuwm41xCigl6LntI+GZpE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751454002; c=relaxed/simple; bh=KKK3T2Tn8w/JJjjM1i+W0GhRumqvrPtd46g/MyiMSVA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ov4kgzKqOBj0Lsz2NSBCdP4ve+4Ew95Fmmcyl2PuqM4Kygt6oIxdouwifWQ/xgipYSafZxpmiRYYtT7p5wmDlkCmnbYRjtKnWz/b2JKdhqg5Y6lONjhL9mbdVptnaWXZ2pTVJyrDrdefZrLX5NGq/s6Q6VJU1H3Ej9HiJeCG6CQ= 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=JcwikjEU; arc=fail smtp.client-ip=52.101.66.32 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="JcwikjEU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pJemYVEh2RLvYYlkuSwbE5D3thyzUwKufr8HN+EJXtW3h4Tv5oooBVDR6csoV6OqqdXst/idmHdZ0oAZmv6DdvyY95q+WC1wDTv48hzk7aI9rlY+G24RQfK+C+rCqDLfU2O28BbEKmdtgfg/+9DNrnwY+KXGp73/jAZFI8/r7s9l+cCd+XllCe4N6BqO38w5WM9iQc2LgRWKhFKhQ/bWqnOPutF9GZRa8IE3Pt/tO1CSRSS/vr6Ddy0zC6RQm4FsGzqrPvhlo+ya4RXhM7GSNtiYrSCwkolQPbAgmF2aWoB2KpKfFk0+3wXNf56593/isa89klFF20RVZ8fhDNGGdQ== 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=VAZl4m7RIJEB9oH5FlCMCVONnVySE6kkk5W0qO98TF0=; b=LtPX8ONolkmAm5hu+AmjvHP175/mYjNYXjYmG/wHxPC3hJDcOp+5jOU2yjbiLS13KSXdrIufRDUKqmAJCGxjDf+BP25AvQJGVu3rNwmrJFCw+nECaiHZTfMc0FXuJCFWm5P/lMEq98gVLvFpBIBoe6HVG3T6IZ6ofh+sKfhmppVn5qBGUFWsGkY54fS+h4x+++YgeYKkTkbkGgHETqLwMAms/Id4IEr4RHLjLPNXtTyEdcgLgsU/PAXe9oEFJHG+VFdtaB9XUmWW/32y24rI8Lim0Q+0OejnqJy5T9dke8n9HTcKRN7LX/n5JCL8QI9E6ZKOBMOfMQDN0OHUPlEUuA== 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=VAZl4m7RIJEB9oH5FlCMCVONnVySE6kkk5W0qO98TF0=; b=JcwikjEUAjOaD+cixKb/Eih4Q88A1WND0A3R7aAcIsl3ACR7i9uzj11L/uP0O3CSHXNfP4rZSpMisvLcXmzWUmYmiZlQVaXdiwh1Qqh/95GpQPioSi3jS1Al/Y+MgUV/GSkUHAcAdZB5hd9C9KoYYjkmNH7g54CRACkMCPtz1MOPFksvuTRfr49eEPDaopj3EX0clEMM7ZOW6dBic0LiAkfHh+IIyr/xUSCf0B9PEzvLVfVvqaa+I7cDGsUn6zn7G+A109/idj/n/DQH0NSAMZWVZad4yRqdWAe8gD6ko/nC+KjXEWQtn2IlHh2FSw/tmXIxGSJJFdmym5iTAeFk6Q== 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 PAWPR04MB9888.eurprd04.prod.outlook.com (2603:10a6:102:385::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Wed, 2 Jul 2025 10:59:57 +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.018; Wed, 2 Jul 2025 10:59:57 +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, dafna.hirschfeld@collabora.com 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 v3 1/3] usb: core: add dma-noncoherent buffer alloc and free API Date: Wed, 2 Jul 2025 19:02:20 +0800 Message-Id: <20250702110222.3926355-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250702110222.3926355-1-xu.yang_2@nxp.com> References: <20250702110222.3926355-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0073.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ad::12) 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_|PAWPR04MB9888:EE_ X-MS-Office365-Filtering-Correlation-Id: a21bdb0b-15dd-4ddb-ce65-08ddb95794cf 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|366016|19092799006|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qHFwlc9R1SzAmQLNgbkxt3WEF38y3ZdEbBuqSHdUEBAQBZP2XAkca8v1kadQ?= =?us-ascii?Q?imWvuy009Bk/jRRLsX/e/oxwfQkNuLYrMfq3JpUC/h/yHXjX6hX9atjyQPPN?= =?us-ascii?Q?sSxOWHXoYce1OrlDmMepyY2Pmp00bU3H7rqQRnjL5Bj2Ayk8z52oNrZBFhw6?= =?us-ascii?Q?yYozG9bl/ujye9AqgNuOhRuxa9Y8Y62dptSd+x2uG/u7i3DiJQW7Lr6zdLDf?= =?us-ascii?Q?BJLX8oJzG+jmV+2uOVAn4i3qix9VqjfiBH1F0pKscv+pjLm59IO8Ilvj+hcH?= =?us-ascii?Q?eEvJjATD7SZNdSBqpQtVOd9vsJvUscQ6w20dSOdNa1BzTSjnF4IT2nCF4gNF?= =?us-ascii?Q?KgULwJ6QdmS++LTrgER86Erw3/h8nyJI/v/8N+EWUQW+f76/4gPJ+JCk5MMq?= =?us-ascii?Q?2x/rmA8ARcwm+wewt10nJYQ2iDiWyuQTmhQDcAFeQGWzBntV/nc2VUtYwPvO?= =?us-ascii?Q?WpelnKusW2eGf3Wxq1UMGkpWXEgET5hvNqkubnIAB8FkS8sGT94HZLr1vRyw?= =?us-ascii?Q?zZf4UaBLc15tgtphs+VV0ni4CXXU07EjRoJbl6eahIwdR9+3G+uFqZHdt/0f?= =?us-ascii?Q?NITZC4DzmGqQN32/zRktErGhMR0Xf69YpHGQJYdTn4WuwG7hHBxdoJuIf3Aq?= =?us-ascii?Q?y3oFsvnsgukXDquDk9CHRH3C/H/pkCkwBwEIb7F2wiVlcK/Bkv6Aoa6ubhqb?= =?us-ascii?Q?WJ1hAmPSd7zK9z5GbY1ibWW6trRh15E/P0KMDRkkyozg029aMjkNlWgvlTwi?= =?us-ascii?Q?KJseQvKlOJwB417/HrSnZW5IxVuNQShoL+wBIUaDtR8Wnxpt1yTjASPlgMBp?= =?us-ascii?Q?RC+Ahpa0xzO+S/em41IEs+5aHaw0yZKF2JAIiqxy0sLaw/4nCUNJLUGHULyq?= =?us-ascii?Q?mDUZiAxsfxHQ9nDZby9mURF/n+75WVOpzrcPF/GVwNeCm6rM5fjZLGrgcsNG?= =?us-ascii?Q?WL1Z8AekmEookY9mGj1Dy7y329NmmgVPQWqEQR2r+HJFUvR+Upyi+ZRzC4RI?= =?us-ascii?Q?Aba/nVPyXnlY5KY2GgwVEj4IDyJLtxMIlSTDaV5Us2O91lOtpuf+Q+vxRAJd?= =?us-ascii?Q?L3QTf9RmVX2dAQPygB0aj0r1jRPcPGWPeKodJ6IvJVKYew0S9iKjOZ6NLQdv?= =?us-ascii?Q?BZZeVjmXuXjCeYLZ5xtCdnYxlzv5zRA+k5dPFh1lVBg375ZuB7+jXVomsImE?= =?us-ascii?Q?kM1nIP/kvq5JiHg9PRrqmVq7vLkfkaxHh76vly20AjqeiFbL2y1F5kVm/FjV?= =?us-ascii?Q?NKcjTR280jPlaqK7VAx/73mp0/LKg3ozZwt13XRGIULYU6UmNrcFApBeZKir?= =?us-ascii?Q?ZR/L/lIkEHfygpWcux9/YgEx7rSLBnvQHeL6sAQAVvkdtdAWwNHeifFQd7de?= =?us-ascii?Q?2jZHZVw8cTd/CRM5P2JFXzqi4dL56iIMHbGSbjtvNAinYDRcq0LalJbqUnEv?= =?us-ascii?Q?iUamZrb9VDo8jZUtfAIWBe0EgYSStiLDgZMfAWAV9mUGh5ks5tKtF2wI3GiO?= =?us-ascii?Q?Y0hRZ0tbNDzKls8=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)(366016)(19092799006)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bWr0ZaPiGDKz5DYq877klw2TYYqTlID9zFsiTM3PFJz5TDTdI8tbrdznYxSM?= =?us-ascii?Q?aQSCJiaeT2yVCWDEgLMSWjdV9tyQ83KnoIZQ+FnHFM1VGir20H/QRDI9QLuB?= =?us-ascii?Q?syJNE2sM/qljDcgRcu+VevbcszBsqlPg+8cQluk3TY58JCQzHDjvW8AeJweN?= =?us-ascii?Q?D+qUZICULCKoo8Wh838ZHeRSzVw4/3XJcupUv58OA3Dr0AHQnEM3F2i49y9y?= =?us-ascii?Q?tM0pIhPixyXsUYN+cYc4FagXl1YXE61vUy/mQfPdFt9immG6tiL8u7W2RAym?= =?us-ascii?Q?Xoey1EhHukbnYzEjA/v/YDiyaDy2qlW66IB381WAahnGp9bVFwT2rolTBY3t?= =?us-ascii?Q?wMTzjpjnzgM1BVLfHFa/OCFVQVd/CdvA+bM1klw6kU/wxJbHSBXAc5G3Zshh?= =?us-ascii?Q?1/BpeVyoyCl0t5PUGT4UVlV951uTZKRdqb7Zqw4sdgh/NXG2ItDz0wjEsd9v?= =?us-ascii?Q?Rh+ERtvkugslgJgVzIOWQQZbl3cGRcRlreX4c1bgqrjCts9vOv+BkSJOEqbm?= =?us-ascii?Q?EBFGYOFxdE+H/WjOtgi774M3QiEfdsq21lpbSdmFmr9vQFi0idqOiwJl/hrV?= =?us-ascii?Q?DQO/n7Fqgf05HpkSTAIgb/m49Y8i2Dbz80C9dp2159woV4X3rub4da5Xlm8F?= =?us-ascii?Q?z0P47jTRyJHZwng2mLaFsIIKIZsvelU1+2QGYq2TKbnVhMPxRj/wnj2zZOse?= =?us-ascii?Q?//OB5J+Cz0asHfzjYaq93pBUtWFIcbN/d2wVw8ftIkCeHP14um50ZoLFtQMs?= =?us-ascii?Q?eW7GNyYks73USRMTC8w2H26ZvkXonp0LZY94DGnp/7yIYZZ1JzSByl2djTFi?= =?us-ascii?Q?Ga2p3MoIurmjmOh8T9Lgq1zzei+dom3sZ4e4sQoIaPk7EtvlaDUNFQWI3wXE?= =?us-ascii?Q?CBjT5zk6FuKcBmJ3uLf3cHD6i6KZJoYH8hZXRTSqktTK+7MPhExZ7m8EijtK?= =?us-ascii?Q?k97m3nZJiI6cN7oYJiZYM8k5ZpnFMAzpRp+vI3S/JzEUgaPzaATR7kczYXlk?= =?us-ascii?Q?glfGTaAn8Yk/dbUaLI67KzaXPTJ/o3dugwb7A/Q6eoRgcz5A6KfogavIeM+3?= =?us-ascii?Q?Upx8H03ICl7t0m059a/2Om/dgGC7zkHgzzletM7ZWUkHprlx3c+jdGo8lGzz?= =?us-ascii?Q?hOu1Ei8wEcn+WZKHO/xcNte/EH6pxC1o99JtpZWywYdsKHgBcThyb/3fhw0u?= =?us-ascii?Q?2wAcefgDwuPWaJDSROvOABZctmprcBic2xxFLF2vGjEovtBcrI1zniWCaqej?= =?us-ascii?Q?bh2+Kc/9+I6/VdGo0plTRJOOVZiakRZsFWNgwXosOvlNoyKDckFfC0saiArF?= =?us-ascii?Q?mGW5Q4Zu7Z9fEpS0p8p3YDYPTiKLGCh0BJwnVX7Ovs6Xwss6Ws1UOsFEpIKF?= =?us-ascii?Q?FIrwxj7qvwSIMl294pnau585E4XoJDRx06fSfu5A7ilqKXjQ5/NCoYbMOXCI?= =?us-ascii?Q?gf6SlrMptoZy7bT0h/33QWeGdW8Skc3E/6uH2Y7v7XfW4hyeJLxTo1g3CBDw?= =?us-ascii?Q?aFWzdVqcZU4gCvl52Xl0FWikPT37ekLC3TQbqP/BuO+cG+dU1oleFJy74Jno?= =?us-ascii?Q?eTe5sC0rRFmtHNmSK9OLMlewzd8GLAVil+23XaZa?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a21bdb0b-15dd-4ddb-ce65-08ddb95794cf X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2025 10:59:57.0155 (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: aKo29Oet7rU1cr6rcvMw9SJdJ3hI5uL5K7bSZXgackDqtZFwcez3+iO9HXIIJu8YwPoOncHd6I0NKITQ8BRhWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9888 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 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 | 19 ++++++++++ drivers/usb/core/usb.c | 80 ++++++++++++++++++++++++++++++++++++++++++ include/linux/usb.h | 11 ++++++ 3 files changed, 110 insertions(+) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index c22de97432a0..e0fa6d6d273b 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1366,6 +1366,14 @@ void usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, = struct urb *urb) urb->transfer_buffer_length, dir); =20 + 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); + } + /* Make it safe to call this routine more than once */ urb->transfer_flags &=3D ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE | URB_DMA_MAP_SINGLE | URB_MAP_LOCAL); @@ -1491,7 +1499,18 @@ 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); + + return ret; } + + if ((urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP) && + urb->sgt) { + 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 04:19:39 2025 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013007.outbound.protection.outlook.com [40.107.159.7]) (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 877B9266594; Wed, 2 Jul 2025 11:00:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.7 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751454007; cv=fail; b=uid86I/FVPOcfDoaUrc83V9NDVPO/v5+Ss2ugQtmdIQHjmXGeyHtowxxhjFcxjDTVQQP9/2EYqTKy3GWq5EKOvBaiVFZiRBtqjHsX/9o5KBQu2eII97Pu/rniyI7sarqVVo06qXDnEU0x95Wx98FsKFZKlmf8G25WacLu4rOzrs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751454007; c=relaxed/simple; bh=JCZY0iRmVDFhPBQ4p7DBj+2+yVIr0nh6g3t2K7SV4cA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mpIhTb/bSRlzVt2ZaSqTvzuDmXvStUVYTS7bxp3cGmplZVjkUnwBZ4ZJ936HWkohGf/LygeoCd65vM9wKMTsRmwCWJk6aumWbY+4a6LBsxJdBSp37+dvO1RTWdW0745m7tbBnhTyCm9Xlq6r38HjVAXH+2cO5YlY+UOyKjv9kY4= 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=a/pNP12F; arc=fail smtp.client-ip=40.107.159.7 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="a/pNP12F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qjhG1JY/46QfcO1yu1moNAoRrSfJT1Kt/20k9RdabLB04m12OAN/QxtAewzGALz1WG/N8CqD8UMFsfkmLGAMneZezZvpsTAqUsKTmWeuT1yRre/NqKj9K984wcijrsdwJat6IkPXji7ppLCgtaV8qs6OKIBGyj9irUJ4U3QSE9l+aFyl3PQrEOctZX/3wxpS2XZpi2MOUXrDeIFJ+eMxHq+x337s6KwfUYLdzt6ux7jMoVSg4uVNz0NQ4/Nj/6P/jt1CgYOxrg33imm02baAZM9ql1DQnZSnGFH5cWJFkMg7YtlGoK5ffR4c0jtcy1Ca3o0HHSo3lqOYMUe5bUCHLQ== 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=2Tsx4NTrUAsBPdWqxKPaq3CPcY0mQlHMHtvxvRjtqxA=; b=oKPC3G49loARcAl+zFeBDVtEQtZGEhg/Na8Z9Q2tyEiDcrvw9qQSndKjDcjx7yJ69GyXviXkiSFRNyPXm5HrogsQGdKOUeNYnydY7QiEWvriT4wNcQRI7ykq7Bg/rlQHGvbzuzC6hSZyxY5bihR/J2cVsM/aRmNYIUrIFPfc0aMBg7xdSqmj3SEorlMXWDB500YH677sZexl9AJi1k/b+ZmNxQ1M6vUGmWoQiNN8SCUhlnNubxrDnOGvlhN0zg/u1TTQ9NMk3zrfOFjRZBmKzQ6rxMZxkhOcYweSN9Abjwg8fDfPmTPBofMk/iBzc2a58jJkOjVpgDzv8XYQo5yjhQ== 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=2Tsx4NTrUAsBPdWqxKPaq3CPcY0mQlHMHtvxvRjtqxA=; b=a/pNP12FlxhI2pl3SXIduyIUADeKIlGA1B9DQsj6jgwiKWDnJq3M/W/ghkJySo4tIVm+MNDfLd+VTqPEMwoma955hxARkVSLyAas46HsCKE73GydlitLBY+p4yACRIYIrkg8e+5aqDQYVNoAkI43wlckpLBLCNpSmvxKArwhydYy93um+jbqKA471ZQ5m0bwAU4a/cQpARzAjoSHWnYq9tvLU61zpGW6LDqjPv/KpWNYlzbRW/pt5EgXtVlpvH7Q3L2gDEyfYLsSekyoda59J8+DUZZUr8yra0kKNDrBAC4bSquj4IqD/w7roq6lM/tb6I43axJfA6cu+N6jwhh6YA== 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 PAWPR04MB9888.eurprd04.prod.outlook.com (2603:10a6:102:385::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Wed, 2 Jul 2025 11:00:02 +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.018; Wed, 2 Jul 2025 11:00:02 +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, dafna.hirschfeld@collabora.com 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 v3 2/3] media: uvcvideo: use usb_alloc_noncoherent/usb_free_noncoherent() Date: Wed, 2 Jul 2025 19:02:21 +0800 Message-Id: <20250702110222.3926355-3-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250702110222.3926355-1-xu.yang_2@nxp.com> References: <20250702110222.3926355-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0073.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ad::12) 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_|PAWPR04MB9888:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b51bbda-8fc0-496e-75b1-08ddb9579828 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|366016|19092799006|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oXoTnkvOJFSMuHhX2mPlvWRLWp332aNPaNjcxb9zeSBNo2GeAki+wP8GfFtF?= =?us-ascii?Q?FERu3iDWb9tko597jMwpjW9a7pwu3uw1/MUgMcT3kdYgAdk3oONIEexQHkOH?= =?us-ascii?Q?F1xhAay46KSfbAAjKz2f9o+Y+1UX0ix5y+y9jKMyIASrqya/gQbuUlFdTCXl?= =?us-ascii?Q?mCcZn9u6zi751pPV7qNxBXdVKq0DEw7K3QIoxgzfZ6VIcjIz61r05aZkSVCx?= =?us-ascii?Q?0aGIWUL9M3eq59kd9TPpkS9ZNowZBH9iA2rtPK2xiKeeYjPwK70Vfjng6MWx?= =?us-ascii?Q?wjWj7nzHog21XqDuifkokIsjoldd0otF/mfrEDrbgNtC68NTKNkXbd25lRVA?= =?us-ascii?Q?mj4pae3A5Yd/Ogqb3dej4z0JxpTOkr/QwihbTPigLeR9WyVfWaQrlYu/QUYE?= =?us-ascii?Q?XugLPTuxbSXfwZEJhP07Z59TPbgLM77INC7X9v+bdTt3uoNpmurRNs3QyKVY?= =?us-ascii?Q?hE6qaTFdGCA3biqMrswl4A47k6rTiT7SMIT8qzGp/AQi8DoX2tpawPIxBP/Z?= =?us-ascii?Q?8AqtpP4b2d27BqxnCX4ufM7EyYCc3IuJclKwok0NujFcbEPq7FckCYhrxZ2R?= =?us-ascii?Q?pH06Ak2+ByCUco4t1tOLgimSY3Qfz7CidzPe7spB9EtFPUyDjqF396I63xjD?= =?us-ascii?Q?1qjiN6knCPhe5alWADV6OfQK0YkD0L1p1SwP0MP5l2MLu1GNXKt4Knhpbq8r?= =?us-ascii?Q?w+HuqUudbfiVtQGRI28UEFUhmFDFaLsZzdCHA/EXfJB1DVPTHqYb2J3S48oR?= =?us-ascii?Q?PQwiiiXxq4sXPbj15g06B5zYpVkpirOAzUKOcIuAyxIxszEvLxNNL3P6coFF?= =?us-ascii?Q?6ZWgJKdafno+qTrWqycAsMVeoGwxxbx0QsNSnlumCknx6pXrxuJpUWDwr2SE?= =?us-ascii?Q?Cs1LpVkpIlYtAC16K3q+QxJq6usCoLZKryH0o66nEw/obVsYF+7qbiTpDEDj?= =?us-ascii?Q?LE1whhJI/TWHfSgRPK2IyWNXCkv4+GUmbPvvncbOk+tL9sNoWzp0MjqHPi3t?= =?us-ascii?Q?2cQRFqtWL5zjQcdlKQL+26Tuyz4i0gSo7bnibnihcqnvK7JBzgAilSTx2Tn+?= =?us-ascii?Q?6BiBoX3X++3CjrcA1WBBLdo9Tpu+ewrexsDSnuTqZ5Jb6bTVv93efA563iPD?= =?us-ascii?Q?XlJt3vbULYQhnMvf5sYlOWCOoswJhkq6yk4FHjM4ZqvDGQ6R7uNgD4HXF92Y?= =?us-ascii?Q?1yw6OTrZ8G3ayJCmsqPHOiIa0oHdsBE8K9W0PUceyzrtVkKfTXJ2w3lbwrHo?= =?us-ascii?Q?vFPgtQ504yfZU0ZqTXgmpgeyo3EACvw1lTqPSq6KQjz9NPhyFTVYoYtHDTxM?= =?us-ascii?Q?O2nVuuD5YyavahcCF3/zIQspGtk0zPgMLGrHh7khRLvcxMRjnVpsRnXGQReW?= =?us-ascii?Q?lAtHMTNXkpUxqcDthhwDM1EzTgbyYEnOmMNP56yeOXvThgcOTpD1LOzO/kbM?= =?us-ascii?Q?03BNczsuJIBudS1RPE7IS65zhIZYvlOcYRPWFGMyIHnxeQaA5RmrWR39tU6f?= =?us-ascii?Q?wW6jeUZvJHBKIVY=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)(366016)(19092799006)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UChIQkx/93Ptqkif5Z+uimBvWNwc5pb2HaC2Xn+ebNMn2cs2EyfSjdV8Fenr?= =?us-ascii?Q?sNSZspRdcRAIfqOlmLmbNLQeW0lIN5r/L8MGj+2yH4lVPFgj3bnaYcDbzAnE?= =?us-ascii?Q?tmRCDJuOMLElZpcm8J/bwW2MAh9TImeyTmZ6jeQUvMdZKFh7aiYzgWRMtlXZ?= =?us-ascii?Q?/X2dPlKHB4O3mG2/O9GPu73gqBqQq023Qsi/qkqLs9YfiCQBN/Sj8MLkkKzM?= =?us-ascii?Q?45mwZyM8M6Q8ChdtQF9xsRDtLAEBZVsvjYL+OSmI7zsrv2jqS938wp9/b6uF?= =?us-ascii?Q?GFJ5VvRm6nD9bndqBgnQQ4g540zJB1H8prtUBG/AxpN+qAu1zFMdJcWaHM+a?= =?us-ascii?Q?56FmUDoH0oQZ5pUfpWZCaLmqJfv9kM2bXR6UuxIX0XoA6D76tTX2WmJwSwku?= =?us-ascii?Q?ZmKOgJPGPbdyNojiptL+cwEbENfvimJp3Ql6q26qfE6i2SRADqCPUrmLiMh1?= =?us-ascii?Q?3r4ej223B7w6m1VVwi3JUG5TpDzAw96T/dmKqyHBgEC2JSJCMxLj62nXY9Bz?= =?us-ascii?Q?PEqtN3Z/Bj1JkC9zALG/HBfHm1DqG5a9ZVYRYrcNLKqMaFfIFEK77B+I3+Fw?= =?us-ascii?Q?EM3MOv7SX9LOWze2pOIJ1KSYUKJAujbkorl5z6yE7Y7czk2PRk5E2Eo7icK3?= =?us-ascii?Q?F81kBHEECOlUhmUKezywc8NgOzPYV1t4AUUwr1P+7v2rWb4GTISWj2Qftqba?= =?us-ascii?Q?7cSCFf0v1KO28CeD1bftVy8c9ocX/XziMY9OmeTSVHIY6//0bAremEkidi3h?= =?us-ascii?Q?xK3w15YbXm+WMkjpd9+JH+TkqsH5tUIbSKCPY5T18S8ewhJwU1+4u2nqA335?= =?us-ascii?Q?VCCWrvUX5B467TtQlM+YfpeGIc7gZpA16CRObbnN0SNs823ruOMR4Lpb2Fro?= =?us-ascii?Q?40tt5W93gfb3WG4v0jMWLuQ1R8e3wF/IB0KdRn1KlHynseFBZEIn1EqlgNep?= =?us-ascii?Q?tocxeWHT7EhTgRyWPw9N1zvjFIcZUcdMcrMuSaxdPjQw3Kpvd3VtfnEBdnwP?= =?us-ascii?Q?6utURRgjnwDkklPUnVdn/m+iKDEU1oXeoGjIrP73HhdYTaFGXLCSc/URoGLV?= =?us-ascii?Q?dEx8+c35OYpocc/W2Ic7x0WU2CJfiM4ng+xt3EtPLo0LbZiedp02Iw4+j4PF?= =?us-ascii?Q?SVFh9IofctEy0iUdgM71Fe9NHrITz7kGXmvuIF1Sb2EBZwtcFN6cKRmdNEKQ?= =?us-ascii?Q?hpaJsajAolNKQvF8Lz3x8aKftmJb/x3a76EXLzsv62ECBowQobLAh8Dvrcy1?= =?us-ascii?Q?NVMwYG6MYCxnH9oaqBtINuhbKxkmJtgSaq97nNnRC4GhNlJunWGMXsy4tKFN?= =?us-ascii?Q?ccBVdIU3n/SX7PYXy5AgGp1Ru7zvbI9Haj038R85bWIw7gpj+DO3SqEFSm7X?= =?us-ascii?Q?BhDvl4uB0V7KCVBFKPnUPXRguIsP047MQAUHWrYxxt2YA4ATKYPLqeKSZWh0?= =?us-ascii?Q?Llz2rLFvyvPzJb6L8m9fs/PgBppkcK3+IwTE/cdr7flIReK9/8qfHcW6rB8O?= =?us-ascii?Q?J190SzKVUupKhpuksoqhvw01WgSpKMA2Ta1Uo4hM6lY1DNfDBEqWzHQ5fVyk?= =?us-ascii?Q?V0pOGg8w5kRhGL7n6/49IftYW+GCrqFvXPiHVQlq?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b51bbda-8fc0-496e-75b1-08ddb9579828 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2025 11:00:02.4661 (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: 6piUxNANs6+8BAG2Z5qdEglcwgD8aKioQazH8x/zvBIxFxuZEKxcGymVDs4S5FL2JQZrhuoElula2GI7W/27MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9888 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 --- Changes in v3: - no changes --- drivers/media/usb/uvc/uvc_video.c | 56 ++++++++----------------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index e3567aeb0007..614cf4781221 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1280,15 +1280,6 @@ static inline struct device *uvc_stream_to_dmadev(st= ruct uvc_streaming *stream) return bus_to_hcd(stream->dev->udev->bus)->self.sysdev; } =20 -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 +1301,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 +1727,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 +1735,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 +1750,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 +1769,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 +1923,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 +1980,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 +2092,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 04:19:39 2025 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012002.outbound.protection.outlook.com [52.101.66.2]) (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 3F16325523C; Wed, 2 Jul 2025 11:00:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.2 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751454013; cv=fail; b=FEmV7dzHmkC/N9oRTGoJnWSgky1loi/3ij7wI8c6IPqroTh6QllVBmtf2nDldBqmyDzMxeqajIByItc3LauhfQ8Bt/PB8fZvQu0d6IfmL9uZadxgaFILaxhJCR8QR6Hoca/IgqiJouJLMcC9L7dkKReZ6FQJE0Ja3M5CzJoYOI0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751454013; c=relaxed/simple; bh=wE/rZyxZUNuzCDeOCQTT64rFWdHMt7tJHeVEavsNuuE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=IFXQL+2yy0PtK6Q8SMrvpgzG8jUxy+ueMyEdjVLoDtpQZnETanXhZqwXZFd109mCta8rFS+0XyOV5qkvj/NC0kDcLnuNBU8J6K8ZEzl1Onh64rtDr7fidPGhRT/rHk38eCXHxHLtfiYfU3KuwtFPSdqAxUEVyJd56JFBBVw4AtM= 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=NrA6v1Lf; arc=fail smtp.client-ip=52.101.66.2 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="NrA6v1Lf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v5GRYuyVHUxW74lqlrd4WVYuDbSU3LInRMDbAqEvOYyCaEkFKHSehJJsdVQbsl65tbeqLd/bvPegVMWWsqM/6o7+hH+Fxx4elkzpboh9Dhof/lTqCzjTxDKKj+2Z3cke///QoShnolINMvrDVYv5mfHRzl4eDf3UxcA/38s5ndhlIhqAVoNkE0KK/Y1zabLeegiWRt+0Q/TyoUeCkNRkgJhSt3I9p7VeHbRRmBQI6B70f8SbFSgsyi4mf0E8uxWXSCy0X0ivkTg+MaJGpjr/s3j0iQU36+IUkgNWozE8KiUKcu5ghByw5dg7LKlahBBz8V7K9cnMbJlEAzxurPPFVQ== 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=XJa5NFWO9AUJOy6LGENilO2nrVdxIkLW3KrikaEwpg8=; b=TrJm+HFiXI1jRjgv1q+Frh0cTuj1FZbhZ8J38OJh3eMgWKEaMClSXaukm/sFbdL2A9NcysS+FgHNKMUnJvzkO86Gny2cKek4u9ePOj0Ky7sTDIioxdx2oDQJW+rmRB7KZibl5GsLbQ40sUE0ttSxWsqMyd86Snn+v+BrrOI0t2sJNsqBmirbaxFozN1+OdLwykYA4lhuQtEONh1J1QuQb7Qdqc8NICzFtRVylXiiXKGp7Z6MuIH4DLsG0CSRMneB4CugJoqXRrp5joJg8UYggxA5zlDN5sTX6wnzywjviMBylXoUROkk6s6w6t9bzLddIQ09vsxRU2NFSbfowyaX0w== 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=XJa5NFWO9AUJOy6LGENilO2nrVdxIkLW3KrikaEwpg8=; b=NrA6v1LfeYzbd8+5xYQfTCvLGNxJpqNZJP0E27h+2MiiewO46R8trp8pBldTeo3DHdq4AF2V8MZEHYZVNSmtaFDUskvUtR8oKeveQUkU/J+IdaWO5QYnl6p47GJkqDB3+3o6ocATf/jtHowzkQkFK6fA3QxPq+0wVsrBBHWMuK/Fu7iLOwXvtUGehMHKlY6r+iQzJaDg4iUxt11t3qEpTzIrEesuUjPnH1hpLipgMr0nvAXTDN3IL/0WEsl61rddrblHnqq/WfZ+enG6lFtx9QSjNUAi89tHKCgI/m0gt+NV40g9wZkcLzcnbEI7ff69FODoFFDcYFqi19krtQsx6A== 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 PAWPR04MB9888.eurprd04.prod.outlook.com (2603:10a6:102:385::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Wed, 2 Jul 2025 11:00:08 +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.018; Wed, 2 Jul 2025 11:00:08 +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, dafna.hirschfeld@collabora.com 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 v3 3/3] media: stk1160: use usb_alloc_noncoherent/usb_free_noncoherent() Date: Wed, 2 Jul 2025 19:02:22 +0800 Message-Id: <20250702110222.3926355-4-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250702110222.3926355-1-xu.yang_2@nxp.com> References: <20250702110222.3926355-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA0PR01CA0073.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ad::12) 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_|PAWPR04MB9888:EE_ X-MS-Office365-Filtering-Correlation-Id: c83d5ce2-c1e6-4532-23d3-08ddb9579b81 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|366016|19092799006|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?t322hwP76nfbZ5gxxQpqDylGFJHtmb2Nh5h8HaImaZvI9s00YKR8uuvYLYMn?= =?us-ascii?Q?S0L1CMXeX5u0fFtGC8iuWN/4PkLQXFk6tpXVcI1khTuD3hzrzfGBQzWBwIWs?= =?us-ascii?Q?o2CGj5sinj/MaOmdFcdEnLQtA2sIXVTNxlYOsB1aS1uRZ5iaHjgMfylrGU0k?= =?us-ascii?Q?PtXnQ0no6MobvJEov8/zL6k4jz8+Ja5VJOQlvrRDgErxGXZo0xk5MOd6MCUm?= =?us-ascii?Q?4WXr1B1AKoYw4HlZnZkLIsDELS8YraigxlKCcfQ1S2l/7MQUTJqRqOYFFKSn?= =?us-ascii?Q?9p9/OyWB7V8whDk+sdWGqB+1Rg4nEJLHar4TLeS1DuyGx0Y0RiaY/gtKOV+J?= =?us-ascii?Q?bVKGtYbFhDH0fHDRZoXdkxdagySwIuCS/Vz/ePqaiGPI1OgsXoWaeIM/hiXP?= =?us-ascii?Q?kDUXsjJb3N0L80KjyLtgi7QNl8dz2lakQu5O6WRGgOunccQDDDRyCXU3byjf?= =?us-ascii?Q?FeGvOOxhqZwjVL5OghVApYbg/+TsG20DQyMOptUggp2663fcQuw35F13hMOz?= =?us-ascii?Q?KgqBbRroWE+h3CSQ8RzYdW7ySBy1Y6GHEzOP1IBUA/ABa96zPqy+0hxI/Yew?= =?us-ascii?Q?ZI6UnY/ZhWu2o2XQOVvd1/3t/ANyICcwuaWm5zy1jjA7xx8Xu/z5MYa2Ti5/?= =?us-ascii?Q?kkWhW0poix5tFjDpyCKvTr6rTvieALoZwcL6LSg3xZ3rMPvAO7QtGOguC8Cj?= =?us-ascii?Q?hfQI3Pm0zgweFlDDWDbqle1fXteuo9nOfCIwEDqovXFQXdgwK95mJiheEMJA?= =?us-ascii?Q?w70kexLguJNYRS2hLJ0D8R/PDP9tlSoFWsF3BFS0sVQJKsbQpe/1aPMXxM6m?= =?us-ascii?Q?Fcut667Dx5XfF3fd+nSvUn8Ukxe0DKRHR7gIJGY5rpZD4wOQ2xOe6BNqfDwa?= =?us-ascii?Q?zO7mA2o30bImFfxCzeD/5idrus75aX/q1rsIgiDX5N08T8mbcUuP+OHQhTlx?= =?us-ascii?Q?IkmJudH6hFj8trM2MRZ2IWHiGSzwOLW1G0u8ONseOtJJkiUSyF/C0N3YkJI8?= =?us-ascii?Q?r0i+aOfXzxt8EyAULo2IL2xl4fsws+FAzJ1r8I9KiR+yo+PlwJYj1RFY0M9P?= =?us-ascii?Q?WJsi9RQnkzEdzSUK4lmmUX/Tol9qe59RJXw3zsi43GX3az/JQQ7XihMbi/wZ?= =?us-ascii?Q?oRWr3cgHM4dXWZVlwX8p8Jx1H0mXNkuy1JmDj7Z2u90U6QYyz1NkKIB0jJJq?= =?us-ascii?Q?OcD357lSCkNTijgyNdxoSZ35FgiGgL9k5m42FXGciX/LifmQYC5yJV4BYpR0?= =?us-ascii?Q?7vlsr2w8SLAakMyoKkfzDOkBsKsHxvXQLe4i07ezw0ndDVCkEoq2LUtNT4YU?= =?us-ascii?Q?mQxWSOxnq9nAw6mFyAKk7gnH0g2fakgcMzwRZK7bgbzWfQEO589f8aOHxx8o?= =?us-ascii?Q?zA0iioTwTJd00lU+050FpXh2G27Q61o/E8YqOqhzA2cz4MmSF9sz0GKaxOlh?= =?us-ascii?Q?IwJEjtU/D19uFBss4ppt5DMmh1zEfE0We+IC3JcFKJp055uahpRE72xJpc1i?= =?us-ascii?Q?Nkroc3A+iEIjzcA=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)(366016)(19092799006)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SSeABD97VRXKAeeLRXjNTZw3Ct2bVBa3ev0L9wtSV3GIEbvs0nUtRvXfHFlc?= =?us-ascii?Q?VfPquE+LapZ7mM60UruVwaXjASbc0m1B614wQoTPjzORGLL/29A/sm+Jh+4B?= =?us-ascii?Q?To0XF0YdSeEQC51+/7bq62GttIZHzOUcwMM9Cjd+UelFKudp1qFvsjsBIXui?= =?us-ascii?Q?BwC6zMYIUYC2hea4brtaORBfW1fvpukilpqtF63Pjzr/uBTBhrKdIZLLLHww?= =?us-ascii?Q?X/+Dylqh3ecQug+5KjYPeymYloKYtlfUcCfzKhHkOwcmk0xMscMnVnkxrC4a?= =?us-ascii?Q?AOIwqUOtHfY8XGu1cOSrnZFdCpE2epAObTfZALmIR8/LvvhY/eW8Xq2dPCsM?= =?us-ascii?Q?pUMrYYUHf2n7gJQ0YGroeHlJqhGT2vEnwF7nvWDQxUtRuYGuhM6YKWFYw3ri?= =?us-ascii?Q?8OsXdL6wrFfMu3jJnSUthIrryrhmbhWbLPfMA0Ag8iCUpeP4xdH5LU1BX5sF?= =?us-ascii?Q?Fo8mYhtKY91a9tatHEWlRnZlDIftp8XILueWLOEX6jSbhnwKBMOUE3VbpbPl?= =?us-ascii?Q?KctCZ03epyedBonXpc3bktFceg4Wx16UxPETsWM0PfVNpfiA470h90xfd7Mw?= =?us-ascii?Q?m6JhmIC7lIIhdPIkS9eYodKVULKBE2lfpicOggIG3wSu5ujmnxRjnaM8JxoL?= =?us-ascii?Q?DjTBcv0pUX9EZRMziqE7btYE9kwfGg3Xm4AmBKrXYdgkTsub5BCDwoH9kM0G?= =?us-ascii?Q?W2LEIY2yH359sPH+9Qlj7CtQbasZC9hvzeFqRQHZHe30tXRXuHSLrdaQB1Ak?= =?us-ascii?Q?NJ5utcMiU+SkyMYHAHVKHHN+ggoiyE5JovLBxf9MbtSHrEHVXOEzvp3fWA6i?= =?us-ascii?Q?FAf4fUr+/3jY77Z7FkNRvbXgAK3lbFySAzFjDB+oVNwWIhEkWZ87OpPscCkj?= =?us-ascii?Q?PmVYSX72vDfX7EQLCBhLMDv76Btugjls+tDZu+8Gpr/iJapQxi86exKAaANR?= =?us-ascii?Q?FcSAWSAILi76n+7u3M5bxJ6bcvM3mnap6YSWfd0QQnxAxJu9axh6Mi8pVfzE?= =?us-ascii?Q?h5IP9ZsXHHUlW3sljfcFjqOenoxvggW5MpxIO3Pmq6EVuf/B00d+Vo9DdMp1?= =?us-ascii?Q?jgGrvByhk4RemkYo+CnBliCbhh/HqjBcLyZGhAczlAWux9MESiCJf0DlFl6/?= =?us-ascii?Q?RI96NcPBRPcRWZAC0IlfB4CZ7FyiirRvEnbfKfjPDS1xY0PEBiZ0WkaRZdkn?= =?us-ascii?Q?G21WClyph+DquIejjpqllXqG/geDYhGWUHVPRhox2JX+fcRd/+IyshIKAk0Y?= =?us-ascii?Q?f9V6vaeUY4Ku5SiSGfLLa5LKQQaDMMuRd3fJ3aeSkmrK3PrhHBjUaUnV86Ss?= =?us-ascii?Q?oazQq6Se0rQCrjK60HGYy2QqG6EoMKM4d2qMMEDxOUU2Ij74D3/YwgM2UTp/?= =?us-ascii?Q?/FjFfwSIiwUUbluPtGWffwerPCaIBEXaohhwQCAiOW3d8ZxvSM/1BuXrEzyv?= =?us-ascii?Q?nlVdmbRyVPJ/LjlJ8jOCUVTpyD7qTGft/F8T9nA2ZeF3Idc30cKHJHW8NQnr?= =?us-ascii?Q?FAkPxu7ps7mpZAnzAXaAeAmdDGNsY4yC7mA2zZmlDyxlqfR3cXTE+aTN6F11?= =?us-ascii?Q?SZwVH2EYVKELYZ8+fOUpOh08Zite4k3lvvjhRneQ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c83d5ce2-c1e6-4532-23d3-08ddb9579b81 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2025 11:00:08.0000 (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: SrthMtGhfot0NjKFC6vTFSoQujsU26Qk+Cfs1Ab+DW/8lHEdE30cdepRxg50My5/OUEzGn+QH4qmOw9IrTN5fA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9888 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 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