diff mbox

[U-Boot,v2] ARM: zynq: disable CONFIG_SYS_MALLOC_F to fix MMC boot

Message ID 1428470750-13260-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada April 8, 2015, 5:25 a.m. UTC
Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
if DM is on), Zynq MMC boot hangs up after printing the following:

    U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
    mmc boot
    reading system.dtb

Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
Zynq MMC boot.

We are planning to have the v2015.04 release in a few days.
I know this is a defensive fixup, but what I can do now is to add
   # CONFIG_SYS_MALLOC_F is not set
to every Zynq defconfig file to get back the original behavior.

Tested on:
  - Zedboard
  - ZC706 board

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Simon Glass <sjg@chromium.org>
---

This problem is urgent!

If we cannot find the better solution, please apply this patch
by the v2015.04 release.
^^^^^^^^^^^^^^^^^^^^^^^


Changes in v2:
  - Fix the commit subject.
      s/CONFIG_SYS_MALLOC_F_LEN/CONFIG_SYS_MALLOC_F/

 configs/zynq_microzed_defconfig    | 1 +
 configs/zynq_zc70x_defconfig       | 1 +
 configs/zynq_zc770_xm010_defconfig | 1 +
 configs/zynq_zc770_xm012_defconfig | 1 +
 configs/zynq_zc770_xm013_defconfig | 1 +
 configs/zynq_zed_defconfig         | 1 +
 configs/zynq_zybo_defconfig        | 1 +
 7 files changed, 7 insertions(+)

Comments

Michal Simek April 8, 2015, 8:03 a.m. UTC | #1
On 04/08/2015 07:25 AM, Masahiro Yamada wrote:
> Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
> if DM is on), Zynq MMC boot hangs up after printing the following:
> 
>     U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
>     mmc boot
>     reading system.dtb
> 
> Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
> not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
> CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
> anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
> Zynq MMC boot.
> 
> We are planning to have the v2015.04 release in a few days.
> I know this is a defensive fixup, but what I can do now is to add
>    # CONFIG_SYS_MALLOC_F is not set
> to every Zynq defconfig file to get back the original behavior.
> 
> Tested on:
>   - Zedboard
>   - ZC706 board
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Simon Glass <sjg@chromium.org>
> ---
> 
> This problem is urgent!
> 
> If we cannot find the better solution, please apply this patch
> by the v2015.04 release.
> ^^^^^^^^^^^^^^^^^^^^^^^

Tested-by: Michal Simek <michal.simek@xilinx.com>

Tom: Can you please add it to your tree?

Thanks,
Michal
Simon Glass April 8, 2015, 12:30 p.m. UTC | #2
Hi,

On 8 April 2015 at 02:03, Michal Simek <michal.simek@xilinx.com> wrote:
> On 04/08/2015 07:25 AM, Masahiro Yamada wrote:
>> Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
>> if DM is on), Zynq MMC boot hangs up after printing the following:
>>
>>     U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
>>     mmc boot
>>     reading system.dtb
>>
>> Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
>> not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
>> CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
>> anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
>> Zynq MMC boot.
>>
>> We are planning to have the v2015.04 release in a few days.
>> I know this is a defensive fixup, but what I can do now is to add
>>    # CONFIG_SYS_MALLOC_F is not set
>> to every Zynq defconfig file to get back the original behavior.
>>
>> Tested on:
>>   - Zedboard
>>   - ZC706 board
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> Cc: Michal Simek <michal.simek@xilinx.com>
>> Cc: Simon Glass <sjg@chromium.org>
>> ---
>>
>> This problem is urgent!
>>
>> If we cannot find the better solution, please apply this patch
>> by the v2015.04 release.
>> ^^^^^^^^^^^^^^^^^^^^^^^
>
> Tested-by: Michal Simek <michal.simek@xilinx.com>
>
> Tom: Can you please add it to your tree?

That's fine, although if we can wait a few days we might figure out
the root cause. See the other thread for context.

Regards,
Simon
Tom Rini April 8, 2015, 2:04 p.m. UTC | #3
On Wed, Apr 08, 2015 at 10:03:28AM +0200, Michal Simek wrote:
> On 04/08/2015 07:25 AM, Masahiro Yamada wrote:
> > Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
> > if DM is on), Zynq MMC boot hangs up after printing the following:
> > 
> >     U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
> >     mmc boot
> >     reading system.dtb
> > 
> > Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
> > not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
> > CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
> > anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
> > Zynq MMC boot.
> > 
> > We are planning to have the v2015.04 release in a few days.
> > I know this is a defensive fixup, but what I can do now is to add
> >    # CONFIG_SYS_MALLOC_F is not set
> > to every Zynq defconfig file to get back the original behavior.
> > 
> > Tested on:
> >   - Zedboard
> >   - ZC706 board
> > 
> > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> > Cc: Michal Simek <michal.simek@xilinx.com>
> > Cc: Simon Glass <sjg@chromium.org>
> > ---
> > 
> > This problem is urgent!
> > 
> > If we cannot find the better solution, please apply this patch
> > by the v2015.04 release.
> > ^^^^^^^^^^^^^^^^^^^^^^^
> 
> Tested-by: Michal Simek <michal.simek@xilinx.com>
> 
> Tom: Can you please add it to your tree?

