mbox series

[GIT,PULL] TI changes for v2020.10-rc3

Message ID 20200811103237.28194-1-lokeshvutla@ti.com
State Changes Requested
Delegated to: Tom Rini
Headers show
Series [GIT,PULL] TI changes for v2020.10-rc3 | expand

Pull-request

https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3

Message

Lokesh Vutla Aug. 11, 2020, 10:32 a.m. UTC
Hi Tom,
	Please find the pull request for v2020.10-rc3 containing TI specific
changes. This should have been sent for rc2 but delayed due to some
comments in the last minute. Please look at the PR description for the
details on the PR.

Travis-CI build: https://travis-ci.org/github/lokeshvutla/u-boot/builds/716796052

The following changes since commit c045207f96f7f7ae8c7f1341111a6010e636176b:

  Prepare v2020.10-rc2 (2020-08-10 16:10:09 -0400)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3

for you to fetch changes up to ce2e881bb791dca33b122fd901820deef303f6df:

  arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port (2020-08-11 10:22:11 +0530)

----------------------------------------------------------------
Below are the major changes in this PR:
- Added support for J7200 evm
- DM_ETH and DM_USB migrations for omap3
- USB DFU and mass storage support for AM65x evm
- RTI watchdog support for K3 devices
- Fix an issue with L3 cache on K3 devices
----------------------------------------------------------------
Andrew F. Davis (1):
      arm: mach-k3: Clean non-coherent lines out of L3 cache

Dave Gerlach (1):
      arm: dts: k3-j7200: Add R5 specific dts support

Derald D. Woods (1):
      ARM: omap3: evm: Complete DM_ETH and DM_USB migrations

Faiz Abbas (14):
      mmc: am654_sdhci: Use MMC_MODES_END value instead of hardcoded value
      spl: usb: Create an API spl_usb_load()
      spl: usb: Only init usb once
      armv7R: K3: am654: Use full malloc in SPL both pre and post reloc
      arm: mach-k3: sysfw-loader: Add support to load SYSFW from USB
      arm: mach-k3: am6_init: Gate mmc related configurations with the appropriate config
      arm: mach-k3: am6_init: Do USB fixups to facilitate host and device boot modes
      arm: mach-k3: am6_init: Add support for USB boot mode
      arm: dts: k3-am654-r5-base-board: Add USB0 nodes
      arm: dts: k3-am654-base-board: Add support for USB0 in SPL
      configs: am65x_evm: Add support for DFU related configs
      configs: am65x_evm_a53: Enable USB Mass storage and DFU boot modes
      configs: Add defconfig for USB DFU bootmode
      configs: Add new config for supporting USB mass storage boot

Jan Kiszka (3):
      watchdog: Add support for K3 RTI watchdog
      arm: dts: k3: Add RTI watchdogs
      am654_sdhci: mmc fail to send stop cmd

Jean-Jacques Hiblot (1):
      arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled

Kishon Vijay Abraham I (1):
      soc: soc_ti_k3: Add device identification for J7200 SoC

Lokesh Vutla (15):
      board: ti: board_detect: Add stub functions for EEPROM detection apis
      board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is defined
      arm: mach-k3: Move mmr_unlock to a common location
      arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image
      arm: mach-k3: j721e: Add detection for j721e
      arm: mach-k3: j721e: Fix unlocking control module registers
      arm: mach-k3: j7200: Add support for SOC detection
      arm: mach-k3: j7200: Add support for storing extended boot info from ROM
      arm: mach-k3: j7200: Detect if ROM has already loaded sysfw
      board: ti: j7200: Introduce support for j7200 build targets
      board: ti: j7200: Add board detection support for j7200
      ram: k3-j721e: Relax version checks for memory controller
      arm: dts: k3-j7200: Add dts support
      configs: j7200_evm_r5: Add initial support
      configs: j7200_evm_a72: Add Initial support

Suman Anna (4):
      arm: dts: k3-am65: Fix interconnect node names
      arm: dts: k3-j721e: Fix interconnect node names
      board: ti: am65x: Update fdt fixup logic for interconnect nodes
      board: ti: j721e: Update fdt fixup logic for interconnect nodes

