u-boot-usb/master

GIT PULL Marek Vasut 3 participants 9 messages Sep 17, 2012 – Sep 21, 2012

Share & tools

Marek Vasut

author

2012-09-17 17:52 UTC #0 lore raw

I'm not sure if we want them in current release or next, I'll leave that to you to decide. I don't see much danger for current though.

The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721:

Merge branch 'master' of git://git.denx.de/u-boot-avr32 (2012-09-04 09:17:27
+0200)

are available in the git repository at:

git://git.denx.de/u-boot-usb.git master

for you to fetch changes up to 8187c2dcbd3e47ecfef406468c8eee1fe746b8e7:

usb: do explicit unaligned accesses (2012-09-06 08:02:08 +0200)

----------------------------------------------------------------
Lucas Stach (5):
usb: lowlevel interface change to support multiple controllers
usb: ehci: rework to take advantage of new lowlevel interface
usb: add support for multiple usb controllers
tegra20: port to new ehci interface
usb: do explicit unaligned accesses

?ukasz Majewski (2):
dfu:usb: Support for ext4
dfu:usb:fix: Read the "filesize" environment variable only when file read

 arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c       |    4 +--
 arch/arm/cpu/armv7/tegra20/usb.c              |   15 +++------
 arch/arm/include/asm/arch-tegra20/usb.h       |    4 +--
 arch/arm/include/asm/ehci-omap.h              |   10 +++++-
 arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c |    4 +--
 arch/powerpc/cpu/mpc5xxx/usb_ohci.c           |    4 +--
 arch/powerpc/cpu/ppc4xx/usb_ohci.c            |    4 +--
 arch/sparc/cpu/leon3/usb_uhci.c               |    4 +--
 arch/sparc/lib/bootm.c                        |    2 +-
 board/htkw/mcx/mcx.c                          |    6 ++--
 board/mpl/common/usb_uhci.c                   |    4 +--
 board/technexion/twister/twister.c            |    6 ++--
 board/teejet/mt_ventoux/mt_ventoux.c          |    6 ++--
 board/ti/beagle/beagle.c                      |    6 ++--
 board/ti/panda/panda.c                        |    6 ++--
 common/cmd_usb.c                              |   16 ++++++---
 common/usb.c                                  |  108 
+++++++++++++++++++++++++++++++++----------------------------
 common/usb_hub.c                              |   16 +++++----
 common/usb_storage.c                          |    2 +-
 drivers/dfu/dfu_mmc.c                         |   34 +++++++++++++++----
 drivers/usb/eth/usb_ether.c                   |    2 +-
 drivers/usb/host/ehci-armada100.c             |   15 ++++-----
 drivers/usb/host/ehci-atmel.c                 |   11 +++----
 drivers/usb/host/ehci-core.h                  |   29 -----------------
 drivers/usb/host/ehci-exynos.c                |   15 ++++-----
 drivers/usb/host/ehci-fsl.c                   |   11 +++----
 drivers/usb/host/ehci-hcd.c                   |  131 
+++++++++++++++++++++++++++++++++++++++++---------------------------------
 drivers/usb/host/ehci-ixp4xx.c                |   15 ++++-----
 drivers/usb/host/ehci-marvell.c               |   15 ++++-----
 drivers/usb/host/ehci-mpc512x.c               |   25 ++++++--------
 drivers/usb/host/ehci-mx5.c                   |   11 +++----
 drivers/usb/host/ehci-mx6.c                   |   11 +++----
 drivers/usb/host/ehci-mxc.c                   |   11 +++----
 drivers/usb/host/ehci-mxs.c                   |   28 +++++++++-------
 drivers/usb/host/ehci-omap.c                  |   10 +++---
 drivers/usb/host/ehci-pci.c                   |   15 ++++-----
 drivers/usb/host/ehci-ppc4xx.c                |   11 +++----
 drivers/usb/host/ehci-tegra.c                 |   14 ++++----
 drivers/usb/host/ehci-vct.c                   |    9 +++---
 drivers/usb/host/ehci.h                       |    4 +--
 drivers/usb/host/isp116x-hcd.c                |    4 +--
 drivers/usb/host/ohci-hcd.c                   |    4 +--
 drivers/usb/host/r8a66597-hcd.c               |    4 +--
 drivers/usb/host/sl811-hcd.c                  |    4 +--
 drivers/usb/musb/musb_hcd.c                   |    4 +--
 include/usb.h                                 |   10 ++++--
 include/usb/mv_udc.h                          |    2 +-
 47 files changed, 352 insertions(+), 334 deletions(-)
 delete mode 100644 drivers/usb/host/ehci-core.h

