From cd5b8b145b57165e613b53cbbcff2acaf3d63582 Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@freescale.com>
Date: Fri, 1 Aug 2014 12:33:16 +0800
Subject: udev[-extraconf]: skip mmc rpmb partitions

In FSL SDK 1.6 Kernel, mmc driver has created a new partition
with "mmcblkXrpmb" if device expresses it support of RPMB.

RPMB (Replay Protected Memory Block), A signed access to a Replay
Protected Memory Block is provided. This function provides means
for the system to store data to the specific memory area in an
authenticated and replay protected manner.

In that case, any read/write access to this partition device will
report errors which will not impact any fuction.

add rules to skip it, avoid the below error msg:
| mmcblk0rpmb: retrying using single block read
| mmcblk0rpmb: error -110 transferring data

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-core/udev/udev-extraconf_%.bbappend        |  9 +++--
 .../udev/skip-rules-for-mmc-rpmb-partition.patch   | 41 ++++++++++++++++++++++
 recipes-core/udev/udev_182.bbappend                |  7 +++-
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 recipes-core/udev/udev/skip-rules-for-mmc-rpmb-partition.patch

diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
index db74aac..6c2bfe2 100644
--- a/recipes-core/udev/udev-extraconf_%.bbappend
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
@@ -1,10 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI_append = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \
+SRC_URI_append_qoriq-ppc = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \
     "72-fsl-dpaa-persistent-networking.rules", "71-fsl-dpaa-persistent-networking.rules", d)}"
 
-do_install_append () {
+do_install_append_qoriq-ppc () {
     install -d ${D}${sysconfdir}/udev/rules.d/
     install -m 0644 ${WORKDIR}/*-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d
+
+    # skip mmc rpmb partitions
+    echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist
 }
 
diff --git a/recipes-core/udev/udev/skip-rules-for-mmc-rpmb-partition.patch b/recipes-core/udev/udev/skip-rules-for-mmc-rpmb-partition.patch
new file mode 100644
index 0000000..edbc0b3
--- /dev/null
+++ b/recipes-core/udev/udev/skip-rules-for-mmc-rpmb-partition.patch
@@ -0,0 +1,41 @@
+From 68a780f4cbba18c01d8409faafb1f7904afa86a9 Mon Sep 17 00:00:00 2001
+From: Ting Liu <ting.liu@freescale.com>
+Date: Thu, 31 Jul 2014 16:12:32 +0800
+Subject: [PATCH] skip rules for mmc rpmb partition
+
+Upstream-status: Pending
+
+In FSL SDK 1.6 Kernel, mmc driver has created a new partition 
+with "mmcblkXrpmb" if device expresses it support of RPMB.
+
+RPMB (Replay Protected Memory Block), A signed access to a Replay 
+Protected Memory Block is provided. This function provides means 
+for the system to store data to the specific memory area in an 
+authenticated and replay protected manner.
+
+In that case, any read/write access to this partition device will 
+report errors which will not impact any fuction.
+
+add rules to skip it.
+
+Signed-off-by: Ting Liu <ting.liu@freescale.com>
+---
+ rules/60-persistent-storage.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
+index fa687f2..bb3f8f9 100644
+--- a/rules/60-persistent-storage.rules
++++ b/rules/60-persistent-storage.rules
+@@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
+ SUBSYSTEM!="block", GOTO="persistent_storage_end"
+ 
+ # skip rules for inappropriate block devices
+-KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end"
++KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|mmcblk*rpmb", GOTO="persistent_storage_end"
+ 
+ # ignore partitions that span the entire disk
+ TEST=="whole_disk", GOTO="persistent_storage_end"
+-- 
+1.8.3.2
+
diff --git a/recipes-core/udev/udev_182.bbappend b/recipes-core/udev/udev_182.bbappend
index 72d991c..4eedfd8 100644
--- a/recipes-core/udev/udev_182.bbappend
+++ b/recipes-core/udev/udev_182.bbappend
@@ -1 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI_append_qoriq-ppc = " \
+    file://skip-rules-for-mmc-rpmb-partition.patch \
+"
+
-- 
cgit v1.2.3-54-g00ecf