Vignesh Raghavendra (6):
      arm: dts: k3-j7200: Add USB related DT entries
      board: ti: j721e: Add support for HyperFlash detection
      ARM: dts: k3-j7200: Add wkup gpio node
      ARM: dts: k3-j7200: Add HyperBus and HyperFlash nodes
      ARM: dts: k3-j7200-mcu-wakeup: Add CPSW2G support
      arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port

 arch/arm/dts/Makefile                              |    4 +-
 arch/arm/dts/k3-am65-mcu.dtsi                      |    9 +
 arch/arm/dts/k3-am65.dtsi                          |    6 +-
 arch/arm/dts/k3-am654-base-board-u-boot.dtsi       |   27 +
 arch/arm/dts/k3-am654-r5-base-board.dts            |   35 +
 .../arm/dts/k3-j7200-common-proc-board-u-boot.dtsi |  133 ++
 arch/arm/dts/k3-j7200-common-proc-board.dts        |  195 ++
 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi        | 2195 ++++++++++++++++++++
 arch/arm/dts/k3-j7200-main.dtsi                    |  343 +++
 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi              |  272 +++
 arch/arm/dts/k3-j7200-r5-common-proc-board.dts     |  217 ++
 arch/arm/dts/k3-j7200-som-p0.dtsi                  |   62 +
 arch/arm/dts/k3-j7200.dtsi                         |  177 ++
 arch/arm/dts/k3-j721e-main.dtsi                    |   18 +
 arch/arm/dts/k3-j721e.dtsi                         |    4 +-
 arch/arm/dts/omap3-evm-37xx-u-boot.dtsi            |   10 +
 arch/arm/dts/omap3-evm-u-boot.dtsi                 |   10 +
 arch/arm/mach-k3/Makefile                          |    1 +
 arch/arm/mach-k3/am6_init.c                        |   80 +-
 arch/arm/mach-k3/cache.S                           |   24 +
 arch/arm/mach-k3/common.c                          |   38 +
 arch/arm/mach-k3/common.h                          |    6 +
 arch/arm/mach-k3/config.mk                         |    8 +-
 arch/arm/mach-k3/include/mach/am6_hardware.h       |    2 +
 arch/arm/mach-k3/include/mach/am6_spl.h            |    3 +-
 arch/arm/mach-k3/include/mach/hardware.h           |    8 +
 arch/arm/mach-k3/include/mach/j721e_hardware.h     |    3 +
 arch/arm/mach-k3/include/mach/sys_proto.h          |    3 +
 arch/arm/mach-k3/include/mach/sysfw-loader.h       |    4 +-
 arch/arm/mach-k3/j721e_init.c                      |   30 +-
 arch/arm/mach-k3/sysfw-loader.c                    |   67 +-
 arch/arm/mach-omap2/omap3/Kconfig                  |    3 +
 board/ti/am65x/MAINTAINERS                         |    2 +
 board/ti/am65x/evm.c                               |   10 +-
 board/ti/common/board_detect.h                     |   13 +
 board/ti/evm/evm.c                                 |   82 +-
 board/ti/j721e/Kconfig                             |   53 +
 board/ti/j721e/MAINTAINERS                         |    2 +
 board/ti/j721e/evm.c                               |   56 +-
 common/spl/spl_usb.c                               |   31 +-
 configs/am65x_evm_a53_defconfig                    |   10 +
 configs/am65x_evm_r5_usbdfu_defconfig              |  120 ++
 configs/am65x_evm_r5_usbmsc_defconfig              |  119 ++
 configs/j7200_evm_a72_defconfig                    |  173 ++
 configs/j7200_evm_r5_defconfig                     |  130 ++
 configs/omap3_evm_defconfig                        |   14 +-
 drivers/mmc/am654_sdhci.c                          |    2 +-
 drivers/mmc/mmc.c                                  |    6 +-
 drivers/ram/k3-j721e/lpddr4.c                      |   16 +-
 drivers/soc/soc_ti_k3.c                            |    4 +
 drivers/watchdog/Kconfig                           |    7 +
 drivers/watchdog/Makefile                          |    1 +
 drivers/watchdog/rti_wdt.c                         |  123 ++
 include/configs/am65x_evm.h                        |    6 +-
 include/configs/j721e_evm.h                        |    4 +-
 include/spl.h                                      |   14 +
 56 files changed, 4826 insertions(+), 169 deletions(-)
 create mode 100644 arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-common-proc-board.dts
 create mode 100644 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-main.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-r5-common-proc-board.dts
 create mode 100644 arch/arm/dts/k3-j7200-som-p0.dtsi
 create mode 100644 arch/arm/dts/k3-j7200.dtsi
 create mode 100644 arch/arm/mach-k3/cache.S
 create mode 100644 configs/am65x_evm_r5_usbdfu_defconfig
 create mode 100644 configs/am65x_evm_r5_usbmsc_defconfig
 create mode 100644 configs/j7200_evm_a72_defconfig
 create mode 100644 configs/j7200_evm_r5_defconfig
 create mode 100644 drivers/watchdog/rti_wdt.c

