Skip to content

L
linux
Commit dad67397 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Greg Kroah-Hartman
Browse files
Options

usb: renesas_usbhs: modify data transfer interrupt 

On current driver, overall data transfer method was implemented in fifo.c,
but its interrupt which is member of packet queue control
was still in mod_gadget.c.
This patch move it into fifo.c.
By this patch, the packet/fifo control is independent from mod_gadget.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 659d4954
Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 294 deletions
drivers/usb/renesas_usbhs/fifo.c
View file @ dad67397
...@@ -22,19 +22,44 @@ ...@@ -22,19 +22,44 @@
/* /*
* packet info function * packet info function
*/ */
static int usbhsf_null_handle(struct usbhs_pkt *pkt)
{
struct usbhs_priv *priv = usbhs_pipe_to_priv(pkt->pipe);
struct device *dev = usbhs_priv_to_dev(priv);
dev_err(dev, "null handler\n");
return -EINVAL;
}
static struct usbhs_pkt_handle usbhsf_null_handler = {
.prepare = usbhsf_null_handle,
.try_run = usbhsf_null_handle,
};
void usbhs_pkt_init(struct usbhs_pkt *pkt) void usbhs_pkt_init(struct usbhs_pkt *pkt)
{ {
INIT_LIST_HEAD(&pkt->node); INIT_LIST_HEAD(&pkt->node);
} }
void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt, void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
struct usbhs_pkt_handle *handler,
void *buf, int len, int zero) void *buf, int len, int zero)
{ {
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
struct device *dev = usbhs_priv_to_dev(priv);
if (!handler) {
dev_err(dev, "no handler function\n");
handler = &usbhsf_null_handler;
}
list_del_init(&pkt->node); list_del_init(&pkt->node);
list_add_tail(&pkt->node, &pipe->list); list_add_tail(&pkt->node, &pipe->list);
pkt->pipe = pipe; pkt->pipe = pipe;
pkt->buf = buf; pkt->buf = buf;
pkt->handler = handler;
pkt->length = len; pkt->length = len;
pkt->zero = zero; pkt->zero = zero;
pkt->actual = 0; pkt->actual = 0;
...@@ -163,12 +188,7 @@ static int usbhsf_fifo_select(struct usbhs_pipe *pipe, int write) ...@@ -163,12 +188,7 @@ static int usbhsf_fifo_select(struct usbhs_pipe *pipe, int write)
/* /*
* PIO fifo functions * PIO fifo functions
*/ */
int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe) static int usbhsf_try_push(struct usbhs_pkt *pkt)
{
return usbhsf_fifo_select(pipe, 1);
}
int usbhs_fifo_write(struct usbhs_pkt *pkt)
{ {
struct usbhs_pipe *pipe = pkt->pipe; struct usbhs_pipe *pipe = pkt->pipe;
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
...@@ -181,11 +201,11 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt) ...@@ -181,11 +201,11 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt)
int i, ret, len; int i, ret, len;
int is_short, is_done; int is_short, is_done;
ret = usbhs_pipe_is_accessible(pipe); ret = usbhsf_fifo_select(pipe, 1);
if (ret < 0) if (ret < 0)
goto usbhs_fifo_write_busy; goto usbhs_fifo_write_busy;
ret = usbhsf_fifo_select(pipe, 1); ret = usbhs_pipe_is_accessible(pipe);
if (ret < 0) if (ret < 0)
goto usbhs_fifo_write_busy; goto usbhs_fifo_write_busy;
...@@ -246,8 +266,7 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt) ...@@ -246,8 +266,7 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt)
if (usbhs_pipe_is_dcp(pipe)) if (usbhs_pipe_is_dcp(pipe))
usbhs_dcp_control_transfer_done(pipe); usbhs_dcp_control_transfer_done(pipe);
if (info->tx_done) info->done(pkt);
info->tx_done(pkt);
} }
return 0; return 0;
...@@ -262,8 +281,14 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt) ...@@ -262,8 +281,14 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt)
return ret; return ret;
} }
int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe) struct usbhs_pkt_handle usbhs_fifo_push_handler = {
.prepare = usbhsf_try_push,
.try_run = usbhsf_try_push,
};
static int usbhsf_prepare_pop(struct usbhs_pkt *pkt)
{ {
struct usbhs_pipe *pipe = pkt->pipe;
int ret; int ret;
/* /*
...@@ -279,7 +304,7 @@ int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe) ...@@ -279,7 +304,7 @@ int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe)
return ret; return ret;
} }
int usbhs_fifo_read(struct usbhs_pkt *pkt) static int usbhsf_try_pop(struct usbhs_pkt *pkt)
{ {
struct usbhs_pipe *pipe = pkt->pipe; struct usbhs_pipe *pipe = pkt->pipe;
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
...@@ -355,9 +380,124 @@ int usbhs_fifo_read(struct usbhs_pkt *pkt) ...@@ -355,9 +380,124 @@ int usbhs_fifo_read(struct usbhs_pkt *pkt)
usbhsf_rx_irq_ctrl(pipe, 0); usbhsf_rx_irq_ctrl(pipe, 0);
usbhs_pipe_disable(pipe); usbhs_pipe_disable(pipe);
if (info->rx_done) info->done(pkt);
info->rx_done(pkt); }
return 0;
}
struct usbhs_pkt_handle usbhs_fifo_pop_handler = {
.prepare = usbhsf_prepare_pop,
.try_run = usbhsf_try_pop,
};
/*
* handler function
*/
static int usbhsf_ctrl_stage_end(struct usbhs_pkt *pkt)
{
struct usbhs_pipe *pipe = pkt->pipe;
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
usbhs_dcp_control_transfer_done(pipe);
info->done(pkt);
return 0;
}
struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler = {
.prepare = usbhsf_ctrl_stage_end,
.try_run = usbhsf_ctrl_stage_end,
};
/*
* irq functions
*/
static int usbhsf_irq_empty(struct usbhs_priv *priv,
struct usbhs_irq_state *irq_state)
{
struct usbhs_pipe *pipe;
struct usbhs_pkt *pkt;
struct device *dev = usbhs_priv_to_dev(priv);
int i, ret;
if (!irq_state->bempsts) {
dev_err(dev, "debug %s !!\n", __func__);
return -EIO;
}
dev_dbg(dev, "irq empty [0x%04x]\n", irq_state->bempsts);
/*
* search interrupted "pipe"
* not "uep".
*/
usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
if (!(irq_state->bempsts & (1 << i)))
continue;
pkt = usbhs_pkt_get(pipe);
ret = usbhs_pkt_run(pkt);
if (ret < 0)
dev_err(dev, "irq_empty run_error %d : %d\n", i, ret);
} }
return 0; return 0;
} }
static int usbhsf_irq_ready(struct usbhs_priv *priv,
struct usbhs_irq_state *irq_state)
{
struct usbhs_pipe *pipe;
struct usbhs_pkt *pkt;
struct device *dev = usbhs_priv_to_dev(priv);
int i, ret;
if (!irq_state->brdysts) {
dev_err(dev, "debug %s !!\n", __func__);
return -EIO;
}
dev_dbg(dev, "irq ready [0x%04x]\n", irq_state->brdysts);
/*
* search interrupted "pipe"
* not "uep".
*/
usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
if (!(irq_state->brdysts & (1 << i)))
continue;
pkt = usbhs_pkt_get(pipe);
ret = usbhs_pkt_run(pkt);
if (ret < 0)
dev_err(dev, "irq_ready run_error %d : %d\n", i, ret);
}
return 0;
}
/*
* fifo init
*/
void usbhs_fifo_init(struct usbhs_priv *priv)
{
struct usbhs_mod *mod = usbhs_mod_get_current(priv);
mod->irq_empty = usbhsf_irq_empty;
mod->irq_ready = usbhsf_irq_ready;
mod->irq_bempsts = 0;
mod->irq_brdysts = 0;
}
void usbhs_fifo_quit(struct usbhs_priv *priv)
{
struct usbhs_mod *mod = usbhs_mod_get_current(priv);
mod->irq_empty = NULL;
mod->irq_ready = NULL;
mod->irq_bempsts = 0;
mod->irq_brdysts = 0;
}
drivers/usb/renesas_usbhs/fifo.h
View file @ dad67397
...@@ -19,30 +19,43 @@ ...@@ -19,30 +19,43 @@
#include "pipe.h" #include "pipe.h"
struct usbhs_pkt_handle;
struct usbhs_pkt { struct usbhs_pkt {
struct list_head node; struct list_head node;
struct usbhs_pipe *pipe; struct usbhs_pipe *pipe;
struct usbhs_pkt_handle *handler;
void *buf; void *buf;
int length; int length;
int actual; int actual;
int zero; int zero;
}; };
struct usbhs_pkt_handle {
int (*prepare)(struct usbhs_pkt *pkt);
int (*try_run)(struct usbhs_pkt *pkt);
};
/* /*
* fifo * fifo
*/ */
int usbhs_fifo_write(struct usbhs_pkt *pkt); void usbhs_fifo_init(struct usbhs_priv *priv);
int usbhs_fifo_read(struct usbhs_pkt *pkt); void usbhs_fifo_quit(struct usbhs_priv *priv);
int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe);
int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe);
/* /*
* packet info * packet info
*/ */
extern struct usbhs_pkt_handle usbhs_fifo_push_handler;
extern struct usbhs_pkt_handle usbhs_fifo_pop_handler;
extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler;
void usbhs_pkt_init(struct usbhs_pkt *pkt); void usbhs_pkt_init(struct usbhs_pkt *pkt);
void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt, void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
struct usbhs_pkt_handle *handler,
void *buf, int len, int zero); void *buf, int len, int zero);
void usbhs_pkt_pop(struct usbhs_pkt *pkt); void usbhs_pkt_pop(struct usbhs_pkt *pkt);
struct usbhs_pkt *usbhs_pkt_get(struct usbhs_pipe *pipe); struct usbhs_pkt *usbhs_pkt_get(struct usbhs_pipe *pipe);
#define usbhs_pkt_start(p) ((p)->handler->prepare(p))
#define usbhs_pkt_run(p) ((p)->handler->try_run(p))
#endif /* RENESAS_USB_FIFO_H */ #endif /* RENESAS_USB_FIFO_H */
drivers/usb/renesas_usbhs/mod_gadget.c
View file @ dad67397
...@@ -31,7 +31,6 @@ struct usbhsg_request { ...@@ -31,7 +31,6 @@ struct usbhsg_request {
#define EP_NAME_SIZE 8 #define EP_NAME_SIZE 8
struct usbhsg_gpriv; struct usbhsg_gpriv;
struct usbhsg_pipe_handle;
struct usbhsg_uep { struct usbhsg_uep {
struct usb_ep ep; struct usb_ep ep;
struct usbhs_pipe *pipe; struct usbhs_pipe *pipe;
...@@ -39,7 +38,7 @@ struct usbhsg_uep { ...@@ -39,7 +38,7 @@ struct usbhsg_uep {
char ep_name[EP_NAME_SIZE]; char ep_name[EP_NAME_SIZE];
struct usbhsg_gpriv *gpriv; struct usbhsg_gpriv *gpriv;
struct usbhsg_pipe_handle *handler; struct usbhs_pkt_handle *handler;
}; };
struct usbhsg_gpriv { struct usbhsg_gpriv {
...@@ -57,11 +56,6 @@ struct usbhsg_gpriv { ...@@ -57,11 +56,6 @@ struct usbhsg_gpriv {
#define USBHSG_STATUS_WEDGE (1 << 2) #define USBHSG_STATUS_WEDGE (1 << 2)
}; };
struct usbhsg_pipe_handle {
int (*prepare)(struct usbhsg_uep *uep, struct usbhsg_request *ureq);
int (*try_run)(struct usbhsg_uep *uep, struct usbhsg_request *ureq);
};
struct usbhsg_recip_handle { struct usbhsg_recip_handle {
char *name; char *name;
int (*device)(struct usbhs_priv *priv, struct usbhsg_uep *uep, int (*device)(struct usbhs_priv *priv, struct usbhsg_uep *uep,
...@@ -164,7 +158,8 @@ static void usbhsg_queue_push(struct usbhsg_uep *uep, ...@@ -164,7 +158,8 @@ static void usbhsg_queue_push(struct usbhsg_uep *uep,
/* /*
********* assume under spin lock ********* ********* assume under spin lock *********
*/ */
usbhs_pkt_push(pipe, pkt, req->buf, req->length, req->zero); usbhs_pkt_push(pipe, pkt, uep->handler,
req->buf, req->length, req->zero);
req->actual = 0; req->actual = 0;
req->status = -EINPROGRESS; req->status = -EINPROGRESS;
...@@ -187,22 +182,15 @@ static struct usbhsg_request *usbhsg_queue_get(struct usbhsg_uep *uep) ...@@ -187,22 +182,15 @@ static struct usbhsg_request *usbhsg_queue_get(struct usbhsg_uep *uep)
return usbhsg_pkt_to_ureq(pkt); return usbhsg_pkt_to_ureq(pkt);
} }
#define usbhsg_queue_prepare(uep) __usbhsg_queue_handler(uep, 1); static int usbhsg_queue_start(struct usbhsg_uep *uep)
#define usbhsg_queue_handle(uep) __usbhsg_queue_handler(uep, 0);
static int __usbhsg_queue_handler(struct usbhsg_uep *uep, int prepare)
{ {
struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep); struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
struct device *dev = usbhsg_gpriv_to_dev(gpriv); struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
struct usbhsg_request *ureq; struct usbhs_pkt *pkt;
spinlock_t *lock; spinlock_t *lock;
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
if (!uep->handler) {
dev_err(dev, "no handler function\n");
return -EIO;
}
/* /*
* CAUTION [*queue handler*] * CAUTION [*queue handler*]
* *
...@@ -224,13 +212,10 @@ static int __usbhsg_queue_handler(struct usbhsg_uep *uep, int prepare) ...@@ -224,13 +212,10 @@ static int __usbhsg_queue_handler(struct usbhsg_uep *uep, int prepare)
/****************** spin try lock *******************/ /****************** spin try lock *******************/
lock = usbhsg_trylock(gpriv, &flags); lock = usbhsg_trylock(gpriv, &flags);
ureq = usbhsg_queue_get(uep); pkt = usbhs_pkt_get(pipe);
if (ureq) { if (pkt)
if (prepare) ret = usbhs_pkt_start(pkt);
ret = uep->handler->prepare(uep, ureq);
else
ret = uep->handler->try_run(uep, ureq);
}
usbhsg_unlock(lock, &flags); usbhsg_unlock(lock, &flags);
/******************** spin unlock ******************/ /******************** spin unlock ******************/
...@@ -277,102 +262,10 @@ static void usbhsg_queue_pop(struct usbhsg_uep *uep, ...@@ -277,102 +262,10 @@ static void usbhsg_queue_pop(struct usbhsg_uep *uep,
/* more request ? */ /* more request ? */
if (0 == status) if (0 == status)
usbhsg_queue_prepare(uep); usbhsg_queue_start(uep);
}
/*
* irq enable/disable function
*/
#define usbhsg_irq_callback_ctrl(uep, status, enable) \
({ \
struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep); \
struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep); \
struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv); \
struct usbhs_mod *mod = usbhs_mod_get_current(priv); \
if (!mod) \
return; \
if (enable) \
mod->irq_##status |= (1 << usbhs_pipe_number(pipe)); \
else \
mod->irq_##status &= ~(1 << usbhs_pipe_number(pipe)); \
usbhs_irq_callback_update(priv, mod); \
})
static void usbhsg_irq_empty_ctrl(struct usbhsg_uep *uep, int enable)
{
usbhsg_irq_callback_ctrl(uep, bempsts, enable);
}
static void usbhsg_irq_ready_ctrl(struct usbhsg_uep *uep, int enable)
{
usbhsg_irq_callback_ctrl(uep, brdysts, enable);
}
/*
* handler function
*/
static int usbhsg_try_run_ctrl_stage_end(struct usbhsg_uep *uep,
struct usbhsg_request *ureq)
{
struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
/*
********* assume under spin lock *********
*/
usbhs_dcp_control_transfer_done(pipe);
usbhsg_queue_pop(uep, ureq, 0);
return 0;
}
/*
* packet send hander
*/
static void usbhsg_send_packet_done(struct usbhs_pkt *pkt)
{
struct usbhs_pipe *pipe = pkt->pipe;
struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
ureq->req.actual = pkt->actual;
usbhsg_queue_pop(uep, ureq, 0);
}
static int usbhsg_try_run_send_packet(struct usbhsg_uep *uep,
struct usbhsg_request *ureq)
{
struct usbhs_pkt *pkt = usbhsg_ureq_to_pkt(ureq);
/*
********* assume under spin lock *********
*/
usbhs_fifo_write(pkt);
return 0;
} }
static int usbhsg_prepare_send_packet(struct usbhsg_uep *uep, static void usbhsg_queue_done(struct usbhs_pkt *pkt)
struct usbhsg_request *ureq)
{
struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
/*
********* assume under spin lock *********
*/
usbhs_fifo_prepare_write(pipe);
usbhsg_try_run_send_packet(uep, ureq);
return 0;
}
/*
* packet recv hander
*/
static void usbhsg_receive_packet_done(struct usbhs_pkt *pkt)
{ {
struct usbhs_pipe *pipe = pkt->pipe; struct usbhs_pipe *pipe = pkt->pipe;
struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe); struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
...@@ -383,65 +276,6 @@ static void usbhsg_receive_packet_done(struct usbhs_pkt *pkt) ...@@ -383,65 +276,6 @@ static void usbhsg_receive_packet_done(struct usbhs_pkt *pkt)
usbhsg_queue_pop(uep, ureq, 0); usbhsg_queue_pop(uep, ureq, 0);
} }
static int usbhsg_try_run_receive_packet(struct usbhsg_uep *uep,
struct usbhsg_request *ureq)
{
struct usbhs_pkt *pkt = usbhsg_ureq_to_pkt(ureq);
/*
********* assume under spin lock *********
*/
return usbhs_fifo_read(pkt);
}
static int usbhsg_prepare_receive_packet(struct usbhsg_uep *uep,
struct usbhsg_request *ureq)
{
struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
/*
********* assume under spin lock *********
*/
return usbhs_fifo_prepare_read(pipe);
}
static struct usbhsg_pipe_handle usbhsg_handler_send_by_empty = {
.prepare = usbhsg_prepare_send_packet,
.try_run = usbhsg_try_run_send_packet,
};
static struct usbhsg_pipe_handle usbhsg_handler_send_by_ready = {
.prepare = usbhsg_prepare_send_packet,
.try_run = usbhsg_try_run_send_packet,
};
static struct usbhsg_pipe_handle usbhsg_handler_recv_by_ready = {
.prepare = usbhsg_prepare_receive_packet,
.try_run = usbhsg_try_run_receive_packet,
};
static struct usbhsg_pipe_handle usbhsg_handler_ctrl_stage_end = {
.prepare = usbhsg_try_run_ctrl_stage_end,
.try_run = usbhsg_try_run_ctrl_stage_end,
};
/*
* DCP pipe can NOT use "ready interrupt" for "send"
* it should use "empty" interrupt.
* see
* "Operation" - "Interrupt Function" - "BRDY Interrupt"
*
* on the other hand, normal pipe can use "ready interrupt" for "send"
* even though it is single/double buffer
*/
#define usbhsg_handler_send_ctrl usbhsg_handler_send_by_empty
#define usbhsg_handler_recv_ctrl usbhsg_handler_recv_by_ready
#define usbhsg_handler_send_packet usbhsg_handler_send_by_ready
#define usbhsg_handler_recv_packet usbhsg_handler_recv_by_ready
/* /*
* USB_TYPE_STANDARD / clear feature functions * USB_TYPE_STANDARD / clear feature functions
*/ */
...@@ -473,7 +307,7 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv, ...@@ -473,7 +307,7 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv,
usbhsg_recip_handler_std_control_done(priv, uep, ctrl); usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
usbhsg_queue_prepare(uep); usbhsg_queue_start(uep);
return 0; return 0;
} }
...@@ -580,13 +414,13 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv, ...@@ -580,13 +414,13 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
switch (stage) { switch (stage) {
case READ_DATA_STAGE: case READ_DATA_STAGE:
dcp->handler = &usbhsg_handler_send_ctrl; dcp->handler = &usbhs_fifo_push_handler;
break; break;
case WRITE_DATA_STAGE: case WRITE_DATA_STAGE:
dcp->handler = &usbhsg_handler_recv_ctrl; dcp->handler = &usbhs_fifo_pop_handler;
break; break;
case NODATA_STATUS_STAGE: case NODATA_STATUS_STAGE:
dcp->handler = &usbhsg_handler_ctrl_stage_end; dcp->handler = &usbhs_ctrl_stage_end_handler;
break; break;
default: default:
return ret; return ret;
...@@ -620,72 +454,6 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv, ...@@ -620,72 +454,6 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
return ret; return ret;
} }
static int usbhsg_irq_empty(struct usbhs_priv *priv,
struct usbhs_irq_state *irq_state)
{
struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
struct usbhsg_uep *uep;
struct usbhs_pipe *pipe;
struct device *dev = usbhsg_gpriv_to_dev(gpriv);
int i, ret;
if (!irq_state->bempsts) {
dev_err(dev, "debug %s !!\n", __func__);
return -EIO;
}
dev_dbg(dev, "irq empty [0x%04x]\n", irq_state->bempsts);
/*
* search interrupted "pipe"
* not "uep".
*/
usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
if (!(irq_state->bempsts & (1 << i)))
continue;
uep = usbhsg_pipe_to_uep(pipe);
ret = usbhsg_queue_handle(uep);
if (ret < 0)
dev_err(dev, "send error %d : %d\n", i, ret);
}
return 0;
}
static int usbhsg_irq_ready(struct usbhs_priv *priv,
struct usbhs_irq_state *irq_state)
{
struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
struct usbhsg_uep *uep;
struct usbhs_pipe *pipe;
struct device *dev = usbhsg_gpriv_to_dev(gpriv);
int i, ret;
if (!irq_state->brdysts) {
dev_err(dev, "debug %s !!\n", __func__);
return -EIO;
}
dev_dbg(dev, "irq ready [0x%04x]\n", irq_state->brdysts);
/*
* search interrupted "pipe"
* not "uep".
*/
usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
if (!(irq_state->brdysts & (1 << i)))
continue;
uep = usbhsg_pipe_to_uep(pipe);
ret = usbhsg_queue_handle(uep);
if (ret < 0)
dev_err(dev, "receive error %d : %d\n", i, ret);
}
return 0;
}
/* /*
* *
* usb_dcp_ops * usb_dcp_ops
...@@ -716,7 +484,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep) ...@@ -716,7 +484,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
{ {
struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep); struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
struct usbhsg_request *ureq; struct usbhsg_request *ureq;
int disable = 0;
/* /*
********* assume under spin lock ********* ********* assume under spin lock *********
...@@ -724,12 +491,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep) ...@@ -724,12 +491,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
usbhs_pipe_disable(pipe); usbhs_pipe_disable(pipe);
/*
* disable pipe irq
*/
usbhsg_irq_empty_ctrl(uep, disable);
usbhsg_irq_ready_ctrl(uep, disable);
while (1) { while (1) {
ureq = usbhsg_queue_get(uep); ureq = usbhsg_queue_get(uep);
if (!ureq) if (!ureq)
...@@ -782,9 +543,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep, ...@@ -782,9 +543,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
pipe->mod_private = uep; pipe->mod_private = uep;
if (usb_endpoint_dir_in(desc)) if (usb_endpoint_dir_in(desc))
uep->handler = &usbhsg_handler_send_packet; uep->handler = &usbhs_fifo_push_handler;
else else
uep->handler = &usbhsg_handler_recv_packet; uep->handler = &usbhs_fifo_pop_handler;
ret = 0; ret = 0;
} }
...@@ -879,7 +640,7 @@ static int usbhsg_ep_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -879,7 +640,7 @@ static int usbhsg_ep_queue(struct usb_ep *ep, struct usb_request *req,
usbhsg_unlock(lock, &flags); usbhsg_unlock(lock, &flags);
/******************** spin unlock ******************/ /******************** spin unlock ******************/
usbhsg_queue_prepare(uep); usbhsg_queue_start(uep);
return ret; return ret;
} }
...@@ -1006,8 +767,8 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status) ...@@ -1006,8 +767,8 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
* pipe initialize and enable DCP * pipe initialize and enable DCP
*/ */
usbhs_pipe_init(priv, usbhs_pipe_init(priv,
usbhsg_send_packet_done, usbhsg_queue_done);
usbhsg_receive_packet_done); usbhs_fifo_init(priv);
usbhsg_uep_init(gpriv); usbhsg_uep_init(gpriv);
usbhsg_dcp_enable(dcp); usbhsg_dcp_enable(dcp);
...@@ -1026,10 +787,6 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status) ...@@ -1026,10 +787,6 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
*/ */
mod->irq_dev_state = usbhsg_irq_dev_state; mod->irq_dev_state = usbhsg_irq_dev_state;
mod->irq_ctrl_stage = usbhsg_irq_ctrl_stage; mod->irq_ctrl_stage = usbhsg_irq_ctrl_stage;
mod->irq_empty = usbhsg_irq_empty;
mod->irq_ready = usbhsg_irq_ready;
mod->irq_bempsts = 0;
mod->irq_brdysts = 0;
usbhs_irq_callback_update(priv, mod); usbhs_irq_callback_update(priv, mod);
usbhsg_try_start_unlock: usbhsg_try_start_unlock:
...@@ -1059,13 +816,11 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status) ...@@ -1059,13 +816,11 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
!usbhsg_status_has(gpriv, USBHSG_STATUS_REGISTERD)) !usbhsg_status_has(gpriv, USBHSG_STATUS_REGISTERD))
goto usbhsg_try_stop_unlock; goto usbhsg_try_stop_unlock;
usbhs_fifo_quit(priv);
/* disable all irq */ /* disable all irq */
mod->irq_dev_state = NULL; mod->irq_dev_state = NULL;
mod->irq_ctrl_stage = NULL; mod->irq_ctrl_stage = NULL;
mod->irq_empty = NULL;
mod->irq_ready = NULL;
mod->irq_bempsts = 0;
mod->irq_brdysts = 0;
usbhs_irq_callback_update(priv, mod); usbhs_irq_callback_update(priv, mod);
usbhsg_dcp_disable(dcp); usbhsg_dcp_disable(dcp);
......
drivers/usb/renesas_usbhs/pipe.c
View file @ dad67397
...@@ -532,13 +532,18 @@ static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type) ...@@ -532,13 +532,18 @@ static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type)
} }
void usbhs_pipe_init(struct usbhs_priv *priv, void usbhs_pipe_init(struct usbhs_priv *priv,
void (*tx_done)(struct usbhs_pkt *pkt), void (*done)(struct usbhs_pkt *pkt))
void (*rx_done)(struct usbhs_pkt *pkt))
{ {
struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv); struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
struct device *dev = usbhs_priv_to_dev(priv);
struct usbhs_pipe *pipe; struct usbhs_pipe *pipe;
int i; int i;
if (!done) {
dev_err(dev, "no done function\n");
return;
}
/* /*
* FIXME * FIXME
* *
...@@ -565,8 +570,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv, ...@@ -565,8 +570,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv,
usbhsp_pipectrl_set(pipe, ACLRM, 0); usbhsp_pipectrl_set(pipe, ACLRM, 0);
} }
info->tx_done = tx_done; info->done = done;
info->rx_done = rx_done;
} }
struct usbhs_pipe *usbhs_pipe_malloc(struct usbhs_priv *priv, struct usbhs_pipe *usbhs_pipe_malloc(struct usbhs_priv *priv,
......
drivers/usb/renesas_usbhs/pipe.h
View file @ dad67397
...@@ -42,8 +42,7 @@ struct usbhs_pipe_info { ...@@ -42,8 +42,7 @@ struct usbhs_pipe_info {
int size; /* array size of "pipe" */ int size; /* array size of "pipe" */
int bufnmb_last; /* FIXME : driver needs good allocator */ int bufnmb_last; /* FIXME : driver needs good allocator */
void (*tx_done)(struct usbhs_pkt *pkt); void (*done)(struct usbhs_pkt *pkt);
void (*rx_done)(struct usbhs_pkt *pkt);
}; };
/* /*
...@@ -82,8 +81,7 @@ void usbhs_pipe_remove(struct usbhs_priv *priv); ...@@ -82,8 +81,7 @@ void usbhs_pipe_remove(struct usbhs_priv *priv);
int usbhs_pipe_is_dir_in(struct usbhs_pipe *pipe); int usbhs_pipe_is_dir_in(struct usbhs_pipe *pipe);
int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe); int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe);
void usbhs_pipe_init(struct usbhs_priv *priv, void usbhs_pipe_init(struct usbhs_priv *priv,
void (*tx_done)(struct usbhs_pkt *pkt), void (*done)(struct usbhs_pkt *pkt));
void (*rx_done)(struct usbhs_pkt *pkt));
int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe); int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe);
void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe); void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe);
int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe); int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7