Tom Rini

2012-09-17 18:46 UTC #1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 3 lines · Marek Vasut

I'm not sure if we want them in current release or next, I'll leave that to you to decide. I don't see much danger for current though.

I believe all of this made it by the merge window and looks good. But in the future please only pull request code you believe to be ready for mainline. If you aren't sure, test it more, review it more and be sure. I'm relying on all of the custodians and their judgement of what is, and is not, ready to go. Thanks!

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQV2/qAAoJENk4IS6UOR1WlDcP+QExUWs63LzKcahlUrOsFftZ 1kx06ZquDPYPt2suR54VxV81bo7Iuf3i/XO6NU/jOQpBBPsuixB8ij1oRGB/glpd H05QckOhh8FYJYvoXpVEctHN2z/Tm3PcWR1gWfcVC8RmtDASpn8pxzLBC9x3iiSe qD0z8JBvSBghC5F/u7LW8twDXyDitL7VZEE59sbzKrSvpHW/nH+1rMbvQzXX57QQ abogaI+XNNJWUskm7BRXqfE5tPwE2pABXkVXv7pFEqMAXl53iJVWBEvskFyHsBwv UdzCxMHMs3ktbBpAX1vtBxsCPIW0Egc1pLdq9CZxisTHsaQ0C6fUcxYIJFHlSiaB dhCZfMhp+v90HdDm8p5ZhDJPEwUosYVGUqiSqgVQLcgFT3xfsq7uP1JsAIay6jDG DtlKMKkFOkiQgM1lt7RP6DnG9CyHojqOFUQ5Rlv7dP7e3o2utf5F51pyPGvrOR3S HOIVS/MH9AIPNrNeVywYmROPCBtOmESCsHogDpY/iil/qRgL0+YFUumWc2vadRvT MoL81OwLBmMDOfC6X6krz4XYswHIAhHGWyoOrMo+KZQIFrQxZOYoqNGGvsh5lklc dDwAaOl0HCEOGuv53oi/UrdR/gcNlt3L+obhPzngJjRUwavns2i6M2MPqPsakTE0 13vCk0tMCfQ7yARkiT/6
=Dnsj
-----END PGP SIGNATURE-----

Marek Vasut

author

2012-09-17 19:05 UTC #2 lore raw

Dear Tom Rini,

Quoted 6 lines · Marek Vasut

Quoted 3 lines
I'm not sure if we want them in current release or next, I'll leave that to you to decide. I don't see much danger for current though.
I believe all of this made it by the merge window and looks good.

It's been stuck in there for a while, yes.

Quoted 5 lines

But
in the future please only pull request code you believe to be ready for mainline. If you aren't sure, test it more, review it more and be sure. I'm relying on all of the custodians and their judgement of what is, and is not, ready to go. Thanks!

Best regards,
Marek Vasut

Tom Rini

2012-09-17 20:21 UTC #3 lore raw

In reply to Marek Vasut

Quoted 72 lines · Marek Vasut

I'm not sure if we want them in current release or next, I'll leave that to you to decide. I don't see much danger for current though.

The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721:

Merge branch 'master' of git://git.denx.de/u-boot-avr32 (2012-09-04 09:17:27
+0200)

are available in the git repository at:

git://git.denx.de/u-boot-usb.git master

for you to fetch changes up to 8187c2dcbd3e47ecfef406468c8eee1fe746b8e7:

usb: do explicit unaligned accesses (2012-09-06 08:02:08 +0200)

