mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 11:49:32 +00:00
usb: renesas_usbhs: Modify pipe configuration
The current code has info->bufnmb_last to calculate the BUFNMB bits of PIPEBUF register. However, since the bufnmb_last is initialized in the usbhs_pipe_init() only, this driver is possible to set unexpected value to the register if usb_ep_{enable,disable}() are called many times. So, this patch modifies the pipe configuration via struct renesas_usbhs_driver_param to simplify the code. Also this patch changes: - a double buffer configuration - isochronous buffer size from 512 to 1024 Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
parent
762d3a1a9c
commit
51f141a97a
5 changed files with 82 additions and 129 deletions
|
@ -302,37 +302,37 @@ static void usbhsc_set_buswait(struct usbhs_priv *priv)
|
|||
*/
|
||||
|
||||
/* commonly used on old SH-Mobile SoCs */
|
||||
static u32 usbhsc_default_pipe_type[] = {
|
||||
USB_ENDPOINT_XFER_CONTROL,
|
||||
USB_ENDPOINT_XFER_ISOC,
|
||||
USB_ENDPOINT_XFER_ISOC,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
static struct renesas_usbhs_driver_pipe_config usbhsc_default_pipe[] = {
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_CONTROL, 64, 0x00, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_ISOC, 1024, 0x08, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_ISOC, 1024, 0x18, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x28, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x38, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x48, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x04, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x05, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x06, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x07, false),
|
||||
};
|
||||
|
||||
/* commonly used on newer SH-Mobile and R-Car SoCs */
|
||||
static u32 usbhsc_new_pipe_type[] = {
|
||||
USB_ENDPOINT_XFER_CONTROL,
|
||||
USB_ENDPOINT_XFER_ISOC,
|
||||
USB_ENDPOINT_XFER_ISOC,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
USB_ENDPOINT_XFER_INT,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
USB_ENDPOINT_XFER_BULK,
|
||||
static struct renesas_usbhs_driver_pipe_config usbhsc_new_pipe[] = {
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_CONTROL, 64, 0x00, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_ISOC, 1024, 0x08, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_ISOC, 1024, 0x28, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x48, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x58, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x68, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x04, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x05, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_INT, 64, 0x06, false),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x78, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x88, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0x98, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0xa8, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0xb8, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0xc8, true),
|
||||
RENESAS_USBHS_PIPE(USB_ENDPOINT_XFER_BULK, 512, 0xd8, true),
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -564,10 +564,9 @@ static int usbhs_probe(struct platform_device *pdev)
|
|||
switch (priv->dparam.type) {
|
||||
case USBHS_TYPE_RCAR_GEN2:
|
||||
priv->pfunc = usbhs_rcar2_ops;
|
||||
if (!priv->dparam.pipe_type) {
|
||||
priv->dparam.pipe_type = usbhsc_new_pipe_type;
|
||||
priv->dparam.pipe_size =
|
||||
ARRAY_SIZE(usbhsc_new_pipe_type);
|
||||
if (!priv->dparam.pipe_configs) {
|
||||
priv->dparam.pipe_configs = usbhsc_new_pipe;
|
||||
priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
@ -586,9 +585,9 @@ static int usbhs_probe(struct platform_device *pdev)
|
|||
dfunc->notify_hotplug = usbhsc_drvcllbck_notify_hotplug;
|
||||
|
||||
/* set default param if platform doesn't have */
|
||||
if (!priv->dparam.pipe_type) {
|
||||
priv->dparam.pipe_type = usbhsc_default_pipe_type;
|
||||
priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_default_pipe_type);
|
||||
if (!priv->dparam.pipe_configs) {
|
||||
priv->dparam.pipe_configs = usbhsc_default_pipe;
|
||||
priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_default_pipe);
|
||||
}
|
||||
if (!priv->dparam.pio_dma_border)
|
||||
priv->dparam.pio_dma_border = 64; /* 64byte */
|
||||
|
|
|
@ -1414,7 +1414,8 @@ static void usbhsh_pipe_init_for_host(struct usbhs_priv *priv)
|
|||
{
|
||||
struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
|
||||
struct usbhs_pipe *pipe;
|
||||
u32 *pipe_type = usbhs_get_dparam(priv, pipe_type);
|
||||
struct renesas_usbhs_driver_pipe_config *pipe_configs =
|
||||
usbhs_get_dparam(priv, pipe_configs);
|
||||
int pipe_size = usbhs_get_dparam(priv, pipe_size);
|
||||
int old_type, dir_in, i;
|
||||
|
||||
|
@ -1442,15 +1443,15 @@ static void usbhsh_pipe_init_for_host(struct usbhs_priv *priv)
|
|||
* USB_ENDPOINT_XFER_BULK -> dir in
|
||||
* ...
|
||||
*/
|
||||
dir_in = (pipe_type[i] == old_type);
|
||||
old_type = pipe_type[i];
|
||||
dir_in = (pipe_configs[i].type == old_type);
|
||||
old_type = pipe_configs[i].type;
|
||||
|
||||
if (USB_ENDPOINT_XFER_CONTROL == pipe_type[i]) {
|
||||
if (USB_ENDPOINT_XFER_CONTROL == pipe_configs[i].type) {
|
||||
pipe = usbhs_dcp_malloc(priv);
|
||||
usbhsh_hpriv_to_dcp(hpriv) = pipe;
|
||||
} else {
|
||||
pipe = usbhs_pipe_malloc(priv,
|
||||
pipe_type[i],
|
||||
pipe_configs[i].type,
|
||||
dir_in);
|
||||
}
|
||||
|
||||
|
|
|
@ -44,6 +44,15 @@ char *usbhs_pipe_name(struct usbhs_pipe *pipe)
|
|||
return usbhsp_pipe_name[usbhs_pipe_type(pipe)];
|
||||
}
|
||||
|
||||
static struct renesas_usbhs_driver_pipe_config
|
||||
*usbhsp_get_pipe_config(struct usbhs_priv *priv, int pipe_num)
|
||||
{
|
||||
struct renesas_usbhs_driver_pipe_config *pipe_configs =
|
||||
usbhs_get_dparam(priv, pipe_configs);
|
||||
|
||||
return &pipe_configs[pipe_num];
|
||||
}
|
||||
|
||||
/*
|
||||
* DCPCTR/PIPEnCTR functions
|
||||
*/
|
||||
|
@ -384,18 +393,6 @@ void usbhs_pipe_set_trans_count_if_bulk(struct usbhs_pipe *pipe, int len)
|
|||
/*
|
||||
* pipe setup
|
||||
*/
|
||||
static int usbhsp_possible_double_buffer(struct usbhs_pipe *pipe)
|
||||
{
|
||||
/*
|
||||
* only ISO / BULK pipe can use double buffer
|
||||
*/
|
||||
if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_BULK) ||
|
||||
usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_ISOC))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
|
||||
int is_host,
|
||||
int dir_in)
|
||||
|
@ -412,7 +409,6 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
|
|||
[USB_ENDPOINT_XFER_INT] = TYPE_INT,
|
||||
[USB_ENDPOINT_XFER_ISOC] = TYPE_ISO,
|
||||
};
|
||||
int is_double = usbhsp_possible_double_buffer(pipe);
|
||||
|
||||
if (usbhs_pipe_is_dcp(pipe))
|
||||
return -EINVAL;
|
||||
|
@ -434,10 +430,7 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
|
|||
usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_BULK))
|
||||
bfre = 0; /* FIXME */
|
||||
|
||||
/* DBLB */
|
||||
if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_ISOC) ||
|
||||
usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_BULK))
|
||||
dblb = (is_double) ? DBLB : 0;
|
||||
/* DBLB: see usbhs_pipe_config_update() */
|
||||
|
||||
/* CNTMD */
|
||||
if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_BULK))
|
||||
|
@ -473,13 +466,13 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
|
|||
static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe)
|
||||
{
|
||||
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
|
||||
struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
|
||||
struct device *dev = usbhs_priv_to_dev(priv);
|
||||
int pipe_num = usbhs_pipe_number(pipe);
|
||||
int is_double = usbhsp_possible_double_buffer(pipe);
|
||||
u16 buff_size;
|
||||
u16 bufnmb;
|
||||
u16 bufnmb_cnt;
|
||||
struct renesas_usbhs_driver_pipe_config *pipe_config =
|
||||
usbhsp_get_pipe_config(priv, pipe_num);
|
||||
|
||||
/*
|
||||
* PIPEBUF
|
||||
|
@ -489,56 +482,13 @@ static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe)
|
|||
* - "Features" - "Pipe configuration"
|
||||
* - "Operation" - "FIFO Buffer Memory"
|
||||
* - "Operation" - "Pipe Control"
|
||||
*
|
||||
* ex) if pipe6 - pipe9 are USB_ENDPOINT_XFER_INT (SH7724)
|
||||
*
|
||||
* BUFNMB: PIPE
|
||||
* 0: pipe0 (DCP 256byte)
|
||||
* 1: -
|
||||
* 2: -
|
||||
* 3: -
|
||||
* 4: pipe6 (INT 64byte)
|
||||
* 5: pipe7 (INT 64byte)
|
||||
* 6: pipe8 (INT 64byte)
|
||||
* 7: pipe9 (INT 64byte)
|
||||
* 8 - xx: free (for BULK, ISOC)
|
||||
*/
|
||||
|
||||
/*
|
||||
* FIXME
|
||||
*
|
||||
* it doesn't have good buffer allocator
|
||||
*
|
||||
* DCP : 256 byte
|
||||
* BULK: 512 byte
|
||||
* INT : 64 byte
|
||||
* ISOC: 512 byte
|
||||
*/
|
||||
if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_CONTROL))
|
||||
buff_size = 256;
|
||||
else if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_INT))
|
||||
buff_size = 64;
|
||||
else
|
||||
buff_size = 512;
|
||||
buff_size = pipe_config->bufsize;
|
||||
bufnmb = pipe_config->bufnum;
|
||||
|
||||
/* change buff_size to register value */
|
||||
bufnmb_cnt = (buff_size / 64) - 1;
|
||||
|
||||
/* BUFNMB has been reserved for INT pipe
|
||||
* see above */
|
||||
if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_INT)) {
|
||||
bufnmb = pipe_num - 2;
|
||||
} else {
|
||||
bufnmb = info->bufnmb_last;
|
||||
info->bufnmb_last += bufnmb_cnt + 1;
|
||||
|
||||
/*
|
||||
* double buffer
|
||||
*/
|
||||
if (is_double)
|
||||
info->bufnmb_last += bufnmb_cnt + 1;
|
||||
}
|
||||
|
||||
dev_dbg(dev, "pipe : %d : buff_size 0x%x: bufnmb 0x%x\n",
|
||||
pipe_num, buff_size, bufnmb);
|
||||
|
||||
|
@ -549,8 +499,13 @@ static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe)
|
|||
void usbhs_pipe_config_update(struct usbhs_pipe *pipe, u16 devsel,
|
||||
u16 epnum, u16 maxp)
|
||||
{
|
||||
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
|
||||
int pipe_num = usbhs_pipe_number(pipe);
|
||||
struct renesas_usbhs_driver_pipe_config *pipe_config =
|
||||
usbhsp_get_pipe_config(priv, pipe_num);
|
||||
u16 dblb = pipe_config->double_buf ? DBLB : 0;
|
||||
|
||||
if (devsel > 0xA) {
|
||||
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
|
||||
struct device *dev = usbhs_priv_to_dev(priv);
|
||||
|
||||
dev_err(dev, "devsel error %d\n", devsel);
|
||||
|
@ -568,7 +523,7 @@ void usbhs_pipe_config_update(struct usbhs_pipe *pipe, u16 devsel,
|
|||
maxp);
|
||||
|
||||
if (!usbhs_pipe_is_dcp(pipe))
|
||||
usbhsp_pipe_cfg_set(pipe, 0x000F, epnum);
|
||||
usbhsp_pipe_cfg_set(pipe, 0x000F | DBLB, epnum | dblb);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -708,23 +663,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv,
|
|||
struct usbhs_pipe *pipe;
|
||||
int i;
|
||||
|
||||
/*
|
||||
* FIXME
|
||||
*
|
||||
* driver needs good allocator.
|
||||
*
|
||||
* find first free buffer area (BULK, ISOC)
|
||||
* (DCP, INT area is fixed)
|
||||
*
|
||||
* buffer number 0 - 3 have been reserved for DCP
|
||||
* see
|
||||
* usbhsp_to_bufnmb
|
||||
*/
|
||||
info->bufnmb_last = 4;
|
||||
usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
|
||||
if (usbhs_pipe_type_is(pipe, USB_ENDPOINT_XFER_INT))
|
||||
info->bufnmb_last++;
|
||||
|
||||
usbhsp_flags_init(pipe);
|
||||
pipe->fifo = NULL;
|
||||
pipe->mod_private = NULL;
|
||||
|
@ -851,12 +790,13 @@ int usbhs_pipe_probe(struct usbhs_priv *priv)
|
|||
struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
|
||||
struct usbhs_pipe *pipe;
|
||||
struct device *dev = usbhs_priv_to_dev(priv);
|
||||
u32 *pipe_type = usbhs_get_dparam(priv, pipe_type);
|
||||
struct renesas_usbhs_driver_pipe_config *pipe_configs =
|
||||
usbhs_get_dparam(priv, pipe_configs);
|
||||
int pipe_size = usbhs_get_dparam(priv, pipe_size);
|
||||
int i;
|
||||
|
||||
/* This driver expects 1st pipe is DCP */
|
||||
if (pipe_type[0] != USB_ENDPOINT_XFER_CONTROL) {
|
||||
if (pipe_configs[0].type != USB_ENDPOINT_XFER_CONTROL) {
|
||||
dev_err(dev, "1st PIPE is not DCP\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -876,10 +816,10 @@ int usbhs_pipe_probe(struct usbhs_priv *priv)
|
|||
pipe->priv = priv;
|
||||
|
||||
usbhs_pipe_type(pipe) =
|
||||
pipe_type[i] & USB_ENDPOINT_XFERTYPE_MASK;
|
||||
pipe_configs[i].type & USB_ENDPOINT_XFERTYPE_MASK;
|
||||
|
||||
dev_dbg(dev, "pipe %x\t: %s\n",
|
||||
i, usbhsp_pipe_name[pipe_type[i]]);
|
||||
i, usbhsp_pipe_name[pipe_configs[i].type]);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -46,7 +46,6 @@ struct usbhs_pipe {
|
|||
struct usbhs_pipe_info {
|
||||
struct usbhs_pipe *pipe;
|
||||
int size; /* array size of "pipe" */
|
||||
int bufnmb_last; /* FIXME : driver needs good allocator */
|
||||
|
||||
int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map);
|
||||
};
|
||||
|
|
|
@ -105,12 +105,26 @@ struct renesas_usbhs_platform_callback {
|
|||
* some register needs USB chip specific parameters.
|
||||
* This struct show it to driver
|
||||
*/
|
||||
|
||||
struct renesas_usbhs_driver_pipe_config {
|
||||
u8 type; /* USB_ENDPOINT_XFER_xxx */
|
||||
u16 bufsize;
|
||||
u8 bufnum;
|
||||
bool double_buf;
|
||||
};
|
||||
#define RENESAS_USBHS_PIPE(_type, _size, _num, _double_buf) { \
|
||||
.type = (_type), \
|
||||
.bufsize = (_size), \
|
||||
.bufnum = (_num), \
|
||||
.double_buf = (_double_buf), \
|
||||
}
|
||||
|
||||
struct renesas_usbhs_driver_param {
|
||||
/*
|
||||
* pipe settings
|
||||
*/
|
||||
u32 *pipe_type; /* array of USB_ENDPOINT_XFER_xxx (from ep0) */
|
||||
int pipe_size; /* pipe_type array size */
|
||||
struct renesas_usbhs_driver_pipe_config *pipe_configs;
|
||||
int pipe_size; /* pipe_configs array size */
|
||||
|
||||
/*
|
||||
* option:
|
||||
|
|
Loading…
Reference in a new issue