5178 2013-09-13 08:33:16 +0000 sabresd boot failure with preferred provider linux-fslc 2014-05-27 16:50:26 +0000 1 1 7 Build System, Metadata & Runtime BSPs bsps-meta-fsl-arm 1.4.1 x86 Multiple RESOLVED WORKSFORME Medium normal 1.7 1 nick.lewis angolini angolini otavio --- New (Never tested) No (bug/feature does not impact docs) oldest_to_newest 36656 0 nick.lewis 2013-09-13 08:33:16 +0000 When booting core-image-minimal-imx6qsabresd.sdcard that has preferred providers linux-fslc and u-boot-fslc the kernel waits for the wrong mmcroot. It looks for /dev/mmcblk1p2 instead of /dev/mmcblk0p2. The bug affects Dylan but not Master 36707 1 otavio 2013-09-13 15:24:06 +0000 Thanks for reporting this issue. Do you know when we fixed this in mainline kernel? I think it'd be good to backport it to Dylan kernel branch. 36709 2 nick.lewis 2013-09-13 16:01:24 +0000 Not sure but it might be 0001-mx6qsabre_common-uEnv.txt-bootz-n-fixes.patch 36773 3 nick.lewis 2013-09-17 10:45:51 +0000 Sorry - scrub all that - the bug does seem to affect Master too Steps to reproduce - repo init with the master of fsl-community-bsp-platform and setup environment - add PREFERRED_PROVIDER_virtual/kernel = "linux-fslc" and PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc" to the local.conf - bitbake core-image-minimal - dd onto an sdcard - boot in an mx6sabresd board 36776 4 nick.lewis 2013-09-17 11:11:35 +0000 This temporary patch resolved the problem for me: --- tmp/work/imx6qsabresd-poky-linux-gnueabi/u-boot-fslc/v2013.10-r0/git/include/configs/mx6sabresd.h.bak 2013-09-16 16:56:13.106857912 +0100 +++ tmp/work/imx6qsabresd-poky-linux-gnueabi/u-boot-fslc/v2013.10-r0/git/include/configs/mx6sabresd.h 2013-09-17 11:51:17.963975426 +0100 @@ -15,7 +15,7 @@ #define CONFIG_MACH_TYPE 3980 #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" -#define CONFIG_MMCROOT "/dev/mmcblk1p2" +#define CONFIG_MMCROOT "/dev/mmcblk0p2" #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) 36784 5 otavio 2013-09-17 13:21:25 +0000 Using this patch, most probably break FSL kernel usage. Can you confirm it? 36787 6 otavio 2013-09-17 13:49:58 +0000 Fabio has been able to reproduce it. Setting it for him. 36790 7 nick.lewis 2013-09-17 13:54:01 +0000 By 'FSL kernel' do you mean with PREFERRED_PROVIDER_virtual/kernel="linux-imx"? 36793 8 nick.lewis 2013-09-17 13:59:00 +0000 A workaround is to insert another sd card containing anything into SD2. This SD card is ignored by uboot and early kernel boot but is loaded first by the SDHCI controllers at mmcblk0 meaning that the card in SD3 does become mmcblk1 as currently configured for the mmcroot 36796 9 nick.lewis 2013-09-17 14:25:57 +0000 This thread discusses a similar problem and includes solutions Devicetree: Initialization order of mmc block devices 36800 10 festevam 2013-09-17 15:21:45 +0000 Nick, thanks for the link. Could you please try the suggestion from: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-July/111022.html ? 36821 11 festevam 2013-09-17 17:43:05 +0000 Ok, I managed to manually apply Dirk's proposal patch and it seems that this is the way to fix this issue. Now I can mount the rootfs with the original U-boot. I will start a thread in the linux-mmc list about this. I also think that we should fix this in the mmc core instead of sdhc-imx driver. 36855 12 1516 nick.lewis 2013-09-18 10:32:06 +0000 Created attachment 1516 Ported Patch 36857 13 nick.lewis 2013-09-18 10:33:23 +0000 I have also tried the ported patch and it works for me both with and without SD cards in other slots 36858 14 nick.lewis 2013-09-18 10:41:41 +0000 It would be nice if aliases could be defined only for those sd slots that need a fixed device id e.g. containing rootfs. Could the driver first probe for those requiring fixed aliases and then probe again for the rest? At the moment the find_next_zero_bit would silently allocate the wrong device index in these cases leading to unexpected and possibly insecure behaviour (e.g. using malicious rootfs) 36871 15 nick.lewis 2013-09-18 13:19:59 +0000 Part of your patch at linux-mmc looks a bit dangerous + if (ret >= 0) + host->mmc->devidx = ret; How about instead using + host->mmc->devidx = ret ? ret : 0; 36872 16 nick.lewis 2013-09-18 13:23:20 +0000 Nope I am an idiot + if (ret >= 0) + host->mmc->devidx = ret; + else + host->mmc->devidx = 0; 36873 17 festevam 2013-09-18 13:26:51 +0000 Nick, what do you think about this approach? http://marc.info/?l=linux-mmc&m=134423822729031 36874 18 nick.lewis 2013-09-18 13:50:15 +0000 I worry that there may be cases where a host supports more than one device. It would need in depth checking to fully understand the implications Also this change may obsolete all the md->name_idx stuff which I guess would need to be removed in any final version of the patch. I am unclear about the impact or otherwise of subname Aparently the alias approach is used for serial ports so may be best to be consistent 37314 19 festevam 2013-09-28 22:45:42 +0000 With the two patches below we should be able to run both 3.0.35 and 3.11 with no issues: From 584ee6fb95edc73b1e16ad02e4d86a444376d688 Mon Sep 17 00:00:00 2001 From: Fabio Estevam <fabio.estevam@freescale.com> Date: Sat, 28 Sep 2013 18:46:18 -0300 Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first On sabresd boards we boot from SDHC3, so let's register it as mmc0. Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present). Registering SDHC3 is safer as we can always find the rootfs. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 3f9a845..4e6b323 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void) imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data); - /* Move sd4 to first because sd4 connect to emmc. - Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1. - */ + imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data); imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data); imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data); - imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data); imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata); imx6q_sabresd_init_usb(); /* SATA is not supported by MX6DL/Solo */ -- 1.8.1.2 From b180194e61c4a2eab83cff00b501d7c5cff7eeba Mon Sep 17 00:00:00 2001 From: Fabio Estevam <fabio.estevam@freescale.com> Date: Sat, 28 Sep 2013 18:52:40 -0300 Subject: [PATCH] mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT Using mmcblk0 for CONFIG_MMCROOT, so that the rootfs can be found on both FSL 3.0.35 as well as in mainline kernel. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- include/configs/mx6sabresd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index a3dd74a..c740986 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -15,7 +15,7 @@ #define CONFIG_MACH_TYPE 3980 #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" -#define CONFIG_MMCROOT "/dev/mmcblk1p2" +#define CONFIG_MMCROOT "/dev/mmcblk0p2" #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -- 1.8.1.2 37783 20 otavio 2013-10-09 14:13:08 +0000 Applied following changes: http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-arm/commit/?id=eda8fb05ad0edcd831dab6c59f75962fcc7bae02 http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-arm/commit/?id=e2feee421e3c4050649edf0c44693e62e6c68d2e 37786 21 nick.lewis 2013-10-09 15:34:41 +0000 Does there also need to be -#define CONFIG_MMCROOT "/dev/mmcblk1p2" +#define CONFIG_MMCROOT "/dev/mmcblk0p2" in u-boot-fslc? 37788 22 otavio 2013-10-09 16:09:12 +0000 Yes; this is part of the fix. It also changed the linux-imx recipe to use same order as mainline kernel. 37793 23 nick.lewis 2013-10-10 08:42:34 +0000 I am a bit confused why there is no change to the u-boot-imx recipe Will the following local conf work? PREFERRED_PROVIDER_virtual/kernel = "linux-imx" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" 37823 24 otavio 2013-10-11 00:31:36 +0000 You're right. u-boot-imx should need same fix. Can you make a patch for it Nick? 37835 25 nick.lewis 2013-10-11 10:54:23 +0000 Otavio I am out of my depth here. u-boot-imx already seems to have a patch mx69_sabresd-Change-default-environment-to-work-eith.patch with the line + "mmcroot=/dev/mmcblk0p2 rw\0" \ but running the u-boot-imx/linux-imx sdcard image i see on the console Waiting for root device /dev/mmcblk1p2... Nick 43606 26 angolini 2014-05-27 16:50:26 +0000 Just tested with daisy 1516 2013-09-18 10:32:06 +0000 2013-09-18 10:32:06 +0000 Ported Patch devidx.patch application/octet-stream 3397 nick.lewis ZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2Jvb3QvZHRzL2lteDZxLXNhYnJlc2QuZHRzIGIvYXJjaC9h cm0vYm9vdC9kdHMvaW14NnEtc2FicmVzZC5kdHMKaW5kZXggMDAzODIyOC4uYzNmYjY3NiAxMDA2 NDQKLS0tIGEvYXJjaC9hcm0vYm9vdC9kdHMvaW14NnEtc2FicmVzZC5kdHMKKysrIGIvYXJjaC9h cm0vYm9vdC9kdHMvaW14NnEtc2FicmVzZC5kdHMKQEAgLTE4LDYgKzE4LDEyIEBACiAvIHsKIAlt b2RlbCA9ICJGcmVlc2NhbGUgaS5NWDYgUXVhZCBTQUJSRSBTbWFydCBEZXZpY2UgQm9hcmQiOwog CWNvbXBhdGlibGUgPSAiZnNsLGlteDZxLXNhYnJlc2QiLCAiZnNsLGlteDZxIjsKKworCWFsaWFz ZXMgeworCQltbWNibGswID0gJnVzZGhjMjsKKwkJbW1jYmxrMSA9ICZ1c2RoYzM7CisJCW1tY2Js azIgPSAmdXNkaGM0OworCX07CiB9OwogCiAmaW9tdXhjIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv bW1jL2NhcmQvYmxvY2suYyBiL2RyaXZlcnMvbW1jL2NhcmQvYmxvY2suYwppbmRleCBjZDBiN2Y0 Li5jZDVjYTdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL21tYy9jYXJkL2Jsb2NrLmMKKysrIGIvZHJp dmVycy9tbWMvY2FyZC9ibG9jay5jCkBAIC0xOTg3LDcgKzE5ODcsOCBAQCBzdGF0aWMgc3RydWN0 IG1tY19ibGtfZGF0YSAqbW1jX2Jsa19hbGxvY19yZXEoc3RydWN0IG1tY19jYXJkICpjYXJkLAog CXN0cnVjdCBtbWNfYmxrX2RhdGEgKm1kOwogCWludCBkZXZpZHgsIHJldDsKIAotCWRldmlkeCA9 IGZpbmRfZmlyc3RfemVyb19iaXQoZGV2X3VzZSwgbWF4X2RldmljZXMpOworCWRldmlkeCA9IGZp bmRfbmV4dF96ZXJvX2JpdChkZXZfdXNlLCBtYXhfZGV2aWNlcywKKwkJCWNhcmQtPmhvc3QtPmRl dmlkeCk7CiAJaWYgKGRldmlkeCA+PSBtYXhfZGV2aWNlcykKIAkJcmV0dXJuIEVSUl9QVFIoLUVO T1NQQyk7CiAJX19zZXRfYml0KGRldmlkeCwgZGV2X3VzZSk7CkBAIC0yMDA1LDcgKzIwMDYsOCBA QCBzdGF0aWMgc3RydWN0IG1tY19ibGtfZGF0YSAqbW1jX2Jsa19hbGxvY19yZXEoc3RydWN0IG1t Y19jYXJkICpjYXJkLAogCSAqIGluZGV4IGFueW1vcmUgc28gd2Uga2VlcCB0cmFjayBvZiBhIG5h bWUgaW5kZXguCiAJICovCiAJaWYgKCFzdWJuYW1lKSB7Ci0JCW1kLT5uYW1lX2lkeCA9IGZpbmRf Zmlyc3RfemVyb19iaXQobmFtZV91c2UsIG1heF9kZXZpY2VzKTsKKwkJbWQtPm5hbWVfaWR4ID0g ZmluZF9uZXh0X3plcm9fYml0KG5hbWVfdXNlLCBtYXhfZGV2aWNlcywKKwkJCQljYXJkLT5ob3N0 LT5kZXZpZHgpOwogCQlfX3NldF9iaXQobWQtPm5hbWVfaWR4LCBuYW1lX3VzZSk7CiAJfSBlbHNl CiAJCW1kLT5uYW1lX2lkeCA9ICgoc3RydWN0IG1tY19ibGtfZGF0YSAqKQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9tbWMvaG9zdC9zZGhjaS1lc2RoYy1pbXguYyBiL2RyaXZlcnMvbW1jL2hvc3Qvc2Ro Y2ktZXNkaGMtaW14LmMKaW5kZXggMWRkNWJhOC4uMzYxNGIwOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9tbWMvaG9zdC9zZGhjaS1lc2RoYy1pbXguYworKysgYi9kcml2ZXJzL21tYy9ob3N0L3NkaGNp LWVzZGhjLWlteC5jCkBAIC05OSw2ICs5OSw4IEBAIHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlX2lkIGlteF9lc2RoY19kZXZ0eXBlW10gPSB7CiAJCS5kcml2ZXJfZGF0YSA9IElNWDI1X0VT REhDLAogCX0sIHsKIAkJLm5hbWUgPSAic2RoY2ktZXNkaGMtaW14MzUiLAorCisKIAkJLmRyaXZl cl9kYXRhID0gSU1YMzVfRVNESEMsCiAJfSwgewogCQkubmFtZSA9ICJzZGhjaS1lc2RoYy1pbXg1 MSIsCkBAIC00ODEsMTAgKzQ4MywxOSBAQCBzZGhjaV9lc2RoY19pbXhfcHJvYmVfZHQoc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqcGRldiwKIAkJCSBzdHJ1Y3QgZXNkaGNfcGxhdGZvcm1fZGF0YSAq Ym9hcmRkYXRhKQogewogCXN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAgPSBwZGV2LT5kZXYub2Zfbm9k ZTsKKwlpbnQgcmV0OwogCiAJaWYgKCFucCkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKKwlyZXQgPSBv Zl9hbGlhc19nZXRfaWQobnAsICJtbWNibGsiKTsKKwlpZiAocmV0IDwgMCkgeworCQlkZXZfZXJy KCZwZGV2LT5kZXYsICJmYWlsZWQgdG8gZ2V0IG1tY2JsayBhbGlhcyBpZCBmcm9tIGR0cywgZXJy bm8gJWRcbiIsIHJldCk7CisJCXJldHVybiAgLUVOT0RFVjsKKwl9CisKKwlib2FyZGRhdGEtPmRl dmlkeCA9IHJldDsKKwogCWlmIChvZl9nZXRfcHJvcGVydHkobnAsICJub24tcmVtb3ZhYmxlIiwg TlVMTCkpCiAJCWJvYXJkZGF0YS0+Y2RfdHlwZSA9IEVTREhDX0NEX1BFUk1BTkVOVDsKIApAQCAt NjAyLDYgKzYxMyw5IEBAIHN0YXRpYyBpbnQgc2RoY2lfZXNkaGNfaW14X3Byb2JlKHN0cnVjdCBw bGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCQkJCWhvc3QtPm1tYy0+cGFyZW50LT5wbGF0Zm9ybV9k YXRhKTsKIAl9CiAKKwkvKmNvcHkgbW1jIGJsb2NrIGRldmljZSBpbmRleCAqLworCWhvc3QtPm1t Yy0+ZGV2aWR4ID0gYm9hcmRkYXRhLT5kZXZpZHg7CisKIAkvKiB3cml0ZV9wcm90ZWN0ICovCiAJ aWYgKGJvYXJkZGF0YS0+d3BfdHlwZSA9PSBFU0RIQ19XUF9HUElPKSB7CiAJCWVyciA9IG1tY19n cGlvX3JlcXVlc3Rfcm8oaG9zdC0+bW1jLCBib2FyZGRhdGEtPndwX2dwaW8pOwpkaWZmIC0tZ2l0 IGEvaW5jbHVkZS9saW51eC9tbWMvaG9zdC5oIGIvaW5jbHVkZS9saW51eC9tbWMvaG9zdC5oCmlu ZGV4IDNiMGMzM2EuLjU0ZDI4OTYgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW1jL2hvc3Qu aAorKysgYi9pbmNsdWRlL2xpbnV4L21tYy9ob3N0LmgKQEAgLTM2Miw2ICszNjIsNyBAQCBzdHJ1 Y3QgbW1jX2hvc3QgewogCiAJdW5zaWduZWQgaW50CQlzbG90bm87CS8qIHVzZWQgZm9yIHNkaW8g YWNwaSBiaW5kaW5nICovCiAKKwl1bnNpZ25lZCBpbnQJCWRldmlkeDsgLyogcHJlZmVycmVkIG1t Y2JsayBkZXZpY2UgaW5kZXggKi8KIAl1bnNpZ25lZCBsb25nCQlwcml2YXRlWzBdIF9fX19jYWNo ZWxpbmVfYWxpZ25lZDsKIH07CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvcGxhdGZvcm1f ZGF0YS9tbWMtZXNkaGMtaW14LmggYi9pbmNsdWRlL2xpbnV4L3BsYXRmb3JtX2RhdGEvbW1jLWVz ZGhjLWlteC5oCmluZGV4IGQ0NDkxMmQuLjYwMzFlYzcgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGlu dXgvcGxhdGZvcm1fZGF0YS9tbWMtZXNkaGMtaW14LmgKKysrIGIvaW5jbHVkZS9saW51eC9wbGF0 Zm9ybV9kYXRhL21tYy1lc2RoYy1pbXguaApAQCAtNDEsNSArNDEsNiBAQCBzdHJ1Y3QgZXNkaGNf cGxhdGZvcm1fZGF0YSB7CiAJZW51bSBjZF90eXBlcyBjZF90eXBlOwogCWludCBtYXhfYnVzX3dp ZHRoOwogCXVuc2lnbmVkIGludCBmX21heDsKKwl1bnNpZ25lZCBpbnQgZGV2aWR4OwogfTsKICNl bmRpZiAvKiBfX0FTTV9BUkNIX0lNWF9FU0RIQ19IICovCg==