??ukasz Majewski (2):
dfu:usb: Support for ext4
dfu:usb:fix: Read the "filesize" environment variable only when file read

 arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c       |    4 +--
 arch/arm/cpu/armv7/tegra20/usb.c              |   15 +++------
 arch/arm/include/asm/arch-tegra20/usb.h       |    4 +--
 arch/arm/include/asm/ehci-omap.h              |   10 +++++-
 arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c |    4 +--
 arch/powerpc/cpu/mpc5xxx/usb_ohci.c           |    4 +--
 arch/powerpc/cpu/ppc4xx/usb_ohci.c            |    4 +--
 arch/sparc/cpu/leon3/usb_uhci.c               |    4 +--
 arch/sparc/lib/bootm.c                        |    2 +-
 board/htkw/mcx/mcx.c                          |    6 ++--
 board/mpl/common/usb_uhci.c                   |    4 +--
 board/technexion/twister/twister.c            |    6 ++--
 board/teejet/mt_ventoux/mt_ventoux.c          |    6 ++--
 board/ti/beagle/beagle.c                      |    6 ++--
 board/ti/panda/panda.c                        |    6 ++--
 common/cmd_usb.c                              |   16 ++++++---
 common/usb.c                                  |  108 
+++++++++++++++++++++++++++++++++----------------------------
 common/usb_hub.c                              |   16 +++++----
 common/usb_storage.c                          |    2 +-
 drivers/dfu/dfu_mmc.c                         |   34 +++++++++++++++----
 drivers/usb/eth/usb_ether.c                   |    2 +-
 drivers/usb/host/ehci-armada100.c             |   15 ++++-----
 drivers/usb/host/ehci-atmel.c                 |   11 +++----
 drivers/usb/host/ehci-core.h                  |   29 -----------------
 drivers/usb/host/ehci-exynos.c                |   15 ++++-----
 drivers/usb/host/ehci-fsl.c                   |   11 +++----
 drivers/usb/host/ehci-hcd.c                   |  131 
+++++++++++++++++++++++++++++++++++++++++---------------------------------
 drivers/usb/host/ehci-ixp4xx.c                |   15 ++++-----
 drivers/usb/host/ehci-marvell.c               |   15 ++++-----
 drivers/usb/host/ehci-mpc512x.c               |   25 ++++++--------
 drivers/usb/host/ehci-mx5.c                   |   11 +++----
 drivers/usb/host/ehci-mx6.c                   |   11 +++----
 drivers/usb/host/ehci-mxc.c                   |   11 +++----
 drivers/usb/host/ehci-mxs.c                   |   28 +++++++++-------
 drivers/usb/host/ehci-omap.c                  |   10 +++---
 drivers/usb/host/ehci-pci.c                   |   15 ++++-----
 drivers/usb/host/ehci-ppc4xx.c                |   11 +++----
 drivers/usb/host/ehci-tegra.c                 |   14 ++++----
 drivers/usb/host/ehci-vct.c                   |    9 +++---
 drivers/usb/host/ehci.h                       |    4 +--
 drivers/usb/host/isp116x-hcd.c                |    4 +--

Quoted 8 lines

 drivers/usb/host/ohci-hcd.c                   |    4 +--
 drivers/usb/host/r8a66597-hcd.c               |    4 +--
 drivers/usb/host/sl811-hcd.c                  |    4 +--
 drivers/usb/musb/musb_hcd.c                   |    4 +--
 include/usb.h                                 |   10 ++++--
 include/usb/mv_udc.h                          |    2 +-
 47 files changed, 352 insertions(+), 334 deletions(-)
 delete mode 100644 drivers/usb/host/ehci-core.h

This breaks at least:
ARM: m28evk apx4devkit sc_sps_1 mx28evk
PowerPC: Everything that uses ehci-fsl.c, the first of which I saw was P2020RDB_36BIT but there's approx 141 boards total broken with MAKEALL -a powerpc.

Rejected, please re-work.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120917/53c20a05/attachment.pgp>

Marek Vasut

author

2012-09-20 22:05 UTC #4 lore raw

The following changes since commit 5fb29f3c48d26981b117b08286bc16ec99d4ca0b:

