On Fri, Mar 13, 2015 at 11:01:47AM +0800, Peter Chen wrote:
> On Thu, Mar 12, 2015 at 10:30:21AM +0800, Li Jun wrote:
> > From: Li Jun <b47624@xxxxxxxxxxxxx>
> >
> > Peripheral answers OTG status selector request from host according to
> > host_request_flag of gadget, length is 1.
> >
> > Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx>
> > ---
> > drivers/usb/chipidea/udc.c | 28 +++++++++++++++++++++++-----
> > 1 file changed, 23 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> > index 4254792..eed66bc 100644
> > --- a/drivers/usb/chipidea/udc.c
> > +++ b/drivers/usb/chipidea/udc.c
> > @@ -831,7 +831,17 @@ __acquires(hwep->lock)
> > return -ENOMEM;
> >
> > req->complete = isr_get_status_complete;
> > - req->length = 2;
> > + if (setup->wIndex == OTG_STS_SELECTOR) {
>
> It seems you define OTG_STS_SELECTOR at your 4/5, move it
> to this one to avoid 'git bisect' problem.
>
I will resolve this.
Li Jun
> > + if (ci_otg_is_fsm_mode(ci)) {
> > + req->length = 1;
> > + } else {
> > + retval = -ENOTSUPP;
> > + goto err_free_req;
> > + }
>
> If we don't support it, why not stall it?
>
This error handling will stall/halt it, isn't it?
Li Jun
> > + } else {
> > + req->length = 2;
> > + }
> > +
> > req->buf = kzalloc(req->length, gfp_flags);
> > if (req->buf == NULL) {
> > retval = -ENOMEM;
> > @@ -839,8 +849,15 @@ __acquires(hwep->lock)
> > }
> >
> > if ((setup->bRequestType & USB_RECIP_MASK) == USB_RECIP_DEVICE) {
> > - *(u16 *)req->buf = (ci->remote_wakeup << 1) |
> > - ci->gadget.is_selfpowered;
> > + if (setup->wIndex == OTG_STS_SELECTOR) {
> > + if (ci->gadget.host_request_flag)
> > + *(u8 *)req->buf = HOST_REQUEST_FLAG;
> > + else
> > + *(u8 *)req->buf = 0;
> > + } else {
> > + *(u16 *)req->buf = (ci->remote_wakeup << 1) |
> > + ci->gadget.is_selfpowered;
> > + }
> > } else if ((setup->bRequestType & USB_RECIP_MASK) \
> > == USB_RECIP_ENDPOINT) {
> > dir = (le16_to_cpu(setup->wIndex) & USB_ENDPOINT_DIR_MASK) ?
> > @@ -1018,8 +1035,9 @@ __acquires(ci->lock)
> > type != (USB_DIR_IN|USB_RECIP_ENDPOINT) &&
> > type != (USB_DIR_IN|USB_RECIP_INTERFACE))
> > goto delegate;
> > - if (le16_to_cpu(req.wLength) != 2 ||
> > - le16_to_cpu(req.wValue) != 0)
> > + if ((le16_to_cpu(req.wLength) != 2 &&
> > + le16_to_cpu(req.wLength) != 1) ||
> > + le16_to_cpu(req.wValue) != 0)
> > break;
> > err = isr_get_status_response(ci, &req);
> > break;
> > --
> > 1.7.9.5
> >
>
> --
>
> Best Regards,
> Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