Do you want to do a PR with this (or wait a bit for Simon and Masahiro
to root-cause) and your maintainers update or should I just grab that
directly too?  Thanks!
Michal Simek April 8, 2015, 5:59 p.m. UTC | #4
On 04/08/2015 04:04 PM, Tom Rini wrote:
> On Wed, Apr 08, 2015 at 10:03:28AM +0200, Michal Simek wrote:
>> On 04/08/2015 07:25 AM, Masahiro Yamada wrote:
>>> Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
>>> if DM is on), Zynq MMC boot hangs up after printing the following:
>>>
>>>     U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
>>>     mmc boot
>>>     reading system.dtb
>>>
>>> Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
>>> not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
>>> CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
>>> anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
>>> Zynq MMC boot.
>>>
>>> We are planning to have the v2015.04 release in a few days.
>>> I know this is a defensive fixup, but what I can do now is to add
>>>    # CONFIG_SYS_MALLOC_F is not set
>>> to every Zynq defconfig file to get back the original behavior.
>>>
>>> Tested on:
>>>   - Zedboard
>>>   - ZC706 board
>>>
>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>> Cc: Michal Simek <michal.simek@xilinx.com>
>>> Cc: Simon Glass <sjg@chromium.org>
>>> ---
>>>
>>> This problem is urgent!
>>>
>>> If we cannot find the better solution, please apply this patch
>>> by the v2015.04 release.
>>> ^^^^^^^^^^^^^^^^^^^^^^^
>>
>> Tested-by: Michal Simek <michal.simek@xilinx.com>
>>
>> Tom: Can you please add it to your tree?
> 
> Do you want to do a PR with this (or wait a bit for Simon and Masahiro
> to root-cause) and your maintainers update or should I just grab that
> directly too?  Thanks!

Please grab both patches directly to your tree. When Simon or Masahiro
find out root cause then we can simple revert it. This seems to be the
best strategy for now.

Thanks,
Michal
Masahiro Yamada April 9, 2015, 10:09 a.m. UTC | #5
Hi Tom, Michal,

2015-04-09 2:59 GMT+09:00 Michal Simek <michal.simek@xilinx.com>:
> On 04/08/2015 04:04 PM, Tom Rini wrote:
>> On Wed, Apr 08, 2015 at 10:03:28AM +0200, Michal Simek wrote:
>>> On 04/08/2015 07:25 AM, Masahiro Yamada wrote:
>>>> Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
>>>> if DM is on), Zynq MMC boot hangs up after printing the following:
>>>>
>>>>     U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
>>>>     mmc boot
>>>>     reading system.dtb
>>>>
>>>> Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
>>>> not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
>>>> CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
>>>> anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
>>>> Zynq MMC boot.
>>>>
>>>> We are planning to have the v2015.04 release in a few days.
>>>> I know this is a defensive fixup, but what I can do now is to add
>>>>    # CONFIG_SYS_MALLOC_F is not set
>>>> to every Zynq defconfig file to get back the original behavior.
>>>>
>>>> Tested on:
>>>>   - Zedboard
>>>>   - ZC706 board
>>>>
>>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>>> Cc: Michal Simek <michal.simek@xilinx.com>
>>>> Cc: Simon Glass <sjg@chromium.org>
>>>> ---
>>>>
>>>> This problem is urgent!
>>>>
>>>> If we cannot find the better solution, please apply this patch
>>>> by the v2015.04 release.
>>>> ^^^^^^^^^^^^^^^^^^^^^^^
>>>
>>> Tested-by: Michal Simek <michal.simek@xilinx.com>
>>>
>>> Tom: Can you please add it to your tree?
>>
>> Do you want to do a PR with this (or wait a bit for Simon and Masahiro
>> to root-cause) and your maintainers update or should I just grab that
>> directly too?  Thanks!
>
> Please grab both patches directly to your tree. When Simon or Masahiro
> find out root cause then we can simple revert it. This seems to be the
> best strategy for now.

I agree.
Tom Rini April 9, 2015, 11:37 a.m. UTC | #6
On Wed, Apr 08, 2015 at 02:25:50PM +0900, Masahiro Yamada wrote:

> Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
> if DM is on), Zynq MMC boot hangs up after printing the following:
> 
>     U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
>     mmc boot
>     reading system.dtb
> 
> Prior to commit 326a682358c1, Zynq boards enabled CONFIG_DM, but
> not CONFIG_SYS_MALLOC_F.  That commit forcibly turned on
> CONFIG_SYS_MALLOC_F.  I have not figured out the root cause, but
> anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
> Zynq MMC boot.
> 
> We are planning to have the v2015.04 release in a few days.
> I know this is a defensive fixup, but what I can do now is to add
>    # CONFIG_SYS_MALLOC_F is not set
> to every Zynq defconfig file to get back the original behavior.
> 
> Tested on:
>   - Zedboard
>   - ZC706 board
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 39a7f6b..b6bca82 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -3,6 +3,7 @@  CONFIG_ARM=y
 CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_MICROZED=y
 CONFIG_OF_CONTROL=y
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index a8ef97f..44f3ae0 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -4,6 +4,7 @@  CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC70X=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index ecd245a..d689857 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -5,6 +5,7 @@  CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC770=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 341a4d8..9745d21 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -5,6 +5,7 @@  CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC770=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index ee08a9f..924efb4 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -5,6 +5,7 @@  CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC770=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 2500d84..01fa723 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -4,6 +4,7 @@  CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZED=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index c9d0121..f1001f1 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -4,6 +4,7 @@  CONFIG_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZYBO=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y