diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
| commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
| tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch | |
| parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
| download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip | |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch b/target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch new file mode 100644 index 0000000000..c67cdb0f82 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/303-core-0008-ENGR00279980-ubi-attach-do-not-return-EINVAL-if-the-.patch @@ -0,0 +1,46 @@ +From 17e6b7bb84649ffcbec11b3e3e933294d8856462 Mon Sep 17 00:00:00 2001 +From: Huang Shijie <b32955@freescale.com> +Date: Wed, 18 Sep 2013 10:17:39 +0800 +Subject: [PATCH] ENGR00279980 ubi: attach: do not return -EINVAL if the + mtd->numeraseregions is 1 + +If the master mtd does not have any slave mtd partitions, +and its numeraseregions is one(only has one erease block), and +we attach the master mtd with : ubiattach -m 0 -d 0 + +We will meet the error: +------------------------------------------------------- +root@freescale ~$ ubiattach /dev/ubi_ctrl -m 0 -d 0 +UBI: attaching mtd0 to ubi0 +UBI error: io_init: multiple regions, not implemented +ubiattach: error!: cannot attach mtd0 + error 22 (Invalid argument) +------------------------------------------------------- + +In fact, if there is only one "erase block", we should not +prevent the attach. + +This patch fixes it. + +Signed-off-by: Huang Shijie <b32955@freescale.com> +(cherry picked from commit 361cdc47fc4c4db31c5485560cdabd94f409bd81) +(cherry picked from commit ebee7d74914fad3cf7223af84496811c9d2488a1) + +Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com> + +Signed-off-by: Han Xu <han.xu@nxp.com> +--- + drivers/mtd/ubi/build.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/ubi/build.c ++++ b/drivers/mtd/ubi/build.c +@@ -576,7 +576,7 @@ static int io_init(struct ubi_device *ub + dbg_gen("sizeof(struct ubi_ainf_peb) %zu", sizeof(struct ubi_ainf_peb)); + dbg_gen("sizeof(struct ubi_wl_entry) %zu", sizeof(struct ubi_wl_entry)); + +- if (ubi->mtd->numeraseregions != 0) { ++ if (ubi->mtd->numeraseregions > 1) { + /* + * Some flashes have several erase regions. Different regions + * may have different eraseblock size and other |