Comments

Tom Rini Aug. 11, 2020, 2:56 p.m. UTC | #1
On Tue, Aug 11, 2020 at 04:02:37PM +0530, Lokesh Vutla wrote:

> Hi Tom,
> 	Please find the pull request for v2020.10-rc3 containing TI specific
> changes. This should have been sent for rc2 but delayed due to some
> comments in the last minute. Please look at the PR description for the
> details on the PR.
> 
> Travis-CI build: https://travis-ci.org/github/lokeshvutla/u-boot/builds/716796052
> 
> The following changes since commit c045207f96f7f7ae8c7f1341111a6010e636176b:
> 
>   Prepare v2020.10-rc2 (2020-08-10 16:10:09 -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3
> 
> for you to fetch changes up to ce2e881bb791dca33b122fd901820deef303f6df:
> 
>   arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port (2020-08-11 10:22:11 +0530)
> 
> ----------------------------------------------------------------
> Below are the major changes in this PR:
> - Added support for J7200 evm
> - DM_ETH and DM_USB migrations for omap3
> - USB DFU and mass storage support for AM65x evm
> - RTI watchdog support for K3 devices
> - Fix an issue with L3 cache on K3 devices
> ----------------------------------------------------------------
> Andrew F. Davis (1):
>       arm: mach-k3: Clean non-coherent lines out of L3 cache
> 
> Dave Gerlach (1):
>       arm: dts: k3-j7200: Add R5 specific dts support
> 
> Derald D. Woods (1):
>       ARM: omap3: evm: Complete DM_ETH and DM_USB migrations
> 
> Faiz Abbas (14):
>       mmc: am654_sdhci: Use MMC_MODES_END value instead of hardcoded value
>       spl: usb: Create an API spl_usb_load()
>       spl: usb: Only init usb once
>       armv7R: K3: am654: Use full malloc in SPL both pre and post reloc
>       arm: mach-k3: sysfw-loader: Add support to load SYSFW from USB
>       arm: mach-k3: am6_init: Gate mmc related configurations with the appropriate config
>       arm: mach-k3: am6_init: Do USB fixups to facilitate host and device boot modes
>       arm: mach-k3: am6_init: Add support for USB boot mode
>       arm: dts: k3-am654-r5-base-board: Add USB0 nodes
>       arm: dts: k3-am654-base-board: Add support for USB0 in SPL
>       configs: am65x_evm: Add support for DFU related configs
>       configs: am65x_evm_a53: Enable USB Mass storage and DFU boot modes
>       configs: Add defconfig for USB DFU bootmode
>       configs: Add new config for supporting USB mass storage boot
> 
> Jan Kiszka (3):
>       watchdog: Add support for K3 RTI watchdog
>       arm: dts: k3: Add RTI watchdogs
>       am654_sdhci: mmc fail to send stop cmd

OK, so the last change from Jan here is:

commit 6bc290047b6e0209dd8183ce78be2f9297feb3c6
Author: Jan Kiszka <jan.kiszka@web.de>
Date:   Sat Jul 18 16:47:04 2020 +0200

    am654_sdhci: mmc fail to send stop cmd
    
    Hi all,
    
    on one device with one specific SD-card (possibly an aging one), I'm
    seeing frequent "mmc fail to send stop cmd" messages, followed by read
    errors when loading kernel and dtb. -ETIMEDOUT is returned by
    mmd_send_cmd. However, I can always resolve this by simply retrying the
    stop command like this:
    
    Hardware is our IOT2050, baseline is today's master (1c4b5038afcc) with
    board-enabling and a bunch of patches from your tree [1]. However,
    already 4d6da10ce611 exposes the problem.
    
    What could cause this?
    
    Jan
    
    [1] https://github.com/siemens/u-boot/commits/jan/iot2050

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d79cdef62ed2..2aca8d3a4d32 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -407,7 +407,11 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
 			pr_err("mmc fail to send stop cmd\n");
 #endif
-			return 0;
+			pr_err("retrying...\n");
+			if (mmc_send_cmd(mmc, &cmd, NULL)) {
+				pr_err("failed again\n");
+				return 0;
+			}
 		}
 	}
 
