From 2058e126784551cf7fb073c56fbf512a9598de9b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 6 Apr 2015 19:34:26 +0000 Subject: [PATCH] eMMC: Don't initialize partitions on RPMB flagged areas (Closes: #782038) svn path=/dists/sid/linux/; revision=22483 --- debian/changelog | 1 + ...ize-partitions-on-rpmb-flagged-areas.patch | 27 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch diff --git a/debian/changelog b/debian/changelog index efe370914..83440dc57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -196,6 +196,7 @@ linux (3.16.7-ckt9-1) UNRELEASED; urgency=medium g4x/vlv/chv (Closes: #775217) * HID: thingm: fix workqueue race on remove (Closes: #780055) * [x86] Disable X86_VERBOSE_BOOTUP (Closes: #781953) + * eMMC: Don't initialize partitions on RPMB flagged areas (Closes: #782038) -- Ian Campbell Wed, 18 Mar 2015 21:07:15 +0000 diff --git a/debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch b/debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch new file mode 100644 index 000000000..5495a30f8 --- /dev/null +++ b/debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch @@ -0,0 +1,27 @@ +From: Nell Hardcastle +Date: Thu, 29 May 2014 22:06:50 -0700 +Subject: [PATCH] eMMC: Don't initialize partitions on RPMB flagged areas. +Origin: https://dev-nell.com/rpmb-emmc-errors-under-linux.html +Bug-Debian: https://bugs.debian.org/782038 + +Prevents a lot of pointless hanging at boot on some devices. +--- +[bwh: An RPMB is unlikely to be useful on any platform supported by a Debian +kernel, so I think it's best to hide them for now. Once we are confident +that userland will ignore them or the kernel does a better job of avoiding +hanging reads, we can drop this patch.] + + drivers/mmc/card/block.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mmc/card/block.c ++++ b/drivers/mmc/card/block.c +@@ -2258,7 +2258,7 @@ static int mmc_blk_alloc_parts(struct mm + return 0; + + for (idx = 0; idx < card->nr_parts; idx++) { +- if (card->part[idx].size) { ++ if (card->part[idx].size && !(card->part[idx].area_type & MMC_BLK_DATA_AREA_RPMB)) { + ret = mmc_blk_alloc_part(card, md, + card->part[idx].part_cfg, + card->part[idx].size >> 9, diff --git a/debian/patches/series b/debian/patches/series index 52446abba..9084548cc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -573,3 +573,4 @@ features/all/psmouse/input-psmouse-disable-changing-resolution-rate-scale.patch features/all/psmouse/input-psmouse-disable-palm-detection-in-the-focaltec.patch bugfix/x86/drm-i915-add-limited-color-range-readout-for-hdmi-dp.patch bugfix/all/hid-thingm-fix-workqueue-race-on-remove.patch +debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch