[U-Boot] [PATCH 0/2] mmc: Fix partition table init regression

[U-Boot] [PATCH 0/2] mmc: Fix partition table init regression

[Andre Przywara]

Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
in the 2019.01-rc1 merge window moved the partition init call to the
generic DM layer, leaving every non-DM driver behind. As the result all
Allwinner boards now don't read the partition table automatically
anymore:
=> fatls mmc 0
** Unrecognized filesystem type **
=> fatload mmc 0 $kernel_addr_r Image-4.20-rc3
** Unrecognized filesystem type **

A quick workaround is to explicitly read the partition table, but this is
still a regression, as it breaks existing scripts and workflows:
==========
=> mmc part

Partition Map for MMC device 0  --   Partition Type: DOS

Part    Start Sector    Num Sectors     UUID            Type
  1     8192            30873600        00000000-01     0c
=> fatls mmc 0
   852304   xen
 23544320   Image-4.20-rc3

2 file(s), 0 dir(s)
==========

These two patches are the minimal version to fix this problem, by bringing
the implicit part_init() call back just for non-DM MMC drivers.
Patch 1 is needed to keep the H6 SPL below the size limit.

The whole SPL_LIBDISK_SUPPORT symbol is now somewhat obsolete and needs
some proper fixing, but this needs more discussion and testing and
is probably nothing for this release still.

Thanks,
Andre.

Andre Przywara (2):
  sunxi: drop default SPL_LIBDISK_SUPPORT enablement
  mmc: bring back partition init for non-DM MMC drivers

 arch/arm/Kconfig  | 1 -
 drivers/mmc/mmc.c | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

-- 
2.14.5

[U-Boot] [PATCH 1/2] sunxi: drop default SPL_LIBDISK_SUPPORT enablement

[Andre Przywara]

There is no code for using partition labels in the Allwinner SPL port.
Even so the name is slightly misleading, CONFIG_SPL_LIBDISK_SUPPORT was
meant to guard partition code for the SPL.

Remove the "imply" line in the Kconfig to make this obvious and avoid
unneeded code inclusions, helping to keep the H6 SPL code small.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 arch/arm/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cb7ec58079..5e1aaf50f1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -874,7 +874,6 @@ config ARCH_SUNXI
 	imply PRE_CONSOLE_BUFFER
 	imply SPL_GPIO_SUPPORT
 	imply SPL_LIBCOMMON_SUPPORT
-	imply SPL_LIBDISK_SUPPORT
 	imply SPL_LIBGENERIC_SUPPORT
 	imply SPL_MMC_SUPPORT if MMC
 	imply SPL_POWER_SUPPORT
-- 
2.14.5

[U-Boot] [PATCH 1/2] sunxi: drop default SPL_LIBDISK_SUPPORT enablement

[Simon Glass]

On Mon, 17 Dec 2018 at 03:07, Andre Przywara <andre.przywara@arm.com> wrote:
>
> There is no code for using partition labels in the Allwinner SPL port.
> Even so the name is slightly misleading, CONFIG_SPL_LIBDISK_SUPPORT was
> meant to guard partition code for the SPL.
>
> Remove the "imply" line in the Kconfig to make this obvious and avoid
> unneeded code inclusions, helping to keep the H6 SPL code small.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
>  arch/arm/Kconfig | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [U-Boot, 1/2] sunxi: drop default SPL_LIBDISK_SUPPORT enablement

[Tom Rini]

On Mon, Dec 17, 2018 at 10:05:44AM +0000, Andre Przywara wrote:

> There is no code for using partition labels in the Allwinner SPL port.
> Even so the name is slightly misleading, CONFIG_SPL_LIBDISK_SUPPORT was
> meant to guard partition code for the SPL.
> 
> Remove the "imply" line in the Kconfig to make this obvious and avoid
> unneeded code inclusions, helping to keep the H6 SPL code small.
> 
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190109/33387f79/attachment.sig>

[U-Boot] [PATCH 2/2] mmc: bring back partition init for non-DM MMC drivers

[Andre Przywara]

Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
removed the call to part_init() in mmc.c, as this is done by the DM_MMC
framework.
However Allwinner is (still) relying on a non-DM MMC driver, so we are
now missing the implicit partition init, leading to failing MMC accesses
due to the missing partition information.

Bring the call back just for non-DM MMC driver to fix this regression.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 drivers/mmc/mmc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index f5c821e308..d858127132 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2449,6 +2449,10 @@ static int mmc_startup(struct mmc *mmc)
 	bdesc->revision[0] = 0;
 #endif
 
+#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
+	part_init(bdesc);
+#endif
+
 	return 0;
 }
 
-- 
2.14.5