Which is a generic MMC change, grows everyone by a little bit and lacks
both an S-o-B from the author and Reviewed-by of the MMC maintainer.
Please drop this patch.  Thanks!
Jan Kiszka Aug. 11, 2020, 3:02 p.m. UTC | #2
On 11.08.20 16:56, Tom Rini wrote:
> On Tue, Aug 11, 2020 at 04:02:37PM +0530, Lokesh Vutla wrote:
>
>> Hi Tom,
>> 	Please find the pull request for v2020.10-rc3 containing TI specific
>> changes. This should have been sent for rc2 but delayed due to some
>> comments in the last minute. Please look at the PR description for the
>> details on the PR.
>>
>> Travis-CI build: https://travis-ci.org/github/lokeshvutla/u-boot/builds/716796052
>>
>> The following changes since commit c045207f96f7f7ae8c7f1341111a6010e636176b:
>>
>>    Prepare v2020.10-rc2 (2020-08-10 16:10:09 -0400)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3
>>
>> for you to fetch changes up to ce2e881bb791dca33b122fd901820deef303f6df:
>>
>>    arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port (2020-08-11 10:22:11 +0530)
>>
>> ----------------------------------------------------------------
>> Below are the major changes in this PR:
>> - Added support for J7200 evm
>> - DM_ETH and DM_USB migrations for omap3
>> - USB DFU and mass storage support for AM65x evm
>> - RTI watchdog support for K3 devices
>> - Fix an issue with L3 cache on K3 devices
>> ----------------------------------------------------------------
>> Andrew F. Davis (1):
>>        arm: mach-k3: Clean non-coherent lines out of L3 cache
>>
>> Dave Gerlach (1):
>>        arm: dts: k3-j7200: Add R5 specific dts support
>>
>> Derald D. Woods (1):
>>        ARM: omap3: evm: Complete DM_ETH and DM_USB migrations
>>
>> Faiz Abbas (14):
>>        mmc: am654_sdhci: Use MMC_MODES_END value instead of hardcoded value
>>        spl: usb: Create an API spl_usb_load()
>>        spl: usb: Only init usb once
>>        armv7R: K3: am654: Use full malloc in SPL both pre and post reloc
>>        arm: mach-k3: sysfw-loader: Add support to load SYSFW from USB
>>        arm: mach-k3: am6_init: Gate mmc related configurations with the appropriate config
>>        arm: mach-k3: am6_init: Do USB fixups to facilitate host and device boot modes
>>        arm: mach-k3: am6_init: Add support for USB boot mode
>>        arm: dts: k3-am654-r5-base-board: Add USB0 nodes
>>        arm: dts: k3-am654-base-board: Add support for USB0 in SPL
>>        configs: am65x_evm: Add support for DFU related configs
>>        configs: am65x_evm_a53: Enable USB Mass storage and DFU boot modes
>>        configs: Add defconfig for USB DFU bootmode
>>        configs: Add new config for supporting USB mass storage boot
>>
>> Jan Kiszka (3):
>>        watchdog: Add support for K3 RTI watchdog
>>        arm: dts: k3: Add RTI watchdogs
>>        am654_sdhci: mmc fail to send stop cmd
>
> OK, so the last change from Jan here is:
>
> commit 6bc290047b6e0209dd8183ce78be2f9297feb3c6
> Author: Jan Kiszka <jan.kiszka@web.de>
> Date:   Sat Jul 18 16:47:04 2020 +0200
>
>      am654_sdhci: mmc fail to send stop cmd
>
>      Hi all,
>
>      on one device with one specific SD-card (possibly an aging one), I'm
>      seeing frequent "mmc fail to send stop cmd" messages, followed by read
>      errors when loading kernel and dtb. -ETIMEDOUT is returned by
>      mmd_send_cmd. However, I can always resolve this by simply retrying the
>      stop command like this:
>
>      Hardware is our IOT2050, baseline is today's master (1c4b5038afcc) with
>      board-enabling and a bunch of patches from your tree [1]. However,
>      already 4d6da10ce611 exposes the problem.
>
>      What could cause this?
>
>      Jan
>
>      [1] https://github.com/siemens/u-boot/commits/jan/iot2050
>
> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> index d79cdef62ed2..2aca8d3a4d32 100644
> --- a/drivers/mmc/mmc.c
> +++ b/drivers/mmc/mmc.c
> @@ -407,7 +407,11 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
>   #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
>   			pr_err("mmc fail to send stop cmd\n");
>   #endif
> -			return 0;
> +			pr_err("retrying...\n");
> +			if (mmc_send_cmd(mmc, &cmd, NULL)) {
> +				pr_err("failed again\n");
> +				return 0;
> +			}
>   		}
>   	}
>
> Which is a generic MMC change, grows everyone by a little bit and lacks
> both an S-o-B from the author and Reviewed-by of the MMC maintainer.
> Please drop this patch.  Thanks!
>

