Re: [PATCH] usb: chipidea: Properly mark little endian descriptors

[Peter Chen]

On Wed, Sep 14, 2016 at 10:37:40AM +0800, Peter Chen wrote:
> On Tue, Sep 13, 2016 at 04:06:31PM -0700, Stephen Boyd wrote:
> > The DMA descriptors are little endian, and we do a pretty good
> > job of handling them with the proper le32_to_cpu() markings, but
> > we don't actually mark them as __le32. This means checkers like
> > sparse can't easily find new bugs. Let's mark the members of
> > structures properly and fix the few places where we're missing
> > conversions.
> > 
> > Cc: Peter Chen <peter.chen@xxxxxxx>
> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > Signed-off-by: Stephen Boyd <stephen.boyd@xxxxxxxxxx>
> > ---
> >  drivers/usb/chipidea/udc.c |  6 +++---
> >  drivers/usb/chipidea/udc.h | 12 ++++++------
> >  2 files changed, 9 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> > index 6acf4dba395e..61a65d1d05f2 100644
> > --- a/drivers/usb/chipidea/udc.c
> > +++ b/drivers/usb/chipidea/udc.c
> > @@ -364,7 +364,7 @@ static int add_td_to_list(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq,
> >  		if (hwreq->req.length == 0
> >  				|| hwreq->req.length % hwep->ep.maxpacket)
> >  			mul++;
> > -		node->ptr->token |= mul << __ffs(TD_MULTO);
> > +		node->ptr->token |= cpu_to_le32(mul << __ffs(TD_MULTO));
> >  	}
> >  
> >  	temp = (u32) (hwreq->req.dma + hwreq->req.actual);
> > @@ -503,7 +503,7 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
> >  		if (hwreq->req.length == 0
> >  				|| hwreq->req.length % hwep->ep.maxpacket)
> >  			mul++;
> > -		hwep->qh.ptr->cap |= mul << __ffs(QH_MULT);
> > +		hwep->qh.ptr->cap |= cpu_to_le32(mul << __ffs(QH_MULT));
> >  	}
> >  
> >  	wmb();   /* synchronize before ep prime */
> > @@ -530,7 +530,7 @@ static void free_pending_td(struct ci_hw_ep *hwep)
> >  static int reprime_dtd(struct ci_hdrc *ci, struct ci_hw_ep *hwep,
> >  					   struct td_node *node)
> >  {
> > -	hwep->qh.ptr->td.next = node->dma;
> > +	hwep->qh.ptr->td.next = cpu_to_le32(node->dma);
> >  	hwep->qh.ptr->td.token &=
> >  		cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE));
> >  
> > diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h
> > index e66df0020bd4..2ecd1174d66c 100644
> > --- a/drivers/usb/chipidea/udc.h
> > +++ b/drivers/usb/chipidea/udc.h
> > @@ -22,11 +22,11 @@
> >  /* DMA layout of transfer descriptors */
> >  struct ci_hw_td {
> >  	/* 0 */
> > -	u32 next;
> > +	__le32 next;
> >  #define TD_TERMINATE          BIT(0)
> >  #define TD_ADDR_MASK          (0xFFFFFFEUL << 5)
> >  	/* 1 */
> > -	u32 token;
> > +	__le32 token;
> >  #define TD_STATUS             (0x00FFUL <<  0)
> >  #define TD_STATUS_TR_ERR      BIT(3)
> >  #define TD_STATUS_DT_ERR      BIT(5)
> > @@ -36,7 +36,7 @@ struct ci_hw_td {
> >  #define TD_IOC                BIT(15)
> >  #define TD_TOTAL_BYTES        (0x7FFFUL << 16)
> >  	/* 2 */
> > -	u32 page[5];
> > +	__le32 page[5];
> >  #define TD_CURR_OFFSET        (0x0FFFUL <<  0)
> >  #define TD_FRAME_NUM          (0x07FFUL <<  0)
> >  #define TD_RESERVED_MASK      (0x0FFFUL <<  0)
> > @@ -45,18 +45,18 @@ struct ci_hw_td {
> >  /* DMA layout of queue heads */
> >  struct ci_hw_qh {
> >  	/* 0 */
> > -	u32 cap;
> > +	__le32 cap;
> >  #define QH_IOS                BIT(15)
> >  #define QH_MAX_PKT            (0x07FFUL << 16)
> >  #define QH_ZLT                BIT(29)
> >  #define QH_MULT               (0x0003UL << 30)
> >  #define QH_ISO_MULT(x)		((x >> 11) & 0x03)
> >  	/* 1 */
> > -	u32 curr;
> > +	__le32 curr;
> >  	/* 2 - 8 */
> >  	struct ci_hw_td		td;
> >  	/* 9 */
> > -	u32 RESERVED;
> > +	__le32 RESERVED;
> >  	struct usb_ctrlrequest   setup;
> >  } __attribute__ ((packed, aligned(4)));
> >  
> > -- 

I am afraid I can't apply for testing

Applying: usb: chipidea: Properly mark little endian descriptors
fatal: sha1 information is lacking or useless
(drivers/usb/chipidea/udc.c).
error: could not build fake ancestor
Patch failed at 0001 usb: chipidea: Properly mark little endian
descriptors
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Would you please rebase my ci-for-usb-next branch?

-- 

Best Regards,
Peter Chen