[v4.4.40] patch backport error

[v4.4.40] patch backport error

[Bin Liu]

Hi,

I am unable to figure out what was happening, but there seems to be a
patch backport error in v4.4.40.

Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
sensible value) is backported from upstream
eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has

+               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;

but eaa496ffaaf19591fe471a36cef366146eeb9153 has

+               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);

they are not consistant.

I haven't checked v4.9 yet, not sure if this happens there too.

Regards,
-Bin.

Re: [v4.4.40] patch backport error

[Felipe Balbi]

hi,

Bin Liu <b-liu@ti.com> writes:
> I am unable to figure out what was happening, but there seems to be a
> patch backport error in v4.4.40.
>
> Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
> sensible value) is backported from upstream
> eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
>
> +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
>
> but eaa496ffaaf19591fe471a36cef366146eeb9153 has
>
> +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
>
> they are not consistant.
>
> I haven't checked v4.9 yet, not sure if this happens there too.

oh-oh. you're correct, I sent the wrong patch :-(

I'll send a correct patch tomorrow. Greg, do you want a revert followed
by correct patch, or just fix-up patch?

-- 
balbi

Re: [v4.4.40] patch backport error

[Bin Liu]

On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote:
> 
> hi,
> 
> Bin Liu <b-liu@ti.com> writes:
> > I am unable to figure out what was happening, but there seems to be a
> > patch backport error in v4.4.40.
> >
> > Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
> > sensible value) is backported from upstream
> > eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
> >
> > +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
> >
> > but eaa496ffaaf19591fe471a36cef366146eeb9153 has
> >
> > +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
> >
> > they are not consistant.
> >
> > I haven't checked v4.9 yet, not sure if this happens there too.
> 
> oh-oh. you're correct, I sent the wrong patch :-(

so you sent a separate set to stable? I thought it was directly back
ported from upstream which has the correct version?

Regards,
-Bin.

> 
> I'll send a correct patch tomorrow. Greg, do you want a revert followed
> by correct patch, or just fix-up patch?
> 
> -- 
> balbi

Re: [v4.4.40] patch backport error

[Bin Liu]

On Wed, Jan 11, 2017 at 11:13:05AM -0600, Bin Liu wrote:
> Hi,
> 
> I am unable to figure out what was happening, but there seems to be a
> patch backport error in v4.4.40.
> 
> Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
> sensible value) is backported from upstream
> eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
> 
> +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
> 
> but eaa496ffaaf19591fe471a36cef366146eeb9153 has
> 
> +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
> 
> they are not consistant.
> 
> I haven't checked v4.9 yet, not sure if this happens there too.

v4.9 seem to have the same issue too.

Regards,
-Bin.

Re: [v4.4.40] patch backport error

[Felipe Balbi]

Hi,

Bin Liu <b-liu@ti.com> writes:
> On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote:
>> 
>> hi,
>> 
>> Bin Liu <b-liu@ti.com> writes:
>> > I am unable to figure out what was happening, but there seems to be a
>> > patch backport error in v4.4.40.
>> >
>> > Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
>> > sensible value) is backported from upstream
>> > eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
>> >
>> > +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
>> >
>> > but eaa496ffaaf19591fe471a36cef366146eeb9153 has
>> >
>> > +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
>> >
>> > they are not consistant.
>> >
>> > I haven't checked v4.9 yet, not sure if this happens there too.
>> 
>> oh-oh. you're correct, I sent the wrong patch :-(
>
> so you sent a separate set to stable? I thought it was directly back
> ported from upstream which has the correct version?

well, it had to be manually backported to do away with the dependency on
usb_endpoint_maxp_mult(), but I ended up reimplementing
usb_endpoint_maxp() correctly instead of actually extracting high bits
of wMaxPacketSize

-- 
balbi

Re: [v4.4.40] patch backport error

[Greg Kroah-Hartman]

On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote:
> 
> hi,
> 
> Bin Liu <b-liu@ti.com> writes:
> > I am unable to figure out what was happening, but there seems to be a
> > patch backport error in v4.4.40.
> >
> > Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
> > sensible value) is backported from upstream
> > eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
> >
> > +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
> >
> > but eaa496ffaaf19591fe471a36cef366146eeb9153 has
> >
> > +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
> >
> > they are not consistant.
> >
> > I haven't checked v4.9 yet, not sure if this happens there too.
> 
> oh-oh. you're correct, I sent the wrong patch :-(
> 
> I'll send a correct patch tomorrow. Greg, do you want a revert followed
> by correct patch, or just fix-up patch?

A simple fixup is fine.

thanks,

greg k-h

Re: [v4.4.40] patch backport error

[Greg Kroah-Hartman]

On Wed, Jan 11, 2017 at 09:17:02PM +0100, Greg Kroah-Hartman wrote:
> On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote:
> > 
> > hi,
> > 
> > Bin Liu <b-liu@ti.com> writes:
> > > I am unable to figure out what was happening, but there seems to be a
> > > patch backport error in v4.4.40.
> > >
> > > Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
> > > sensible value) is backported from upstream
> > > eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
> > >
> > > +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
> > >
> > > but eaa496ffaaf19591fe471a36cef366146eeb9153 has
> > >
> > > +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
> > >
> > > they are not consistant.
> > >
> > > I haven't checked v4.9 yet, not sure if this happens there too.
> > 
> > oh-oh. you're correct, I sent the wrong patch :-(
> > 
> > I'll send a correct patch tomorrow. Greg, do you want a revert followed
> > by correct patch, or just fix-up patch?
> 
> A simple fixup is fine.

Hm, no, let me go revert these now, as I'm doing a release in an hour or
so.  Can you send me the "correct" backported patches, I'll take them
for the next round of stable kernels.

thanks,

greg k-h