That was an instrumentation hunk for the issue described above. Never
intended to be a patch.

Jan
Tom Rini Aug. 11, 2020, 3:11 p.m. UTC | #3
On Tue, Aug 11, 2020 at 05:02:59PM +0200, Jan Kiszka wrote:
> On 11.08.20 16:56, Tom Rini wrote:
> > On Tue, Aug 11, 2020 at 04:02:37PM +0530, Lokesh Vutla wrote:
> > 
> > > Hi Tom,
> > > 	Please find the pull request for v2020.10-rc3 containing TI specific
> > > changes. This should have been sent for rc2 but delayed due to some
> > > comments in the last minute. Please look at the PR description for the
> > > details on the PR.
> > > 
> > > Travis-CI build: https://travis-ci.org/github/lokeshvutla/u-boot/builds/716796052
> > > 
> > > The following changes since commit c045207f96f7f7ae8c7f1341111a6010e636176b:
> > > 
> > >    Prepare v2020.10-rc2 (2020-08-10 16:10:09 -0400)
> > > 
> > > are available in the Git repository at:
> > > 
> > >    https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3
> > > 
> > > for you to fetch changes up to ce2e881bb791dca33b122fd901820deef303f6df:
> > > 
> > >    arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port (2020-08-11 10:22:11 +0530)
> > > 
> > > ----------------------------------------------------------------
> > > Below are the major changes in this PR:
> > > - Added support for J7200 evm
> > > - DM_ETH and DM_USB migrations for omap3
> > > - USB DFU and mass storage support for AM65x evm
> > > - RTI watchdog support for K3 devices
> > > - Fix an issue with L3 cache on K3 devices
> > > ----------------------------------------------------------------
> > > Andrew F. Davis (1):
> > >        arm: mach-k3: Clean non-coherent lines out of L3 cache
> > > 
> > > Dave Gerlach (1):
> > >        arm: dts: k3-j7200: Add R5 specific dts support
> > > 
> > > Derald D. Woods (1):
> > >        ARM: omap3: evm: Complete DM_ETH and DM_USB migrations
> > > 
> > > Faiz Abbas (14):
> > >        mmc: am654_sdhci: Use MMC_MODES_END value instead of hardcoded value
> > >        spl: usb: Create an API spl_usb_load()
> > >        spl: usb: Only init usb once
> > >        armv7R: K3: am654: Use full malloc in SPL both pre and post reloc
> > >        arm: mach-k3: sysfw-loader: Add support to load SYSFW from USB
> > >        arm: mach-k3: am6_init: Gate mmc related configurations with the appropriate config
> > >        arm: mach-k3: am6_init: Do USB fixups to facilitate host and device boot modes
> > >        arm: mach-k3: am6_init: Add support for USB boot mode
> > >        arm: dts: k3-am654-r5-base-board: Add USB0 nodes
> > >        arm: dts: k3-am654-base-board: Add support for USB0 in SPL
> > >        configs: am65x_evm: Add support for DFU related configs
> > >        configs: am65x_evm_a53: Enable USB Mass storage and DFU boot modes
> > >        configs: Add defconfig for USB DFU bootmode
> > >        configs: Add new config for supporting USB mass storage boot
> > > 
> > > Jan Kiszka (3):
> > >        watchdog: Add support for K3 RTI watchdog
> > >        arm: dts: k3: Add RTI watchdogs
> > >        am654_sdhci: mmc fail to send stop cmd
> > 
> > OK, so the last change from Jan here is:
> > 
> > commit 6bc290047b6e0209dd8183ce78be2f9297feb3c6
> > Author: Jan Kiszka <jan.kiszka@web.de>
> > Date:   Sat Jul 18 16:47:04 2020 +0200
> > 
> >      am654_sdhci: mmc fail to send stop cmd
> > 
> >      Hi all,
> > 
> >      on one device with one specific SD-card (possibly an aging one), I'm
> >      seeing frequent "mmc fail to send stop cmd" messages, followed by read
> >      errors when loading kernel and dtb. -ETIMEDOUT is returned by
> >      mmd_send_cmd. However, I can always resolve this by simply retrying the
> >      stop command like this:
> > 
> >      Hardware is our IOT2050, baseline is today's master (1c4b5038afcc) with
> >      board-enabling and a bunch of patches from your tree [1]. However,
> >      already 4d6da10ce611 exposes the problem.
> > 
> >      What could cause this?
> > 
> >      Jan
> > 
> >      [1] https://github.com/siemens/u-boot/commits/jan/iot2050
> > 
> > diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> > index d79cdef62ed2..2aca8d3a4d32 100644
> > --- a/drivers/mmc/mmc.c
> > +++ b/drivers/mmc/mmc.c
> > @@ -407,7 +407,11 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
> >   #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
> >   			pr_err("mmc fail to send stop cmd\n");
> >   #endif
> > -			return 0;
> > +			pr_err("retrying...\n");
> > +			if (mmc_send_cmd(mmc, &cmd, NULL)) {
> > +				pr_err("failed again\n");
> > +				return 0;
> > +			}
> >   		}
> >   	}
> > 
> > Which is a generic MMC change, grows everyone by a little bit and lacks
> > both an S-o-B from the author and Reviewed-by of the MMC maintainer.
> > Please drop this patch.  Thanks!
> > 
> 
> That was an instrumentation hunk for the issue described above. Never
> intended to be a patch.

