mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-15 17:56:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

media: stk1160: use usb_alloc_noncoherent/usb_free_noncoherent()

Browse Source 
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 <xu.yang_2@nxp.com>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Link: https://lore.kernel.org/r/20250704095751.73765-4-xu.yang_2@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Xu Yang
2025-07-04 17:57:51 +08:00
committed by Greg Kroah-Hartman
parent 41b2a7eb1d
commit b4b4dbfa96
3 changed files with 11 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/usb/stk1160/stk1160-v4l.c
View File

@@ -232,10 +232,6 @@ static int stk1160_start_streaming(struct stk1160 *dev)
/* submit urbs and enables IRQ */
for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
struct stk1160_urb *stk_urb = &dev->isoc_ctl.urb_ctl[i];
dma_sync_sgtable_for_device(stk1160_get_dmadev(dev), stk_urb->sgt,
DMA_FROM_DEVICE);
rc = usb_submit_urb(dev->isoc_ctl.urb_ctl[i].urb, GFP_KERNEL);
if (rc) {
stk1160_err("cannot submit urb[%d] (%d)\n", i, rc);

43
drivers/media/usb/stk1160/stk1160-video.c
View File

@@ -298,9 +298,7 @@ static void stk1160_process_isoc(struct stk1160 *dev, struct urb *urb)
static void stk1160_isoc_irq(struct urb *urb)
{
int i, rc;
struct stk1160_urb *stk_urb = urb->context;
struct stk1160 *dev = stk_urb->dev;
struct device *dma_dev = stk1160_get_dmadev(dev);
struct stk1160 *dev = urb->context;
switch (urb->status) {
case 0:
@@ -315,10 +313,6 @@ static void stk1160_isoc_irq(struct urb *urb)
return;
}
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);
/* Reset urb buffers */
@@ -327,7 +321,6 @@ static void stk1160_isoc_irq(struct urb *urb)
urb->iso_frame_desc[i].actual_length = 0;
}
dma_sync_sgtable_for_device(dma_dev, stk_urb->sgt, DMA_FROM_DEVICE);
rc = 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)
static void stk_free_urb(struct stk1160 *dev, struct stk1160_urb *stk_urb)
{
struct device *dma_dev = 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);
stk_urb->transfer_buffer = NULL;
@@ -410,32 +401,19 @@ void stk1160_uninit_isoc(struct stk1160 *dev)
static int stk1160_fill_urb(struct stk1160 *dev, struct stk1160_urb *stk_urb,
int sb_size, int max_packets)
{
struct device *dma_dev = stk1160_get_dmadev(dev);
stk_urb->urb = usb_alloc_urb(max_packets, GFP_KERNEL);
if (!stk_urb->urb)
return -ENOMEM;
stk_urb->sgt = 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)
stk_urb->transfer_buffer = 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_urb;
stk_urb->transfer_buffer = dma_vmap_noncontiguous(dma_dev, sb_size,
stk_urb->sgt);
if (!stk_urb->transfer_buffer)
goto free_sgt;
stk_urb->dma = stk_urb->sgt->sgl->dma_address;
stk_urb->dev = dev;
return 0;
free_sgt:
dma_free_noncontiguous(dma_dev, sb_size, stk_urb->sgt, DMA_FROM_DEVICE);
stk_urb->sgt = NULL;
free_urb:
usb_free_urb(stk_urb->urb);
stk_urb->urb = NULL;
@@ -494,12 +472,13 @@ int stk1160_alloc_isoc(struct stk1160 *dev)
urb->transfer_buffer = dev->isoc_ctl.urb_ctl[i].transfer_buffer;
urb->transfer_buffer_length = sb_size;
urb->complete = stk1160_isoc_irq;
urb->context = &dev->isoc_ctl.urb_ctl[i];
urb->context = dev;
urb->interval = 1;
urb->start_frame = 0;
urb->number_of_packets = max_packets;
urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
urb->transfer_dma = dev->isoc_ctl.urb_ctl[i].dma;
urb->sgt = dev->isoc_ctl.urb_ctl[i].sgt;
k = 0;
for (j = 0; j < max_packets; j++) {

7
drivers/media/usb/stk1160/stk1160.h
View File

@@ -16,8 +16,6 @@
#include <media/videobuf2-v4l2.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include <linux/usb.h>
#include <linux/usb/hcd.h>
#define STK1160_VERSION "0.9.5"
#define STK1160_VERSION_NUM 0x000905
@@ -195,8 +193,3 @@ void stk1160_select_input(struct stk1160 *dev);
/* 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;
}