[U-Boot] [PATCH 2/2] mmc: bring back partition init for non-DM MMC drivers

[Simon Glass]

kOn Mon, 17 Dec 2018 at 03:07, Andre Przywara <andre.przywara@arm.com> wrote:
>
> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
> removed the call to part_init() in mmc.c, as this is done by the DM_MMC
> framework.
> However Allwinner is (still) relying on a non-DM MMC driver, so we are
> now missing the implicit partition init, leading to failing MMC accesses
> due to the missing partition information.
>
> Bring the call back just for non-DM MMC driver to fix this regression.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
>  drivers/mmc/mmc.c | 4 ++++
>  1 file changed, 4 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 2/2] mmc: bring back partition init for non-DM MMC drivers

[Soeren Moch]

On 05.01.19 02:56, Simon Glass wrote:
> kOn Mon, 17 Dec 2018 at 03:07, Andre Przywara <andre.przywara@arm.com> wrote:
>> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
>> removed the call to part_init() in mmc.c, as this is done by the DM_MMC
>> framework.
>> However Allwinner is (still) relying on a non-DM MMC driver, so we are
>> now missing the implicit partition init, leading to failing MMC accesses
>> due to the missing partition information.
>>
>> Bring the call back just for non-DM MMC driver to fix this regression.
>>
>> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
>> ---
>>  drivers/mmc/mmc.c | 4 ++++
>>  1 file changed, 4 insertions(+)
> Reviewed-by: Simon Glass <sjg@chromium.org>

This also fixes MMC support on a tbs2910 board.

Tested-by: Soeren Moch <smoch@web.de>

Thanks,
Soeren

[U-Boot] [PATCH 2/2] mmc: bring back partition init for non-DM MMC drivers

[Petr Štetiar]

Soeren Moch <smoch@web.de> [2019-01-05 18:31:09]:

> This also fixes MMC support on a tbs2910 board.

And also for Apalis board with i.MX6[1]. Thanks Andre!

 Tested-by: Petr Å tetiar <ynezz@true.cz>

1. https://lists.denx.de/pipermail/u-boot/2018-December/352210.html

-- ynezz

[U-Boot] [U-Boot, 2/2] mmc: bring back partition init for non-DM MMC drivers

[Tom Rini]

On Mon, Dec 17, 2018 at 10:05:45AM +0000, Andre Przywara wrote:

> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
> removed the call to part_init() in mmc.c, as this is done by the DM_MMC
> framework.
> However Allwinner is (still) relying on a non-DM MMC driver, so we are
> now missing the implicit partition init, leading to failing MMC accesses
> due to the missing partition information.
> 
> Bring the call back just for non-DM MMC driver to fix this regression.
> 
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Tested-by: Soeren Moch <smoch@web.de>
> ---
>  drivers/mmc/mmc.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> index f5c821e308..d858127132 100644
> --- a/drivers/mmc/mmc.c
> +++ b/drivers/mmc/mmc.c
> @@ -2449,6 +2449,10 @@ static int mmc_startup(struct mmc *mmc)
>  	bdesc->revision[0] = 0;
>  #endif
>  
> +#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
> +	part_init(bdesc);
> +#endif
> +
>  	return 0;
>  }

So, this pushes pine_h64 over the limit:
https://travis-ci.org/trini/u-boot/jobs/477078336

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190108/cef95939/attachment.sig>

[U-Boot] [U-Boot, 2/2] mmc: bring back partition init for non-DM MMC drivers

[André Przywara]

On 09/01/2019 03:44, Tom Rini wrote:
> On Mon, Dec 17, 2018 at 10:05:45AM +0000, Andre Przywara wrote:
> 
>> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
>> removed the call to part_init() in mmc.c, as this is done by the DM_MMC
>> framework.
>> However Allwinner is (still) relying on a non-DM MMC driver, so we are
>> now missing the implicit partition init, leading to failing MMC accesses
>> due to the missing partition information.
>>
>> Bring the call back just for non-DM MMC driver to fix this regression.
>>
>> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>> Tested-by: Soeren Moch <smoch@web.de>
>> ---
>>  drivers/mmc/mmc.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
>> index f5c821e308..d858127132 100644
>> --- a/drivers/mmc/mmc.c
>> +++ b/drivers/mmc/mmc.c
>> @@ -2449,6 +2449,10 @@ static int mmc_startup(struct mmc *mmc)
>>  	bdesc->revision[0] = 0;
>>  #endif
>>  
>> +#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
>> +	part_init(bdesc);
>> +#endif
>> +
>>  	return 0;
>>  }
> 
> So, this pushes pine_h64 over the limit:
> https://travis-ci.org/trini/u-boot/jobs/477078336