I kind of thought that might be the case from the description, thanks
for clarifying.
Lokesh Vutla Aug. 11, 2020, 3:12 p.m. UTC | #4
Hi Tom, Jan

On 11/08/20 8:32 pm, Jan Kiszka wrote:
> On 11.08.20 16:56, Tom Rini wrote:
>> On Tue, Aug 11, 2020 at 04:02:37PM +0530, Lokesh Vutla wrote:
>>
>>> Hi Tom,
>>>     Please find the pull request for v2020.10-rc3 containing TI specific
>>> changes. This should have been sent for rc2 but delayed due to some
>>> comments in the last minute. Please look at the PR description for the
>>> details on the PR.
>>>
>>> Travis-CI build:
>>> https://travis-ci.org/github/lokeshvutla/u-boot/builds/716796052
>>>
>>> The following changes since commit c045207f96f7f7ae8c7f1341111a6010e636176b:
>>>
>>>    Prepare v2020.10-rc2 (2020-08-10 16:10:09 -0400)
>>>
>>> are available in the Git repository at:
>>>
>>>    https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3
>>>
>>> for you to fetch changes up to ce2e881bb791dca33b122fd901820deef303f6df:
>>>
>>>    arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port (2020-08-11
>>> 10:22:11 +0530)
>>>
>>> ----------------------------------------------------------------
>>> Below are the major changes in this PR:
>>> - Added support for J7200 evm
>>> - DM_ETH and DM_USB migrations for omap3
>>> - USB DFU and mass storage support for AM65x evm
>>> - RTI watchdog support for K3 devices
>>> - Fix an issue with L3 cache on K3 devices
>>> ----------------------------------------------------------------
>>> Andrew F. Davis (1):
>>>        arm: mach-k3: Clean non-coherent lines out of L3 cache
>>>
>>> Dave Gerlach (1):
>>>        arm: dts: k3-j7200: Add R5 specific dts support
>>>
>>> Derald D. Woods (1):
>>>        ARM: omap3: evm: Complete DM_ETH and DM_USB migrations
>>>
>>> Faiz Abbas (14):
>>>        mmc: am654_sdhci: Use MMC_MODES_END value instead of hardcoded value
>>>        spl: usb: Create an API spl_usb_load()
>>>        spl: usb: Only init usb once
>>>        armv7R: K3: am654: Use full malloc in SPL both pre and post reloc
>>>        arm: mach-k3: sysfw-loader: Add support to load SYSFW from USB
>>>        arm: mach-k3: am6_init: Gate mmc related configurations with the
>>> appropriate config
>>>        arm: mach-k3: am6_init: Do USB fixups to facilitate host and device
>>> boot modes
>>>        arm: mach-k3: am6_init: Add support for USB boot mode
>>>        arm: dts: k3-am654-r5-base-board: Add USB0 nodes
>>>        arm: dts: k3-am654-base-board: Add support for USB0 in SPL
>>>        configs: am65x_evm: Add support for DFU related configs
>>>        configs: am65x_evm_a53: Enable USB Mass storage and DFU boot modes
>>>        configs: Add defconfig for USB DFU bootmode
>>>        configs: Add new config for supporting USB mass storage boot
>>>
>>> Jan Kiszka (3):
>>>        watchdog: Add support for K3 RTI watchdog
>>>        arm: dts: k3: Add RTI watchdogs
>>>        am654_sdhci: mmc fail to send stop cmd
>>
>> OK, so the last change from Jan here is:
>>
>> commit 6bc290047b6e0209dd8183ce78be2f9297feb3c6
>> Author: Jan Kiszka <jan.kiszka@web.de>
>> Date:   Sat Jul 18 16:47:04 2020 +0200
>>
>>      am654_sdhci: mmc fail to send stop cmd
>>
>>      Hi all,
>>
>>      on one device with one specific SD-card (possibly an aging one), I'm
>>      seeing frequent "mmc fail to send stop cmd" messages, followed by read
>>      errors when loading kernel and dtb. -ETIMEDOUT is returned by
>>      mmd_send_cmd. However, I can always resolve this by simply retrying the
>>      stop command like this:
>>
>>      Hardware is our IOT2050, baseline is today's master (1c4b5038afcc) with
>>      board-enabling and a bunch of patches from your tree [1]. However,
>>      already 4d6da10ce611 exposes the problem.
>>
>>      What could cause this?
>>
>>      Jan
>>
>>      [1] https://github.com/siemens/u-boot/commits/jan/iot2050
>>
>> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
>> index d79cdef62ed2..2aca8d3a4d32 100644
>> --- a/drivers/mmc/mmc.c
>> +++ b/drivers/mmc/mmc.c
>> @@ -407,7 +407,11 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst,
>> lbaint_t start,
>>   #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
>>               pr_err("mmc fail to send stop cmd\n");
>>   #endif
>> -            return 0;
>> +            pr_err("retrying...\n");
>> +            if (mmc_send_cmd(mmc, &cmd, NULL)) {
>> +                pr_err("failed again\n");
>> +                return 0;
>> +            }
>>           }
>>       }
>>
>> Which is a generic MMC change, grows everyone by a little bit and lacks
>> both an S-o-B from the author and Reviewed-by of the MMC maintainer.
>> Please drop this patch.  Thanks!
>>
> 
> That was an instrumentation hunk for the issue described above. Never
> intended to be a patch.

