linux-next: manual merge of the usb-gadget tree with Linus' tree

linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/musb/omap2430.c and drivers/usb/musb/tusb6010.c between
commit c1f01be4060b ("usb: musb: fix resource passed from glue layer to
musb") from Linus' tree and commit c1a7d67c1901 ("usb: musb: use
dev_get_platdata()") from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/musb/omap2430.c
index f44e8b5,ebb46ec..0000000
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@@ -481,8 -481,8 +481,8 @@@ static u64 omap2430_dmamask = DMA_BIT_M
  
  static int omap2430_probe(struct platform_device *pdev)
  {
 -	struct resource			musb_resources[2];
 +	struct resource			musb_resources[3];
- 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);
  	struct omap_musb_board_data	*data;
  	struct platform_device		*musb;
  	struct omap2430_glue		*glue;
diff --cc drivers/usb/musb/tusb6010.c
index 6f8a9ca,2196ee6..0000000
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@@ -1156,8 -1156,8 +1156,8 @@@ static u64 tusb_dmamask = DMA_BIT_MASK(
  
  static int tusb_probe(struct platform_device *pdev)
  {
 -	struct resource musb_resources[2];
 +	struct resource musb_resources[3];
- 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);
  	struct platform_device		*musb;
  	struct tusb6010_glue		*glue;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
include/uapi/linux/usb/functionfs.h between commit 091221417853 ("usb:
gadget: f_fs: resurect usb_functionfs_descs_head structure") from
Linus' tree and commit f0175ab51993 ("usb: gadget: f_fs: OS descriptors
support") from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/uapi/linux/usb/functionfs.h
index 24b68c59dcf8,b66fae77c08c..000000000000
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@@ -33,14 -32,37 +32,45 @@@ struct usb_endpoint_descriptor_no_audi
  	__u8  bInterval;
  } __attribute__((packed));
  
+ /* MS OS Descriptor header */
+ struct usb_os_desc_header {
+ 	__u8	interface;
+ 	__le32	dwLength;
+ 	__le16	bcdVersion;
+ 	__le16	wIndex;
+ 	union {
+ 		struct {
+ 			__u8	bCount;
+ 			__u8	Reserved;
+ 		};
+ 		__le16	wCount;
+ 	};
+ } __attribute__((packed));
+ 
+ struct usb_ext_compat_desc {
+ 	__u8	bFirstInterfaceNumber;
+ 	__u8	Reserved1;
+ 	__u8	CompatibleID[8];
+ 	__u8	SubCompatibleID[8];
+ 	__u8	Reserved2[6];
+ };
+ 
+ struct usb_ext_prop_desc {
+ 	__le32	dwSize;
+ 	__le32	dwPropertyDataType;
+ 	__le16	wPropertyNameLength;
+ } __attribute__((packed));
+ 
+ #ifndef __KERNEL__
+ 
 +/* Legacy format, deprecated as of 3.14. */
 +struct usb_functionfs_descs_head {
 +	__le32 magic;
 +	__le32 length;
 +	__le32 fs_count;
 +	__le32 hs_count;
 +} __attribute__((packed, deprecated));
 +
  /*
   * Descriptors format:
   *

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the usb-gadget tree with Linus' tree

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

On Thu, Jul 17, 2014 at 04:52:38PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> include/uapi/linux/usb/functionfs.h between commit 091221417853 ("usb:
> gadget: f_fs: resurect usb_functionfs_descs_head structure") from
> Linus' tree and commit f0175ab51993 ("usb: gadget: f_fs: OS descriptors
> support") from the usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks that is the correct fix :-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/gadget/Makefile, drivers/usb/gadget/legacy/Makefile and
drivers/usb/gadget/function/Makefile between commit 5d19703822da ("usb:
gadget: remove $(PWD) in ccflags-y") from Linus' tree and commit
fa31409a82ee ("usb: gadget: use $(srctree) instead of $(PWD) for
includes") from the usb-gadget tree.

I fixed it up (I used the version from the usb-gadget tree) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from
Linus' tree and commit ea2fdf842365 ("usb: phy: samsung: remove old
common USB PHY code") from the usb-gadget tree.

I fixed it up (the latter just removed the file, so I did that) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the usb-gadget tree with Linus' tree

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 636 bytes --]

On Mon, Sep 08, 2014 at 05:13:11PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
> phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from
> Linus' tree and commit ea2fdf842365 ("usb: phy: samsung: remove old
> common USB PHY code") from the usb-gadget tree.
> 
> I fixed it up (the latter just removed the file, so I did that) and can
> carry the fix as necessary (no action is required).

Thank you. Guess I'll just merge current -rc in my next branch :-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in:

  drivers/usb/gadget/function/f_mass_storage.c

between commit:

  dc9217b69dd6 ("usb: gadget: f_mass_storage: Serialize wake and sleep execution")

from Linus' tree and commit:

  225785aec726 ("USB: f_mass_storage: improve memory barriers and synchronization")

from the usb-gadget tree.

I fixed it up (I used the usb-gadget tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

Hi all,

Today's linux-next merge of the usb-gadget tree got a conflict in:

  drivers/usb/cdns3/gadget.c

between commit:

  f616c3bda47e ("usb: cdns3: Fix dequeue implementation.")

from Linus' tree and commit:

  4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")

from the usb-gadget tree.

I have no idea how to handle this, so I just dropped the usb-gadget tree
for today - it clearly needs to be rebased on Linus' tree anyway (it
has a few shared patches that are different commits and there are
further changes to this file in Linus' tree as well.  rebasing onto
(or merging with) v5.5-rc6 may be useful.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the usb-gadget tree with Linus' tree

[Geert Uytterhoeven]

[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]

Hi Stephen,

On Fri, Jan 10, 2020 at 5:33 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
>   drivers/usb/cdns3/gadget.c
>
> between commit:
>
>   f616c3bda47e ("usb: cdns3: Fix dequeue implementation.")
>
> from Linus' tree and commit:
>
>   4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")
>
> from the usb-gadget tree.
>
> I have no idea how to handle this, so I just dropped the usb-gadget tree
> for today - it clearly needs to be rebased on Linus' tree anyway (it
> has a few shared patches that are different commits and there are
> further changes to this file in Linus' tree as well.  rebasing onto
> (or merging with) v5.5-rc6 may be useful.

For today's renesas-drivers, I'm using the attached conflict resolution.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[-- Attachment #2: drivers_usb_cdns3_gadget.c.diff --]
[-- Type: text/x-patch, Size: 2936 bytes --]

diff --cc drivers/usb/cdns3/gadget.c
index e4820bd4b5791381,4dadc85ad992f08a..0000000000000000
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@@ -1145,37 -1436,56 +1436,64 @@@ static void cdns3_transfer_completed(st
  		request = cdns3_next_request(&priv_ep->pending_req_list);
  		priv_req = to_cdns3_request(request);
  
 +		trb = priv_ep->trb_pool + priv_ep->dequeue;
 +
 +		/* Request was dequeued and TRB was changed to TRB_LINK. */
 +		if (TRB_FIELD_TO_TYPE(trb->control) == TRB_LINK) {
 +			trace_cdns3_complete_trb(priv_ep, trb);
 +			cdns3_move_deq_to_next_trb(priv_req);
 +		}
 +
- 		/* Re-select endpoint. It could be changed by other CPU during
- 		 * handling usb_gadget_giveback_request.
- 		 */
- 		cdns3_select_ep(priv_dev, priv_ep->endpoint.address);
+ 		if (!request->stream_id) {
+ 			/* Re-select endpoint. It could be changed by other CPU
+ 			 * during handling usb_gadget_giveback_request.
+ 			 */
+ 			cdns3_select_ep(priv_dev, priv_ep->endpoint.address);
  
- 		if (!cdns3_request_handled(priv_ep, priv_req))
- 			goto prepare_next_td;
+ 			if (!cdns3_request_handled(priv_ep, priv_req))
+ 				goto prepare_next_td;
  
- 		trb = priv_ep->trb_pool + priv_ep->dequeue;
- 		trace_cdns3_complete_trb(priv_ep, trb);
+ 			trb = priv_ep->trb_pool + priv_ep->dequeue;
+ 			trace_cdns3_complete_trb(priv_ep, trb);
+ 
+ 			if (trb != priv_req->trb)
+ 				dev_warn(priv_dev->dev,
+ 					 "request_trb=0x%p, queue_trb=0x%p\n",
+ 					 priv_req->trb, trb);
  
- 		if (trb != priv_req->trb)
- 			dev_warn(priv_dev->dev,
- 				 "request_trb=0x%p, queue_trb=0x%p\n",
- 				 priv_req->trb, trb);
+ 			request->actual = TRB_LEN(le32_to_cpu(trb->length));
+ 			cdns3_move_deq_to_next_trb(priv_req);
+ 			cdns3_gadget_giveback(priv_ep, priv_req, 0);
  
- 		request->actual = TRB_LEN(le32_to_cpu(trb->length));
- 		cdns3_move_deq_to_next_trb(priv_req);
- 		cdns3_gadget_giveback(priv_ep, priv_req, 0);
+ 			if (priv_ep->type != USB_ENDPOINT_XFER_ISOC &&
+ 			    TRBS_PER_SEGMENT == 2)
+ 				break;
+ 		} else {
+ 			/* Re-select endpoint. It could be changed by other CPU
+ 			 * during handling usb_gadget_giveback_request.
+ 			 */
+ 			cdns3_select_ep(priv_dev, priv_ep->endpoint.address);
+ 
+ 			trb = priv_ep->trb_pool;
+ 			trace_cdns3_complete_trb(priv_ep, trb);
  
- 		if (priv_ep->type != USB_ENDPOINT_XFER_ISOC &&
- 		    TRBS_PER_SEGMENT == 2)
+ 			if (trb != priv_req->trb)
+ 				dev_warn(priv_dev->dev,
+ 					 "request_trb=0x%p, queue_trb=0x%p\n",
+ 					 priv_req->trb, trb);
+ 
+ 			request->actual += TRB_LEN(le32_to_cpu(trb->length));
+ 
+ 			if (!request->num_sgs ||
+ 			    (request->num_sgs == (priv_ep->stream_sg_idx + 1))) {
+ 				priv_ep->stream_sg_idx = 0;
+ 				cdns3_gadget_giveback(priv_ep, priv_req, 0);
+ 			} else {
+ 				priv_ep->stream_sg_idx++;
+ 				cdns3_ep_run_stream_transfer(priv_ep, request);
+ 			}
  			break;
+ 		}
  	}
  	priv_ep->flags &= ~EP_PENDING_REQUEST;
  

RE: linux-next: manual merge of the usb-gadget tree with Linus' tree

[Pawel Laszczak]

Hi,

It's looks like the same issue reported by Stephen Rothwell some days ago. 

As I know, the first version of patch "usb: cdns3: Add streams support to cadence USB3 DRD driver" 
was generated by Jayshri based on Felipe repository
(https://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git/log/?h=next - branch next). 

I don't know why, but there is a lack of  "usb: cdns3: Fix dequeue implementation.".  
It's looks like from some reasons Felipe missed this patch in his next repo.

The latest version "[PATCH v2] usb: cdns3: Add streams support to cadence USB3 DRD driver" 
has been created based on top of linux-next.git master branch. 

In my opinion Felipe has to revert the 4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")
commit then should apply f616c3bda47e ("usb: cdns3: Fix dequeue implementation.") and again apply 
 new version of "usb: cdns3: Add streams support to cadence USB3 DRD driver" patch . 

Regards,
Pawell

>
>Hi Stephen,
>
>On Fri, Jan 10, 2020 at 5:33 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the usb-gadget tree got a conflict in:
>>
>>   drivers/usb/cdns3/gadget.c
>>
>> between commit:
>>
>>   f616c3bda47e ("usb: cdns3: Fix dequeue implementation.")
>>
>> from Linus' tree and commit:
>>
>>   4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")
>>
>> from the usb-gadget tree.
>>
>> I have no idea how to handle this, so I just dropped the usb-gadget tree
>> for today - it clearly needs to be rebased on Linus' tree anyway (it
>> has a few shared patches that are different commits and there are
>> further changes to this file in Linus' tree as well.  rebasing onto
>> (or merging with) v5.5-rc6 may be useful.
>
>For today's renesas-drivers, I'm using the attached conflict resolution.
>
>Gr{oetje,eeting}s,
>
>                        Geert
>
>--
>Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
>In personal conversations with technical people, I call myself a hacker. But
>when I'm talking to journalists I just say "programmer" or something like that.
>                                -- Linus Torvalds

Re: linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

Hi Geert,

On Tue, 14 Jan 2020 09:41:57 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> For today's renesas-drivers, I'm using the attached conflict resolution.

Thanks, I will use your resolution from now on.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the usb-gadget tree with Linus' tree

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]


Hi,

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
>   drivers/usb/cdns3/gadget.c
>
> between commit:
>
>   f616c3bda47e ("usb: cdns3: Fix dequeue implementation.")
>
> from Linus' tree and commit:
>
>   4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")
>
> from the usb-gadget tree.
>
> I have no idea how to handle this, so I just dropped the usb-gadget tree
> for today - it clearly needs to be rebased on Linus' tree anyway (it
> has a few shared patches that are different commits and there are
> further changes to this file in Linus' tree as well.  rebasing onto
> (or merging with) v5.5-rc6 may be useful.

I'll rebase on top of Greg's tree

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]