It seems you are missing patch 1/2?
https://lists.denx.de/pipermail/u-boot/2018-December/352283.html
(sunxi: drop default SPL_LIBDISK_SUPPORT enablement)

I put this one in for exactly this reason.

I have some other cleanups which reduce the H6 SPL size by 2K, will send
them out shortly.

Cheers,
Andre.

[U-Boot] [U-Boot, 2/2] mmc: bring back partition init for non-DM MMC drivers

[Tom Rini]

On Wed, Jan 09, 2019 at 09:03:19AM +0000, André Przywara wrote:
> On 09/01/2019 03:44, Tom Rini wrote:
> > On Mon, Dec 17, 2018 at 10:05:45AM +0000, Andre Przywara wrote:
> > 
> >> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
> >> removed the call to part_init() in mmc.c, as this is done by the DM_MMC
> >> framework.
> >> However Allwinner is (still) relying on a non-DM MMC driver, so we are
> >> now missing the implicit partition init, leading to failing MMC accesses
> >> due to the missing partition information.
> >>
> >> Bring the call back just for non-DM MMC driver to fix this regression.
> >>
> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> >> Reviewed-by: Simon Glass <sjg@chromium.org>
> >> Tested-by: Soeren Moch <smoch@web.de>
> >> ---
> >>  drivers/mmc/mmc.c | 4 ++++
> >>  1 file changed, 4 insertions(+)
> >>
> >> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> >> index f5c821e308..d858127132 100644
> >> --- a/drivers/mmc/mmc.c
> >> +++ b/drivers/mmc/mmc.c
> >> @@ -2449,6 +2449,10 @@ static int mmc_startup(struct mmc *mmc)
> >>  	bdesc->revision[0] = 0;
> >>  #endif
> >>  
> >> +#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT))
> >> +	part_init(bdesc);
> >> +#endif
> >> +
> >>  	return 0;
> >>  }
> > 
> > So, this pushes pine_h64 over the limit:
> > https://travis-ci.org/trini/u-boot/jobs/477078336
> 
> It seems you are missing patch 1/2?
> https://lists.denx.de/pipermail/u-boot/2018-December/352283.html
> (sunxi: drop default SPL_LIBDISK_SUPPORT enablement)
> 
> I put this one in for exactly this reason.
> 
> I have some other cleanups which reduce the H6 SPL size by 2K, will send
> them out shortly.

Thanks, I don't know why I thought that was in already.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190109/6c858c62/attachment.sig>

[U-Boot] [U-Boot, 2/2] mmc: bring back partition init for non-DM MMC drivers

[Tom Rini]

On Mon, Dec 17, 2018 at 10:05:45AM +0000, Andre Przywara wrote:

> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
> removed the call to part_init() in mmc.c, as this is done by the DM_MMC
> framework.
> However Allwinner is (still) relying on a non-DM MMC driver, so we are
> now missing the implicit partition init, leading to failing MMC accesses
> due to the missing partition information.
> 
> Bring the call back just for non-DM MMC driver to fix this regression.
> 
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Tested-by: Soeren Moch <smoch@web.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190109/b56b140d/attachment.sig>

[U-Boot] [PATCH 0/2] mmc: Fix partition table init regression

[Maxime Ripard]

On Mon, Dec 17, 2018 at 10:05:43AM +0000, Andre Przywara wrote:
> Commit d0851c893706 ("blk: Call part_init() in the post_probe() method")
> in the 2019.01-rc1 merge window moved the partition init call to the
> generic DM layer, leaving every non-DM driver behind. As the result all
> Allwinner boards now don't read the partition table automatically
> anymore:
> => fatls mmc 0
> ** Unrecognized filesystem type **
> => fatload mmc 0 $kernel_addr_r Image-4.20-rc3
> ** Unrecognized filesystem type **
> 
> A quick workaround is to explicitly read the partition table, but this is
> still a regression, as it breaks existing scripts and workflows:
> ==========
> => mmc part
> 
> Partition Map for MMC device 0  --   Partition Type: DOS
> 
> Part    Start Sector    Num Sectors     UUID            Type
>   1     8192            30873600        00000000-01     0c
> => fatls mmc 0
>    852304   xen
>  23544320   Image-4.20-rc3
> 
> 2 file(s), 0 dir(s)
> ==========
> 
> These two patches are the minimal version to fix this problem, by bringing
> the implicit part_init() call back just for non-DM MMC drivers.
> Patch 1 is needed to keep the H6 SPL below the size limit.
> 
> The whole SPL_LIBDISK_SUPPORT symbol is now somewhat obsolete and needs
> some proper fixing, but this needs more discussion and testing and
> is probably nothing for this release still.

Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>

Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181217/fd92fdb6/attachment.sig>