2012-08-12 01:32:57 +08:00
|
|
|
/*
|
|
|
|
* STK1160 driver
|
|
|
|
*
|
|
|
|
* Copyright (C) 2012 Ezequiel Garcia
|
|
|
|
* <elezegarcia--a.t--gmail.com>
|
|
|
|
*
|
|
|
|
* Based on Easycap driver by R.M. Thomas
|
|
|
|
* Copyright (C) 2010 R.M. Thomas
|
|
|
|
* <rmthomas--a.t--sciolus.org>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/usb.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/ratelimit.h>
|
|
|
|
|
|
|
|
#include "stk1160.h"
|
|
|
|
|
|
|
|
static unsigned int debug;
|
|
|
|
module_param(debug, int, 0644);
|
|
|
|
MODULE_PARM_DESC(debug, "enable debug messages");
|
|
|
|
|
|
|
|
static inline void print_err_status(struct stk1160 *dev,
|
|
|
|
int packet, int status)
|
|
|
|
{
|
|
|
|
char *errmsg = "Unknown";
|
|
|
|
|
|
|
|
switch (status) {
|
|
|
|
case -ENOENT:
|
2017-11-02 18:11:53 +08:00
|
|
|
errmsg = "unlinked synchronously";
|
2012-08-12 01:32:57 +08:00
|
|
|
break;
|
|
|
|
case -ECONNRESET:
|
2017-11-02 18:11:53 +08:00
|
|
|
errmsg = "unlinked asynchronously";
|
2012-08-12 01:32:57 +08:00
|
|
|
break;
|
|
|
|
case -ENOSR:
|
|
|
|
errmsg = "Buffer error (overrun)";
|
|
|
|
break;
|
|
|
|
case -EPIPE:
|
|
|
|
errmsg = "Stalled (device not responding)";
|
|
|
|
break;
|
|
|
|
case -EOVERFLOW:
|
|
|
|
errmsg = "Babble (bad cable?)";
|
|
|
|
break;
|
|
|
|
case -EPROTO:
|
|
|
|
errmsg = "Bit-stuff error (bad cable?)";
|
|
|
|
break;
|
|
|
|
case -EILSEQ:
|
|
|
|
errmsg = "CRC/Timeout (could be anything)";
|
|
|
|
break;
|
|
|
|
case -ETIME:
|
|
|
|
errmsg = "Device does not respond";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (packet < 0)
|
|
|
|
printk_ratelimited(KERN_WARNING "URB status %d [%s].\n",
|
|
|
|
status, errmsg);
|
|
|
|
else
|
|
|
|
printk_ratelimited(KERN_INFO "URB packet %d, status %d [%s].\n",
|
|
|
|
packet, status, errmsg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
struct stk1160_buffer *stk1160_next_buffer(struct stk1160 *dev)
|
|
|
|
{
|
|
|
|
struct stk1160_buffer *buf = NULL;
|
|
|
|
unsigned long flags = 0;
|
|
|
|
|
|
|
|
/* Current buffer must be NULL when this functions gets called */
|
2012-11-23 19:12:35 +08:00
|
|
|
WARN_ON(dev->isoc_ctl.buf);
|
2012-08-12 01:32:57 +08:00
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->buf_lock, flags);
|
|
|
|
if (!list_empty(&dev->avail_bufs)) {
|
|
|
|
buf = list_first_entry(&dev->avail_bufs,
|
|
|
|
struct stk1160_buffer, list);
|
|
|
|
list_del(&buf->list);
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&dev->buf_lock, flags);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
void stk1160_buffer_done(struct stk1160 *dev)
|
|
|
|
{
|
|
|
|
struct stk1160_buffer *buf = dev->isoc_ctl.buf;
|
|
|
|
|
[media] media: videobuf2: Restructure vb2_buffer
Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.
Add new member variables - bytesused, length, offset, userptr, fd,
data_offset - to struct vb2_plane in order to cover all information
of v4l2_plane.
struct vb2_plane {
<snip>
unsigned int bytesused;
unsigned int length;
union {
unsigned int offset;
unsigned long userptr;
int fd;
} m;
unsigned int data_offset;
}
Replace v4l2_buf with new member variables - index, type, memory - which
are common fields for buffer management.
struct vb2_buffer {
<snip>
unsigned int index;
unsigned int type;
unsigned int memory;
unsigned int num_planes;
struct vb2_plane planes[VIDEO_MAX_PLANES];
<snip>
};
v4l2 specific fields - flags, field, timestamp, timecode,
sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
struct vb2_v4l2_buffer {
struct vb2_buffer vb2_buf;
__u32 flags;
__u32 field;
struct timeval timestamp;
struct v4l2_timecode timecode;
__u32 sequence;
};
Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
2015-09-22 21:30:30 +08:00
|
|
|
buf->vb.sequence = dev->sequence++;
|
|
|
|
buf->vb.field = V4L2_FIELD_INTERLACED;
|
2015-11-03 18:16:37 +08:00
|
|
|
buf->vb.vb2_buf.timestamp = ktime_get_ns();
|
2012-08-12 01:32:57 +08:00
|
|
|
|
[media] media: videobuf2: Restructure vb2_buffer
Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.
Add new member variables - bytesused, length, offset, userptr, fd,
data_offset - to struct vb2_plane in order to cover all information
of v4l2_plane.
struct vb2_plane {
<snip>
unsigned int bytesused;
unsigned int length;
union {
unsigned int offset;
unsigned long userptr;
int fd;
} m;
unsigned int data_offset;
}
Replace v4l2_buf with new member variables - index, type, memory - which
are common fields for buffer management.
struct vb2_buffer {
<snip>
unsigned int index;
unsigned int type;
unsigned int memory;
unsigned int num_planes;
struct vb2_plane planes[VIDEO_MAX_PLANES];
<snip>
};
v4l2 specific fields - flags, field, timestamp, timecode,
sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
struct vb2_v4l2_buffer {
struct vb2_buffer vb2_buf;
__u32 flags;
__u32 field;
struct timeval timestamp;
struct v4l2_timecode timecode;
__u32 sequence;
};
Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
2015-09-22 21:30:30 +08:00
|
|
|
vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->bytesused);
|
|
|
|
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
|
2012-08-12 01:32:57 +08:00
|
|
|
|
|
|
|
dev->isoc_ctl.buf = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len)
|
|
|
|
{
|
|
|
|
int linesdone, lineoff, lencopy;
|
|
|
|
int bytesperline = dev->width * 2;
|
|
|
|
struct stk1160_buffer *buf = dev->isoc_ctl.buf;
|
|
|
|
u8 *dst = buf->mem;
|
|
|
|
int remain;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: These stk1160_dbg are very spammy!
|
|
|
|
* We should 1) check why we are getting them
|
|
|
|
* and 2) add ratelimit.
|
|
|
|
*
|
|
|
|
* UPDATE: One of the reasons (the only one?) for getting these
|
|
|
|
* is incorrect standard (mismatch between expected and configured).
|
|
|
|
* So perhaps, we could add a counter for errors. When the counter
|
|
|
|
* reaches some value, we simply stop streaming.
|
|
|
|
*/
|
|
|
|
|
|
|
|
len -= 4;
|
|
|
|
src += 4;
|
|
|
|
|
|
|
|
remain = len;
|
|
|
|
|
|
|
|
linesdone = buf->pos / bytesperline;
|
|
|
|
lineoff = buf->pos % bytesperline; /* offset in current line */
|
|
|
|
|
|
|
|
if (!buf->odd)
|
|
|
|
dst += bytesperline;
|
|
|
|
|
|
|
|
/* Multiply linesdone by two, to take account of the other field */
|
|
|
|
dst += linesdone * bytesperline * 2 + lineoff;
|
|
|
|
|
|
|
|
/* Copy the remaining of current line */
|
|
|
|
if (remain < (bytesperline - lineoff))
|
|
|
|
lencopy = remain;
|
|
|
|
else
|
|
|
|
lencopy = bytesperline - lineoff;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we have enough space left in the buffer.
|
|
|
|
* In that case, we force loop exit after copy.
|
|
|
|
*/
|
|
|
|
if (lencopy > buf->bytesused - buf->length) {
|
|
|
|
lencopy = buf->bytesused - buf->length;
|
|
|
|
remain = lencopy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if the copy is done */
|
|
|
|
if (lencopy == 0 || remain == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Let the bug hunt begin! sanity checks! */
|
|
|
|
if (lencopy < 0) {
|
|
|
|
stk1160_dbg("copy skipped: negative lencopy\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((unsigned long)dst + lencopy >
|
|
|
|
(unsigned long)buf->mem + buf->length) {
|
|
|
|
printk_ratelimited(KERN_WARNING "stk1160: buffer overflow detected\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(dst, src, lencopy);
|
|
|
|
|
|
|
|
buf->bytesused += lencopy;
|
|
|
|
buf->pos += lencopy;
|
|
|
|
remain -= lencopy;
|
|
|
|
|
|
|
|
/* Copy current field line by line, interlacing with the other field */
|
|
|
|
while (remain > 0) {
|
|
|
|
|
|
|
|
dst += lencopy + bytesperline;
|
|
|
|
src += lencopy;
|
|
|
|
|
|
|
|
/* Copy one line at a time */
|
|
|
|
if (remain < bytesperline)
|
|
|
|
lencopy = remain;
|
|
|
|
else
|
|
|
|
lencopy = bytesperline;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we have enough space left in the buffer.
|
|
|
|
* In that case, we force loop exit after copy.
|
|
|
|
*/
|
|
|
|
if (lencopy > buf->bytesused - buf->length) {
|
|
|
|
lencopy = buf->bytesused - buf->length;
|
|
|
|
remain = lencopy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if the copy is done */
|
|
|
|
if (lencopy == 0 || remain == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (lencopy < 0) {
|
|
|
|
printk_ratelimited(KERN_WARNING "stk1160: negative lencopy detected\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((unsigned long)dst + lencopy >
|
|
|
|
(unsigned long)buf->mem + buf->length) {
|
|
|
|
printk_ratelimited(KERN_WARNING "stk1160: buffer overflow detected\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(dst, src, lencopy);
|
|
|
|
remain -= lencopy;
|
|
|
|
|
|
|
|
buf->bytesused += lencopy;
|
|
|
|
buf->pos += lencopy;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Controls the isoc copy of each urb packet
|
|
|
|
*/
|
|
|
|
static void stk1160_process_isoc(struct stk1160 *dev, struct urb *urb)
|
|
|
|
{
|
|
|
|
int i, len, status;
|
|
|
|
u8 *p;
|
|
|
|
|
|
|
|
if (!dev) {
|
|
|
|
stk1160_warn("%s called with null device\n", __func__);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (urb->status < 0) {
|
|
|
|
/* Print status and drop current packet (or field?) */
|
|
|
|
print_err_status(dev, -1, urb->status);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < urb->number_of_packets; i++) {
|
|
|
|
status = urb->iso_frame_desc[i].status;
|
|
|
|
if (status < 0) {
|
|
|
|
print_err_status(dev, i, status);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get packet actual length and pointer to data */
|
|
|
|
p = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
|
|
|
|
len = urb->iso_frame_desc[i].actual_length;
|
|
|
|
|
|
|
|
/* Empty packet */
|
|
|
|
if (len <= 4)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* An 8-byte packet sequence means end of field.
|
|
|
|
* So if we don't have any packet, we start receiving one now
|
|
|
|
* and if we do have a packet, then we are done with it.
|
|
|
|
*
|
|
|
|
* These end of field packets are always 0xc0 or 0x80,
|
|
|
|
* but not always 8-byte long so we don't check packet length.
|
|
|
|
*/
|
|
|
|
if (p[0] == 0xc0) {
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If first byte is 0xc0 then we received
|
|
|
|
* second field, and frame has ended.
|
|
|
|
*/
|
|
|
|
if (dev->isoc_ctl.buf != NULL)
|
|
|
|
stk1160_buffer_done(dev);
|
|
|
|
|
|
|
|
dev->isoc_ctl.buf = stk1160_next_buffer(dev);
|
|
|
|
if (dev->isoc_ctl.buf == NULL)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we don't have a buffer here, then it means we
|
|
|
|
* haven't found the start mark sequence.
|
|
|
|
*/
|
|
|
|
if (dev->isoc_ctl.buf == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (p[0] == 0xc0 || p[0] == 0x80) {
|
|
|
|
|
|
|
|
/* We set next packet parity and
|
|
|
|
* continue to get next one
|
|
|
|
*/
|
|
|
|
dev->isoc_ctl.buf->odd = *p & 0x40;
|
|
|
|
dev->isoc_ctl.buf->pos = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
stk1160_copy_video(dev, p, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* IRQ callback, called by URB callback
|
|
|
|
*/
|
|
|
|
static void stk1160_isoc_irq(struct urb *urb)
|
|
|
|
{
|
|
|
|
int i, rc;
|
|
|
|
struct stk1160 *dev = urb->context;
|
|
|
|
|
|
|
|
switch (urb->status) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case -ECONNRESET: /* kill */
|
|
|
|
case -ENOENT:
|
|
|
|
case -ESHUTDOWN:
|
|
|
|
/* TODO: check uvc driver: he frees the queue here */
|
|
|
|
return;
|
|
|
|
default:
|
|
|
|
stk1160_err("urb error! status %d\n", urb->status);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stk1160_process_isoc(dev, urb);
|
|
|
|
|
|
|
|
/* Reset urb buffers */
|
|
|
|
for (i = 0; i < urb->number_of_packets; i++) {
|
|
|
|
urb->iso_frame_desc[i].status = 0;
|
|
|
|
urb->iso_frame_desc[i].actual_length = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
if (rc)
|
|
|
|
stk1160_err("urb re-submit failed (%d)\n", rc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Cancel urbs
|
|
|
|
* This function can't be called in atomic context
|
|
|
|
*/
|
|
|
|
void stk1160_cancel_isoc(struct stk1160 *dev)
|
|
|
|
{
|
2012-08-20 08:23:43 +08:00
|
|
|
int i, num_bufs = dev->isoc_ctl.num_bufs;
|
2012-08-12 01:32:57 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This check is not necessary, but we add it
|
|
|
|
* to avoid a spurious debug message
|
|
|
|
*/
|
2012-08-20 08:23:43 +08:00
|
|
|
if (!num_bufs)
|
2012-08-12 01:32:57 +08:00
|
|
|
return;
|
|
|
|
|
2012-08-20 08:23:43 +08:00
|
|
|
stk1160_dbg("killing %d urbs...\n", num_bufs);
|
2012-08-12 01:32:57 +08:00
|
|
|
|
2012-08-20 08:23:43 +08:00
|
|
|
for (i = 0; i < num_bufs; i++) {
|
2012-08-12 01:32:57 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* To kill urbs we can't be in atomic context.
|
|
|
|
* We don't care for NULL pointer since
|
|
|
|
* usb_kill_urb allows it.
|
|
|
|
*/
|
|
|
|
usb_kill_urb(dev->isoc_ctl.urb[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
stk1160_dbg("all urbs killed\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Releases urb and transfer buffers
|
|
|
|
* Obviusly, associated urb must be killed before releasing it.
|
|
|
|
*/
|
|
|
|
void stk1160_free_isoc(struct stk1160 *dev)
|
|
|
|
{
|
|
|
|
struct urb *urb;
|
2012-08-20 08:23:43 +08:00
|
|
|
int i, num_bufs = dev->isoc_ctl.num_bufs;
|
2012-08-12 01:32:57 +08:00
|
|
|
|
2012-08-20 08:23:43 +08:00
|
|
|
stk1160_dbg("freeing %d urb buffers...\n", num_bufs);
|
2012-08-12 01:32:57 +08:00
|
|
|
|
2012-08-20 08:23:43 +08:00
|
|
|
for (i = 0; i < num_bufs; i++) {
|
2012-08-12 01:32:57 +08:00
|
|
|
|
|
|
|
urb = dev->isoc_ctl.urb[i];
|
|
|
|
if (urb) {
|
|
|
|
|
|
|
|
if (dev->isoc_ctl.transfer_buffer[i]) {
|
|
|
|
#ifndef CONFIG_DMA_NONCOHERENT
|
|
|
|
usb_free_coherent(dev->udev,
|
|
|
|
urb->transfer_buffer_length,
|
|
|
|
dev->isoc_ctl.transfer_buffer[i],
|
|
|
|
urb->transfer_dma);
|
|
|
|
#else
|
|
|
|
kfree(dev->isoc_ctl.transfer_buffer[i]);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
usb_free_urb(urb);
|
|
|
|
dev->isoc_ctl.urb[i] = NULL;
|
|
|
|
}
|
|
|
|
dev->isoc_ctl.transfer_buffer[i] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(dev->isoc_ctl.urb);
|
|
|
|
kfree(dev->isoc_ctl.transfer_buffer);
|
|
|
|
|
|
|
|
dev->isoc_ctl.urb = NULL;
|
|
|
|
dev->isoc_ctl.transfer_buffer = NULL;
|
|
|
|
dev->isoc_ctl.num_bufs = 0;
|
|
|
|
|
|
|
|
stk1160_dbg("all urb buffers freed\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper for cancelling and freeing urbs
|
|
|
|
* This function can't be called in atomic context
|
|
|
|
*/
|
|
|
|
void stk1160_uninit_isoc(struct stk1160 *dev)
|
|
|
|
{
|
|
|
|
stk1160_cancel_isoc(dev);
|
|
|
|
stk1160_free_isoc(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate URBs
|
|
|
|
*/
|
|
|
|
int stk1160_alloc_isoc(struct stk1160 *dev)
|
|
|
|
{
|
|
|
|
struct urb *urb;
|
|
|
|
int i, j, k, sb_size, max_packets, num_bufs;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It may be necessary to release isoc here,
|
|
|
|
* since isoc are only released on disconnection.
|
|
|
|
* (see new_pkt_size flag)
|
|
|
|
*/
|
|
|
|
if (dev->isoc_ctl.num_bufs)
|
|
|
|
stk1160_uninit_isoc(dev);
|
|
|
|
|
|
|
|
stk1160_dbg("allocating urbs...\n");
|
|
|
|
|
|
|
|
num_bufs = STK1160_NUM_BUFS;
|
|
|
|
max_packets = STK1160_NUM_PACKETS;
|
|
|
|
sb_size = max_packets * dev->max_pkt_size;
|
|
|
|
|
|
|
|
dev->isoc_ctl.buf = NULL;
|
|
|
|
dev->isoc_ctl.max_pkt_size = dev->max_pkt_size;
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 05:03:40 +08:00
|
|
|
dev->isoc_ctl.urb = kcalloc(num_bufs, sizeof(void *), GFP_KERNEL);
|
2012-08-12 01:32:57 +08:00
|
|
|
if (!dev->isoc_ctl.urb) {
|
|
|
|
stk1160_err("out of memory for urb array\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 05:03:40 +08:00
|
|
|
dev->isoc_ctl.transfer_buffer = kcalloc(num_bufs, sizeof(void *),
|
|
|
|
GFP_KERNEL);
|
2012-08-12 01:32:57 +08:00
|
|
|
if (!dev->isoc_ctl.transfer_buffer) {
|
|
|
|
stk1160_err("out of memory for usb transfers\n");
|
|
|
|
kfree(dev->isoc_ctl.urb);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate urbs and transfer buffers */
|
|
|
|
for (i = 0; i < num_bufs; i++) {
|
|
|
|
|
|
|
|
urb = usb_alloc_urb(max_packets, GFP_KERNEL);
|
2016-08-12 05:03:59 +08:00
|
|
|
if (!urb)
|
2012-08-20 08:23:44 +08:00
|
|
|
goto free_i_bufs;
|
2012-08-12 01:32:57 +08:00
|
|
|
dev->isoc_ctl.urb[i] = urb;
|
|
|
|
|
|
|
|
#ifndef CONFIG_DMA_NONCOHERENT
|
|
|
|
dev->isoc_ctl.transfer_buffer[i] = usb_alloc_coherent(dev->udev,
|
|
|
|
sb_size, GFP_KERNEL, &urb->transfer_dma);
|
|
|
|
#else
|
|
|
|
dev->isoc_ctl.transfer_buffer[i] = kmalloc(sb_size, GFP_KERNEL);
|
|
|
|
#endif
|
|
|
|
if (!dev->isoc_ctl.transfer_buffer[i]) {
|
2012-08-20 08:23:44 +08:00
|
|
|
stk1160_err("cannot alloc %d bytes for tx[%d] buffer\n",
|
|
|
|
sb_size, i);
|
2012-10-24 08:20:30 +08:00
|
|
|
|
|
|
|
/* Not enough transfer buffers, so just give up */
|
|
|
|
if (i < STK1160_MIN_BUFS)
|
|
|
|
goto free_i_bufs;
|
|
|
|
goto nomore_tx_bufs;
|
2012-08-12 01:32:57 +08:00
|
|
|
}
|
|
|
|
memset(dev->isoc_ctl.transfer_buffer[i], 0, sb_size);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* FIXME: Where can I get the endpoint?
|
|
|
|
*/
|
|
|
|
urb->dev = dev->udev;
|
|
|
|
urb->pipe = usb_rcvisocpipe(dev->udev, STK1160_EP_VIDEO);
|
|
|
|
urb->transfer_buffer = dev->isoc_ctl.transfer_buffer[i];
|
|
|
|
urb->transfer_buffer_length = sb_size;
|
|
|
|
urb->complete = stk1160_isoc_irq;
|
|
|
|
urb->context = dev;
|
|
|
|
urb->interval = 1;
|
|
|
|
urb->start_frame = 0;
|
|
|
|
urb->number_of_packets = max_packets;
|
|
|
|
#ifndef CONFIG_DMA_NONCOHERENT
|
|
|
|
urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
|
|
|
|
#else
|
|
|
|
urb->transfer_flags = URB_ISO_ASAP;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
k = 0;
|
|
|
|
for (j = 0; j < max_packets; j++) {
|
|
|
|
urb->iso_frame_desc[j].offset = k;
|
|
|
|
urb->iso_frame_desc[j].length =
|
|
|
|
dev->isoc_ctl.max_pkt_size;
|
|
|
|
k += dev->isoc_ctl.max_pkt_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-24 08:20:30 +08:00
|
|
|
stk1160_dbg("%d urbs allocated\n", num_bufs);
|
2012-08-12 01:32:57 +08:00
|
|
|
|
|
|
|
/* At last we can say we have some buffers */
|
|
|
|
dev->isoc_ctl.num_bufs = num_bufs;
|
|
|
|
|
|
|
|
return 0;
|
2012-08-20 08:23:44 +08:00
|
|
|
|
2012-10-24 08:20:30 +08:00
|
|
|
nomore_tx_bufs:
|
|
|
|
/*
|
|
|
|
* Failed to allocate desired buffer count. However, we may have
|
|
|
|
* enough to work fine, so we just free the extra urb,
|
|
|
|
* store the allocated count and keep going, fingers crossed!
|
|
|
|
*/
|
|
|
|
usb_free_urb(dev->isoc_ctl.urb[i]);
|
|
|
|
dev->isoc_ctl.urb[i] = NULL;
|
|
|
|
|
|
|
|
stk1160_warn("%d urbs allocated. Trying to continue...\n", i - 1);
|
|
|
|
|
|
|
|
dev->isoc_ctl.num_bufs = i - 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
2012-08-20 08:23:44 +08:00
|
|
|
free_i_bufs:
|
|
|
|
/* Save the allocated buffers so far, so we can properly free them */
|
|
|
|
dev->isoc_ctl.num_bufs = i+1;
|
|
|
|
stk1160_free_isoc(dev);
|
|
|
|
return -ENOMEM;
|
2012-08-12 01:32:57 +08:00
|
|
|
}
|
|
|
|
|