Merge branch 'ext4' (2012-09-20 11:27:35 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-usb.git master

for you to fetch changes up to 93ad908c43ed5d8e3e546dd22fa08b668c5090d9:

usb: do explicit unaligned accesses (2012-09-21 00:05:00 +0200)

----------------------------------------------------------------
Lucas Stach (1):
usb: do explicit unaligned accesses

?ukasz Majewski (2):
dfu:usb: Support for ext4
dfu:usb:fix: Read the "filesize" environment variable only when file read

 common/usb_hub.c            |   14 +++++++++-----
 drivers/dfu/dfu_mmc.c       |   34 +++++++++++++++++++++++++++-------
 drivers/usb/host/ehci-hcd.c |    7 +++++--
 3 files changed, 41 insertions(+), 14 deletions(-)

Tom Rini

2012-09-21 17:59 UTC #5 lore raw

Quoted 17 lines · Marek Vasut

The following changes since commit 5fb29f3c48d26981b117b08286bc16ec99d4ca0b:
Merge branch 'ext4' (2012-09-20 11:27:35 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 93ad908c43ed5d8e3e546dd22fa08b668c5090d9:
usb: do explicit unaligned accesses (2012-09-21 00:05:00 +0200)
----------------------------------------------------------------
Lucas Stach (1):
usb: do explicit unaligned accesses

Quoted 8 lines

??ukasz Majewski (2):
dfu:usb: Support for ext4
dfu:usb:fix: Read the "filesize" environment variable only when file read
 common/usb_hub.c            |   14 +++++++++-----
 drivers/dfu/dfu_mmc.c       |   34 +++++++++++++++++++++++++++-------
 drivers/usb/host/ehci-hcd.c |    7 +++++--
 3 files changed, 41 insertions(+), 14 deletions(-)

I've applied this. But please note:
Testing edminiv2 on -00600-g50d924b
Fri Sep 21 10:57:25 MST 2012
Configuring for edminiv2 board...
text data bss dec hex filename
195013 3536 86692 285241 45a39 edminiv2/u-boot
ehci-hcd.c: In function 'ehci_submit_async':
ehci-hcd.c:291:2: warning: #warning CONFIG_SYS_MALLOC_LEN may be too small for EHCI [-Wcpp]

--------------------- SUMMARY ---------------------------- Boards compiled: 1
Boards with warnings but no errors: 1 ( edminiv2 )
----------------------------------------------------------

Albert, this is your platform.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120921/75c21fed/attachment.pgp>

Marek Vasut

author

2012-09-21 18:05 UTC #6 lore raw

Dear Tom Rini,

Quoted 35 lines · Marek Vasut

Quoted 19 lines
The following changes since commit 5fb29f3c48d26981b117b08286bc16ec99d4ca0b:
Merge branch 'ext4' (2012-09-20 11:27:35 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 93ad908c43ed5d8e3e546dd22fa08b668c5090d9:
usb: do explicit unaligned accesses (2012-09-21 00:05:00 +0200)
----------------------------------------------------------------
Lucas Stach (1):
usb: do explicit unaligned accesses
??ukasz Majewski (2):
dfu:usb: Support for ext4
dfu:usb:fix: Read the "filesize" environment variable only when file read
Quoted 4 lines
 common/usb_hub.c            |   14 +++++++++-----
 drivers/dfu/dfu_mmc.c       |   34 +++++++++++++++++++++++++++-------
 drivers/usb/host/ehci-hcd.c |    7 +++++--
 3 files changed, 41 insertions(+), 14 deletions(-)
I've applied this. But please note:
Testing edminiv2 on -00600-g50d924b
Fri Sep 21 10:57:25 MST 2012
Configuring for edminiv2 board...
text data bss dec hex filename
195013 3536 86692 285241 45a39 edminiv2/u-boot
ehci-hcd.c: In function 'ehci_submit_async':
ehci-hcd.c:291:2: warning: #warning CONFIG_SYS_MALLOC_LEN may be too small for EHCI [-Wcpp]

Quoted 6 lines

--------------------- SUMMARY ---------------------------- Boards compiled: 1
Boards with warnings but no errors: 1 ( edminiv2 )
----------------------------------------------------------
Albert, this is your platform.

Did this explode only now? This warning was added a while ago.

Best regards,
Marek Vasut

Tom Rini

2012-09-21 18:13 UTC #7 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 23 lines · Marek Vasut

Dear Tom Rini,
Quoted 21 lines · Marek Vasut
Quoted 20 lines
The following changes since commit 5fb29f3c48d26981b117b08286bc16ec99d4ca0b: Merge branch 'ext4' (2012-09-20 11:27:35 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to 93ad908c43ed5d8e3e546dd22fa08b668c5090d9: usb: do explicit unaligned accesses (2012-09-21 00:05:00 +0200)
----------------------------------------------------------------

Lucas Stach (1):

Quoted 19 lines

Quoted 19 lines
Quoted 10 lines
usb: do explicit unaligned accesses
??ukasz Majewski (2): dfu:usb: Support for ext4 dfu:usb:fix:
Read the "filesize" environment variable only when file read
common/usb_hub.c            |   14 +++++++++----- 
drivers/dfu/dfu_mmc.c       |   34 
+++++++++++++++++++++++++++------- drivers/usb/host/ehci-hcd.c
| 7 +++++-- 3 files changed, 41 insertions(+), 14
deletions(-)
I've applied this. But please note: Testing edminiv2 on -00600-g50d924b Fri Sep 21 10:57:25 MST 2012 Configuring for
edminiv2 board... text data bss dec hex filename
195013 3536 86692 285241 45a39 edminiv2/u-boot
ehci-hcd.c: In function 'ehci_submit_async': ehci-hcd.c:291:2:
warning: #warning CONFIG_SYS_MALLOC_LEN may be too small for EHCI [-Wcpp]

Quoted 8 lines

Quoted 6 lines
--------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with warnings but no errors: 1 ( edminiv2 )
----------------------------------------------------------
Albert, this is your platform.
Did this explode only now? This warning was added a while ago.

Yes, it's one of the differences in my logs before and after.

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQXK5eAAoJENk4IS6UOR1WX0UP/AxJfosIF/EXmQrOadNe4ZEL tpEVmYKnjA30DH2apC0xyoHMDdnSRJ/zsmsyg7/QypiB0det2kTkrzPHsmwUmKGs c0xnETPTj/uKRYwJSi8mbhmtIMkTdHA3q4dp6VQRMmUpCEr2CdrVOl8pIt1C6g0h qoRSsbGdhbhN7f1PpeAOzvxbRebBPx+ImGMP9dfjYCy2rMaEDQjukXVlVRFtZtTF QfWki6kEPa5P5Km+ccK1CKJ6GHeP/cbwstyId6XmKoDWfCEY5ZkljxKrYb64xPnd vofWsX0Ji2qkLbYsJMv+K2j5QVl+4y6NDlI/5ftkZOAXL9m5E8EBccwUSSsiOXe9 7Zl3xTFeld12JqJpZC77o9zYBuc6Or3wS0pirPy3XtC2mJsLH/jSx50F6cjrMVX2 X407rZ9yBtogZErM298vd4VZqaN2IbMYqBiY747QJ1w94hui89Ls7MYBibA8mdsN DBL5zWQC8uBERmedAVp2lTIAF6EQ4AluDK6yO4zva1OMa3RRmY0g3fMCEXCsDlDi S90LMHk88pdzzMM7wJB7k3twd4o+GDIAUNkIW4Eho+fXtegMR+FTvyiYKPrrelNB qf46ZTgGOtRjcX76jajRjU2Nuy4pI33AWjETLf1ZBlFQ5OPr2IyV5taj/z5cwYw3 BMC18TaPL9nlL4KPmP6+
=Zz98
-----END PGP SIGNATURE-----

Albert ARIBAUD

2012-09-21 20:22 UTC #8 lore raw

Hi Tom, Marek,

Quoted 13 lines · Tom Rini

Quoted 13 lines
Quoted 13 lines
I've applied this. But please note: Testing edminiv2 on -00600-g50d924b Fri Sep 21 10:57:25 MST 2012 Configuring for
edminiv2 board... text data bss dec hex filename
195013 3536 86692 285241 45a39 edminiv2/u-boot
ehci-hcd.c: In function 'ehci_submit_async': ehci-hcd.c:291:2:
warning: #warning CONFIG_SYS_MALLOC_LEN may be too small for EHCI [-Wcpp]
--------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with warnings but no errors: 1 ( edminiv2 )
----------------------------------------------------------

Quoted 5 lines

Quoted 3 lines
Quoted 1 line
Albert, this is your platform.
Did this explode only now? This warning was added a while ago.
Yes, it's one of the differences in my logs before and after.

I've just seen it while merging u-boot/master for regression before requestion pull of ARM. Bumping up to 256KB makes the warning disappear; I'll be running tests on the board once I am done with Tom's and my pull reqs.

Amicalement,

Signature · 1 line

Albert.