Sorry my bad. I did remove this patch from my queue, but not sure how it got here.

Tom,
	Updated the tag without this patch. Build is going on, once it completes will
send a v2.

Thanks and regards,
Lokesh

> 
> Jan
Tom Rini Aug. 11, 2020, 3:44 p.m. UTC | #5
On Tue, Aug 11, 2020 at 08:42:40PM +0530, Lokesh Vutla wrote:
> Hi Tom, Jan
> 
> On 11/08/20 8:32 pm, Jan Kiszka wrote:
> > On 11.08.20 16:56, Tom Rini wrote:
> >> On Tue, Aug 11, 2020 at 04:02:37PM +0530, Lokesh Vutla wrote:
> >>
> >>> Hi Tom,
> >>>     Please find the pull request for v2020.10-rc3 containing TI specific
> >>> changes. This should have been sent for rc2 but delayed due to some
> >>> comments in the last minute. Please look at the PR description for the
> >>> details on the PR.
> >>>
> >>> Travis-CI build:
> >>> https://travis-ci.org/github/lokeshvutla/u-boot/builds/716796052
> >>>
> >>> The following changes since commit c045207f96f7f7ae8c7f1341111a6010e636176b:
> >>>
> >>>    Prepare v2020.10-rc2 (2020-08-10 16:10:09 -0400)
> >>>
> >>> are available in the Git repository at:
> >>>
> >>>    https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.10-rc3
> >>>
> >>> for you to fetch changes up to ce2e881bb791dca33b122fd901820deef303f6df:
> >>>
> >>>    arm: dts: k3-j7200-common-proc-board: Enable CPSW2G port (2020-08-11
> >>> 10:22:11 +0530)
> >>>
> >>> ----------------------------------------------------------------
> >>> Below are the major changes in this PR:
> >>> - Added support for J7200 evm
> >>> - DM_ETH and DM_USB migrations for omap3
> >>> - USB DFU and mass storage support for AM65x evm
> >>> - RTI watchdog support for K3 devices
> >>> - Fix an issue with L3 cache on K3 devices
> >>> ----------------------------------------------------------------
> >>> Andrew F. Davis (1):
> >>>        arm: mach-k3: Clean non-coherent lines out of L3 cache
> >>>
> >>> Dave Gerlach (1):
> >>>        arm: dts: k3-j7200: Add R5 specific dts support
> >>>
> >>> Derald D. Woods (1):
> >>>        ARM: omap3: evm: Complete DM_ETH and DM_USB migrations
> >>>
> >>> Faiz Abbas (14):
> >>>        mmc: am654_sdhci: Use MMC_MODES_END value instead of hardcoded value
> >>>        spl: usb: Create an API spl_usb_load()
> >>>        spl: usb: Only init usb once
> >>>        armv7R: K3: am654: Use full malloc in SPL both pre and post reloc
> >>>        arm: mach-k3: sysfw-loader: Add support to load SYSFW from USB
> >>>        arm: mach-k3: am6_init: Gate mmc related configurations with the
> >>> appropriate config
> >>>        arm: mach-k3: am6_init: Do USB fixups to facilitate host and device
> >>> boot modes
> >>>        arm: mach-k3: am6_init: Add support for USB boot mode
> >>>        arm: dts: k3-am654-r5-base-board: Add USB0 nodes
> >>>        arm: dts: k3-am654-base-board: Add support for USB0 in SPL
> >>>        configs: am65x_evm: Add support for DFU related configs
> >>>        configs: am65x_evm_a53: Enable USB Mass storage and DFU boot modes
> >>>        configs: Add defconfig for USB DFU bootmode
> >>>        configs: Add new config for supporting USB mass storage boot
> >>>
> >>> Jan Kiszka (3):
> >>>        watchdog: Add support for K3 RTI watchdog
> >>>        arm: dts: k3: Add RTI watchdogs
> >>>        am654_sdhci: mmc fail to send stop cmd
> >>
> >> OK, so the last change from Jan here is:
> >>
> >> commit 6bc290047b6e0209dd8183ce78be2f9297feb3c6
> >> Author: Jan Kiszka <jan.kiszka@web.de>
> >> Date:   Sat Jul 18 16:47:04 2020 +0200
> >>
> >>      am654_sdhci: mmc fail to send stop cmd
> >>
> >>      Hi all,
> >>
> >>      on one device with one specific SD-card (possibly an aging one), I'm
> >>      seeing frequent "mmc fail to send stop cmd" messages, followed by read
> >>      errors when loading kernel and dtb. -ETIMEDOUT is returned by
> >>      mmd_send_cmd. However, I can always resolve this by simply retrying the
> >>      stop command like this:
> >>
> >>      Hardware is our IOT2050, baseline is today's master (1c4b5038afcc) with
> >>      board-enabling and a bunch of patches from your tree [1]. However,
> >>      already 4d6da10ce611 exposes the problem.
> >>
> >>      What could cause this?
> >>
> >>      Jan
> >>
> >>      [1] https://github.com/siemens/u-boot/commits/jan/iot2050
> >>
> >> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> >> index d79cdef62ed2..2aca8d3a4d32 100644
> >> --- a/drivers/mmc/mmc.c
> >> +++ b/drivers/mmc/mmc.c
> >> @@ -407,7 +407,11 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst,
> >> lbaint_t start,
> >>   #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
> >>               pr_err("mmc fail to send stop cmd\n");
> >>   #endif
> >> -            return 0;
> >> +            pr_err("retrying...\n");
> >> +            if (mmc_send_cmd(mmc, &cmd, NULL)) {
> >> +                pr_err("failed again\n");
> >> +                return 0;
> >> +            }
> >>           }
> >>       }
> >>
> >> Which is a generic MMC change, grows everyone by a little bit and lacks
> >> both an S-o-B from the author and Reviewed-by of the MMC maintainer.
> >> Please drop this patch.  Thanks!
> >>
> > 
> > That was an instrumentation hunk for the issue described above. Never
> > intended to be a patch.
> 
> Sorry my bad. I did remove this patch from my queue, but not sure how it got here.
> 
> Tom,
> 	Updated the tag without this patch. Build is going on, once it completes will
> send a v2.

OK, thanks.  BTW, if you put the changes in the tag message I don't have
to copy/paste them in :)